133 files changed, 30800 insertions, 23444 deletions

diff --git a/ABOUT-NLS b/ABOUT-NLS
index 5fde45a..5fde45a 100644..100755
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
diff --git a/COPYING b/COPYING
index eeb586b..eeb586b 100644..100755
--- a/COPYING
+++ b/COPYING
diff --git a/ChangeLog b/ChangeLog
index 49edace..276eb1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2.1.4 - December 12th, 2007 :
+=============================
+    * Added support of pictures in Ogg Vorbis and Speex files (with Ogg Vorbis
+      tags),
+    * Added support of pictures in FLAC files (with FLAC Vorbis tags).
+    * The code for handling FLAC files was also fully rewritten,
+    * Added view of tag fields in the main list of files,
+    * Added a button on the main window to select a directory to browse for file 
+      (useful when the tree is hidden),
+    * Fixed compilation problem with mpeg4ip 1.6 (thanks to Götz Waschk),
+    * Fixed messages boxes to use the stock buttons and labels of GTK,
+    * Fixed file easytag.desktop (thanks to Doruk Fisek and Götz Waschk),
+    * Fixed problem with dates and EUC-JP locale when displaying lines on the 
+      log window (thanks to Misty Haiku),
+    * Fixed problem with the Cddb manual search when using a proxy,
+    * Fixed detection of Roman numerals before a coma and dot characters in the
+      scanner window,
+    * Settings to write ID3v1.x tags : the option "//TRANSLIT" was enabled by 
+      default to avoid an error message with UTF-8 strings. This was the setting
+      used before using libid3tag instead of id3lib,
+    * Fixed problem when reading tag with some languages as Turkish (patch from
+      Doruk Fisek),
+    * New Chinese (Taiwan) translation (thanks to Jose Sun),
+    * Hungarian translation updated (thanks to Mészáros Csaba),
+    * Chinese (Simplified) translation updated (thanks to Yang Jinsong),
+    * German translation updated (thanks to Götz Waschk),
+    * French translation updated.
+
+
+    Windows version :
+    * Fixed crash on start up for Norwegian locale.
+    * Fixed problem when loading the default directory if it contains an UTF-8 character,
+    * Using NSIS installer to build the setup package (instead of Inno Setup)
+
+
 2.1.3 - October 15th, 2007 :
 ============================
     * The "convert" function of the 'Process Fields' scanner was improved to
diff --git a/Makefile.am b/Makefile.am
index 6b1f6a6..4a58ab1 100644..100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,10 +11,11 @@ text_DATA = ChangeLog
 man_MANS = doc/easytag.1
 
 BITMAPS = \
-    pixmaps/add.xpm \
     pixmaps/add_folder.xpm \
+    pixmaps/album.xpm \
     pixmaps/all_downcase.xpm \
     pixmaps/all_uppercase.xpm \
+    pixmaps/artist.xpm \
     pixmaps/artist_album.xpm \
     pixmaps/black.xpm \
     pixmaps/blackwhite.xpm \
@@ -47,10 +48,15 @@ BITMAPS = \
 pixmapdir = $(datadir)/$(PACKAGE)
 pixmap_DATA = \
     pixmaps/EasyTAG_logo.xpm
+#    pixmaps/artist_album.png \
+#    pixmaps/EasyTAG_icon.png \
+#    pixmaps/EasyTAG_logo.png \
+#    pixmaps/scan.png
 
 
 icondir = $(datadir)/pixmaps
 icon_DATA = pixmaps/EasyTAG_icon.xpm
+#icon_DATA = pixmaps/EasyTAG_icon.png
 
 
 EXTRA_DIST= \
@@ -62,7 +68,7 @@ EXTRA_DIST= \
     \
     autogen.sh \
     easytag.spec \
-    easytag.win32.setup.iss \
+    easytag-win32-installer.nsi \
     COPYING \
     INSTALL \
     README \
@@ -87,75 +93,10 @@ EXTRA_DIST= \
     po/Makefile.mingw \
     \
     doc/easytag.1.in \
-    doc/EasyTAG_Documentation.html \
-    doc/EasyTAG_Documentation_fr.html \
-    doc/EasyTAG_Documentation_sv.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr1.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr2.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr3.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr4.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr5.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr6.html \
-    doc/users_guide_french/USERS-GUIDE.css \
-    doc/users_guide_french/images/bouton_arbo.png \
-    doc/users_guide_french/images/bouton_img1.png \
-    doc/users_guide_french/images/bouton_img2.png \
-    doc/users_guide_french/images/bouton_img3.png \
-    doc/users_guide_french/images/bouton_scan1.png \
-    doc/users_guide_french/images/bouton_scan2.png \
-    doc/users_guide_french/images/bouton_scan3.png \
-    doc/users_guide_french/images/bouton_scan4.png \
-    doc/users_guide_french/images/bouton_scan5.png \
-    doc/users_guide_french/images/bouton_scan6.png \
-    doc/users_guide_french/images/bouton_scan7.png \
-    doc/users_guide_french/images/fen_boutons.png \
-    doc/users_guide_french/images/fen_cddb1.png \
-    doc/users_guide_french/images/fen_cddb2.png \
-    doc/users_guide_french/images/fen_fic_txt.png \
-    doc/users_guide_french/images/fen_fich.png \
-    doc/users_guide_french/images/fen_lect1.png \
-    doc/users_guide_french/images/fen_lect2.png \
-    doc/users_guide_french/images/fen_playlist.png \
-    doc/users_guide_french/images/fen_rech1.png \
-    doc/users_guide_french/images/fen_scan1.png \
-    doc/users_guide_french/images/fen_scan2.png \
-    doc/users_guide_french/images/fen_scan3.png \
-    doc/users_guide_french/images/fen_scan4.png \
-    doc/users_guide_french/images/fen_sel1.png \
-    doc/users_guide_french/images/fen_sel2.png \
-    doc/users_guide_french/images/fen_sel3.png \
-    doc/users_guide_french/images/fen_tag_bout1.png \
-    doc/users_guide_french/images/fen_tag_bout2.png \
-    doc/users_guide_french/images/fen_tag_gen.png \
-    doc/users_guide_french/images/fen_tag_img.png \
-    doc/users_guide_french/images/interface.png \
-    doc/users_guide_french/images/menu_context1.png \
-    doc/users_guide_french/images/menu_context2.png \
-    doc/users_guide_french/images/menu_context3.png \
-    doc/users_guide_french/images/menu_div.png \
-    doc/users_guide_french/images/menu_fic.png \
-    doc/users_guide_french/images/menu_pref.png \
-    doc/users_guide_french/images/menu_recherche1.png \
-    doc/users_guide_french/images/menu_recherche2.png \
-    doc/users_guide_french/images/menu_recherche.png \
-    doc/users_guide_french/images/menu_scan.png \
-    doc/users_guide_french/images/menu_sel.png \
-    doc/users_guide_french/images/sousmenu_fic1.png \
-    doc/users_guide_french/images/sousmenu_fic2.png \
-    doc/users_guide_german/bedienung1.htm \
-    doc/users_guide_german/bedienung2.htm \
-    doc/users_guide_german/easy.css \
-    doc/users_guide_german/einleitung.htm\
-    doc/users_guide_german/images/EasyTAG.png \
-    doc/users_guide_german/images/filelist.png \
-    doc/users_guide_german/images/playlist.png \
-    doc/users_guide_german/images/t_easytag.jpg \
-    doc/users_guide_german/images/eigensch.png \
-    doc/users_guide_german/images/search.png \
-    doc/users_guide_german/images/treeview.png \
-    doc/id3/easy.html \
-    doc/id3/id3v2.3.0.html \
-    doc/id3/id3v2_blocks.gif \
-    doc/id3/mpeghdr-19991222.htm \
-    doc/vorbis/v-comment.html \
-    doc/vorbis/white-ogg.png
+    doc/EasyTAG_Documentation*.html \
+    doc/users_guide_*/* \
+    doc/users_guide_*/images/* \
+    doc/id3/* \
+    doc/vorbis/* 
+
+
diff --git a/Makefile.in b/Makefile.in
index 5d788c2..540bff9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -236,10 +236,11 @@ textdir = $(datadir)/$(PACKAGE)
 text_DATA = ChangeLog
 man_MANS = doc/easytag.1
 BITMAPS = \
-    pixmaps/add.xpm \
     pixmaps/add_folder.xpm \
+    pixmaps/album.xpm \
     pixmaps/all_downcase.xpm \
     pixmaps/all_uppercase.xpm \
+    pixmaps/artist.xpm \
     pixmaps/artist_album.xpm \
     pixmaps/black.xpm \
     pixmaps/blackwhite.xpm \
@@ -273,8 +274,13 @@ pixmapdir = $(datadir)/$(PACKAGE)
 pixmap_DATA = \
     pixmaps/EasyTAG_logo.xpm
 
+#    pixmaps/artist_album.png \
+#    pixmaps/EasyTAG_icon.png \
+#    pixmaps/EasyTAG_logo.png \
+#    pixmaps/scan.png
 icondir = $(datadir)/pixmaps
 icon_DATA = pixmaps/EasyTAG_icon.xpm
+#icon_DATA = pixmaps/EasyTAG_icon.png
 EXTRA_DIST = \
     $(gnome_menu_DATA) \
     $(text_DATA) \
@@ -284,7 +290,7 @@ EXTRA_DIST = \
     \
     autogen.sh \
     easytag.spec \
-    easytag.win32.setup.iss \
+    easytag-win32-installer.nsi \
     COPYING \
     INSTALL \
     README \
@@ -309,78 +315,11 @@ EXTRA_DIST = \
     po/Makefile.mingw \
     \
     doc/easytag.1.in \
-    doc/EasyTAG_Documentation.html \
-    doc/EasyTAG_Documentation_fr.html \
-    doc/EasyTAG_Documentation_sv.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr1.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr2.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr3.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr4.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr5.html \
-    doc/users_guide_french/USERS-GUIDE-11_fr6.html \
-    doc/users_guide_french/USERS-GUIDE.css \
-    doc/users_guide_french/images/bouton_arbo.png \
-    doc/users_guide_french/images/bouton_img1.png \
-    doc/users_guide_french/images/bouton_img2.png \
-    doc/users_guide_french/images/bouton_img3.png \
-    doc/users_guide_french/images/bouton_scan1.png \
-    doc/users_guide_french/images/bouton_scan2.png \
-    doc/users_guide_french/images/bouton_scan3.png \
-    doc/users_guide_french/images/bouton_scan4.png \
-    doc/users_guide_french/images/bouton_scan5.png \
-    doc/users_guide_french/images/bouton_scan6.png \
-    doc/users_guide_french/images/bouton_scan7.png \
-    doc/users_guide_french/images/fen_boutons.png \
-    doc/users_guide_french/images/fen_cddb1.png \
-    doc/users_guide_french/images/fen_cddb2.png \
-    doc/users_guide_french/images/fen_fic_txt.png \
-    doc/users_guide_french/images/fen_fich.png \
-    doc/users_guide_french/images/fen_lect1.png \
-    doc/users_guide_french/images/fen_lect2.png \
-    doc/users_guide_french/images/fen_playlist.png \
-    doc/users_guide_french/images/fen_rech1.png \
-    doc/users_guide_french/images/fen_scan1.png \
-    doc/users_guide_french/images/fen_scan2.png \
-    doc/users_guide_french/images/fen_scan3.png \
-    doc/users_guide_french/images/fen_scan4.png \
-    doc/users_guide_french/images/fen_sel1.png \
-    doc/users_guide_french/images/fen_sel2.png \
-    doc/users_guide_french/images/fen_sel3.png \
-    doc/users_guide_french/images/fen_tag_bout1.png \
-    doc/users_guide_french/images/fen_tag_bout2.png \
-    doc/users_guide_french/images/fen_tag_gen.png \
-    doc/users_guide_french/images/fen_tag_img.png \
-    doc/users_guide_french/images/interface.png \
-    doc/users_guide_french/images/menu_context1.png \
-    doc/users_guide_french/images/menu_context2.png \
-    doc/users_guide_french/images/menu_context3.png \
-    doc/users_guide_french/images/menu_div.png \
-    doc/users_guide_french/images/menu_fic.png \
-    doc/users_guide_french/images/menu_pref.png \
-    doc/users_guide_french/images/menu_recherche1.png \
-    doc/users_guide_french/images/menu_recherche2.png \
-    doc/users_guide_french/images/menu_recherche.png \
-    doc/users_guide_french/images/menu_scan.png \
-    doc/users_guide_french/images/menu_sel.png \
-    doc/users_guide_french/images/sousmenu_fic1.png \
-    doc/users_guide_french/images/sousmenu_fic2.png \
-    doc/users_guide_german/bedienung1.htm \
-    doc/users_guide_german/bedienung2.htm \
-    doc/users_guide_german/easy.css \
-    doc/users_guide_german/einleitung.htm\
-    doc/users_guide_german/images/EasyTAG.png \
-    doc/users_guide_german/images/filelist.png \
-    doc/users_guide_german/images/playlist.png \
-    doc/users_guide_german/images/t_easytag.jpg \
-    doc/users_guide_german/images/eigensch.png \
-    doc/users_guide_german/images/search.png \
-    doc/users_guide_german/images/treeview.png \
-    doc/id3/easy.html \
-    doc/id3/id3v2.3.0.html \
-    doc/id3/id3v2_blocks.gif \
-    doc/id3/mpeghdr-19991222.htm \
-    doc/vorbis/v-comment.html \
-    doc/vorbis/white-ogg.png
+    doc/EasyTAG_Documentation*.html \
+    doc/users_guide_*/* \
+    doc/users_guide_*/images/* \
+    doc/id3/* \
+    doc/vorbis/* 
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/Makefile.mingw b/Makefile.mingw
index 94a2097..4f21f44 100644..100755
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -5,9 +5,15 @@
 # Description: Top Makefile for win32 (mingw) port of Gaim
 #
 
-EASYTAG_SRC = ./src
+#MAKENSIS            = "C:/Program Files/NSIS/makensis.exe"
+#VERSION := $(shell cat ./config.h |grep VERSION)
+
+EASYTAG_SRC         = ./src
 EASYTAG_INSTALL_DIR = ./win32-install-dir
-PO = ./po
+DOC                 = ./doc
+PIXMAPS             = ./pixmaps
+PO                  = ./po
+
 
 ##
 ## Don't forget to change STATIC_PROTO_INIT, in config.h.mingw if you
@@ -21,18 +27,24 @@ all:
 install: all
 	$(MAKE) -C $(PO) -f Makefile.mingw install
 	$(MAKE) -C $(EASYTAG_SRC) -f Makefile.mingw install
+	cp ChangeLog $(EASYTAG_INSTALL_DIR)/ChangeLog.txt
+	cp COPYING $(EASYTAG_INSTALL_DIR)/COPYING.txt
+	cp README $(EASYTAG_INSTALL_DIR)/README.txt
+	cp README_win32.txt $(EASYTAG_INSTALL_DIR)
+	cp $(DOC)/EasyTAG_Documentation* $(EASYTAG_INSTALL_DIR)
+	cp -r $(DOC)/users_guide_* $(EASYTAG_INSTALL_DIR)
 
+#installer: 
+#	$(MAKENSIS) /DPRODUCT_VERSION="$(VERSION)"  easytag-win32-installer.nsi
+#	$(MAKENSIS) /DPRODUCT_VERSION="$(VERSION)" /DWITH_GTK easytag-win32-installer.nsi
 
-installer:
-	$(MAKENSIS) /DGAIM_VERSION="$(VERSION)" /DWITH_GTK gaim-installer.nsi
-
-installer_nogtk:
-	$(MAKENSIS) /DGAIM_VERSION="$(VERSION)" gaim-installer.nsi
+#installer_nogtk:
+#	$(MAKENSIS) /DEASYTAG_VERSION="$(VERSION)" gaim-installer.nsi
 
-installer_debug:
-	$(MAKENSIS) /DGAIM_VERSION="$(VERSION)" /DDEBUG gaim-installer.nsi
+#installer_debug:
+#	$(MAKENSIS) /DEASYTAG_VERSION="$(VERSION)" /DDEBUG easytag-win32-installer.nsi
 
-installers: installer installer_nogtk
+#installers: installer #installer_nogtk
 
 
 clean:
diff --git a/README b/README
index c7db943..c7db943 100644..100755
--- a/README
+++ b/README
diff --git a/README_win32.txt b/README_win32.txt
index 21a94cf..df25d25 100755
--- a/README_win32.txt
+++ b/README_win32.txt
@@ -6,16 +6,27 @@ I. BINARIES INSTALL
 

 You'll need to install GTK+ runtime to run EasyTAG.

 Get it at http://sourceforge.net/project/showfiles.php?group_id=121075&package_id=132255

+The GTK+ runtime will add the directory "C:\Program Files\Common files\GTK\2.0\bin" in your PATH environment variable.

 

 You can run from any directory. It should autodetect GTK libs location and store preferences in the localized version of

 the "C:\Documents and Settings\<user>\Application Data\.easytag" folder

 

-It should autodetect your audio player. foobar2k and winamp in order, if you have them installed. If not you can set your audio player in the settings dialog

+It should autodetect your audio player. foobar2k and winamp in order, if you have them installed. If not you can set 

+your audio player in the settings dialog.

 

 It should use the langage of your Windows installation. It can be overriden by setting the EASYTAGLANG environment variable

-to the two letter country code found in the "locale" subdirectory. Example for french:

+to the two letter country code found in the "locale" subdirectory. 

+To define this variable, go in the "Advanced" tab of the "Desktop" properties window. Click the  "Environment variable"

+button, and then create it with the "New" button of the User variables frame.

+Example for french:

+    set EASYTAGLANG=fr

+    

+Crash at start:

+---------------

+    If the program crashes immediatelly at start without any message, it may be due to the locale which isn't detected 

+correctly.

+In this case, try to declare the EASYTAGLANG variable using your right locale as value, else with "en".

 

-set EASYTAGLANG=fr

 

 

 II. DIFFERENCE WITH UNIX VERSION

@@ -46,12 +57,19 @@ V. TO COMPILE
 

 - install MinGW with gcc 3.4.4 and g++ (important as gcc 3.4.2 in current has a serious bug with paths)

 - install MSYS

-- install gtk+ development and runtime package and their dependancies in the MinGW directory (see http://www.gimp.org/~tml/gimp/win32/downloads.html)

+- install gtk+ development and runtime package and their dependencies in the MinGW directory (see http://www.gimp.org/~tml/gimp/win32/downloads.html)

 	* libiconv-1.9.1.bin.woe32.zip

 	* gettext-0.14.5.zip

 	* gettext-dev-0.14.5.zip

 	* libtool-1.5.8-bin.zip

 	* libtool-1.5.8-lib.zip

+	

+	* mingw-utils-0.3.tar.gz (for debugger "drmingw", see infos in doc/ for installation:

+	                          - unzip in MinGW/ directory

+	                          - edit drmingw.reg to set the correct path to drmingw.exe and apply it

+	                          - run "drmingw -i")

+    * (interesting informations on http://developer.pidgin.im/wiki/BuildingWinPidgin)

+    

 - install pkg-config (see http://www.gimp.org/~tml/gimp/win32/downloads.html)

 

 - add in /etc/profile:

@@ -59,21 +77,28 @@ export PKG_CONFIG_PATH=/mingw/lib/pkgconfig:/usr/local/lib/pkgconfig
 

 - relaunch MSYS and check that pkg-config works:

 pkg-config --list-all

+    => should list gtk and its dependencies

 

 

-should list gtk and its dependencies

-

-

-1) id3lib :

------------

+1) id3lib-3.8.3 :

+-----------------

 

 - edit configure.in : comment check for truncate() (line 252 to 255)

 - aclocal && automake && autoconf

 - CXXFLAGS="-DID3LIB_LINKOPTION=1" ./configure && make install

 

+2) libid3tag-0.15.1b :

+----------------------

+

+- install (see: http://sourceforge.net/project/showfiles.php?group_id=23617&package_id=16861&release_id=344693)

+    * zlib-1.2.3-bin.zip

+    * zlib-1.2.3-lib.zip

+

+- ./configure && make install

+

 

-2) libmp4v2 :

--------------

+3) libmp4v2 (in mpeg4ip) :

+--------------------------

 

 - compile and install SDL (SDL-1.2.9.tar.gz : ./configure && make install)

 - ./bootstrap && ./configure

@@ -83,21 +108,22 @@ should list gtk and its dependencies
 - cp *.h /usr/local

 

 

-3) libogg :

------------

+4) libogg-1.1.3 :

+-----------------

 

 - ./configure && make install

 

 

-4) libvorbis :

---------------

+5) libvorbis-1.2.0 :

+--------------------

 

 - ./configure

 

 - compile will fail when linking libvorbisfile with a libogg missing dependency (libtool bug)

-to fix the problem :

+to fix the problem:

 

-in file "lib/Makefile" line 252, replace:

+libvorbis-1.1.2, in file "lib/Makefile" line 252, replace:

+libvorbis-1.2.0, in file "lib/Makefile" line 267, replace:

     libvorbisfile_la_LIBADD = libvorbis.la

 by

     libvorbisfile_la_LIBADD = libvorbis.la -L/local/lib -logg

@@ -105,16 +131,22 @@ by
 - make install

 

 

-5) flac :

----------

+6) speex-1.2beta2 :

+-------------------

 

 ./configure && make install

 

 

-6) wavpack :

-------------

+7) flac-1.1.3 :

+---------------

+

+./configure && make install

+

+

+8) wavpack-4.41.0 :

+-------------------

 

-- if compile fails, replace in the file 'cli\utils.c', line 304 : 

+- wavpack-4.40.0, if compile fails, replace in the file 'cli\utils.c', line 304 : 

     return (int)(pos - cp) & 1;

   by :

     return (int)((int)pos - (int)cp) & 1;

@@ -122,7 +154,7 @@ by
 ./configure && make install

 

 

-7) easytag :

+9) easytag :

 ------------

 

 make -f Makefile.mingw install

diff --git a/THANKS b/THANKS
index d8a184d..8b8d28d 100644..100755
--- a/THANKS
+++ b/THANKS
@@ -211,12 +211,18 @@ Pierre Dumuid <pierre.dumuid@adelaide.edu.au>
 Yuval Hager <yuval@avramzon.net>
   - Hebrew translation
 
+Yang Jinsong <shannleon@gmail.com>
+ - Chinese transalation
+
 Anders Strömer <anders.stromer@comhem.se>
   - Swedich documentation
 
 Miloš Popović <gpopac@gmail.com>
   - Serbian translation
 
+Jose Sun <josesun@gmail.com>
+ - Chinese (Taiwan) transalation
+
 
 My thanks to all :)
     Jerome
diff --git a/TODO b/TODO
index f2a4b7f..f2a4b7f 100644..100755
--- a/TODO
+++ b/TODO
diff --git a/acconfig.h b/acconfig.h
index 7847613..7847613 100644..100755
--- a/acconfig.h
+++ b/acconfig.h
diff --git a/aclocal.m4 b/aclocal.m4
index 0db1722..1f07ce3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -49,7 +49,7 @@ AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run
       esac
   done
 
-  PKG_PROG_PKG_CONFIG([0.7])
+  PKG_PROG_PKG_CONFIG([0.16])
 
   no_glib=""
 
@@ -858,7 +858,7 @@ main ()
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 48 AC_PROG_LIBTOOL
+# serial 51 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1021,7 +1021,7 @@ test -z "$STRIP" && STRIP=:
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
@@ -1108,8 +1108,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 # Check for compiler boilerplate output or warnings with
 # the simple compiler test code.
 AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -1121,8 +1122,9 @@ $rm conftest*
 # Check for linker boilerplate output or warnings with
 # the simple link test code.
 AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -1138,12 +1140,20 @@ $rm conftest*
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
 AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 ])# _LT_AC_SYS_LIBPATH_AIX
 
@@ -1374,13 +1384,17 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
@@ -1396,7 +1410,11 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
       esac
       ;;
     *64-bit*)
+      libsuff=64
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -1468,7 +1486,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
   ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$3"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -1509,11 +1527,12 @@ fi
 # ------------------------------------------------------------
 # Check whether the given compiler option works
 AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
   [$2=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -1627,24 +1646,27 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     fi
     ;;
   *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
 	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 ])
@@ -1871,7 +1893,8 @@ fi
 # ---------------------------------
 # Check to see if options -c and -o are simultaneously supported by compiler
 AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
@@ -1879,7 +1902,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -2019,6 +2042,7 @@ else
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
          AC_MSG_RESULT([yes])
        else
   AC_MSG_RESULT([no])
@@ -2036,7 +2060,8 @@ fi
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
 AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -2050,20 +2075,58 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+fi])
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -2220,12 +2283,8 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+  m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -2242,18 +2301,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2291,7 +2338,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -2354,7 +2401,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[[3-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -2409,7 +2456,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -2422,28 +2469,13 @@ linux*)
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
-
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-    if AC_TRY_EVAL(ac_compile); then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 
   # 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/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2455,18 +2487,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -2548,6 +2568,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -2653,7 +2677,8 @@ fi
 # _LT_AC_TAGCONFIG
 # ----------------
 AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
     [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
         [include additional configurations @<:@automatic@:>@])],
     [tagnames="$withval"])
@@ -2914,7 +2939,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
 
 # AC_PATH_TOOL_PREFIX
 # -------------------
-# find a file program which can recognise shared library
+# find a file program which can recognize shared library
 AC_DEFUN([AC_PATH_TOOL_PREFIX],
 [AC_REQUIRE([AC_PROG_EGREP])dnl
 AC_MSG_CHECKING([for $1])
@@ -2977,7 +3002,7 @@ fi
 
 # AC_PATH_MAGIC
 # -------------
-# find a file program which can recognise a shared library
+# find a file program which can recognize a shared library
 AC_DEFUN([AC_PATH_MAGIC],
 [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -3124,7 +3149,7 @@ esac
 # how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics
 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
 lt_cv_deplibs_check_method,
 [lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -3163,16 +3188,22 @@ cygwin*)
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -3210,7 +3241,7 @@ hpux10.20* | hpux11*)
   esac
   ;;
 
-interix3*)
+interix[[3-9]]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
   ;;
@@ -3226,7 +3257,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3260,6 +3291,10 @@ osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3312,7 +3347,7 @@ AC_DEFUN([AC_PROG_NM],
   lt_cv_path_NM="$NM"
 else
   lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
@@ -3528,10 +3563,10 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 _LT_AC_SYS_COMPILER
 
@@ -3633,10 +3668,10 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -3782,7 +3817,7 @@ case $host_os in
 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	then
 	  # We have reworked collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  :
 	else
 	  # We have old collect2
 	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -3941,10 +3976,10 @@ case $host_os in
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -3978,7 +4013,7 @@ case $host_os in
   freebsd-elf*)
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
     ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
+  freebsd* | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -4027,9 +4062,7 @@ case $host_os in
       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
       case $host_cpu in
-      hppa*64*|ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
         ;;
@@ -4097,7 +4130,7 @@ case $host_os in
 	;;
     esac
     ;;
-  interix3*)
+  interix[[3-9]]*)
     _LT_AC_TAGVAR(hardcode_direct, $1)=no
     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -4137,7 +4170,7 @@ case $host_os in
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
     ;;
-  linux*)
+  linux* | k*bsd*-gnu)
     case $cc_basename in
       KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -4217,6 +4250,29 @@ case $host_os in
 	# dependencies.
 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
     esac
     ;;
   lynxos*)
@@ -4255,16 +4311,20 @@ case $host_os in
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
   openbsd*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    if test -f /usr/libexec/ld.so; then
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi
-    output_verbose_link_cmd='echo'
     ;;
   osf3*)
     case $cc_basename in
@@ -4426,15 +4486,10 @@ case $host_os in
 	case $host_os in
 	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 	    ;;
 	esac
 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
@@ -4481,6 +4536,12 @@ case $host_os in
 	  fi
 
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	  *)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
 	fi
 	;;
     esac
@@ -4724,7 +4785,7 @@ $rm -f confest.$objext
 # PORTME: override above test on systems where it is broken
 ifelse([$1],[CXX],
 [case $host_os in
-interix3*)
+interix[[3-9]]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   _LT_AC_TAGVAR(predep_objects,$1)=
@@ -4732,13 +4793,46 @@ interix3*)
   _LT_AC_TAGVAR(postdeps,$1)=
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;
@@ -4787,10 +4881,17 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -4869,10 +4970,10 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -4925,7 +5026,7 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -5014,6 +5115,7 @@ if test -f "$ltmain"; then
     _LT_AC_TAGVAR(module_cmds, $1) \
     _LT_AC_TAGVAR(module_expsym_cmds, $1) \
     _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
     _LT_AC_TAGVAR(exclude_expsyms, $1) \
     _LT_AC_TAGVAR(include_expsyms, $1); do
 
@@ -5060,7 +5162,7 @@ ifelse([$1], [],
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -5385,7 +5487,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
@@ -5468,6 +5570,7 @@ fi
 # ---------------------------------
 AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
 [AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
 AC_REQUIRE([AC_PROG_NM])
 AC_REQUIRE([AC_OBJEXT])
 # Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -5504,7 +5607,7 @@ hpux*) # Its linker distinguishes data from code symbols
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
-linux*)
+linux* | k*bsd*-gnu)
   if test "$host_cpu" = ia64; then
     symcode='[[ABCDGIRSTW]]'
     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -5694,12 +5797,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # like `-m68040'.
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
@@ -5711,7 +5816,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # DJGPP does not support shared libraries at all
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -5777,7 +5882,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
+      freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -5820,7 +5925,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    ;;
 	esac
 	;;
-      linux*)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -5847,6 +5952,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -5967,13 +6080,15 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
 
@@ -5983,7 +6098,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -6041,7 +6156,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
@@ -6074,7 +6189,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -6093,6 +6208,22 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
         # All Alpha code is PIC.
         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -6102,6 +6233,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
+    rdos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
     solaris*)
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -6196,7 +6331,8 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
 # ------------------------------------
 # See if the linker supports building shared libraries.
 AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 ifelse([$1],[CXX],[
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
@@ -6213,7 +6349,7 @@ ifelse([$1],[CXX],[
     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
   ;;
   *)
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -6352,7 +6488,7 @@ EOF
       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_AC_TAGVAR(always_export_symbols, $1)=no
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -6370,7 +6506,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -6385,7 +6521,7 @@ EOF
       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -6403,13 +6539,22 @@ EOF
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -6449,7 +6594,7 @@ EOF
 
     sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
       case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
@@ -6568,7 +6713,7 @@ _LT_EOF
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+  	  :
 	  else
   	  # We have old collect2
   	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -6661,7 +6806,7 @@ _LT_EOF
       # The linker will automatically build a .lib file if we build a DLL.
       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
       # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
       _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
@@ -6703,10 +6848,10 @@ _LT_EOF
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -6746,7 +6891,7 @@ _LT_EOF
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -6868,24 +7013,28 @@ _LT_EOF
       ;;
 
     openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	   ;;
-	 *)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
@@ -6944,17 +7093,16 @@ _LT_EOF
       case $host_os in
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
@@ -7011,7 +7159,7 @@ _LT_EOF
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -7086,7 +7234,7 @@ x|xyes)
       # to ld, don't add -lc before -lgcc.
       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
         soname=conftest
@@ -7189,6 +7337,30 @@ AC_DEFUN([LT_AC_PROG_RC],
 [AC_CHECK_TOOL(RC, windres, no)
 ])
 
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+  as_executable_p='test -x'
+else
+  as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
 # NOTE: This macro has been submitted for inclusion into   #
 #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
 #  a released version of Autoconf we should remove this    #
@@ -7209,7 +7381,7 @@ do
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
@@ -7400,7 +7572,7 @@ path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
 		[$4])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff --git a/config.guess b/config.guess
index 396482d..951383e 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-07-02'
+timestamp='2007-05-17'
 
 # 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
@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -329,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -780,7 +781,7 @@ EOF
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -790,12 +791,15 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[3456]*)
-	echo i586-pc-interix${UNAME_RELEASE}
-	exit ;;
-    EM64T:Interix*:[3456]*)
-	echo x86_64-unknown-interix${UNAME_RELEASE}
-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86) 
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -950,6 +954,9 @@ EOF
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa:Linux:*:*)
+    	echo xtensa-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
@@ -1208,6 +1215,15 @@ EOF
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
diff --git a/config.h.in b/config.h.in
index 05e4479..795b5ac 100644..100755
--- a/config.h.in
+++ b/config.h.in
@@ -191,6 +191,9 @@
    slash. */
 #undef LSTAT_FOLLOWS_SLASHED_SYMLINK
 
+/* Define for MP4 lib with multiple image support */
+#undef NEWMP4
+
 /* Name of package */
 #undef PACKAGE
 
diff --git a/config.h.mingw b/config.h.mingw
index 27046e8..48f0ce0 100755..100644
--- a/config.h.mingw
+++ b/config.h.mingw
@@ -337,11 +337,13 @@
 /* Define if you have the resolv library (-lresolv).  */
 /* #undef HAVE_LIBRESOLV */
 
+
+
 /* Name of package */
 #define PACKAGE "easytag"
 
 /* Version number of package */
-#define VERSION "2.1.3"
+#define VERSION "2.1.4"
 
 /* Define if you have the iconv() function. */
 /* #undef HAVE_ICONV */
@@ -375,10 +377,10 @@
 #define HAVE_NSS 1
 /*#define HAVE_GNUTLS 1*/
 
+
 /*
- * Following are added for Win32 version of Gaim
+ * Following are added for Win32 version of EasyTAG
  */
-
 #define HAVE_VSNPRINTF
 
 #define ENABLE_ID3LIB 1
@@ -408,8 +410,12 @@
 /* Define to 1 if you have the `vorbisfile' library (-lvorbisfile). */
 #define HAVE_LIBVORBISFILE 1
 
+/* Define for Ogg Vorbis support */
 #define ENABLE_OGG 1
 
+/* Define for Speex support (-lspeex) */
+#define ENABLE_SPEEX 1
+
 /* Define for FLAC support */
 #define ENABLE_FLAC 1
 
@@ -425,4 +431,7 @@
 /* Define to 1 if you have the `mp4v2' library (-lmp4v2). */
 #define HAVE_LIBMP4V2 1
 
+/* Define for MP4 libmp4v2 >= 1.6 */
+#define NEW_MP4 1
+
 #define HAVE_GLIB_H 1
diff --git a/config.sub b/config.sub
index fab0aa3..c060f44 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-09-20'
+timestamp='2007-04-29'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@ case $basic_machine in
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore \
+	| maxq | mb | microblaze | mcore | mep \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -324,7 +324,7 @@ case $basic_machine in
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
@@ -683,6 +683,10 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -925,6 +929,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1219,7 +1226,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1414,6 +1421,9 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
diff --git a/configure b/configure
index 56a139a..5504c10 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for easytag 2.1.3.
+# Generated by GNU Autoconf 2.61 for easytag 2.1.4.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='easytag'
 PACKAGE_TARNAME='easytag'
-PACKAGE_VERSION='2.1.3'
-PACKAGE_STRING='easytag 2.1.3'
+PACKAGE_VERSION='2.1.4'
+PACKAGE_STRING='easytag 2.1.4'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src/easytag.h"
@@ -1432,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.3 to adapt to many kinds of systems.
+\`configure' configures easytag 2.1.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1502,7 +1502,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of easytag 2.1.3:";;
+     short | recursive ) echo "Configuration of easytag 2.1.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1629,7 +1629,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-easytag configure 2.1.3
+easytag configure 2.1.4
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1643,7 +1643,7 @@ 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.3, which was
+It was created by easytag $as_me 2.1.4, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2334,7 +2334,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='easytag'
- VERSION='2.1.3'
+ VERSION='2.1.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2481,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 sr sr@Latn 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 zh_TW"
 GETTEXT_PACKAGE=easytag
 
 
@@ -4557,7 +4557,7 @@ do
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
@@ -4960,8 +4960,8 @@ else
 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 recognize dependent libraries" >&5
+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5002,16 +5002,22 @@ cygwin*)
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -5049,7 +5055,7 @@ hpux10.20* | hpux11*)
   esac
   ;;
 
-interix3*)
+interix[3-9]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
   ;;
@@ -5065,7 +5071,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -5099,6 +5105,10 @@ osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -5186,7 +5196,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5189 "configure"' > conftest.$ac_ext
+  echo '#line 5199 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5221,7 +5231,8 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -5232,6 +5243,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
@@ -5247,7 +5261,11 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
       esac
       ;;
     *64-bit*)
+      libsuff=64
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -6563,24 +6581,27 @@ else
     fi
     ;;
   *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
 	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 
@@ -6597,6 +6618,7 @@ 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; }
@@ -6634,7 +6656,7 @@ hpux*) # Its linker distinguishes data from code symbols
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
-linux*)
+linux* | k*bsd*-gnu)
   if test "$host_cpu" = ia64; then
     symcode='[ABCDGIRSTW]'
     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -7185,7 +7207,7 @@ test -z "$STRIP" && STRIP=:
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
@@ -7385,10 +7407,10 @@ objext=o
 objext=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 
 # If no C compiler was specified, use CC.
@@ -7403,13 +7425,13 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -7429,7 +7451,7 @@ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -7440,11 +7462,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:7443: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7465: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7447: \$? = $ac_status" >&5
+   echo "$as_me:7469: \$? = $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.
@@ -7495,13 +7517,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
@@ -7511,7 +7535,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -7569,7 +7593,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -7602,7 +7626,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl='-Wl,'
@@ -7621,6 +7645,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -7630,6 +7670,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@ -7697,7 +7741,7 @@ if test "${lt_prog_compiler_pic_works+set}" = set; then
 else
   lt_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -7708,11 +7752,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:7711: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7755: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7715: \$? = $ac_status" >&5
+   echo "$as_me:7759: \$? = $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.
@@ -7761,7 +7805,7 @@ else
   lt_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -7801,7 +7845,7 @@ else
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -7812,11 +7856,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:7815: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7859: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7819: \$? = $ac_status" >&5
+   echo "$as_me:7863: \$? = $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
@@ -8008,7 +8052,7 @@ EOF
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -8026,7 +8070,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
@@ -8041,7 +8085,7 @@ EOF
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -8059,13 +8103,22 @@ EOF
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	ld_shlibs=no
@@ -8224,7 +8277,7 @@ _LT_EOF
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct=unsupported
@@ -8298,11 +8351,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && 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; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -8357,11 +8417,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && 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; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -8415,7 +8482,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes=yes
       ;;
@@ -8457,10 +8524,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -8500,7 +8567,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -8622,24 +8689,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     openbsd*)
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs=no
       fi
       ;;
 
@@ -8698,17 +8769,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs=yes
       ;;
@@ -8765,7 +8835,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag='${wl}-z,text'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
@@ -8842,7 +8912,7 @@ x|xyes)
       { 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
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -8900,17 +8970,55 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
+
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
@@ -9070,12 +9178,8 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -9092,18 +9196,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -9141,7 +9233,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -9204,7 +9296,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -9259,7 +9351,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -9272,32 +9364,13 @@ linux*)
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
-
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 9280 "configure"' > conftest.$ac_ext
-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 
   # 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/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -9309,18 +9382,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -9402,6 +9463,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -9555,6 +9620,7 @@ else
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
          { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
        else
@@ -10141,7 +10207,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10144 "configure"
+#line 10210 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10241,7 +10307,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10244 "configure"
+#line 10310 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10439,6 +10505,7 @@ if test -f "$ltmain"; then
     module_cmds \
     module_expsym_cmds \
     lt_cv_prog_compiler_c_o \
+    fix_srcfile_path \
     exclude_expsyms \
     include_expsyms; do
 
@@ -10483,7 +10550,7 @@ echo "$as_me: creating $ofile" >&6;}
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -10807,7 +10874,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols
@@ -10976,10 +11043,10 @@ objext=o
 objext_CXX=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -10995,13 +11062,13 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -11260,7 +11327,7 @@ case $host_os in
 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	then
 	  # We have reworked collect2
-	  hardcode_direct_CXX=yes
+	  :
 	else
 	  # We have old collect2
 	  hardcode_direct_CXX=unsupported
@@ -11334,11 +11401,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && 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; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -11394,11 +11468,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && 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; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -11517,10 +11598,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
           module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -11554,7 +11635,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
   freebsd-elf*)
     archive_cmds_need_lc_CXX=no
     ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
+  freebsd* | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     ld_shlibs_CXX=yes
@@ -11603,9 +11684,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_libdir_separator_CXX=:
 
       case $host_cpu in
-      hppa*64*|ia64*)
-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
 	export_dynamic_flag_spec_CXX='${wl}-E'
         ;;
@@ -11673,7 +11752,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	;;
     esac
     ;;
-  interix3*)
+  interix[3-9]*)
     hardcode_direct_CXX=no
     hardcode_shlibpath_var_CXX=no
     hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
@@ -11713,7 +11792,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
     hardcode_libdir_separator_CXX=:
     ;;
-  linux*)
+  linux* | k*bsd*-gnu)
     case $cc_basename in
       KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -11793,6 +11872,29 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	# dependencies.
 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  no_undefined_flag_CXX=' -zdefs'
+	  archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
     esac
     ;;
   lynxos*)
@@ -11831,16 +11933,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ld_shlibs_CXX=no
     ;;
   openbsd*)
-    hardcode_direct_CXX=yes
-    hardcode_shlibpath_var_CXX=no
-    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      export_dynamic_flag_spec_CXX='${wl}-E'
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    if test -f /usr/libexec/ld.so; then
+      hardcode_direct_CXX=yes
+      hardcode_shlibpath_var_CXX=no
+      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	export_dynamic_flag_spec_CXX='${wl}-E'
+	whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      ld_shlibs_CXX=no
     fi
-    output_verbose_link_cmd='echo'
     ;;
   osf3*)
     case $cc_basename in
@@ -12002,15 +12108,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	case $host_os in
 	  solaris2.[0-5] | solaris2.[0-5].*) ;;
 	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+	    whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
 	    ;;
 	esac
 	link_all_deplibs_CXX=yes
@@ -12057,6 +12158,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  fi
 
 	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+	  *)
+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
 	fi
 	;;
     esac
@@ -12248,7 +12355,7 @@ $rm -f confest.$objext
 
 # PORTME: override above test on systems where it is broken
 case $host_os in
-interix3*)
+interix[3-9]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   predep_objects_CXX=
@@ -12256,13 +12363,46 @@ interix3*)
   postdeps_CXX=
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    postdeps_CXX='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;
@@ -12299,12 +12439,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       # like `-m68040'.
       lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
@@ -12316,7 +12458,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -12382,7 +12524,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
+      freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -12425,7 +12567,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    ;;
 	esac
 	;;
-      linux*)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -12452,6 +12594,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -12566,7 +12716,7 @@ if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
 else
   lt_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -12577,11 +12727,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:12580: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12730: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12584: \$? = $ac_status" >&5
+   echo "$as_me:12734: \$? = $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.
@@ -12630,7 +12780,7 @@ else
   lt_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -12670,7 +12820,7 @@ else
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -12681,11 +12831,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:12684: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12834: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12688: \$? = $ac_status" >&5
+   echo "$as_me:12838: \$? = $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
@@ -12751,7 +12901,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
     export_symbols_cmds_CXX="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
   ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -12782,7 +12932,7 @@ x|xyes)
       { 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
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -12840,20 +12990,7 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -13010,12 +13147,7 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -13032,18 +13164,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -13081,7 +13201,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -13144,7 +13264,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -13199,7 +13319,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -13212,32 +13332,13 @@ linux*)
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
-
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 13220 "configure"' > conftest.$ac_ext
-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 
   # 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/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -13249,18 +13350,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -13342,6 +13431,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -13536,6 +13629,7 @@ if test -f "$ltmain"; then
     module_cmds_CXX \
     module_expsym_cmds_CXX \
     lt_cv_prog_compiler_c_o_CXX \
+    fix_srcfile_path_CXX \
     exclude_expsyms_CXX \
     include_expsyms_CXX; do
 
@@ -13856,7 +13950,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_CXX
@@ -13947,10 +14041,17 @@ objext=o
 objext_F77=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -13966,13 +14067,13 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -14059,13 +14160,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
       ;;
 
@@ -14075,7 +14178,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_F77='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -14133,7 +14236,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
@@ -14166,7 +14269,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_F77='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_F77='-Wl,'
@@ -14185,6 +14288,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static_F77='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -14194,6 +14313,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_F77='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static_F77='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
@@ -14261,7 +14384,7 @@ if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
 else
   lt_prog_compiler_pic_works_F77=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_F77"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -14272,11 +14395,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:14275: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14398: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14279: \$? = $ac_status" >&5
+   echo "$as_me:14402: \$? = $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.
@@ -14325,7 +14448,7 @@ else
   lt_prog_compiler_static_works_F77=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -14365,7 +14488,7 @@ else
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -14376,11 +14499,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:14379: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14502: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14383: \$? = $ac_status" >&5
+   echo "$as_me:14506: \$? = $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
@@ -14572,7 +14695,7 @@ EOF
       allow_undefined_flag_F77=unsupported
       always_export_symbols_F77=no
       enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -14590,7 +14713,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct_F77=no
       hardcode_shlibpath_var_F77=no
       hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
@@ -14605,7 +14728,7 @@ EOF
       archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -14623,13 +14746,22 @@ EOF
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	ld_shlibs_F77=no
@@ -14788,7 +14920,7 @@ _LT_EOF
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct_F77=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct_F77=unsupported
@@ -14852,11 +14984,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && 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; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -14901,11 +15040,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && 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; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -14959,7 +15105,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_F77='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_F77=yes
       ;;
@@ -15001,10 +15147,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -15044,7 +15190,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
@@ -15166,24 +15312,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     openbsd*)
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_F77='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_F77=yes
+	hardcode_shlibpath_var_F77=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_F77='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_F77='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_F77='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs_F77=no
       fi
       ;;
 
@@ -15242,17 +15392,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs_F77=yes
       ;;
@@ -15309,7 +15458,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag_F77='${wl}-z,text'
       archive_cmds_need_lc_F77=no
       hardcode_shlibpath_var_F77=no
@@ -15386,7 +15535,7 @@ x|xyes)
       { 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
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -15444,20 +15593,7 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -15614,12 +15750,7 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -15636,18 +15767,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -15685,7 +15804,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -15748,7 +15867,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -15803,7 +15922,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -15816,32 +15935,13 @@ linux*)
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
-
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 15824 "configure"' > conftest.$ac_ext
-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 
   # 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/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -15853,18 +15953,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -15946,6 +16034,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -16140,6 +16232,7 @@ if test -f "$ltmain"; then
     module_cmds_F77 \
     module_expsym_cmds_F77 \
     lt_cv_prog_compiler_c_o_F77 \
+    fix_srcfile_path_F77 \
     exclude_expsyms_F77 \
     include_expsyms_F77; do
 
@@ -16460,7 +16553,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_F77
@@ -16518,10 +16611,10 @@ objext=o
 objext_GCJ=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -16537,13 +16630,13 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -16584,7 +16677,7 @@ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -16595,11 +16688,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:16598: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16691: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16602: \$? = $ac_status" >&5
+   echo "$as_me:16695: \$? = $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.
@@ -16650,13 +16743,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
       ;;
 
@@ -16666,7 +16761,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_GCJ='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -16724,7 +16819,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
@@ -16757,7 +16852,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_GCJ='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_GCJ='-Wl,'
@@ -16776,6 +16871,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static_GCJ='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -16785,6 +16896,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_GCJ='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static_GCJ='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@ -16852,7 +16967,7 @@ if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
 else
   lt_prog_compiler_pic_works_GCJ=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -16863,11 +16978,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:16866: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16981: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16870: \$? = $ac_status" >&5
+   echo "$as_me:16985: \$? = $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.
@@ -16916,7 +17031,7 @@ else
   lt_prog_compiler_static_works_GCJ=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -16956,7 +17071,7 @@ else
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -16967,11 +17082,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:16970: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17085: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16974: \$? = $ac_status" >&5
+   echo "$as_me:17089: \$? = $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
@@ -17163,7 +17278,7 @@ EOF
       allow_undefined_flag_GCJ=unsupported
       always_export_symbols_GCJ=no
       enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -17181,7 +17296,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct_GCJ=no
       hardcode_shlibpath_var_GCJ=no
       hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
@@ -17196,7 +17311,7 @@ EOF
       archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -17214,13 +17329,22 @@ EOF
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	ld_shlibs_GCJ=no
@@ -17379,7 +17503,7 @@ _LT_EOF
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct_GCJ=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct_GCJ=unsupported
@@ -17453,11 +17577,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && 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; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -17512,11 +17643,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && 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; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -17570,7 +17708,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_GCJ='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_GCJ=yes
       ;;
@@ -17612,10 +17750,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -17655,7 +17793,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_GCJ='-R$libdir'
       hardcode_direct_GCJ=yes
@@ -17777,24 +17915,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     openbsd*)
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_GCJ='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_GCJ=yes
+	hardcode_shlibpath_var_GCJ=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_GCJ='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs_GCJ=no
       fi
       ;;
 
@@ -17853,17 +17995,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs_GCJ=yes
       ;;
@@ -17920,7 +18061,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag_GCJ='${wl}-z,text'
       archive_cmds_need_lc_GCJ=no
       hardcode_shlibpath_var_GCJ=no
@@ -17997,7 +18138,7 @@ x|xyes)
       { 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
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -18055,20 +18196,7 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -18225,12 +18353,7 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -18247,18 +18370,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -18296,7 +18407,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -18359,7 +18470,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -18414,7 +18525,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -18427,32 +18538,13 @@ linux*)
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
-
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 18435 "configure"' > conftest.$ac_ext
-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 
   # 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/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -18464,18 +18556,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -18557,6 +18637,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -18751,6 +18835,7 @@ if test -f "$ltmain"; then
     module_cmds_GCJ \
     module_expsym_cmds_GCJ \
     lt_cv_prog_compiler_c_o_GCJ \
+    fix_srcfile_path_GCJ \
     exclude_expsyms_GCJ \
     include_expsyms_GCJ; do
 
@@ -19071,7 +19156,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_GCJ
@@ -19128,7 +19213,7 @@ objext=o
 objext_RC=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -19147,13 +19232,13 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -19231,6 +19316,7 @@ if test -f "$ltmain"; then
     module_cmds_RC \
     module_expsym_cmds_RC \
     lt_cv_prog_compiler_c_o_RC \
+    fix_srcfile_path_RC \
     exclude_expsyms_RC \
     include_expsyms_RC; do
 
@@ -19551,7 +19637,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_RC
@@ -19756,6 +19842,90 @@ fi
 
 
 
+{ 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
+  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; }
+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
+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
+
+
+case $host_os in
+  *mingw32* ) MINGW32=yes;;
+	  * ) MINGW32=no;;
+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
+  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; }
+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
+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
+
+
+case $host_os in
+  *cygwin* ) CYGWIN=yes;;
+	 * ) CYGWIN=no;;
+esac
+
 
 # Check whether --enable-mp3 was given.
 if test "${enable_mp3+set}" = set; then
@@ -19949,7 +20119,7 @@ fi
 
 fi
 if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.7
+	_pkg_min_version=0.16
 	{ 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
@@ -20625,7 +20795,7 @@ Alternatively, you may set the environment variables GTK_CFLAGS
 and GTK_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&5
 echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -20635,7 +20805,7 @@ Alternatively, you may set the environment variables GTK_CFLAGS
 and GTK_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
@@ -21989,8 +22159,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 
         #include <id3.h>
         #include <stdio.h>
-        int
-        main ()
+        int main ()
         {
             FILE *output;
             output=fopen("conftest.id3","w");
@@ -22231,6 +22400,114 @@ echo "${ECHO_T}no" >&6; }
         echo "*** (Install libmp4v2 to enable it)"
         echo "***"
     else
+
+                LIBS_SAVE="$LIBS"
+        CFLAGS_SAVE="$CFLAGS"
+        LIBS="$LIBS $LIBMP4V2_LIBS"
+        CFLAGS="$CFLAGS $LIBMP4V2_CFLAGS"
+        { echo "$as_me:$LINENO: checking for libmp4v2 version" >&5
+echo $ECHO_N "checking for libmp4v2 version... $ECHO_C" >&6; }
+            if test "$cross_compiling" = yes; then
+  echo $ac_n "cross compiling; assuming ${LIBMP4V2_NAME}-${LIBMP4V2_VERSION} $ac_c"
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+                #include <stdio.h>
+                #include <mpeg4ip_config.h>
+                int main (void)
+                {
+                    FILE *output;
+                    output=fopen("conftest.mp4v2","w");
+                    fprintf(output,"LIBMP4V2_NAME=%s\nLIBMP4V2_VERSION=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
+                    fclose(output);
+                    exit(0);
+                }
+
+_ACEOF
+rm -f 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>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (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
+  . ./conftest.mp4v2; echo "${LIBMP4V2_NAME}-${LIBMP4V2_VERSION}"
+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 )
+{ echo "$as_me:$LINENO: WARNING: could not determine libmp4v2 version" >&5
+echo "$as_me: WARNING: could not determine libmp4v2 version" >&2;}
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+        LIBS="$LIBS_SAVE"
+        CFLAGS="$CFLAGS_SAVE"
+        if test "$LIBMP4V2_VERSION" != ""; then
+            LIBMP4V2_VERSION="($LIBMP4V2_NAME-$LIBMP4V2_VERSION)"
+        fi
+
+                cat >conftest.$ac_ext <<_ACEOF
+
+           #include <mp4.h>
+           main () {
+           MP4FileHandle hFile;
+           MP4GetMetadataCoverArt(hFile, NULL, NULL,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); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+
+cat >>confdefs.h <<\_ACEOF
+#define NEWMP4 1
+_ACEOF
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
         { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 
@@ -26183,7 +26460,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by easytag $as_me 2.1.3, which was
+This file was extended by easytag $as_me 2.1.4, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26236,7 +26513,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-easytag config.status 2.1.3
+easytag config.status 2.1.4
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -27222,7 +27499,7 @@ echo ID3v2.3 tags support ....: $enable_id3v23 $ID3LIB_VERSION
 echo Ogg Vorbis file support .: $enable_ogg
 echo Speex file support ......: $enable_speex
 echo FLAC file support .......: $enable_flac $LIBFLAC_VERSION
-echo MP4 file support ........: $enable_mp4 $MPEG4IP_VERSION
+echo MP4 file support ........: $enable_mp4 $LIBMP4V2_VERSION
 echo WavPack support .........: $enable_wavpack
 echo NLS/gettext .............: $USE_NLS
 echo Install path ............: $prefix
diff --git a/configure.in b/configure.in
index 452e45c..efedcd3 100644..100755
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl AC_INIT(src/easytag.h)
 AC_PREREQ(2.53)
 
 dnl To set also in config.h.mingw
-AC_INIT(easytag, 2.1.3) dnl defines ($PACKAGE, $VERSION)
+AC_INIT(easytag, 2.1.4) dnl defines ($PACKAGE, $VERSION)
 
 AC_CONFIG_SRCDIR(src/easytag.h)
 dnl -------------------------------
@@ -15,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 sr sr@Latn 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 zh_TW"
 GETTEXT_PACKAGE=easytag
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
@@ -33,6 +33,11 @@ AC_PROG_LIBTOOL
 AC_ISC_POSIX
 AM_MAINTAINER_MODE
 
+dnl -------------------------
+dnl Handle mingw32 or cygwin
+dnl -------------------------
+AC_MINGW32
+AC_CYGWIN
 
 dnl -------------------------------
 dnl Configure switches.
@@ -278,8 +283,7 @@ if test "x$enable_mp3" = "xyes"; then
               AC_TRY_RUN([
         #include <id3.h>
         #include <stdio.h>
-        int 
-        main ()
+        int main ()
         {
             FILE *output;
             output=fopen("conftest.id3","w");
@@ -313,7 +317,6 @@ dnl ################################################
 if test "x$enable_mp4" = "xyes"; then
     dnl Librairies required for mp4 files, if not found 'enable_mp4' is disabled
     AC_CHECK_LIB(m, cos)
-    dnl AC_CHECK_LIB(mp4v2, MP4Read, , mp4_available=no)
     AC_CHECK_LIB(mp4v2, MP4GetTrackMediaDataName, , mp4_available=no)
 fi
 
@@ -327,6 +330,39 @@ if test "x$enable_mp4" = "xyes"; then
         echo "*** (Install libmp4v2 to enable it)"
         echo "***"
     else
+
+        dnl Check version of mpeg4ip installed
+        LIBS_SAVE="$LIBS"
+        CFLAGS_SAVE="$CFLAGS"
+        LIBS="$LIBS $LIBMP4V2_LIBS"
+        CFLAGS="$CFLAGS $LIBMP4V2_CFLAGS"
+        AC_MSG_CHECKING(for libmp4v2 version)
+            AC_TRY_RUN([
+                #include <stdio.h>
+                #include <mpeg4ip_config.h>
+                int main (void)
+                {
+                    FILE *output;
+                    output=fopen("conftest.mp4v2","w");
+                    fprintf(output,"LIBMP4V2_NAME=%s\nLIBMP4V2_VERSION=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
+                    fclose(output);
+                    exit(0);
+                }
+            ], . ./conftest.mp4v2; echo "${LIBMP4V2_NAME}-${LIBMP4V2_VERSION}", AC_MSG_WARN(could not determine libmp4v2 version),[echo $ac_n "cross compiling; assuming ${LIBMP4V2_NAME}-${LIBMP4V2_VERSION} $ac_c"])
+        LIBS="$LIBS_SAVE"
+        CFLAGS="$CFLAGS_SAVE"
+        if test "$LIBMP4V2_VERSION" != ""; then
+            LIBMP4V2_VERSION="($LIBMP4V2_NAME-$LIBMP4V2_VERSION)"
+        fi
+
+        dnl Version 1.6 of libmp4v2 introduces an index argument for MP4GetMetadataCoverart. So we define 'NEWMP4' if it is the case
+        AC_COMPILE_IFELSE([
+           #include <mp4.h>
+           main () {
+           MP4FileHandle hFile;
+           MP4GetMetadataCoverArt(hFile, NULL, NULL,0); }
+        ], AC_DEFINE(NEWMP4,1,[Define for MP4 lib with multiple image support]),)
+
         AC_MSG_RESULT(yes)
         AC_DEFINE(ENABLE_MP4,1,[Define for MP4 support])
     fi
@@ -456,7 +492,7 @@ echo ID3v2.3 tags support ....: $enable_id3v23 $ID3LIB_VERSION
 echo Ogg Vorbis file support .: $enable_ogg
 echo Speex file support ......: $enable_speex
 echo FLAC file support .......: $enable_flac $LIBFLAC_VERSION
-echo MP4 file support ........: $enable_mp4 $MPEG4IP_VERSION
+echo MP4 file support ........: $enable_mp4 $LIBMP4V2_VERSION
 echo WavPack support .........: $enable_wavpack
 echo NLS/gettext .............: $USE_NLS
 echo Install path ............: $prefix
diff --git a/debian/changelog b/debian/changelog
index 0e65f3e..4e8c9ba 100755..100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,14 @@
-easytag (2.1.2-1) unstable; urgency=low
+easytag (2.1.3-1) unstable; urgency=low
+
+  * New upstream version
+  * debian/easytag.xpm, debian/rules:
+    - use the upstream icon version
+  * easytag.desktop:
+    - use the correct icon naming
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 25 Nov 2007 16:15:43 +0100
+
+ easytag (2.1.2-1) unstable; urgency=low
 
   * New upstream version:
     - Fixed a mistake in the configure script (Closes: #432257)
diff --git a/debian/rules b/debian/rules
index 8a20d2b..0331e93 100755..100644
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,3 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 DEB_MAKE_INVOKE := $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR)
 
 DEB_INSTALL_MANPAGES_easytag := debian/easytag.1
-
-binary-install/easytag::
-	cp debian/easytag.xpm debian/easytag/usr/share/pixmaps/
diff --git a/doc/EasyTAG_Documentation_sv.html b/doc/EasyTAG_Documentation_sv.html
index 510b18a..510b18a 100644..100755
--- a/doc/EasyTAG_Documentation_sv.html
+++ b/doc/EasyTAG_Documentation_sv.html
diff --git a/easytag-win32-installer.nsi b/easytag-win32-installer.nsi
new file mode 100755
index 0000000..ad295d3
--- /dev/null
+++ b/easytag-win32-installer.nsi
@@ -0,0 +1,335 @@
+;-------------------------------------------------------------

+; Script generated by the HM NIS Edit Script Wizard.

+;

+; Installer script for win32 EasyTAG (inspired of win32 Pidgin installer script

+; Original Author: Jerome COUDERC <easytag@gmail.com>

+;

+; Install "NSIS 2.33" :

+;         http://nsis.sourceforge.net/Download

+; Install "HM NIS EDIT: A Free NSIS Editor/IDE"

+;         http://prdownloads.sourceforge.net/hmne/nisedit2.0.3.exe?download

+;

+; Online documentation :

+;        English : http://nsis.sourceforge.net/Docs/

+;                  http://nsis.sourceforge.net/Docs/Modern%20UI/Readme.html

+;                  http://forums.winamp.com/forumdisplay.php?s=&forumid=65

+;        French  : http://www.veekee.net/wikinsis/docs/

+;-------------------------------------------------------------

+

+; HM NIS Edit Wizard helper defines

+!define PRODUCT_NAME             "EasyTAG"

+!define PRODUCT_VERSION          "2.1.4"

+!define PRODUCT_PUBLISHER        "J�r�me COUDERC"

+!define PRODUCT_WEB_SITE         "http://easytag.sourceforge.net"

+!define PRODUCT_DIR_REGKEY       "Software\Microsoft\Windows\CurrentVersion\App Paths\easytag.exe"

+!define PRODUCT_UNINST_KEY       "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

+!define PRODUCT_UNINST_ROOT_KEY  "HKLM"

+!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"

+

+SetCompressor /SOLID lzma

+ShowInstDetails show

+ShowUninstDetails show

+

+; MUI 1.67 compatible ------

+!include "MUI.nsh"

+!include "Sections.nsh"

+;!include "WinVer.nsh" ; Version of Windows used...

+

+; MUI Settings

+!define MUI_ABORTWARNING

+!define MUI_COMPONENTSPAGE_SMALLDESC

+!define MUI_ICON                        ".\src\win32\nsis\easytag-install.ico"

+!define MUI_UNICON                      "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" ;".\pixmaps\EasyTAG.ico"

+

+; Modern UI Configuration

+!define MUI_HEADERIMAGE

+!define MUI_HEADERIMAGE_BITMAP_NOSTRETCH

+!define MUI_HEADERIMAGE_BITMAP          ".\src\win32\nsis\easytag-header.bmp"

+!define MUI_WELCOMEFINISHPAGE_BITMAP    ".\src\win32\nsis\easytag-install.bmp"

+!define MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH

+!define MUI_UNWELCOMEFINISHPAGE_BITMAP  ".\src\win32\nsis\easytag-uninstall.bmp"

+

+

+; Language Selection Dialog Settings

+!define MUI_LANGDLL_REGISTRY_ROOT      "${PRODUCT_UNINST_ROOT_KEY}"

+!define MUI_LANGDLL_REGISTRY_KEY       "${PRODUCT_UNINST_KEY}"

+!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"

+

+; Version resource

+VIProductVersion "0.0.0.0"

+VIAddVersionKey "ProductName"     "${PRODUCT_NAME}"

+VIAddVersionKey "FileVersion"     "${PRODUCT_VERSION}"

+VIAddVersionKey "ProductVersion"  "${PRODUCT_VERSION}"

+VIAddVersionKey "LegalCopyright"  ""

+VIAddVersionKey "FileDescription" "${PRODUCT_NAME} Installer"

+

+; Welcome page

+!insertmacro MUI_PAGE_WELCOME

+

+; License page

+!insertmacro MUI_PAGE_LICENSE "./COPYING"

+

+; Components page

+!insertmacro MUI_PAGE_COMPONENTS

+

+; Directory page

+!insertmacro MUI_PAGE_DIRECTORY

+

+; Start menu page

+var ICONS_GROUP

+!define MUI_STARTMENUPAGE_NODISABLE

+!define MUI_STARTMENUPAGE_DEFAULTFOLDER      "${PRODUCT_NAME}"

+!define MUI_STARTMENUPAGE_REGISTRY_ROOT      "${PRODUCT_UNINST_ROOT_KEY}"

+!define MUI_STARTMENUPAGE_REGISTRY_KEY       "${PRODUCT_UNINST_KEY}"

+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"

+!insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP

+

+; Instfiles page

+!insertmacro MUI_PAGE_INSTFILES

+

+; Finish page

+!define MUI_FINISHPAGE_RUN           "$INSTDIR\easytag.exe"

+!define MUI_FINISHPAGE_RUN_NOTCHECKED

+!define MUI_FINISHPAGE_SHOWREADME    "$INSTDIR\README.txt"

+!define MUI_FINISHPAGE_LINK          "${PRODUCT_NAME} Web site"

+!define MUI_FINISHPAGE_LINK_LOCATION "http://easytag.sourceforge.net"

+!insertmacro MUI_PAGE_FINISH

+

+; Uninstaller pages

+!insertmacro MUI_UNPAGE_WELCOME

+!insertmacro MUI_UNPAGE_CONFIRM

+!insertmacro MUI_UNPAGE_INSTFILES

+!insertmacro MUI_UNPAGE_FINISH

+

+; Language files

+!insertmacro MUI_LANGUAGE "Afrikaans"

+!insertmacro MUI_LANGUAGE "Albanian"

+!insertmacro MUI_LANGUAGE "Arabic"

+!insertmacro MUI_LANGUAGE "Basque"

+!insertmacro MUI_LANGUAGE "Belarusian"

+!insertmacro MUI_LANGUAGE "Bosnian"

+!insertmacro MUI_LANGUAGE "Breton"

+!insertmacro MUI_LANGUAGE "Bulgarian"

+!insertmacro MUI_LANGUAGE "Catalan"

+!insertmacro MUI_LANGUAGE "Croatian"

+!insertmacro MUI_LANGUAGE "Czech"

+!insertmacro MUI_LANGUAGE "Danish"

+!insertmacro MUI_LANGUAGE "Dutch"

+!insertmacro MUI_LANGUAGE "English"

+!insertmacro MUI_LANGUAGE "Estonian"

+!insertmacro MUI_LANGUAGE "Farsi"

+!insertmacro MUI_LANGUAGE "Finnish"

+!insertmacro MUI_LANGUAGE "French"

+!insertmacro MUI_LANGUAGE "Galician"

+!insertmacro MUI_LANGUAGE "German"

+!insertmacro MUI_LANGUAGE "Greek"

+!insertmacro MUI_LANGUAGE "Hebrew"

+!insertmacro MUI_LANGUAGE "Hungarian"

+!insertmacro MUI_LANGUAGE "Icelandic"

+!insertmacro MUI_LANGUAGE "Indonesian"

+!insertmacro MUI_LANGUAGE "Irish"

+!insertmacro MUI_LANGUAGE "Italian"

+!insertmacro MUI_LANGUAGE "Japanese"

+!insertmacro MUI_LANGUAGE "Korean"

+!insertmacro MUI_LANGUAGE "Kurdish"

+!insertmacro MUI_LANGUAGE "Latvian"

+!insertmacro MUI_LANGUAGE "Lithuanian"

+!insertmacro MUI_LANGUAGE "Luxembourgish"

+!insertmacro MUI_LANGUAGE "Macedonian"

+!insertmacro MUI_LANGUAGE "Malay"

+!insertmacro MUI_LANGUAGE "Mongolian"

+!insertmacro MUI_LANGUAGE "Norwegian"

+!insertmacro MUI_LANGUAGE "NorwegianNynorsk"

+!insertmacro MUI_LANGUAGE "Polish"

+!insertmacro MUI_LANGUAGE "Portuguese"

+!insertmacro MUI_LANGUAGE "PortugueseBR"

+!insertmacro MUI_LANGUAGE "Romanian"

+!insertmacro MUI_LANGUAGE "Russian"

+!insertmacro MUI_LANGUAGE "Serbian"

+!insertmacro MUI_LANGUAGE "SerbianLatin"

+!insertmacro MUI_LANGUAGE "SimpChinese"

+!insertmacro MUI_LANGUAGE "Slovak"

+!insertmacro MUI_LANGUAGE "Slovenian"

+!insertmacro MUI_LANGUAGE "Spanish"

+!insertmacro MUI_LANGUAGE "SpanishInternational"

+!insertmacro MUI_LANGUAGE "Swedish"

+!insertmacro MUI_LANGUAGE "Thai"

+!insertmacro MUI_LANGUAGE "TradChinese"

+!insertmacro MUI_LANGUAGE "Turkish"

+!insertmacro MUI_LANGUAGE "Ukrainian"

+!insertmacro MUI_LANGUAGE "Uzbek"

+!insertmacro MUI_LANGUAGE "Welsh"

+

+; MUI end ------

+

+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"

+OutFile "easytag-${PRODUCT_VERSION}-setup.exe"

+InstallDir "$PROGRAMFILES\EasyTAG"

+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""

+ShowInstDetails show

+ShowUnInstDetails show

+

+Function .onInit

+  !insertmacro MUI_LANGDLL_DISPLAY ; Open the language selection window

+FunctionEnd

+

+

+;------------------------------------

+; EasyTAG executable install Section

+;------------------------------------

+Section "Program" SecProgram

+  SectionIn 1 RO ; User can't remove it!

+  

+  SetOutPath "$INSTDIR"

+  SetOverwrite on

+  File "win32-install-dir\easytag.exe"

+  File "win32-install-dir\easytag.dll"

+  File "win32-install-dir\*.dll"

+  File "win32-install-dir\*.txt"

+

+  ; Shortcuts

+  ;!insertmacro MUI_STARTMENU_WRITE_BEGIN Application

+  ;CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"

+  ;CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\EasyTAG ${PRODUCT_VERSION}.lnk" "$INSTDIR\easytag.exe"

+  ;!insertmacro MUI_STARTMENU_WRITE_END

+SectionEnd

+

+;------------------------------------

+; EasyTAG shortcut install Section

+;------------------------------------

+SectionGroup /e "Shortcuts" SecShortcuts

+  Section /o "Desktop" SecDesktopShortcut

+    SetOverwrite on

+    CreateShortCut "$DESKTOP\${PRODUCT_NAME} ${PRODUCT_VERSION}.lnk" "$INSTDIR\easytag.exe"

+    SetOverwrite off

+  SectionEnd

+  

+  Section "Start Menu" SecStartMenuShortcut

+    SetOverwrite on

+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application

+    CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"

+    CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\${PRODUCT_NAME} ${PRODUCT_VERSION}.lnk" "$INSTDIR\easytag.exe"

+    !insertmacro MUI_STARTMENU_WRITE_END

+    SetOverwrite off

+  SectionEnd

+

+  Section "Context Menu" SecContextMenuShortcut

+    SetOverwrite on

+    WriteRegStr HKCR "Directory\shell\EasyTAG"         "" "Browse with EasyTAG"

+    WriteRegStr HKCR "Directory\shell\EasyTAG\Command" "" "$INSTDIR\easytag.exe"

+    SetOverwrite off

+  SectionEnd

+SectionGroupEnd

+

+

+;------------------------------------

+; Documentation install Section

+;------------------------------------

+Section "Documentation" SecDocumentation

+  SetOutPath "$INSTDIR\documentation"

+  SetOverwrite on

+  File "doc\EasyTAG_Documentation*.html"

+  File /r "doc\users_guide_*"

+

+  ; Shortcuts

+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application

+  CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"

+  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\EasyTAG Documentation.lnk" "$INSTDIR\documentation\EasyTAG_Documentation.html"

+  !insertmacro MUI_STARTMENU_WRITE_END

+SectionEnd

+

+;------------------------------------

+; Translation install Section

+;------------------------------------

+Section "Translations" SecTranslations

+  SetOutPath "$INSTDIR\locale"

+  SetOverwrite on

+  File /r "win32-install-dir\locale\"

+

+  ; Shortcuts

+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application

+  CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"

+  !insertmacro MUI_STARTMENU_WRITE_END

+SectionEnd

+

+Section -AdditionalIcons

+  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application

+  WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"

+  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"

+  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall ${PRODUCT_NAME}.lnk" "$INSTDIR\uninst.exe"

+  !insertmacro MUI_STARTMENU_WRITE_END

+SectionEnd

+

+Section -Post

+  WriteUninstaller "$INSTDIR\uninst.exe"

+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\easytag.exe"

+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"

+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"

+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\easytag.exe"

+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"

+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"

+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"

+SectionEnd

+

+; Section descriptions

+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN

+  !insertmacro MUI_DESCRIPTION_TEXT ${SecProgram}           "Main files"

+  !insertmacro MUI_DESCRIPTION_TEXT ${SecDocumentation}     "Some documentation how to use the program"

+  !insertmacro MUI_DESCRIPTION_TEXT ${SecTranslations}      "Translation catalogs"

+  !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts}         "Shortcuts to create"

+  !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopShortcut}   "Create a shortcut to the program on the desktop"

+  !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenuShortcut} "Create a shortcuts in the start menu"

+!insertmacro MUI_FUNCTION_DESCRIPTION_END

+

+

+;------------------------------------

+; Uninstall Section

+;------------------------------------

+Section Uninstall

+  !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP

+  Delete "$INSTDIR\${PRODUCT_NAME}.url"

+  Delete "$INSTDIR\uninst.exe"

+  Delete "$INSTDIR\easytag.dll"

+  Delete "$INSTDIR\easytag.exe"

+  Delete "$INSTDIR\*.dll"

+  Delete "$INSTDIR\*.txt"

+  RMDir /r "$INSTDIR\Documentation\" ; Remove all files in documentation directory...

+  RMDir /r "$INSTDIR\locale\" 

+

+  Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall ${PRODUCT_NAME}.lnk"

+  Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"

+  Delete "$SMPROGRAMS\$ICONS_GROUP\EasyTAG ${PRODUCT_VERSION}.lnk"

+  Delete "$SMPROGRAMS\$ICONS_GROUP\EasyTAG Documentation.lnk"

+

+  Delete "$DESKTOP\EasyTAG ${PRODUCT_VERSION}.lnk"

+

+  RMDir "$SMPROGRAMS\$ICONS_GROUP"

+  RMDir "$INSTDIR"

+

+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"

+  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"

+

+  ; Delete personnals settings?

+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \

+             "Do you want to remove yours personnals settings?" IDYES deletesettings IDNO dontdeletesettings

+  deletesettings:

+    ; Get 'Application Data' user's directory

+    ReadRegStr $R0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "AppData"

+    RMDir /r "$R0\.easytag"

+  dontdeletesettings:

+

+  SetAutoClose true

+SectionEnd

+

+

+;Function un.onUninstSuccess

+;  HideWindow

+;  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."

+;FunctionEnd

+

+Function un.onInit

+!insertmacro MUI_UNGETLANGUAGE

+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2

+  Abort

+FunctionEnd

+

diff --git a/easytag.desktop b/easytag.desktop
index b6c2534..a5da65f 100644..100755
--- a/easytag.desktop
+++ b/easytag.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=EasyTAG
+GenericName=Audio File Tag Viewer/Editor
 Comment=EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, Ogg Vorbis, MusePack and Monkey's Audio files, with a GTK+ GUI.
 Comment[cs]=EasyTAG je utilita na prohlížení, editaci a zápis tagů do vašich MP3, MP2, FLAC, Ogg Vorbis, MusePack a Monkey Audio souborů.
 Comment[da]=Et program til at vise/redigere MP3 og Ogg Vorbis tags med et GTK+ interface.
@@ -12,14 +13,14 @@ Comment[ja]=EasyTAG は MP3, MP2, FLAC, Ogg Vorbis, MusePack と Monkey's オー
 Comment[nl]=EasyTAG is een programma voor het bewerken van tags van MP2-, MP3-, FLAC-, Ogg Vorbis, MusePack en Monkeys Audio-bestanden. Dit gebeurt in een verzorgde GTK+-omgeving.
 Comment[pl]=EasyTAG jest narzędziem do przeglądania, edytowania i zapisywania tagów w plikach MP3, MP2, FLAC, Ogg Vorbis, MusePack i Monkey's Audio. Jego prosty i miły interface wykonany w GTK+ ułatwia tagowanie.
 Comment[ro]=EasyTAG este un utilitar pentru afisarea, modificarea si scrierea etichtelor fisierelor MP3, MP2, FLAC, Ogg Vorbis, MusePack si Monkey Audio. Interfata sa simpla (GTK+) face etichetarea mai simpla.
-Comment[ru]=EasyTAG -- ЩРН ОПНЦПЮЛЛЮ ДКЪ ОПНЯЛНРПЮ Х ПЕДЮЙРХПНБЮМХЪ РЕЦНБ Б ТЮИКЮУ MP3, MP2, FLAC, MusePack, APE Х Ogg Vorbis Я СДНАМШЛ ХМРЕПТЕИЯНЛ GTK+ ДКЪ GNU/Linux.
+Comment[ru]=EasyTAG -- это программа для просмотра и редактирования тегов в файлах MP3, MP2, FLAC, MusePack, APE и Ogg Vorbis с удобным интерфейсом GTK+ для GNU/Linux.
 Comment[sv]=EasyTAG är ett verktyg för att undersöka, editera och skriva taggar för dina MP3-, MP2-, FLAC- och Ogg Vorbis-filer, och använder ett enkelt och trevligt GTK+-gränssnitt.
 Comment[uk]=EasyTAG - утиліта для перегляду, редагування та запису тегів у файли MP3, MP2, FLAC, Ogg Vorbis, MusePack та Monkey's Audio. Простий та приємний інтерфейс GTK+ допоможе процесу запису тегів.
 Exec=easytag %F
-Icon=EasyTAG.xpm
+Icon=EasyTAG_icon
 Terminal=false
 Type=Application
-Encoding=UTF-8
-Categories=Application;AudioVideo;AudioVideoEditing;
-X-Desktop-File-Install-Version=0.3
-MimeType=audio/x-mp3;application/ogg;
+Categories=AudioVideo;AudioVideoEditing;GTK;
+X-Desktop-File-Install-Version=0.14
+MimeType=audio/x-mp3;application/ogg;x-directory/normal;
+
diff --git a/easytag.spec b/easytag.spec
index 13bbe43..c64861d 100644
--- a/easytag.spec
+++ b/easytag.spec
@@ -1,5 +1,5 @@
 %define    name      easytag
-%define    version   2.1.3
+%define    version   2.1.4
 %define    release   1
 %define    prefix    /usr
 
diff --git a/easytag.spec.in b/easytag.spec.in
index ba55161..ba55161 100644..100755
--- a/easytag.spec.in
+++ b/easytag.spec.in
diff --git a/easytag.win32.setup.iss b/easytag.win32.setup.iss
deleted file mode 100644
index f78efd8..0000000
--- a/easytag.win32.setup.iss
+++ /dev/null
@@ -1,217 +0,0 @@
-; ---------------------------------------------------------

-; To build this setup follow these steps:

-;

-; - Download and install Inno Setup QuickStart Pack from

-;   http://files.jrsoftware.org/ispack/ispack-5.1.9.exe

-;

-; - Create a subdirectory named "win32-install-dir" of the

-;   directory that contains this script. Then, copy into the

-;   directory "win32-install-dir" all the EasyTAG's files

-;   (easytag.exe, easytag.dll, etc).

-;

-; - Finally open this script in Inno Setup and click on

-;   "Build -> Compile", or simply "Compile" in the context

-;   menu of the file in Windows Explorer.

-;

-; ---------------------------------------------------------

-

-; Here you can specify the current version of EasyTAG.

-#define APP_NAME 	"EasyTAG"

-#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"

-

-; Here you can specify the minimum required version of GTK+

-; and the download URL for the Windows version.

-#define GTK_VERSION  "2.8"

-#define GTK_DOWNLOAD "http://sourceforge.net/project/showfiles.php?group_id=121075&package_id=132255"

-

-; Defining MULTILANGUAGE the installer will support other

-; languages, not only English. See also below in sections

-; [Languages] and [CustomMessages].

-#define MULTILANGUAGE

-

-[Setup]

-AppVerName={#APP_NAME} {#APP_VERSION}

-VersionInfoVersion={#APP_VERSION}

-AppName={#APP_NAME}

-AppPublisher={#DEV_NAME}

-AppPublisherURL={#APP_URL}

-AppSupportURL={#APP_URL}

-AppUpdatesURL={#APP_URL}

-AppCopyright={#DEV_NAME}

-VersionInfoCopyright=This program is open-source!

-DefaultDirName={pf}\{#APP_NAME}

-DefaultGroupName={#APP_NAME}

-UninstallDisplayIcon={app}\{#APP_NAME}.exe,0

-DisableStartupPrompt=yes

-DirExistsWarning=no

-OutputDir=.\

-OutputBaseFilename={#APP_NAME_2}-{#APP_VERSION}

-Compression=lzma/max

-SolidCompression=yes

-AllowNoIcons=yes

-PrivilegesRequired=poweruser

-ShowLanguageDialog=auto

-

-WizardImageFile=compiler:WizModernImage-IS.bmp

-WizardSmallImageFile=compiler:WizModernSmallImage-IS.bmp

-

-; Here you can specify which languages are available for the setup

-; GUI. Additional languages can be found at this location:

-; http://www.jrsoftware.org/files/istrans/

-[Languages]

-Name: en; MessagesFile: compiler:Default.isl

-#ifdef MULTILANGUAGE

-Name: cs; MessagesFile: compiler:Languages\Czech.isl

-Name: da; MessagesFile: compiler:Languages\Danish.isl

-Name: de; MessagesFile: compiler:Languages\German.isl

-Name: es; MessagesFile: compiler:Languages\Spanish.isl

-Name: fr; MessagesFile: compiler:Languages\French.isl

-Name: hu; MessagesFile: compiler:Languages\Hungarian.isl

-Name: it; MessagesFile: compiler:Languages\Italian.isl

-#endif

-

-; These are the labels displayed in the wizard and not contained in

-; the Inno Setup's translation files

-[CustomMessages]

-; ** ENGLISH **

-en.FoldersLink=Add {#APP_NAME} to folders' context menu

-en.MissingGTK=The GTK+ libraries v{#GTK_VERSION} (or above) are not installed. Would you like do download them now?

-#ifdef MULTILANGUAGE

-; ** CZECH **

-cs.FoldersLink=Pridat {#APP_NAME} do kontextov�ho menu adres�re

-cs.MissingGTK=Knihovny GTK+ v{#GTK_VERSION} (nebo vy���) nejsou nainstalov�ny. Chcete je nyn� st�hnout?

-; ** DANISH **

-da.FoldersLink=Tilf�j {#APP_NAME} til mappers h�jre-klik menu

-da.MissingGTK=GTK+ bibliotekerne v{#GTK_VERSION} (eller h�jere) er ikke installeret. Vil du hente dem nu?

-; ** GERMAN **

-de.FoldersLink=F�ge {#APP_NAME} zum Kontextmen� von Ordnern hinzu

-de.MissingGTK=GTK+ v{#GTK_VERSION} (oder neuer) ist nicht installiert. Wollen sie es jetzt herunterladen?

-; ** SPANISH ** ---> NOT TRANSLATED YET! <---

-es.FoldersLink=Add {#APP_NAME} to folders' context menu

-es.MissingGTK=The GTK+ libraries v{#GTK_VERSION} (or above) are not installed. Would you like do download them now?

-; ** FRENCH **

-fr.FoldersLink=Ajouter {#APP_NAME} au menu contextuel des dossiers

-fr.MissingGTK=La librairie GTK+ v{#GTK_VERSION} (ou sup�rieure) n'est pas install�e. Voulez-vous la t�l�charger maintenant?

-; ** HUNGARIAN **

-hu.FoldersLink=K�lso program {#APP_NAME} be�p�t�se a men�szerkezetbe

-hu.MissingGTK=A GTK+ {#GTK_VERSION} (vagy nagyobb) k�rnyezet nincs telep�tve. Szeretn� most let�lteni?

-; ** ITALIAN **

-it.FoldersLink=Aggiungi {#APP_NAME} al men� contestuale delle cartelle

-it.MissingGTK=Le librerie GTK+ v{#GTK_VERSION} (o superiore) non sono installate. Vuoi scaricarle adesso?

-#endif

-

-[Files]

-Source: .\win32-install-dir\*; DestDir: {app}; Flags: ignoreversion recursesubdirs; Tasks: ; Languages: 

-

-[Tasks]

-Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}

-;Name: desktopicon\common; Description: "For all users"; GroupDescription: {cm:AdditionalIcons}; Flags: exclusive

-;Name: desktopicon\user; Description: "For the current user only"; GroupDescription: {cm:AdditionalIcons}; Flags: exclusive unchecked

-Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked

-Name: folderslink; Description: {cm:FoldersLink}; GroupDescription: {cm:AdditionalIcons}

-

-[Registry]

-Root: HKCR; Subkey: Directory\shell\{#APP_NAME}; Flags: uninsdeletekey dontcreatekey

-Root: HKCR; Subkey: Directory\shell\{#APP_NAME}; ValueType: string; ValueName: ; ValueData: {#APP_NAME}; Tasks: folderslink

-Root: HKCR; Subkey: Directory\shell\{#APP_NAME}\Command; ValueType: string; ValueName: ; ValueData: """{app}\{#APP_NAME}.exe"" ""%1"""; Tasks: folderslink

-

-[Icons]

-Name: {group}\{#APP_NAME} {#APP_VERSION}; Filename: {app}\{#APP_NAME}.exe; WorkingDir: {app}

-Name: {group}\{cm:UninstallProgram,{#APP_NAME}}; Filename: {uninstallexe}; WorkingDir: {app}

-Name: {group}\{cm:ProgramOnTheWeb,{#APP_NAME}}; Filename: {#APP_URL}

-Name: {commondesktop}\{#APP_NAME}; Filename: {app}\{#APP_NAME}.exe; WorkingDir: {app}; Tasks: desktopicon

-

-[Run]

-Filename: {app}\{#APP_NAME}.exe; Description: {cm:LaunchProgram,{#APP_NAME} {#APP_VERSION}}; Flags: nowait postinstall skipifsilent

-

-[Code]

-// Parse a version string in a array of Integer ('1.2.3.4' -> [1,2,3,4])

-// -- taken from the Inno Setup forum --

-procedure DecodeVersion(i_oStrVersion: String; var o_panVersion: array of Integer);

-var

-  l_nIndex   : Integer;

-  l_nPos     : Integer;

-  l_oStrTemp : String;

-begin

-  o_panVersion := [0,0,0,0];

-

-  l_nIndex := 0;

-  while ((Length(i_oStrVersion) > 0) and (l_nIndex < 4)) do begin

-    l_nPos := pos('.', i_oStrVersion);

-    if l_nPos > 0 then begin

-      if l_nPos = 1 then begin

-        l_oStrTemp := '0'

-      end else begin

-        l_oStrTemp := Copy(i_oStrVersion, 1, l_nPos - 1);

-      end;

-

-      o_panVersion[l_nIndex] := StrToIntDef(l_oStrTemp, 0);

-      l_nIndex := l_nIndex + 1;

-      i_oStrVersion := Copy(i_oStrVersion, l_nPos + 1, Length(i_oStrVersion));

-    end else begin

-      o_panVersion[l_nIndex] := StrToIntDef(i_oStrVersion, 0);

-      i_oStrVersion := '';

-    end;

-  end;

-end;

-

-// Compare two array of Integer from their string counterpart

-// -- taken from the Inno Setup forum --

-function CompareVersion(i_oStrVersionDest, i_oStrVersionFrom: String) : Integer;

-var

-  l_anVersionDest : array of Integer;

-  l_anVersionFrom : array of Integer;

-  l_nIndex        : Integer;

-begin

-  SetArrayLength(l_anVersionDest, 4);

-  DecodeVersion(i_oStrVersionDest, l_anVersionDest);

-

-  SetArrayLength(l_anVersionFrom, 4);

-  DecodeVersion(i_oStrVersionFrom, l_anVersionFrom);

-

-  Result := 0;

-  l_nIndex := 0;

-

-  while ((Result = 0) and (l_nIndex < 4)) do begin

-    if l_anVersionDest[l_nIndex] > l_anVersionFrom[l_nIndex] then begin

-      Result := 1    // i_oStrVersionDest > i_oStrVersionFrom

-    end else begin

-      if l_anVersionDest[l_nIndex] < l_anVersionFrom[l_nIndex] then begin

-        Result := -1 // i_oStrVersionDest < i_oStrVersionFrom

-      end else begin

-        Result := 0; // i_oStrVersionDest = i_oStrVersionFrom

-      end;

-    end;

-

-    l_nIndex := l_nIndex + 1;

-  end;

-end;

-

-// Checks, when setup starts, if the installed version of GTK+ mathches requirements

-function InitializeSetup(): Boolean;

-var

-  iRetVal: Integer;

-  sGtkVer: String;

-begin

-  Result := True;

-  sGtkVer := '0.0.0.0';

-  RegQueryStringValue(HKLM, 'SOFTWARE\GTK\2.0', 'Version', sGtkVer);

-

-  if(CompareVersion(sGtkVer, '{#GTK_VERSION}') = -1) then begin

-    case MsgBox(CustomMessage('MissingGTK'), mbError, MB_YESNOCANCEL) of

-      IDYES: begin

-        Result := False;

-        ShellExec('open', '{#GTK_DOWNLOAD}', '', '', SW_SHOW, ewNoWait, iRetVal);

-      end

-

-      IDCANCEL: begin

-        Result := False;

-      end

-    end

-  end

-end;

-[_ISTool]

-UseAbsolutePaths=false

diff --git a/ltmain.sh b/ltmain.sh
index d70dc75..8e5a930 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,8 +1,8 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007  Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify
@@ -43,8 +43,8 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+VERSION=1.5.24
+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
 
 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -57,6 +57,8 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 else
   case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
@@ -114,10 +116,10 @@ esac
 for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
   eval "if test \"\${$lt_var+set}\" = set; then
-         save_$lt_var=\$$lt_var
-         $lt_var=C
-         export $lt_var
-       fi"
+	  save_$lt_var=\$$lt_var
+	  $lt_var=C
+	  export $lt_var
+	fi"
 done
 
 # Make sure IFS has a sensible default
@@ -206,7 +208,13 @@ func_win32_libid ()
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
       $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
-	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+	$SED -n -e '1,100{
+		/ I /{
+			s,.*,import,
+			p
+			q
+			}
+		}'`
       case $win32_nmres in
       import*)  win32_libid_type="x86 archive import";;
       *)        win32_libid_type="x86 archive static";;
@@ -340,11 +348,11 @@ func_extract_archives ()
       my_xlib_u=$my_xlib
       while :; do
         case " $extracted_archives " in
-       *" $my_xlib_u "*)
-         extracted_serial=`expr $extracted_serial + 1`
-         my_xlib_u=lt$extracted_serial-$my_xlib ;;
-       *) break ;;
-       esac
+	*" $my_xlib_u "*)
+	  extracted_serial=`expr $extracted_serial + 1`
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
       done
       extracted_archives="$extracted_archives $my_xlib_u"
       my_xdir="$my_gentop/$my_xlib_u"
@@ -474,11 +482,12 @@ do
     ;;
 
   --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+    echo "\
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
+Copyright (C) 2007  Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     exit $?
     ;;
 
@@ -775,7 +784,7 @@ if test -z "$show_help"; then
     *.class) xform=class ;;
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
+    *.[fF][09]?) xform=[fF][09]. ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
     *.obj) xform=obj ;;
@@ -1160,8 +1169,8 @@ EOF
     do
       case $arg in
       -all-static | -static | -static-libtool-libs)
-    case $arg in
-    -all-static)
+	case $arg in
+	-all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1170,19 +1179,19 @@ EOF
 	  fi
 	  prefer_static_libs=yes
 	  ;;
-    -static)
+	-static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
 	  ;;
-    -static-libtool-libs)
-      if test -z "$pic_flag" && test -n "$link_static_flag"; then
-        dlopen_self=$dlopen_self_static
-      fi
-      prefer_static_libs=yes
-      ;;
-    esac
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1630,7 +1639,7 @@ EOF
 	continue
 	;;
 
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	compiler_flags="$compiler_flags $arg"
 	compile_command="$compile_command $arg"
 	finalize_command="$finalize_command $arg"
@@ -1650,10 +1659,11 @@ EOF
       # -m* pass through architecture-specific compiler args for GCC
       # -m*, -t[45]*, -txscale* pass through architecture-specific
       # compiler args for GCC
-      # -pg pass through profiling flag for GCC
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
       # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-      -t[45]*|-txscale*|@*)
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
@@ -1681,9 +1691,9 @@ EOF
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
 	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
+	  # and Darwin in order for the loader to find any dlls it needs.
 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
 	  fast_install=no
@@ -2124,7 +2134,7 @@ EOF
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -2520,9 +2530,9 @@ EOF
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-         { { test "$prefer_static_libs" = no ||
-             test "$prefer_static_libs,$installed" = "built,yes"; } ||
-           test -z "$old_library"; }; then
+	     { { test "$prefer_static_libs" = no ||
+		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -3229,9 +3239,10 @@ EOF
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
+	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_minor"
+	    lt_irix_increment=no
 	    ;;
 	  esac
 	  ;;
@@ -3290,7 +3301,8 @@ EOF
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
 	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
 	  ;;
 
 	freebsd-aout)
@@ -3304,8 +3316,11 @@ EOF
 	  ;;
 
 	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    major=`expr $current - $age`
+	  else
+	    major=`expr $current - $age + 1`
+	  fi
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
@@ -3442,11 +3457,11 @@ EOF
       fi
 
       # Eliminate all temporary directories.
-#      for path in $notinst_path; do
-#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-#      done
+      #for path in $notinst_path; do
+      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3547,7 +3562,7 @@ EOF
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
@@ -3909,7 +3924,10 @@ EOF
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	      case $archive_cmds in
+	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
+	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
+	      esac
 	    else
 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
 	    fi
@@ -4275,7 +4293,7 @@ EOF
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -5295,6 +5313,8 @@ if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
 else
   case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
@@ -6391,8 +6411,10 @@ relink_command=\"$relink_command\""
 	if test -f "$dir/$objdir/$dlname"; then
 	  dir="$dir/$objdir"
 	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
+	  if test ! -f "$dir/$dlname"; then
+	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
 	fi
 	;;
 
@@ -6458,12 +6480,11 @@ relink_command=\"$relink_command\""
       # Restore saved environment variables
       for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
       do
-       eval "if test \"\${save_$lt_var+set}\" = set; then
-               $lt_var=\$save_$lt_var; export $lt_var
-             fi"
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+		$lt_var=\$save_$lt_var; export $lt_var
+	      fi"
       done
 
-
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
     else
diff --git a/pixmaps/add.xpm b/pixmaps/add.xpm
deleted file mode 100755
index 7803c0f..0000000
--- a/pixmaps/add.xpm
+++ /dev/null
@@ -1,212 +0,0 @@
-/* XPM */
-static char * add_xpm[] = {
-"20 20 189 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #222221",
-"@ 	c #28261D",
-"# 	c #272419",
-"$ 	c #251F10",
-"% 	c #0C0A05",
-"& 	c #020202",
-"* 	c #CCC9B9",
-"= 	c #F1DF9F",
-"- 	c #EACF82",
-"; 	c #DBAC44",
-"> 	c #493916",
-", 	c #CABF95",
-"' 	c #EED680",
-") 	c #E4C059",
-"! 	c #D1940C",
-"~ 	c #463104",
-"{ 	c #514F44",
-"] 	c #A39D83",
-"^ 	c #E5DDBA",
-"/ 	c #A37309",
-"( 	c #6C4C05",
-"_ 	c #23221D",
-": 	c #AEA88C",
-"< 	c #EFDC96",
-"[ 	c #AC7909",
-"} 	c #2F2102",
-"| 	c #151515",
-"1 	c #A9A181",
-"2 	c #EED888",
-"3 	c #E1BE59",
-"4 	c #A2730A",
-"5 	c #302509",
-"6 	c #4B4E4B",
-"7 	c #5F655F",
-"8 	c #192A19",
-"9 	c #AAA17C",
-"0 	c #B69E54",
-"a 	c #574D27",
-"b 	c #556355",
-"c 	c #2D3E2D",
-"d 	c #5F625F",
-"e 	c #646A64",
-"f 	c #708270",
-"g 	c #4F5E4F",
-"h 	c #142D14",
-"i 	c #10300A",
-"j 	c #5E5B45",
-"k 	c #818F81",
-"l 	c #96AA96",
-"m 	c #6A846A",
-"n 	c #546654",
-"o 	c #334433",
-"p 	c #343634",
-"q 	c #797E79",
-"r 	c #848F84",
-"s 	c #557255",
-"t 	c #1A431A",
-"u 	c #042304",
-"v 	c #001C00",
-"w 	c #135813",
-"x 	c #859485",
-"y 	c #ACBEAC",
-"z 	c #A0B4A0",
-"A 	c #8BA28B",
-"B 	c #748C74",
-"C 	c #657D65",
-"D 	c #344134",
-"E 	c #7B7E7B",
-"F 	c #BFCABF",
-"G 	c #A9B6A9",
-"H 	c #687F68",
-"I 	c #3A5E3A",
-"J 	c #2F582F",
-"K 	c #2C572C",
-"L 	c #426E42",
-"M 	c #98AF98",
-"N 	c #94AC94",
-"O 	c #87A087",
-"P 	c #779477",
-"Q 	c #799479",
-"R 	c #758D75",
-"S 	c #293B29",
-"T 	c #696D69",
-"U 	c #BAC2BA",
-"V 	c #E5EBE5",
-"W 	c #E1E9E1",
-"X 	c #C9D3C9",
-"Y 	c #9DAD9D",
-"Z 	c #758E75",
-"` 	c #5E7B5E",
-" .	c #5A7A5A",
-"..	c #7F997F",
-"+.	c #809A80",
-"@.	c #819A81",
-"#.	c #869D86",
-"$.	c #859A85",
-"%.	c #6E866E",
-"&.	c #546B54",
-"*.	c #2A3A2A",
-"=.	c #6C766C",
-"-.	c #D0DBD0",
-";.	c #E6EDE6",
-">.	c #DEE7DE",
-",.	c #CDDACD",
-"'.	c #B6C6B6",
-").	c #95A995",
-"!.	c #648064",
-"~.	c #879F87",
-"{.	c #90A690",
-"].	c #8EA48E",
-"^.	c #7F977F",
-"/.	c #6F886F",
-"(.	c #647F64",
-"_.	c #4D714D",
-":.	c #164216",
-"<.	c #000C00",
-"[.	c #768076",
-"}.	c #B0BBB0",
-"|.	c #D4DCD4",
-"1.	c #D6E0D6",
-"2.	c #D0DED0",
-"3.	c #C7D4C7",
-"4.	c #9CAE9C",
-"5.	c #647E64",
-"6.	c #8C9F8C",
-"7.	c #91A691",
-"8.	c #859D85",
-"9.	c #779177",
-"0.	c #446044",
-"a.	c #1B381B",
-"b.	c #001700",
-"c.	c #4F594E",
-"d.	c #668266",
-"e.	c #9DAC9D",
-"f.	c #B5C3B5",
-"g.	c #94A694",
-"h.	c #4D6C4D",
-"i.	c #698369",
-"j.	c #506D50",
-"k.	c #778C77",
-"l.	c #789078",
-"m.	c #4B6F4B",
-"n.	c #1E281E",
-"o.	c #0A140A",
-"p.	c #1E221D",
-"q.	c #6C856C",
-"r.	c #5A765A",
-"s.	c #5E795E",
-"t.	c #2B5E2B",
-"u.	c #496C49",
-"v.	c #748E74",
-"w.	c #3A5F3A",
-"x.	c #4A654A",
-"y.	c #295229",
-"z.	c #091709",
-"A.	c #001600",
-"B.	c #010101",
-"C.	c #7B8D79",
-"D.	c #829881",
-"E.	c #6A866A",
-"F.	c #627F62",
-"G.	c #6E886E",
-"H.	c #839B83",
-"I.	c #486A48",
-"J.	c #255725",
-"K.	c #063306",
-"L.	c #042B04",
-"M.	c #032F03",
-"N.	c #0E320E",
-"O.	c #0E100E",
-"P.	c #536152",
-"Q.	c #6B7C6A",
-"R.	c #819781",
-"S.	c #8EA78E",
-"T.	c #567556",
-"U.	c #456945",
-"V.	c #214421",
-"W.	c #113A11",
-"X.	c #262D26",
-"Y.	c #455145",
-"Z.	c #6B7C6B",
-"`.	c #93AA92",
-" +	c #4C654C",
-".+	c #2B3E2B",
-"++	c #111B11",
-"@+	c #374036",
-"#+	c #202B20",
-"                . + @ # $ %             ",
-"                & * = - ; >             ",
-"            . . . , ' ) ! ~ . .         ",
-"            . { ] ^ ' ) ! / ( .         ",
-"              _ : < ' ) ! [ }           ",
-"                | 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.v       ",
-"        B.C.D.E.F.G.H.I.J.K.L.M.N.      ",
-"          O.P.Q.R.8.S.T.U.V.W..         ",
-"              X.Y.Z.`. +.+++            ",
-"                    @+#+                ",
-"                                        "};
diff --git a/pixmaps/album.xpm b/pixmaps/album.xpm
new file mode 100755
index 0000000..89564b7
--- /dev/null
+++ b/pixmaps/album.xpm
@@ -0,0 +1,289 @@
+/* XPM */

+static char * album_xpm[] = {

+"24 24 262 2",

+"  	c None",

+". 	c #7CAE7E",

+"+ 	c #70A872",

+"@ 	c #549757",

+"# 	c #57975A",

+"$ 	c #629E65",

+"% 	c #70A973",

+"& 	c #81B682",

+"* 	c #73A975",

+"= 	c #448847",

+"- 	c #3F8042",

+"; 	c #3C7B40",

+"> 	c #3E7C41",

+", 	c #427E45",

+"' 	c #468149",

+") 	c #4B834D",

+"! 	c #528B55",

+"~ 	c #639F67",

+"{ 	c #93BE95",

+"] 	c #659F68",

+"^ 	c #3F8143",

+"/ 	c #408043",

+"( 	c #448348",

+"_ 	c #4A864C",

+": 	c #4E8951",

+"< 	c #538D56",

+"[ 	c #58905B",

+"} 	c #5E9460",

+"| 	c #629765",

+"1 	c #679A6A",

+"2 	c #70A574",

+"3 	c #89BB8C",

+"4 	c #AFCEB0",

+"5 	c #5EA163",

+"6 	c #4C8F4E",

+"7 	c #509254",

+"8 	c #559659",

+"9 	c #5A995E",

+"0 	c #609C63",

+"a 	c #66A169",

+"b 	c #6BA56E",

+"c 	c #70A874",

+"d 	c #76AC79",

+"e 	c #7BB07E",

+"f 	c #81B484",

+"g 	c #87B889",

+"h 	c #8DBB8F",

+"i 	c #97C39A",

+"j 	c #7CAF7F",

+"k 	c #5DA360",

+"l 	c #63A666",

+"m 	c #68AA6C",

+"n 	c #6DAD71",

+"o 	c #73B076",

+"p 	c #78B37B",

+"q 	c #7DB680",

+"r 	c #83B985",

+"s 	c #88BC8B",

+"t 	c #8DBF90",

+"u 	c #92C295",

+"v 	c #98C59A",

+"w 	c #9DC89F",

+"x 	c #A2CBA5",

+"y 	c #A7CFAA",

+"z 	c #B2D5B4",

+"A 	c #6AAB6E",

+"B 	c #6EAD71",

+"C 	c #7DB681",

+"D 	c #83B986",

+"E 	c #93C295",

+"F 	c #9DC9A0",

+"G 	c #A2CCA5",

+"H 	c #A8CFAA",

+"I 	c #ADD2AF",

+"J 	c #B8D8B9",

+"K 	c #BDDBBF",

+"L 	c #C7E1C9",

+"M 	c #90B993",

+"N 	c #79B37C",

+"O 	c #7EB681",

+"P 	c #89BD8B",

+"Q 	c #8EC091",

+"R 	c #93C396",

+"S 	c #98C69B",

+"T 	c #9EC9A0",

+"U 	c #A3CCA5",

+"V 	c #ADD2B0",

+"W 	c #B3D5B5",

+"X 	c #B8D8BA",

+"Y 	c #C3DEC4",

+"Z 	c #C8E1C9",

+"` 	c #CDE4CF",

+" .	c #D2E7D4",

+"..	c #DAE6DB",

+"+.	c #86BB88",

+"@.	c #89BD8C",

+"#.	c #99C69B",

+"$.	c #A3CCA6",

+"%.	c #A8CFAB",

+"&.	c #ACBEAC",

+"*.	c #AFB2AF",

+"=.	c #B5B6B5",

+"-.	c #BBC2BB",

+";.	c #C6DBC7",

+">.	c #C8E1CA",

+",.	c #CDE5CF",

+"'.	c #D3E8D4",

+").	c #D8EBD9",

+"!.	c #DDEEDE",

+"~.	c #E2F1E4",

+"{.	c #E8F3E9",

+"].	c #94C396",

+"^.	c #9EC9A1",

+"/.	c #A9CFAB",

+"(.	c #AED2B0",

+"_.	c #B4C2B4",

+":.	c #C8C8C8",

+"<.	c #DDDDDD",

+"[.	c #E2E2E2",

+"}.	c #D9D9D9",

+"|.	c #C7C7C7",

+"1.	c #D9E8DA",

+"2.	c #DDEEDF",

+"3.	c #E3F1E4",

+"4.	c #E8F4E9",

+"5.	c #3B793E",

+"6.	c #437F46",

+"7.	c #4C854F",

+"8.	c #A4CCA6",

+"9.	c #A9D0AB",

+"0.	c #AED3B1",

+"a.	c #B4D6B6",

+"b.	c #B9D9BB",

+"c.	c #BEDCC0",

+"d.	c #C4DFC5",

+"e.	c #BCBFBC",

+"f.	c #E5E5E5",

+"g.	c #E1E1E1",

+"h.	c #DDE0DD",

+"i.	c #3C793F",

+"j.	c #448047",

+"k.	c #4D8650",

+"l.	c #558C58",

+"m.	c #5E9360",

+"n.	c #669969",

+"o.	c #96B397",

+"p.	c #7E897E",

+"q.	c #BFDCC0",

+"r.	c #C4DFC6",

+"s.	c #C9E2CB",

+"t.	c #CEE5D0",

+"u.	c #D4E8D5",

+"v.	c #CBCDCB",

+"w.	c #EAEAEA",

+"x.	c #637565",

+"y.	c #568D58",

+"z.	c #5E9361",

+"A.	c #679969",

+"B.	c #6FA072",

+"C.	c #78A67A",

+"D.	c #80AC83",

+"E.	c #A1BDA2",

+"F.	c #CAE2CB",

+"G.	c #CFE5D0",

+"H.	c #D4E9D6",

+"I.	c #D9ECDB",

+"J.	c #DFEFE0",

+"K.	c #E4F2E5",

+"L.	c #D6D9D6",

+"M.	c #819182",

+"N.	c #70A072",

+"O.	c #78A67B",

+"P.	c #81AC83",

+"Q.	c #89B38B",

+"R.	c #92B994",

+"S.	c #9BBF9C",

+"T.	c #AEC4B0",

+"U.	c #D6E9D8",

+"V.	c #DAECDB",

+"W.	c #E9F5EB",

+"X.	c #3D7B40",

+"Y.	c #568A59",

+"Z.	c #A0B7A1",

+"`.	c #8AB38C",

+" +	c #93BA95",

+".+	c #9BC09D",

+"++	c #A4C6A6",

+"@+	c #ACCDAE",

+"#+	c #B5D3B6",

+"$+	c #BCCBBC",

+"%+	c #C9D1CA",

+"&+	c #EAF5EB",

+"*+	c #3E7B41",

+"=+	c #4F8852",

+"-+	c #578E5A",

+";+	c #609462",

+">+	c #689A6B",

+",+	c #77A279",

+"'+	c #8CA28D",

+")+	c #849384",

+"!+	c #869486",

+"~+	c #A2B7A3",

+"{+	c #9CC09D",

+"]+	c #A4C7A6",

+"^+	c #ADCDAE",

+"/+	c #B5D3B7",

+"(+	c #BEDABF",

+"_+	c #C6E0C8",

+":+	c #CFE6D0",

+"<+	c #C5D1C5",

+"[+	c #425243",

+"}+	c #508852",

+"|+	c #588E5B",

+"1+	c #619563",

+"2+	c #699B6C",

+"3+	c #72A174",

+"4+	c #7AA87D",

+"5+	c #83AE85",

+"6+	c #8BB48D",

+"7+	c #94BB96",

+"8+	c #9DC19E",

+"9+	c #A5C7A7",

+"0+	c #AECEAF",

+"a+	c #B6D4B8",

+"b+	c #BFDAC0",

+"c+	c #C7E0C8",

+"d+	c #D0E7D1",

+"e+	c #D3E9D4",

+"f+	c #D4E9D5",

+"g+	c #80A482",

+"h+	c #72A275",

+"i+	c #7BA87D",

+"j+	c #8CB58E",

+"k+	c #9DC19F",

+"l+	c #A6C8A7",

+"m+	c #AECEB0",

+"n+	c #B7D4B8",

+"o+	c #C9D8CA",

+"p+	c #98BA9A",

+"q+	c #95BB97",

+"r+	c #9DC29F",

+"s+	c #A6C8A8",

+"t+	c #C0DBC1",

+"u+	c #D1E7D2",

+"v+	c #424942",

+"w+	c #B4D2B5",

+"x+	c #B8D5B9",

+"y+	c #C0DBC2",

+"z+	c #C9E2CA",

+"A+	c #D1E8D2",

+"B+	c #BECBBE",

+"C+	c #737D73",

+"D+	c #D3E8D5",

+"E+	c #D4E9D4",

+"F+	c #A7B3A7",

+"G+	c #B1BFB3",

+"H+	c #D5E9D6",

+"I+	c #808981",

+"J+	c #BBC9BC",

+"K+	c #CFE1D0",

+"L+	c #C3D2C4",

+"M+	c #8F9B8F",

+"                                                ",

+"                . + @ # $ % &                   ",

+"            * = - ; > , ' ) ! ~ {               ",

+"          ] ^ / ( _ : < [ } | 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 o p C D s t E v F G H I z J K L       ",

+"    M N O D P Q R S T U H V W X K Y Z `  ...    ",

+"    +.@.Q R #.T $.%.&.*.=.-.;.>.,.'.).!.~.{.    ",

+"    ].#.^.$./.(.W _.:.<.[.}.|.1.2.3.4.5.6.7.    ",

+"    8.9.0.a.b.c.d.e.f.g.    g.h.i.j.k.l.m.n.o.  ",

+"  p.a.b.q.r.s.t.u.v.w.        x.y.z.A.B.C.D.E.  ",

+"    r.F.G.H.I.J.K.L.          M.N.O.P.Q.R.S.T.  ",

+"    U.V.J.K.W.X.' Y.          Z.`. +.+++@+#+$+  ",

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

+"    [+}+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+e+f+    ",

+"      g+h+i+5+j+7+k+l+m+n+b+Z d+e+e+e+e+e+o+    ",

+"        p+q+r+s+m+n+t+Z u+e+e+e+e+e+e+e+f+      ",

+"        v+w+x+y+z+A+e+e+e+e+e+e+e+e+e+e+B+      ",

+"          C+D+e+e+e+e+e+e+e+e+e+e+e+E+F+        ",

+"              G+f+e+e+e+e+e+e+e+e+H+I+          ",

+"                  J+K+'.e+e+D+L+M+              ",

+"                                                ",

+"                                                "};

diff --git a/pixmaps/artist.xpm b/pixmaps/artist.xpm
new file mode 100755
index 0000000..a1cdf90
--- /dev/null
+++ b/pixmaps/artist.xpm
@@ -0,0 +1,220 @@
+/* XPM */

+static char * artist_xpm[] = {

+"24 24 193 2",

+"  	c None",

+". 	c #1D1802",

+"+ 	c #2C2502",

+"@ 	c #2C2300",

+"# 	c #221C00",

+"$ 	c #211C00",

+"% 	c #655A26",

+"& 	c #D5B935",

+"* 	c #F7D636",

+"= 	c #F7D530",

+"- 	c #F0CD23",

+"; 	c #CCAC11",

+"> 	c #4F4100",

+", 	c #1A1500",

+"' 	c #8E813D",

+") 	c #F9DE5B",

+"! 	c #F9E067",

+"~ 	c #F9E069",

+"{ 	c #F9DF60",

+"] 	c #F8DB4E",

+"^ 	c #F7D637",

+"/ 	c #F6D11C",

+"( 	c #846E00",

+"_ 	c #1B1700",

+": 	c #48411E",

+"< 	c #F9E065",

+"[ 	c #FAE581",

+"} 	c #FBEA97",

+"| 	c #FBEB9C",

+"1 	c #FAE78B",

+"2 	c #F9E270",

+"3 	c #F8DC52",

+"4 	c #F7D532",

+"5 	c #F6CF12",

+"6 	c #6A5700",

+"7 	c #B6A13E",

+"8 	c #F9E16E",

+"9 	c #FBE88E",

+"0 	c #FCEEAD",

+"a 	c #FCF0B7",

+"b 	c #FBEA9A",

+"c 	c #FAE479",

+"d 	c #F8DD59",

+"e 	c #F4D124",

+"f 	c #F2CC13",

+"g 	c #D5B100",

+"h 	c #221B00",

+"i 	c #D9BD32",

+"j 	c #F8DA4B",

+"k 	c #F7DC5B",

+"l 	c #FAE685",

+"m 	c #FAE788",

+"n 	c #FAE47C",

+"o 	c #F8DA4A",

+"p 	c #6A5C19",

+"q 	c #816C07",

+"r 	c #F5CB00",

+"s 	c #302800",

+"t 	c #211B00",

+"u 	c #CCAD14",

+"v 	c #60520E",

+"w 	c #3B3213",

+"x 	c #E4C42B",

+"y 	c #F8DB4F",

+"z 	c #F8D840",

+"A 	c #F7D42B",

+"B 	c #564813",

+"C 	c #282109",

+"D 	c #312800",

+"E 	c #201B02",

+"F 	c #413828",

+"G 	c #837064",

+"H 	c #3A311E",

+"I 	c #453A12",

+"J 	c #92790B",

+"K 	c #B99B05",

+"L 	c #D4B001",

+"M 	c #3A310D",

+"N 	c #3C3426",

+"O 	c #8D7400",

+"P 	c #1C1A16",

+"Q 	c #D4B7A2",

+"R 	c #D3B5A0",

+"S 	c #D0B39E",

+"T 	c #C4A895",

+"U 	c #907C6E",

+"V 	c #746350",

+"W 	c #5D5038",

+"X 	c #786755",

+"Y 	c #BBA18F",

+"Z 	c #201C0B",

+"` 	c #231E1B",

+" .	c #D6B8A3",

+"..	c #F4D2BA",

+"+.	c #E7C6B0",

+"@.	c #211E1A",

+"#.	c #6B5C53",

+"$.	c #806E61",

+"%.	c #0D1319",

+"&.	c #5B524A",

+"*.	c #F2D0B9",

+"=.	c #9B8677",

+"-.	c #161311",

+";.	c #060F1A",

+">.	c #2A5984",

+",.	c #25547E",

+"'.	c #0D1721",

+").	c #5C5049",

+"!.	c #B39A88",

+"~.	c #8D786B",

+"{.	c #3D342F",

+"].	c #101417",

+"^.	c #081825",

+"/.	c #0C2336",

+"(.	c #7BB4E7",

+"_.	c #93C1EB",

+":.	c #68A6DF",

+"<.	c #20415F",

+"[.	c #15181B",

+"}.	c #707070",

+"|.	c #C8C8C8",

+"1.	c #141F27",

+"2.	c #2F81CB",

+"3.	c #07141F",

+"4.	c #3C6F9D",

+"5.	c #ABCFF0",

+"6.	c #B8D7F2",

+"7.	c #90C0EB",

+"8.	c #27425B",

+"9.	c #777A7C",

+"0.	c #E9E9E9",

+"a.	c #0D1F2F",

+"b.	c #328ADA",

+"c.	c #173E62",

+"d.	c #07141E",

+"e.	c #75ADE0",

+"f.	c #B3D4F1",

+"g.	c #C6DEF5",

+"h.	c #B2D3F1",

+"i.	c #96C3EC",

+"j.	c #75B0E5",

+"k.	c #182F45",

+"l.	c #0B151F",

+"m.	c #2465A0",

+"n.	c #276CAA",

+"o.	c #05101A",

+"p.	c #081724",

+"q.	c #79B2E7",

+"r.	c #9CC7ED",

+"s.	c #A4CBEF",

+"t.	c #9BC6ED",

+"u.	c #89BCEA",

+"v.	c #71AEE5",

+"w.	c #559EE0",

+"x.	c #398EDB",

+"y.	c #2B78BD",

+"z.	c #06141F",

+"A.	c #0A1D2E",

+"B.	c #69A9E4",

+"C.	c #7EB5E8",

+"D.	c #82B8E9",

+"E.	c #70ADE5",

+"F.	c #5DA3E2",

+"G.	c #4896DE",

+"H.	c #2F82CD",

+"I.	c #071320",

+"J.	c #081826",

+"K.	c #529CE0",

+"L.	c #5DA2E2",

+"M.	c #61A5E2",

+"N.	c #539DE0",

+"O.	c #4495DD",

+"P.	c #286EAE",

+"Q.	c #05111C",

+"R.	c #07121B",

+"S.	c #205789",

+"T.	c #3C90DC",

+"U.	c #3F91DC",

+"V.	c #348BDA",

+"W.	c #3289D9",

+"X.	c #102D46",

+"Y.	c #051119",

+"Z.	c #102D47",

+"`.	c #276CAB",

+" +	c #2669A6",

+".+	c #0C2337",

+"++	c #07111B",

+"@+	c #071521",

+"#+	c #0A1B2B",

+"$+	c #0B1E31",

+"%+	c #0A1C2B",

+"&+	c #081623",

+"*+	c #06111C",

+"                                                ",

+"                  . + @ # $                     ",

+"                % & * = - ; > ,                 ",

+"              ' ) ! ~ { ] ^ / ( _               ",

+"            : < [ } | 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 r 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.5.7.8.9.0.a.b.c.              ",

+"          d.e.f.g.h.i.j.k.l.m.b.n.o.            ",

+"          p.q.r.s.t.u.v.w.x.b.b.y.z.            ",

+"          A.B.C.D.C.E.F.G.b.b.b.H.I.            ",

+"          J.K.L.M.L.N.O.b.b.b.b.P.Q.            ",

+"          R.S.T.U.T.V.b.b.b.b.W.X.              ",

+"            Y.Z.`.b.b.b.b.W. +.+                ",

+"                ++@+#+$+%+&+*+                  ",

+"                                                "};

diff --git a/pixmaps/artist_album.xpm b/pixmaps/artist_album.xpm
index a587ffe..d31026c 100644..100755
--- a/pixmaps/artist_album.xpm
+++ b/pixmaps/artist_album.xpm
@@ -1,295 +1,348 @@
-/* XPM */
-static char * artist_album_xpm[] = {
-"24 24 268 2",
-"  	c None",
-". 	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+          "};
+/* XPM */

+static char * artist_album_xpm[] = {

+"24 24 321 2",

+"  	c None",

+". 	c #292201",

+"+ 	c #362D00",

+"@ 	c #2A2300",

+"# 	c #272000",

+"$ 	c #28230A",

+"% 	c #9C892E",

+"& 	c #ECCD37",

+"* 	c #F7D636",

+"= 	c #F7D42C",

+"- 	c #E1C01B",

+"; 	c #977E05",

+"> 	c #211C00",

+", 	c #2C260B",

+"' 	c #C7B24A",

+") 	c #F9DF62",

+"! 	c #F9E16D",

+"~ 	c #F9E16B",

+"{ 	c #F9DE5C",

+"] 	c #F8D945",

+"^ 	c #F7D329",

+"/ 	c #CBAA0A",

+"( 	c #282100",

+"_ 	c #786C31",

+": 	c #F9E16C",

+"< 	c #FAE78B",

+"[ 	c #FBECA2",

+"} 	c #FBEB9D",

+"| 	c #FAE682",

+"1 	c #F8D840",

+"2 	c #F6D11D",

+"3 	c #AD8F00",

+"4 	c #1E1900",

+"5 	c #D2BA47",

+"6 	c #F9E271",

+"7 	c #FBE992",

+"8 	c #FCEEAE",

+"9 	c #FCEDA7",

+"0 	c #FAE788",

+"a 	c #F9E066",

+"b 	c #EECE35",

+"c 	c #D1B111",

+"d 	c #F2C900",

+"e 	c #2B2300",

+"f 	c #E6C734",

+"g 	c #D6B82B",

+"h 	c #EACE43",

+"i 	c #FAE47B",

+"j 	c #FAE479",

+"k 	c #F9E068",

+"l 	c #F8DB4F",

+"m 	c #C1A521",

+"n 	c #251F05",

+"o 	c #F5CB00",

+"p 	c #3B3100",

+"q 	c #8E770A",

+"r 	c #302813",

+"s 	c #393016",

+"t 	c #BD9F0E",

+"u 	c #F5D32E",

+"v 	c #F7D531",

+"w 	c #F7D327",

+"x 	c #AB9009",

+"y 	c #0F0D08",

+"z 	c #D3AF00",

+"A 	c #201B09",

+"B 	c #937E70",

+"C 	c #A18A7B",

+"D 	c #6A5A49",

+"E 	c #453B1F",

+"F 	c #4E4117",

+"G 	c #4F4317",

+"H 	c #3A3111",

+"I 	c #67594E",

+"J 	c #211C06",

+"K 	c #3E4826",

+"L 	c #6FA572",

+"M 	c #569659",

+"N 	c #519255",

+"O 	c #5F9D63",

+"P 	c #71A974",

+"Q 	c #89B98C",

+"R 	c #302A25",

+"S 	c #F0CFB7",

+"T 	c #EDCCB5",

+"U 	c #EACAB3",

+"V 	c #E8C7B1",

+"W 	c #E5C5AE",

+"X 	c #E3C3AD",

+"Y 	c #E0C1AB",

+"Z 	c #DDBEA8",

+"` 	c #3B3B30",

+" .	c #3C7A3E",

+"..	c #3D7B40",

+"+.	c #427E45",

+"@.	c #48814B",

+"#.	c #4C8550",

+"$.	c #538855",

+"%.	c #5A905E",

+"&.	c #76AA7A",

+"*.	c #9EC3A0",

+"=.	c #25201D",

+"-.	c #DBBDA7",

+";.	c #F4D2BA",

+">.	c #EECDB6",

+",.	c #313A2A",

+"'.	c #509154",

+").	c #57955A",

+"!.	c #5D9961",

+"~.	c #659E67",

+"{.	c #6AA26D",

+"].	c #71A775",

+"^.	c #78AB7B",

+"/.	c #7FB081",

+"(.	c #88B88B",

+"_.	c #A7CAAA",

+":.	c #342C28",

+"<.	c #F1CFB8",

+"[.	c #5E584A",

+"}.	c #548555",

+"|.	c #6FAE72",

+"1.	c #76B279",

+"2.	c #7CB57F",

+"3.	c #83B985",

+"4.	c #89BD8C",

+"5.	c #90C192",

+"6.	c #96C498",

+"7.	c #9CC89F",

+"8.	c #A3CCA5",

+"9.	c #A9D0AB",

+"0.	c #BFD8C0",

+"a.	c #11293F",

+"b.	c #101B26",

+"c.	c #88776C",

+"d.	c #F2D0B9",

+"e.	c #CCAF9B",

+"f.	c #3E3931",

+"g.	c #0C1519",

+"h.	c #628D65",

+"i.	c #84BA87",

+"j.	c #8BBE8D",

+"k.	c #91C294",

+"l.	c #98C59A",

+"m.	c #9EC9A0",

+"n.	c #A4CDA7",

+"o.	c #ABD1AD",

+"p.	c #B1D4B3",

+"q.	c #B8D8BA",

+"r.	c #BEDCC0",

+"s.	c #C5DFC6",

+"t.	c #D3E1D4",

+"u.	c #0A1D2D",

+"v.	c #76B0E5",

+"w.	c #6AA8E1",

+"x.	c #285278",

+"y.	c #0F171E",

+"z.	c #302B28",

+"A.	c #3F3E3A",

+"B.	c #5F5F60",

+"C.	c #205381",

+"D.	c #1C3035",

+"E.	c #97C49A",

+"F.	c #A0CAA2",

+"G.	c #A4CCA6",

+"H.	c #B0C5B1",

+"I.	c #BACBBC",

+"J.	c #B8D4BA",

+"K.	c #C0DDC2",

+"L.	c #C6E0C8",

+"M.	c #CDE4CE",

+"N.	c #D3E8D5",

+"O.	c #DAECDB",

+"P.	c #E2EFE3",

+"Q.	c #3D6E9C",

+"R.	c #A7CDEF",

+"S.	c #ADD0F0",

+"T.	c #9CC7ED",

+"U.	c #5382AD",

+"V.	c #2D353B",

+"W.	c #FFFFFF",

+"X.	c #2F383F",

+"Y.	c #2C79BF",

+"Z.	c #23527B",

+"`.	c #7F9981",

+" +	c #B2D3B5",

+".+	c #B2B5B2",

+"++	c #D5D5D5",

+"@+	c #DADADA",

+"#+	c #CBCBCB",

+"$+	c #D6E2D6",

+"%+	c #DBEDDC",

+"&+	c #E2F0E3",

+"*+	c #E8F4E9",

+"=+	c #3D7A40",

+"-+	c #48824A",

+";+	c #081623",

+">+	c #7BB1E2",

+",+	c #BAD8F3",

+"'+	c #C8E0F5",

+")+	c #ABCFF0",

+"!+	c #8CBDEA",

+"~+	c #3A658B",

+"{+	c #172027",

+"]+	c #142B3E",

+"^+	c #328ADA",

+"/+	c #2C7AC1",

+"(+	c #4A5C5B",

+"_+	c #C2D2C3",

+":+	c #DEDEDE",

+"<+	c #EDEDED",

+"[+	c #D2D4D3",

+"}+	c #417E44",

+"|+	c #4A844D",

+"1+	c #558C57",

+"2+	c #5F9361",

+"3+	c #699B6C",

+"4+	c #96B597",

+"5+	c #0A1C2C",

+"6+	c #85B9E9",

+"7+	c #A3CBEE",

+"8+	c #A9CEEF",

+"9+	c #9BC6ED",

+"0+	c #82B8E9",

+"a+	c #66A8E3",

+"b+	c #3E89CC",

+"c+	c #3188D7",

+"d+	c #3289D8",

+"e+	c #3F4E53",

+"f+	c #D5E0D7",

+"g+	c #E8E8E8",

+"h+	c #639465",

+"i+	c #6C9D6E",

+"j+	c #76A579",

+"k+	c #81AC83",

+"l+	c #8BB48D",

+"m+	c #A9C2AA",

+"n+	c #0C2134",

+"o+	c #72AFE6",

+"p+	c #86BAE9",

+"q+	c #7EB5E8",

+"r+	c #6CABE4",

+"s+	c #569FE1",

+"t+	c #3C90DC",

+"u+	c #193331",

+"v+	c #458048",

+"w+	c #7E987F",

+"x+	c #95A395",

+"y+	c #83AE85",

+"z+	c #8EB690",

+"A+	c #98BE9A",

+"B+	c #A3C5A4",

+"C+	c #ADCDAF",

+"D+	c #BBCEBC",

+"E+	c #0B1D2E",

+"F+	c #559EE0",

+"G+	c #60A4E2",

+"H+	c #62A6E3",

+"I+	c #5DA2E2",

+"J+	c #509BDF",

+"K+	c #3E91DC",

+"L+	c #2E80CB",

+"M+	c #203A34",

+"N+	c #669969",

+"O+	c #739F75",

+"P+	c #8BA98D",

+"Q+	c #8D9F8E",

+"R+	c #98AF99",

+"S+	c #9BBE9D",

+"T+	c #A5C7A7",

+"U+	c #B0CFB1",

+"V+	c #BAD7BC",

+"W+	c #C4DEC6",

+"X+	c #CFE6D0",

+"Y+	c #C8D5C9",

+"Z+	c #07131E",

+"`+	c #245E94",

+" @	c #3F91DC",

+".@	c #3A8FDB",

+"+@	c #1D4769",

+"@@	c #57775B",

+"#@	c #89B28B",

+"$@	c #93BA95",

+"%@	c #9DC29F",

+"&@	c #A8C9AA",

+"*@	c #B2D1B4",

+"=@	c #BDD9BE",

+"-@	c #C7E0C8",

+";@	c #D1E8D2",

+">@	c #D3E9D4",

+",@	c #D4EAD5",

+"'@	c #07121C",

+")@	c #0E283F",

+"!@	c #1D5180",

+"~@	c #2A75B9",

+"{@	c #276BA9",

+"]@	c #1B394D",

+"^@	c #4E675A",

+"/@	c #A0C3A1",

+"(@	c #AACBAC",

+"_@	c #B5D3B6",

+":@	c #BFDAC0",

+"<@	c #CAE2CB",

+"[@	c #C6D3C7",

+"}@	c #091927",

+"|@	c #0A1B2B",

+"1@	c #091825",

+"2@	c #0C161C",

+"3@	c #9CB39D",

+"4@	c #B7D5B9",

+"5@	c #C2DDC3",

+"6@	c #CCE4CD",

+"7@	c #D5E8D6",

+"8@	c #CBDBCC",

+"9@	c #CDDDCE",

+"0@	c #676E67",

+"a@	c #CCDCCD",

+"b@	c #D4E9D5",

+"c@	c #D0E2D1",

+"d@	c #AEBBAF",

+"e@	c #7C857C",

+"f@	c #8C968C",

+"        . + @ #                                 ",

+"    $ % & * = - ; >                             ",

+"  , ' ) ! ~ { ] ^ / (                           ",

+"  _ : < [ } | ) 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.S 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+0+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+`+t+ @.@^+^+^+^+^++@@@#@$@%@&@*@=@-@;@>@>@,@  ",

+"  '@)@!@~@^+^+^+{@]@^@/@(@_@:@<@>@>@>@>@>@>@[@  ",

+"        Z+}@|@1@2@3@4@5@6@>@>@>@>@>@>@>@>@7@    ",

+"                    8@>@>@>@>@>@>@>@>@>@9@      ",

+"                      0@a@>@>@>@>@b@c@d@        ",

+"                              e@f@              "};

diff --git a/pixmaps/freedb.xpm b/pixmaps/freedb.xpm
index b7aec89..b7aec89 100644..100755
--- a/pixmaps/freedb.xpm
+++ b/pixmaps/freedb.xpm
diff --git a/pixmaps/gnudb.xpm b/pixmaps/gnudb.xpm
index 23aa537..23aa537 100644..100755
--- a/pixmaps/gnudb.xpm
+++ b/pixmaps/gnudb.xpm
diff --git a/pixmaps/musicbrainz.xpm b/pixmaps/musicbrainz.xpm
index 8f805ae..8f805ae 100644..100755
--- a/pixmaps/musicbrainz.xpm
+++ b/pixmaps/musicbrainz.xpm
diff --git a/pixmaps/scan.xpm b/pixmaps/scan.xpm
index 08fdf4c..08fdf4c 100644..100755
--- a/pixmaps/scan.xpm
+++ b/pixmaps/scan.xpm
diff --git a/po/ChangeLog b/po/ChangeLog
index 4f4c3d2..4f4c3d2 100644..100755
--- a/po/ChangeLog
+++ b/po/ChangeLog
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 4a1e4ff..4a1e4ff 100644..100755
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
diff --git a/po/Makefile.mingw b/po/Makefile.mingw
index 78cd5d8..78cd5d8 100644..100755
--- a/po/Makefile.mingw
+++ b/po/Makefile.mingw
diff --git a/po/bg.gmo b/po/bg.gmo
index fa66f2e..af93952 100644
--- a/po/bg.gmo
+++ b/po/bg.gmo
diff --git a/po/bg.po b/po/bg.po
index e03de07..95c2d7c 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-10-15 23:53+0200\n"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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:134
+#: src/about.c:140
 #, fuzzy
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
@@ -26,201 +26,196 @@ msgstr ""
 "FLAC, Ogg Vorbis, MousePack и Monkey's аудио фалове. Лесният и приетен GTK+ "
 "интерфейс правят поставянето на етикети приятно под GNU/Liux."
 
-#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(Превод на немски)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(Превод на руски)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(Превод на холандски)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(Превод на шведски)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(Превод на унгарски)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(Превод на италиански)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(Превод на японски)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(Превод на украински)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(Превод на чешки)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(Превод на испански)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(Превод на полски)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(Превод на румънски)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(Превод на датски)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(Превод на гръцки)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Превод на португалски)"
 
-#: src/about.c:170
+#: src/about.c:176
 #, fuzzy
 msgid "(Bulgarian translation)"
 msgstr "(Превод на унгарски)"
 
-#: src/about.c:171
+#: src/about.c:177
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(Превод на японски)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(Превод на японски)"
+
+#: src/about.c:179
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(Превод на гръцки)"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(Превод на немски)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "Коментар"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "Относно..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "Относно"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "Компилиран на: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "Използват се: GTK+ %d.%d.%d и id3lib %d.%d.%d"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "Автор: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "Електронна поща: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Интернет страница: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "Описание:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 #, fuzzy
 msgid "MP3 file support"
 msgstr "Поддръжката за FLAC файлове е изключена"
 
-#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
-#: src/about.c:452 src/about.c:462
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "Поддръжката за FLAC файлове е изключена"
 
-#: src/about.c:410
+#: src/about.c:452
 #, fuzzy
 msgid "available"
 msgstr "Няма налична памет"
 
-#: src/about.c:420
+#: src/about.c:463
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "Поддръжката за Ogg Vorbis файлове е изключена)"
 
-#: src/about.c:430
+#: src/about.c:475
 #, fuzzy
 msgid "Speex file support"
 msgstr "Поддръжката за FLAC файлове е изключена"
 
-#: src/about.c:440
+#: src/about.c:491
 #, fuzzy
 msgid "FLAC file support"
 msgstr "Поддръжката за FLAC файлове е изключена"
 
-#: src/about.c:450
+#: src/about.c:504
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "Поддръжката за FLAC файлове е изключена"
 
-#: src/about.c:460
+#: src/about.c:516
 #, fuzzy
 msgid "WavPack file support"
 msgstr "Поддръжката за FLAC файлове е изключена"
@@ -228,33 +223,33 @@ msgstr "Поддръжката за FLAC файлове е изключена"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "Благодарности"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "Преводачи:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "Програмисти:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "Промени"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "Появи се грешка по време на отварянето на файл: '%s' (%s)."
@@ -430,7 +425,7 @@ msgstr ""
 msgid "Open File(s) with ..."
 msgstr "Отворяне на файл с"
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "Избира всички файлове"
 
@@ -438,7 +433,7 @@ msgstr "Избира всички файлове"
 msgid "Unselect All Files"
 msgstr ""
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr ""
 
@@ -586,7 +581,7 @@ msgstr "Преименува папка"
 msgid "Reload Directory"
 msgstr "Презарежда папка"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "Разглежда папка с ..."
 
@@ -726,17 +721,17 @@ msgstr ""
 msgid "Ready to start..."
 msgstr "Готов да започне..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 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
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "Потвърждение..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 #, fuzzy
 msgid ""
 "Some files have been modified but not saved...\n"
@@ -745,99 +740,147 @@ msgstr ""
 "Някои файлове бяха променени, но бяха записани...\n"
 "Желаете ли да ги запазите, преди да смените директорията?Грешка..."
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 #, fuzzy
 msgid "<All albums>"
 msgstr "Албуми"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "Изглет като списък"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "Име на файл"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "Заглавие"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "Изпълнител"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "Албум"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "Година"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "Песен"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "Жанр"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "Композитор"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "Ориг. изпълнител"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "Права"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "URL"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "Деодирано от"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "Албуми"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 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
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "Едно ниво по-нагоре"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "Задайте папка за търсене"
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "Изглет като списък"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "Изберете папка за претърсване!"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "Изпълнител и албум"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "Преименува директория"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Преименува папката '%si' на : "
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "Използва маска :"
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 #, fuzzy
 msgid "If activated, it will use masks to rename directory."
 msgstr "Ако е активирано, ще се създаде плейлист в предходната директория"
 
-#: src/browser.c:3263
+#: src/browser.c:3649
 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
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "Невалидна маска на скенера"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 #, fuzzy
 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 #, fuzzy
 msgid "Error..."
 msgstr "Грешка в размера..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "Трябва да въведете име на папката!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -848,16 +891,22 @@ msgstr ""
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -866,14 +915,14 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
 "(%s)"
 msgstr ""
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -888,90 +937,90 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "Папката преименувана"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "Програма за стартиране :"
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Въведете програма за стартиране.Тя ще получи текущата директория като "
 "параметър"
 
-#: src/browser.c:3801
+#: src/browser.c:4222
 #, fuzzy
 msgid "Open File with ..."
 msgstr "Отваряне на файл с..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Въведете програма за стартиране.Тя ще получи текущата директория като "
 "параметър"
 
-#: src/browser.c:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "Трябва да въведете име на програма!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr ""
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, fuzzy, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Неможе да се изпълни %s (%s)!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "Неможе да се повдигне друг процес!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Изпълнена команда : %s %s"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "Изпълнител / Албум"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 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
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "Име на песен"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "Продължителност"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "Търсене в база данни на диск"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "Автоматично търсене"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 #, fuzzy
 msgid "Request CD database :"
 msgstr "Заявка към FreeDB база данни"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 #, fuzzy
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
@@ -980,17 +1029,17 @@ msgstr ""
 "Автоматична заявка към CDDB база данни използвайки избраните файлове "
 "(последователността е важна!) за да се генерира CddbIDСпира търсенето"
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 #, fuzzy
 msgid "Stop the search ..."
 msgstr " СПИРА търсенето... "
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1002,139 +1051,139 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "Ръчно търсене"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "Думи :"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Въведете думи за търсене (отделени с интервал или плюс)"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "Търсене в:"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "Всички полета"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "Друго"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "Всички категории"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Блус"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "Класическа музика"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Кънтри"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Фолк"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Джаз"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Друго"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr ""
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Реге"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Рок"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "Песен от филм"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr ""
 "Включени са: фънк, соул джаз, рап, поп,  индустриялна музика, метъл и т.н."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "Филми, Шоута"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "Други, които не се вписват в горните категории"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr "Категории"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "Резултати :"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "Търсене :"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "Въведете думите за да търсите в списъка по-долу"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "Търси следващ"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "Търси предишен"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 #, fuzzy
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "Покажи само червените линии / Покажи всички линии"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr ""
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "Завърта селекцията "
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "Избира всички линии"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1144,52 +1193,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "Постави посока :"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 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
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "Песен No."
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 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
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "Изпълни текущият скенер за всеки файл"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 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
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1204,15 +1237,15 @@ msgstr ""
 "резултатите, вместо да използвате directly the position order.\" "
 "##########################"
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "Зареди избраните линии или всички линии(ако няма избрани такива)"
 
-#: src/cddb.c:798 src/misc.c:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "Готов за търсене..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1220,76 +1253,76 @@ msgstr ""
 "Албум: '%s', Изпълнител: '%s', Продължителност: '%s', година: '%s', жанр: '%"
 "s', ID: '%s"
 
-#: src/cddb.c:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "Завърта селекцията"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "Сортиране по номер на песен"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "Сортиране по име на песен"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr ""
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr ""
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr ""
 
 #. Open connection to the server
-#: src/cddb.c:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Свързване към хост '%s' порт '%d' ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Неможе да се свърже с хост '%s' (%s)!"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Свързан с хост '%s'"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Получаване на информация (%s) ..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Грешка при премахването на ID3v1 етикет на '%s' (%s)\n"
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Не може да се създаде или отвори файл '%s' (%s)\n"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "Изпращане на  заявка..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Неможе да се изпрати заявка (%s)!"
@@ -1298,91 +1331,91 @@ msgstr "Неможе да се изпрати заявка (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "Получаване на информация ..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "Сървърът върна грешен отговор! (%s)"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Сървърът върна грешен отговор! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Съжалявам, уеб базираното търсене в момента не работи!"
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Намерени %d съответстващи албума"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Получаване на информация (%s) ..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Получаване на информация (%s) ..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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
+#: src/cddb.c:2893
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d файлове са избрани!"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Готов за търсене..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Изпращане на  заявка (Cddbld: %s #песни: %d, дължина на диска: %d) ..."
 
-#: src/cddb.c:3268
+#: src/cddb.c:3276
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Намерени %d съответстващи албума"
 
-#: src/cddb.c:3364
+#: src/cddb.c:3372
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Неможе да се зареди файла '%s' (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "Зареждане на списъка с песните от албума ..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1391,7 +1424,7 @@ msgid ""
 "Do you want to continue ?"
 msgstr ""
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "Запис на етикет от CDDB"
 
@@ -1576,72 +1609,72 @@ msgstr "Ново западноевропейско (ISO-8859-15)"
 msgid "Western (Windows-1252)"
 msgstr "Западноевропейско (Windows-1252)"
 
-#: src/charset.c:542
+#: src/charset.c:543
 #, fuzzy, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 "UTF-8 низът '%s' неможе да бъде конвертиран в кодирането на името на файла\n"
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 #, fuzzy
 msgid "Invalid UTF-8"
 msgstr "Уникод  (UTF-8)"
 
-#: src/charset.c:641
+#: src/charset.c:642
 #, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
 "UTF-8 низът '%s' неможе да бъде конвертиран в кодирането на името на файла\n"
 
-#: src/charset.c:705
+#: src/charset.c:706
 #, fuzzy, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 "UTF-8 низът '%s' неможе да бъде конвертиран в кодирането на името на файла\n"
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, fuzzy, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "Стартиране на EasyTAG %s (Pld: %d) ...\n"
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, fuzzy, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "Използва се id3lib версия %d.%d.%d ...\n"
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, fuzzy, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "Използва се id3lib версия %d.%d.%d ...\n"
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr ""
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, fuzzy, c-format
 msgid "Setting locale : '%s'"
 msgstr "Преименуване на файл '%s'"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr ""
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s от %s (компилирано %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "Интернет страница: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr ""
@@ -1649,413 +1682,413 @@ msgstr ""
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "Браузър"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "Файл"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "Файл само за четене"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 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
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, Слой ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr ""
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "Честота:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 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
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "Размер:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? kb"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "Време:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "Етикет"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "Общи"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "Заглавие:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "Поставя етикет на избраните файлове с това заглавие"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "Изпълнител"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr "Поставя етикет на избраните файлове с този изпълнител"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "Албум:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr "Поставя етикет на избраните файлове с името на този албум"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 #, fuzzy
 msgid "CD:"
 msgstr "Диск"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr "Поставя етикет на избраните файлове с този номер на диск"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "Година"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "Поставя етикет на избраните файлове с тази година"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "Песен #:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr ""
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr "Поставя етикет на избраните файлове с тези номера на песните"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "Жанр"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "Поставя етикет на избраните файлове с този жанр"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "Коментар"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 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
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "Композитор:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr "Поставя етикет на избраните файлове с този композитор"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "Ориг. изпълнител:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr "Поставя етикет на избраните файлове с този ориг. изпълнител"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "Авторски права:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "Поставя етикет на избраните файлове с тези авторски права"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "Поставя етикет на избраните файлове с този URL"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "Кодирано от:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr ""
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "Картинки"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "Картинки:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "Можете да използвате с провлачване и пускане за добавяне на картинка"
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "Поставя етикет на избраните файлове с тези картинки"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr ""
 "Добавяне на картинки към етикета(провлачване и пускане също е налично)."
 
-#: src/easytag.c:1051
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr "Премахва избраните картинки, освен всички."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "Запазва избраните картинки на хард диска."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "Поставя аксесоари на избраните картинки."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Избраните файлове с етикет с име на песен '%s'."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "Премахва име на песен от избраните файлове"
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Избраните файлове с етикет с изпълнител '%s'."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "Премахва изпълнител от избраните файлове."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Избраните файлове с етикет с албум '%s'."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "Премахнато името на албума от избраните файлове."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Избраните файлове с етикет с диск номер '%s'."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "Премахва номер на диска от избраните файлове."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Избраните файлове с етикет с година '%s'."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "Премахва година от избраните файлове."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Избраните файлове с етикет със заглавие като 'xx/%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Избраните файлове с етикет със заглавие като 'xx'."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "Премахва номер на песен от избраните файлове."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "Избраните файлове номерирани последователно"
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Избраните файлове с етикет с жанр '%s'."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "Премахва жанр от избраните файлове"
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Избраните файлове с етикет с коментар '%s'."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "Премахва коментар от избраните файлове."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Избраните файлове с етикет с композитор '%s'."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "Премахва композитор от избраните файлове."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Избраните файлове с етикет с ориг. изпълнител '%s'"
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "Премахва ориг. изпълнител от избраните файлове."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Избраните файлове с етикет с авторски права '%s'."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "Премахва авторски права от избраните файлове."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Избраните файлове с етикет с URL '%s'."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "Премахва URL от избраните файлове."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr ""
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr ""
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "Избраните файлове с етикет с картинки."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "Премахва картинките от избраните файлове."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr ""
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "Всички етикети бяха сканирани"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "Всички етикети бяха премахнати"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "Всички файлове бяха запазени..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "Всички файлове бяха частично запазени..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "Всички файлове бяха частично изтрити..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "Всички файлове бяха изтрити..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, fuzzy, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2064,17 +2097,17 @@ msgstr ""
 "Желаете ли да запишете етикета на файл\n"
 "'%s' ?Записва етикет..."
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 #, fuzzy
 msgid "Write Tag..."
 msgstr "Запис на етикет от CDDB"
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr "Преименува файл и папка..."
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, fuzzy, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2088,12 +2121,12 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 #, fuzzy
 msgid "Rename Directory..."
 msgstr "Преименува папка"
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2107,11 +2140,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "Преименува файл..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2124,17 +2157,17 @@ msgstr ""
 "на \n"
 "'%s' ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Записване на етикета на '%s'"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 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
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2143,14 +2176,14 @@ msgstr ""
 "Неможе да се запише етикета във файл '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, 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
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2163,11 +2196,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "Файлът не е преименуван..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2180,7 +2213,7 @@ msgstr ""
 "защото същият вече съществува:\n"
 "'%s'"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2192,16 +2225,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Файлът '%s' е преименуван на '%s'"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "Файловете са преименувани..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, fuzzy, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2213,18 +2246,18 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, fuzzy, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Файлът '%s' е преименуван на '%s'"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 #, fuzzy
 msgid "File(s) moved..."
 msgstr "Файловете са преименувани..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, fuzzy, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2237,12 +2270,12 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 #, fuzzy
 msgid "File(s) not moved..."
 msgstr "Файлът не е преименуван..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2251,16 +2284,16 @@ msgstr ""
 "Наистина ли желаете да изтриете файла\n"
 "'%s' ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "Изтриване на файл"
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Файлът '%s' бе изтрит"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2272,109 +2305,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "Търсене в прогрес..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "Файл: '%s'"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Намерени %d файла в тази директория и поддиректориите."
 
-#: src/easytag.c:3239
+#: src/easytag.c:3356
 #, 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
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u файла"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
 msgstr "Не са намерени файлове в тази директория и поддиректориите!"
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "Не са намерени файлове в тази директория"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "Търсене..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr " СПИРА търсенето... "
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "Изберете папка за претърсване!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "Поставя етикет на избраните файлове с това поле"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Конвертира '_' и '%20' до интервали"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "Ковертира ' ' до '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "Всичко с главни букви"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "Всичко с малки букви"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "Първата буква е главна"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "Първата буква във всички думи е главна"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "Премахва интервали"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "Вмъква интервал преди главна буква"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 msgid "Remove duplicate spaces or underscores"
 msgstr "Премахва двоични интервали или подчертани думи"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Неправилно излизане! (PId: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Получен е сигнал %s (%d)\a"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 "
@@ -2384,11 +2417,11 @@ msgstr ""
 "с gdb backtrace ('gdb easytag core' then 'bt' and 'l') и информация за "
 "възпроизвеждането й до <easytag@gmail.com>"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "Неразпознат сигнал"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, c-format
 msgid ""
 "\n"
@@ -2407,11 +2440,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Нормално напускане."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 #, fuzzy
 msgid ""
 "Some files have been modified but not saved...\n"
@@ -2420,83 +2453,83 @@ msgstr ""
 "Някои файлове бяха променени, но бяха записани...\n"
 "Желаете ли да ги запазите, преди да смените директорията?Грешка..."
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 #, fuzzy
 msgid " Do you really want to exit the program? "
 msgstr ""
 "Наистина ли желаете да изтриете файла\n"
 "'%s' ?"
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "ID3 етикет"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis етикет"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis етикет"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "APE етикет"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr ""
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "MP3 файл"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "MP2 файл"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis файл"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 #, fuzzy
 msgid "Speex File"
 msgstr "Следващ файл"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "FLAC файл"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "MousePack файл"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "Monkey's Audio файл"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 #, fuzzy
 msgid "MP4/AAC File"
 msgstr "MP2 файл"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 #, fuzzy
 msgid "Wavpack File"
 msgstr "MousePack файл"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "Картинки"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2504,14 +2537,14 @@ msgid "%d kb/s"
 msgstr "%d кб/сек."
 
 #. Samplerate
-#: src/et_core.c:2917 src/flac_header.c:304 src/monkeyaudio_header.c:91
+#: src/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2522,11 +2555,11 @@ msgstr ""
 "във системната кодова таблица\n"
 "(Опитайте да настроите системната променлива G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "Превод на името на файла"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Името на файл '%s' превишава %d символа и ще бъде смалено!\n"
@@ -2536,7 +2569,7 @@ msgstr "Името на файл '%s' превишава %d символа и щ
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "Декодер:"
@@ -2545,48 +2578,53 @@ msgstr "Декодер:"
 #. 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/flac_header.c:312 src/mp4_header.c:286 src/ogg_header.c:267
 #: src/wavpack_header.c:88
 #, fuzzy
 msgid "Channels:"
 msgstr "Промени"
 
-#: src/flac_tag.c:140 src/flac_tag.c:741
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "Появи се грешка по време на отварянето на файл: '%s' (%s)."
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, 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
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Записан е етикет на '%s'"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Премахнат е етикет от '%s'"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, 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
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Грешка при премахване на ID3v2 етикет на  '%s' (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Грешка при обновяване на ID3v2 етикет на '%s' (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2601,205 +2639,161 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Грешка при обновяване на ID3v1 етикет на '%s' (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Обновен е етикет на '%s'"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "Няма съобщени грешки"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "Няма налична памет"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "Няма налични данни за разбор"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "Неправилно форматирани данни"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "Няма наличен буфер за писане"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "Буферът е твърде малък"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "Невалидна рамка на ID"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "Зададените полета не са намерени"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "Непознат тип на полето"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "Етикетът вече е прикрепен към файл"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "Невалидна версия на етикет"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "Няма наличен файл за разбор"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "Опитва да се запише върху файл само за четене"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "Грешка в компресията/декомпресията"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr " Непознато съобщение за грешка!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
 "will cause an error in id3lib, it will not be processed by the program."
 msgstr ""
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 #, fuzzy
 msgid "Corrupted file..."
 msgstr "Избира файл..."
 
-#: src/log.c:91
+#: src/log.c:95
 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:773
+msgid "Select file..."
+msgstr "Избира файл..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "Избира директория..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "Избира файл..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 #, fuzzy
 msgid "Warning..."
 msgstr "Търсене..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "Б"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "КБ"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "МБ"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "ГБ"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "ТБ"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "Възпроизвежда се плейлиста"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "M3U име на плейлист"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "Използва име на директория"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "Редактира маски"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "Опции на плейлиста"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "Влключва само избраните файлове"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 #, fuzzy
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
@@ -2809,53 +2803,53 @@ msgstr ""
 "В противен случай, ще се запишат всички файлове.Използва пълният път за "
 "файловете в плейлиста"
 
-#: src/misc.c:1397
+#: src/misc.c:1323
 #, fuzzy
 msgid "Use full path for files in playlist"
 msgstr "Използва относителен път към файловете в плейлиста"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 msgid "Use relative path for files in playlist"
 msgstr "Използва относителен път към файловете в плейлиста"
 
 #. Create playlist in parent directory
-#: src/misc.c:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "Създава плейлист в предходната директория"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "Ако е активирано, ще се създаде плейлист в предходната директория"
 
 #. DOS Separator
-#: src/misc.c:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "Използва DOS разделител за директории"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 "Тази опция заменя UNIX разделителя на директории '/' с DOS разделител'\\'."
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "Съдържание на плейлиста"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "Записва само списък с файлове"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "Записва информация използвайки име на файл"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "Записва инфрормация използвайки:"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2864,12 +2858,12 @@ msgstr ""
 "Плейлист '%s' вече съществува!\n"
 "Презаписване?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "Записване на плейлист..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2878,137 +2872,117 @@ msgstr ""
 "Неможе да се запише плейлист '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Записан е плейлист '%s'"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 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 "URL"
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "Деодирано от"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "Търсене за име на файл"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
 "Въведете дума за търсене във файловете, или нищо, за да се покажат всички."
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "В :"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "Тагът"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Чуствителност към регистъра"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Намерени : %d file(s)"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "Зареждане на имената на файлове от TXT файл"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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
+#: src/misc.c:2738
 msgid " Load "
 msgstr " Зареждане "
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, 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
+#: src/misc.c:2782 src/misc.c:2876
 #, 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
+#: src/misc.c:2791 src/misc.c:2885
 #, 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
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 msgid "Delete all blank lines"
 msgstr "Изтрива празните линии"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2861 src/misc.c:2955
+#: src/misc.c:2812 src/misc.c:2906
 #, 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
+#: src/misc.c:2821 src/misc.c:2915
 #, 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "Презареждане"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "Записва само списък с файлове"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "Избира всички линии"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3017,20 +2991,20 @@ msgstr ""
 "текущият избран скенер ще бъде задействан (прозорецът на скенера трябва да е "
 "отворен)."
 
-#: src/misc.c:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "Добавяне на празна линия"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "Изтриване на тази линия"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "Премества нагоре тази маска"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "Премества надолу тази маска"
@@ -3049,7 +3023,7 @@ msgstr ""
 msgid "Unknown"
 msgstr "Непознат тип картинка"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr ""
 
@@ -3074,8 +3048,7 @@ msgstr ""
 msgid "Single channel"
 msgstr ""
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "Повтаря действието за останалите файлове"
 
@@ -3113,48 +3086,48 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "ГРЕШКА: Провал при отваряне на файл: '%s' като vorbis (%s)."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Внимание : Този Ogg Vorbis file '%s' съдържа ID3v2 етикет."
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "Добавя картинки"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "Всички файлове"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG и JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "Аксесоари към картинката %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "Вид на картинката"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "Описание на картинката"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "Запазване на картинката %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, fuzzy, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3165,126 +3138,136 @@ msgstr ""
 "'%s'\n"
 "Желаете ли да го презапишете?Запазване на файл..."
 
-#: src/picture.c:734
+#: src/picture.c:719
 #, fuzzy
 msgid "Save file..."
 msgstr "Избира файл..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "JPEG изображение"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "PNG картинка"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "Непознат тип картинка"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "32 на 32 пиксела PNG файлова икона"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "Друга файлова икона"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "Обложка (отпред)"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "Обложка (отзад)"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr "Брошурка"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr "Медия (т.е. етикет върху диска)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr ""
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "Изпълнител/Реализатор"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "Диригент"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "Бенд/Оркестър"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "Писател/Текстописец"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "Място на записване"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "По време на записване"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "По време на изпълнение"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "Снимка от видео клип"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "Изсветлен тип"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "Илюстрация"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "Лого на бенд/Изпълител"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "Лого на издател/студио"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "Непознат тип изображение"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "пиксела"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "Тип"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "Описание"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 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
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr ""
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3296,7 +3279,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr "Файлът на изображението не е зареден..."
 
@@ -3695,7 +3678,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3708,7 +3691,7 @@ msgid ""
 "characters"
 msgstr ""
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3897,7 +3880,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr ""
 
@@ -3918,35 +3901,42 @@ msgstr "Кодова таблица използвана за да се запи
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 #, fuzzy
 msgid "No"
 msgstr " Не "
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "ID3 етикет"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "Записва ID3v1.x етикет"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3954,22 +3944,22 @@ msgstr ""
 "Ако е активирано ID3v1 етикет ще бъде добавен или обновен в края на "
 "MP3файловете."
 
-#: src/prefs.c:878
+#: src/prefs.c:882
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Кодова таблица използвана за да се запишат данните на етикет във файл"
 
 #. Character Set for reading tag
-#: src/prefs.c:910
+#: src/prefs.c:917
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Подреждане на знаците за ID3 етикети"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -3986,31 +3976,31 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:947
+#: src/prefs.c:954
 msgid "Character set used to read tag data in the file."
 msgstr "Кодова даблица използвана за да се четат данните за етикета във файл"
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "Скенер"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Запълва скенера за етикети - конвертиране на символи"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Конвертира долна черта '_' и низове '%20' до интервал ' '"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Конвертира интервал ' ' до долна черта '_'"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4019,11 +4009,11 @@ msgstr ""
 "маска заскенера за етикети"
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Преименува файловия скенер - конвертиране на символи"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4032,17 +4022,17 @@ msgstr ""
 "от скенера за файлове"
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 msgid "Process Fields Scanner - Character Conversion"
 msgstr ""
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1034
+#: src/prefs.c:1041
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: src/prefs.c:1038
+#: src/prefs.c:1045
 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 "
@@ -4051,15 +4041,15 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "Прозорец на скенера"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "Отваря прозореца на скенера при стартиране"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4067,11 +4057,11 @@ msgstr ""
 "Активирайте тази опция за да се отваря автоматично прозреца на скенера "
 "когато EasyTAGсе стартира"
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "Прозореца на скенера е винаги отгоре"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4080,16 +4070,16 @@ msgstr ""
 "върхуглавният прозорец"
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "Полета"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "Презаписва полетата когато сканира етикет"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4097,11 +4087,11 @@ msgstr ""
 "Ако е активирано, скенерът ще замести съществуващият текст в полетата с нов "
 "Ако е деактивирано, сам празните полета на етикетите ще бъдат запълвани."
 
-#: src/prefs.c:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "Запазва този текст като коментар по подразбиране :"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4110,12 +4100,12 @@ msgstr ""
 "коментар използвайки 'Fill Tag' скенера."
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 "Използва CRC32 като коментар по подразбиране (за файлове само с ID3 етикети)."
 
-#: src/prefs.c:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4126,46 +4116,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "CD база данни"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Автоматично търсене"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "Име :"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "Порт :"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "CGI път :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Настройки на сървъра"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "CD база данни"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 #, fuzzy
 msgid "Path :"
 msgstr "CGI път :"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4174,52 +4164,52 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "Настройки на сървъра посредник"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "Използва сървър посредник"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "Активира настройките на сървъра посредник."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "Име на хост :"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "Име на сървъра посредник."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "Порт на сървъра посредник."
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "Потребителско име :"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "Потребителко име за сървъра посредник."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "Парола :"
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 msgid "Password of user for the the proxy server."
 msgstr "Парола за сървъра посредник."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "Списък с имена на песни"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4227,7 +4217,7 @@ msgstr ""
 "Избира съответния аудио файл (съобразно позицията или DLM ако са активирани "
 "по-долу)"
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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."
@@ -4236,7 +4226,7 @@ msgstr ""
 "съответният аудио файл в главния списък също ще бъде избран."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4247,15 +4237,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "Потвърждаване"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "Потвърждаване за напускане на програмата"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4263,19 +4253,19 @@ msgstr ""
 "Ако е активирано, отваря диалогов прозорец за да се поиска потвърждение "
 "преди напускане на програмата."
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "Потвърждаване за запис на етикети"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "Потвърждаване за преименуване на файлове"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "Потвърджаване за изтриване на файлове"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "Потвърждаване за писане на плейлисти"
 
@@ -4283,37 +4273,37 @@ msgstr "Потвърждаване за писане на плейлисти"
 #. //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
+#: src/prefs.c:1429
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Прилага промените (но не ги запазва) и затваря този прозорец"
 
-#: src/prefs.c:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "Затваря този прозорец без запазване"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 msgid "Save changes and close this window"
 msgstr "Запазва промените и затваря прозореца"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Пример : %.*d_-_Име_на_песен_1.mp3)"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "Промените са приложени"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "Конфигурацията е запазена"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "Конфигурацията е непроменена"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4324,57 +4314,57 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "Това не е директория"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr ""
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "Запълва етикет"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "Преименува файл и директория"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "Индикатор на процеси"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "Етикетът е успешно сканиран"
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Етикетът е успешно сканиран...(%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Грешка при сканиране: неможе да се намери сепаратор '%s'в '%s"
 
-#: src/scan.c:663
+#: src/scan.c:667
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Неможе да конвертира името на файл '%s' в системната кодова таблица."
 
-#: src/scan.c:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "Новото име на файла е успешно сканирано..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Новото име на файла е успешно сканирано...(%s)"
@@ -4382,56 +4372,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "Сканиране за файл и етикет"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "Скенер :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "Избира тип на скенер за ползване"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "Отваря прозореца на скенера / Сканира избраните файлове"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "Опции на скенера"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "Показва / скрива редактора на маски"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "Показва / скрива легенда"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "Затваря този прозорец"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 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
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "Запълва предварителния преглед на етикета..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr "Задава текущият път като префикс за маската"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4440,15 +4430,15 @@ msgid ""
 msgstr ""
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "Преглед на преименувания файл..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "Избира файлове:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4457,126 +4447,126 @@ msgstr ""
 "Изберете тези, които ви интересуват."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "Ф"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
 msgstr "Обработва полето за име на файл"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "З"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "Обработва полето за заглавие"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "И"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "Обработва полето за изпълнител"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "А"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "Обработва полето за албум"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "Ж"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "Обработва полето за жанр"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "Коме"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "Обработва полето за коментар"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "Комп"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "Обработва полето за композитор"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "Ор. Изп."
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 msgid "Process original artist field"
 msgstr "Обработва полето за оригинален изпълнител"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Ав"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "Обработва полето за авторско право"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr "Обработа полето за URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr ""
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr ""
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "Завърта селекцията"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "Избира/ Не избира всички."
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Конвертира '_' и '%20' до ' '"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "Конвертира :"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "до : "
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 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 +4574,7 @@ msgstr ""
 "Знакът долна черта или низът '%20' са заменени от един интервал. Пример, "
 "преди: 'Текст%20В%20Един_Запис', след: 'Текст В Един Запис'."
 
-#: src/scan.c:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4592,12 +4582,12 @@ msgstr ""
 "Знакът интервал е заменен от долна черта. Пример, преди: 'Текст В Един "
 "Запис', след: 'Текст_В_Един_Запис'."
 
-#: src/scan.c:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4605,7 +4595,7 @@ msgstr ""
 "Конвертира всички букви във всички полета до главни букви. Пример, преди: "
 "'Текс В ЕДИН запис', след: 'ТЕКСТ В ЕДИН ЗАПИС'."
 
-#: src/scan.c:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4613,7 +4603,7 @@ msgstr ""
 "Конвертира всички букви във всички полета до малки букви. Пример, преди: "
 "'ТЕКСТ В един запис', след: 'текст в един запис'."
 
-#: src/scan.c:2325
+#: src/scan.c:2394
 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'."
@@ -4621,7 +4611,7 @@ msgstr ""
 "Конвертира първата буква във всички полета до главна буква. Пример, преди: "
 "'текст В Един ЗАПИС', след: 'Текст в един запис'."
 
-#: src/scan.c:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4629,15 +4619,15 @@ msgstr ""
 "Конвертира всяка първа буква до главна във всички полета. Пример, преди: "
 "'Текст в един ЗАПИС', след: 'Текст В Един Запис'."
 
-#: src/scan.c:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "Поставя интервал преди главна буква"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "Премахва дублиращи се интервали или главни букви"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4645,7 +4635,7 @@ msgstr ""
 "Всички интервали преди буквите се премахват. Пример, преди: 'Текст В Един "
 "Запис', след: 'ТекстВЕдинЗапис'."
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4653,7 +4643,7 @@ msgstr ""
 "Поставя интервал преди всяка главна буква. Пример, преди: 'ТекстВЕдинЗапис', "
 "след: 'Текст В Един Запис'."
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4664,185 +4654,185 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "Легенда"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a : изпълнител"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : албум"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c : коментар"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p : композитор"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r : авторски права"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : номер на диск"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : кодирано от"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g : жанр"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : игнорирано"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l : номера на песни"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : ориг. изпълнител"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n : песен"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t : заглавие"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y : година"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "Редактор на маски"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "Създава нова маска"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "Премества нагоре тази маска"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "Премества надолу тази маска"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "Дублира маска"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "Добавя маски по подразбиране"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "Премахва маска"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "Запазва маска"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "Нова_маска"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "Копиране: няма избран ред!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "Премахване: няма избран ред!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "Преместване нагоре: няма избран ред"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "Преместване надолу: няма избран ред!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "ГРЕШКА: Не може да запиша конфигурационен файл: %s (%s)\n"
 
-#: src/setting.c:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Не може да отвори конфигурационен файл '%s' (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Не може да се създаде или отвори файл '%s' (%s)"
 
-#: src/setting.c:1278
+#: src/setting.c:1277
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "ГРЕШКА: Не може да запиша конфигурационен файл: %s (%s)\n"
 
 #. Fall back to defaults
-#: src/setting.c:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Зарежда настройки по подразбиране 'Запълва маската на етикет'..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "Зарежда настройки по подразбиране 'Преименува маска на файл'..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 #, fuzzy
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Зарежда настройки по подразбиране 'Преименува маска на файл'..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "ГРЕШКА: Променливата на обкръжението HOME не е дефинирана!\n"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ГРЕШКА: Не може да създаде директория '%s' (%s)!"
@@ -4889,42 +4879,75 @@ msgid ""
 msgstr ""
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr ""
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr ""
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr ""
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr ""
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, fuzzy, c-format
 msgid "Audio player: '%s'"
 msgstr "Отваря програма за музика"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid " OK "
+#~ msgstr " Добре "
+
+#~ msgid " Yes "
+#~ msgstr " Да "
+
+#~ msgid " No "
+#~ msgstr " Не "
+
+#~ msgid " Apply "
+#~ msgstr " Прилагане "
+
+#~ msgid " Save "
+#~ msgstr " Запазване "
+
+#~ msgid " Cancel "
+#~ msgstr " Отказване "
+
+#~ msgid " Close "
+#~ msgstr " Затваряне "
+
+#~ msgid " Write "
+#~ msgstr " Записване "
+
+#~ msgid " Execute "
+#~ msgstr " Изпълнение "
+
+#~ msgid " Search "
+#~ msgstr " Търсене "
+
+#~ msgid " Browse... "
+#~ msgstr " Избор..."
+
 #, fuzzy
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
diff --git a/po/cs.gmo b/po/cs.gmo
index 020d990..b9817b4 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 34e87ed..c2ca31b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Poedit-Language: Czech\n"
 "X-Poedit-Country: CZECH REPUBLIC\n"
 
-#: src/about.c:134
+#: src/about.c:140
 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,198 +27,193 @@ 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:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(Německý překlad)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(Ruský překlad)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(Holandský překlad)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(Švédský překlad)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(Maďarský překlad)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(Italský překlad)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(Japonský překlad)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(Ukrajinský překlad)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(Český překlad)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(Španělský překlad)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(Polský překlad)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(Rumunský překlad)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(Dánský překlad)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(Řecký překlad)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Brazilský překlad)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr "(Bulharský překlad)"
 
-#: src/about.c:171
+#: src/about.c:177
 msgid "(Chinese translation)"
 msgstr "(Čínský překlad)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(Čínský překlad)"
+
+#: src/about.c:179
 msgid "(Hebrew translation)"
 msgstr "Hebrejský překlad:"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(Německý překlad)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "Poznámka"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "O aplikaci..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "O aplikaci"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(kompilováno: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(používá: GTK+ %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Webová stránka: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "Popis:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(podpora MP3 vypnuta)"
 
-#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
-#: src/about.c:452 src/about.c:462
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(podpora ID3v2.3 tagů vypnuta)"
 
-#: src/about.c:410
+#: src/about.c:452
 #, fuzzy
 msgid "available"
 msgstr "Není dostupná žádná pamět"
 
-#: src/about.c:420
+#: src/about.c:463
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(podpora Ogg Vorbis formátu vypnuta)"
 
-#: src/about.c:430
+#: src/about.c:475
 #, fuzzy
 msgid "Speex file support"
 msgstr "(podpora Speex formátu vypnuta)"
 
-#: src/about.c:440
+#: src/about.c:491
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(podpora FLAC formátu vypnuta)"
 
-#: src/about.c:450
+#: src/about.c:504
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(podpora MP4/AAC vypnuta)"
 
-#: src/about.c:460
+#: src/about.c:516
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(podpora WavPack formátu vypnuta)"
@@ -226,33 +221,33 @@ msgstr "(podpora WavPack formátu vypnuta)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "Poděkování"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "Překlady:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "Obecné:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "Změny"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "CHYBA při otevírání souboru: '%s' (%s)."
@@ -428,7 +423,7 @@ msgstr "Setřídit seznam sestupně podle vzorkování"
 msgid "Open File(s) with ..."
 msgstr "Otevřít soubor(y) s ..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "Označit všechny soubory"
 
@@ -436,7 +431,7 @@ msgstr "Označit všechny soubory"
 msgid "Unselect All Files"
 msgstr "Odznačit všechny soubory"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "Invertovat výběr souborů"
 
@@ -582,7 +577,7 @@ msgstr "Přejmenovat adresář..."
 msgid "Reload Directory"
 msgstr "Obnovit adresář"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "Procházet adresář s ..."
 
@@ -721,17 +716,17 @@ msgstr ""
 msgid "Ready to start..."
 msgstr "Připraveno..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 msgid "New default path for files selected"
 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:4550 src/easytag.c:4570 src/easytag.c:4589
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "Potvrzení..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -739,65 +734,113 @@ 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:2040
+#: src/browser.c:2164
 msgid "<All albums>"
 msgstr "<Všechna alba>"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "Strom"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "Název souboru"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "Název"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "Umělec"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "Album"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "Rok"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "Pořadí"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "Žánr"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "Skladatel"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "Původní umělec:"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "Copyright"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "URL"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "Enkódováno"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "# Alba"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 msgid "# Files"
 msgstr "# Soubory"
 
-#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
-msgid "Album"
-msgstr "Album"
-
-#: src/browser.c:2822
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "Přejít do nadřazeného adresáře"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "Napište název adresáře."
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "Strom"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "Vyberte adresář, který se bude procházet!"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "Umělec & Album"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "Přejmenovat adresář"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Přejmenovat adresář '%s' na : "
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "Použít masku :"
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 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:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -805,31 +848,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:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
-#: src/scan.c:2119 src/scan.c:2465
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "Chybná maska skeneru"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 msgid "Rename directory preview..."
 msgstr "Náhled přejmenování adresáře..."
 
-#. 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "Chyba..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "Musíte vyplnit název adresáře!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, 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."
@@ -838,16 +881,22 @@ msgstr "Nemohu převést '%s' do kódování názvu souboru. Použijte jiný ná
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -856,7 +905,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:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -865,7 +914,7 @@ msgstr ""
 "Nelze přejmenovat, protože adresář s tímto názvem již existuje!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -880,88 +929,88 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "Adresář přejmenován"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "Spustit program :"
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 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:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "Otevřít soubor s ..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 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:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "Musíte vyplnit název programu!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Nemohu nalézt program '%s'!"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Nemohu spustit %s (chyba %d)!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "Nelze vytvořit proces!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Spuštěný příkaz : '%s %s'"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "Umělec / Album"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Category"
 msgstr "Kategorie"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:229 src/cddb.c:438
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "Název skladby"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "Čas"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "Hledání v CD databázi..."
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "Automatické hledání"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 msgid "Request CD database :"
 msgstr "Požadavek na CD databázi :"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -969,16 +1018,16 @@ msgstr ""
 "Automaticky zaslat požadavek do CDDB databáze na základě vybraných souborů "
 "(pořadí je důležité) k vytvoření CddbID."
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "Zastavit hledání ..."
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr "Použít lokální Cddb"
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -989,138 +1038,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "Manuální hledání"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "Slova :"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Napište slova, která chcete vyhledat (oddělená mezerou nebo '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "Hledat v :"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "Všechna pole"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "Další"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "Všechny kategorie"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "Klasická hudba"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Ostatní"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "obsahuje : funk, soul, rap, pop, industrial, metal, atd."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "filmy, show"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "ostatní, které nepatří do zobrazených kategorií"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr " Kategorie"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "Výsledky :"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "Hledat :"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "Napište slova, která chcete vyhledat v seznamu"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "Hledat další"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "Hledat předchozí"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Zobrazit pouze červené řádky (nebo všechny řádky) v seznamu 'Umělec / Album'"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "Odznačit všechny řádky"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "Invertovat výběr řádků"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "Označit všechny řádky"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1132,52 +1181,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "Nastavit do :"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 msgid "All"
 msgstr "Vše"
 
-#: src/cddb.c:721 src/misc.c:1958
-msgid "File Name"
-msgstr "Název souboru"
-
-#: src/cddb.c:722 src/misc.c:1959
-msgid "Title"
-msgstr "Název"
-
-#: src/cddb.c:725 src/misc.c:1963
-msgid "Year"
-msgstr "Rok"
-
-#: src/cddb.c:726
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "Pořadí #"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 msgid "# Tracks"
 msgstr "# skladeb"
 
-#: 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:3013
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "Spustí aktuální skener pro každý soubor"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 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
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1188,91 +1221,91 @@ msgstr ""
 "K porovnání a výběru CDDB titulu s názvem souboru se použije Levenshteinův "
 "algoritmus (DLM: Damerau-Levenshtein Metric)."
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 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:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "Připraveno k vyhledání..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, 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:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "Invertovat výběr"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "Setřídit podle pořadí skladby"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "Setřídit podle názvu skladby"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Hledám server '%s' ..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Nemohu nalézt server '%s' (%s)!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, 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:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Probíhá připojování k '%s', port '%d' ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Nelze se připojit k '%s' (%s)!"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Připojeno k '%s'"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Přijímám data (%s) ..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Chyba při načítán odpovědi cddb (%s)!"
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Nelze vytvořit soubor '%s' (%s)"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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:2246 src/cddb.c:2564 src/cddb.c:3397
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "Odesílání požadavku"
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Nelze odeslat požadavek (%s)!"
@@ -1281,91 +1314,92 @@ msgstr "Nelze odeslat požadavek (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "Přijímám data ..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 msgid "The server returned a wrong answer!"
 msgstr "Server vrátil špatnou odpověď!"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Server vrátil špatnou odpověď! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Webové vyhledávání právě není v provozu."
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Nalezeno %d odpovídajících alb"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Přijímám data %d ..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Přijímám data %d ..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr "Další výsledky k načtení ..."
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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:2889
+#: src/cddb.c:2893
 msgid "More than 99 files selected! Can't send request!"
 msgstr "Bylo vyráno více než 99 souborů! Nelze zaslat požadavek!"
 
-#: src/cddb.c:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "Vybráno %d souborů!"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 msgid "Local CD search..."
 msgstr "Lokální vyhledávání CD..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
+#, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 "Cesta k 'Lokální  CD Databázi' nebyla definována!\n"
 "Vyplňte jí v okně nastavení."
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, 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:3268
+#: src/cddb.c:3276
 #, 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:3364
+#: src/cddb.c:3372
 #, 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:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "Načítání skladeb z alba ..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1378,7 +1412,7 @@ msgstr ""
 "\n"
 "Chcete pokračovat?"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "Zapsat tag z CDDB..."
 
@@ -1563,70 +1597,70 @@ msgstr "Západní (ISO-8859-15)"
 msgid "Western (Windows-1252)"
 msgstr "Západní (Windows-1252)"
 
-#: src/charset.c:542
-#, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
+#: src/charset.c:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Název souboru '%s' nemohl být převeden do UTF-8 (%s).\n"
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "Neplatné UTF-8"
 
-#: src/charset.c:641
-#, c-format
+#: src/charset.c:642
+#, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
 "UTF-8 řetězec '%s' nemohl být převeden do kódové stránky souboru (%s)\n"
 
-#: src/charset.c:705
-#, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+#: src/charset.c:706
+#, fuzzy, c-format
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Řetězec '%s' nemohl být převeden do UTF-8 (%s).\n"
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "Spouštím EasyTAG %s (PId: %d) ..."
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "Používám libid3tag ve verzi %s ..."
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "Používám id3lib ve verzi %d.%d.%d ..."
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr ""
 "Proměnná prostředí EASYTAGLANG nebyla definována. Nastavuji locale : '%s'"
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, c-format
 msgid "Setting locale : '%s'"
 msgstr "Nastavuji locale : '%s'"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr "Používám locale '%s' (případně '%s')..."
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s od %s (zkompilováno %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "Webová stránka: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr "Neznámý parametr nebo cesta '%s'\n"
@@ -1634,139 +1668,139 @@ msgstr "Neznámý parametr nebo cesta '%s'\n"
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "Prohlížeč"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "Soubor"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "Soubor je jen pro čtení"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 msgid "File Link Broken"
 msgstr "Vadný link na soubor"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, Vrstva ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "Datový tok:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "Vzorkování:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Mód:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
-#: src/easytag.c:4073
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "Velikost:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? kb"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "Čas:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "Tag"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "Obecné"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "Název:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "Nastavit vybraným souborům tento název"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "Umělec:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr "Nastavit vybraným souborům tohoto umělce"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr "Nastavit vybraným souborům tento název alba"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr "Nastavit vybraným souborům toto číslo disku"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "Rok:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "Nastavit vybraným souborům tento rok"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Očíslovat vybrané skladby sekvenčně. Začíná od 01 v každém podadresáři."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "Pořadí #:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1774,274 +1808,274 @@ msgstr ""
 "Nastavit počet souborů ve stejném adresáři jako zobrazený do pole počet "
 "skladeb."
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr "Nastavit vybraným souborům tento počet skladeb"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "Žánr:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "Nastavit vybraným souborům tento žánr"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "Poznámka:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 msgid "Tag selected files with this comment"
 msgstr "Nastavit vybraným souborům tuto poznámku"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:818
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "Skladatel:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr "Nastavit vybraným souborům tohoto skladatele"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "Původní umělec:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr "Nastavit vybraným souborům tohoto původního umělce"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "Nastavit vybraným souborům tento copyright"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "Nastavit vybraným souborům tuto URL"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "Enkódováno:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr "Nastavit vybraným souborům tento enkodér"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "Obrázky"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "Obrázky:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "Pro přidání obrázku můžete použít drag and drop."
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "Nastavit vybraným souborům tyto obrázky"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 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
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr "Odstranit vybrané obrázky, jinak všechny obrázky."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "Uložit vybrané obrázky na pevný disk."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "Nastavit vlastnosti vybraných obrázků."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Vybraným souborům byl nastaven název '%s'."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "Z vybraných souborů byl vymazán název."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Vybraným souborům byl nastaven autor '%s'."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "Z vybraných souborů byl vymazán autor."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Vybraným souborům bylo nastaveno album '%s'."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "Z vybraných souborů bylo vymazáno album."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Vybraným souborům bylo nastaveno číslo disku '%s'."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "Z vybraných souborů bylo vymazáno číslo disku."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Vybraným souborům byl nastaven rok '%s'."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "Z vybraných souborů byl vymazán rok."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Vybraným souborům bylo nastaveno pořadí 'xx/%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Vybraným souborům bylo nastaveno pořadí 'xx'."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "Z vybraných souborů bylo vymazáno pořadí skladby."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "Vybrané skladby byly sekvenčně očíslovány."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Vybraným souborům byl nastaven žánr '%s'."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "Z vybraných souborů byl vymazán žánr."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Vybraným souborům byla nastavena poznámka '%s'."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "Z vybraných souborů byla vymazána poznámka."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Vybraným souborům byl nastaven skladatel '%s'."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "Z vybraných souborů byl vymazán skladatel."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Vybraným souborům byl nastaven původní umělec '%s'."
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "Z vybraných souborů byl vymazán původní umělec."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Vybraným souborům byl nastaven copyright '%s'."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "Z vybraných souborů byl vymazán copyright."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Vybraným souborům byla nastavena URL '%s'."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "Z vybraných souborů byla vymazána URL."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Vybraným souborům byl nastaven enkodér '%s'."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr "Z vybraných souborů byl vymazán enkodér."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "Vybraným souborům byly nastaveny obrázky."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "Z vybraných souborů byly vymazány obrázky."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Vyberte Mód a Masku, a zopakujte stejnou akci"
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "Všechny tagy byly naskenovány"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "Všechny tagy byly vymazány"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "Všechny soubory byly uloženy..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "Některé soubory nebyly uloženy..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "Některé soubory nebyly vymazány..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "Všechny soubory byly vymazány..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2050,16 +2084,16 @@ msgstr ""
 "Chcete zapsat tag do souboru\n"
 "'%s' ?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "Zapsat tag..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr "Přejmenovat soubor a adresář..."
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2073,11 +2107,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr "Přejmenovat adresář... "
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2091,11 +2125,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "Přejmenovat soubor..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2108,17 +2142,17 @@ msgstr ""
 "na \n"
 "'%s' ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Zapisování tagu do '%s'"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 msgid "Tag(s) written"
 msgstr "Tagy zapsány"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2586 src/easytag.c:2591
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2127,14 +2161,14 @@ msgstr ""
 "Nelze zapsat tag do souboru '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Přejmenování souboru '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2737 src/easytag.c:2769 src/easytag.c:2941
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2147,11 +2181,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "Soubor(y) nebyly přejmenovány..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2164,7 +2198,7 @@ msgstr ""
 "protože soubor stejného názvu již existuje:\n"
 "'%s'"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2176,16 +2210,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Soubor '%s' přejmenován na '%s'"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "Soubor(y) přejmenovány..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2197,17 +2231,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Soubor '%s' přejmenován na '%s'"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
 msgstr "Soubor(y) přejmenovány..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2220,11 +2254,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
 msgstr "Soubor(y) nebyl přesunut..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2233,16 +2267,16 @@ msgstr ""
 "Opravdu chcete definitivně vymazat soubor\n"
 "'%s' ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "Vymazání souboru..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Soubor '%s' byl vymazán"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2254,109 +2288,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "Probíhá hledání..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "Soubor: '%s'"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, 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:3239
+#: src/easytag.c:3356
 #, 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:3252 src/et_core.c:2696
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u souborů"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 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:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "Nebyl nalezen žádný soubor v tomto adresáři!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "Hledání..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "  PŘERUŠIT vyhledávání...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "Vyberte adresář, který se bude procházet!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "Nastavit vybraným souborům tento název"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Konvertovat '_' a '%20' na mezery"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "Konvertovat ' ' na '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "Všechno velkými písmeny"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "Všechno malými písmeny"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "První písmeno velké"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "První písmeno každého slova velké"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "Smazat mezery"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "Vložit mezeru před velká písmena"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 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:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Nestandardní ukončení! (PId: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Zachycen signál %s (%d)\a"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 "
@@ -2366,11 +2400,11 @@ msgstr ""
 "gdb výpisem zásobníku ('gdb easytag core' potom 'bt' a 'l') na adresu "
 "<easytag@gmail.com>"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "Neznámy signál"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2403,11 +2437,11 @@ msgstr ""
 "., ./             Načte aktuální adresář.\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Standardní ukončení"
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2415,77 +2449,77 @@ 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:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr " Opravdu chcete ukončit program? "
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "ID3 Tag"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis Tag"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Tag"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "APE Tag"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC Tag"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr "Wavpack Tag"
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "MP3 soubor"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "MP2 soubor"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis soubor"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 msgid "Speex File"
 msgstr "Soubor Speex"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "FLAC soubor"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "MusePack soubor"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "Monkey Audio soubor"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr "MP4/AAC soubor"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 msgid "Wavpack File"
 msgstr "Wavpack soubor"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, c-format
 msgid "Pictures (%d)"
 msgstr "Obrázky (%d)"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2493,14 +2527,14 @@ 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/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2511,11 +2545,11 @@ 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:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "Překlad názvu souboru"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Název souboru '%s' překročil %d znaků a proto bude zkrácen!\n"
@@ -2525,7 +2559,7 @@ msgstr "Název souboru '%s' překročil %d znaků a proto bude zkrácen!\n"
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "Enkodér:"
@@ -2534,47 +2568,52 @@ msgstr "Enkodér:"
 #. 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/flac_header.c:312 src/mp4_header.c:286 src/ogg_header.c:267
 #: src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Channels:"
 
-#: src/flac_tag.c:140 src/flac_tag.c:741
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "CHYBA při otevírání souboru: '%s' jako FLAC (%s)."
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "CHYBA: Selhalo zapsání komentářů do souboru '%s' (%s)."
 
-#: src/flac_tag.c:990 src/ogg_tag.c:759
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Zapsán tag do '%s'"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Vymazán tag z '%s'"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Chyba při mazání ID3v1 tagu v '%s' (%s)"
 
-#: src/id3_tag.c:490 src/id3_tag.c:557
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Chyba při mazání ID3v2 tagu v '%s' (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Chyba při úpravě ID3v2 tagu v  '%s' (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2589,77 +2628,77 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Chyba při úpravě ID3v1 tagu v  '%s' (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Upraven tag v '%s'"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "Neohlášena žádná chyba"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "Není dostupná žádná pamět"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "Žádná data pro parsování"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "Chybně zformátovaná data"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "Nebyl nalezen buffer pro zápis"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "Buffer je přlož nový"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "Chybné ID rámce"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "Požadované pole nebylo nalezeno"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "Neznámé pole"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "Tag v souboru již je"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "Chybná verze tagu"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "Nebyl nalezen soubor pro parsování"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "Pokus o zápis do read-only souboru"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "Chyba při kompresi/dekompresi"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "Neznámá chyba!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2668,126 +2707,82 @@ msgstr ""
 "Protože by následující poškozený soubor: '%s'\n"
 "způsobil chybu v id3lib, nebude programem zpracován."
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
 msgstr "Poškozený soubor..."
 
-#: src/log.c:91
+#: src/log.c:95
 msgid "Log"
 msgstr "Log"
 
-#: src/misc.c:214
-msgid " OK "
-msgstr " OK "
-
-#: src/misc.c:219
-msgid " Yes "
-msgstr " Ano "
-
-#: src/misc.c:224
-msgid " No "
-msgstr " Ne "
-
-#: src/misc.c:229
-msgid " Apply "
-msgstr " Použít "
-
-#: src/misc.c:234
-msgid " Save "
-msgstr " Uložit "
-
-#: src/misc.c:239
-msgid " Cancel "
-msgstr " Zrušit "
-
-#: src/misc.c:244
-msgid " Close "
-msgstr " Zavřít "
-
-#: src/misc.c:249
-msgid " Write "
-msgstr " Zapsat "
-
-#: src/misc.c:254
-msgid " Execute "
-msgstr " Spustit "
-
-#: src/misc.c:259
-msgid " Search "
-msgstr "Hledání..."
-
-#: src/misc.c:264
-msgid " Browse... "
-msgstr " Procházet... "
+#: src/misc.c:773
+msgid "Select file..."
+msgstr "Vybrat soubor..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "Vybrat adresář..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "Vybrat soubor..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 msgid "Warning..."
 msgstr "Varování..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr "Nebyl nastaven audio přerávač!"
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "Vygenerovat seznam skladeb"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "Název seznamu M3U"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "Použít název adresáře"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "Upravit masku"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "Možnosti seznamu skladeb"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "Zahrnout pouze vybrané soubory"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2795,30 +2790,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:1397
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "Použít celou cestu k souborům v seznamu"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 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:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "Vytvořit seznam skladeb v nadřazeném adresáři"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 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:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "Používat DOSovský oddělovač adresářů"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2826,23 +2821,23 @@ msgstr ""
 "Tato volba nahrazuje UNIXovský oddělovač adresářů '/' na DOSovský oddělovač "
 "'\\'."
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "Obsah seznamu skladeb"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "Zapsat jen seznam souborů"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "Zapsat informace za použití názvu souboru"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "Zapsat informace za použití:"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2851,12 +2846,12 @@ msgstr ""
 "Soubor seznamu skladeb '%s' již existuje!\n"
 "Přepsat?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "Zapsat seznam skladeb..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2865,44 +2860,24 @@ msgstr ""
 "Nelze zapsat do souboru seznamu skladeb '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Zapsán soubor seznamu skladeb '%s'"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1964
-msgid "Track"
-msgstr "Pořadí"
-
-#: src/misc.c:1967 src/picture.c:821
-msgid "Composer"
-msgstr "Skladatel"
-
-#: src/misc.c:1968
-msgid "Orig. Artist"
-msgstr "Původní umělec:"
-
-#: src/misc.c:1969
-msgid "Copyright"
-msgstr "Copyright"
-
-#: src/misc.c:1970
-msgid "URL"
-msgstr "URL"
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "Enkódováno"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "Najít soubor"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2910,93 +2885,93 @@ msgstr ""
 "všech souborů."
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "V :"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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:2033
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "Tag"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Rozlišovat velikost písmen"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Nalezeno %d souborů"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "Nahrát názvy souborů z TXT souboru."
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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:2787
+#: src/misc.c:2738
 msgid " Load "
 msgstr " Nahrát "
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, 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
+#: src/misc.c:2782 src/misc.c:2876
 #, 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
+#: src/misc.c:2791 src/misc.c:2885
 #, 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
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 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
+#: src/misc.c:2812 src/misc.c:2906
 #, fuzzy
 msgid "Move up the selected line"
 msgstr "Zahrnout pouze vybrané soubory"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2870 src/misc.c:2964
+#: src/misc.c:2821 src/misc.c:2915
 #, fuzzy
 msgid "Move down the selected line"
 msgstr "Zahrnout pouze vybrané soubory"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "Obnovit"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "Zapsat jen seznam souborů"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "Označit všechny řádky"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3004,20 +2979,20 @@ msgstr ""
 "Při spuštění této volby, po načtení názvů souboru, bude spuštěn aktuální "
 "skener (okno skeneru musí být otevřeno)."
 
-#: src/misc.c:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "Vložit prázdný řádek"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "Vymazat tento řádek"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "Posunout masku nahoru"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "Posunout masku dolů"
@@ -3035,7 +3010,7 @@ msgstr "Audio"
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr "Neplatný formát MP4"
 
@@ -3060,8 +3035,7 @@ msgstr "Dual channel"
 msgid "Single channel"
 msgstr "Single channal"
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "Opakovat akci pro zbytek souborů"
 
@@ -3103,48 +3077,48 @@ msgstr ""
 "Ogg Vorbis: vnitřní logická chyba signalizující bug, nebo poškození "
 "zásobníku (soubor: '%s')."
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "CHYBA: Selhalo otevření souboru: '%s' jako vorbis (%s)."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Varování : Soubor Ogg Vorbis '%s' obsahuje ID3v2 tag."
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "Přidat obrázky"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "Všechny soubory"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG a JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "Vlastnosti obrázku %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "Typ obrázku"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "Popis obrázku:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "Uložit obrázek %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3155,117 +3129,122 @@ msgstr ""
 "'%s'\n"
 "Chcete jej přepsat?"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "Uložit soubor..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "JPEG obrázek"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "PNG obrázek"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "Neznámý obrázek"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32 px PNG ikona souboru"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "Jiná ikona souboru"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "Přebal (přední)"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "Přebal (zadní)"
 
-#: src/picture.c:809
+#: src/picture.c:826
 #, fuzzy
 msgid "Leaflet page"
 msgstr "webová stránka"
 
-#: src/picture.c:811
+#: src/picture.c:828
 #, fuzzy
 msgid "Media (e.g. label side of CD)"
 msgstr "Velikost etikety (CD/DVD)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr "Hlavní umělec/hlavní účinkující/sólista"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "Umělec/Účinkující"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "Skupina/Orchestr"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "Textař"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "Místo nahrávání"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "Během nahrávání"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "Během představení"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "Zachytávání filmu/videa"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "Pestrobarevná ryba"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "Ilustrace"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "Logo skupiny/umělce"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "Logo vydavatele/studia"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "Neznámý typ obrázku"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "pixely"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "Typ"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "Popis"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3273,11 +3252,16 @@ msgstr ""
 "Nemohu zobrazit obrázek, protože nebyl načten dostatek dat k vytvoření "
 "bufferu."
 
-#: src/picture.c:987
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr "Nahrávám obrázek..."
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3288,7 +3272,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr "Soubor s obrázkem nebyl načten..."
 
@@ -3686,7 +3670,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "Vynutit systémovou znakovou sadu a aktivovat transliteraci"
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3701,7 +3685,7 @@ msgid ""
 "characters"
 msgstr "Vynutit systémovou znakovou sadu a zahazovat některé znaky"
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3888,7 +3872,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr "Znaková sada:"
 
@@ -3907,33 +3891,43 @@ msgstr "Znaková sada použitá pro zápis dat tagu do souboru."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr "Další nastavení pro iconv():"
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 msgid "No"
 msgstr "Ne"
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+#, fuzzy
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+"Pokud nemůže být znak reprezentován v cílové znakové sadě, může být nahrazen "
+"jedním nebo několika přibližně podobnými znaky."
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 msgid "ID3v1 tags"
 msgstr "ID3v1 tagy"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "Zapisovat ID3v1.x tag"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3941,20 +3935,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:878
+#: src/prefs.c:882
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Znaková sada pro zápis ID3v1 tagů do souboru."
 
 #. Character Set for reading tag
-#: src/prefs.c:910
+#: src/prefs.c:917
 msgid "Character Set for reading ID3 tags"
 msgstr "Znaková sada pro čtení ID3 tagů"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr "Nestandardní:"
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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,31 +3965,31 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:947
+#: src/prefs.c:954
 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:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "Skener"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Vyplnění tagu - Konverze znaků"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Konvertovat podtržítko '_' a řetězec '%20' na mezeru ' '"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Konvertovat mezeru ' ' na podržítko '_'"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4003,11 +3997,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:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Přejmenování souboru - Konverze znaků"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4016,17 +4010,17 @@ msgstr ""
 "konverze."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 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:1034
+#: src/prefs.c:1041
 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:1038
+#: src/prefs.c:1045
 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 "
@@ -4037,26 +4031,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:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "Okno skeneru"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "Otevřít okno skeneru při startu"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 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:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "Okno skeneru bude vždy navrchu"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4064,16 +4058,16 @@ msgstr ""
 "Pokud je zapnuto, okno s maskami zůstane vždy nad hlavním oknem programu."
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "Pole"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "Přepsat pole při skenování tagu"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4081,11 +4075,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:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "Nastavit tento text jako výchozí poznámku:"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4094,11 +4088,11 @@ msgstr ""
 "do pole poznámky při použití možnosti 'Naplň tag'."
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 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:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4109,42 +4103,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "CD databáze"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 msgid "Server Settings for Automatic Search"
 msgstr "Nastavení serveru pro automatické hledání"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "Název :"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "CGI Cesta :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 msgid "Server Settings for Manual Search"
 msgstr "Nastavení serveru pro manuální hledání"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 msgid "Local CD Data Base"
 msgstr "Lokální CD databáze"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 msgid "Path :"
 msgstr "Cesta :"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4156,59 +4150,59 @@ msgstr ""
 "'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' a 'misc'."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "Nastavení proxy"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "Použít proxy"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "Pro připojení k serveru používat proxy."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "Server :"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "Název proxy serveru."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "Port proxy serveru."
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "Login :"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "Jméno uživatele pro proxy serveru."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "Heslo :"
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 msgid "Password of user for the the proxy server."
 msgstr "Heslo uživatele pro proxy server."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "Seznam názvů skladeb"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 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:1353
+#: src/prefs.c:1360
 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 +4211,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:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4228,15 +4222,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "Potvrzování"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "Potvrdit opuštění programu"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4244,19 +4238,19 @@ msgstr ""
 "Pokud je zapnuto, otevře se dialogové okno s potvrzením při zavírání "
 "programu."
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "Potvrdit zápis tagu do souboru"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "Potvrdit přejmenování souboru"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "Potvrdit smazání souboru"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "Potvrdit zápis seznamu skladeb."
 
@@ -4264,37 +4258,37 @@ msgstr "Potvrdit zápis seznamu skladeb."
 #. //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
+#: src/prefs.c:1429
 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:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "Zavře toto okno bez uložení"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 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:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Příklad : %.*d_-_Nazev_stopy_1.mp3)"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "Změny byly použity"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "Konfigurace uložena"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "Konfigurace nebyla změněna"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4305,57 +4299,57 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "Není adresář"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Nemohu nalézt audio přehrávač '%s'!"
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "Vyplnit tag"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "Přejmenovat soubor a adresář"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "Upravit"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "Tag byl úspěšně naskenován..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Tag byl úspěšně naskenován...(%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, 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:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, 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:663
+#: src/scan.c:667
 #, 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:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "Nový název souboru byl úspěšně naskenován..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nový název souboru byl úspěšně naskenován...(%s)"
@@ -4363,41 +4357,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "Skenování tagu a názvu souboru"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "Skener :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "Vyberte druh skenování"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "Otevřít okno skeneru / Naskenovat označené soubory"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "Možnosti skenování"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "Zobrazit / Skrýt editor masky"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "Zobrazit / Skrýt legendu"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "Zavřít toto okno"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4406,15 +4400,15 @@ msgstr ""
 "budou plnit pole tagu z názvu souboru a cesty."
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "Náhled tagu..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4427,15 +4421,15 @@ msgstr ""
 "absolutní cestu, jinak je cesta relativní."
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "Náhled nového názvu souboru..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "Vyberte pole:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4444,126 +4438,126 @@ msgstr ""
 "které chcete upravit."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "S"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
 msgstr "Upravit pole názvu souboru"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "N"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "Upravit název skladby"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "Au"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "Upravit autora"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "Upravit album"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "Upravit pole žánru"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "P"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "Upravit poznámku"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "S"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "Upravit pole skladatele"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "P"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 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:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "Upravit pole copyrightu"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr "Upravit pole URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr "Upravit pole názvu enkodéru"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "Invertovat výběr"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "Označit/Odznačit vše."
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Konvertovat '_' a '%20' na mezery"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "Konvertovat :"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "na : "
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4571,7 +4565,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:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4579,12 +4573,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:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4592,7 +4586,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:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4600,7 +4594,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:2325
+#: src/scan.c:2394
 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'."
@@ -4608,7 +4602,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:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4616,15 +4610,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:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "Vkládat mezeru před velká písmena"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "Odstranit dvojité mezery nebo podtržítka"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4632,7 +4626,7 @@ msgstr ""
 "Mezery mezi slovy budou odstraňovány. Příklad, před: 'Text In An Entry', po: "
 "'TextInAnEntry'."
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4640,7 +4634,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:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4651,183 +4645,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a : autor"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c : poznámka"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p : skladatel"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r : copyright"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : číslo disku"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : enkódoval"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g : žánr"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorováno"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l : počet skladeb"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : pův. umělec"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n : pořadí"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t : název"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y : rok"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "Editor masky"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "Vytvořit novou masku"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "Posunout masku nahoru"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "Posunout masku dolů"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "Duplikovat masku"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "Přidat základní masky"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "Odebrat masku"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "Uložit masky"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "Nová_maska"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "Kopírování: Nebyl vybrán žádný řádek!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "Odebrání: Nebyl vybrán žádný řádek!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "Posun nahoru: Nebyl vybrán žádný řádek!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "Posun dolů: Nebyl vybrán žádný řádek!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "CHYBA: Nemohu zapsat konfigurační soubor: %s (%s)"
 
-#: src/setting.c:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Nelze načíst konfigurační soubor '%s' (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 msgid "Loading default configuration..."
 msgstr "Načítá se výchozí konfigurace..."
 
-#: 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Nelze vytvořit nebo otevřít soubor '%s' (%s)"
 
-#: src/setting.c:1278
+#: src/setting.c:1277
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "CHYBA: Nemohu zapsat seznam do souboru: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Načítám výchozí masky pro vyplnění tagů..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 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:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Načítám výchozí masky pro přejmenování adresářů..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "CHYBA: Proměnná prostředí HOME není definována!"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "CHYBA: Nelze vytvořit adresář '%s' (%s)!"
@@ -4876,42 +4870,75 @@ msgstr ""
 "zkrácen."
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr "DLL '%s' nebyla nalezena. Zkuste jí načíst..."
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr "DLL '%s' nelze načíst"
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr "Tato verze '%s' obsahuje '%s'"
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr "Funci '%s' nebyla v dll '%s' nalezena"
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, c-format
 msgid "Audio player: '%s'"
 msgstr "Audio přehrávač: '%s'"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr "Adresář s nastavením EasyTag: '%s'"
 
+#~ msgid " OK "
+#~ msgstr " OK "
+
+#~ msgid " Yes "
+#~ msgstr " Ano "
+
+#~ msgid " No "
+#~ msgstr " Ne "
+
+#~ msgid " Apply "
+#~ msgstr " Použít "
+
+#~ msgid " Save "
+#~ msgstr " Uložit "
+
+#~ msgid " Cancel "
+#~ msgstr " Zrušit "
+
+#~ msgid " Close "
+#~ msgstr " Zavřít "
+
+#~ msgid " Write "
+#~ msgstr " Zapsat "
+
+#~ msgid " Execute "
+#~ msgstr " Spustit "
+
+#~ msgid " Search "
+#~ msgstr "Hledání..."
+
+#~ msgid " Browse... "
+#~ msgstr " Procházet... "
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/da.gmo b/po/da.gmo
index 573e145..7fe069b 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 449e3d4..c4038f6 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-10-15 23:53+0200\n"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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:134
+#: src/about.c:140
 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,200 +29,195 @@ 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:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(Tysk oversættelse)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(Russisk oversættelse)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(Hollandsk oversættelse)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(Svensk oversættelse)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(Ungarsk oversættelse)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(Italiensk oversættelse)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(Japansk oversættelse)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(Ukrainsk oversættelse)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(Tjekkisk oversættelse)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(Spansk oversættelse)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(Polsk oversættelse)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(Rumænsk oversættelse)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(Dansk oversættelse)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(Græsk oversættelse)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Brasiliansk-portugisisk oversættelse)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr "(Bulgarsk oversættelse)"
 
-#: src/about.c:171
+#: src/about.c:177
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(Japansk oversættelse)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(Japansk oversættelse)"
+
+#: src/about.c:179
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(Græsk oversættelse)"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(Tysk oversættelse)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "Kommentar"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "Om..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "Om"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(kompileret: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(bruger: GTK+ %d.%d.%d og id3lib %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "Forfatter: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Hjemmeside: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "Beskrivelse:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(MP3 filunderstøttelse slået fra)"
 
-#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
-#: src/about.c:452 src/about.c:462
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(MP3 filunderstøttelse slået fra)"
 
-#: src/about.c:410
+#: src/about.c:452
 #, fuzzy
 msgid "available"
 msgstr "Ingen tilgængelige hukommelse"
 
-#: src/about.c:420
+#: src/about.c:463
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(Ogg Vorbis filunderstøttelse slået fra)"
 
-#: src/about.c:430
+#: src/about.c:475
 #, fuzzy
 msgid "Speex file support"
 msgstr "(MP3 filunderstøttelse slået fra)"
 
-#: src/about.c:440
+#: src/about.c:491
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(FLAC filunderstøttelse slået fra)"
 
-#: src/about.c:450
+#: src/about.c:504
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(MP4/AAC filunderstøttelse slået fra)"
 
-#: src/about.c:460
+#: src/about.c:516
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(MP3 filunderstøttelse slået fra)"
@@ -230,33 +225,33 @@ msgstr "(MP3 filunderstøttelse slået fra)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "Tak"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "Oversættelser:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "Generelt:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "Ændringer"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "FEJL ved åbning af fil: '%s' (%s)."
@@ -432,7 +427,7 @@ msgstr "Samplerate nedadgående"
 msgid "Open File(s) with ..."
 msgstr "Åbn fil(er) med ..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "Vælg alle filer"
 
@@ -440,7 +435,7 @@ msgstr "Vælg alle filer"
 msgid "Unselect All Files"
 msgstr "Fravælg alle filer"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "Invertér filvalg"
 
@@ -586,7 +581,7 @@ msgstr "Omdøb mappe ..."
 msgid "Reload Directory"
 msgstr "Genindlæs mappe"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "Gennemse mappe med ..."
 
@@ -725,17 +720,17 @@ msgstr "Kunne ikke flette UI, fejl var: %s\n"
 msgid "Ready to start..."
 msgstr "Klar til at starte..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 msgid "New default path for files selected"
 msgstr "Ny standardsti for filer valgt"
 
 #. 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
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "Bekræft..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -743,66 +738,114 @@ msgstr ""
 "Nogle filer er blevet ændret, men ikke gemt...\n"
 "Vil du gemme dem, før du ændrer mappe?"
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 #, fuzzy
 msgid "<All albums>"
 msgstr "# Albums"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "Træ"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "Filnavn"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "Titel"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "Kunstner"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "Album"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "År"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "Spor"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "Genre"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "Komponist"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "Orig. kunstner"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "Ophavsret"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "URL"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "Encoded af"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "# Albums"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 msgid "# Files"
 msgstr "# Filer"
 
-#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
-msgid "Album"
-msgstr "Album"
-
-#: src/browser.c:2822
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "Gå et niveau op"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "Indtast en mappe at gennemse."
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "Træ"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "Vælg en mappe at gennemse!"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "Kunstner & Album"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "Omdøb mappen"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Omdøb mappen '%s' til : "
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "Brug maske :"
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 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:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -810,31 +853,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:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
-#: src/scan.c:2119 src/scan.c:2465
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "Ugyldig scanner maske"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 msgid "Rename directory preview..."
 msgstr "Omdøb mappeforvisning..."
 
-#. 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "Fejl..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "Du skal indtaste et mappenavn!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, 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."
@@ -843,16 +886,22 @@ msgstr "Kunne ikke konvertere '%s' til filnavnets tegnsæt. Brug et andet navn."
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -861,7 +910,7 @@ msgstr "Kunne ikke konvertere '%s' til filnavnets tegnsæt. Brug et andet navn."
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -870,7 +919,7 @@ msgstr ""
 "Kan ikke omdøbe fordi det mappenavn allerede findes!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -885,89 +934,89 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "Mappe omdøbt"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "Program der skal køres :"
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 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:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "Åbn fil med ..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 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:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "Du skal indtaste et programnavn!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Programmet '%s' blev ikke fundet!"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Kan ikke køre %s (fejl %d)!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "Kan ikke 'fork' endnu en process!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Kørte kommando : '%s %s'"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "Kunstner / Album"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Category"
 msgstr "Kategori"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:229 src/cddb.c:438
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "Spornavn"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "Tid"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "CDDB søgning"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "Automatisk søgning"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 #, fuzzy
 msgid "Request CD database :"
 msgstr "Send anmodning til FreeDB database:"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -975,16 +1024,16 @@ msgstr ""
 "Anmod automatisk CDDB-databasen med de valgte filer (rækkefølgen er vigtig!) "
 "for at generere CddbID."
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "Stop søgningen ..."
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -995,15 +1044,15 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "Manuel søgning"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "Ord :"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr ""
 "Indtast ordene der skal søges efter (separeret med mellemrum eller '+')"
@@ -1011,123 +1060,123 @@ msgstr ""
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "Søg i :"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "Alle felter"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "Andre"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "Alle kategorier"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "Klassisk"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Folkesang"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Diverse"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "inkluderet : funk, soul, rap, pop, industrial, metal, osv."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "film, shows"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "andre der ikke passer ind i ovenstående kategorier"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr " Kategorier "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "Resultater :"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "Søg :"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "Indtast ordene at søge efter i listen forneden"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "Søg næste"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "Søg forrige"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 #, fuzzy
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "Vis kun røde linjer/ Vis alle linjer"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "Fravælg alle linjer"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "Invertér linjevalg"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "Vælg alle linjer"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1140,52 +1189,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "Sæt ind i :"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 msgid "All"
 msgstr "Alle"
 
-#: src/cddb.c:721 src/misc.c:1958
-msgid "File Name"
-msgstr "Filnavn"
-
-#: src/cddb.c:722 src/misc.c:1959
-msgid "Title"
-msgstr "Titel"
-
-#: src/cddb.c:725 src/misc.c:1963
-msgid "Year"
-msgstr "År"
-
-#: src/cddb.c:726
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "Spor #"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 msgid "# Tracks"
 msgstr "# Spor"
 
-#: 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:3013
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "Kør den nuværende scanner for hver enkel fil"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 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
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1199,91 +1232,91 @@ msgstr ""
 "Dette vil blive brugt når der bliver valgt en tilsvarende lydfil, eller "
 "anvendelse af cddb-resulatater, i stedet for at bruge positionsrækkefølgen."
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 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:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "Klar til at søge..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, 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:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "Invertér valg"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "Sortér efter spornummer"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "Sortér efter spornavn"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Slår værtsnavn '%s' op ..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Kunne ikke slå værtsnavn '%s' op (%s)!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, 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:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Forbinder til vært '%s', port '%d' ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Kan ikke forbinde til vært '%s' (%s)!"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Forbundet til vært '%s'"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Modtager svar (%s) ..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, 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:1770
+#: src/cddb.c:1771
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Kan ikke oprette eller åbne fil '%s' (%s)\n"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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:2246 src/cddb.c:2564 src/cddb.c:3397
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "Sender anmodning ..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Kunne ikke sende anmodning (%s)!"
@@ -1292,91 +1325,91 @@ msgstr "Kunne ikke sende anmodning (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "Modtager data ..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "Serveren returnerede forkert svar! (%s)"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Serveren returnerede forkert svar! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Desværre, web-baseret søgning virker ikke i øjeblikket!"
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Fandt %d matchende album(s)"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Modtager svar (%s) ..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Modtager svar (%s) ..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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:2889
+#: src/cddb.c:2893
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d fil(er) valgt"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Klar til at søge..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, 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:3268
+#: src/cddb.c:3276
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Fandt %d matchende album(s)"
 
-#: src/cddb.c:3364
+#: src/cddb.c:3372
 #, 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:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "Henter albums sporliste ..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1389,7 +1422,7 @@ msgstr ""
 "\n"
 "Vil du fortsætte?"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "Skriver mærke fra CDDB..."
 
@@ -1574,68 +1607,68 @@ msgstr "Vestlig (ISO-8859-15)"
 msgid "Western (Windows-1252)"
 msgstr "Vestlig (Windows-1252)"
 
-#: src/charset.c:542
-#, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
+#: src/charset.c:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Filnavnet '%s' kunne ikke konverteres til UTF-8 (%s).\n"
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "Ugyldig UTF-8"
 
-#: src/charset.c:641
-#, c-format
+#: src/charset.c:642
+#, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr "UTF-8 strengen '%s' kunne ikke konverteres til filnavnstegnsæt (%s)\n"
 
-#: src/charset.c:705
+#: src/charset.c:706
 #, fuzzy, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Filnavnet '%s' kunne ikke konverteres til UTF-8 (%s).\n"
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, fuzzy, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "Starter EasyTAG %s (PId: %d) ...\n"
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, fuzzy, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "Bruger id3lib version %d.%d.%d ...\n"
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, fuzzy, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "Bruger id3lib version %d.%d.%d ...\n"
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr ""
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, fuzzy, c-format
 msgid "Setting locale : '%s'"
 msgstr "Omdøber fil '%s'"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, fuzzy, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr "Bruger locale '%s' (og senere '%s')...\n"
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s af %s (kompileret %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "Hjemmeside: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr ""
@@ -1643,140 +1676,140 @@ msgstr ""
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "Browser"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "Fil"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "Fil med kun læseadgang"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 msgid "File Link Broken"
 msgstr "Fillænke ødelagt"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, Layer ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "Bithastighed:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "Frek:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Mode:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
-#: src/easytag.c:4073
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? kb"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "Tid:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "Mærke"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "Fælles"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "Titel:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "Mærk valgte filer med denne titel"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "Kunstner:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr "Mærk valgte filer med denne kunstner"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr "Mærk valgte filer med dette albumnavn"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 #, fuzzy
 msgid "CD:"
 msgstr "CD"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr "Mærk valgte filer med dette disknummer"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "År:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "Mærk valgte filer med dette år"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Giv numre til valgte spor sekventielt. Starter ved 01 i hver undermappe."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "Spor #:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1784,274 +1817,274 @@ msgstr ""
 "Sæt antallet af filer, i den samme mappe som den viste fil, til det valgte "
 "antal spor."
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr "Mærk valgte filer med dette antal spor"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "Genre:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "Mærk valgte filer med denne genre"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 msgid "Tag selected files with this comment"
 msgstr "Mærk valgte filer med denne kommentar"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:818
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "Komponist:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr "Mærk valgte filer med denne komponist"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "Orig. kunstner:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr "Mærk valgte filer med denne originale kunstner"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "Ophavsret:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "Mærk valgte filer med denne ophavsret"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "Mærk valgte filer med denne URL"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "Encoded af:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr "Mærk valgte filer med denne encoders navn"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "Billeder"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "Billeder:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "Du kan bruge træk-og-slip for at tilføje et billede."
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "Mærk valgte filer med disse billeder"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 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
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr "Fjern valgte billeder, ellers alle billeder."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "Gem de valgte billeder på harddisken."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "Sæt egenskaber på valgte billeder."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Valgte filer mærket med titlen '%s'."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "Fjernede titel fra valgte filer."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Valgte filer mærket med kunstneren '%s'."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "Fjernede kunstner fra valgte filer."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Valgte filer mærket med album '%s'."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "Fjernede albumnavn fra valgte filer."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Valgte filer mærket med disknummer '%s'."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "Fjernede disknummer fra valgte filer."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Valgte filer mærket med år '%s'."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "Fjernede år fra valgte filer."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Valgte filer mærket med spor som 'xx/%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Valgte filer mærket med spor som 'xx'."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "Fjernede spornummer fra valgte filer."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "Valgte spor givet numre sekventielt."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Valgte filer mærket med genre '%s'."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "Fjernede genre fra valgte filer."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Valgte filer mærket med kommentar '%s'."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "Fjernede kommentar fra valgte filer."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Valgte filer mærket med komponist '%s'."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "Fjernede komponist fra valgte filer."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Valgte filer mærket med original kunstneren '%s'."
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "Fjernede original kunstner fra valgte filer."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Valgte filer mærket med ophavsret '%s'."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "Fjernede ophavsret fra valgte filer."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Valgte filer mærket med URL '%s'."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "Fjernede URL fra valgte filer."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Vælg filer mærker med encoder-navn '%s'."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr "Fjern encoder-navn fra valgte filer."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "Valgte filer mærket med billeder."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "Fjernede billeder fra valgte filer."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Vælg mode og maske, og omgør den samme handling"
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "Alle mærker er blevet scannet"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "Alle mærker er blevet fjernet"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "Alle filer er blevet gemt..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "Filer er blevet delvist gemt..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "Filer er blevet delvist slettet..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "Alle filer er blevet slettet..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2060,16 +2093,16 @@ msgstr ""
 "Vil du skrive mærket på filen\n"
 "'%s' ?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "Skriv mærke..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr "Omdøb fil og mappe..."
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2084,11 +2117,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr "Omdøb mappe ..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2102,11 +2135,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "Omdøb fil..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2119,17 +2152,17 @@ msgstr ""
 "til \n"
 "'%s' ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Skriver mærker på '%s'"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 msgid "Tag(s) written"
 msgstr "Mærke(r) skrevet"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2586 src/easytag.c:2591
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2138,14 +2171,14 @@ msgstr ""
 "Kan ikke skrive mærke til fil '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Omdøber fil '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2737 src/easytag.c:2769 src/easytag.c:2941
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2158,11 +2191,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "Fil(er) ikke omdøbt..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2175,7 +2208,7 @@ msgstr ""
 "fordi den følgende fil allerede eksisterer:\n"
 "'%s'"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2187,16 +2220,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Omdøbte fil '%s' til '%s'"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "Fil(er) omdøbt..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2208,17 +2241,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Flyttede fil '%s' til '%s'"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
 msgstr "Fil(er) flyttet..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2231,11 +2264,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
 msgstr "Fil(er) ikke flyttet"
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2244,16 +2277,16 @@ msgstr ""
 "Vil du virkelig slette filen\n"
 "'%s' ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "Slet fil..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Fil '%s' slettet"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2265,109 +2298,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "Søgning i gang..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "Fil: '%s'"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, 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:3239
+#: src/easytag.c:3356
 #, 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:3252 src/et_core.c:2696
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u fil(er)"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
 msgstr "Ingen filer fundet i denne mappe og undermapper!"
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "Ingen fil fundet i denne mappe!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "Søger..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "  STOP søgningen...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "Vælg en mappe at gennemse!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "Mærk valgte filer med dette felt"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Konvertér '_' og '%20' til mellemrum"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "Konvertér ' ' til '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "Alle store bogstaver"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "All små bogstaver"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "Første bogstav stort"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "Første bogstav stort på hvert ord"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "Fjern mellemrum"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "Indsæt mellemrum før store bogstaver"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 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:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Unormal afslutning! (PId: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, fuzzy, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Modtog signal %s (%d)\a\n"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 "
@@ -2377,11 +2410,11 @@ msgstr ""
 "backtrace ('gdb easytag core', så 'bt' og så 'l') og oplysninger der kan "
 "reproducere problemet til <easytag@gmail.com>"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "Ukendt signal"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2414,11 +2447,11 @@ msgstr ""
 "sti_til/filer     Indlæs relativ sti.\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normal afslutning."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2426,79 +2459,79 @@ msgstr ""
 "Nogle filer er blevet ændret men ikke gemt...\n"
 "Vil du gemme dem før du afslutter programmet?"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr " Vil du virkelig afslutte programmet? "
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "ID3 mærke"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis mærke"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis mærke"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "APE mærke"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC mærke"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "MP3 fil"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "MP2 fil"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis fil"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 #, fuzzy
 msgid "Speex File"
 msgstr "Næste fil"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "FLAC fil"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "MusePack fil"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "Monkey's Audio fil"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr "MP4/AAC fil"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 #, fuzzy
 msgid "Wavpack File"
 msgstr "MusePack fil"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "Billeder"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2506,14 +2539,14 @@ 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/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2524,11 +2557,11 @@ msgstr ""
 "til systemets tegnsæt\n"
 "(Prøv at sætte miljø-variablen G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "Filnavn oversættelse"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Filnavnet '%s' overskrider %d tegn og vil blive forkortet!\n"
@@ -2538,7 +2571,7 @@ msgstr "Filnavnet '%s' overskrider %d tegn og vil blive forkortet!\n"
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "Encoder:"
@@ -2547,49 +2580,54 @@ msgstr "Encoder:"
 #. 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/flac_header.c:312 src/mp4_header.c:286 src/ogg_header.c:267
 #: src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Kanaler:"
 
-#: src/flac_tag.c:140 src/flac_tag.c:741
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "FEJL ved åbning af fil: '%s' (%s).\n"
 "\a"
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "FEJL: Kunne ikke skrive kommentarer til fil '%s' (%s)."
 
-#: src/flac_tag.c:990 src/ogg_tag.c:759
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Skrev mærke på '%s'"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Fjernede mærke på '%s'"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Fejl under fjernelse af ID3v1 mærke på '%s' (%d)"
 
-#: src/id3_tag.c:490 src/id3_tag.c:557
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Fejl under fjernelse af ID3v2 mærke på '%s' (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Fejl under opdatering af ID3v2 mærke på '%s' (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2604,77 +2642,77 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Fejl under opdatering af ID3v1 mærke på '%s' (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Opdaterede mærke på '%s'"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "Ingen fejl rapporteret"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "Ingen tilgængelige hukommelse"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "Ingen data at fortolke"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "Forkert formatteret data"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "Ingen buffer at skrive til"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "Buffer er for lille"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "Ugyldigt frame ID"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "Anmodet felt ikke fundet"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "Ukendt felt type"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "Mærke er allerede tilknyttet til en fil"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "Ugyldig mærke version"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "Ingen fil at fortolke"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "Prøver at skrive til en fil med kun læseadgang"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "Fejl i pakning/udpakning"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "Ukendt fejlbesked!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2683,127 +2721,83 @@ msgstr ""
 "Eftersom den følgende ødelagte fil: '%s'\n"
 "vil skabe en fejl i id3lib, vil den ikke blive indlæst af programmet."
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
 msgstr "Ødelagt fil..."
 
-#: src/log.c:91
+#: src/log.c:95
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:214
-msgid " OK "
-msgstr " O.k. "
-
-#: src/misc.c:219
-msgid " Yes "
-msgstr " Ja "
-
-#: src/misc.c:224
-msgid " No "
-msgstr " Nej "
-
-#: src/misc.c:229
-msgid " Apply "
-msgstr " Anvend "
-
-#: src/misc.c:234
-msgid " Save "
-msgstr " Gem "
-
-#: src/misc.c:239
-msgid " Cancel "
-msgstr " Annullér "
-
-#: src/misc.c:244
-msgid " Close "
-msgstr " Luk "
-
-#: src/misc.c:249
-msgid " Write "
-msgstr " Skriv "
-
-#: src/misc.c:254
-msgid " Execute "
-msgstr " Kør "
-
-#: src/misc.c:259
-msgid " Search "
-msgstr " Søg "
-
-#: src/misc.c:264
-msgid " Browse... "
-msgstr " Gennnemse... "
+#: src/misc.c:773
+msgid "Select file..."
+msgstr "Vælg fil..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "Vælg mappe..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "Vælg fil..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 #, fuzzy
 msgid "Warning..."
 msgstr "Søger..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "Opret en spilleliste"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "M3U spillelistenavn"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "Brug mappenavn"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "Redigér masker"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "Spilleliste tilvalg"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "Inkludér kun de valgte filer"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2811,31 +2805,31 @@ msgstr ""
 "Hvis aktiveret, vil kun de valgte filer blive skrevet til spillelisten. "
 "Ellers, vil alle filer blive skrevet."
 
-#: src/misc.c:1397
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "Brug fuld sti for filer i spilleliste"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 msgid "Use relative path for files in playlist"
 msgstr "Brug relativ sti for filer i spilleliste"
 
 #. Create playlist in parent directory
-#: src/misc.c:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "Opret spilleliste i et niveau højere end dette"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 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:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "Brug DOS-mappe adskiller"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2843,23 +2837,23 @@ msgstr ""
 "Denne indstilling erstatter UNIX-mappenavne adskiller '/' med DOS-adskiller "
 "'\\'."
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "Spilleliste indhold"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "Skriv kun liste af filer"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "Skriv oplysninger ved hjælp af filnavn"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "Skriv oplysninger med :"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2868,12 +2862,12 @@ msgstr ""
 "Spileliste fil '%s' eksisterer allerede!\n"
 "Overskriv?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "Skriv spilleliste..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2882,44 +2876,24 @@ msgstr ""
 "Kan ikke skrive spilleliste fil '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Skrev spilleliste fil '%s'"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1964
-msgid "Track"
-msgstr "Spor"
-
-#: src/misc.c:1967 src/picture.c:821
-msgid "Composer"
-msgstr "Komponist"
-
-#: src/misc.c:1968
-msgid "Orig. Artist"
-msgstr "Orig. kunstner"
-
-#: src/misc.c:1969
-msgid "Copyright"
-msgstr "Ophavsret"
-
-#: src/misc.c:1970
-msgid "URL"
-msgstr "URL"
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "Encoded af"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "Søg efter en fil"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2927,93 +2901,93 @@ msgstr ""
 "alle filer blive vist."
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "I :"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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:2033
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "mærket"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Forskel på store og små bogstaver"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Fandt : %d fil(er)"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "Hent filnavne fra TXT fil"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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:2787
+#: src/misc.c:2738
 msgid " Load "
 msgstr " Indlæs "
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, 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
+#: src/misc.c:2782 src/misc.c:2876
 #, 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
+#: src/misc.c:2791 src/misc.c:2885
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "Slet denne linje"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 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
+#: src/misc.c:2812 src/misc.c:2906
 #, 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
+#: src/misc.c:2821 src/misc.c:2915
 #, 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "Genindlæs"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "Skriv kun liste af filer"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "Vælg alle linjer"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3021,20 +2995,20 @@ msgstr ""
 "Efter aktivering af denne indstilling, og efter at indlæse filnavne, den "
 "nuværende scanner vil blive kørt (scannervinduet skal være åbent)."
 
-#: src/misc.c:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "Indsæt en blank linje"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "Slet denne linje"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "Flyt denne maske op"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "Flyt denne maske ned"
@@ -3052,7 +3026,7 @@ msgstr "Lyd"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr "MP4 format ugyldigt"
 
@@ -3077,8 +3051,7 @@ msgstr ""
 msgid "Single channel"
 msgstr ""
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "Gentag handling for resten af filerne"
 
@@ -3116,48 +3089,48 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "FEJL: Kunne ikke åbne filen '%s' som vorbis (%s)."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Advarsel : Ogg Vorbis filen '%s' indeholder et ID3v2 mærke."
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "Tilføj billeder"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "Alle filer"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG og JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "Billed egenskaber %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "Billedtype"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "Billedbeskrivelse:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "Gem billede %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3168,115 +3141,120 @@ msgstr ""
 "'%s'\n"
 "Vil du overskrive?"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "Gem fil..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "JPEG-billede"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "PNG-billede"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "Ukendt billede"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32 billedpunkter, PNG filikon"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "Andet filikon"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "Cover (forside)"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "Cover (bagside)"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr "Brochure side"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr "Medie (f.eks. mærkesiden af CD'en)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr "Hovedkunstner"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "Kunstner/optræder"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "Leder"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "Band/orkester"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "Lyrik skriver"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "Optagelsesplacering"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "Under optagelse"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "Under optræden"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "Film/video skærmbillede"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "En lys farvet fisk"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "Illustration"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "Band/Kunstner logotype"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "Udgiver/studie logotype"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "Ukendt billedtype"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "billedpunkter"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "Type"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3284,11 +3262,16 @@ msgstr ""
 "Kan ikke vise billedet, eftersom ikke nok data er blevet læst der kan "
 "bestemme hvordan billedbufferen skal oprettes."
 
-#: src/picture.c:987
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr "Indlæser billedfil..."
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3299,7 +3282,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr "Billedfil ikke indlæst..."
 
@@ -3702,7 +3685,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "Tving at brug systemtegnsættet og aktivér konvertering af ukendte tegn"
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3717,7 +3700,7 @@ msgid ""
 "characters"
 msgstr "Tving til at bruge systemtegnsæt og smid nogle tegn væk"
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3915,7 +3898,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr ""
 
@@ -3936,35 +3919,45 @@ msgstr "Tegnsæt der skal bruges til at skrive mærke-data i filen."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 #, fuzzy
 msgid "No"
 msgstr " Nej "
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+#, fuzzy
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+"Med denne indstilling, når et tegn ikke kan repræsenteres i det valgte "
+"tegnsæt, vil der blive gættet på et andet tegn der ligner."
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "ID3 mærke"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "Skriv ID3v1.x mærke"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3972,22 +3965,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:878
+#: src/prefs.c:882
 #, 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:910
+#: src/prefs.c:917
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Tegnsæt for ID3-mærker"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -4018,31 +4011,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:947
+#: src/prefs.c:954
 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:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "Scanner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Udfyld mærke scanner - Karakter konvertering"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Konvertér underscore karakter '_' og streng '%20' til mellemrum ' '"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Konvertér mellemrum ' ' til underscore '_'"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4051,11 +4044,11 @@ msgstr ""
 "fra scanneren for mærker."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Omdøb filscanner - Karakter konvertering"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4064,18 +4057,18 @@ msgstr ""
 "i scanneren for filnavne."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 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:1034
+#: src/prefs.c:1041
 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:1038
+#: src/prefs.c:1045
 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 +4079,15 @@ msgstr ""
 "f.eks. 'feat.' (featuring)."
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "Scannervindue"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "Åbn scannervindue ved opstart"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4102,11 +4095,11 @@ msgstr ""
 "Aktiver denne indstilling for automatisk at åbne scannervinduet når EasyTAG "
 "starter."
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "Scannervindue altid øverst"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4115,16 +4108,16 @@ msgstr ""
 "hovedvinduet."
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "Felter"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "Overskriv felter når der scannes efter mærker"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4132,11 +4125,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:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "Sæt denne tekst som standard kommentar :"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4145,11 +4138,11 @@ msgstr ""
 "kommentar feltet når der bruges 'Udfyld mærke' scanneren."
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 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:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4160,46 +4153,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "CDDB"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Automatisk søgning"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "Navn :"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "CGI-sti :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Serverindstillinger"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "CDDB"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 #, fuzzy
 msgid "Path :"
 msgstr "CGI-sti :"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4208,58 +4201,58 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "Mellemværtsindstillinger"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "Brug en mellemvært"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "Aktivér mellemværtsindstillinger"
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "Værtsnavn :"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "Navn på mellemværtsserveren."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "Port på mellemværtsserveren."
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "Brugernavn :"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "Navn på bruger for mellemværten."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "Bruger adgangskode :"
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 msgid "Password of user for the the proxy server."
 msgstr "Brugerens adgangskoden til mellemværten."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "Spornavn liste"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 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:1353
+#: src/prefs.c:1360
 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."
@@ -4268,7 +4261,7 @@ msgstr ""
 "tilsvanrede lydfil i hovedlisten også blive valgt."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4279,15 +4272,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "Bekræftelse"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "Bekræft afslutning fra programmet"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4295,19 +4288,19 @@ msgstr ""
 "Hvis aktiveret, åbnes en dialogboks for at spørge om bekræftelse før "
 "afslutning af programmet."
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "Bekræft skrivning af filmærke"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "Bekræft omdøbning af fil"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "Bekræft sletning af fil"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "Bekræft skrivning af spilleliste"
 
@@ -4315,37 +4308,37 @@ msgstr "Bekræft skrivning af spilleliste"
 #. //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
+#: src/prefs.c:1429
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Anvend ændringer (men gem ikke) og luk dette vindue"
 
-#: src/prefs.c:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "Luk dette vinduet uden at gemme"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 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:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Eksempel : %.*d_-_Spor_navn_1.mp3)"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "Ændringer anvendt"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "Opsætning gemt"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "Opsætning uændret"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4356,57 +4349,57 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "Ikke en mappe"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Lydafspilleren '%s' blev ikke fundet!"
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "Udfyld mærke"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "Omdøb fil og mappe"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "Behandl felter"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "Mærke succesfuldt scannet..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Mærke succesfuldt scannet...(%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, 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:663
+#: src/scan.c:667
 #, 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:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "Nyt filnavn succesfuldt scannet..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nyt filnavn succesfuldt scannet...(%s)"
@@ -4414,41 +4407,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "Mærk og filnavns scan"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "Scanner :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "Vælg scannertypen"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "Åbn scannervindue / Scan valgte filer"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "Scanner indstillinger"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "Vis / Skjul maske redigering"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "Vis / Skjul signatur"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "Luk dette vindue"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4457,15 +4450,15 @@ msgstr ""
 "filnavne og sti. Brugt til at udfylde i mærke-felter."
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "Udfyld-mærke forvisning..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr "Præfiks maske med nuværende sti"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4478,15 +4471,15 @@ msgstr ""
 "sti, ellers er den relativ til den gamle sti."
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "Omdøb filforvisning..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "Vælg felter:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4495,126 +4488,126 @@ msgstr ""
 "dem som har din interesse."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
 msgstr "Behandl filnavnsfelt"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "Behandl titel felt"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "K"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "Behandl kunstnerfelt"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "A"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "Behandl album felt"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "Behandl genre felt"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "Ko"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "Behandl kommentar felt"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "Op"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "Behandl komponist felt"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 msgid "Process original artist field"
 msgstr "Behandl original kunstner felt"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Oh"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "Behandl ophavsret felt"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr "Behandl URL felt"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr "Behandl encoder-navn felt"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "Invertér valg"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "Vælg/fravælg alle."
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Konvertér '_' og '%20' til ' '"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "Konvertér :"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "til : "
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4622,7 +4615,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:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4630,12 +4623,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:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4643,7 +4636,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:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4651,7 +4644,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:2325
+#: src/scan.c:2394
 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'."
@@ -4659,7 +4652,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:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4667,15 +4660,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:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "Indsæt et mellemrum før et stort bogstav"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "Fjern dubletter af mellemrum og underscores"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4683,7 +4676,7 @@ msgstr ""
 "Alle mellemrum mellem ord er fjernet. F.eks., før: 'Text In An Entry', "
 "efter: 'TextInAnEntry'."
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4691,7 +4684,7 @@ msgstr ""
 "Et mellemrum er indsat før hvert store bogstav. F.eks., før: "
 "'TextInAnEntry', efter: 'Text In An Entry'."
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4702,161 +4695,161 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "Signatur"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a : kunstner"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c : kommentar"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p : komponist"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r : ophavsret"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : disknummer"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : encoded af"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g : genre"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignoreret"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l : antal spor"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : orig. kunstner"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n : spor"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t : titel"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y : år"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "Maske redigering"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "Opret ny maske"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "Flyt denne maske op"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "Flyt denne maske ned"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "Dublér maske"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "Tilføj standard maskem"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "Fjern maske"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "Gem masker"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "Ny_maske"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "Kopi: Ingen række valgt!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "Fjern: Ingen række valgt!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "Flyt op: Ingen række valgt!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "Flyt ned: Ingen række valgt!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, 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:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Kan ikke åbne opsætningsfil '%s' (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 msgid "Loading default configuration..."
 msgstr "Henter standardopsætning..."
 
-#: 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Kan ikke oprette eller åbne fil '%s' (%s)"
 
-#: src/setting.c:1278
+#: src/setting.c:1277
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
@@ -4864,28 +4857,28 @@ msgstr ""
 "\a"
 
 #. Fall back to defaults
-#: src/setting.c:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Indlæser standard 'Udfyld mærke' masker..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "Indlæser standard 'Omdøb fil' masker..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Indlæser standard 'Omdøb mappe' masker..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "FEJL: Miljøvariablen HOME er ikke sat!\n"
 "\n"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "FEJL: Kan ikke oprette mappe '%s' (%s)!"
@@ -4935,42 +4928,75 @@ msgstr ""
 "eller ødelagte."
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr ""
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr ""
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr ""
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr ""
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, fuzzy, c-format
 msgid "Audio player: '%s'"
 msgstr "Kør musikafspiller"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid " OK "
+#~ msgstr " O.k. "
+
+#~ msgid " Yes "
+#~ msgstr " Ja "
+
+#~ msgid " No "
+#~ msgstr " Nej "
+
+#~ msgid " Apply "
+#~ msgstr " Anvend "
+
+#~ msgid " Save "
+#~ msgstr " Gem "
+
+#~ msgid " Cancel "
+#~ msgstr " Annullér "
+
+#~ msgid " Close "
+#~ msgstr " Luk "
+
+#~ msgid " Write "
+#~ msgstr " Skriv "
+
+#~ msgid " Execute "
+#~ msgstr " Kør "
+
+#~ msgid " Search "
+#~ msgstr " Søg "
+
+#~ msgid " Browse... "
+#~ msgstr " Gennnemse... "
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/de.gmo b/po/de.gmo
index a661ee9..4d2559b 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index fb5616c..d1faaef 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,17 +10,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: EasyTAG 2.1.2\n"
+"Project-Id-Version: EasyTAG 2.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-15 23:53+0200\n"
-"PO-Revision-Date: 2007-07-12 07:44+0200\n"
+"POT-Creation-Date: 2007-12-09 18:16+0100\n"
+"PO-Revision-Date: 2007-10-16 09:12+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:134
+#: src/about.c:140
 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,233 +31,218 @@ msgstr ""
 "Audio-Dateien. Seine einfache und hübsche GTK+-Oberfläche macht das Taggen "
 "einfacher."
 
-#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(Deutsche Übersetzung)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(Russische Übersetzung)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(Holländische Übersetzung)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(Schwedische Übersetzung)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(Ungarische Übersetzung)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(Italienische Übersetzung)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(Japanische Übersetzung)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(Ukrainische Übersetzung)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(Tschechische Übersetzung)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(Spanische Übersetzung)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(Polnische Übersetzung)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(Rumänische Übersetzung)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(Dänische Übersetzung)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(Griechische Übersetzung)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Brasilianisch Portugische Übersetzung)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr "(Bulgarische Übersetzung)"
 
-#: src/about.c:171
+#: src/about.c:177
 msgid "(Chinese translation)"
 msgstr "(Chinesische Übersetzung)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(Chinesische Übersetzung)"
+
+#: src/about.c:179
 msgid "(Hebrew translation)"
 msgstr "(Hebräische Übersetzung)"
 
-#: src/about.c:173
-#, fuzzy
+#: src/about.c:180
 msgid "(Serbian translation)"
-msgstr "(Deutsche Übersetzung)"
+msgstr "(Serbische Übersetzung)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
-msgstr ""
+msgstr "Erweiterungsname"
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "Kommentar"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "Über..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "Über"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compiliert: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(verwendet: GTK+ %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-Mail: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Homepage: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "Beschreibung:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
-msgstr ""
-
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
+msgstr "Erweiterungen"
 
-#: src/about.c:394
-#, fuzzy
+#: src/about.c:433
 msgid "MP3 file support"
-msgstr "(MP3-Unterstützung deaktiviert)"
+msgstr "MP3-Unterstützung"
 
-#: 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
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 msgid "enabled"
-msgstr "Gerahmt"
+msgstr "aktiviert"
 
-#: 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
-msgstr ""
+msgstr "deaktiviert"
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
-#, fuzzy
+#: src/about.c:449
 msgid "ID3v2.3 tags writting support"
-msgstr "(ID3v2.3-Tag-Unterstützung deaktiviert)"
+msgstr "Schreiben von ID3v2.3-Tags"
 
-#: src/about.c:410
-#, fuzzy
+#: src/about.c:452
 msgid "available"
-msgstr "(Nicht vorhanden!)"
+msgstr "verfügbar"
 
-#: src/about.c:420
-#, fuzzy
+#: src/about.c:463
 msgid "Ogg Vorbis file support"
-msgstr "(Ogg Vorbis-Unterstützung deaktiviert)"
+msgstr "Ogg Vorbis-Unterstützung"
 
-#: src/about.c:430
-#, fuzzy
+#: src/about.c:475
 msgid "Speex file support"
-msgstr "(Speex-Unterstützung deaktiviert)"
+msgstr "Speex-Unterstützung"
 
-#: src/about.c:440
-#, fuzzy
+#: src/about.c:491
 msgid "FLAC file support"
-msgstr "(FLAC-Unterstützung deaktiviert)"
+msgstr "FLAC-Unterstützung"
 
-#: src/about.c:450
-#, fuzzy
+#: src/about.c:504
 msgid "MP4/AAC file support"
-msgstr "(MP4/AAC-Unterstützung deaktiviert)"
+msgstr "MP4/AAC-Unterstützung"
 
-#: src/about.c:460
-#, fuzzy
+#: src/about.c:516
 msgid "WavPack file support"
-msgstr "(WavPack-Unterstützung deaktiviert)"
+msgstr "WavPack-Unterstützung"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "Danksagung"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "Übersetzungen:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "Allgemeines:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "Änderungen"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "FEHLER beim Öffnen der Datei: '%s' (%s)."
@@ -433,7 +418,7 @@ msgstr "Absteigend nach Samplerate"
 msgid "Open File(s) with ..."
 msgstr "Öffne Datei(en) mit ..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "Alle Dateien auswählen"
 
@@ -441,7 +426,7 @@ msgstr "Alle Dateien auswählen"
 msgid "Unselect All Files"
 msgstr "Alle Dateien abwählen"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "Dateiauswahl umkehren"
 
@@ -587,7 +572,7 @@ msgstr "Verzeichnis umbenennen..."
 msgid "Reload Directory"
 msgstr "Verzeichnis neu einlesen"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "Verzeichnis betrachten mit ..."
 
@@ -726,17 +711,17 @@ msgstr "Konnte Oberfläche nicht verschmelzen, der Fehler war: %s\n"
 msgid "Ready to start..."
 msgstr "Bereit zum Start..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 msgid "New default path for files selected"
 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:4550 src/easytag.c:4570 src/easytag.c:4589
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "Bestätigen..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -744,69 +729,117 @@ msgstr ""
 "Einige Dateien wurden verändert, aber nicht gespeichert...\n"
 "Möchten sie diese vor dem Wechseln des Verzeichnisses speichern?"
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 msgid "<All albums>"
 msgstr "<Alle Alben>"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "Baum"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "Dateiname"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "Titel"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "Künstler"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "Album"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "Jahr"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "Stück #"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "Genre"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "Komponist"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "Originalkünstler"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "Copyright"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "URL"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "Kodierer"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "# Alben"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 msgid "# Files"
 msgstr "# Dateien"
 
-#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
-msgid "Album"
-msgstr "Album"
-
-#: src/browser.c:2822
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "Zum Elternverzeichnis gehen"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "Geben sie das zu durchsuchende Verzeichnis an"
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "Baum"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "Wählen sie ein Verzeichnis aus!"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "Künstler & Album"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "Verzeichnis umbenennen"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Benenne Verzeichnis '%s' um in : "
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "Nutze Maske :"
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 msgid "If activated, it will use masks to rename directory."
 msgstr ""
 "Wenn aktiviert, dann werden Masken zur Umbenennung des Verzeichnisses "
 "verwendet."
 
-#: src/browser.c:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -814,31 +847,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:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
-#: src/scan.c:2119 src/scan.c:2465
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "Ungültige Scannermaske"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 msgid "Rename directory preview..."
 msgstr "Verzeichnisumbenennungsvorschau..."
 
-#. 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "Fehler..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "Sie müssen einen Verzeichnisnamen angeben!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -849,16 +882,22 @@ msgstr ""
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -867,7 +906,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -876,7 +915,7 @@ msgstr ""
 "Umbenennung nicht möglich, da dieser Verzeichnisname bereits existiert!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -891,88 +930,88 @@ msgstr ""
 "'%s' umbenannt werden!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "Verzeichnis umbenannt"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "Programm starten:"
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 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:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "Öffne Datei mit ..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 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:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "Sie müssen einen Programmnamen angeben!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Das Programm '%s' wurde nicht gefunden!"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Kann %s nicht ausführen (Fehler %d)!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "Kein weiterer Prozess kann gestartet werden!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Ausgeführtes Programm: '%s %s'"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "Künstler / Album"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Category"
 msgstr "Kategorie"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:229 src/cddb.c:438
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "Stückname:"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "Zeit"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "CD-Datenbanksuche"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "Automatische Suche"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 msgid "Request CD database :"
 msgstr "Frage CD-Datenbank an :"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -980,16 +1019,16 @@ msgstr ""
 "Frage die CDDB-Datenbank automatisch mit den ausgewählten Dateien (die "
 "Reihenfolge ist wichtig!) an, um die CddbID zu erzeugen."
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "Suche abbrechen ..."
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr "Benutze lokale CDDB"
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1000,139 +1039,139 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "Manuelle Suche"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "Wörter :"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Gib die zu suchenden Wörter ein (durch Leerzeichen oder '+' getrennt)"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "Suche in :"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "Alle Felder"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "Andere"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "Alle Kategorien"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "Klassik"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Extra"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "New Age"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "beinhaltet: Funk, Soul, Rap, Pop, Industrial, Metal, usw."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "Filme, Shows"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "andere, die nicht in die obigen Kategorien passen"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr "Kategorien"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "Ergebnisse :"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "Suche :"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "Gib die in der unten stehenden Liste zu  suchenden Wörter ein"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "Suche nächsten"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "Suche vorherigen"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Zeige nur rote Zeilen (oder zeige alle Zeilen) in der 'Künster / Album'-"
 "Liste "
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "Alle Zeilen abwählen"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "Zeilenauswahl umkehren"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "Alle Zeilen auswählen"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1145,52 +1184,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "Setze ein :"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 msgid "All"
 msgstr "Alle"
 
-#: src/cddb.c:721 src/misc.c:1958
-msgid "File Name"
-msgstr "Dateiname"
-
-#: src/cddb.c:722 src/misc.c:1959
-msgid "Title"
-msgstr "Titel"
-
-#: src/cddb.c:725 src/misc.c:1963
-msgid "Year"
-msgstr "Jahr"
-
-#: src/cddb.c:726
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "Stück #"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 msgid "# Tracks"
 msgstr "# Stücke"
 
-#: 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:3013
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "Aktuellen Scanner für alle Dateien ausführen"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "Finde passende Zeilen mit dem Levenshtein-Algorithmus"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:777 src/prefs.c:1362
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1204,91 +1227,91 @@ msgstr ""
 "Dies wird bei der Auswahl der zugehörigen Audiodatei oder der Anwendung der "
 "CDDB-Ergebnisse statt der Benutzung der direkten Reihenfolge durchgeführt."
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 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:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "Bereit zur Suche..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, 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:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "Auswahl umkehren"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "Sortiere nach Stücknummer"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "Sortiere nach Stücknamen"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Suche Rechner '%s' ..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Kann Rechner '%s' nicht finden (%s)!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, 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:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Verbinde mit Rechner '%s' Port '%d' ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Kann keine Verbindung zu '%s' aufbauen (%s)! "
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Verbunden mit Rechner '%s'"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Empfange Daten (%s) ..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Fehler beim Lesen der CDDB-Anfrage (%s)!"
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Datei '%s' kann nicht angelegt werden (%s)"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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:2246 src/cddb.c:2564 src/cddb.c:3397
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "Sende Anfrage ..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Kann die Anfrage nicht senden (%s)!"
@@ -1297,91 +1320,92 @@ msgstr "Kann die Anfrage nicht senden (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "Empfange Daten ..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 msgid "The server returned a wrong answer!"
 msgstr "Der Server hat eine falsche Antwort gegeben!"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Der Server hat eine falsche Antwort gegeben! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Entschuldigung, die Web-basierte Suche funktioniert gerade nicht."
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "%d passende Alben gefunden."
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Empfange Daten der Seite %d (Album %d/%d)..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Empfange Daten der Seite %d ..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr "Mehr Ergebnisse zu laden ..."
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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:2889
+#: src/cddb.c:2893
 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:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d Datei(en) ausgewählt!"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 msgid "Local CD search..."
 msgstr "Lokale CD-Suche..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
+#, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 "Der Pfad zur 'lokalen CD-Datenbank' wurde nicht festgelegt!\n"
 "Stellen sie ihn im Einstellungsfenster ein."
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, 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:3268
+#: src/cddb.c:3276
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "%d passende Alben für die DiscID '%s' gefunden."
 
-#: src/cddb.c:3364
+#: src/cddb.c:3372
 #, 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:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "Lade Titelliste des Albums ..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1394,7 +1418,7 @@ msgstr ""
 "\n"
 "Wollen sie weitermachen?"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "Schreibe Tag aus CDDB..."
 
@@ -1579,71 +1603,71 @@ msgstr "Westlich (ISO-8859-15)"
 msgid "Western (Windows-1252)"
 msgstr "Westlich (Windows-1252)"
 
-#: src/charset.c:542
-#, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
+#: src/charset.c:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Der Dateiname '%s' konnte nicht nach UTF-8 konvertiert werden (%s).\n"
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "ungültiges UTF-8"
 
-#: src/charset.c:641
-#, c-format
+#: src/charset.c:642
+#, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
 "Die UTF-8-Zeichenkette '%s' konnte nicht in die Dateinamenskodierung "
 "umgewandelt werden (%s)\n"
 
-#: src/charset.c:705
-#, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+#: src/charset.c:706
+#, fuzzy, c-format
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 "Die Zeichenkette '%s' konnte nicht nach UTF-8 konvertiert werden (%s).\n"
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "EasyTAG %s wird gestartet (PId: %d)..."
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "Verwendet libid3tag Version %s ..."
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "Verwendet id3lib Version %d.%d.%d ..."
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr "Variable EASYTAGLANG definiert. Setze Sprache: '%s'"
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, c-format
 msgid "Setting locale : '%s'"
 msgstr "Setze Sprache: '%s'"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr "Verwende momentan die Spracheinstellung '%s' (letztendlich '%s')..."
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s von %s (kompiliert um %s am %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "Homepage: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr "Unbekannter Parameter oder Pfad '%s'\n"
@@ -1651,128 +1675,128 @@ msgstr "Unbekannter Parameter oder Pfad '%s'\n"
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "Auswahl"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "Datei"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "Datei ist nur lesbar"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 msgid "File Link Broken"
 msgstr "Datei-Link kaputt"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, Ebene ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "Frequenz:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Modus:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
-#: src/easytag.c:4073
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "Größe:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? kb"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "Dauer:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "Tag"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "Allgemein"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "Titel:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "Diesen Titel in allen ausgewählten Dateien eintragen"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "Künstler:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr "Diesen Künstler in allen ausgewählten Dateien eintragen"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr "Diesen Albumnamen in allen ausgewählten Dateien eintragen"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr "Diesen CD-Nummer in allen ausgewählten Dateien eintragen"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "Jahr:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "Dieses Jahr in allen ausgewählten Dateien eintragen"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Alle ausgewählten Stücke sequentiell durchnummerieren. Beginnt mit 01 in "
@@ -1780,11 +1804,11 @@ msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "Stück #:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1792,276 +1816,276 @@ msgstr ""
 "Fügt die Anzahl der Dateien, die in dem gleichen Verzeichnis wie die "
 "aktuelle Datei sind, den ausgewählten Dateien hinzu."
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr "Diese Gesamtzahl an Stücken in allen ausgewählten Dateien eintragen"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "Genre:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "Dieses Genre in allen ausgewählten Dateien eintragen"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 msgid "Tag selected files with this comment"
 msgstr "Diesen Kommentar in allen ausgewählten Dateien eintragen"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:818
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "Komponist"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr "Diesen Komponisten in allen ausgewählten Dateien eintragen"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "Originalkünstler:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr "Diesen Originalkünstler in allen ausgewählten Dateien eintragen"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "Dieses Copyright in allen ausgewählten Dateien eintragen"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "Diese URL in allen ausgewählten Dateien eintragen"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "Kodierer:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr "Diesen Kodierer in allen ausgewählten Dateien eintragen"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "Bilder"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "Bilder:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "Sie können Bilder durch Drag und Drop hinzufügen."
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "Diese Bilder in allen ausgewählten Dateien eintragen"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 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
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr "Entferne ausgewählter Bilder, sonst alle Bilder."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "Speichere ausgewählte Bilder auf der Festplatte."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "Setze Eigenschaftern der ausgewählten Bilder."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "In allen ausgewählten Dateien wurde der Title '%s' eintragen."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "Dieser Titel wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Künstler '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "Künstler wurde(n) aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Album '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "Albumname wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "CD-Nummer '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "CD-Nummer aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Jahr '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "Jahr wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr ""
 "In allen ausgewählten hDateien wurden Stücknummern wie 'xx/%s' eingetragen."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr ""
 "In allen ausgewählten Dateien wurden Stücknummern wie 'xx' eingetragen."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "Stücknummer aus allen ausgewählten Dateien entfernt."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "Alle ausgewählten Stücke wurden durchnummeriert."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Genre '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "Genre wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Kommentar '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "Kommentar wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Komponist '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "Komponist wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Originalkünstler '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "Originalkünstler wurde(n) aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Copyright '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "Copyright wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "URL '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "URL wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Kodierer '%s' wurde in allen ausgewählten Dateien eingetragen."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr "Kodierer wurde aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "In allen ausgewählten Dateien wurden die Bilder eingetragen."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "Die Bilder wurden aus allen ausgewählten Dateien entfernt."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Wählen sie Modus und Maske und wiederholen sie die Aktion"
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "Alle Tags wurden durchsucht"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "Alle Tags wurden entfernt"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "Alle Dateien wurden gespeichert..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "Dateien wurden teilweise gespeichert..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "Dateien wurden teilweise gelöscht..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "Alle Dateien wurden gelöscht..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2070,16 +2094,16 @@ msgstr ""
 "Wollen sie den Tag der Datei\n"
 "'%s' schreiben?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "Tag wird geschrieben..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr "Datei und Verzeichnis umbenennen..."
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2093,11 +2117,11 @@ msgstr ""
 "'%s' umbenennen?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr "Verzeichnis umbenennen..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2111,11 +2135,11 @@ msgstr ""
 "'%s' umbenennen?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "Datei umbenennen..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2128,17 +2152,17 @@ msgstr ""
 "in \n"
 "'%s' umbenennen?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Schreibe Tag von '%s'"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 msgid "Tag(s) written"
 msgstr "Tag(s) wurden geschrieben"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2586 src/easytag.c:2591
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2147,14 +2171,14 @@ msgstr ""
 "Tag kann nicht in Datei '%s' geschrieben werden!\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Benenne Datei '%s' um"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2737 src/easytag.c:2769 src/easytag.c:2941
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2167,11 +2191,11 @@ msgstr ""
 "'%s' umbenannt werden!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "Datei(en) nicht umbenannt..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2184,7 +2208,7 @@ msgstr ""
 "kann nicht umbenannt werden, da die folgende Datei bereits existiert:\n"
 "'%s'"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2196,16 +2220,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Datei '%s' wurde in '%s' umbenannt"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "Datei(en) umbenannt..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2217,17 +2241,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Datei '%s' nach '%s' verschoben"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
 msgstr "Datei(en) verschoben..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2240,11 +2264,11 @@ msgstr ""
 "'%s' verschoben werden!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
 msgstr "Datei(en) nicht verschoben..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2253,16 +2277,16 @@ msgstr ""
 "Wollen sie diese Datei wirklich löschen:\n"
 "'%s' ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "Datei löschen..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Datei '%s' gelöscht"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2274,109 +2298,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "Suche läuft..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "Datei: '%s'"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, 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:3239
+#: src/easytag.c:3356
 #, 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:3252 src/et_core.c:2696
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u Datei(en)"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
 msgstr "Keine Datei in diesem Verzeichnis oder Unterverzeichnissen gefunden!"
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "Keine Datei in diesem Verzeichnis gefunden!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "Suche..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "Suche ABBRECHEN...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "Wählen sie ein Verzeichnis aus!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "Dieses Feld in allen ausgewählten Dateien eintragen"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "'_' und '%20' in Leerzeichen umwandeln"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "' ' in '_' umwandeln"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "Alles groß schreiben"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "Alles klein schreiben"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "Ersten Buchstaben groß schreiben"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "Der erste Buchstabe jeden Wortes wird groß geschrieben"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "Leerzeichen entfernen"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "Vor Großbuchstaben ein Leerzeichen einfügen"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 msgid "Remove duplicate spaces or underscores"
 msgstr "Doppelte Leerzeichen oder Unterstriche entfernen"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Fehlerhaft beendet! (PId: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Signal %s (%d) empfangen \a"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 "
@@ -2386,12 +2410,12 @@ msgstr ""
 "Fehlerbericht mit einem GDB-Backtrace ('gdb easytag core', dann 'bt' und "
 "'l') an <easytag@gmail.com>"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "Unbekanntes Signal"
 
-#: src/easytag.c:4479
-#, fuzzy, c-format
+#: src/easytag.c:4597
+#, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2419,16 +2443,16 @@ msgstr ""
 "\n"
 "Verzeichnis:\n"
 "------------\n"
-"c:/Pfad_zu/Dateien      Absoluten Pfad laden,\n"
+"%s/Pfad_zu/Dateien      Absoluten Pfad laden,\n"
 "/Pfad_zu/Dateien        Absoluten Pfad laden,\n"
 "Pfad_zu/Dateien         verwende relativen Pfad.\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normal beendet."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2436,77 +2460,77 @@ msgstr ""
 "Einige Dateien wurden verändert, aber nicht gespeichert...\n"
 "Möchten sie diese vor Beendigung des Programms speichern?"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr " Wollen sie das Programm wirklich beenden? "
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "ID3-Tag"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis Tag"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis Tag"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "APE-Tag"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC-Tag"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr "Wavpack-Tag"
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "MP3-Datei"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "MP2-Datei"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis-Datei"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 msgid "Speex File"
 msgstr "Speex-Datei"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "FLAC-Datei"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "MusePack-Datei"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "Monkey's-Audio-Datei"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr "MP4/AAC-Datei"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 msgid "Wavpack File"
 msgstr "Wavpack-Datei"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, c-format
 msgid "Pictures (%d)"
 msgstr "Bilder (%d)"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2514,14 +2538,14 @@ 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/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2532,11 +2556,11 @@ msgstr ""
 "Dateinamenskodierung des Systems konvertiert werden.\n"
 "(Versuchen sie, die Umgebungsvariable G_FILENAME_ENCODING zu setzen)."
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "Dateinamensübersetzung"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Der Dateiname '%s' überschreitet %d Zeichen und wird abgeschnitten!\n"
@@ -2546,7 +2570,7 @@ msgstr "Der Dateiname '%s' überschreitet %d Zeichen und wird abgeschnitten!\n"
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "Encoder:"
@@ -2555,47 +2579,52 @@ msgstr "Encoder:"
 #. 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/flac_header.c:312 src/mp4_header.c:286 src/ogg_header.c:267
 #: src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Kanäle:"
 
-#: src/flac_tag.c:140 src/flac_tag.c:741
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "FEHLER beim Öffnen der Datei: '%s' als FLAC (%s)."
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "FEHLER: Kann Kommentare nicht in Datei schreiben: '%s' (%s)."
 
-#: src/flac_tag.c:990 src/ogg_tag.c:759
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Tag von '%s' wurde geschrieben"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Tag von '%s' wurde entfernt"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Fehler beim Entfernen des IDv1-Tags von '%s' (%s)"
 
-#: src/id3_tag.c:490 src/id3_tag.c:557
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Fehler beim Entfernen des IDv2-Tags von '%s' (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Fehler beim Aktualisieren des ID3v2-Tags von '%s' (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2620,77 +2649,77 @@ msgstr ""
 "\n"
 "Datei : %s"
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Fehler beim Aktualisieren des ID3v1-Tags von '%s' (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Tag von '%s' wurde aktualisiert"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "Kein Fehler gemeldet"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "Kein Speicher verfügbar"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "Keine Daten zu analysieren"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "Ungeeignet formatierte Daten"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "Kein Schreibpuffer vorhanden"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "Puffer zu klein"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "Ungültige Frame-ID"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "Angefordertes Feld nicht gefunden"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "Unbekannter Feldtyp"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "Tag hängt bereits an einer Datei"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "Ungültige Tag-Version"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "Keine Datei zu analysieren"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "Versuch, in eine nur lesbare Datei zu schreiben"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "Fehler beim Komprimieren/Dekomprimieren"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "Unbekannte Fehlermeldung!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2699,126 +2728,82 @@ msgstr ""
 "Da die beschädigte Datei '%s' einen Fehler mit id3lib auslöst,\n"
 "wird sie vom Programm nicht bearbeitet."
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
 msgstr "Beschädigte Datei..."
 
-#: src/log.c:91
+#: src/log.c:95
 msgid "Log"
 msgstr "Logbuch"
 
-#: src/misc.c:214
-msgid " OK "
-msgstr " OK "
-
-#: src/misc.c:219
-msgid " Yes "
-msgstr " Ja "
-
-#: src/misc.c:224
-msgid " No "
-msgstr " Nein "
-
-#: src/misc.c:229
-msgid " Apply "
-msgstr " Anwenden "
-
-#: src/misc.c:234
-msgid " Save "
-msgstr " Speichern "
-
-#: src/misc.c:239
-msgid " Cancel "
-msgstr " Abbrechen "
-
-#: src/misc.c:244
-msgid " Close "
-msgstr " Schließen "
-
-#: src/misc.c:249
-msgid " Write "
-msgstr " Schreiben "
-
-#: src/misc.c:254
-msgid " Execute "
-msgstr "Ausführen "
-
-#: src/misc.c:259
-msgid " Search "
-msgstr "Suche "
-
-#: src/misc.c:264
-msgid " Browse... "
-msgstr "Auswahl..."
+#: src/misc.c:773
+msgid "Select file..."
+msgstr "Datei auswählen..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "Wähle Verzeichnis..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "Datei auswählen..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 msgid "Warning..."
 msgstr "Warnung..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr "Kein Musikprogramm vorgegeben!"
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "Erzeuge eine Wiedergabeliste"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "M3U-Wiedergabelistenname"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "Nutze Verzeichnisnamen"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "Bearbeite Masken"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "Wiedergabelisten-Optionen"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "Nur ausgewählte Dateien einfügen"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2826,31 +2811,31 @@ msgstr ""
 "Wenn aktiviert, dann werden nur die ausgewählten Dateien in die "
 "Wiedergabeliste geschrieben, ansonsten werden alle Dateien verwendet."
 
-#: src/misc.c:1397
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "Benutze vollen Pfad für Dateien in der Wiedergabeliste"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 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:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "Erzeuge Wiedergabeliste im Elternverzeichnis"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 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:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "Nutze DOS-Verzeichnistrennsymbol"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2858,23 +2843,23 @@ msgstr ""
 "Diese Option ersetzt das UNIX-Verzeichnistrennzeichen '/' durch das DOS-"
 "Zeichen '\\'."
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "Inhalt der Wiedergabeliste"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "Nur Liste der Dateien schreiben."
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "Verwende Dateinamen beim Schreiben der Informationen"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "Schreibe Information mit :"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2883,12 +2868,12 @@ msgstr ""
 "Wiedergabelistendatei '%s' existiert bereits!\n"
 "Überschreiben?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "Schreibe Wiedergabeliste..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2897,44 +2882,24 @@ msgstr ""
 "Kann Wiedergabelistendatei '%s' nicht schreiben!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Wiedergabelistendatei '%s' wurde geschrieben."
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1964
-msgid "Track"
-msgstr "Stück #"
-
-#: src/misc.c:1967 src/picture.c:821
-msgid "Composer"
-msgstr "Komponist"
-
-#: src/misc.c:1968
-msgid "Orig. Artist"
-msgstr "Originalkünstler"
-
-#: src/misc.c:1969
-msgid "Copyright"
-msgstr "Copyright"
-
-#: src/misc.c:1970
-msgid "URL"
-msgstr "URL"
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "Kodierer"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "Suche eine Datei"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2942,93 +2907,86 @@ msgstr ""
 "zur Anzeige aller Dateien."
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "In :"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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:2033
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "das Tag"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Groß/Kleinschreibung beachten"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Gefunden : %d Datei(en)"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "Lade die Dateinamen aus einer Textdatei"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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:2787
+#: src/misc.c:2738
 msgid " Load "
 msgstr "Laden "
 
-#: src/misc.c:2810
-#, fuzzy
+#: src/misc.c:2761
 msgid "Content of TXT file"
-msgstr "Umbenennen der Datei bestätigen"
+msgstr "Inhalt der Textdatei"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2831 src/misc.c:2925
-#, fuzzy
+#: src/misc.c:2782 src/misc.c:2876
 msgid "Insert a blank line before the selected line"
-msgstr "Vor einem Großbuchstaben ein Leerzeichen einfügen"
+msgstr "Vor der ausgewählten Zeile eine Leerzeile einfügen"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2840 src/misc.c:2934
-#, fuzzy
+#: src/misc.c:2791 src/misc.c:2885
 msgid "Delete the selected line"
-msgstr "Diese Zeile löschen"
+msgstr "Ausgewählte Zeile löschen"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 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
+#: src/misc.c:2812 src/misc.c:2906
 msgid "Move up the selected line"
-msgstr "Kein Pfad ausgewählt!"
+msgstr "Bewege ausgewählte Zeile nach oben"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2870 src/misc.c:2964
-#, fuzzy
+#: src/misc.c:2821 src/misc.c:2915
 msgid "Move down the selected line"
-msgstr "Nur ausgewählte Dateien einfügen"
+msgstr "Bewege ausgewählte Zeile nach unten"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "Neu Laden"
 
-#: src/misc.c:2903
-#, fuzzy
+#: src/misc.c:2854
 msgid "List of files"
-msgstr "Nur Liste der Dateien schreiben."
+msgstr "Liste der Dateien"
 
-#: src/misc.c:2998
-#, fuzzy
+#: src/misc.c:2949
 msgid "Selected line:"
-msgstr "Alle Zeilen auswählen"
+msgstr "Ausgewählte Zeile:"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3036,23 +2994,21 @@ 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:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "Füge eine Leerzeile ein"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "Diese Zeile löschen"
 
-#: src/misc.c:3424
-#, fuzzy
+#: src/misc.c:3376
 msgid "Move up this line"
-msgstr "Maske nach oben bewegen"
+msgstr "Bewege diese Zeile nach oben"
 
-#: src/misc.c:3430
-#, fuzzy
+#: src/misc.c:3382
 msgid "Move down this line"
-msgstr "Maske nach unten bewegen"
+msgstr "Bewege diese Zeile nach unten"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3067,7 +3023,7 @@ msgstr "Audio"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr "MP4-Format ungültig"
 
@@ -3092,8 +3048,7 @@ msgstr "Zweikanal"
 msgid "Single channel"
 msgstr "Einzelner Kanal"
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "Aktion für die übrigen Dateien wiederholen"
 
@@ -3135,48 +3090,48 @@ msgstr ""
 "Ogg Vorbis: Interner Logikfehler, das deutet auf einen Fehler oder einen "
 "defekten Heap/Stack hin (Datei: '%s')."
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "FEHLER beim Öffnen der Datei: '%s' als Vorbis (%s)."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Warnung: Die Ogg-Datei '%s' enthält ein ID3v2-Tag."
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "Füge Bilder hinzu"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "Alle Dateien"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG und JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "Bildeigenschaften %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "Bildtyp"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "Bildbeschreibung:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "Speichere Bild %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3187,115 +3142,120 @@ msgstr ""
 "'%s'\n"
 "Soll sie überschrieben werden?"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "Datei speichern..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "JPEG-Bild"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "PNG-Bild"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "Unbekanntes Bild"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32-Pixel PNG-Symboldatei"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "Andere Symboldatei"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "Frontcover"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "Rückseite"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr "Faltblatt"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr "Medium (z.B. Label der CD)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr "Führender Künstler/Darsteller/Solist"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "Künstler/Darsteller"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "Band/Orchester"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "Lyriker/Textautor"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "Aufnahmeort"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "Während der Aufnahme"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "Während der Aufführung"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "Film/Video-Bildschirmfoto"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "Ein heller, farbiger Fisch"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "Illustration"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "Band/Künstlerlogo"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "Verlags/Studiologo"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "Unbekannter Bildtyp"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "Pixel"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "Typ"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3303,11 +3263,16 @@ msgstr ""
 "Das Bild kann nicht angezeigt werden, da nicht genug Daten zur Erzeugung "
 "eines Bildpuffers geladen werden konnten."
 
-#: src/picture.c:987
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr "Lade Bilddatei..."
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3318,7 +3283,7 @@ msgstr ""
 "%s' !\n"
 "(%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr "Bilddatei nicht geladen..."
 
@@ -3578,26 +3543,21 @@ msgstr ""
 
 #. Log options
 #: src/prefs.c:411
-#, fuzzy
 msgid "Log Options"
-msgstr "Tag-Optionen"
+msgstr "Protokolloptionen"
 
 #. Show / hide log view
 #: src/prefs.c:418
-#, fuzzy
 msgid "Show log view in main window"
-msgstr "Mitte des Hauptfensters"
+msgstr "Zeige Protokoll im Hauptfenster"
 
 #: 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."
+msgstr "Wenn aktiviert, dann wird das Protokoll im Hauptfenster angezeigt."
 
 #: src/prefs.c:428
 msgid "Max number of lines :"
-msgstr ""
+msgstr "Maximale Zeilenzahl :"
 
 #. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
 #. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
@@ -3730,7 +3690,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "Erzwinge die Systemzeichenkodierung und aktiviere die Transliteration"
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3746,7 +3706,7 @@ msgid ""
 msgstr ""
 "Erzwinge die Systemzeichenkodierung und lasse einige Zeichen einfach weg"
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3947,7 +3907,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr "Zeichensatz:"
 
@@ -3966,33 +3926,43 @@ msgstr "Zeichensatz um Tag-Daten in die Datei zu schreiben."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr "Weitere Einstellungen für iconv():"
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 msgid "No"
 msgstr "Keine"
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+#, fuzzy
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+"Mit dieser Einstellung wird ein Zeichen, das nicht im Zielzeichensatz "
+"existiert, durch ein oder mehrere ähnlich aussehende Zeichen ersetzt."
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 msgid "ID3v1 tags"
 msgstr "ID3v1-Tag"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "ID3v1.x-Tag schreiben"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4000,20 +3970,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:878
+#: src/prefs.c:882
 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:910
+#: src/prefs.c:917
 msgid "Character Set for reading ID3 tags"
 msgstr "Zeichensatz zum Lesen von ID3-Tags"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr "Nicht-Standard:"
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -4044,31 +4014,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:947
+#: src/prefs.c:954
 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:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "Scanner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Scanner zum Füllen der Tags - Zeichensatzkonvertierung"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Unterstrich '_' und '%20' durch ein Leerzeichen ' ' ersetzen"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Leerzeichen ' ' durch Unterstrich '_' ersetzen"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4077,11 +4047,11 @@ msgstr ""
 "im Scanner nach Tags benutzt."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Scanner zum Umbenennen der Dateien - Zeichensatzkonvertierung"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4090,19 +4060,19 @@ msgstr ""
 "im Scanner nach Dateinamen benutzt."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 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:1034
+#: src/prefs.c:1041
 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:1038
+#: src/prefs.c:1045
 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 "
@@ -4115,15 +4085,15 @@ msgstr ""
 "man 'Text in an Entry' statt 'Text In An Entry')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "Scannerfenster"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "Öffne das Scannerfenster beim Start"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4131,11 +4101,11 @@ msgstr ""
 "Aktiviere diese Option, um beim Start von EasyTAG automatisch das "
 "Scannerfenster zu öffnen."
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "Scanner-Fenster immer im Vordergrund"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4143,16 +4113,16 @@ msgstr ""
 "Wenn aktiviert, wird das Maskenfenster immer über dem Hauptfenster liegen."
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "Felder"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "Felder werden überschrieben, wenn ein Tag gescannt wird"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4160,11 +4130,11 @@ msgstr ""
 "Scanner ersetzt vorhandenen Text in Feldern mit neuem Inhalt, wenn "
 "aktiviert. Wenn nicht, werden nur leere Felder ausgefüllt."
 
-#: src/prefs.c:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "Standardmäßig diesen Text verwenden :"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4173,11 +4143,11 @@ msgstr ""
 "dieser Text in das Kommentarfeld eingetragen werden soll."
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 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:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4188,42 +4158,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "CD-Datenbank"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 msgid "Server Settings for Automatic Search"
 msgstr "Servereinstellungen für automatische Suche"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "Name :"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "CGI-Pfad :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 msgid "Server Settings for Manual Search"
 msgstr "Server-Einstellungen für manuelle Suche"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 msgid "Local CD Data Base"
 msgstr "Lokale CD-Datenbank"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 msgid "Path :"
 msgstr "Pfad :"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4235,58 +4205,58 @@ msgstr ""
 "'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' und 'misc'."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "Proxy-Einstellungen"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "Verwende Proxy"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "Aktiviere die Einstellungen des Proxy-Servers."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "Rechnername :"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "Name des Proxy-Servers."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "Port des Proxy-Servers."
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "Nutzername :"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "Nutzername für den Proxy-Server."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "Nutzer-Passwort :"
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 msgid "Password of user for the the proxy server."
 msgstr "Passwort des Nutzers des Proxy-Servers."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "Stücknamensliste:"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 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:1353
+#: src/prefs.c:1360
 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."
@@ -4295,7 +4265,7 @@ msgstr ""
 "passende Datei in der Hauptliste ebenfalls ausgewählt."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4306,15 +4276,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "Bestätigung"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "Beenden des Programms bestätigen"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4322,19 +4292,19 @@ msgstr ""
 "Falls aktiviert, öffnet sich eine Dialogbox, um eine Bestätigung zu "
 "erfragen, bevor das Programm beendet wird."
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "Schreiben des Tags bestätigen"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "Umbenennen der Datei bestätigen"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "Löschen der Datei bestätigen"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "Schreiben der Wiedergabeliste bestätigen"
 
@@ -4342,37 +4312,37 @@ msgstr "Schreiben der Wiedergabeliste bestätigen"
 #. //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
+#: src/prefs.c:1429
 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:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "Dieses Fenster schließen ohne abzuspeichern"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 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:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Beispiel: %.*d_-_Stück_Name_1.mp3)"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "Änderungen angewandt"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "Konfiguration gespeichert"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "Konfiguration ist unverändert"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4383,37 +4353,37 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "Kein Verzeichnis"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Das Wiedergabeprogramm '%s' wurde nicht gefunden!"
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "Fülle Tag"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "Datei und Verzeichnis umbenennen"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "Felder verarbeiten"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "Tag wurde erfolgreich gescannt..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Tag wurde erfolgreich gescannt...(%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
@@ -4421,23 +4391,23 @@ msgstr ""
 "Tag-Scanner: Seltsam..., die Erweiterung '%s' wurde nicht im Dateinamen '%s' "
 "gefunden!"
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Scan-Fehler: Separator '%s' in '%s' nicht auffindbar"
 
-#: src/scan.c:663
+#: src/scan.c:667
 #, 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:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "Neuer Dateinamen wurde erfolgreich gescannt..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Neuer Dateiname wurde erfolgreich gescannt...(%s)"
@@ -4445,41 +4415,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "Scan von Tag und Dateinamen"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "Scanner :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "Typ des zu verwendenden Scanners auswählen"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "Öffne Scanner-Fenster / Ausgewählte Dateien scannen"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "Scanneroptionen"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "Maskeneditor anzeigen/verstecken"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "Legende anzeigen/verstecken"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4489,15 +4459,15 @@ msgstr ""
 "zum Ausfüllen der Tag-Felder verwendet."
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "Tag-Füllungs-Vorschau"
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr "Stelle aktuellen Pfad vor die Maske"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4510,15 +4480,15 @@ msgstr ""
 "ist, ist es ein absoluter Pfad, ansonsten relativ zum alten Pfad."
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "Umbenennungs-Vorschau"
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "Felder auswählen:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4528,126 +4498,126 @@ msgstr ""
 "Wählen sie die interessanten aus."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
 msgstr "Verarbeite Dateinamensfeld"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "Titelfeld verarbeiten"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "Kü"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "Künstlerfeld dieser Datei bearbeiten"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "Albumfeld verarbeiten"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "Verarbeite Genrefeld"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "K"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "Kommentarfeld verarbeiten"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "Ko"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "Komponistenfeld verarbeiten"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 msgid "Process original artist field"
 msgstr "Originalkünstlerfeld dieser Datei bearbeiten"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Co"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "Copyright-Feld verarbeiten"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr "URL-Feld verarbeiten"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "K"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr "Verarbeite Kodiererfeld"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "Auswahl umkehren"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "Alle/Keine auswählen."
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "'_' und '%20' durch ' ' ersetzen"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "Konvertiere :"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "nach : "
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4657,7 +4627,7 @@ msgstr ""
 "(Beispiel, vorher: 'Text%20in%20einem_Eintrag', danach: 'Text in einem "
 "Eintrag')."
 
-#: src/scan.c:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4665,12 +4635,14 @@ msgstr ""
 "Ein Leerzeichen wird durch einen Unterstrich ersetzt. \n"
 "Beispiel, vorher: 'Text in einem Eintrag', danach: 'Text_in_einem_Eintrag'."
 
-#: src/scan.c:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
+"Ersetze eine Zeichenkette durch eine andere. Beachten sie, dass die Suche "
+"Groß- und Kleinschreibung unterscheidet."
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4678,7 +4650,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:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4686,7 +4658,7 @@ msgstr ""
 "Wörter in allen Feldern klein schreiben. \n"
 "Beispiel, vorher: 'TEXT IN einem eintrag', danach: 'text in einem eintrag'."
 
-#: src/scan.c:2325
+#: src/scan.c:2394
 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'."
@@ -4695,7 +4667,7 @@ msgstr ""
 "geschrieben. \n"
 " Beispiel, vorher: 'text IN Einem EINTRAG', danach: 'Text in einem eintrag'."
 
-#: src/scan.c:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4703,15 +4675,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:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "Vor einem Großbuchstaben ein Leerzeichen einfügen"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "Doppelte Leerzeichen oder Unterstriche entfernen"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4719,7 +4691,7 @@ msgstr ""
 "Alle Leerzeichen zwischen Wörtern werden entfernt. \n"
 "Beispiel, vorher: 'Text In Einem Eintrag', danach: 'TextInEinemEintrag'."
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4727,7 +4699,7 @@ msgstr ""
 "Vor jedem Großbuchstaben wird ein Leerzeichen eingefügt. \n"
 "Beispiel, vorher: 'TextInEinemEintrag', danach: 'Text In Einem Eintrag'."
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4738,183 +4710,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "Legende"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a : Künstler"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : Album"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c : Kommentar"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p : Komponist"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r : Copyright"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : CD-Nummer"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : Kodierer"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g : Genre"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : wird ignoriert"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l : Anzahl von Stücken"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : Originalkünstler"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n : Stück"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t : Titel"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y : Jahr"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "Maskeneditor"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "Neue Maske erstellen"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "Maske nach oben bewegen"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "Maske nach unten bewegen"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "Maske duplizieren"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "Vorgabemasken hinzufügen"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "Maske löschen"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "Masken speichern"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "Neue_Maske"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "Kopieren: keine Zeile ausgewählt!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "Löschen: keine Zeile ausgewählt!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "Nach oben bewegen: keine Zeile ausgewählt!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "Nach unten bewegen: keine Zeile ausgewählt!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "FEHLER: Konfigurationsdatei kann nicht geschrieben werden: %s (%s)"
 
-#: src/setting.c:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Konfigurationsdatei '%s' kann nicht geöffnet werden (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 msgid "Loading default configuration..."
 msgstr "Standardkonfiguration wird geladen..."
 
-#: 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Datei '%s' kann nicht geöffnet werden (%s)"
 
-#: src/setting.c:1278
+#: src/setting.c:1277
 #, 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:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Vorgaben für 'Fülle Tag'-Masken werden geladen..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "Vorgabe für 'Datei umbenennen'-Masken werden geladen..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Vorgabe für 'Verzeichnis umbenennen'-Masken werden geladen..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "ERROR: Die Umgebungsvariable HOME ist nicht definiert!"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "FEHLER: Kann Verzeichnis '%s' nicht anlegen! (%s)"
@@ -4963,42 +4935,81 @@ msgstr ""
 "fehlerhaft oder abgeschnitten sein."
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr "DLL '%s' nicht gefunden. Versuche sie zu laden..."
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr "DLL '%s' konnte nicht geladen werden"
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr "Diese Version von '%s' enthält '%s'"
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr "Funktion '%s' nicht in DLL '%s' gefunden"
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, c-format
 msgid "Audio player: '%s'"
 msgstr "Audio-Player: '%s'"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr "Verzeichnis für EasyTAG-Einstellungen: '%s'"
 
+#~ msgid "libid3tag %s"
+#~ msgstr "libid3tag %s"
+
+#~ msgid "id3lib %d.%d.%d"
+#~ msgstr "id3lib %d.%d.%d"
+
+#~ msgid " OK "
+#~ msgstr " OK "
+
+#~ msgid " Yes "
+#~ msgstr " Ja "
+
+#~ msgid " No "
+#~ msgstr " Nein "
+
+#~ msgid " Apply "
+#~ msgstr " Anwenden "
+
+#~ msgid " Save "
+#~ msgstr " Speichern "
+
+#~ msgid " Cancel "
+#~ msgstr " Abbrechen "
+
+#~ msgid " Close "
+#~ msgstr " Schließen "
+
+#~ msgid " Write "
+#~ msgstr " Schreiben "
+
+#~ msgid " Execute "
+#~ msgstr "Ausführen "
+
+#~ msgid " Search "
+#~ msgstr "Suche "
+
+#~ msgid " Browse... "
+#~ msgstr "Auswahl..."
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/easytag.pot b/po/easytag.pot
index ec93d77..9843cb7 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-10-15 23:53+0200\n"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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,230 +16,224 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/about.c:134
+#: src/about.c:140
 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:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr ""
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr ""
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr ""
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr ""
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr ""
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr ""
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr ""
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr ""
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr ""
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr ""
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr ""
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr ""
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr ""
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr ""
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr ""
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr ""
 
-#: src/about.c:171
+#: src/about.c:177
 msgid "(Chinese translation)"
 msgstr ""
 
-#: src/about.c:172
+#: src/about.c:178
+msgid "(Chinese (Taiwan) translation)"
+msgstr ""
+
+#: src/about.c:179
 msgid "(Hebrew translation)"
 msgstr ""
 
-#: src/about.c:173
+#: src/about.c:180
 msgid "(Serbian translation)"
 msgstr ""
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr ""
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr ""
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr ""
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr ""
 
-#: src/about.c:297
+#: src/about.c:320
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr ""
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr ""
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr ""
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr ""
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 msgid "MP3 file support"
 msgstr ""
 
-#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
-#: src/about.c:452 src/about.c:462
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 msgid "ID3v2.3 tags writting support"
 msgstr ""
 
-#: src/about.c:410
+#: src/about.c:452
 msgid "available"
 msgstr ""
 
-#: src/about.c:420
+#: src/about.c:463
 msgid "Ogg Vorbis file support"
 msgstr ""
 
-#: src/about.c:430
+#: src/about.c:475
 msgid "Speex file support"
 msgstr ""
 
-#: src/about.c:440
+#: src/about.c:491
 msgid "FLAC file support"
 msgstr ""
 
-#: src/about.c:450
+#: src/about.c:504
 msgid "MP4/AAC file support"
 msgstr ""
 
-#: src/about.c:460
+#: src/about.c:516
 msgid "WavPack file support"
 msgstr ""
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr ""
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr ""
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr ""
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr ""
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr ""
@@ -415,7 +409,7 @@ msgstr ""
 msgid "Open File(s) with ..."
 msgstr ""
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr ""
 
@@ -423,7 +417,7 @@ msgstr ""
 msgid "Unselect All Files"
 msgstr ""
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr ""
 
@@ -569,7 +563,7 @@ msgstr ""
 msgid "Reload Directory"
 msgstr ""
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr ""
 
@@ -708,111 +702,157 @@ msgstr ""
 msgid "Ready to start..."
 msgstr ""
 
-#: src/browser.c:326
+#: src/browser.c:330
 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
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr ""
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
 msgstr ""
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 msgid "<All albums>"
 msgstr ""
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr ""
 
-#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
-msgid "Artist"
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
 msgstr ""
 
-#: src/browser.c:2801
-msgid "# Albums"
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
 msgstr ""
 
-#: src/browser.c:2801 src/browser.c:2802
-msgid "# Files"
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
 msgstr ""
 
-#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
+msgid "Artist"
+msgstr ""
+
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
 msgid "Album"
 msgstr ""
 
-#: src/browser.c:2822
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr ""
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr ""
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr ""
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr ""
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr ""
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr ""
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr ""
+
+#: src/browser.c:2946
+msgid "Encoded By"
+msgstr ""
+
+#: src/browser.c:2947
+msgid "# Albums"
+msgstr ""
+
+#: src/browser.c:2947 src/browser.c:2948
+msgid "# Files"
+msgstr ""
+
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr ""
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr ""
 
-#: src/browser.c:2914
-msgid "Tree"
+#: src/browser.c:2994
+msgid "Select a directory to browse."
 msgstr ""
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr ""
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr ""
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr ""
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr ""
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 msgid "If activated, it will use masks to rename directory."
 msgstr ""
 
-#: src/browser.c:3263
+#: src/browser.c:3649
 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
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr ""
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr ""
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr ""
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -821,16 +861,22 @@ msgstr ""
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -839,14 +885,14 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
 "(%s)"
 msgstr ""
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -856,99 +902,99 @@ msgid ""
 "(%s)"
 msgstr ""
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr ""
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr ""
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 
-#: src/browser.c:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr ""
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 
-#: src/browser.c:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr ""
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr ""
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr ""
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr ""
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr ""
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr ""
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 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
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr ""
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr ""
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr ""
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr ""
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 msgid "Request CD database :"
 msgstr ""
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 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
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr ""
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -957,137 +1003,137 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr ""
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr ""
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr ""
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr ""
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr ""
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr ""
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr ""
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr ""
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr ""
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr ""
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr ""
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr ""
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr ""
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr ""
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr ""
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr ""
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr ""
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr ""
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr ""
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr ""
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr ""
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr ""
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr ""
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr ""
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr ""
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr ""
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr ""
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr ""
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr ""
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1097,52 +1143,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr ""
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 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
+#: src/cddb.c:727
 msgid "Track #"
 msgstr ""
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 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
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr ""
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 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
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1151,90 +1181,90 @@ msgid ""
 "instead of using directly the position order."
 msgstr ""
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 
-#: src/cddb.c:798 src/misc.c:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr ""
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
 
-#: src/cddb.c:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr ""
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr ""
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr ""
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr ""
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr ""
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr ""
 
 #. Open connection to the server
-#: src/cddb.c:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr ""
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr ""
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr ""
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr ""
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr ""
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr ""
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr ""
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr ""
@@ -1243,89 +1273,89 @@ msgstr ""
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr ""
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 msgid "The server returned a wrong answer!"
 msgstr ""
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr ""
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
 msgstr ""
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr ""
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr ""
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr ""
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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
+#: src/cddb.c:2893
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
 msgstr ""
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 msgid "Local CD search..."
 msgstr ""
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr ""
 
-#: src/cddb.c:3268
+#: src/cddb.c:3276
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr ""
 
-#: src/cddb.c:3364
+#: src/cddb.c:3372
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr ""
 
 #. Load the track list of the album
-#: src/cddb.c:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr ""
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1334,7 +1364,7 @@ msgid ""
 "Do you want to continue ?"
 msgstr ""
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr ""
 
@@ -1519,68 +1549,68 @@ msgstr ""
 msgid "Western (Windows-1252)"
 msgstr ""
 
-#: src/charset.c:542
+#: src/charset.c:543
 #, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr ""
 
-#: src/charset.c:641
+#: src/charset.c:642
 #, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
 
-#: src/charset.c:705
+#: src/charset.c:706
 #, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr ""
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr ""
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr ""
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr ""
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, c-format
 msgid "Setting locale : '%s'"
 msgstr ""
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr ""
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr ""
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr ""
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr ""
@@ -1588,427 +1618,427 @@ msgstr ""
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr ""
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr ""
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr ""
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 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
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr ""
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr ""
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr ""
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr ""
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr ""
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr ""
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 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
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr ""
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr ""
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr ""
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr ""
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr ""
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr ""
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr ""
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr ""
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr ""
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr ""
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr ""
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr ""
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 msgid "CD:"
 msgstr ""
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr ""
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr ""
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr ""
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr ""
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr ""
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr ""
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr ""
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr ""
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr ""
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 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
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr ""
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr ""
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr ""
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr ""
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr ""
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr ""
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr ""
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr ""
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr ""
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr ""
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr ""
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr ""
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr ""
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr ""
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr ""
 
-#: src/easytag.c:1051
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr ""
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr ""
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr ""
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr ""
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr ""
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr ""
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr ""
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr ""
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr ""
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr ""
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr ""
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr ""
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr ""
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr ""
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr ""
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr ""
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr ""
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr ""
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr ""
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr ""
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr ""
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr ""
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr ""
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr ""
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr ""
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr ""
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr ""
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr ""
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr ""
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr ""
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr ""
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr ""
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr ""
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr ""
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr ""
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr ""
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr ""
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr ""
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr ""
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr ""
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
 "'%s' ?"
 msgstr ""
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr ""
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr ""
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2018,11 +2048,11 @@ msgid ""
 msgstr ""
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr ""
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2032,11 +2062,11 @@ msgid ""
 msgstr ""
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr ""
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2045,31 +2075,31 @@ msgid ""
 "'%s' ?"
 msgstr ""
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr ""
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 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
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
 "(%s)"
 msgstr ""
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, c-format
 msgid "Renaming file '%s'"
 msgstr ""
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2737 src/easytag.c:2769 src/easytag.c:2941
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2078,11 +2108,11 @@ msgid ""
 "(%s)"
 msgstr ""
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr ""
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2091,7 +2121,7 @@ msgid ""
 "'%s'"
 msgstr ""
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2100,16 +2130,16 @@ msgid ""
 msgstr ""
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr ""
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr ""
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2118,17 +2148,17 @@ msgid ""
 msgstr ""
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr ""
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
 msgstr ""
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2137,27 +2167,27 @@ msgid ""
 "(%s)"
 msgstr ""
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
 msgstr ""
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
 "'%s' ?"
 msgstr ""
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr ""
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr ""
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2166,120 +2196,120 @@ msgid ""
 msgstr ""
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr ""
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr ""
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr ""
 
-#: src/easytag.c:3239
+#: src/easytag.c:3356
 #, c-format
 msgid "Found %d file(s) in this directory."
 msgstr ""
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3252 src/et_core.c:2696
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr ""
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
 msgstr ""
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr ""
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr ""
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr ""
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr ""
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr ""
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr ""
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr ""
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr ""
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr ""
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr ""
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr ""
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr ""
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr ""
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 msgid "Remove duplicate spaces or underscores"
 msgstr ""
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr ""
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr ""
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr ""
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, c-format
 msgid ""
 "\n"
@@ -2298,87 +2328,87 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr ""
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
 msgstr ""
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr ""
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr ""
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr ""
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr ""
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr ""
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr ""
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr ""
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr ""
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr ""
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 msgid "Speex File"
 msgstr ""
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr ""
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr ""
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr ""
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr ""
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 msgid "Wavpack File"
 msgstr ""
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, c-format
 msgid "Pictures (%d)"
 msgstr ""
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2386,14 +2416,14 @@ msgid "%d kb/s"
 msgstr ""
 
 #. Samplerate
-#: src/et_core.c:2917 src/flac_header.c:304 src/monkeyaudio_header.c:91
+#: src/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr ""
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2401,11 +2431,11 @@ msgid ""
 "(Try setting the environment variable G_FILENAME_ENCODING)."
 msgstr ""
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr ""
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr ""
@@ -2415,7 +2445,7 @@ msgstr ""
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr ""
@@ -2424,47 +2454,52 @@ msgstr ""
 #. 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/flac_header.c:312 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
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr ""
 
-#: src/flac_tag.c:990 src/ogg_tag.c:759
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr ""
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr ""
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr ""
 
-#: src/id3_tag.c:490 src/id3_tag.c:557
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr ""
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr ""
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2479,412 +2514,348 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr ""
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr ""
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr ""
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr ""
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr ""
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr ""
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr ""
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr ""
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr ""
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr ""
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr ""
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr ""
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr ""
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr ""
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr ""
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr ""
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr ""
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
 "will cause an error in id3lib, it will not be processed by the program."
 msgstr ""
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
 msgstr ""
 
-#: src/log.c:91
+#: src/log.c:95
 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... "
+#: src/misc.c:773
+msgid "Select file..."
 msgstr ""
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr ""
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr ""
-
-#: src/misc.c:931
+#: src/misc.c:852
 msgid "Warning..."
 msgstr ""
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, c-format
 msgid "Can't execute %s (%s)!\n"
 msgstr ""
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr ""
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr ""
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr ""
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr ""
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr ""
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr ""
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr ""
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr ""
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr ""
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr ""
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr ""
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 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
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr ""
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 msgid "Use relative path for files in playlist"
 msgstr ""
 
 #. Create playlist in parent directory
-#: src/misc.c:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr ""
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 
 #. DOS Separator
-#: src/misc.c:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr ""
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr ""
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr ""
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr ""
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr ""
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
 "Overwrite?"
 msgstr ""
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr ""
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
 "(%s)"
 msgstr ""
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr ""
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 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
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr ""
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr ""
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr ""
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr ""
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr ""
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr ""
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr ""
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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
+#: src/misc.c:2738
 msgid " Load "
 msgstr ""
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 msgid "Content of TXT file"
 msgstr ""
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2831 src/misc.c:2925
+#: src/misc.c:2782 src/misc.c:2876
 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
+#: src/misc.c:2791 src/misc.c:2885
 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
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 msgid "Delete all blank lines"
 msgstr ""
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2861 src/misc.c:2955
+#: src/misc.c:2812 src/misc.c:2906
 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
+#: src/misc.c:2821 src/misc.c:2915
 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr ""
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 msgid "List of files"
 msgstr ""
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 msgid "Selected line:"
 msgstr ""
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 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
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr ""
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr ""
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 msgid "Move up this line"
 msgstr ""
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 msgid "Move down this line"
 msgstr ""
 
@@ -2901,7 +2872,7 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr ""
 
@@ -2926,8 +2897,7 @@ msgstr ""
 msgid "Single channel"
 msgstr ""
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr ""
 
@@ -2965,48 +2935,48 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr ""
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr ""
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr ""
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr ""
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr ""
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr ""
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr ""
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr ""
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr ""
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3014,125 +2984,135 @@ msgid ""
 "Do you want to overwrite?"
 msgstr ""
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr ""
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr ""
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr ""
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr ""
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr ""
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr ""
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr ""
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr ""
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr ""
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr ""
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr ""
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr ""
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr ""
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr ""
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr ""
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr ""
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr ""
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr ""
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr ""
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr ""
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr ""
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr ""
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr ""
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr ""
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr ""
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr ""
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr ""
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 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
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr ""
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3140,7 +3120,7 @@ msgid ""
 "(%s)"
 msgstr ""
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr ""
 
@@ -3511,7 +3491,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3524,7 +3504,7 @@ msgid ""
 "characters"
 msgstr ""
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3692,7 +3672,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr ""
 
@@ -3711,52 +3691,59 @@ msgstr ""
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 msgid "No"
 msgstr ""
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 msgid "ID3v1 tags"
 msgstr ""
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr ""
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 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:878
+#: src/prefs.c:882
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr ""
 
 #. Character Set for reading tag
-#: src/prefs.c:910
+#: src/prefs.c:917
 msgid "Character Set for reading ID3 tags"
 msgstr ""
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -3773,59 +3760,59 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:947
+#: src/prefs.c:954
 msgid "Character set used to read tag data in the file."
 msgstr ""
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr ""
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr ""
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr ""
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr ""
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 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
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr ""
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 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
+#: src/prefs.c:1034
 msgid "Process Fields Scanner - Character Conversion"
 msgstr ""
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1034
+#: src/prefs.c:1041
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: src/prefs.c:1038
+#: src/prefs.c:1045
 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 "
@@ -3834,62 +3821,62 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr ""
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr ""
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr ""
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr ""
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
 msgstr ""
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr ""
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr ""
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr ""
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 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
+#: src/prefs.c:1112
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 
-#: src/prefs.c:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -3898,42 +3885,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr ""
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 msgid "Server Settings for Automatic Search"
 msgstr ""
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr ""
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr ""
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr ""
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 msgid "Server Settings for Manual Search"
 msgstr ""
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 msgid "Local CD Data Base"
 msgstr ""
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 msgid "Path :"
 msgstr ""
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -3942,65 +3929,65 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr ""
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr ""
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr ""
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr ""
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr ""
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr ""
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr ""
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr ""
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr ""
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 msgid "Password of user for the the proxy server."
 msgstr ""
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr ""
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4009,33 +3996,33 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr ""
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr ""
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr ""
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr ""
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr ""
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr ""
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr ""
 
@@ -4043,37 +4030,37 @@ msgstr ""
 #. //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
+#: src/prefs.c:1429
 msgid "Apply changes (but don't save) and close this window"
 msgstr ""
 
-#: src/prefs.c:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr ""
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 msgid "Save changes and close this window"
 msgstr ""
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr ""
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr ""
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr ""
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr ""
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4081,57 +4068,57 @@ msgid ""
 "(%s) "
 msgstr ""
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr ""
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr ""
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr ""
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr ""
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr ""
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr ""
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr ""
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr ""
 
-#: src/scan.c:663
+#: src/scan.c:667
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr ""
 
-#: src/scan.c:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr ""
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr ""
@@ -4139,56 +4126,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr ""
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr ""
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr ""
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr ""
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr ""
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr ""
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr ""
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr ""
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 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
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr ""
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4197,202 +4184,202 @@ msgid ""
 msgstr ""
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr ""
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr ""
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 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
+#: src/scan.c:2220
 msgid "F"
 msgstr ""
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr ""
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr ""
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr ""
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr ""
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr ""
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr ""
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr ""
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 msgid "Process original artist field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr ""
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr ""
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr ""
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr ""
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr ""
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr ""
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr ""
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr ""
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr ""
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 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:2284
+#: src/scan.c:2353
 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
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 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
+#: src/scan.c:2391
 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
+#: src/scan.c:2394
 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
+#: src/scan.c:2397
 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
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr ""
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr ""
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4401,183 +4388,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr ""
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr ""
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr ""
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr ""
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr ""
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr ""
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr ""
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr ""
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr ""
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr ""
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr ""
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr ""
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr ""
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr ""
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr ""
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr ""
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr ""
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr ""
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr ""
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr ""
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr ""
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr ""
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr ""
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr ""
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr ""
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr ""
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr ""
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr ""
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr ""
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr ""
 
-#: src/setting.c:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr ""
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr ""
 
-#: src/setting.c:1278
+#: src/setting.c:1277
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
 
 #. Fall back to defaults
-#: src/setting.c:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr ""
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr ""
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
 msgstr ""
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr ""
@@ -4624,38 +4611,38 @@ msgid ""
 msgstr ""
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr ""
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr ""
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr ""
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr ""
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, c-format
 msgid "Audio player: '%s'"
 msgstr ""
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
diff --git a/po/el.gmo b/po/el.gmo
index 26faa15..0b36db4 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index 831bf0c..49a672f 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-10-15 23:53+0200\n"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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:134
+#: src/about.c:140
 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,200 +31,195 @@ msgstr ""
 "Monkey's Audio. �� ���� ��� ������ ���������� ��� ����� ��� ����������� ��� "
 "�������� ��� GNU/Linux ��������!"
 
-#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(��������� ���������)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(������ ���������)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(��������� ���������)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(������� ���������)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(��������� ���������)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(������� ���������)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(��������� ���������)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(������������ ���������)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr "(���������� ���������)"
 
-#: src/about.c:171
+#: src/about.c:177
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(�������� ���������)"
+
+#: src/about.c:179
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(��������� ���������)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "������"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "����..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "����"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(�������������: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(������������: GTK+ %d.%d.%d ��� id3lib %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "����������: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "����������:"
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "���������:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 #, 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
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(����� ���������� ������� MP3)"
 
-#: src/about.c:410
+#: src/about.c:452
 #, fuzzy
 msgid "available"
 msgstr "��� ������� ��������� �����"
 
-#: src/about.c:420
+#: src/about.c:463
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(����� ���������� ������� Ogg Vorbis)"
 
-#: src/about.c:430
+#: src/about.c:475
 #, fuzzy
 msgid "Speex file support"
 msgstr "(����� ���������� ������� MP3)"
 
-#: src/about.c:440
+#: src/about.c:491
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(����� ���������� ������� FLAC)"
 
-#: src/about.c:450
+#: src/about.c:504
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(����� ���������� ������� MP4/AAC)"
 
-#: src/about.c:460
+#: src/about.c:516
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(����� ���������� ������� MP3)"
@@ -232,33 +227,33 @@ msgstr "(����� ���������� ������� MP3)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "�����������"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "�����������:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "������:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "�������� �������"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "������ ���� �� ������� ��� �������:  '%s' (%s)."
@@ -434,7 +429,7 @@ msgstr "��������, ���� ����� ��������������"
 msgid "Open File(s) with ..."
 msgstr "������� �������/�� ��..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "������� ���� ��� �������"
 
@@ -442,7 +437,7 @@ msgstr "������� ���� ��� �������"
 msgid "Unselect All Files"
 msgstr "���������� ���� ��� �������"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "���������� �������� �������"
 
@@ -588,7 +583,7 @@ msgstr "����������� ���������..."
 msgid "Reload Directory"
 msgstr "������������ ���������"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "������� ��������� ��..."
 
@@ -727,17 +722,17 @@ msgstr "Could not merge UI, error was: %s\n"
 msgid "Ready to start..."
 msgstr "������ ��� ��������..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 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
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "�����������..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -745,68 +740,116 @@ msgstr ""
 "�������� ������ ����� ������������ ����� �� ������������ �� �������...\n"
 "������ �� �� ������������ ������ ������������� ��� ��������;"
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 #, fuzzy
 msgid "<All albums>"
 msgstr "# ������"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "������"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "����� �������"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "�����"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "�����������"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "������"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "������"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "������ ���������"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "�����"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "��������"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "������� �����������"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "Copyright"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "����������"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "�������������� ���"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "# ������"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 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
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "�������� ��� ������ ��������"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "����� �� �������� ��� ��������� ���� ����� ������ �� ������������"
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "������"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "�������� ���� �������� ��� ���������!"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "���������� & ������"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "����������� ��� ���������"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "����������� ��� ��������� '%s' ��:"
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "�����:"
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 msgid "If activated, it will use masks to rename directory."
 msgstr ""
 "�� ������������� � ������� ����, ���� �� ������ �� ��������������� ��� �� "
 "����������� ��� ���������."
 
-#: src/browser.c:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -814,31 +857,31 @@ 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
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "���������� ����� �������"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "������..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "������ �� ��������������� ��� ����� ���������!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -849,16 +892,22 @@ msgstr ""
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -867,7 +916,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -876,7 +925,7 @@ msgstr ""
 "������� ��� ��������� �� ���� �� �����!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -891,89 +940,89 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "� ��������� �������������"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "��������� ���� ��������:"
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "�������������� �� ����� ��� ���� �������� ������������. �� ����� �� ����� "
 "��� ��������� ��������� �� ���������."
 
-#: src/browser.c:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "������� ������� ��..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "�������������� �� ����� ��� ���� �������� ������������. �� ����� �� ����� "
 "��� ��������� ������� �� ���������."
 
-#: src/browser.c:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "������ �� ��������������� ��� ����� ������������!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "� �������� '%s' �� �������!"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "��� ����� ������ � �������� ��� %s (������ %d)!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "�������� ����������� ���� ���������� (forking)!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "����������� � ������: '%s %s'"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "����������� / ������"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 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
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "������ ���������"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "��������"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "��������� ��� ���� ��������� CD"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "�������� ���������"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 #, fuzzy
 msgid "Request CD database :"
 msgstr "��������� ����� ��������� FreeDB:"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -981,16 +1030,16 @@ msgstr ""
 "�������� ��������� ��� ����� ��������� CDDB, ��������������� �� ���������� "
 "������ ��� �� ���������� ��� CddbID (� ����� ��� ������� ���� �������!)."
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "����������� ����������..."
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1002,138 +1051,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "����������� ���������"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "������:"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "�������������� ��� ������ ��� ��������� (���������� �� ���� � '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "��������� ��:"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "��� �� �����"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "����"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "���� �� ����������"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "�������"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "����"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "������������: funk, soul, rap, pop, industrial, metal, etc."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "�������, ��������"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "����, ��� ��� ��������� ���� �������� ����������"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr " ����������"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "������������:"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "���������:"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "�������������� ����� ��� ��������� ������ ��� �������������"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "��������� ��������"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "��������� ������������"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 #, fuzzy
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "�������� ���� ��� �������� ������� / �������� ����"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "���������� ���� ��� �������"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "���������� ��������"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "������� ���� ��� �������"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1147,52 +1196,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "����� ���� ����������:"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 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
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "�/� ���������"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 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
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "������ ���� ������� �� ��� ��������� ��������� �������"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 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
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1206,17 +1239,17 @@ msgstr ""
 "�����������, ���� ���� ������ ����������� ���� ���������� ������� ��� CDDB "
 "�� ���� �� ���� ���."
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 "������� ��� ����������� � ���� ��� ������� (�� ��� ���� �������� ������ "
 "������)."
 
-#: src/cddb.c:798 src/misc.c:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "������ ��� ���������..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1224,76 +1257,76 @@ msgstr ""
 "������: '%s', �����������: '%s', ��������: '%s', ������: '%s', �����: '%s', "
 "ID: '%s'"
 
-#: src/cddb.c:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "���������� ��������"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "���������� ���� ������� ������ ���������"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "���������� ���� ����� ���������"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "��������� ����������  '%s'..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "� ����������� '%s' (%s) �� �������!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "�������� ����������� ���� socket (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "������� �� ��� ���������� '%s', ���� '%d' ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "�������� �������� �� ��� ����������  '%s' (%s)!"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "�������� ������� �� ��� ���������� '%s'."
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "���� ��������� (%s)..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "������ ���� ��� �������� ��� �������� ID3v1 ��� '%s' (%s)\n"
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "�������� ����������� � ���������� ��� ������� '%s' (%s)\n"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "�������� �������..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "�������� ��������� ������� (%s)!"
@@ -1302,93 +1335,93 @@ msgstr "�������� ��������� ������� (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "���� ���������..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "� ������������ ����� ���������� ��������! (%s)"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "� ������������ ����� ���������� ��������! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
 msgstr ""
 "��������, �� ������� ���������� ���� ��� ����� ����� ����� �����������!"
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "�������� %d ������/������ ��� ���������� ��� �������� ����������"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "���� ��������� (%s)..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "���� ��������� (%s)..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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
+#: src/cddb.c:2893
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "����������� %d ������!"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 #, fuzzy
 msgid "Local CD search..."
 msgstr "������ ��� ���������..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr ""
 "�������� ������� (CddbId: %s, # ���������: %d, : �������� ������:%d) ..."
 
-#: src/cddb.c:3268
+#: src/cddb.c:3276
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "�������� %d ������/������ ��� ���������� ��� �������� ����������"
 
-#: src/cddb.c:3364
+#: src/cddb.c:3372
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "�������� ���������� ��� ������� '%s' (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "������� ������ ��������� ������"
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1401,7 +1434,7 @@ msgstr ""
 "\n"
 "������ �� ����������;"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "���������� �������� ��� �� CDDB..."
 
@@ -1586,74 +1619,74 @@ msgstr "������ (ISO-8859-15)"
 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"
+#: src/charset.c:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 "�������� ���������� ��� �������� ������� '%s' ��� ������ ���������� UTF-8 (%"
 "s) \n"
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "���������� UTF-8"
 
-#: src/charset.c:641
-#, c-format
+#: src/charset.c:642
+#, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
 "�������� ���������� ��� ������������� UTF-8 '%s' ��� ������ ���������� ��� "
 "�������� ������� (%s)\n"
 
-#: src/charset.c:705
+#: src/charset.c:706
 #, fuzzy, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 "�������� ���������� ��� �������� ������� '%s' ��� ������ ���������� UTF-8 (%"
 "s) \n"
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, fuzzy, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "�������� ��� EasyTAG %s (PId: %d) ...\n"
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, fuzzy, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "������� ����� ��� id3lib, ������� %d.%d.%d ...\n"
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, fuzzy, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "������� ����� ��� id3lib, ������� %d.%d.%d ...\n"
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr ""
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, fuzzy, c-format
 msgid "Setting locale : '%s'"
 msgstr "����������� ������� '%s'"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, fuzzy, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr "� �������� ������ ����� '%s' (��� ������ '%s')...\n"
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s ��� %s (compiled %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "����������: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr ""
@@ -1661,143 +1694,143 @@ msgstr ""
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "����������"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "����������� �������"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "������ ���� �������� ����"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 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
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, Layer ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "���������:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 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
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "�������:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? kb"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "��������:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "�������"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "����� �����"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "������:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "���������� ��� �������� ��� ����������� ������� �� ����� ��� �����"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "�����������:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr ""
 "���������� ��� �������� ��� ����������� ������� �� ���� �� ����� ����������"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "������:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr ""
 "���������� ��� �������� ��� ����������� ������� �� ����� ��� ����� ������"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 #, fuzzy
 msgid "CD:"
 msgstr "CD"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr ""
 "���������� ��� �������� ��� ����������� ������� �� ����� ��� ������� ������ "
 "������"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "������:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "���������� ��� �������� ��� ����������� ������� �� ���� �� ������"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 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
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "�/� ���������:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1805,78 +1838,78 @@ msgstr ""
 "���������� ��� ������ �������� ���������� ���� ������� �� ��� ������ ��� "
 "������� ��� ���������� ���� ���� ����������� �� ����."
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr ""
 "���������� ��� �������� ��� ����������� ������� �� ����� ��� ������ ���������"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "�����:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "���������� ��� �������� ��� ����������� ������� �� ���� �� �����"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "������:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 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
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "��������:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr ""
 "���������� ��� �������� ��� ����������� ������� �� ���� �� ����� �������"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "������� �����������:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr ""
 "���������� ��� �������� ��� ����������� ������� �� ���� �� ����� ������� "
 "����������"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "���������� ��� �������� ��� ����������� ������� �� ���� �� copyright"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "����������:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr ""
 "���������� ��� �������� ��� ����������� ������� �� ���� �� ��������� "
 "�����������"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "�������������� ���:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr ""
 "���������� ��� �������� ��� ����������� ������� �� ���� �� ����� ������������"
@@ -1884,216 +1917,216 @@ msgstr ""
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "�������"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "�������:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "�������� �� ���������� ������� �� drag & drop."
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "����� ����� ��� ������� �� ��� �� ���������� ������"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "�������� ������� ���� ������� (������ �� ����� ��� �� drag & drop)."
 
-#: src/easytag.c:1051
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr ""
 "�������� ��� ����������� �������, � ���� ��� ������� �� ��� ���� �������� "
 "�����."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "���������� ��� ����������� ������� ��� �����."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "���������� ��� ��������� ��� ����������� �������."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "� ������� ��� ����������� ������� ������������ �� ��� ����� '%s'."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "���������� � ������ ��� ��� �������� ��� ����������� �������."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "� ������� ��� ����������� ������� ������������ �� ��� ���������� '%s'."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr ""
 "���������� �� ����� ���������� ��� ��� �������� ��� ����������� �������."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "� ������� ��� ����������� ������� ������������ �� ����� ������ '%s'."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "���������� � ������ ������ ��� ��� �������� ��� ����������� �������."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "� ������� ��� ����������� ������� ������������ ������ ������ '%s'."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "���������� �/� ������ ��� ��� �������� ��� ����������� �������."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "� ������� ��� ����������� ������� ������������ �� ������ '%s'."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "���������� � ������ ��� ��� �������� ��� ����������� �������."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr ""
 "� ������� ��� ����������� ������� ������������ �� �/� ��������� ��� ������ "
 "'xx/%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr ""
 "� ������� ��� ����������� ������� ������������ �� �/� ��������� ��� ������ "
 "'xx'."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "���������� � �/� ��������� ��� ��� �������� ��� ����������� �������."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "�� ���������� ������ ����������� ���������."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "� ������� ��� ����������� ������� ������������ �� ����� '%s'."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "���������� �� ����� ��� ��� �������� ��� ����������� �������."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "� ������� ��� ����������� ������� ������������ �� ������ '%s'."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "���������� �� ������ ��� ��� �������� ��� ����������� �������."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "� ������� ��� ����������� ������� ������������ �� ����� ������� '%s'."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "���������� �� ����� ������� ��� ��� �������� ��� ����������� �������."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr ""
 "� ������� ��� ����������� ������� ������������ �� ����� ������� ���������� '%"
 "s'."
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr ""
 "���������� �� ����� ��� ������� ���������� ��� ��� �������� ��� ����������� "
 "�������."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "� ������� ��� ����������� ������� ������������ �� copyright '%s'."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "���������� �� copyright ��� ��� �������� ��� ����������� �������."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "� ������� ��� ����������� ������� ������������ �� ���������� '%s'."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "���������� � ���������� ��� ��� �������� ��� ����������� �������."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr ""
 "� ������� ��� ����������� ������� ������������ �� ����� ������������ '%s'."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr ""
 "���������� �� ����� ��� ������������ ��� ��� �������� ��� ����������� "
 "�������."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "����������� ������� ���� ������� ��� ����������� �������."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "����������� �� ������� ��� �� ���������� ������."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "�������� ����� ����������� ��� ����� ��� ����������� ��� ���� ��������"
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "��������� ���� �� ��������"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "����������� ���� �� ��������"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "������������� ��� �� ������..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "�� ������ ������������� �� �����..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "�� ������ ����������� �� �����..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "����������� ��� �� ������..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2102,16 +2135,16 @@ msgstr ""
 "������ �� ������������ ��� ������� ��� �������\n"
 "'%s' ;"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "���������� ��������..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr "����������� ������� ��� ���������"
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2125,11 +2158,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr "����������� ���������..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2143,11 +2176,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "����������� �������"
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2160,17 +2193,17 @@ msgstr ""
 "�� \n"
 "'%s' ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "���������� ��� �������� ��� '%s'"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 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
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2179,14 +2212,14 @@ msgstr ""
 "�������� �������� ��� �������� ��� ������� '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, 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
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2199,11 +2232,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "��/�� ������/� ��� �������������/��..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2216,7 +2249,7 @@ msgstr ""
 "����� ������� �� �������� ������:\n"
 "'%s'"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2228,16 +2261,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "�� ������ '%s' ������������� �� '%s'"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "��/�� ������/� �������������/��"
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2249,17 +2282,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "�� ������ '%s' ������������� �� '%s'"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
 msgstr "��/�� ������/� �������������/��"
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2272,11 +2305,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
 msgstr "��/�� ������/� ��� �������������/��..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2285,16 +2318,16 @@ msgstr ""
 "������ �������� �� ���������� �������� �� ������\n"
 "'%s' ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "�������� �������..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "�� ������ '%s' ����������."
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2306,110 +2339,110 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "��������� �� �������..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "������: '%s'"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "�������� %d ������ �� ����� ��� �������� ��� ���� ������������� ���"
 
-#: src/easytag.c:3239
+#: src/easytag.c:3356
 #, 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
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u ������/�"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
 msgstr ""
 "�� ������� ������ ������ �� ����� ��� �������� ��� ���� ������������� ���!"
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "�� ������� ������ ������ �� ����� ��� ��������!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "��������� �� �������..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr " ��������� ����������..."
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "�������� ���� �������� ��� ���������!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "���������� ����� ��� ������ ��� �������� ��� ����������� �������"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "��������� ��� '_' ��� ��� '%20' �� ����"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "��������� ��� ' ' �� '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "��� ��������"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "��� ����"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "����� ������ ��������"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "����� ������ ���� ����� ��������"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "�������� �����"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "�������� ����� ���� ��� ���� �������� ������"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 msgid "Remove duplicate spaces or underscores"
 msgstr "�������� ������ ����� � '_'"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: ���������� ������! (PId: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, fuzzy, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "������ �� ���� %s(%d)\n"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 "
@@ -2420,11 +2453,11 @@ msgstr ""
 "core' ��� ��� �������� 'bt' ��� 'l') ��� ������� ��� ��� ����������� ��� "
 "����������� ��� <easytag@gmail.com>"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "������� ����"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2457,11 +2490,11 @@ msgstr ""
 "��������_���/������    ����� �������� ���������\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: �������� ������"
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2469,79 +2502,79 @@ msgstr ""
 "������ ������ ����� ������������ ����� �� ������������ �� �������...\n"
 "������ �� ������������ ��� ������� ��� ������ ������ ������� �� ���������;"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr "���������� ����� �� �������� ��� �� ���������;"
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "������� ID3"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "������� Ogg Vorbis"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "������� FLAC Vorbis"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "������� APE"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr "������� MP4/M4A/AAC"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "����������� ������� MP3"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "����������� ������� MP2"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "����������� ������� Ogg Vorbis"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 #, fuzzy
 msgid "Speex File"
 msgstr "������� ������"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "����������� ������� FLAC"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "����������� ������� MusePack"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "����������� ������� Monkey's Audio"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr "����������� ������� MP4/AAC"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 #, fuzzy
 msgid "Wavpack File"
 msgstr "����������� ������� MusePack"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "�������"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2549,14 +2582,14 @@ 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/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2567,11 +2600,11 @@ msgstr ""
 "���� ������������ ���������� ��� ����������\n"
 "(��������� �� ������ �� ��������� ������������� G_FILENAME_ENCODING)"
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "��������� �������� �������"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr ""
@@ -2582,7 +2615,7 @@ msgstr ""
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "�������� ���/���:"
@@ -2591,49 +2624,54 @@ msgstr "�������� ���/���:"
 #. 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/flac_header.c:312 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
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "������ ���� �� ������� ��� �������:  '%s' (%s).\n"
 "\a"
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, 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
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "� ������� ��� '%s' ������������"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "���������� � ������� ���  '%s'"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, 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
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "������ ���� ��� �������� ��� �������� ID3v2 ��� '%s' (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "������ ���� ��� ��������� ��� �������� ID3v2 ��� '%s' (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2648,77 +2686,77 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "������ ���� ��� ��������� ��� �������� ID3v1 ��� '%s' (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "� ������� ��� '%s' �����������"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "��� ���������� ������ ������"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "��� ������� ��������� �����"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "��� �������� �������� ���� �����������"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "���������� ������������ ��������"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "��� ������� buffer ��� �������"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "�� buffer ����� ���� �����"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "'����� frame ID"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "�� ������� �� ��������� �����"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "�������� ����� ������"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "� ������� ���� ������ ��� �� ��� ������"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "���������� ������ ��������"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "��� ������� ������ ���� �����������"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "�������� �������� �� ������ ������������� ��� �������"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "������ ���� �� ��������/�����������"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "������� ������ ������!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2728,127 +2766,83 @@ msgstr ""
 "�������� �������� ��� �� ���������� �������� ���� id3lib. �� �� ������ �� "
 "��������� �� �� �� ������������."
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
 msgstr "��������� ������..."
 
-#: src/log.c:91
+#: src/log.c:95
 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:773
+msgid "Select file..."
+msgstr "�������� ������..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "�������� ��������..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "�������� ������..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 #, fuzzy
 msgid "Warning..."
 msgstr "��������� �� �������..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "���������� ������ ������������"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "����� ������ ������������ M3U"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "����� ���������:"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "����������� ������"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "�������� ������ ������������"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "�� ������������ ���� �� ���������� ������"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2857,31 +2851,31 @@ msgstr ""
 "����������� ��� ����� ������������. �������� � ����� �� ������������ ��� �� "
 "������."
 
-#: src/misc.c:1397
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "����� ������� ��������� ��� �� ������ ��� ����� ������������"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 msgid "Use relative path for files in playlist"
 msgstr "����� �������� ��������� ��� �� ������ ��� ����� ������������"
 
 #. Create playlist in parent directory
-#: src/misc.c:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "���������� ������ ������������ ��� ������ ��������"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "�� ������������� � ������� ����, ���� � ����� ������������ �� ������������ "
 "���� ������ ��������."
 
 #. DOS Separator
-#: src/misc.c:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "����� ������������� ��������� DOS"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2889,23 +2883,23 @@ msgstr ""
 "� ������� ���� ����������� �� ������������ ��������� ��� UNIX, '/' �� �� "
 "������������ ��� DOS, '\\'."
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "����������� ������ ������������"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "���������� ���� ��� ������ ��� �������"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "���������� ����������� �� ����� ��� �������� �������"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "���������� ����������� �� �����:"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2914,12 +2908,12 @@ msgstr ""
 "�� ������ ������ ������������ '%s' ������� ���!\n"
 " �� ��������������;"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "���������� ������ ������������..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2928,44 +2922,24 @@ msgstr ""
 "�������� ����������� ��� ������ ������������ '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "������������ � ����� ������������ '%s'"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 msgid "CD"
 msgstr "CD"
 
-#: 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 "Copyright"
-
-#: src/misc.c:1970
-msgid "URL"
-msgstr "����������"
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "�������������� ���"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "��������� �� ��� ������"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2973,93 +2947,93 @@ msgstr ""
 "����������� ��� �� ������."
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "��:"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "� ������� ..."
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "��������� �����/���������"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "��������: %d ������/�"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "������� �������� ������� ��� ��� ������ ��������"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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
+#: src/misc.c:2738
 msgid " Load "
 msgstr "�������"
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, 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
+#: src/misc.c:2782 src/misc.c:2876
 #, 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
+#: src/misc.c:2791 src/misc.c:2885
 #, 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
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 msgid "Delete all blank lines"
 msgstr "�������� ���� ��� ����� �������"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2861 src/misc.c:2955
+#: src/misc.c:2812 src/misc.c:2906
 #, 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
+#: src/misc.c:2821 src/misc.c:2915
 #, 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "������������"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "���������� ���� ��� ������ ��� �������"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "������� ���� ��� �������"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3068,20 +3042,20 @@ msgstr ""
 "�������������� � ������� �� ��� ��������� ��������� ��� (�� �������� ��� "
 "������ ������ �� ����� �������)."
 
-#: src/misc.c:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "�������� ���� ����� �������"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "�������� ����� ��� �������"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "���������� ��� ������ ���� �� ����"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "���������� ��� ������ ���� �� ����"
@@ -3099,7 +3073,7 @@ msgstr "����"
 msgid "Unknown"
 msgstr "�������"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr "����� ����������� MP4."
 
@@ -3124,8 +3098,7 @@ msgstr ""
 msgid "Single channel"
 msgstr ""
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "�� ����������� � ���� �������� ��� �� �������� ������."
 
@@ -3163,48 +3136,48 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "������: �������� ���������� ��� ������� '%s' �� ������ vorbis (%s)."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "�������: �� ������ Ogg Vorbis  '%s' �������� ������� ID3v2."
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "�������� �������"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "��� �� ������"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "������ PNG ��� JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "��������� ������� %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "����� �������"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "��������� �������:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "���������� ������� %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3214,115 +3187,120 @@ msgstr ""
 "�� ������ '%s' ������� ���\n"
 "������ �� �� ���������������"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "���������� �������..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "������ JPEG"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "������ PNG"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "�������� ����� �������"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "��������� PNG 32x32 pixel"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "���� ��������� �������"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "��������"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "�����������"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr "������ �������"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr "������ ����� (�.�. ������� CD)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr "������ �����������/������ ����������/������"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "�����������/����������"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "���������� ���������"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "��������"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "������"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "����� �����������"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "���� ��� ����������"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "���� ��� ��������"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "���� ��� ������ / ������"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "��� ��������� ����"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "������"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "�������� �������������/����������"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "�������� ������������� ��������/��������"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "�������� ����� �������"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "pixels"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "�����"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "���������"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3330,11 +3308,16 @@ msgstr ""
 "��� ����� ������ � ���������� ��� �������, ����� �� ����������� ������ "
 "�������� ��� �� �������� ������ � ���������� ��� buffer ��� �������."
 
-#: src/picture.c:987
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr "������� ������� �������..."
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3345,7 +3328,7 @@ msgstr ""
 "'%s'!\n"
 " (%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr "�� ������ ������� �� ���������..."
 
@@ -3761,7 +3744,7 @@ msgstr ""
 "����� ���������� ��� ������������� ���������� ��� ���������� ��� "
 "������������ ��� ���������� ����������."
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3780,7 +3763,7 @@ msgstr ""
 "����� ���������� ��� ������������� ���������� ��� ���������� ��� ������� "
 "�������� ������� ����������."
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3983,7 +3966,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr ""
 
@@ -4004,35 +3987,47 @@ msgstr "������ ���������� �� �� ����� �� ������������ � ������� ��� ������."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 #, fuzzy
 msgid "No"
 msgstr "���"
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+#, fuzzy
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+"�� ��� ������� ���� ��������������, �� easytag �� ������������ ����� �� "
+"������ ���������� ��� ����������, ���, ��� ���� ���������� ��� ������� ��� "
+"������ ����, ���� �� �������������� �� ���� � ������������� ������� ���� "
+"�������� ����������."
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "������� ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "���������� �������� ID3v1.x"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4041,22 +4036,22 @@ msgstr ""
 "ID3v1, �, ������ ���� �������, �� �����������. ����������� � ������� ID3v1 "
 "�� ����������."
 
-#: src/prefs.c:878
+#: src/prefs.c:882
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "������ ���������� �� �� ����� �� ������������ � ������� ��� ������."
 
 #. Character Set for reading tag
-#: src/prefs.c:910
+#: src/prefs.c:917
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "������ ���������� ��� ��� �������� ID3"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -4089,7 +4084,7 @@ msgstr ""
 "��� �������� ��� ��������� ��� �������� �� Windows � ISO-8859-7 ��� �������� "
 "��� ��������� ��� �������� �� Unix."
 
-#: src/prefs.c:947
+#: src/prefs.c:954
 msgid "Character set used to read tag data in the file."
 msgstr ""
 "������ ���������� �� �� ����� �� ������� � �������� ��� �������� ��� �� "
@@ -4098,24 +4093,24 @@ msgstr ""
 #.
 #. * Scanner
 #.
-#: src/prefs.c:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "�������"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "���������� �������� - ��������� ����������"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "��������� ��� '_' ��� ��� '%20' �� ���� ' '"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "��������� ��� ����� ' ' �� '_'"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4124,11 +4119,11 @@ msgstr ""
 "���� ������ ��� ������ ��������."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "����������� ������� - ��������� ����������"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4137,17 +4132,17 @@ msgstr ""
 "���� ������ ��� ������ ������������ �������."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "����������� ������ - ��������� ����������"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1034
+#: src/prefs.c:1041
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "���� ����� ������ �� ������� ��������� ��� �����"
 
-#: src/prefs.c:1038
+#: src/prefs.c:1045
 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 "
@@ -4160,15 +4155,15 @@ msgstr ""
 "��� �����')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "�������� ������"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "������� ��� ��������� ������ ���� ��� ��������"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4176,11 +4171,11 @@ msgstr ""
 "������������� ��� ������� ���� ��� �� ������� �������� �� �������� ��� "
 "������ ���� ���� ��� ������ �� EasyTAG."
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "����� ����� �������� ������"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4189,16 +4184,16 @@ msgstr ""
 "����� ��������."
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "�����"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "������� ���� ��� �� ��������� �����"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4206,11 +4201,11 @@ msgstr ""
 "�� �������������, ���� � ������� �� ����������� �� ������� ��� ����� ��� ��� "
 "����� ������� �� ���. �� ���������������, ���� �� ������ ���� ��� ���� �����."
 
-#: src/prefs.c:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "���������� ������ ������� :"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4219,11 +4214,11 @@ msgstr ""
 "��� ����� ������� ���� �������������� �� ������ ��� ���������� ��� ��������."
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr "����� ��� CRC32 �� ������ ������ (��� ������ �� �������� ID3 ����)."
 
-#: src/prefs.c:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4235,46 +4230,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "���� ��������� CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "�������� ���������"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "����� :"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "���� :"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "�������� CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "��������� �����������"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "���� ��������� CD"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 #, fuzzy
 msgid "Path :"
 msgstr "�������� CGI :"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4283,52 +4278,52 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "��������� ������������� �������"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "����� ������������� �������"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "������������ ������ ���� ������������� �������."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "����� ������������� :"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "����� ��� ������������� �������"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "���� �������� ��� ������������� �������"
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "����� ������ :"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "����� ������ ��� ����������� ��� ������������� �������"
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "����������� ������ :"
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 msgid "Password of user for the the proxy server."
 msgstr "����������� ������ ��� ����������� ��� ������������� �������"
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "����� ������ ���������"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4336,7 +4331,7 @@ msgstr ""
 "������� ��� ����������� ������� ���� (������� �� �� ���� � �� DLM, �� ���� "
 "����� ��������������)"
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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."
@@ -4346,7 +4341,7 @@ msgstr ""
 "�����."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4357,15 +4352,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "�������������"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "����������� ������ ��� �� ���������"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4373,19 +4368,19 @@ msgstr ""
 "�� �������������, ���� �� �������� ��� �� ������ ����������� ������ ��� �� "
 "���������."
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "����������� ����������� ��� �������� ��� �������"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "����������� ������������ ��� �������"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "����������� ��������� ��� �������"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "����������� ����������� ��� ������ ������������"
 
@@ -4393,38 +4388,38 @@ msgstr "����������� ����������� ��� ������ ������������"
 #. //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
+#: src/prefs.c:1429
 msgid "Apply changes (but don't save) and close this window"
 msgstr ""
 "�������� ��� ������� (����� ���������� ����) ��� �������� ��� ���������"
 
-#: src/prefs.c:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "�������� ��� ��������� ����� �� ������������ �� �������"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 msgid "Save changes and close this window"
 msgstr "���������� ��� ������� ��� �������� ��� ���������"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(�.�.: %.*d_-_�����_�������_1.mp3)"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "�� ������� ������� �� ����"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "�� ��������� �������������"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "�� ��������� ������� �����������"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4435,57 +4430,57 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "��� ����� ���������"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "�� ��������� ������������ ���� '%s' �� �������!"
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "���������� ��������"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "����������� ������� ��� ���������"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "����������� ������"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "� ������� ������������ ��������..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "� ������� ������������ ��������...(%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "������ �������: �������� ���������� ��� ������������� '%s' ��� '%s'"
 
-#: src/scan.c:663
+#: src/scan.c:667
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "�������� ���������� ��� '%s' ��� ������ ���������� ��� ����������."
 
-#: src/scan.c:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "�� ������ ������������� �� ��������..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "�� ������ ������������� �� ��������...(%s)"
@@ -4493,41 +4488,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "������ �������� ��� �������� �������."
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "�������� :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "�������� ��� ���� ������ ��� ����������"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "������ ��� ����������� �������"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "�������� ������"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "�������� / �������� ��� �������� ������"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "�������� / �������� �����������"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "�������� ��� ��������� �����"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4537,15 +4532,15 @@ msgstr ""
 "��������������� ��� �� ���������� ��� ��������."
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "������������� ��������..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr "����� ��� ��������� ��������� �� ������� ��� �����"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4560,15 +4555,15 @@ msgstr ""
 "��� ����������� ��������."
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "������������� �������� �������..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "�������� �����:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4577,126 +4572,126 @@ msgstr ""
 "���� ��� ��� �����������."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "�"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
 msgstr "����� �������"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "�"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "������ ���������"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "�"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "�����������"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "�"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "����� ������"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "�"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "������� �����"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "��"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "������"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "��"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "����� �������"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "��"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 msgid "Process original artist field"
 msgstr "����� ������� ����������"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "C"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "Copyright"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr "URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "��"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr "�������������� ���"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "���������� ��������"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "�������/���������� ����"
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "��������� ��� '_' ��� ��� '%20' �� ' '"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "��������� :"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "�� : "
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4704,7 +4699,7 @@ msgstr ""
 "� ���� ����� ��� � ������������ '%20' ��������������� ��� ��� ����. �.�. �� "
 "'�������%20��%20�����������_�����' ������� '������� �� �����������_�����'."
 
-#: src/scan.c:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4712,12 +4707,12 @@ msgstr ""
 "�� ���� �������������� ��� ��� ���� �����. �.�. �� '������� �� ����������� "
 "�����' ������� '�������_��_�����������_�����'."
 
-#: src/scan.c:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4725,7 +4720,7 @@ msgstr ""
 "��������� ���� ��� ��������� �� ��� �� ����� �� ��������. �.�. �� '������� "
 "�� ������ �����' ������� '������� �� ������ �����'."
 
-#: src/scan.c:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4733,7 +4728,7 @@ msgstr ""
 "��������� ���� ��� ��������� �� ��� �� ����� �� ����. �.�. �� '������� �� "
 "������ �����' ������� '������� �� ������ �����'."
 
-#: src/scan.c:2325
+#: src/scan.c:2394
 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'."
@@ -4741,7 +4736,7 @@ msgstr ""
 "��������� ��� ������� ��������� ��� ������ ����� ���� ������ �� ��������. �."
 "�. �� '������� �� ������ �����' ������� '������� �� ������ �����'."
 
-#: src/scan.c:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4749,15 +4744,15 @@ msgstr ""
 "��������� ��� ������� ��������� ���� ����� ���� ������ �� ��������. �.�. �� "
 "'������� �� ������ �����' ������� '������� �� ������ �����'."
 
-#: src/scan.c:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "�������� ���� ����� ���� ��� ���� �������� ������"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "�������� ������ ����� � ���� ������"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4765,7 +4760,7 @@ msgstr ""
 "����������� ��� �� ���� ������� ���� ������. �.�. �� '������� �� ������ "
 "�����' ������� '��������������������'."
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4773,7 +4768,7 @@ msgstr ""
 "��������� ��� ���� ���� ��� ���� �������� ���������. �.�. �� "
 "'��������������������' ������� '������� �� ������ �����'."
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4784,161 +4779,161 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "��������"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a : ����� ����������"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : ������ ������"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c : ������"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p : ����� �������"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r : Copyright"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : �/� ������"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : �������������� ���"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g : ������� �����"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : �� ��������"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l : ������� ���������"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : ����� ������� ����������"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n ������� ���������"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t : ������"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y : ������"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "��������� ������"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "���������� ���� ������"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "���������� ��� ������ ���� �� ����"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "���������� ��� ������ ���� �� ����"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "������������ ��� ������"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "�������� �� ������� ������"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "�������� ������"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "���������� ������"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "_��� �����"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "���������: ��� ���� �������� ����� �����!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "��������: ��� ���� �������� ����� �����!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "���������� ���� �� ����: ��� ���� �������� ����� �����!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "���������� ���� �� ����: ��� ���� �������� ����� �����!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr ""
 "������: �������� ����������� ��� ������� ��������� %s (%s)\n"
 "\a"
 
-#: src/setting.c:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "�������� ���������� ��� ������� ���������  '%s' (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "�������� ����������� � ���������� ��� ������� '%s' (%s)"
 
-#: src/setting.c:1278
+#: src/setting.c:1277
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
@@ -4946,28 +4941,28 @@ msgstr ""
 "\a"
 
 #. Fall back to defaults
-#: src/setting.c:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "������� ��� ��������������� ������ ����������� ��������..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "������� ��� ��������������� ������ ������������ �������..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "������� ��� ��������������� ������ ������������ ���������..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "������: ��� ���� ������� � ��������� ������������� HOME!\n"
 "\n"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "������: �������� ����������� ��� ���������  '%s' (%s)!"
@@ -5017,42 +5012,75 @@ msgstr ""
 "������ �� ����� ���������� � �������."
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr ""
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr ""
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr ""
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr ""
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, fuzzy, c-format
 msgid "Audio player: '%s'"
 msgstr "�������� ������������ ��������"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid " OK "
+#~ msgstr "��"
+
+#~ msgid " Yes "
+#~ msgstr "���"
+
+#~ msgid " No "
+#~ msgstr "���"
+
+#~ msgid " Apply "
+#~ msgstr "��������"
+
+#~ msgid " Save "
+#~ msgstr "����������"
+
+#~ msgid " Cancel "
+#~ msgstr "�����"
+
+#~ msgid " Close "
+#~ msgstr "��������"
+
+#~ msgid " Write "
+#~ msgstr "����������"
+
+#~ msgid " Execute "
+#~ msgstr "��������"
+
+#~ msgid " Search "
+#~ msgstr "���������"
+
+#~ msgid " Browse... "
+#~ msgstr "���������..."
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/es.gmo b/po/es.gmo
index b05e034..96cd234 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index c3de23e..fbb6463 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-10-15 23:53+0200\n"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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:134
+#: src/about.c:140
 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,200 +28,195 @@ msgstr ""
 "interfaz GTK+ sencilla y agradable hace el etiquetar más fácil bajo GNU/"
 "Linux."
 
-#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(Traducción alemana)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(Traducción rusa)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(Traducción holandesa)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(Traducción sueca)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(Traducción húngara)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(Traducción italiana)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(Traducción japonesa)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(Traducción ucraniana)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(Traducción checa)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(Traducción española)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(Traducción polaca)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(Traducción rumana)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(Traducción danesa)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(Traducción griega)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Traducción portugués brasileiro)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr "(Traducción búlgara)"
 
-#: src/about.c:171
+#: src/about.c:177
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(Traducción japonesa)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(Traducción japonesa)"
+
+#: src/about.c:179
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(Traducción griega)"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(Traducción alemana)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "Comentario"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "Acerca de..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "Acerca de"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compilado: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(usando: GTK+ %d.%d.%d e id3lib %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "Correo-e: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Página web: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "Descripción:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(soporte para archivos MP3 deshabilitado)"
 
-#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
-#: src/about.c:452 src/about.c:462
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(soporte para archivos MP3 deshabilitado)"
 
-#: src/about.c:410
+#: src/about.c:452
 #, fuzzy
 msgid "available"
 msgstr "No hay memoria suficiente"
 
-#: src/about.c:420
+#: src/about.c:463
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(soporte para archivos Ogg Vorbis deshabilitado)"
 
-#: src/about.c:430
+#: src/about.c:475
 #, fuzzy
 msgid "Speex file support"
 msgstr "(soporte para archivos MP3 deshabilitado)"
 
-#: src/about.c:440
+#: src/about.c:491
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(soporte para archivos FLAC deshabilitado)"
 
-#: src/about.c:450
+#: src/about.c:504
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(soporte para archivos MP4/AAC deshabilitado)"
 
-#: src/about.c:460
+#: src/about.c:516
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(soporte para archivos MP3 deshabilitado)"
@@ -229,33 +224,33 @@ msgstr "(soporte para archivos MP3 deshabilitado)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "Agradecimientos"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "Traducciones:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "General:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "Cambios"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "ERROR al abrir archivo: «%s» (%s)."
@@ -431,7 +426,7 @@ msgstr "Descendente por tasa de muestreo"
 msgid "Open File(s) with ..."
 msgstr "Abrir archivo(s) con ..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "Seleccionar todos los archivos"
 
@@ -439,7 +434,7 @@ msgstr "Seleccionar todos los archivos"
 msgid "Unselect All Files"
 msgstr "Deseleccionar todos los archivos"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "Invertir la selección"
 
@@ -585,7 +580,7 @@ msgstr "Renombrar directorio..."
 msgid "Reload Directory"
 msgstr "Recargar directorio"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "Explorar directorio con..."
 
@@ -724,17 +719,17 @@ msgstr "No se pudo combinar el IU, el error fue: %s\n"
 msgid "Ready to start..."
 msgstr "Listo para empezar..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 msgid "New default path for files selected"
 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:4550 src/easytag.c:4570 src/easytag.c:4589
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "Aceptar..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -742,66 +737,114 @@ msgstr ""
 "Algunos archivos han sido modificados pero no guardados...\n"
 "¿Quiere guardarlos antes de cambiar de directorio?"
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 #, fuzzy
 msgid "<All albums>"
 msgstr "# Álbumes"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "Árbol"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "Nombre de archivo"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "Título"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "Artista"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "Álbum"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "Año"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "Pista"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "Género"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "Compositor"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "Artista original"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "Copyright"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "URL"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "Codificado por"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "# Álbumes"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 msgid "# Files"
 msgstr "# Archivos"
 
-#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
-msgid "Album"
-msgstr "Álbum"
-
-#: src/browser.c:2822
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "Ir al directorio superior"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "Introducir un directorio para explorar."
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "Árbol"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "Seleccione un directorio para explorar."
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "Artista y Álbum"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "Renombrar el directorio"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Renombrar el directorio «%s» a : "
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "Usar máscara :"
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 msgid "If activated, it will use masks to rename directory."
 msgstr "Si está activado, usará máscaras para renombrar el directorio."
 
-#: src/browser.c:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -809,31 +852,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:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
-#: src/scan.c:2119 src/scan.c:2465
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "Máscara para procesar inválida"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 msgid "Rename directory preview..."
 msgstr "Previsualizar el renombrado del directorio..."
 
-#. 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "Error..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "¡Debe introducir un nombre de directorio!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -843,16 +886,22 @@ msgstr ""
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -861,7 +910,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -870,7 +919,7 @@ msgstr ""
 "¡No se puede renombrar puesto que el nombre de directorio ya existe!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -885,89 +934,89 @@ msgstr ""
 "«%s»!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "Directorio renombrado"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "Programa a ejecutar :"
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 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:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "Abrir archivo con ..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 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:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "¡Debe introducir un nombre de programa!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "No se puede encontrar el programa «%s»"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "No se puede ejecutar «%s» (error %d)\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "¡No se puede crear otro proceso!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Comando ejecutado : «%s %s»"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "Artista / Álbum"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Category"
 msgstr "Categoría"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:229 src/cddb.c:438
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "Nombre de pista"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "Duración"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "Búsqueda en CDDB"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "Búsqueda automática"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 #, fuzzy
 msgid "Request CD database :"
 msgstr "Solicitud a la base de datos FreeDB:"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -975,16 +1024,16 @@ msgstr ""
 "Solicitud de consulta automática a la base de datos CDDB usando los archivos "
 "seleccionados (¡el orden es importante!) para generar el CddbID."
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "Parar la búsqueda..."
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -995,138 +1044,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "Búsqueda manual"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "Palabras :"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Escriba las palabras a buscar (separadas por un espacio o «+»)"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "Buscar en :"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "Todos los campos"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "Otro"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "Todas las categorías"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "Clásico"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Varios"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "New Age"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "Banda Sonora"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "incluido : funk, soul, rap, pop, industrial, metal, etc."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "películas, shows"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "otros que no se ajustan a las categorías anteriores"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr " Categorías"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "Resultados :"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "Buscar :"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "Escriba las palabras a buscar en la siguiente lista"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "Buscar siguiente"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "Buscar anterior"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 #, fuzzy
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "Mostrar sólo seleccionados / Mostrar todos"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "Deseleccionar todos"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "Invertir la selección"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "Seleccionar todos"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1139,52 +1188,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "Establecer a:"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 msgid "All"
 msgstr "Todo"
 
-#: src/cddb.c:721 src/misc.c:1958
-msgid "File Name"
-msgstr "Nombre de archivo"
-
-#: src/cddb.c:722 src/misc.c:1959
-msgid "Title"
-msgstr "Título"
-
-#: src/cddb.c:725 src/misc.c:1963
-msgid "Year"
-msgstr "Año"
-
-#: src/cddb.c:726
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "Pista #"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 msgid "# Tracks"
 msgstr "# Pistas"
 
-#: 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:3013
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "Ejecutar el procesador para cada archivo"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 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
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1199,91 +1232,91 @@ msgstr ""
 "correspondiente, o aplicar los resultados de cddb en vez de usar "
 "directamente el orden de la posición."
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 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:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "Listo para buscar..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, 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:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "Invertir la selección"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "Ordenar por número de pista"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "Ordenar por nombre de pista"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Resolviendo anfitrión  «%s» ..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "¡No se puede resolver el anfitrión «%s» (%s)!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, 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:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Conectando a anfitrión «%s», puerto «%d» ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "¡No se puede conectar al anfitrión «%s» (%s)!"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Conectado al anfitrión «%s»"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Obteniendo datos (%s) ..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Error al borrar la etiqueta ID3v1 de «%s» (%s)\n"
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, 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:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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:2246 src/cddb.c:2564 src/cddb.c:3397
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "Enviando petición ..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "¡No se puede enviar la petición (%s)!"
@@ -1292,91 +1325,91 @@ msgstr "¡No se puede enviar la petición (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "Obteniendo datos ..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "¡El servidor devolvió una respuesta errónea! (%s)"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "¡El servidor devolvió una respuesta errónea! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Lo siento, la búsqueda web no funciona ahora"
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Encontrados %d álbum(s) coincidentes"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Obteniendo datos (%s) ..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Obteniendo datos (%s) ..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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:2889
+#: src/cddb.c:2893
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d archivos seleccionados"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Listo para buscar..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, 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:3268
+#: src/cddb.c:3276
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Encontrados %d álbum(s) coincidentes"
 
-#: src/cddb.c:3364
+#: src/cddb.c:3372
 #, 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:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "Cargando la lista de pistas del álbum ..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1389,7 +1422,7 @@ msgstr ""
 "\n"
 "¿Continuar?"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "Escribir etiqueta según CDDB..."
 
@@ -1574,75 +1607,75 @@ msgstr "Occidental (ISO-8859-15)"
 msgid "Western (Windows-1252)"
 msgstr "Occidental (Windows-1252)"
 
-#: src/charset.c:542
-#, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
+#: src/charset.c:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 "El nombre de archivo «%s» no se pudo convertir a la codificación UTF-8 (%"
 "s).\n"
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "UTF-8 no válido"
 
-#: src/charset.c:641
-#, c-format
+#: src/charset.c:642
+#, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
 "La cadena UTF-8 «%s» no se pudo convertir a la codificación del nombre de "
 "archivo (%s)\n"
 
-#: src/charset.c:705
+#: src/charset.c:706
 #, fuzzy, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 "El nombre de archivo «%s» no se pudo convertir a la codificación UTF-8 (%"
 "s).\n"
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, fuzzy, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "Comenzando EasyTAG %s (PId: %d) ...\n"
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, fuzzy, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "Actualmente usando id3lib versión %d.%d.%d ...\n"
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, fuzzy, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "Actualmente usando id3lib versión %d.%d.%d ...\n"
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr ""
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, fuzzy, c-format
 msgid "Setting locale : '%s'"
 msgstr "Renombrando archivo «%s»"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, fuzzy, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr ""
 "Usando actualmente la configuración regional «%s» (y eventualmente «%s»)...\n"
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s por %s (compilado %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "Página Web: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr ""
@@ -1650,129 +1683,129 @@ msgstr ""
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "Explorador"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "Archivo"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "Archivo de sólo lectura"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 msgid "File Link Broken"
 msgstr "Enlace a archivo roto"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, layer ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "Tasa de bits:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "Frecuencia:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Modo:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
-#: src/easytag.c:4073
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? kb"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "Duración:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "Etiqueta"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "General"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "Título:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "Etiquetar archivos seleccionados con este título"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "Artista:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr "Etiquetar archivos seleccionados con este artista"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "Álbum:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr "Etiquetar archivos seleccionados con este nombre de álbum"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 #, fuzzy
 msgid "CD:"
 msgstr "CD"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr "Etiquetar archivos seleccionados con este número de disco"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "Año:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "Etiquetar archivos seleccionados con este año"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Numerar todas las pistas secuencialmente.  Empieza con 01 en cada "
@@ -1780,11 +1813,11 @@ msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "Pista #:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1792,274 +1825,274 @@ msgstr ""
 "Poner el número de archivos, en el directorio del mostrado,  a las pistas "
 "seleccionadas"
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr "Etiquetar archivos seleccionados con este número de pistas"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "Género:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "Etiquetar archivos seleccionados con este género"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 msgid "Tag selected files with this comment"
 msgstr "Etiquetar archivos seleccionados con este comentario"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:818
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "Compositor:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr "Etiquetar archivos seleccionados con este compositor"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "Artista original:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr "Etiquetar archivos seleccionados con este artista original"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "Etiquetar archivos seleccionados con este copyright"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "Etiquetar archivos seleccionados con este URL"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "Codificado por:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr "Etiquetar archivos seleccionados con este codificador"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "Imágenes"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "Imágenes:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "Pues usar arrastrar y soltar para añadir una imagen."
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "Etiquetar archivos seleccionados con estas imágenes"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 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
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr "Eliminar imágenes seleccionadas, si no todas."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "Guardar las imágenes seleccionadas al disco duro."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "Ajustar propiedades de las imágenes seleccionadas."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Archivos seleccionados etiquetados con el título «%s»."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "Eliminado el título de los archivos seleccionados."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Archivos seleccionados etiquetados con el artista «%s»."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "Eliminado el artista de los archivos seleccionados."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Archivos seleccionados etiquetados con álbum «%s»."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "Eliminado el nombre de álbum de los archivos seleccionados."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Archivos seleccionados etiquetados con el número de disco «%s»."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "Eliminó el disco de los archivos seleccionados."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Archivos seleccionados etiquetados con el año «%s»."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "Eliminado el año de los archivos seleccionados."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Todos los archivos seleccionados etiquetados con la pista «xx/%s»."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Archivos seleccionados etiquetados con la pista como «xx»."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "Eliminado el número de pista de los archivos seleccionados."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "Pistas seleccionadas numeradas secuencialmente."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Archivos seleccionados etiquetados con el género «%s»."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "Eliminado el género de los archivos seleccionados."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Archivos seleccionados etiquetados con el comentario «%s»."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "Eliminado el comentario de los archivos seleccionados."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Archivos seleccionados etiquetados con el compositor «%s»."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "Eliminado el compositor de los archivos seleccionados."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Archivos seleccionados etiquetados con el artista original «%s»."
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "Eliminado el artista original de los archivos seleccionados."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Archivos seleccionados etiquetados con el copyright «%s»."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "Eliminado el copyright de los archivos seleccionados."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Archivos seleccionados etiquetados con el URL «%s»."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "Eliminado URL de los archivos seleccionados."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Archivos seleccionados etiquetados con el codificador «%s»."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr "Eliminado el codificador de los archivos seleccionados."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "Archivos seleccionados etiquetados con las imágenes."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "Eliminadas imágenes de los archivos seleccionados."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Seleccionar Modo y Máscara, y rehacer la misma acción"
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "Todas las etiquetas han sido procesadas"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "Todas las etiquetas han sido eliminadas"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "Todos los archivos han sido guardados..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "Los archivos han sido parcialmente guardados..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "Los archivos han sido parcialmente eliminados..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "Todos los archivos han sido eliminados..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2068,16 +2101,16 @@ msgstr ""
 "¿Quiere escribir la etiqueta al archivo\n"
 "«%s» ?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "Escribir etiqueta..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr "Renombrar archivo y directorio..."
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2091,11 +2124,11 @@ msgstr ""
 "«%s» ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr "Renombrar directorio..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2109,11 +2142,11 @@ msgstr ""
 "«%s» ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "Renombrar archivo..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2126,17 +2159,17 @@ msgstr ""
 "a \n"
 "«%s» ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Escribiendo etiqueta de «%s»"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 msgid "Tag(s) written"
 msgstr "Etiqueta(s) escritas"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2586 src/easytag.c:2591
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2145,14 +2178,14 @@ msgstr ""
 "No se puede escribir la etiqueta en el archivo «%s»\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Renombrando archivo «%s»"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2737 src/easytag.c:2769 src/easytag.c:2941
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2165,11 +2198,11 @@ msgstr ""
 "«%s»!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "Archivo(s) no renombrados..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2182,7 +2215,7 @@ msgstr ""
 "porque el siguiente archivo ya existe:\n"
 "«%s»"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2194,16 +2227,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Renombrado el archivo «%s» a «%s»"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "Archivo(s) renombrados..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2215,17 +2248,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Se movió el archivo «%s» a «%s»"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
 msgstr "Archivo(s) movidos..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2238,11 +2271,11 @@ msgstr ""
 "«%s»!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
 msgstr "Archivo(s) no movidos..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2251,16 +2284,16 @@ msgstr ""
 "¿Realmente quiere eliminar definitivamente el archivo\n"
 " «%s» ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "Eliminar archivo..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Archivo «%s» eliminado"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2272,110 +2305,110 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "Búsqueda en progreso..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "Archivo: «%s»"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, 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:3239
+#: src/easytag.c:3356
 #, 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:3252 src/et_core.c:2696
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u archivo(s)"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
 msgstr ""
 "¡No se han encontrados archivos en este directorio y los subdirectorios!"
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "¡No se han encontrado archivos en este directorio!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "Buscando..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "  Parar la búsqueda...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "Seleccione un directorio para explorar."
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "Etiquetar archivos seleccionados con este campo"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Convertir «_» y «%20» a espacios"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "Convertir « » a «_»"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "TODAS MAYÚSCULAS"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "todas minúsculas"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "Primera letra mayúscula"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "Primera Letra De Cada Palabra Mayúscula"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "Borrar espacios"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "Insertar espacios antes de una letra en mayúsculas"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 msgid "Remove duplicate spaces or underscores"
 msgstr "Borrar espacios o subrayados duplicados"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: ¡Terminación anormal! (PId: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, fuzzy, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Recibida señal %s (%d)\a\n"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 "
@@ -2385,11 +2418,11 @@ msgstr ""
 "del error con una traza gdb ('gdb easytag core' y entonces 'bt' y 'l') a "
 "easytag@gmail.com"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "Señal desconocida"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2422,11 +2455,11 @@ msgstr ""
 "ruta_a/archivos     Usar una ruta relativa.\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Terminación normal."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2434,79 +2467,79 @@ msgstr ""
 "Algunos archivos han sido modificados pero no se han guardado...\n"
 "¿Desea guardarlos antes de salir del programa?"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr "¿Realmente quiere salir del programa? "
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "Etiqueta ID3"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Etiqueta Ogg Vorbis"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "Etiqueta FLAC Vorbis"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "Etiqueta APE"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr "Etiqueta MP4/M4A/AAC"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "Archivo MP3"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "Archivo MP2"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "Archivo Ogg Vorbis"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 #, fuzzy
 msgid "Speex File"
 msgstr "Siguiente archivo"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "Archivo FLAC"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "Archivo MusePack"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "Archivo Monkey's Audio"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr "Archivo MP4/AAC"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 #, fuzzy
 msgid "Wavpack File"
 msgstr "Archivo MusePack"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "Imágenes"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2514,14 +2547,14 @@ 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/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2532,11 +2565,11 @@ 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:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "Codificación del nombre del archivo"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "El nombre de archivo «%s» excede %d caracteres y será truncado\n"
@@ -2546,7 +2579,7 @@ msgstr "El nombre de archivo «%s» excede %d caracteres y será truncado\n"
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "Codificador:"
@@ -2555,49 +2588,54 @@ msgstr "Codificador:"
 #. 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/flac_header.c:312 src/mp4_header.c:286 src/ogg_header.c:267
 #: src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Canales"
 
-#: src/flac_tag.c:140 src/flac_tag.c:741
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "ERROR al abrir archivo: «%s» (%s).\n"
 "\a"
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "ERROR: Fallo al escribir comentarios al archivo «%s» (%s)."
 
-#: src/flac_tag.c:990 src/ogg_tag.c:759
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Escrita la etiqueta de «%s»"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Borrada la etiqueta de «%s»"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Error al borrar la etiqueta ID3v1 de «%s» (%s)"
 
-#: src/id3_tag.c:490 src/id3_tag.c:557
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Error al borrar la etiqueta ID3v2 de «%s» (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Error al actualizar la etiqueta ID3v2 de «%s» (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2612,77 +2650,77 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Error al actualizar la etiqueta ID3v1 de «%s» (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Actualizada la etiqueta de «%s»"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "No se han producido errores"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "No hay memoria suficiente"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "No hay datos que analizar"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "Datos incorrectamente formados"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "No hay búfer para escribir"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "El búfer es demasiado pequeño"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "ID de marco inválido"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "Campo pedido no encontrado"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "Tipo de campo desconocido"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "La etiqueta ya está asociada a un archivo"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "Versión de etiqueta inválida"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "Ningún archivo que procesar"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "Intentando escribir en un archivo de sólo lectura"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "Error en compresión/descompresión"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "¡Mensaje de error desconocido!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2691,127 +2729,83 @@ msgstr ""
 "Debido a que el siguiente archivo corrompido: «%s»\n"
 "causaría un error en id3lib, el programa no lo procesará."
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
 msgstr "Archivo corrompido..."
 
-#: src/log.c:91
+#: src/log.c:95
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:214
-msgid " OK "
-msgstr " Aceptar "
-
-#: src/misc.c:219
-msgid " Yes "
-msgstr " Sí "
-
-#: src/misc.c:224
-msgid " No "
-msgstr " No "
-
-#: src/misc.c:229
-msgid " Apply "
-msgstr " Aplicar "
-
-#: src/misc.c:234
-msgid " Save "
-msgstr " Guardar "
-
-#: src/misc.c:239
-msgid " Cancel "
-msgstr " Cancelar "
-
-#: src/misc.c:244
-msgid " Close "
-msgstr " Cerrar "
-
-#: src/misc.c:249
-msgid " Write "
-msgstr " Escribir "
-
-#: src/misc.c:254
-msgid " Execute "
-msgstr " Ejecutar "
-
-#: src/misc.c:259
-msgid " Search "
-msgstr " Buscar "
-
-#: src/misc.c:264
-msgid " Browse... "
-msgstr " Examinar..."
+#: src/misc.c:773
+msgid "Select file..."
+msgstr "Seleccionar archivo..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "Seleccionar directorio..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "Seleccionar archivo..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 #, fuzzy
 msgid "Warning..."
 msgstr "Buscando..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "KiB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "MiB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "GiB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "TiB"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "Generar una lista de reproducción"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "Nombre de la lista M3U"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "Usar nombre del directorio"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "Editar máscaras"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "Opciones de la lista de reproducción"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "Incluir sólo los archivos seleccionados"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2819,31 +2813,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:1397
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "Usar ruta completa para los archivos en la lista"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 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:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "Crear lista de reproducción en directorio superior"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 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:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "Usar el separador de directorio de DOS"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2851,23 +2845,23 @@ msgstr ""
 "Esta opción reemplaza el separador de directorio UNIX «/» por el separador "
 "DOS «\\»."
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "Contenido de la lista de reproducción"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "Escribir sólo la lista de archivos"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "Escribir información utilizando el nombre de archivo"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "Escribir información usando :"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2876,12 +2870,12 @@ msgstr ""
 "El archivo de la lista «%s» ya existe.\n"
 "¿Desea sobreescribirlo?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "Escribir lista de reproducción..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2890,44 +2884,24 @@ msgstr ""
 "No se puede escribir el archivo de lista «%s»\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Se ha escrito el archivo de la lista «%s»"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1964
-msgid "Track"
-msgstr "Pista"
-
-#: src/misc.c:1967 src/picture.c:821
-msgid "Composer"
-msgstr "Compositor"
-
-#: src/misc.c:1968
-msgid "Orig. Artist"
-msgstr "Artista original"
-
-#: src/misc.c:1969
-msgid "Copyright"
-msgstr "Copyright"
-
-#: src/misc.c:1970
-msgid "URL"
-msgstr "URL"
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "Codificado por"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "Buscar un archivo"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2935,93 +2909,93 @@ msgstr ""
 "para mostrar todos los archivos."
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "En :"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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:2033
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "la etiqueta"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Distinguir capitalización"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Encontrados: %d archivo(s)"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "Leer nombres de archivo desde un archivo TXT"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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:2787
+#: src/misc.c:2738
 msgid " Load "
 msgstr " Cargar "
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, 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
+#: src/misc.c:2782 src/misc.c:2876
 #, 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
+#: src/misc.c:2791 src/misc.c:2885
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "Eliminar esta línea"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 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
+#: src/misc.c:2812 src/misc.c:2906
 #, 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
+#: src/misc.c:2821 src/misc.c:2915
 #, 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "Releer"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "Escribir sólo la lista de archivos"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "Seleccionar todos"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3029,20 +3003,20 @@ msgstr ""
 "Cuando esta opción esté activa, después de cargar los nombres, el procesador "
 "actual será ejecutado (la ventana del procesador debe estar abierta)."
 
-#: src/misc.c:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "Insertar una línea en blanco"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "Eliminar esta línea"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "Subir esta máscara"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "Bajar esta máscara"
@@ -3060,7 +3034,7 @@ msgstr "Sonido"
 msgid "Unknown"
 msgstr "Desconocida"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr "Formato MP4 inválido"
 
@@ -3085,8 +3059,7 @@ msgstr ""
 msgid "Single channel"
 msgstr ""
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "Repetir acción para el resto de los archivos"
 
@@ -3124,48 +3097,48 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "ERROR: Fallo al abrir archivo: «%s» como vorbis (%s)."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Atención: el archivo Ogg Vorbis «%s» contiene una etiqueta ID3v2."
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "Añadir imágenes"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "Todos los archivos"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG y JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "Propiedades imagen %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "Tipo de imagen"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "Descripción de la imagen:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "Guardar imagen %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3176,115 +3149,120 @@ msgstr ""
 "«%s»\n"
 "¿Quiere sobreescribirlo?"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "Guardar archivo..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "imagen JPEG"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "imagen PNG"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "Imagen desconocida"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "icono archivo PNG de 32x32 píxeles."
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "Otro icono de fichero"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "Carátula (frontal)"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "Carátula (trasera)"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr "Página del folleto"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr "Soporte (ej. lateral de la etiqueta del CD)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr "Artista líder/intérprete líder/solista"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "Artista/intérprete"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "Director"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "Banda/Orquesta"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "Letrista/escritor"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "Lugar de grabación"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "Durante la grabación"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "Durante la actuación"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "Película/captura de vídeo"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "Un pescado brillante coloreado"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "Ilustración"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "Banda/Logotipo de artista"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "Editor/Logotipo del estudio"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "Tipo de imagen desconocido"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "píxeles"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "Tipo"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "Descripción"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3292,11 +3270,16 @@ 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:987
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr "Cargando archivo de imagen..."
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3307,7 +3290,7 @@ msgstr ""
 "«%s»\n"
 "(%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr "Archivo de imagen no cargado..."
 
@@ -3716,7 +3699,7 @@ msgstr ""
 "Forzar el uso de la codificación de caracteres del sistema y activar la "
 "transliteración"
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3734,7 +3717,7 @@ msgstr ""
 "Forzar el uso de la codificación de caracteres del sistema y descartar "
 "silenciosamente algunos caracteres"
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3934,7 +3917,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr ""
 
@@ -3957,35 +3940,46 @@ msgstr ""
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 #, fuzzy
 msgid "No"
 msgstr " No "
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+#, fuzzy
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+"Con esta opción, cuando un carácter no pueda representarse en el conjunto de "
+"caracteres destino, puede ser aproximado a través de caracteres de "
+"apariencia similar."
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "Etiqueta ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "Escribir etiquetas ID3v1.x"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3993,7 +3987,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:878
+#: src/prefs.c:882
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr ""
@@ -4001,16 +3995,16 @@ msgstr ""
 "archivo."
 
 #. Character Set for reading tag
-#: src/prefs.c:910
+#: src/prefs.c:917
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Conjunto de caracteres para las etiquetas ID3"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -4040,7 +4034,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:947
+#: src/prefs.c:954
 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 "
@@ -4049,24 +4043,24 @@ msgstr ""
 #.
 #. * Scanner
 #.
-#: src/prefs.c:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "Procesador"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Procesador de etiquetas - Conversión de caracteres"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Convertir caracteres de subrayado «_» y la cadena «%20» a espacios « »"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Convertir espacios « » a subrayados «_»"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4075,11 +4069,11 @@ msgstr ""
 "máscara desde el procesador para etiquetas."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Renombrado de archivos - Conversión de caracteres"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4088,19 +4082,19 @@ msgstr ""
 "máscara."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 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:1034
+#: src/prefs.c:1041
 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:1038
+#: src/prefs.c:1045
 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 "
@@ -4113,15 +4107,15 @@ msgstr ""
 "'Texto En Una Entrada')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "Ventana del procesador"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "Abrir la ventana del procesador al arrancar."
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4129,11 +4123,11 @@ msgstr ""
 "Seleccione esta opción para abrir automáticamente la ventana del procesador "
 "cuando EasyTAG comience."
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "Ventana del procesador siempre encima"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4142,16 +4136,16 @@ msgstr ""
 "siempre sobre la ventana principal."
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "Campos"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "Sobreescribir campos al procesar etiquetas"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4160,11 +4154,11 @@ msgstr ""
 "campos por los nuevos. Si está deseleccionado, sólo los campos en blanco de "
 "las etiquetas serán completadas."
 
-#: src/prefs.c:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "Establecer este texto como comentario predeterminado :"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4173,12 +4167,12 @@ msgstr ""
 "comentario al usar el procesador «Rellenar etiqueta»."
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 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:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4189,46 +4183,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "Base de datos de CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Búsqueda automática"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "Nombre :"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "Puerto :"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "Ruta a CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Opciones del servidor"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "Base de datos de CD"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 #, fuzzy
 msgid "Path :"
 msgstr "Ruta a CGI :"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4237,52 +4231,52 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "Configuración de proxy"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "Usar un proxy"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "Activar la configuración del servidor proxy."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "Anfitrión:"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "Nombre del servidor proxy."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "Puerto del servidor proxy."
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "Usuario:"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "Nombre de usuario en el servidor proxy."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "Contraseña :"
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 msgid "Password of user for the the proxy server."
 msgstr "Contraseña en el servidor proxy."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "Lista de nombre de pista"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4290,7 +4284,7 @@ msgstr ""
 "Seleccionar el archivo de sonido correspondiente (de acuerdo con posición o "
 "DLM si estuviese activado abajo)"
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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."
@@ -4300,7 +4294,7 @@ msgstr ""
 "seleccionará también."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4311,15 +4305,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "Confirmar"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "Confirmar la salida del programa"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4327,19 +4321,19 @@ msgstr ""
 "Si está seleccionado, muestra una cuadro de diálogo para confirmar si se "
 "desea salir del programa."
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "Confirmar la escritura de la etiqueta de archivos"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "Confirmar el renombrado de archivos"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "Confirmar el borrado de archivos"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "Confirmar la escritura de la lista de reproducción"
 
@@ -4347,37 +4341,37 @@ msgstr "Confirmar la escritura de la lista de reproducción"
 #. //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
+#: src/prefs.c:1429
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Aplicar cambios (pero no guardar) y cerrar esta ventana"
 
-#: src/prefs.c:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "Cerrar esta ventana sin guardar"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 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:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Ejemplo : %.*d_-_Pista_nombre_1.mp3)"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "Cambios aplicados"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "Configuración guardada"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "Configuración sin cambios"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4388,57 +4382,57 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "No es un directorio"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "El reproductor del archivo de sonido «%s» no se puede encontrar"
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "Rellenar etiqueta"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "Renombrar archivo y directorio"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "Procesar campos"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "Se procesaron con éxito las etiquetas..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Se procesaron con éxito las etiquetas...(%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, 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:663
+#: src/scan.c:667
 #, 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:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "Nuevo nombre de archivo procesado con éxito..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nuevo nombre de archivo procesado con éxito...(%s)"
@@ -4446,41 +4440,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "Procesar etiqueta y nombre de archivo"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "Procesador :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "Elegir el tipo de procesador a usar"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "Abrir ventana del procesador / Procesar archivos seleccionados"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "Opciones del procesador"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "Mostrar / Ocultar editor de máscaras"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "Mostrar / Ocultar leyenda"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4490,15 +4484,15 @@ msgstr ""
 "etiquetas."
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "Vista previa del relleno de la etiqueta..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr "Máscara del prefijo con la ruta actual"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4511,15 +4505,15 @@ msgstr ""
 "absoluta, en otro caso, es relativa a la ruta anterior."
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "Previsualizar el renombrado de archivo..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "Elegir campos:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4528,126 +4522,126 @@ msgstr ""
 "Elija aquellos que le interesen."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 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:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "Procesar el campo de título"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "Procesar el campo de artista"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "Procesar el campo de álbum"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "Procesar el campo de género"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "Procesar el campo de comentario"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "Procesar el campo del compositor"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 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:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "Procesar el campo de copyright"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr "Procesar el campo de URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr "Procesar el campo de codificador"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "Invertir la selección"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "Seleccionar/Deseleccionar todo."
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Convertir '_' y '%20' a ' '"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "Convertir :"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "a : "
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4655,7 +4649,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:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4663,12 +4657,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:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4676,7 +4670,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:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4684,7 +4678,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:2325
+#: src/scan.c:2394
 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'."
@@ -4692,7 +4686,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:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4700,15 +4694,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:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "Insertar un espacio antes de una letra mayúscula"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "Borrar espacios o subrayados duplicados"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4716,7 +4710,7 @@ msgstr ""
 "Todos los espacios entre palabras son borrados. Ejemplo, antes: 'Texto En "
 "Una Entrada', después: 'TextoEnUnaEntrada'."
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4724,7 +4718,7 @@ msgstr ""
 "Se inserta un espacio antes de cada letra mayúscula. Ejemplo, antes: "
 "'TextoEnUnaEntrada', después: 'Texto En Una Entrada'."
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4735,161 +4729,161 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "Leyenda"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artista"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : álbum"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c : comentario"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p : compositor"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r: copyright"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : número de disco"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : codificado por"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g : género"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorado"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l : número de pistas"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : artista orig."
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n : pista"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t : título"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u: URL"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y : año"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "Editor de máscaras"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "Crear nueva máscara"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "Subir esta máscara"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "Bajar esta máscara"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "Duplicar máscara"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "Añadir máscara predeterminada"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "Borrar máscara"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "Guardar máscaras"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "Nueva_máscara"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "Copiar: ¡ninguna fila seleccionada!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "Borrar: ¡ninguna fila seleccionada!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "Subir: ¡ninguna fila seleccionada!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "Bajar: ¡ninguna fila seleccionada!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, 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:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, 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:1033
+#: src/setting.c:1032
 msgid "Loading default configuration..."
 msgstr "Cargando la configuración predeterminada..."
 
-#: 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, 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:1278
+#: src/setting.c:1277
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
@@ -4897,28 +4891,28 @@ msgstr ""
 "\a"
 
 #. Fall back to defaults
-#: src/setting.c:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Cargando máscaras de «Rellenar etiqueta» predefinidas..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "Cargando máscaras de 'Renombrar archivo' predefinidas..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Cargar las máscaras de 'Renombrar directorio' predefinidas..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 #, 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:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ERROR: ¡No se puede crear el directorio «%s» (%s)!"
@@ -4968,42 +4962,75 @@ msgstr ""
 "erróneos."
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr ""
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr ""
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr ""
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr ""
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, fuzzy, c-format
 msgid "Audio player: '%s'"
 msgstr "Ejecutar reproductor de audio"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid " OK "
+#~ msgstr " Aceptar "
+
+#~ msgid " Yes "
+#~ msgstr " Sí "
+
+#~ msgid " No "
+#~ msgstr " No "
+
+#~ msgid " Apply "
+#~ msgstr " Aplicar "
+
+#~ msgid " Save "
+#~ msgstr " Guardar "
+
+#~ msgid " Cancel "
+#~ msgstr " Cancelar "
+
+#~ msgid " Close "
+#~ msgstr " Cerrar "
+
+#~ msgid " Write "
+#~ msgstr " Escribir "
+
+#~ msgid " Execute "
+#~ msgstr " Ejecutar "
+
+#~ msgid " Search "
+#~ msgstr " Buscar "
+
+#~ msgid " Browse... "
+#~ msgstr " Examinar..."
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/fr.gmo b/po/fr.gmo
index 2e5e575..4d8b21e 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 18246f5..f10018c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,22 +1,23 @@
 # French catalog for EasyTAG.
 # Copyright (C) 2000-2007 Free Software Foundation, Inc.
+# This file is distributed under the same license as the EasyTAG package.
 # J�r�me Couderc <j.couderc@ifrance.com>, 2000, 2001, 2002, 2004, 2005.
 # J�r�me Couderc <easytag@gmail.com>, 2005, 2006, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: EasyTAG 2.1.3\n"
+"Project-Id-Version: EasyTAG 2.1.4\n"
 "Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2007-12-09 18:16+0100\n"
+"PO-Revision-Date: 2007-12-09 10:41+0100\n"
+"Last-Translator: Jerome Couderc <easytag@gmail.com>\n"
+"Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: src/about.c:134
+#: src/about.c:140
 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,223 +28,217 @@ msgstr ""
 "Son interface GTK+ simple et agr�able rend le marquage plus simple sous GNU/"
 "Linux."
 
-#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(traduction Allemande)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(traduction Russe)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(traduction Hollandaise)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(traduction Su�doise)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(traduction Hongroise)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(traduction Italienne)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(traduction Japonaise)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(traduction Ukrainienne)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(traduction Tch�que)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(traduction Espagnole)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(traduction Polonaise)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(traduction Roumaine)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(traduction Danoise)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(traduction Grecque)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(traduction Portugais Br�silien)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr "(traduction Bulgare)"
 
-#: src/about.c:171
+#: src/about.c:177
 msgid "(Chinese translation)"
 msgstr "(traduction Chinoise)"
 
-#: src/about.c:172
+#: src/about.c:178
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(traduction Chinoise (Ta�wan))"
+
+#: src/about.c:179
 msgid "(Hebrew translation)"
 msgstr "(traduction H�bra�que)"
 
-#: src/about.c:173
+#: src/about.c:180
 msgid "(Serbian translation)"
 msgstr "(traduction Serbe)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr "Nom de l'extension"
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr "Statut"
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "Comment."
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "A Propos..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "A Propos"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compil� le: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(utilis�: GTK+ %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "Auteur : %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail : %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Page Web : "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "Description :"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr "Extensions"
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr "libid3tag %s"
-
-#: src/about.c:394
+#: src/about.c:433
 msgid "MP3 file support"
 msgstr "Support des fichiers 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
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 msgid "enabled"
 msgstr "activ�"
 
-#: 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr "d�sactiv�"
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr "id3lib %d.%d.%d"
-
-#: src/about.c:408
+#: src/about.c:449
 msgid "ID3v2.3 tags writting support"
 msgstr "Support des tags ID3v2.3"
 
-#: src/about.c:410
+#: src/about.c:452
 msgid "available"
 msgstr "disponible"
 
-#: src/about.c:420
+#: src/about.c:463
 msgid "Ogg Vorbis file support"
 msgstr "Support des fichiers Ogg Vorbis"
 
-#: src/about.c:430
+#: src/about.c:475
 msgid "Speex file support"
 msgstr "Support des fichiers Speex"
 
-#: src/about.c:440
+#: src/about.c:491
 msgid "FLAC file support"
 msgstr "Support des fichiers FLAC"
 
-#: src/about.c:450
+#: src/about.c:504
 msgid "MP4/AAC file support"
 msgstr "Support des fichiers MP4/AAC"
 
-#: src/about.c:460
+#: src/about.c:516
 msgid "WavPack file support"
 msgstr "Support des fichiers WavPack"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "Remerciements"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "Traductions :\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "G�n�ral :\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "Historique"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "ERREUR lors de l'ouverture du fichier: '%s' (%s)."
@@ -419,7 +414,7 @@ msgstr "Ordre d�croissant des fr�quences"
 msgid "Open File(s) with ..."
 msgstr "Ouvrir le(s) Fichier(s) avec ..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "S�lectionner tous les Fichiers"
 
@@ -427,7 +422,7 @@ msgstr "S�lectionner tous les Fichiers"
 msgid "Unselect All Files"
 msgstr "D�s�lectionner tous les Fichiers"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "Inverser la S�lection des Fichiers"
 
@@ -573,17 +568,17 @@ msgstr "Renommer le R�pertoire ..."
 msgid "Reload Directory"
 msgstr "Recharger le R�pertoire"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "Parcourir le R�pertoire avec ..."
 
 #: src/bar.c:217
 msgid "_Collapse Tree"
-msgstr "Refermer l'Arbre"
+msgstr "Refermer l'Arborescence"
 
 #: src/bar.c:218
 msgid "_Refresh Tree"
-msgstr "_Rafra�chir l'Arbre"
+msgstr "_Rafra�chir l'Arborescence"
 
 #: src/bar.c:220 src/bar.c:249
 msgid "S_canner"
@@ -712,17 +707,17 @@ msgstr "Impossible de fusionner l'UI, erreur: %s\n"
 msgid "Ready to start..."
 msgstr "Pr�t � d�marrer"
 
-#: src/browser.c:326
+#: src/browser.c:330
 msgid "New default path for files selected"
 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:4550 src/easytag.c:4570 src/easytag.c:4589
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "Confirmer..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -730,66 +725,112 @@ 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:2040
+#: src/browser.c:2164
 msgid "<All albums>"
 msgstr "<Tous les albums>"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "Arborescence"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "Nom de Fichier"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "Titre"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "Album"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "Ann�e"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "Piste"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "Genre"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "Compositeur"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "Artiste Orig."
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "Copyright"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "URL"
+
+#: src/browser.c:2946
+msgid "Encoded By"
+msgstr "Encodeur"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "# Albums"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 msgid "# Files"
 msgstr "# Fichiers"
 
-#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
-msgid "Album"
-msgstr "Album"
-
-#: src/browser.c:2822
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "Aller dans le R�pertoire Parent"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "Entrer un r�pertoire �parcourir."
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "Arborescence"
+#: src/browser.c:2994
+msgid "Select a directory to browse."
+msgstr "S�l�ctionner un r�pertoire � parcourir."
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "Artiste & Album"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "Renommer le R�pertoire"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Renommer le r�pertoire '%s' en :"
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "Utiliser le masque :"
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 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:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -797,31 +838,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:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
-#: src/scan.c:2119 src/scan.c:2465
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "Masque de Scanner Invalide"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 msgid "Rename directory preview..."
 msgstr "Apercu du renommeur de r�pertoires..."
 
-#. 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "Erreur..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "Vous devez saisir un nom de r�pertoire!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -832,16 +873,22 @@ msgstr ""
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -850,7 +897,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -859,7 +906,7 @@ msgstr ""
 "Impossible de renommer car ce r�pertoire existe d�j�!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -874,86 +921,86 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "R�pertoire renomm�"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "Programme � lancer :"
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 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:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "Ouvrir le Fichier avec ..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 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:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "Vous devez saisir un nom de programme!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Le programme '%s' n'a pas �t� trouv�!"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Impossible d'ex�cuter %s (erreur %d)!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "Ne peut lancer un processus fils!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Commande ex�cut�e : '%s %s'"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "Artiste / Album"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Category"
 msgstr "Cat�gorie"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:229 src/cddb.c:438
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "Nom de Piste"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "Dur�e"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "Recherche Base de Donn�es CD"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "Recherche Automatique"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 msgid "Request CD database :"
 msgstr "Interroger la base de CD :"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -961,16 +1008,16 @@ msgstr ""
 "Interroger automatiquement la base CDDB � partir des fichiers s�lectionn�s "
 "pour g�n�rer le CddbID (l'ordre des fichiers est important!)"
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "Arr�ter la recherche ..."
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr "Utiliser Cddb local"
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -981,139 +1028,139 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr " Recherche Manuelle"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "Mots :"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Entrez les mots � rechercher (s�par�s par un espace ou un '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "Rechercher dans :"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "Tous les Champs"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "Autres"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "Toutes les Cat�gories"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "Classique"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Divers"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "inclus : funk, soul, rap, pop, industrial, metal, etc."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "films, shows"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "tous ceux qui ne correspondent pas aux autres cat�gories"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr " Cat�gories "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "R�sultats :"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "Rechercher :"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "Entrez les mots � rechercher dans la liste du dessous"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr " Rechercher le suivant"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "Rechercher le pr�c�dent"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Afficher seulement les lignes rouges (ou afficher toutes les lignes) dans la "
 "liste 'Artiste / Album'"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "D�s�lectionner toutes les lignes"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "Inverser la s�lection des lignes"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "S�lectionner toutes les lignes"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1127,52 +1174,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "Mettre dans :"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 msgid "All"
 msgstr "Tous"
 
-#: src/cddb.c:721 src/misc.c:1958
-msgid "File Name"
-msgstr "Nom de Fichier"
-
-#: src/cddb.c:722 src/misc.c:1959
-msgid "Title"
-msgstr "Titre"
-
-#: src/cddb.c:725 src/misc.c:1963
-msgid "Year"
-msgstr "Ann�e"
-
-#: src/cddb.c:726
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "N� Piste"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 msgid "# Tracks"
 msgstr "Nbr Pistes"
 
-#: 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:3013
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "Ex�cuter le scanner courant pour chaque fichier"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "Correspondance des lignes avec DLM"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:777 src/prefs.c:1362
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1186,93 +1217,93 @@ msgstr ""
 "sera utilis� pour s�lectionner le fichier audio correspondant, ou lors du "
 "chargement des r�sultats CDDB au lieu de se baser sur la position."
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 "Charger les lignes s�lectionn�es ou toutes les lignes (si aucune n'est "
 "s�lectionn�e)"
 
-#: src/cddb.c:798 src/misc.c:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "Pr�t � chercher..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, 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:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "Inverser la s�lection"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "Classer par Num�ro de Piste"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "Classer par Nom de Piste"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Obtention de l'h�te '%s' ..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Impossible d'obtenir l'h�te '%s' (%s)!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, 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:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Connexion en cours sur l'h�te '%s' (port '%d') ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Impossible de se connecter sur l'h�te '%s' (%s)"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Connect� sur l'h�te '%s'"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "R�ception des donn�es (%s) ..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Erreur lors de la lecture de la r�ponse cddb (%s)!"
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Impossible de cr�er le fichier '%s' (%s)"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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:2246 src/cddb.c:2564 src/cddb.c:3397
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "Envoi de la requ�te ..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Impossible d'envoyer la requ�te (%s)!"
@@ -1281,91 +1312,91 @@ msgstr "Impossible d'envoyer la requ�te (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "R�ception des donn�es ..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 msgid "The server returned a wrong answer!"
 msgstr "Le serveur a retourn� une mauvaise r�ponse!"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Le serveur a retourn� une mauvaise r�ponse! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 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:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Trouv�(s) %d album(s) correspondant(s)"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, 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:2587
+#: src/cddb.c:2591
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "R�ception des donn�es de la page %d ..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr "D'autres r�sultats � charger ..."
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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:2889
+#: src/cddb.c:2893
 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:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d fichier(s) s�lectionn�(s)!"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 msgid "Local CD search..."
 msgstr "Recherche CD locale ..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 "Le r�pertoire pour la 'Base de CD locale' n'a pas �t� d�finie!\n"
-"Renseignez le dans la fen�tre des pr�f�rences."
+"Renseignez le dans la fen�tre des pr�f�rences pour utiliser cette recherche."
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, 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:3268
+#: src/cddb.c:3276
 #, 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:3364
+#: src/cddb.c:3372
 #, 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:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "Chargement de la liste des pistes de l'album ..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1378,7 +1409,7 @@ msgstr ""
 "\n"
 "Voulez-vous continuer ?"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "Ecriture des Tags � partir de CDDB..."
 
@@ -1563,70 +1594,70 @@ msgstr "Occidental (ISO-8859-15)"
 msgid "Western (Windows-1252)"
 msgstr "Occidental (Windows-1252)"
 
-#: src/charset.c:542
+#: src/charset.c:543
 #, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
-msgstr "Le nom de fichier '%s' n'a pas pu �tre converti en UTF-8 (%s).\n"
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
+msgstr "Le nom de fichier '%s' n'a pas pu �tre converti en UTF-8 (%s)."
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "UTF-8 Invalide"
 
-#: src/charset.c:641
+#: src/charset.c:642
 #, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
 "La chaine UTF-8 '%s' n'a pas pu �tre convertie vers l'encodage du fichier (%"
-"s)\n"
+"s)."
 
-#: src/charset.c:705
+#: src/charset.c:706
 #, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
-msgstr "La cha�ne '%s' n'a pas pu �tre convertie en UTF-8 (%s).\n"
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
+msgstr "La cha�ne '%s' n'a pas pu �tre convertie en UTF-8 (%s)."
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "D�marrage de EasyTAG %s (PId: %d) ..."
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "Version de libid3tag utilis�e: %s ..."
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "Version de id3lib utilis�e: %d.%d.%d ..."
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr "Variable EASYTAGLANG non d�finie. Param�trage de la locale � : '%s'"
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, c-format
 msgid "Setting locale : '%s'"
 msgstr "Param�trage de la locale � '%s'"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr "Locale utilis�e '%s' (et �ventuellement '%s')..."
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s par %s (compil� le %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "Page Web: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr "Param�tre au chemin '%s' inconnu\n"
@@ -1634,128 +1665,128 @@ msgstr "Param�tre au chemin '%s' inconnu\n"
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "S�lecteur"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "Fichier"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "Fichier en Lecture Seule"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 msgid "File Link Broken"
 msgstr "Fichier Introuvable"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, Layer ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "D�bit:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "Fr�q:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Mode:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
-#: src/easytag.c:4073
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "Taille:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? ko"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "Dur�e:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "Tag"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "G�n�ral"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "Titre:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec ce titre"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "Artiste:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec cet artiste"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec cet album"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec ce num�ro de disque"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "Ann�e:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec cette ann�e"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Renum�rote les pistes s�lectionn�es s�quentiellement. Et red�marre � 01 dans "
@@ -1763,11 +1794,11 @@ msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "Piste N�:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1775,277 +1806,277 @@ msgstr ""
 "Mettre le nombre de fichiers, pr�sents dans le r�pertoire, pour les pistes "
 "s�lectionn�es"
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec ce nombre de pistes"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "Genre:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec ce genre"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "Comment.:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 msgid "Tag selected files with this comment"
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec ce commentaire"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:818
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "Compositeur:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec ce compositeur"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "Artiste Orig.:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec cet artiste original"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec ce copyright"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec cette URL"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "Encodeur:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec ce nom d'encodeur"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "Images"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "Images:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "Vous pouvez utiliser le Drag and Drop pour ajouter des images."
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec ces images"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 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
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr "Effacer les images s�lectionn�es, sinon toutes."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "Sauvegarder les fichiers s�lectionn�s sur le disque dur."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "D�finir les propri�t�s des images s�lectionn�es."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec le titre '%s'."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "Le titre a �t� supprim� dans les fichiers s�lectionn�s."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec l'artiste '%s'."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "L'artiste a �t� supprim� dans les fichiers s�lectionn�s."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec l'album '%s'."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "L'album a �t� supprim� dans les fichiers s�lectionn�s."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec le num�ro de disque '%s'."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "Le num�ro de disque a �t� supprim� dans les fichiers s�lectionn�s."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec l'ann�e '%s'."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "L'ann�e a �t� supprim�e dans les fichiers s�lectionn�s."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr ""
 "Les fichiers s�lectionn�s sont tagg�s avec un num�ro de piste du type 'xx/%"
 "s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr ""
 "Les fichiers s�lectionn�s sont tagg�s avec un num�ro de piste du type 'xx'."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "La piste a �t� supprim�e dans les fichiers s�lectionn�s."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "Les pistes s�lectionn�es ont �t� renum�rot�es!"
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec le genre '%s'."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "Le genre a �t� supprim� dans les fichiers s�lectionn�s."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec le commentaire '%s'."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "Le commentaire a �t� supprim� dans les fichiers s�lectionn�s."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec le compositeur '%s'."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "Le compositeur a �t� supprim� dans les fichiers s�lectionn�s."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec l'artiste original '%s'."
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "L'artiste original a �t� supprim� dans les fichiers s�lectionn�s."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec le copyright '%s'."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "Le copyright a �t� supprim� dans les fichiers s�lectionn�s."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec l'URL '%s'."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "L'URL a �t� supprim�e dans les fichiers s�lectionn�s."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec le nom de l'encodeur '%s'."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr "Le nom de l'encodeur a �t� supprim� dans les fichiers s�lectionn�s."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "Les fichiers s�lectionn�s sont tagg�s avec ces images."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "Les images ont �t� supprim�es des fichiers s�lectionn�s."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "S�lectionner le Mode et le Masque, et refaire la m�me action"
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "Tous les tags ont �t� scann�s"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "Tous les tags ont �t� supprim�s"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "Tous les fichiers ont �t� sauv�s..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "Les fichiers ont �t� partiellement sauv�s..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "Les fichiers ont �t� partiellement effac�s..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "Tous les fichiers ont �t� effac�s..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2054,16 +2085,16 @@ msgstr ""
 "Voulez-vous �crire le tag du fichier\n"
 "'%s' ?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "Ecriture des Tags..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr "Renommer le Fichier et le R�pertoire..."
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2077,11 +2108,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr "Renommer le R�pertoire..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2095,11 +2126,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "Renommer le Fichier..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2112,17 +2143,17 @@ msgstr ""
 "par \n"
 "'%s' ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Ecriture du tag de '%s'"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 msgid "Tag(s) written"
 msgstr "Tag(s) �crit"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2586 src/easytag.c:2591
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2131,14 +2162,14 @@ msgstr ""
 "Impossible d'�crire le tag du fichier '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Renomme le fichier '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2737 src/easytag.c:2769 src/easytag.c:2941
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2151,11 +2182,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "Fichier(s) non renomm�(s)..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2168,7 +2199,7 @@ msgstr ""
 "car ce fichier existe d�j� :\n"
 "%s"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2180,16 +2211,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Fichier '%s' renomm� en '%s'"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "Fichier(s) renomm�(s)..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2201,17 +2232,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Fichier '%s' d�plac� vers '%s'"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
 msgstr "Fichier(s) d�plac�(s)..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2224,11 +2255,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
 msgstr "Fichier(s) non d�plac�(s)..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2237,16 +2268,16 @@ msgstr ""
 "Voulez-vous r�ellement effacer d�finitivement le fichier\n"
 "'%s' ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "Effacer le Fichier..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Fichier: '%s' effac�"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2258,109 +2289,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "Recherche en cours..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "Fichier: '%s'"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, 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:3239
+#: src/easytag.c:3356
 #, 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:3252 src/et_core.c:2696
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u fichier(s)"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
 msgstr "Aucun fichier trouv� dans ce r�pertoire et sous r�pertoires!"
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "Aucun fichier trouv� dans ce r�pertoire!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "Recherche en cours..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "  ARRETER la recherche...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "S�l�ctionner un r�pertoire � parcourir!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "Tagger les fichiers s�lectionn�s avec ce champ"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Convertir '_' et '%20' par un espace"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "Convertir ' ' par '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "Tout en majuscule"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "Tout en minuscule"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "Premi�re lettre en majuscule"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "Premi�re lettre de chaque mot en majuscule"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "Enlever les espaces"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "Ins�rer un espace avant une majuscule"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 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:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Sortie anormale! (PId: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Signal re�u %s (%d)\a"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 "
@@ -2370,11 +2401,11 @@ msgstr ""
 "rapport de bug accompagn� de la trace gdb ('gdb easytag core' puis 'bt' et "
 "'l') et des informations pour le reproduire � l'adresse <easytag@gmail.com>"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "Signal inconnu"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, c-format
 msgid ""
 "\n"
@@ -2407,11 +2438,11 @@ msgstr ""
 "path_to/files     Utiliser un chemin relatif.\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Sortie normale."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2419,77 +2450,77 @@ msgstr ""
 "Des fichiers ont �t� modifi�s mais pas sauv�s...\n"
 "Voulez-vous les sauver avant de quitter le programme?"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr " Voulez-vous r�ellement quitter le programme ?"
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "Tag ID3"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Tag Ogg Vorbis"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "Tag FLAC Vorbis"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "Tag APE"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr "Tag MP4/M4A/AAC"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr "Tag Wavpack"
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "Fichier MP3"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "Fichier MP2"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "Fichier Ogg Vorbis"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 msgid "Speex File"
 msgstr "Fichier Speex"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "Fichier FLAC"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "Fichier MusePack"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "Fichier Monkey's Audio"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr "Fichier MP4/AAC"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 msgid "Wavpack File"
 msgstr "Fichier Wavpack"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, c-format
 msgid "Pictures (%d)"
 msgstr "Images (%d)"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2497,14 +2528,14 @@ 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/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2515,11 +2546,11 @@ msgstr ""
 "ne peut pas �tre converti vers l'encodage du syst�me de fichiers\n"
 "(Essayez de d�finir la variable d'environnement G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "Conversion du nom de fichier"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr ""
@@ -2530,7 +2561,7 @@ msgstr ""
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "Encodeur:"
@@ -2539,47 +2570,52 @@ msgstr "Encodeur:"
 #. 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/flac_header.c:312 src/mp4_header.c:286 src/ogg_header.c:267
 #: src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Canaux:"
 
-#: src/flac_tag.c:140 src/flac_tag.c:741
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "ERREUR lors de l'ouverture du fichier: '%s' comme FLAC (%s)."
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr "Le bloc image n'est pas valide : '%s'"
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "ERREUR: Impossible d'�crire les commentaires du fichier '%s' (%s)."
 
-#: src/flac_tag.c:990 src/ogg_tag.c:759
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Le tag de '%s' a �t� �crit"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Le tag de '%s' a �t� supprim�"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Erreur lors de la suppression du tag ID3v1 de '%s' (%s)"
 
-#: src/id3_tag.c:490 src/id3_tag.c:557
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Erreur lors de la suppression du tag ID3v2 de '%s' (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Erreur lors de la mise � jour du tag ID3v2 de '%s' (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2604,77 +2640,77 @@ msgstr ""
 "\n"
 "Fichier : %s"
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Erreur lors de la mise � jour du tag ID3v1 de '%s' (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Le tag de '%s' a �t� mis � jour"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "Aucune erreur report�e"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "Pas de m�moire disponible"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "Pas de donn�e � analyser"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "Donn�e mal format�e"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "Pas de tampon vers lequel �crire"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "Le tampon est trop petit"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "ID du frame invalide"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "Le champ demand� n'a pas �t� trouv�"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "Type du champ inconnu"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "Le tag est d�j� attach� � un fichier"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "Version du tag invalide"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "Pas de fichier � analyser"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "Tentative d'�criture vers un fichier en lecture seule"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "Erreur dans la compression/d�compression"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "Message d'erreur inconnu!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2683,126 +2719,82 @@ msgstr ""
 "Comme le fichier corrompu : '%s'\n"
 "va causer une erreur dans id3lib, il ne sera pas trait� par le programme."
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
 msgstr "Fichier corrompu..."
 
-#: src/log.c:91
+#: src/log.c:95
 msgid "Log"
 msgstr "Journal"
 
-#: src/misc.c:214
-msgid " OK "
-msgstr " OK "
-
-#: src/misc.c:219
-msgid " Yes "
-msgstr " Oui "
-
-#: src/misc.c:224
-msgid " No "
-msgstr " Non "
-
-#: src/misc.c:229
-msgid " Apply "
-msgstr " Appliquer "
-
-#: src/misc.c:234
-msgid " Save "
-msgstr " Sauver "
-
-#: src/misc.c:239
-msgid " Cancel "
-msgstr " Annuler "
-
-#: src/misc.c:244
-msgid " Close "
-msgstr " Fermer "
-
-#: src/misc.c:249
-msgid " Write "
-msgstr " Ecrire "
-
-#: src/misc.c:254
-msgid " Execute "
-msgstr " Ex�cuter "
-
-#: src/misc.c:259
-msgid " Search "
-msgstr " Rechercher "
-
-#: src/misc.c:264
-msgid " Browse... "
-msgstr "Parcourir..."
+#: src/misc.c:773
+msgid "Select file..."
+msgstr "S�lectionner un fichier..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "S�lectionner un r�pertoire..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "S�lectionner un fichier..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 msgid "Warning..."
 msgstr "Attention..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr "Aucun lecteur audio n'a �t� d�fini!"
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "o"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "Ko"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "Mo"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "Go"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "To"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "G�n�rer une liste de lecture"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "Nom de la Liste de Lecture M3U"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "Utiliser le nom du r�pertoire"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "Editer les Masques"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "Options de la Liste de Lecture"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "Inclure seulement les fichiers s�lectionn�s"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2810,30 +2802,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:1397
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "Utiliser le chemin complet pour les fichiers"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 msgid "Use relative path for files in playlist"
 msgstr "Utiliser le chemin relatif pour les fichiers"
 
 #. Create playlist in parent directory
-#: src/misc.c:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "Cr�er la Liste de Lecture dans le r�p. sup�rieur"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 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:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "Utiliser le s�parateur de r�pertoires DOS"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2841,23 +2833,23 @@ msgstr ""
 "Cette option remplace le s�parateur de r�pertoires UNIX '/' par celui de DOS "
 "'\\'."
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "Contenu de la Liste de Lecture"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "Ecrire seulement la liste des fichiers"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "Ecrire les infos en utilisant le nom du fichier"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "Ecrire les infos en utilisant :"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2866,12 +2858,12 @@ msgstr ""
 "Le fichier '%s' existe d�j�!\n"
 "L'�craser?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "Ecrire Liste de Lecture..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2880,44 +2872,24 @@ msgstr ""
 "Impossible d'�crire la liste de lecture '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "La liste de lecture '%s' a �t� �crite"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1964
-msgid "Track"
-msgstr "Piste"
-
-#: src/misc.c:1967 src/picture.c:821
-msgid "Composer"
-msgstr "Compositeur"
-
-#: src/misc.c:1968
-msgid "Orig. Artist"
-msgstr "Artiste Orig."
-
-#: src/misc.c:1969
-msgid "Copyright"
-msgstr "Copyright"
-
-#: src/misc.c:1970
-msgid "URL"
-msgstr "URL"
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "Encodeur"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "Rechercher un fichier"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2925,86 +2897,86 @@ msgstr ""
 "afficher."
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "Dans :"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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:2033
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "le Tag"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Sensible � la casse"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Trouv�(s) : %d fichier(s)"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "Charger les noms des fichiers � partir d'un fichier TXT"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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:2787
+#: src/misc.c:2738
 msgid " Load "
 msgstr " Charger "
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 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
+#: src/misc.c:2782 src/misc.c:2876
 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
+#: src/misc.c:2791 src/misc.c:2885
 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
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 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
+#: src/misc.c:2812 src/misc.c:2906
 msgid "Move up the selected line"
 msgstr "Monter la ligne s�lectionn�e"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2870 src/misc.c:2964
+#: src/misc.c:2821 src/misc.c:2915
 msgid "Move down the selected line"
 msgstr "Descendre la ligne s�lectionn�e"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "Recharger"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 msgid "List of files"
 msgstr "Liste de fichiers"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 msgid "Selected line:"
 msgstr "Ligne s�lectionn�e"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3012,19 +2984,19 @@ msgstr ""
 "En activant cette option, apr�s le chargement du nom des fichiers, le "
 "scanner courant sera ex�cut� (la fen�tre des scanners doit �tre ouverte)."
 
-#: src/misc.c:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "Ins�rer une ligne vide"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "Effacer cette ligne"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 msgid "Move up this line"
 msgstr "Monter cette ligne"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 msgid "Move down this line"
 msgstr "Descendre cette ligne"
 
@@ -3041,7 +3013,7 @@ msgstr "Audio"
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr "Format MP4 invalide"
 
@@ -3066,8 +3038,7 @@ msgstr "Bi-canal"
 msgid "Single channel"
 msgstr "Mono canal"
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "R�p�ter la m�me action pour les autres fichiers"
 
@@ -3114,48 +3085,48 @@ msgstr ""
 "Ogg Vorbis : Erreur interne de logique, indocation d'un bug ou d'une "
 "corruption de pile (fichier ; '%s')."
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "ERREUR lors de l'ouverture du fichier: '%s' en tant que vorbis (%s)."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Attention : Le fichier Vorbis Ogg '%s' contient un tag ID3v2."
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "Ajouter les images"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "Tous les fichiers"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG et JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "Propri�t�s de l'image %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "Type d'Image:"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "Description de l'image :"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "Sauvegarder l'image %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3166,115 +3137,120 @@ msgstr ""
 "'%s'\n"
 "Voulez vous l'�craser?"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "Sauvegarder le fichier..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "Image JPEG"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "Image PNG"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "Image inconnue"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "Fichier icone PNG de 32x32 pixels"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "Autre fichier icone"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "Couverture (face avant)"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "Couverture (face arri�re)"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr "D�pliant int�rieur"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr "Image de l'album"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr "Artiste principal/Soliste"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "Artiste"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "Chef d'orchestre"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "Groupe/Orchestre"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "Parolier/Ecrivain"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "Lieu d'enregistrement"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "Artistes pendant l'enregistrement"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "Artistes pendant la repr�sentation"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "Capture d'�cran film/video"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "Un poisson aux couleurs vives"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "Illustration"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "Logo du groupe/de l'artiste"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "Maison d'�dition/Sigle du studio"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "Type d'image inconnu"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "pixels"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "Type"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "Description"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr "Erreur avec 'loader_close' : %s"
+
+#: src/picture.c:1015
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3282,11 +3258,16 @@ 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:987
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr "Chargement du fichier image..."
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr "Erreur avec 'loader_write' : %s"
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3297,7 +3278,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr "Image non charg�e..."
 
@@ -3713,7 +3694,7 @@ msgid ""
 msgstr ""
 "Forcer l'utilisation de l'encodage du syst�me et activer la transcription"
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3731,7 +3712,7 @@ msgstr ""
 "Forcer l'utilisation de l'encodage du syst�me et supprimer certains "
 "caract�res"
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3929,7 +3910,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr "Jeu de charact�res :"
 
@@ -3950,33 +3931,43 @@ msgstr ""
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr "Param�tres suppl�mentaires pour iconv() :"
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 msgid "No"
 msgstr "Non"
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+"Avec cette option, quand un caract�re ne peut pas �tre repr�sent� dans "
+"l'encodage cible, il ne sera pas chang�. Mais notez qu'un message d'erreur "
+"appara�tra pour vous informer."
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 msgid "ID3v1 tags"
 msgstr "Tags ID3v1"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "Ecrire le tag ID3v1.x"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3984,22 +3975,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:878
+#: src/prefs.c:882
 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:910
+#: src/prefs.c:917
 msgid "Character Set for reading ID3 tags"
 msgstr "Jeu de caract�res pour lire les tags ID3"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr "Non standard :"
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -4030,7 +4021,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:947
+#: src/prefs.c:954
 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 "
@@ -4039,25 +4030,25 @@ msgstr ""
 #.
 #. * Scanner
 #.
-#: src/prefs.c:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "Scanner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Scanner Compl�ter Tag - Conversion de Caract�res"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 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:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Convertir les espaces ' ' par des underscores '_'"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4066,11 +4057,11 @@ msgstr ""
 "� partir du scanner de tags."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Scanner Renommer Fichier - Conversion de Caract�res"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4079,19 +4070,19 @@ msgstr ""
 "� partir du scanner de fichiers."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 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:1034
+#: src/prefs.c:1041
 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:1038
+#: src/prefs.c:1045
 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 "
@@ -4104,15 +4095,15 @@ msgstr ""
 "'Text in an Entry' au lieu de 'Text In An Entry')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "Fen�tre du Scanner"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "Ouvrir la Fen�tre du Scanner au d�marrage"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4120,11 +4111,11 @@ msgstr ""
 "Activer cette option pour ouvrir automatiquement la fen�tre des scanners au "
 "d�marrage de EasyTAG."
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "Fen�tre du scanner toujours au dessus"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4133,16 +4124,16 @@ msgstr ""
 "fen�tre principale (toujours visible)."
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "Champs"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "Ecraser les champs lors d'un Scan du tag"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4151,11 +4142,11 @@ msgstr ""
 "champs, par le nouveau. Si d�sactiv�, seulement les champs vides seront "
 "compl�t�s."
 
-#: src/prefs.c:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "Mettre ce texte en commentaire par d�faut :"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4164,13 +4155,13 @@ msgstr ""
 "commentaire du tag lors de l'utilisation du scanner 'Compl�ter le Tag'."
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 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:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4181,42 +4172,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "Base de donn�es CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 msgid "Server Settings for Automatic Search"
 msgstr "Param�tres du Serveur pour la Recherche Automatique"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "Nom :"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "Chemin CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 msgid "Server Settings for Manual Search"
 msgstr "Param�tres du Serveur pour la Recherche Manuelle"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 msgid "Local CD Data Base"
 msgstr "Base de donn�es CD locale"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 msgid "Path :"
 msgstr "Chemin :"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4228,52 +4219,52 @@ msgstr ""
 "'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' et 'misc'."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "Param�tres du Proxy"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "Utiliser un proxy"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "Active les param�tres du serveur proxy."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "Nom d'H�te :"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "Nom du proxy."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "Port du proxy."
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "Nom d'Utilisateur :"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "Nom de l'utilisateur sur le serveur proxy."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "Mot de Passe Utilisateur :"
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 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:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "Liste des Noms de Pistes"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4281,7 +4272,7 @@ msgstr ""
 "S�lectionner le fichier audio correspondant (d'apr�s la position ou "
 "l'algorithme DLM si activ� en dessous)"
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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."
@@ -4291,7 +4282,7 @@ msgstr ""
 "s�lectionn�."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4303,15 +4294,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "Confirmer la sortie du programme"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4319,19 +4310,19 @@ 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:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "Confirmer l'�criture du tag du fichier"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "Confirmer pour renommer les fichiers"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "Confirmer l'effacement des fichiers"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "Confirmer l'�criture de la liste de lecture"
 
@@ -4339,37 +4330,37 @@ msgstr "Confirmer l'�criture de la liste de lecture"
 #. //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
+#: src/prefs.c:1429
 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:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "Fermer cette fen�tre sans sauver"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 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:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Exemple : %.*d_-_Piste_1.mp3)"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "Changements appliqu�s"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "Configuration sauv�e"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "Configuration inchang�e"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4380,37 +4371,37 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "Ce n'est pas un r�pertoire"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Le programme de lecture audio '%s' n'a pas �t� trouv�!"
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "Compl�ter Tag"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "Renommer le Fichier et le R�pertoire"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "Traiter Champs"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "Tag scann� avec succ�s..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Tag scann� avec succ�s...(%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
@@ -4418,23 +4409,23 @@ msgstr ""
 "Scanner de tags : �trange..., l'extension '%s' n'a pas �t� trouv�e dans le "
 "nom de fichier '%s'!"
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, 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:663
+#: src/scan.c:667
 #, 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:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "Nouveau nom de fichier scann� avec succ�s..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nouveau nom de fichier scann� avec succ�s...(%s)"
@@ -4442,41 +4433,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "Scanner de Tag et de Nom du Fichier"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "Scanner : "
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "S�lectionner le type du scanner � utiliser"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "Ouvrir fen�tre de Scan / Scanner le(s) fichier(s) s�lectionn�(s)"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "Options du Scanner"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "Montrer / Cacher l'Editeur de Masques"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "Montrer / Cacher la L�gende"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "Fermer cette fen�tre"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4485,15 +4476,15 @@ msgstr ""
 "analyser le nom du fichier et le chemin, afin de compl�ter les champs du tag."
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "Apercu du scanner de tag..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr "Pr�fixer le masque avec le chemin courant"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4506,15 +4497,15 @@ msgstr ""
 "sinon d'un chemin relatif par rapport � l'ancien."
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "Apercu du renommeur de fichiers..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "Champs:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4523,126 +4514,126 @@ msgstr ""
 "S�lectionnez ceux qui vous int�ressent."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 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:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "Traiter le champ du titre"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 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:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "Traiter le champ de l'album"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "Traiter le champ du genre"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "Traiter le champ du commentaire"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "Traiter le champ du compositeur"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "Ao"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 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:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "Traiter le champ du copyright"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 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:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr "Traiter le champ du nom de l'encodeur"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "Inverser la s�lection"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "Tout (D�)S�lectionner."
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Convertir '_' et '%20' par ' '"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "Convertir :"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "par : "
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4650,7 +4641,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:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4658,14 +4649,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:2287
+#: src/scan.c:2356
 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:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4673,7 +4664,7 @@ msgstr ""
 "Toutes les lettres sont mises en majuscules (exemple, avant : 'Text IN AN "
 "entry', apr�s : 'TEXT IN AN ENTRY')."
 
-#: src/scan.c:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4681,7 +4672,7 @@ msgstr ""
 "Toutes les lettres sont mises en minuscules (exemple, avant : 'Text IN AN "
 "entry', apr�s : 'text in an entry')."
 
-#: src/scan.c:2325
+#: src/scan.c:2394
 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'."
@@ -4690,7 +4681,7 @@ msgstr ""
 "majuscule et minuscules (exemple, avant : 'text IN An ENTRY', apr�s : 'Text "
 "in an entry')."
 
-#: src/scan.c:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4698,15 +4689,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:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "Ins�rer un espace avant une majuscule"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "Effacer les espaces ou underscores dupliqu�s"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4714,7 +4705,7 @@ msgstr ""
 "Tous les espaces sont supprim�s (exemple, avant: 'Text In An Entry', apr�s: "
 "'TextInAnEntry')."
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4722,7 +4713,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:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4733,183 +4724,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "L�gende"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artiste"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c : commentaire"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p : compositeur"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r : copyright:"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : n� disque"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : encod� par"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g : genre"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignor�"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l : nombre de pistes"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : artiste orig."
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n : piste"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t : titre"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y : ann�e"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "Editeur de Masque"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "Cr�er un Nouveau Masque"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "Monter ce Masque"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "Descendre ce Masque"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "Dupliquer le Masque"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "Ajouter les Masques par D�faut"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "Effacer le Masque"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "Sauver les Masques"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "Nouveau_masque"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "Copier: Ancune ligne s�lectionn�e!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "Effacer: Ancune ligne s�lectionn�e!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "Monter: Ancune ligne s�lectionn�e!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "Descendre: Ancune ligne s�lectionn�e!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, 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:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Impossible d'ouvrir le fichier de configuration '%s' (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 msgid "Loading default configuration..."
 msgstr "Chargement de la configuration par d�faut..."
 
-#: 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, 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:1278
+#: src/setting.c:1277
 #, 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:1358
+#: src/setting.c:1359
 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:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "Chargement des masques par d�faut pour 'Renommer Fichier' ..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Chargement des masques par d�faut pour 'Renommer le R�pertoire' ..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "ERREUR: La variable d'environnement HOME n'est pas d�finie!"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ERREUR: Impossible de cr�er le r�pertoire '%s' (%s)!"
@@ -4958,42 +4949,81 @@ msgstr ""
 "sortie soit corrompu ou tronqu�."
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr "La DLL '%s' n'a pas �t� trouv�e. Tentative de chargement ..."
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr "La DLL '%s' ne peut �t� charg�e"
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr "Cette version de '%s' contient '%s'"
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr "La fonction '%s' n'a pas �t� trouv�e dans la DLL '%s'"
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, c-format
 msgid "Audio player: '%s'"
 msgstr "Lecteur Audio : '%s'"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr "R�pertoire pour les param�tres EasyTAG : '%s'"
 
+#~ msgid "libid3tag %s"
+#~ msgstr "libid3tag %s"
+
+#~ msgid "id3lib %d.%d.%d"
+#~ msgstr "id3lib %d.%d.%d"
+
+#~ msgid " OK "
+#~ msgstr " OK "
+
+#~ msgid " Yes "
+#~ msgstr " Oui "
+
+#~ msgid " No "
+#~ msgstr " Non "
+
+#~ msgid " Apply "
+#~ msgstr " Appliquer "
+
+#~ msgid " Save "
+#~ msgstr " Sauver "
+
+#~ msgid " Cancel "
+#~ msgstr " Annuler "
+
+#~ msgid " Close "
+#~ msgstr " Fermer "
+
+#~ msgid " Write "
+#~ msgstr " Ecrire "
+
+#~ msgid " Execute "
+#~ msgstr " Ex�cuter "
+
+#~ msgid " Search "
+#~ msgstr " Rechercher "
+
+#~ msgid " Browse... "
+#~ msgstr "Parcourir..."
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/he.gmo b/po/he.gmo
index 55e749f..a44a398 100644
--- a/po/he.gmo
+++ b/po/he.gmo
diff --git a/po/he.po b/po/he.po
index cb0c477..b66c55f 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-10-15 23:53+0200\n"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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,206 +16,201 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: src/about.c:134
+#: src/about.c:140
 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:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(תרגום לגרמנית)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(תרגום לרוסית)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(תרגום להולנדית)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(תרגום לשוודית)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(תרגום להונגרית)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(תרגום לאיטלקית)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(תרגום ליפנית)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(תרגום לאוקראינית)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(תרגום לצ'כית)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(תרגום לספרדית)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(תרגום לפולנית)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(תרגום לרומנית)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(תרגום לדנית)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(תרגום ליוונית)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(תרגום לפורטוגזית ברזילאית)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr "(תרגום לבולגרית)"
 
-#: src/about.c:171
+#: src/about.c:177
 msgid "(Chinese translation)"
 msgstr "(תרגום לסינית)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(תרגום לסינית)"
+
+#: src/about.c:179
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(תרגום ליוונית)"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(תרגום לגרמנית)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "הערה"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "אודות..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "אודות"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(קומפל: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(משתמש ב: GTK+ %d.%d.%d וכן id3lib %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "מחבר: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "דוא\"ל: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "אתר: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "תיאור:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 #, 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
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(ללא תמיכה ב MP3)"
 
-#: src/about.c:410
+#: src/about.c:452
 #, fuzzy
 msgid "available"
 msgstr "אין די זכרון"
 
-#: src/about.c:420
+#: src/about.c:463
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(ללא תמיכה ב Ogg Vorbis)"
 
-#: src/about.c:430
+#: src/about.c:475
 #, fuzzy
 msgid "Speex file support"
 msgstr "(ללא תמיכה ב MP3)"
 
-#: src/about.c:440
+#: src/about.c:491
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(ללא תמיכה ב FLAC)"
 
-#: src/about.c:450
+#: src/about.c:504
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(ללא תמיכה ב MP4/AAC)"
 
-#: src/about.c:460
+#: src/about.c:516
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(ללא תמיכה ב MP3)"
@@ -223,33 +218,33 @@ msgstr "(ללא תמיכה ב MP3)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "תודות"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "תרגומים:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "כללי:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "שינויים"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "שגיאה בפתיחת קובץ: '%s' (%s)."
@@ -425,7 +420,7 @@ msgstr "יורד לפי קצב דגימה"
 msgid "Open File(s) with ..."
 msgstr "פתח באמצעות ..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "בחר הכל"
 
@@ -433,7 +428,7 @@ msgstr "בחר הכל"
 msgid "Unselect All Files"
 msgstr "בטל בחירת הכל"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "הפוך בחירה"
 
@@ -579,7 +574,7 @@ msgstr "שנה שם תיקייה ..."
 msgid "Reload Directory"
 msgstr "טען תיקייה מחדש"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "עיין בתיקייה באמצעות ..."
 
@@ -718,17 +713,17 @@ msgstr "לא ניתן לאחד את הממשק, השגיאה היתה ב: %s\n"
 msgid "Ready to start..."
 msgstr "מוכן להתחיל..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 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
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "אישור..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -736,65 +731,113 @@ msgstr ""
 "מספר קבצים שונו אך לא נשמרו...\n"
 "האם לשמור אותם לפני החלפת התיקיה?"
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 msgid "<All albums>"
 msgstr "<כל האלבומים>"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "עץ"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "שם קובץ"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "כותרת"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "אמן"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "אלבום"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "שנה"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "רצועה"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "ז'אנר"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "מלחין"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "אמן מקורי"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "זכויות"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "אתר"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "קודד ע\"י"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "# אלבומים"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 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
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "עבור לתיקיית אב"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "הכנס תיקייה לעיון"
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "עץ"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "בחר תיקייה לעיון!"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "אמן ואלבום"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "שנה שם לתיקייה"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "שנה שם תיקייה '%s' ל:"
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "השתמש במסכה:"
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 msgid "If activated, it will use masks to rename directory."
 msgstr "אם מופעל, ישתמש במסכות לשינוי שם תיקייה."
 
-#: src/browser.c:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -802,31 +845,31 @@ 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
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "מסכת סורק לא תקפה"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "שגיאה..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "יש להכניס שם תיקייה!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr "לא ניתן להמיר '%s' לקידוד שם קובץ. אנא השתמש בשם אחר."
@@ -835,16 +878,22 @@ msgstr "לא ניתן להמיר '%s' לקידוד שם קובץ. אנא השת�
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -853,7 +902,7 @@ msgstr "לא ניתן להמיר '%s' לקידוד שם קובץ. אנא השת�
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -862,7 +911,7 @@ msgstr ""
 "לא ניתן לשנות את שם התיקיה כי השם כבר קיים!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -877,84 +926,84 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "שם התיקייה שונה"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "תוכנית להריץ :"
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr "הכנס את שם התוכנית להרצה. התוכנית תקבל את התיקיה הנוכחית כפרמטר."
 
-#: src/browser.c:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "פתח קובץ באמצעות ..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr "הכנס את שם התוכנית להרצה. התוכנית תקבל את שם הקובץ הנוכחי כפרמטר."
 
-#: src/browser.c:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "יש להניס שם תוכנית"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "לא ניתן למצוא את התוכנית '%s'!"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "לא ניתן להריץ את %s (שגיאה %d)!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "לא ניתן לפצל תהליך חדש!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "הפקודה שהורצה: '%s %s'"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "אמן / אלבום"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 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
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "שם רצועה"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "זמן"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "חיפוש בבסיס הנתונים של הדיסקים"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "חיפוש אוטומטי"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 msgid "Request CD database :"
 msgstr "שאילתא לבסיס הנתונים של הדיסקים :"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -962,16 +1011,16 @@ msgstr ""
 "חפש באופן אוטומטי ב CDDB לפי הקבצים שנבחרו (הסדר חשוב!) כדי לייצר את המזהה "
 "של הדיסק ב CDDB."
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "עצור את החיפוש ..."
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr "השתמש ב CDDB מקומי"
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -982,137 +1031,137 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "חיפוש ידני"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "מילים :"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "הכנס את המילים לחיפוש (מופרדות ברווחים או '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "חפש ב :"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "כל השדות"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "אחר"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "כל הסיווגים"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "בלוז"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "קלאסי"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "קאונטרי"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "עממי"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "ג'אז"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "שונות"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "ניואייג'"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "ראגיי"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "רוק"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "פסקול"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "כולל: פאנק, נשמה, ראפ, פופ, תעשייתי, מטאל ועוד"
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "סרטים, הופעות"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "כאלו שלא מתאימים לסיווגים האחרים"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr " סיווגים"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "תוצאות :"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "חיפוש :"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "הכנס את המילים לחיפוש ברשימה למטה"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "חפש את הבא"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "חפש את הקודם"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "הראה רק שורות אדומות (או הראה את כל השורות) ברשימת ה'אמן / אלבום'"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "בטל בחירה לכל השורות"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "הפוך בחירת שורות"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "בחר את כל השורות"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1124,52 +1173,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "קבע כ :"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 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
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "מספר רצועה"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 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
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "הרץ את הסורק הנוכחי לכל קובץ"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 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
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1178,90 +1211,90 @@ msgid ""
 "instead of using directly the position order."
 msgstr ""
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "העלה את השורות שנבחרו או כל השורות (אם לא נבחרה אף שורה)."
 
-#: src/cddb.c:798 src/misc.c:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "מוכן לחיפוש..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, 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:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "הפוך בחירה"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "מיין לפי מספר רצועה"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "מיון לפי שם רצועה"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "מחפש מארח '%s' ..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "לא מצאתי את המארח '%s' (%s)!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "לא מצליח לייצר socket חדש (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "מתחבר לשרת '%s', פורט '%d' ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "לא מצליח להתחבר לשרת '%s' (%s)!"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "מחובר לשרת '%s'"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "מקבל מידע (%s) ..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "שגיאה בקריאת תשובת CDDB (%s)!"
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "לא ניתן ליצור קובץ '%s' (%s)"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "שולח בקשה ..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "לא ניתן לשלוח בקשה (%s)!"
@@ -1270,89 +1303,89 @@ msgstr "לא ניתן לשלוח בקשה (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "מקבל נתונים ..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 msgid "The server returned a wrong answer!"
 msgstr "השרת החזיר תשובה לא נכונה!"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "השרת החזיר תשובה לא נכונה! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
 msgstr "סליחה, אל החיפוש מבוסס הרשת כרגע לא פעיל!"
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "נמצאו %d אלבומ(ים) מתאימ(ים)"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "מקבל נתונים עבור עמוד %d ..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "מקבל נתונים עבור עמוד %d ..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr "העלאת תוצאות נוספות ..."
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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
+#: src/cddb.c:2893
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d קבצים נבחרו!"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 msgid "Local CD search..."
 msgstr "חיפוש CD מקומי..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr ""
 
-#: src/cddb.c:3268
+#: src/cddb.c:3276
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "נמצאו %d אלבומים מתאימים למזהה דיסק '%s'"
 
-#: src/cddb.c:3364
+#: src/cddb.c:3372
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "לא ניתן להעלות קובץ: '%s' (%s)!"
 
 #. Load the track list of the album
-#: src/cddb.c:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "מעלה את רשימת הרצועות באלבום"
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1361,7 +1394,7 @@ msgid ""
 "Do you want to continue ?"
 msgstr ""
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "כתוב תג מתוך בסיס הנתונים..."
 
@@ -1546,68 +1579,68 @@ msgstr "מערבי (ISO-8859-15)"
 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"
+#: src/charset.c:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "לא ניתן להמיר את שם הקובץ '%s' ל UTF-8 (%s).\n"
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "UTF-8 לא תקף"
 
-#: src/charset.c:641
-#, c-format
+#: src/charset.c:642
+#, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
-msgstr ""
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
+msgstr "לא ניתן להמיר את שם הקובץ '%s' ל UTF-8 (%s).\n"
 
-#: src/charset.c:705
-#, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
-msgstr ""
+#: src/charset.c:706
+#, fuzzy, c-format
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
+msgstr "לא ניתן להמיר את שם הקובץ '%s' ל UTF-8 (%s).\n"
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "מפעיל את EasyTag %s (מספר תהליך: %d) ..."
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, fuzzy, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "משתמש בספריית id3lib גרסה %d.%d.%d ..."
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "משתמש בספריית id3lib גרסה %d.%d.%d ..."
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr "המשתנה EASYTAGLANG מוגדר. קובע הגדרות מקומיות: '%s'"
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, c-format
 msgid "Setting locale : '%s'"
 msgstr "קובע הגדרות מקומיות: '%s'"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr "משתמש בהגדרות מקומיות '%s' (ולבסוף '%s')..."
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s מאת %s (קומפל ב %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "אתר: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr "משתנה או מסלול לא ידוע '%s'\n"
@@ -1615,411 +1648,411 @@ msgstr "משתנה או מסלול לא ידוע '%s'\n"
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "דפדפן"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "קובץ"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "קובץ לקריאה בלבד"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 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
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr ""
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, שכבה ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "קצב:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? קילוביט לשניה"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "תדר:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? הרץ"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 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
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "גודל:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? קילוביט"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "זמן:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "תג"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "רגיל"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "כותרת:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "תייג את הקבצים הנבחרים עם כותרת זו"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "אומן:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr "תייג את הקבצים הנבחרים עם אומן זה"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "אלבום:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr "תייג את הקבצים הנבחרים עם אלבום זה"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 msgid "CD:"
 msgstr "דיסק:"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr "תייג את הקבצים הנבחרים עם מספר דיסק זה"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "שנה:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "תייג את הקבצים הנבחרים עם שנה זאת"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 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
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "מספר רצועה:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr "קבע את מספר הקבצים באותה תיקייה כמו קובץ זה, עבור הרצועות הנבחרות."
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr "תייג את הקבצים הנבחרים עם מספר רצועות זה"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "ז'אנר:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "תייג את הקבצים הנבחרים עם ז'אנר זה"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "הערה:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 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
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "מלחין:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr "תייג את הקבצים הנבחרים עם מלחין זה"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "אמן מקורי:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr "תייג את הקבצים הנבחרים עם אומן מקורי זה"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "זכויות:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "תייג את הקבצים הנבחרים עם זכויות אלו"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "אתר:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "תייג את הקבצים הנבחרים עם אתר אומן זה"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "קודד ע\"י"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr "תייג את הקבצים הנבחרים עם שם מקודד זה"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "תמונות"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "תמונות:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "תוכל לגרור תמונה כדי להוסיף אותה לכאן."
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "תייג את הקבצים הנבחרים עם תמונות אלה"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "הוסף תמונות לתג (ניתן גם לגרור תמונות לכאן)."
 
-#: src/easytag.c:1051
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr "מחק תמונות נבחרות, או את כולן."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "שמור את התמונות שנבחרו לדיסק הקשיח."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "קבע את התכונות לתמונות שנבחרו."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "הקבצים שנבחרו תויגו עם הכותרת '%s'."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "הכותרת נמחקה מהקבצים שנבחרו."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "הקבצים שנבחרו תויגו עם האומן '%s'."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "האומן נמחק מהקבצים שנבחרו."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "הקבצים שנבחרו תויגו עם האלבום '%s'."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "שם האלבום נמחק מהקבצים שנבחרו."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "הקבצים שנבחרו תויגו עם מספר דיסק '%s'."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "מספר הדיסק נמחק מהקבצים שנבחרו."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "הקבצים שנבחרו תויגו עם שנה '%s'."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "השנה נמחקה מהקבצים שנבחרו."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "הקבצים שנבחרו תויגו עם רצועה כמו 'xx/%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr "הקבצים שנבחרו תויגו ברצועה כמו 'xx'."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "מספר רצועה נמחקה מהקבצים שנבחרו."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "הקבצים שנבחרו מוספרו באופן סדרתי."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "הקבצים שנבחרו תויגו עם ז'אנר '%s'."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "הז'אנר נמחק מהקבצים שנבחרו."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "הקבצים שנבחרו תויגו עם הערה '%s'."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "ההערה נמחקה מהקבצים שנבחרו."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "הקבצים שנבחרו תויגו עם מלחין '%s'."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "המלחין נמחק מהקבצים שנבחרו."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "הקבצים שנבחרו תויגו עם אומן מקורי '%s'."
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "האמן המקורי נמחק מהקבצים שנבחרו."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "הקבצים שנבחרו תויגו עם זכויות '%s'."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "הזכויות נמחקו מהקבצים שנבחרו."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "הקבצים שנבחרו תויגו עם אתר '%s'."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "האתר נמחק מהקבצים שנבחרו."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "הקבצים שנבחרו תויגו עם מקודד '%s'."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr "שם המקודד נמחק מהקבצים שנבחרו."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "הקבצים שנבחרו תויגו בתמונות."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "התמונות נמחקו מהקבצים שנבחרו."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "בחר מצב ומסכה, ובצע מחדש את אותה הפעולה "
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "כל התגים נסרקו"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "כל התגים נמחקו"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "כל הקבצים נשמרו..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "חלק מהקבצים נשמרו..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "חלק מהקבצים נמחקו..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "כל הקבצים נמחקו..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2028,16 +2061,16 @@ msgstr ""
 "האם ברצונך לשמור את תג הקובץ\n"
 "'%s' ?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "שמור תג..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr "שנה שם קובץ ותיקייה..."
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2051,11 +2084,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr "שנה שם תיקייה..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2069,11 +2102,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "שנה שם קובץ..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2086,17 +2119,17 @@ msgstr ""
 "אל \n"
 "'%s' ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "שמירת תג לקובץ '%s'"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 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
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2105,14 +2138,14 @@ msgstr ""
 "לא ניתן לכתוב תג בקובץ '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, 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
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2125,11 +2158,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "שמות הקבצים לא שונו.."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2142,7 +2175,7 @@ msgstr ""
 "בגלל שהקובץ הבא כבר קיים:\n"
 "'%s'"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2154,16 +2187,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "שם הקובץ '%s' שונה ל '%s'"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "שמות קבצים שונו..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2175,17 +2208,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "הקובץ '%s' הועבר ל '%s'"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
 msgstr "קבצים הועברו..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2198,11 +2231,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
 msgstr "קבצים לא הועברו..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2211,16 +2244,16 @@ msgstr ""
 "האם אתה באמת רוצה למחוק לתמיד את הקובץ\n"
 "'%s' ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "מוחק קובץ..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "קובץ '%s' נמחק"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2232,109 +2265,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "החיפוש מתבצע..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "קובץ: '%s'"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "נמצאו %d קבצים בתיקייה זו ובתיקיות המשנה שלה."
 
-#: src/easytag.c:3239
+#: src/easytag.c:3356
 #, 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
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u קבצים"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
 msgstr "לא נמצאו קבצים בתיקייה זו ובתיקיות המשנה שלה!"
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "לא נמצאו קבצים בתיקייה זו!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "מחפש..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "עצור את החיפוש..."
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "בחר תיקייה לעיון!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "תייג את הקבצים שנבחרו בשדה זה"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "המר '_' ו '%20' לרווחים"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "המר ' ' ל '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "הכל באותיות גדולות"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "הכל באותיות קטנות"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "אות ראשונה גדולה"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "אות ראשונה גדולה בכל מילה"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "מחק רווחים"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "הכנס רווח לפני אות גדולה"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 msgid "Remove duplicate spaces or underscores"
 msgstr "מחק רווחים או קוים תחתונים כפולים"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: יציאה לא מסודרת! (מספר תהליך: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "התקבל סיגנל %s (%d)\a"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 "
@@ -2344,11 +2377,11 @@ msgstr ""
 "'gdb easytag core' ואז 'bt' ואז 'l') ומידע על איך לשחזר את התקלה ל "
 "easytag@gmail.com"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "סיגנל לא מוכר"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, c-format
 msgid ""
 "\n"
@@ -2367,11 +2400,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: יציאה מסודרת."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2379,78 +2412,78 @@ msgstr ""
 "חלק מהקבצים שונו אך לא נשמרו...\n"
 "האם ברצונך לשמור אותם לפני הסיום?"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr "האם אתה באמת רוצה לסיים את מהתוכנית?"
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "תג ID3"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "תג Ogg Vorbis"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "תג FLAC Vorbis"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "תג APE"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr "תג MP4/M4A/AAC"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr "תג Wavpack"
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "קובץ MP3"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "קובץ MP2"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "קובץ Ogg Vorbis"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 #, fuzzy
 msgid "Speex File"
 msgstr "הקובץ הבא"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "קובץ FLAC"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "קובץ MusePack"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "קובץ Monkey's Audio"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr "קובץ MP4/AAC"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 msgid "Wavpack File"
 msgstr "קובץ Wavpack"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "תמונות"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2458,14 +2491,14 @@ msgid "%d kb/s"
 msgstr "%d קילוביט לשנייה"
 
 #. Samplerate
-#: src/et_core.c:2917 src/flac_header.c:304 src/monkeyaudio_header.c:91
+#: src/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d הרץ"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2473,11 +2506,11 @@ msgid ""
 "(Try setting the environment variable G_FILENAME_ENCODING)."
 msgstr ""
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "תרגום שם קובץ"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "בשם הקובץ '%s' יש יותר מ%d תוים ולכן יקוצץ!\n"
@@ -2487,7 +2520,7 @@ msgstr "בשם הקובץ '%s' יש יותר מ%d תוים ולכן יקוצץ!\
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "מקודד:"
@@ -2496,47 +2529,52 @@ msgstr "מקודד:"
 #. 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/flac_header.c:312 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
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "שגיאה בפתיחת קובץ: '%s' כקובץ  FLAC (%s).\a"
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, 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
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "התג נכתב לקובץ '%s'"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "התג נמחק מהקובץ '%s'"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, 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
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "שגיאה במחיקת תג מסוג ID3v2 בקובץ '%s' (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "שגיאב בעדכון תג מסוג ID3v2 בקובץ '%s' (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2558,77 +2596,77 @@ msgstr ""
 "בלבד!\n"
 "קובץ : %s"
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "שגיאה בעדכון תג מסוג ID3V1 בקובץ '%s' (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "התג בקובץ '%s' עודכן"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "לא דווחו שגיאות"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "אין די זכרון"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "אין נתונים לעיבוד"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "נתונים לא מסודרים כראוי"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "אין מחיצה לכתוב אליה"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "מחיצה קטנה מדי"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "מזהה ה frame לא תקף"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "השדה לא נמצא"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "סוג שדה לא מוכר"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "התג כבר נמצא בקובץ"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "גרסה לא תקפה של התג"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "אין קובץ לעיבוד"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "מנסה לכתוב לקובץ לקריאה בלבד"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "שגיאה בדחיסה/פריסה"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "שגיאה לא מוכרת!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2637,177 +2675,133 @@ msgstr ""
 "כיוון שהקובץ המושחת הבא: '%s'\n"
 "ייצור שגיאה ב id3lib, הוא לא יעובד ע\"י התוכנית."
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
 msgstr "קובץ מושחת..."
 
-#: src/log.c:91
+#: src/log.c:95
 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:773
+msgid "Select file..."
+msgstr "בחר קובץ..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "בחר תיקייה..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "בחר קובץ..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 msgid "Warning..."
 msgstr "אזהרה..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr "לא מוגדר נגן"
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "בייטים"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "קילובייט"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "מגהבייט"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "ג'יגהבייט"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "טרהבייט"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "ייצר רשימת השמעה"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "שם רשימת ההשמעה מסוג M3U"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "השתמש בשם התיקייה"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "ערוך מסכות"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "אפשרויות רשימת השמעה"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "כלול רק את הקבצים הנבחרים"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 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
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "השתמש במסלול מלא לקבצים ברשימת ההשמעה"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 msgid "Use relative path for files in playlist"
 msgstr "השתמש במסלול יחסי לקבצים ברשימת ההשמעה"
 
 #. Create playlist in parent directory
-#: src/misc.c:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "צור רשימת השמעה בתיקיית האב"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "אם מופעל, רשימת ההשמעה תיוצר בתיקיית האב."
 
 #. DOS Separator
-#: src/misc.c:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "השתמש במפריד תיקייות של DOS"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr "אפשרות זו מחליפה את מפריד התיקיות של UNIX - '/' בזה של DOS - '\\'."
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "תוכן רשימת ההשמעה"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "כתוב רק את רשימת הקבצים"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "כתוב מידע מתוך שם הקובץ"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "כתוב מידע מתוך:"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2816,12 +2810,12 @@ msgstr ""
 "קובץ רשימת ההשמעה '%s' כבר קיים!\n"
 "לשכתב?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "כתוב רשימת השמעה..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2830,155 +2824,135 @@ msgstr ""
 "לא ניתן לכתוב את קובץ רשימת ההשמעה '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "רשימת ההשמעה נכתבה '%s'"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 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
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "קודד ע\"י"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "חפש קובץ"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr "כתוב את המילה שברצונך לחפש בקבצים. אם לא תרשום כלום, יוחזרו כל הקבצים."
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "בתוך :"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "התג"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "הבחנה בין אותיות גדולות לקטנות"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "נמצאו: %d קבצים"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "העלה את שמות הקבצים מתוך קובץ TXT"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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
+#: src/misc.c:2738
 msgid " Load "
 msgstr " העלה"
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, 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
+#: src/misc.c:2782 src/misc.c:2876
 #, 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
+#: src/misc.c:2791 src/misc.c:2885
 #, 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
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 msgid "Delete all blank lines"
 msgstr "מחק את כל השורות הריקות"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2861 src/misc.c:2955
+#: src/misc.c:2812 src/misc.c:2906
 #, 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
+#: src/misc.c:2821 src/misc.c:2915
 #, 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "טען מחדש"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "כתוב רק את רשימת הקבצים"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "בחר את כל השורות"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 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
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "הכנס שורה ריקה"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "מחק שורה זו"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "הזז מסכה זו למעלה"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "הזז מסכה זו למטה"
@@ -2996,7 +2970,7 @@ msgstr "קול"
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr "התסדיר MP4 אינו תקף"
 
@@ -3021,8 +2995,7 @@ msgstr "ערוץ כפול"
 msgid "Single channel"
 msgstr "ערוץ יחיד"
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "חזור על הפעולה בשאר הקבצים"
 
@@ -3060,48 +3033,48 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr ""
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr ""
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "הוסף תמונות"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "כל הקבצים"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG וכן JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "תכונות התמונה %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "סוג התמונה"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "תיאור התמונה:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "שמור תמונה %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3112,125 +3085,135 @@ msgstr ""
 "'%s'\n"
 "לשכתב?"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "שמור קובץ..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "תמונת JPEG"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "תמונת PNG"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "תמונה לא מוכרת"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "צלמית PNG בגודל 32x32 פיקסלים"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "צלמית אחרת"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "עטיפה קדמית"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "עטיפה אחורית"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr "עמוד חוברת"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr "מדיה (למשל התוית על הדיסק)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr "אומן מוביל/מבצע מוביל/מבצע סולו"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "אומן/מבצע"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr ""
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "להקה/תזמורת"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "כותב המילים"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "מיקום ההקלטה"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "בזמן ההקלטה"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "בזמן ההופעה"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "תמונת מתוך סרט"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "דג בצבעים בהירים"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "אילוסטרציה"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "לוגו של הלהקה/אומן"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "לוגו מפיץ/סטודיו"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "סוג תמונה לא ידוע"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "פיקסלים"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "סוג"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "תיאור"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 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
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr "מעלה את קובץ התמונה..."
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3241,7 +3224,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr "קובץ התמונה לא הועלה..."
 
@@ -3617,7 +3600,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 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 +3613,7 @@ msgid ""
 "characters"
 msgstr ""
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3802,7 +3785,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr ""
 
@@ -3823,55 +3806,62 @@ msgstr ""
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 #, fuzzy
 msgid "No"
 msgstr "לא"
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "תג ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr ""
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 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:878
+#: src/prefs.c:882
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr ""
 
 #. Character Set for reading tag
-#: src/prefs.c:910
+#: src/prefs.c:917
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "קידוד תוים עבור תגי ID3"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -3888,59 +3878,59 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:947
+#: src/prefs.c:954
 msgid "Character set used to read tag data in the file."
 msgstr ""
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "סורק"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "סורק למילוי תגים - המרת תוים"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "המר קו תחתי '_' ואת המחרוזת '%20' לרווח - ' '"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "המר רווחים ' ' לקו תחתי '_'"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 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
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "סורק לשינוי שמות קבצים - המרת תוים"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 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
+#: src/prefs.c:1034
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "סורק לעיבוד שדות - המרת תוים"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1034
+#: src/prefs.c:1041
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: src/prefs.c:1038
+#: src/prefs.c:1045
 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 "
@@ -3949,62 +3939,62 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "חלון הסורק"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "פתח את חלון הסורק באתחול"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr ""
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "חלון הסורק תמיד למעלה"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
 msgstr ""
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "שדות"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "שכתב שדות בסריקת תג"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "קבע את הטקסט הבא כהערת ברירת מחדל :"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 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
+#: src/prefs.c:1112
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 
-#: src/prefs.c:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4013,42 +4003,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "בסיס נתונים של הדיסקים"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 msgid "Server Settings for Automatic Search"
 msgstr ""
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "שם :"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "פורט :"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "מסלול CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 msgid "Server Settings for Manual Search"
 msgstr "הגדרות שרת לחיפוש ידני"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 msgid "Local CD Data Base"
 msgstr "חיפוש בבסיס נתונים מקומי"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 msgid "Path :"
 msgstr "מסלול :"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4057,65 +4047,65 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "הגדרות פרוקסי"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "השתמש בפרוקסי"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr ""
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "שם מארח :"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "שם שרת הפרוקסי."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "הפורט של שרת הפרוקסי."
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "שם משתמש :"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "שם המשתמש בשרת הפרוקסי."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "סיסמא :"
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 msgid "Password of user for the the proxy server."
 msgstr "הסיסמא של המשתמש בשרת הפרוקסי."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "רשימת שמות רצועות"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4125,33 +4115,33 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "אישור"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "אישור לפני סיום התוכנית"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr "אם מופעל, פותח חלון לקבלת אישור לפני סיום התוכנית."
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "אישור כתיבת תג לקובץ"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "אישור שינוי שם לקובץ"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "אישור מחיקת קובץ"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "אישור כתיבת רשימת השמעה"
 
@@ -4159,37 +4149,37 @@ msgstr "אישור כתיבת רשימת השמעה"
 #. //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
+#: src/prefs.c:1429
 msgid "Apply changes (but don't save) and close this window"
 msgstr "החל שינויים (אך אל תשמור) וסגור חלון זה"
 
-#: src/prefs.c:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "סגור חלון זה בלי לשמור"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 msgid "Save changes and close this window"
 msgstr "שמור שינויים וסגור חלון זה"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(דוגמא : %.*d_-_Track_name_1.mp3)"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "השינויים הוחלו"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "ההגדרות נשמרו"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "ההגדרות לא השתנו"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4197,57 +4187,57 @@ msgid ""
 "(%s) "
 msgstr ""
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "לא תיקייה"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "לא ניתן למצוא את הנגן '%s'!"
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "מלא תג"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "שנה שם קובץ ותיקייה"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "עבד שדות"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "תגים נסרקו בהצלחה..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "תגים נסרקו בהצלחה...(%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, 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
+#: src/scan.c:481 src/scan.c:510
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "שגיאת סריקה: לא ניתן למצוא את המפריד '%s' בתוך '%s'"
 
-#: src/scan.c:663
+#: src/scan.c:667
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr ""
 
-#: src/scan.c:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "שם קובץ חדש נסרק בהצלחה..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "שם קובץ חדש נסרק בהצלחה...(%s)"
@@ -4255,41 +4245,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "סורק תגים ושמות קבצים"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "סורק:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "בחר את סוג הסורק לשימוש"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "פתח את חלון הסורק / סרוק את הקבצים שנבחרו"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "אפשרויות סורק"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "הצג / החבא את עורך המסכות"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "הצג / החבא מקרא"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "סגור חלון זה"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4298,15 +4288,15 @@ msgstr ""
 "למילוי שדות התגים."
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "תצוגה מקדימה של מילוי התגים..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4315,202 +4305,202 @@ msgid ""
 msgstr ""
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "תצוגה מקדימה לשינוי השם..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "בחר שדות:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 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
+#: src/scan.c:2220
 msgid "F"
 msgstr "ק"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
 msgstr "עבד את שדה שם הקובץ"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "כ"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "עבד את שדה הכותרת"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "או"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "עבד את שדה האומן"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "אל"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "עבד את שדה האלבום"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "ז"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "עבד את שדה הז'אנר"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "ה"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "עבד את שדה ההערה"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "מ"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "עבד את שדה המלחין"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "מק"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 msgid "Process original artist field"
 msgstr "עבד את שדה האומן המקורי"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "זכ"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "עבד את שדה הזכויות"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "את"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr "עבד את שדה האתר"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "מק"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr "עבד את שדה המקודד"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "הפוך בחירה"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "בחר/בטל הכל."
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "המר '_' ו'%20' ל' '"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "המר:"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "אל:"
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 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:2284
+#: src/scan.c:2353
 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
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 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
+#: src/scan.c:2391
 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
+#: src/scan.c:2394
 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
+#: src/scan.c:2397
 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
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "הכנס רווח לפני אות גדולה"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "מחק רווחים או קוים תחתיים כפולים"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4519,183 +4509,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "מקרא"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a : אומן"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : אלבום"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c : הערה"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p : מלחין"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r : זכויות"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : מספר דיסק"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : מקודד ע\"י"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g : ז'אנר"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignored"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l : מספר הרצועות"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : אומן מקורי"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n : רצועה"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t : כותרת"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u : אתר"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y : שנה"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "עורך מסכות"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "צור מסכה חדשה"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "הזז מסכה זו למעלה"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "הזז מסכה זו למטה"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "שכפל מסכה"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "הוסף מסכות ברירת מחדל"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "מחק מסכה"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "שמור מסכות"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr ""
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "העתקה: לא נבחרה שורה!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "מחיקה: לא נבחרה שורה!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "העלה: לא נבחרה שורה!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "הורד: לא נבחרה שורה!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "שגיאה: לא ניתן לכתוב לקובץ ההגדרות: %s (%s)\a"
 
-#: src/setting.c:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "לא ניתן לפתוח קובץ הגדרות  '%s' (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "לא ניתן ליצור או לפתוח קובץ '%s' (%s)"
 
-#: src/setting.c:1278
+#: src/setting.c:1277
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "שגיאה: לא ניתן לכתוב רשימה לקובץ: %s (%s)\a"
 
 #. Fall back to defaults
-#: src/setting.c:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "מעלה את מסכות ברירת המחדל למילוי תגים..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "מעלה את מסכות ברירת המחדל לשינוי שמות קבצים..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "מעלה את מסכות ברירת המחדל לשינוי תיקייה..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "שגיאה: משתנה הסביבה HOME אינו מוגדר"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "שגיאה: לא ניתן ליצור תיקייה '%s' (%s)!"
@@ -4742,42 +4732,75 @@ msgid ""
 msgstr ""
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr ""
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr ""
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr ""
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr ""
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, 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
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr "תיקיית ההגדרות של EasyTag: '%s'"
 
+#~ msgid " OK "
+#~ msgstr "בסדר"
+
+#~ msgid " Yes "
+#~ msgstr "כן"
+
+#~ msgid " No "
+#~ msgstr "לא"
+
+#~ msgid " Apply "
+#~ msgstr "החל"
+
+#~ msgid " Save "
+#~ msgstr "שמור"
+
+#~ msgid " Cancel "
+#~ msgstr "בטל"
+
+#~ msgid " Close "
+#~ msgstr "סגור"
+
+#~ msgid " Write "
+#~ msgstr "כתוב"
+
+#~ msgid " Execute "
+#~ msgstr "בצע"
+
+#~ msgid " Search "
+#~ msgstr "חפש"
+
+#~ msgid " Browse... "
+#~ msgstr "עיין..."
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/hu.gmo b/po/hu.gmo
index 2f40650..b5cde88 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index 319ff20..8c5aae5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,924 +1,963 @@
+# translation of 914hu.po to
 # Hungarian catalog for EasyTAG.
-# Copyright (C) 2001-2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001-2005, 2006, 2007 Free Software Foundation, Inc.
 # Szel Miklos <mukka@freemail.hu>, 2001.
 # Nagy Boldizsar <boldi01@freemail.hu>, 2002, 2003, 2004.
-# M�sz�ros Csaba <csablak@freemail.hu>, 2005, 2006.
+# Mészáros Csaba <csablak@freemail.hu>, 2005, 2006, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: easytag-1.99.13\n"
+"Project-Id-Version: 914hu\n"
 "Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2007-12-09 18:16+0100\n"
+"PO-Revision-Date: 2007-10-24 22:59+0200\n"
+"Last-Translator: \n"
 "Language-Team:  <hu@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/about.c:134
+#: src/about.c:140
 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 ""
-"Az EasyTag egy GTK+-on alapul� ID3 MP3 c�mkeszerkeszt� program MP3, MP2, "
-"FLAC, Ogg Vorbis, MP4/AAC, MusePack �s Monkey audio f�jlokhoz. K�nnyen "
-"�ttekinthet� fel�lete egyszer�v� teszi a c�mk�kkel kapcsolatos munk�t.\n"
-"Magyar ford�t�s: Nagy Boldizs�r <boldi01@freemail.hu>\n"
-"Sz�l Mikl�s <mukka@freemail.hu>\n"
-"M�sz�ros Csaba <csablak@freemail.hu>"
-
-#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+"Az EasyTag egy GTK+-on alapuló ID3 MP3 címkeszerkesztő program MP3, MP2, "
+"FLAC, Ogg Vorbis, MP4/AAC, MusePack és Monkey audio fájlokhoz. Könnyen "
+"áttekinthető felülete egyszerűvé teszi a címkékkel kapcsolatos munkát.\n"
+"Magyar fordítás: Nagy Boldizsár <boldi01@freemail.hu>\n"
+"Szél Miklós <mukka@freemail.hu>\n"
+"Mészáros Csaba <csablak@freemail.hu>"
+
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
-msgstr "(N�met ford�t�s)"
+msgstr "(Német fordítás)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
-msgstr "(Orosz ford�t�s)"
+msgstr "(Orosz fordítás)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
-msgstr "(Holland ford�t�s)"
+msgstr "(Holland fordítás)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
-msgstr "(Sv�d ford�t�s)"
+msgstr "(Svéd fordítás)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
-msgstr "(Magyar ford�t�s)"
+msgstr "(Magyar fordítás)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
-msgstr "(Olasz ford�t�s)"
+msgstr "(Olasz fordítás)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
-msgstr "(Jap�n ford�t�s)"
+msgstr "(Japán fordítás)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
-msgstr "(Ukr�n ford�t�s)"
+msgstr "(Ukrán fordítás)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
-msgstr "(Cseh ford�t�s)"
+msgstr "(Cseh fordítás)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
-msgstr "(Spanyol ford�t�s)"
+msgstr "(Spanyol fordítás)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
-msgstr "(Lengyel ford�t�s)"
+msgstr "(Lengyel fordítás)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
-msgstr "(Rom�n ford�t�s)"
+msgstr "(Román fordítás)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
-msgstr "(D�n ford�t�s)"
+msgstr "(Dán fordítás)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
-msgstr "(G�r�g ford�t�s)"
+msgstr "(Görög fordítás)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
-msgstr "(Brazil �s Portug�l ford�t�s)"
+msgstr "(Brazil és Portugál fordítás)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
-msgstr "(Bulg�r ford�t�s)"
+msgstr "(Bulgár fordítás)"
 
-#: src/about.c:171
+#: src/about.c:177
 msgid "(Chinese translation)"
-msgstr "(K�nai ford�t�s)"
+msgstr "(Kínai fordítás)"
 
-#: src/about.c:172
-#, fuzzy
+#: src/about.c:178
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(Kínai (Tajvani) fordítás)"
+
+#: src/about.c:179
 msgid "(Hebrew translation)"
-msgstr "(G�r�g ford�t�s)"
+msgstr "(Héber fordítás)"
 
-#: src/about.c:173
-#, fuzzy
+#: src/about.c:180
 msgid "(Serbian translation)"
-msgstr "(N�met ford�t�s)"
+msgstr "(Szerb fordítás)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
-msgstr ""
+msgstr "Kiterjesztés neve"
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
-msgstr ""
+msgstr "Helyzet"
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
-msgstr "Megjegyz�s"
+msgstr "Megjegyzés"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
-msgstr "N�vjegy..."
+msgstr "Névjegy..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
-msgstr "N�vjegy"
+msgstr "Névjegy"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
-msgstr "(K�sz�lt: %s)"
+msgstr "(Készült: %s)"
 
-#: src/about.c:297
-#, fuzzy, c-format
+#: src/about.c:320
+#, c-format
 msgid "(using: GTK+ %d.%d.%d)"
-msgstr "(gtk+ %d.%d.%d �s id3lib %d.%d.%d)"
+msgstr "(GTK+ %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
-msgstr "Szerz�: %s"
+msgstr "Szerző: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Honlap: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
-msgstr "Le�r�s:"
+msgstr "Leírás:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
-msgstr ""
+msgstr "Kiterjesztés"
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
-#, fuzzy
+#: src/about.c:433
 msgid "MP3 file support"
-msgstr "(MP3 f�jl t�mogat�s nem el�rhet�)"
+msgstr "MP3 fájl támogatás"
 
-#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
-#: src/about.c:452 src/about.c:462
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 msgid "enabled"
-msgstr ""
+msgstr "elérhető"
 
-#: 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
-msgstr ""
+msgstr "nem elérhető"
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
-#, fuzzy
+#: src/about.c:449
 msgid "ID3v2.3 tags writting support"
-msgstr "(MP3 f�jl t�mogat�s nem el�rhet�)"
+msgstr "ID3v2.3 címkék támogatása"
 
-#: src/about.c:410
-#, fuzzy
+#: src/about.c:452
 msgid "available"
-msgstr "Nincs el�g mem�ria"
+msgstr "elérhető"
 
-#: src/about.c:420
-#, fuzzy
+#: src/about.c:463
 msgid "Ogg Vorbis file support"
-msgstr "(Ogg Vorbis f�jl t�mogat�s nem el�rhet�)"
+msgstr "Ogg Vorbis fájl támogatás"
 
-#: src/about.c:430
-#, fuzzy
+#: src/about.c:475
 msgid "Speex file support"
-msgstr "(MP3 f�jl t�mogat�s nem el�rhet�)"
+msgstr "Speex fájl támogatás"
 
-#: src/about.c:440
-#, fuzzy
+#: src/about.c:491
 msgid "FLAC file support"
-msgstr "(FLAC f�jl t�mogat�s nem el�rhet�)"
+msgstr "FLAC fájl támogatás"
 
-#: src/about.c:450
-#, fuzzy
+#: src/about.c:504
 msgid "MP4/AAC file support"
-msgstr "(MP4/AAC f�jl t�mogat�s nem el�rhet�)"
+msgstr "MP4/AAC fájl támogatás"
 
-#: src/about.c:460
-#, fuzzy
+#: src/about.c:516
 msgid "WavPack file support"
-msgstr "(MP3 f�jl t�mogat�s nem el�rhet�)"
+msgstr "WavPack fájl támogatás"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
-msgstr "K�sz�net"
+msgstr "Köszönet"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
-msgstr "Ford�t�sok:\n"
+msgstr "Fordítások:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
-msgstr "�ltal�nos:\n"
+msgstr "Általános:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
-msgstr "M�dos�t�sok"
+msgstr "Módosítások"
 
-#: src/about.c:560
-#, fuzzy, c-format
+#: src/about.c:620
+#, c-format
 msgid "Can't open file '%s' (%s)\n"
-msgstr "'%s' (%s) f�jl megnyit�sa sikertelen!"
+msgstr "'%s' (%s) fájl megnyitása sikertelen!\n"
 
 #. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: src/ape_tag.c:74 src/et_core.c: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
-msgstr "Hiba a '%s' (%s) f�jl megnyit�sa k�zben."
+msgstr "Hiba a '%s' (%s) fájl megnyitása közben."
 
-# Men�sor
+# Menüsor
 #.
 #. * Main Menu Actions
 #.
 #: src/bar.c:146
 msgid "_File"
-msgstr "_F�jl"
+msgstr "Fájl"
 
-# F�jl men�
+# Fájl menü
 #: src/bar.c:147
 msgid "Sort list by tag"
-msgstr "Lista _rendez�se c�mkemez�k szerint"
+msgstr "Lista rendezése címkemezők szerint"
 
-# F�jl men�
+# Fájl menü
 #: src/bar.c:148
 msgid "Sort list by property"
-msgstr "Lista r_endez�se tulajdons�g szerint"
+msgstr "Lista rendezése tulajdonság szerint"
 
 #: src/bar.c:149
 msgid "Ascending by filename"
-msgstr "F�jln�v szerint n�vekv�en"
+msgstr "Fájlnév szerint növekvően"
 
 #: src/bar.c:150
 msgid "Descending by filename"
-msgstr "F�jln�v szerint cs�kken�en"
+msgstr "Fájlnév szerint csökkenően"
 
 #: src/bar.c:151
 msgid "Ascending by creation date"
-msgstr "L�trehoz�s id�pontja szerint n�vekv�en"
+msgstr "Létrehozás időpontja szerint növekvően"
 
 #: src/bar.c:152
 msgid "Descending by creation date"
-msgstr "L�trehoz�s id�pontja szerint cs�kken�en"
+msgstr "Létrehozás időpontja szerint csökkenően"
 
 #: src/bar.c:153
 msgid "Ascending by track number"
-msgstr "Sorsz�m szerint n�vekv�en"
+msgstr "Sorszám szerint növekvően"
 
 #: src/bar.c:154
 msgid "Descending by track number"
-msgstr "Sorsz�m szerint cs�kken�en"
+msgstr "Sorszám szerint csökkenően"
 
 #: src/bar.c:155
 msgid "Ascending by title"
-msgstr "C�m szerint n�vekv�en"
+msgstr "Cím szerint növekvően"
 
 #: src/bar.c:156
 msgid "Descending by title"
-msgstr "C�m szerint cs�kken�en"
+msgstr "Cím szerint csökkenően"
 
 #: src/bar.c:157
 msgid "Ascending by artist"
-msgstr "El�ad� szerint n�vekv�en"
+msgstr "Előadó szerint növekvően"
 
 #: src/bar.c:158
 msgid "Descending by artist"
-msgstr "El�ad� szerint cs�kken�en"
+msgstr "Előadó szerint csökkenően"
 
 #: src/bar.c:159
 msgid "Ascending by album"
-msgstr "Album szerint n�vekv�en"
+msgstr "Album szerint növekvően"
 
 #: src/bar.c:160
 msgid "Descending by album"
-msgstr "Album szerint cs�kken�en"
+msgstr "Album szerint csökkenően"
 
 #: src/bar.c:161
 msgid "Ascending by year"
-msgstr "�v szerint n�vekv�en"
+msgstr "Év szerint növekvően"
 
 #: src/bar.c:162
 msgid "Descending by year"
-msgstr "�v szerint cs�kken�en"
+msgstr "Év szerint csökkenően"
 
 #: src/bar.c:163
 msgid "Ascending by genre"
-msgstr "M�faj szerint n�vekv�en"
+msgstr "Műfaj szerint növekvően"
 
 #: src/bar.c:164
 msgid "Descending by genre"
-msgstr "M�faj szerint cs�kken�en"
+msgstr "Műfaj szerint csökkenően"
 
 #: src/bar.c:165
 msgid "Ascending by comment"
-msgstr "Megjegyz�s szerint n�vekv�en"
+msgstr "Megjegyzés szerint növekvően"
 
 #: src/bar.c:166
 msgid "Descending by comment"
-msgstr "Megjegyz�s szerint cs�kken�en"
+msgstr "Megjegyzés szerint csökkenően"
 
 #: src/bar.c:167
 msgid "Ascending by composer"
-msgstr "Szerz� szerint n�vekv�en"
+msgstr "Szerző szerint növekvően"
 
 #: src/bar.c:168
 msgid "Descending by composer"
-msgstr "Szerz� szerint cs�kken�en"
+msgstr "Szerző szerint csökkenően"
 
 #: src/bar.c:169
 msgid "Ascending by original artist"
-msgstr "Eredeti el�ad� szerint n�vekv�en"
+msgstr "Eredeti előadó szerint növekvően"
 
 #: src/bar.c:170
 msgid "Descending by original artist"
-msgstr "Eredeti el�ad� szerint cs�kken�en"
+msgstr "Eredeti előadó szerint csökkenően"
 
 #: src/bar.c:171
 msgid "Ascending by copyright"
-msgstr "Kiad� szerint n�vekv�en"
+msgstr "Kiadó szerint növekvően"
 
 #: src/bar.c:172
 msgid "Descending by copyright"
-msgstr "Kiad� szerint cs�kken�en"
+msgstr "Kiadó szerint csökkenően"
 
 #: src/bar.c:173
 msgid "Ascending by URL"
-msgstr "URL szerint n�vekv�en"
+msgstr "URL szerint növekvően"
 
 #: src/bar.c:174
 msgid "Descending by URL"
-msgstr "URL szerint cs�kken�en"
+msgstr "URL szerint csökkenően"
 
 #: src/bar.c:175
 msgid "Ascending by encoder name"
-msgstr "K�dol� neve szerint n�vekv�en"
+msgstr "Kódoló neve szerint növekvően"
 
 #: src/bar.c:176
 msgid "Descending by encoder name"
-msgstr "K�dol� neve szerint cs�kken�en"
+msgstr "Kódoló neve szerint csökkenően"
 
 #: src/bar.c:177
 msgid "Ascending by file type"
-msgstr "F�jlt�pus szerint n�vekv�en"
+msgstr "Fájltípus szerint növekvően"
 
 #: src/bar.c:178
 msgid "Descending by file type"
-msgstr "F�jlt�pus szerint cs�kken�en"
+msgstr "Fájltípus szerint csökkenően"
 
 #: src/bar.c:179
 msgid "Ascending by file size"
-msgstr "F�jlm�ret szerint n�vekv�en"
+msgstr "Fájlméret szerint növekvően"
 
 #: src/bar.c:180
 msgid "Descending by file size"
-msgstr "F�jlm�ret szerint cs�kken�en"
+msgstr "Fájlméret szerint csökkenően"
 
 #: src/bar.c:181
 msgid "Ascending by duration"
-msgstr "Id�tartam szerint n�vekv�en"
+msgstr "Időtartam szerint növekvően"
 
 #: src/bar.c:182
 msgid "Descending by duration"
-msgstr "Id�tartam szerint cs�kken�en"
+msgstr "Időtartam szerint csökkenően"
 
 #: src/bar.c:183
 msgid "Ascending by bitrate"
-msgstr "Bitr�ta szerint n�vekv�en"
+msgstr "Bitráta szerint növekvően"
 
 #: src/bar.c:184
 msgid "Descending by bitrate"
-msgstr "Bitr�ta szerint cs�kken�en"
+msgstr "Bitráta szerint csökkenően"
 
 #: src/bar.c:185
 msgid "Ascending by samplerate"
-msgstr "Min�s�g szerint n�vekv�en"
+msgstr "Minőség szerint növekvően"
 
 #: src/bar.c:186
 msgid "Descending by samplerate"
-msgstr "Min�s�g szerint cs�kken�en"
+msgstr "Minőség szerint csökkenően"
 
-# F�jl men�
+# Fájl menü
 #: src/bar.c:188
 msgid "Open File(s) with ..."
-msgstr "Me_gnyit�s ezzel..."
+msgstr "Megnyitás ezzel..."
 
-# F�jl men� �s bubble help egyben!
-#: src/bar.c:189 src/cddb.c:325
+# Fájl menü és bubble help egyben!
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
-msgstr "_Minden f�jl kijel�l�se"
+msgstr "Minden fájl kijelölése"
 
-# F�jl men� �s bubble help egyben
+# Fájl menü és bubble help egyben
 #: src/bar.c:190
 msgid "Unselect All Files"
-msgstr "_Kijel�l�s megsz�ntet�se"
+msgstr "Kijelölés megszüntetése"
 
-# F�jl men�
-#: src/bar.c:191 src/cddb.c:332
+# Fájl menü
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
-msgstr "K_ijel�l�s megford�t�sa"
+msgstr "Kijelölés megfordítása"
 
-# F�jl men�
+# Fájl menü
 #: src/bar.c:192
 msgid "Delete File(s)"
-msgstr "F�jlok _t�rl�se"
+msgstr "Fájlok törlése"
 
-# F�jl men�
+# Fájl menü
 #: src/bar.c:193
 msgid "_First File"
-msgstr "El_s� f�jl"
+msgstr "Első fájl"
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:193
 msgid "First File"
-msgstr "Els� f�jl"
+msgstr "Első fájl"
 
-# F�jl men�
+# Fájl menü
 #: src/bar.c:194
 msgid "_Previous File"
-msgstr "El�_z� f�jl"
+msgstr "Előző fájl"
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:194
 msgid "Previous File"
-msgstr "El�z� f�jl"
+msgstr "Előző fájl"
 
-# F�jl men�
+# Fájl menü
 #: src/bar.c:195
 msgid "_Next File"
-msgstr "K�_vetkez� f�jl"
+msgstr "Következő fájl"
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:195
 msgid "Next File"
-msgstr "K�vetkez� f�jl"
+msgstr "Következő fájl"
 
-# F�jl men�
+# Fájl menü
 #: src/bar.c:196
 msgid "_Last File"
-msgstr "Ut_ols� f�jl"
+msgstr "Utolsó fájl"
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:196
 msgid "Last File"
-msgstr "Utols� f�jl"
+msgstr "Utolsó fájl"
 
-# F�jl men�
+# Fájl menü
 #. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
 #. and binding Ctrl+C effectively stops the user copying text..
 #: src/bar.c:199
 msgid "S_can File(s)"
-msgstr "_F�jlok feldolgoz�sa"
+msgstr "Fájlok feldolgozása"
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:199
 msgid "Scan File(s)"
-msgstr "M�dos�t�sok beilleszt�se, a kijel�lt helyekre."
+msgstr "Módosítások beillesztése, a kijelölt helyekre."
 
-# F�jl men�
+# Fájl menü
 #: src/bar.c:200
 msgid "_Remove Tag(s)"
-msgstr "_C�mk�k elt�vol�t�sa"
+msgstr "Címkék eltávolítása"
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:200
 msgid "Remove Tag(s)"
-msgstr "C�mk�k elt�vol�t�sa"
+msgstr "Címkék eltávolítása"
 
-# F�jl men�
+# Fájl menü
 #: src/bar.c:201
 msgid "_Undo Last File(s) Changes"
-msgstr "F�_jlm�dos�t�sok visszavon�sa"
+msgstr "Fájlmódosítások visszavonása"
 
-# F�jl men�
+# Fájl menü
 #: src/bar.c:201
 msgid "Undo Last File(s) Changes"
-msgstr "F�j_lm�dos�t�sok visszavon�sa"
+msgstr "Fájlmódosítások visszavonása"
 
-# F� men�
+# Fő menü
 #: src/bar.c:202
 msgid "R_edo Last File(s) Changes"
-msgstr "F�j_lm�dos�t�sokat m�gis"
+msgstr "Fájlmódosításokat mégis"
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:202
 msgid "Redo Last File(s) Changes"
-msgstr "F�jlm�dos�t�sokat m�gis"
+msgstr "Fájlmódosításokat mégis"
 
-# F� men�
+# Fő menü
 #: src/bar.c:203
 msgid "_Save File(s)"
-msgstr "F�jlok me_nt�se"
+msgstr "Fájlok mentése"
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:203
 msgid "Save File(s)"
-msgstr "F�jlok ment�se"
+msgstr "Fájlok mentése"
 
-# F�jl men�
+# Fájl menü
 #: src/bar.c:204
 msgid "_Force Saving File(s)"
-msgstr "F�jlok k�n_yszer�tett ment�se"
+msgstr "Fájlok kényszerített mentése"
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:204
 msgid "Force Saving File(s)"
-msgstr "F�jlok k�nyszer�tett ment�se"
+msgstr "Fájlok kényszerített mentése"
 
-# F�jl men�
+# Fájl menü
 #: src/bar.c:205
 msgid "Undo Last Changes"
-msgstr "_Utols� v�ltoztat�st vissza"
+msgstr "Utolsó változtatást vissza"
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:206
 msgid "Redo Last Changes"
-msgstr "Utols� v�ltozt_at�st m�gis"
+msgstr "Utolsó változtatást mégis"
 
-# F� men�
+# Fő menü
 #: src/bar.c:207
 msgid "_Quit"
-msgstr "Kil�_p�s"
+msgstr "Kilépés"
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:207
 msgid "Quit"
-msgstr "Kil�p�s"
+msgstr "Kilépés"
 
-# Men�sor
+# Menüsor
 #: src/bar.c:209
 msgid "_Browser"
-msgstr "_B�ng�sz�"
+msgstr "Böngésző"
 
-# B�ng�sz� men�
+# Böngésző menü
 #: src/bar.c:210
 msgid "Go to _Home Directory"
-msgstr "_Ugr�s a kezd� k�nyvt�rra"
+msgstr "Ugrás a kezdő könyvtárra"
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:210
 msgid "Go to Home Directory"
-msgstr "Ugr�s a kezd� k�nyvt�rra"
+msgstr "Ugrás a kezdő könyvtárra"
 
-# B�ng�sz� men�
+# Böngésző menü
 #: src/bar.c:211
 msgid "Go to _Default Directory"
-msgstr "U_gr�s az alap�rtelmezett k�nyvt�rra"
+msgstr "Ugrás az alapértelmezett könyvtárra"
 
-# Ikon megjegyz�s
+# Ikon megjegyzés
 #: src/bar.c:211
 msgid "Go to Default Directory"
-msgstr "Ugr�s az alap�rtelmezett k�nyvt�rra"
+msgstr "Ugrás az alapértelmezett könyvtárra"
 
-# B�ng�sz� men�
+# Böngésző menü
 #: src/bar.c:212
 msgid "Set _Current Path as Default"
-msgstr "_Aktu�lis k�nyvt�r alap�rtelmezett� t�tele"
+msgstr "Aktuális könyvtár alapértelmezetté tétele"
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:212
 msgid "Set Current Path as Default"
-msgstr "Aktu�lis k�nyvt�r alap�rtelmezett� t�tele"
+msgstr "Aktuális könyvtár alapértelmezetté tétele2"
 
-# b�ng�sz� men�
+# böngésző menü
 #: src/bar.c:213
 msgid "Tree View | Artist-Album View"
-msgstr "Fa_strukt�ra n�zet | El�ad�-Album n�zet"
+msgstr "Fastruktúra nézet | Előadó-Album nézet"
 
-# b�ng�sz� men�
+# böngésző menü
 #: src/bar.c:214
 msgid "Rename Directory ..."
-msgstr "_K�nyvt�r �tnevez�se..."
+msgstr "Könyvtár átnevezése..."
 
-# b�ng�sz� men�
+# böngésző menü
 #: src/bar.c:215
 msgid "Reload Directory"
-msgstr "K�_nyvt�r �jrat�lt�se"
+msgstr "Könyvtár újratöltése"
 
-# b�ng�sz� men�
-#: src/bar.c:216 src/browser.c:3641
+# böngésző menü
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
-msgstr "K�n_yvt�r b�ng�sz�s k�ls� programmal..."
+msgstr "Könyvtár böngészés külső programmal..."
 
-# b�ng�sz� men�
+# böngésző menü
 #: src/bar.c:217
 msgid "_Collapse Tree"
-msgstr "K�nyvt�rf�t _bez�r"
+msgstr "Könyvtárfát bezár"
 
-# b�ng�sz� men�
+# böngésző menü
 #: src/bar.c:218
 msgid "_Refresh Tree"
-msgstr "K�nyvt�rf�t _friss�t"
+msgstr "Könyvtárfát frissít"
 
-# Men�sor
+# Menüsor
 #: src/bar.c:220 src/bar.c:249
 msgid "S_canner"
-msgstr "Fel_dolgoz�"
+msgstr "Feldolgozó"
 
-# feldolgoz� men�
+# feldolgozó menü
 #: src/bar.c:221
 msgid "_Fill Tag(s) ..."
-msgstr "_Mez�k kit�lt�se..."
+msgstr "Mezők kitöltése..."
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:221
 msgid "Fill Tag(s) ..."
-msgstr "Mez�k kit�lt�se"
+msgstr "Mezők kitöltése"
 
-# feldolgoz� men�
+# feldolgozó menü
 #: src/bar.c:222
 msgid "_Rename File(s) and Directory ..."
-msgstr "�_tnevez�s..."
+msgstr "Átnevezés..."
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:222
 msgid "Rename File(s) and Directory ..."
-msgstr "�tnevez�s..."
+msgstr "Átnevezés..."
 
 #: src/bar.c:223
 msgid "_Process Field(s) ..."
-msgstr "Me_z�feldolgoz�s..."
+msgstr "Mezöfeldolgozás..."
 
-# feldolgoz� men�
+# feldolgozó menü
 #: src/bar.c:223
 msgid "Process Fields(s) ..."
-msgstr "Mez�feldolgoz�s..."
+msgstr "Mezöfeldolgozás..."
 
-# Men�sor
+# Menüsor
 #: src/bar.c:225
 msgid "_Misc"
-msgstr "_Egy�b"
+msgstr "Egyéb"
 
-# egy�b men�
+# egyéb menü
 #: src/bar.c:226
 msgid "Search _File(s) ..."
-msgstr "_F�jl keres�se..."
+msgstr "Fájl keresése..."
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:226
 msgid "Search File(s)..."
-msgstr "F�jl keres�se..."
+msgstr "Fájl keresése..."
 
-# egy�b men�
+# egyéb menü
 #: src/bar.c:227
 msgid "CD Data _Base Search ..."
-msgstr "CDD_B keres�s..."
+msgstr "CDDB keresés..."
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:227
 msgid "CDDB Search ..."
-msgstr "CDDB keres�s..."
+msgstr "CDDB keresés..."
 
-# egy�b men�
+# egyéb menü
 #: src/bar.c:228
 msgid "Load Filenames from TXT ..."
-msgstr "F�jlnevek _bet�lt�se TXT-b�l..."
+msgstr "Fájlnevek betöltése TXT-ből..."
 
-# egy�b men�
+# egyéb menü
 #: src/bar.c:229
 msgid "Write Playlist ..."
-msgstr "M3u _listaf�jl �r�sa..."
+msgstr "M3u listafájl írása..."
 
-# egy�b men�
+# egyéb menü
 #: src/bar.c:230 src/bar.c:250 src/bar.c:251 src/bar.c:252
 msgid "Run Audio Player"
-msgstr "_Zene lej�tsz� futtat�sa"
+msgstr "Zene lejátszó futtatása"
 
-# Men�sor
+# Menüsor
 #: src/bar.c:232
 msgid "_Settings"
-msgstr "Be�ll�t�so_k"
+msgstr "Beállítások"
 
-# be�ll�t�sok men�
+# beállítások menü
 #: src/bar.c:233
 msgid "_Preferences ..."
-msgstr "_Tulajdons�gok..."
+msgstr "Tulajdonságok..."
 
-# ikon megjegyz�s
+# ikon megjegyzés
 #: src/bar.c:233
 msgid "Preferences ..."
-msgstr "Tulajdons�gok..."
+msgstr "Tulajdonságok..."
 
-# Men�sor
+# Menüsor
 #: src/bar.c:235
 msgid "_Help"
-msgstr "_S�g�"
+msgstr "Súgó"
 
 #: src/bar.c:236
 msgid "_About"
-msgstr "_N�vjegy"
+msgstr "Névjegy"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
 #: src/bar.c:242
 msgid "Stop the current action"
-msgstr "Folyamatban lev� m�velet megszak�t�sa"
+msgstr "Folyamatban levő művelet megszakítása"
 
 #.
 #. * Popup menu's Actions
 #.
 #: src/bar.c:248
 msgid "_File Operations"
-msgstr "f�jln�v be�ll�t�sok"
+msgstr "Fájlnév beállítások"
 
 #: src/bar.c:253
 msgid "CDDB Search File(s)..."
-msgstr "F�jl keres�se CDDB adatb�zisban..."
+msgstr "Fájl keresése CDDB adatbázisban..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #: src/bar.c:257
 msgid "Clean Log"
-msgstr ""
+msgstr "Információk törlése"
 
-# b�ng�sz� men�
+# böngésző menü
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
 #: src/bar.c:264
 msgid "Browse _Sub-directories"
-msgstr "A_lk�nyvt�rak b�ng�sz�se"
+msgstr "Alkönyvtárak böngészése"
 
 #. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
 #: src/bar.c:267
 msgid "Show Hidden Directories"
-msgstr "_Rejtett k�nyvt�rak megjelen�t�se"
+msgstr "Rejtett könyvtárak megjelenítése"
 
 #: src/bar.c:269
 msgid "Show tree browser / Display by Artist and Album"
-msgstr "Fastrukt�ra n�zet / El�ad� �s Album n�zet"
+msgstr "Fastruktúra nézet / Előadó és Album nézet"
 
 #: src/bar.c:306
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
-msgstr "�sszevon�s nem lehets�ges %s\n"
+msgstr "Összevonás nem lehetséges %s\n"
 
 #: src/bar.c:406
 msgid "Ready to start..."
-msgstr "Futtat�sra k�sz..."
+msgstr "Futtatásra kész..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 msgid "New default path for files selected"
-msgstr "�j alap�rtelmezett k�nyvt�r kiv�lasztva"
+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:4550 src/easytag.c:4570 src/easytag.c:4589
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
-msgstr "Figyelem1x"
+msgstr "Figyelem..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
 msgstr ""
-"N�h�ny f�jl megv�ltozott\n"
-"Szeretn� menteni a v�ltoz�sokat?"
+"Néhány fájl megváltozott\n"
+"Szeretné menteni a változásokat?"
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 msgid "<All albums>"
 msgstr "<Minden albums>"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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."
+msgstr "Hiba a kereséskor: %s nem található %s útvonalon."
+
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "Fastruktúra"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "Fájl neve"
 
-#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "Cím"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
-msgstr "El�ad�"
+msgstr "Előadó"
+
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "Album"
 
-#: src/browser.c:2801
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "Év"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "Sáv"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "Műfaj"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "Szerző"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "Eredeti előadó"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "Kiadó"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "URL"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "Kódoló"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "# Albumok"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 msgid "# Files"
-msgstr "# F�jlok"
+msgstr "# Fájlok"
 
-#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
-msgid "Album"
-msgstr "Album"
-
-#: src/browser.c:2822
+#: src/browser.c:2968
 msgid "Go to parent directory"
-msgstr "Ugr�s a sz�l� k�nyvt�rba"
+msgstr "Ugrás a szülő könyvtárba"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
-msgstr "Adja meg az �tvizsg�land� k�nyvt�rat."
+msgstr "Adja meg az átvizsgálandó könyvtárat."
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "Fastrukt�ra"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "Adja meg az átvizsgálandó könyvtárat!"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
-msgstr "El�ad� & Album"
+msgstr "Előadó & Album"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
-msgstr "K�nyvt�r �tnevez�se"
+msgstr "Könyvtár átnevezése"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
-msgstr "%s - k�nyvt�r �tnevez�se"
+msgstr "%s - könyvtár átnevezése"
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
-msgstr "Haszn�land� maszk :"
+msgstr "Használandó maszk :"
 
 # bubblehelp
-#: src/browser.c:3244
+#: src/browser.c:3630
 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."
+msgstr "Ha aktíválja, a könyvtár a beállított maszkkal lesz átnevezve."
 
 # bubblehelp
-#: src/browser.c:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
 msgstr ""
-"V�lassza ki a megfelel� maszkot, vagy �rjon egy �jat a k�nyvt�r "
-"�tnevez�s�hez."
+"Válassza ki a megfelelő maszkot, vagy írjon egy újat a könyvtár "
+"átnevezéséhez."
 
-#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
-#: src/scan.c:2119 src/scan.c:2465
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
-msgstr "Hib�s feldolgoz�maszk"
+msgstr "Hibás feldolgozómaszk"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 msgid "Rename directory preview..."
-msgstr "K�nyvt�r �tnevez�s el�n�zet..."
-
-#. 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
+msgstr "Könyvtár átnevezés előnézet..."
+
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "Hiba!"
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
-msgstr "Meg kell adnia a k�nyvt�r nev�t!"
+msgstr "Meg kell adnia a könyvtár nevét!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
-"A konvert�l�s sikertelen. %s f�jln�v k�dolva. K�rem haszn�ljon m�s nevet."
+"A konvertálás sikertelen. %s fájlnév kódolva. Kérem használjon más nevet."
 
 #. 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -927,16 +966,16 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
 "(%s)"
 msgstr ""
-"Az �tnevez�s sikertelen. Ez a n�v m�r l�tezik!\n"
+"Az átnevezés sikertelen. Ez a név már létezik!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -945,312 +984,295 @@ msgid ""
 "'%s'!\n"
 "(%s)"
 msgstr ""
-"Az �tnevez�s sikertelen!\n"
-"Err�l: '%s'\n"
+"Az átnevezés sikertelen!\n"
+"Erről: '%s'\n"
 "Erre: '%s'!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
-msgstr "K�nyvt�r �tnevezve"
+msgstr "Könyvtár átnevezve"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
-msgstr "Futtatand� program:"
+msgstr "Futtatandó program:"
 
 # bubble help?
-#: src/browser.c:3672
+#: src/browser.c:4093
 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."
+"Adja meg a futtatandó programot. Az aktuális könyvtárat fogja megkapni "
+"paraméterként."
 
-#: src/browser.c:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
-msgstr "Megnyit�s ezzel..."
+msgstr "Megnyitás ezzel..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 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."
+"Adja meg a futtatandó programot. Az aktuális fájlt fogja megkapni "
+"paraméterként."
 
-#: src/browser.c:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
-msgstr "Meg kell adnia a program nev�t!"
+msgstr "Meg kell adnia a program nevét!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
-msgstr "A %s program nem tal�lhat�!"
+msgstr "A %s program nem található!"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "'%s'-t nem lehet futtatni. %d hiba!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
-msgstr "Egy m�sik folyamatot nem siker�lt lev�lasztani!\n"
+msgstr "Egy másik folyamatot nem sikerült leválasztani!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "A futtatott parancs : '%s %s'"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
-msgstr "El�ad� / Album"
+msgstr "Előadó / Album"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Category"
-msgstr "Kateg�ria"
+msgstr "Kategória"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:229 src/cddb.c:438
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
-msgstr "S�v neve"
+msgstr "Sáv neve"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
-msgstr "Id�tartam"
+msgstr "Időtartam"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
-msgstr "CDDB keres�s"
+msgstr "CDDB keresés"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
-msgstr "Automatikus keres�s"
+msgstr "Automatikus keresés"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 msgid "Request CD database :"
-msgstr "CD adatb�zis lek�r�se:"
+msgstr "CD adatbázis lekérése:"
 
 # bubble help
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
-msgstr "Az automatikus keres�shez sz�ks�g van egy adatb�zis szerverre."
+msgstr "Az automatikus kereséshez szükség van egy adatbázis szerverre."
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
-msgstr "Keres�s le�ll�t�sa"
+msgstr "Keresés leállítása"
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
-msgstr ""
+msgstr "Helyi Cddb adatbázis használata"
 
 # bubble help
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
 msgstr ""
-"Ha ez az opci� akt�v, a bet�lt�s ut�n a c�mk�k az aktu�lis mez�kkel lesznek "
-"kit�ltve."
+"Ha ez az opció aktív, a betöltés után a címkék az aktuális mezőkkel lesznek "
+"kitöltve."
 
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
-msgstr "K�zi keres�s"
+msgstr "Kézi keresés"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
-msgstr "Keresend� elem:"
+msgstr "Keresendő elem:"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
-msgstr "�rja be a keresend� eleme(ke)t sz�k�zzel elv�lasztva egym�st�l."
+msgstr "Írja be a keresendő eleme(ke)t szóközzel elválasztva egymástól."
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "Ahol keres:"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
-msgstr "Minden mez�ben"
+msgstr "Minden mezőben"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
-msgstr "Egy�b"
+msgstr "Egyéb"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
-msgstr "Minden kateg�ri�ban"
+msgstr "Minden kategóriában"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "Klasszikus"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
-msgstr "Egy�b"
+msgstr "Egyéb"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
-msgstr "�j hull�m"
+msgstr "Új hullám"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "Filmzene"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
-msgstr "bele�rtve a funk, soul, rap, pop, industrial, metal, stb m�fajokat is."
+msgstr "beleértve a funk, soul, rap, pop, industrial, metal, stb műfajokat is."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
-msgstr "filmek, tv m�sorok"
+msgstr "filmek, tv műsorok"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
-msgstr "egy�b fel nem sorolt kateg�ri�k is."
+msgstr "egyéb fel nem sorolt kategóriák is."
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
-msgstr "Kateg�ri�k"
+msgstr "Kategóriák"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
-msgstr "Eredm�nyek"
+msgstr "Eredmények"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
-msgstr "Keresend� elem:"
+msgstr "Keresendő elem:"
 
 # bubble help
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
-msgstr "�rja be a keresend� elemet."
+msgstr "Írja be a keresendő elemet."
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
-msgstr "Lefel� keres"
+msgstr "Lefelé keres"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
-msgstr "Felfel� keres"
+msgstr "Felfelé keres"
 
-#: src/cddb.c:571
-#, fuzzy
+#: src/cddb.c:572
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
-msgstr "Csak a piros (vagy vastag) sorokat / Minden sort"
+msgstr "Csak a piros sorokat (vagy minden sort) az Előadó / Album listában"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
-msgstr "Kijel�l�s megsz�ntet�se"
+msgstr "Kijelölés megszüntetése"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
-msgstr "Kijel�l�s megford�t�sa"
+msgstr "Kijelölés megfordítása"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
-msgstr "Minden sor kijel�l�se"
+msgstr "Minden sor kijelölése"
 
 # bubble help
-#: src/cddb.c:702
+#: src/cddb.c:703
 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 ""
-"V�lassza ki a feldolgozand� f�jlokat. Ha semmit nem v�laszt ki, minden sor "
+"Válassza ki a feldolgozandó fájlokat. Ha semmit nem választ ki, minden sor "
 "fel lesz dolgozva."
 
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
-msgstr "Lek�r�s tartalma"
+msgstr "Lekérés tartalma"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 msgid "All"
-msgstr "MInden mez�"
+msgstr "MInden mező"
 
-#: src/cddb.c:721 src/misc.c:1958
-msgid "File Name"
-msgstr "F�jl neve"
-
-#: src/cddb.c:722 src/misc.c:1959
-msgid "Title"
-msgstr "C�m"
-
-#: src/cddb.c:725 src/misc.c:1963
-msgid "Year"
-msgstr "�v"
-
-#: src/cddb.c:726
+#: src/cddb.c:727
 msgid "Track #"
-msgstr "S�v #"
+msgstr "Sáv #"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 msgid "# Tracks"
-msgstr "# S�v"
-
-#: src/cddb.c:728 src/misc.c:1965
-msgid "Genre"
-msgstr "M�faj"
+msgstr "# Sáv"
 
 #. Check box to run the scanner
-#: src/cddb.c:765 src/misc.c:3013
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
-msgstr "Az aktu�lis feldolgoz� futtat�sa a kijel�lt f�jlokon"
+msgstr "Az aktuális feldolgozó futtatása a kijelölt fájlokon"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 msgid "Match lines with the Levenshtein algorithm"
-msgstr ""
+msgstr "Levenshtein algoritmus féle összehasonlítás"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:777 src/prefs.c:1362
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1258,189 +1280,189 @@ msgid ""
 "when selecting the corresponding audio file, or applying cddb results, "
 "instead of using directly the position order."
 msgstr ""
-"Ha ezt a lehet�s�get v�lasztja, a Levenshtein algoritmus (DLM: Damerau-"
-"Levenshtein Metric) a CDDB c�met �sszeveti az �sszes f�jln�vvel az aktu�lis "
-"k�nyvt�rban, �s kiv�lasztja a legjobb p�ros�t�st. A megfelel� audio f�jlok "
-"kiv�laszt�s�n�l �s a cddb eredm�nyek alkalmaz�sakor a direkt poz�ci� sorrend "
-"helyett is ezt fogja haszn�lni."
+"Ha ezt a lehetőséget választja, a Levenshtein algoritmus (DLM: Damerau-"
+"Levenshtein Metric) a CDDB címet összeveti az összes fájlnévvel az aktuális "
+"könyvtárban, és kiválasztja a legjobb párosítást. A megfelelő audio fájlok "
+"kiválasztásánál és a cddb eredmények alkalmazásakor a direkt pozíció sorrend "
+"helyett is ezt fogja használni."
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 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)"
+msgstr "Kijelölt sorok betöltése. (Ha nincs kjelölés mind betöltődik)"
 
-#: src/cddb.c:798 src/misc.c:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
-msgstr "Keres�sre k�sz..."
+msgstr "Keresésre kész..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, 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'"
+"Album: '%s', előadó: '%s', hossz: '%s', év: '%s', műfaj: '%s', ID: '%s'"
 
-#: src/cddb.c:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
-msgstr "Kijel�l�s megford�t�sa"
+msgstr "Kijelölés megfordítása"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
-msgstr "Lista rendez�se sorsz�m szerint"
+msgstr "Lista rendezése sorszám szerint"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
-msgstr "Rendez�s n�v szerint"
+msgstr "Rendezés név szerint"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
-msgstr "%s n�v felold�sa"
+msgstr "%s név feloldása"
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
-msgstr "'%s' (%s) n�vfelold�sa sikertelen!"
+msgstr "'%s' (%s) névfeloldása sikertelen!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, c-format
 msgid "Can't create a new socket (%s)!"
-msgstr "(%s) l�trehoz�sa sikertelen!"
+msgstr "(%s) létrehozása sikertelen!"
 
 #. Open connection to the server
-#: src/cddb.c:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
-msgstr "Kapcsol�d�s ide '%s', port '%d' ..."
+msgstr "Kapcsolódás ide '%s', port '%d' ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
-msgstr "Sikertelen kapcsol�d�s a '%s' (%s) helyhez!"
+msgstr "Sikertelen kapcsolódás a '%s' (%s) helyhez!"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
-msgstr "Kapcsol�d�s a %s szerverhez"
+msgstr "Kapcsolódás a %s szerverhez"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
-msgstr "Adatok fogad�sa (%s)"
+msgstr "Adatok fogadása (%s)"
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, c-format
 msgid "Error when reading cddb response (%s)!"
-msgstr "Hib�s v�lasz a (%s) cddb leh�v�sakor!"
+msgstr "Hibás válasz a (%s) cddb lehívásakor!"
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, c-format
 msgid "Can't create file '%s' (%s)"
-msgstr "A '%s' (%s) f�jl l�trehoz�sa sikertelen."
+msgstr "A '%s' (%s) fájl létrehozása sikertelen."
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, c-format
 msgid "Can't open file '%s' (%s)"
-msgstr "'%s' (%s) f�jl megnyit�sa sikertelen!"
+msgstr "'%s' (%s) fájl megnyitása sikertelen!"
 
 #. g_print("Request : '%s'\n", cddb_in);
 #. Send the request
-#: src/cddb.c:2246 src/cddb.c:2564 src/cddb.c:3397
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
-msgstr "K�r�s k�ld�se"
+msgstr "Kérés küldése"
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
-msgstr "(%s) k�r�s k�ld�se sikertelen!"
+msgstr "(%s) kérés küldése sikertelen!"
 
 #.
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
-msgstr "Adatok fogad�sa..."
+msgstr "Adatok fogadása..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 msgid "The server returned a wrong answer!"
-msgstr "A szerver hib�s v�laszt k�ld�tt!"
+msgstr "A szerver hibás választ küldött!"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
-msgstr "A szerver (%s) hib�s v�laszt k�ld�tt!"
+msgstr "A szerver (%s) hibás választ küldött!"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
-msgstr "Sajn�ljuk, de a web-b�zis� keres� jelenleg nem m�k�dik!"
+msgstr "Sajnáljuk, de a web-bázisú kereső jelenleg nem működik!"
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
-msgstr "%d darab egyez� albumot tal�ltam."
+msgstr "%d darab egyező albumot találtam."
 
-#: src/cddb.c:2585
-#, fuzzy, c-format
+#: src/cddb.c:2589
+#, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
-msgstr "Adatok fogad�sa (%d)"
+msgstr "Adatok fogadása (%d) (album %d/%d)..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, c-format
 msgid "Receiving data of page %d ..."
-msgstr "Adatok fogad�sa (%d)"
+msgstr "Adatok fogadása (%d)"
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
-msgstr "Tov�bbi eredm�nyek let�lt�se"
+msgstr "További eredmények letöltése"
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 msgid "No file selected!"
-msgstr "Nincs kijel�lt f�jl!"
+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:2889
+#: src/cddb.c:2893
 msgid "More than 99 files selected! Can't send request!"
-msgstr ""
+msgstr "Több mint 99 fájl van kijelölve! A kérés elküldése nem lehetséges!"
 
-#: src/cddb.c:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
-msgstr "%d f�jl kijel�lve!"
+msgstr "%d fájl kijelölve!"
 
-#: src/cddb.c:2970
-#, fuzzy
+#: src/cddb.c:2974
 msgid "Local CD search..."
-msgstr "Keres�sre k�sz..."
+msgstr "Keresés a CD-n..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
+#, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
-msgstr ""
+"Fill it in the preferences window before to use this search."
+msgstr "Az útvonal a Helyi CD adatbázishoz nincs beállítva!"
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, 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) ..."
+msgstr "Adatküldés szükséges (CddbId: %s, #sáv: %d, Lemez hossz: %d) ..."
 
-#: src/cddb.c:3268
-#, fuzzy, c-format
+#: src/cddb.c:3276
+#, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
-msgstr "%d darab egyez� albumot tal�ltam."
+msgstr "%d darab egyező albumot találtam for DiscID '%s'"
 
-#: src/cddb.c:3364
-#, fuzzy, c-format
+#: src/cddb.c:3372
+#, c-format
 msgid "Can't load file: '%s' (%s)!"
-msgstr "'%s' (%s) f�jl megnyit�sa sikertelen!"
+msgstr "'%s' (%s) fájl megnyitása sikertelen!"
 
 #. Load the track list of the album
-#: src/cddb.c:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
-msgstr "Az album sz�mc�meinek bet�lt�se ..."
+msgstr "Az album számcímeinek betöltése ..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1448,14 +1470,14 @@ msgid ""
 "\n"
 "Do you want to continue ?"
 msgstr ""
-"Legyen �vatos ezzel az opci�val. A %d sorok a CDDB %d eredm�nyekn�l vannak "
-"kilist�zva!\n"
+"Legyen óvatos ezzel az opcióval. A %d sorok a CDDB %d eredményeknél vannak "
+"kilistázva!\n"
 "\n"
 "Folytatja?"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
-msgstr "C�mke �r�sa CDDB-b�l..."
+msgstr "Címke írása CDDB-ből..."
 
 #: src/charset.c:49
 msgid "Arabic (IBM-864)"
@@ -1494,37 +1516,37 @@ msgstr "Kelta (ISO-8859-14)"
 # src/trans.h:233
 #: src/charset.c:56
 msgid "Central European (IBM-852)"
-msgstr "K�z�p-eur�pai (IBM-852)"
+msgstr "Közép-európai (IBM-852)"
 
 # src/trans.h:234
 #: src/charset.c:57
 msgid "Central European (ISO-8859-2)"
-msgstr "K�z�p-eur�pai (ISO-8859-2)"
+msgstr "Közép-európai (ISO-8859-2)"
 
 # src/trans.h:236
 #: src/charset.c:58
 msgid "Central European (Windows-1250)"
-msgstr "K�z�p-eur�pai (Windows-1250)"
+msgstr "Közép-európai (Windows-1250)"
 
 # src/trans.h:238
 #: src/charset.c:59
 msgid "Chinese Simplified (GB18030)"
-msgstr "Egyszer�s�tett k�nai (GB18030)"
+msgstr "Egyszerűsített kínai (GB18030)"
 
 # src/trans.h:237
 #: src/charset.c:60
 msgid "Chinese Simplified (GB2312)"
-msgstr "Egyszer�s�tett k�nai (GB2312)"
+msgstr "Egyszerűsített kínai (GB2312)"
 
 # src/trans.h:240
 #: src/charset.c:61
 msgid "Chinese Traditional (Big5)"
-msgstr "Hagyom�nyos k�nai (Big5)"
+msgstr "Hagyományos kínai (Big5)"
 
 # src/trans.h:240
 #: src/charset.c:62
 msgid "Chinese Traditional (Big5-HKSCS)"
-msgstr "Hagyom�nyos k�nai (Big5-HKSCS)"
+msgstr "Hagyományos kínai (Big5-HKSCS)"
 
 # src/trans.h:243
 #: src/charset.c:63
@@ -1559,7 +1581,7 @@ msgstr "Cirill/Orosz (CP-866)"
 # src/trans.h:248
 #: src/charset.c:69
 msgid "Cyrillic/Ukrainian (KOI8-U)"
-msgstr "Cirill/Ukr�n (KOI8-U)"
+msgstr "Cirill/Ukrán (KOI8-U)"
 
 # src/trans.h:293
 #: src/charset.c:70
@@ -1569,37 +1591,37 @@ msgstr "Angol (US-ASCII)"
 # src/trans.h:250
 #: src/charset.c:71
 msgid "Greek (ISO-8859-7)"
-msgstr "G�r�g (ISO-8859-7)"
+msgstr "Görög (ISO-8859-7)"
 
 # src/trans.h:252
 #: src/charset.c:72
 msgid "Greek (Windows-1253)"
-msgstr "G�r�g (Windows-1253)"
+msgstr "Görög (Windows-1253)"
 
 # src/trans.h:274
 #: src/charset.c:73
 msgid "Hebrew (IBM-862)"
-msgstr "H�ber (IBM-862)"
+msgstr "Héber (IBM-862)"
 
 # src/trans.h:252
 #: src/charset.c:74
 msgid "Hebrew (Windows-1255)"
-msgstr "H�ber (Windows-1255)"
+msgstr "Héber (Windows-1255)"
 
 # src/trans.h:254
 #: src/charset.c:75
 msgid "Japanese (EUC-JP)"
-msgstr "Jap�n (EUC-JP)"
+msgstr "Japán (EUC-JP)"
 
 # src/trans.h:255
 #: src/charset.c:76
 msgid "Japanese (ISO-2022-JP)"
-msgstr "Jap�n (ISO-2022-JP)"
+msgstr "Japán (ISO-2022-JP)"
 
 # src/trans.h:256
 #: src/charset.c:77
 msgid "Japanese (Shift_JIS)"
-msgstr "Jap�n (Shift_JIS)"
+msgstr "Japán (Shift JIS)"
 
 # src/trans.h:257
 #: src/charset.c:78
@@ -1609,12 +1631,12 @@ msgstr "Koreai (EUC-KR)"
 # src/trans.h:258
 #: src/charset.c:79
 msgid "Nordic (ISO-8859-10)"
-msgstr "�szaki (ISO-8859-10)"
+msgstr "Északi (ISO-8859-10)"
 
 # src/trans.h:260
 #: src/charset.c:80
 msgid "South European (ISO-8859-3)"
-msgstr "D�l-eur�pai (ISO-8859-3)"
+msgstr "Dél-európai (ISO-8859-3)"
 
 # src/trans.h:261
 #: src/charset.c:81
@@ -1624,17 +1646,17 @@ msgstr "Thai (TIS-620)"
 # src/trans.h:262
 #: src/charset.c:82
 msgid "Turkish (IBM-857)"
-msgstr "T�r�k (IBM-857)"
+msgstr "Török (IBM-857)"
 
 # src/trans.h:263
 #: src/charset.c:83
 msgid "Turkish (ISO-8859-9)"
-msgstr "T�r�k (ISO-8859-9)"
+msgstr "Török (ISO-8859-9)"
 
 # src/trans.h:265
 #: src/charset.c:84
 msgid "Turkish (Windows-1254)"
-msgstr "T�r�k (Windows-1254)"
+msgstr "Török (Windows-1254)"
 
 # src/trans.h:267
 #. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
@@ -1649,17 +1671,17 @@ msgstr "Unicode (UTF-8)"
 #. {N_("Unicode (UTF-32LE)"),                "UTF-32LE"      },
 #: src/charset.c:93
 msgid "Vietnamese (VISCII)"
-msgstr "Vietn�mi (VISCII)"
+msgstr "Vietnámi (VISCII)"
 
 # src/trans.h:271
 #: src/charset.c:94
 msgid "Vietnamese (Windows-1258)"
-msgstr "Vietn�mi (Windows-1258)"
+msgstr "Vietnámi (Windows-1258)"
 
 # src/trans.h:272
 #: src/charset.c:95
 msgid "Visual Hebrew (ISO-8859-8)"
-msgstr "H�ber (ISO-8859-8)"
+msgstr "Héber (ISO-8859-8)"
 
 # src/trans.h:274
 #: src/charset.c:96
@@ -1681,535 +1703,534 @@ msgstr "Nyugati (ISO-8859-15)"
 msgid "Western (Windows-1252)"
 msgstr "Nyugati (Windows-1252)"
 
-#: src/charset.c:542
-#, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
-msgstr "A '%s' f�jln�v konvert�l�sa a (%s) UTF-8 r�szbe sikertelen!\n"
+#: src/charset.c:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
+msgstr "A '%s' fájlnév konvertálása a (%s) UTF-8 részbe sikertelen!\n"
 
 # src/trans.h:267
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
-msgstr "�rv�nytelen Unicode (UTF-8)"
+msgstr "Érvénytelen Unicode (UTF-8)"
 
-#: src/charset.c:641
-#, c-format
+#: src/charset.c:642
+#, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
-msgstr "A '%s' UTF-8 r�sz (%s) f�jln�vbe val� konvert�l�sa sikertelen.\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
+msgstr "A '%s' UTF-8 rész (%s) fájlnévbe való konvertálása sikertelen.\n"
 
-#: src/charset.c:705
-#, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
-msgstr "A '%s' sz�veg konvert�l�sa a (%s) UTF-8 r�szbe sikertelen!\n"
+#: src/charset.c:706
+#, fuzzy, c-format
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
+msgstr "A '%s' szöveg konvertálása a (%s) UTF-8 részbe sikertelen!\n"
 
 #. Starting messages
-#: src/easytag.c:177
-#, fuzzy, c-format
+#: src/easytag.c:179
+#, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
-msgstr "EasyTAG ind�t�sa %s (PId: %d) ...\n"
+msgstr "Az EasyTAG %s indítása (Alverzió: %d) ..."
 
-#: src/easytag.c:179
-#, fuzzy, c-format
+#: src/easytag.c:181
+#, c-format
 msgid "Currently using libid3tag version %s ..."
-msgstr "Az id3lib %d.%d.%d k�rnyezettel ford�tva\n"
+msgstr "Az aktuális libid3tag verzió: %s ..."
 
-#: src/easytag.c:182
-#, fuzzy, c-format
+#: src/easytag.c:184
+#, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
-msgstr "Az id3lib %d.%d.%d k�rnyezettel ford�tva\n"
+msgstr "Az aktuális id3lib verzió: %d.%d.%d ..."
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
-msgstr ""
+msgstr "Variálható EASYTAGLANG beállítva %s nyelvre."
 
-#: src/easytag.c:191
-#, fuzzy, c-format
+#: src/easytag.c:193
+#, c-format
 msgid "Setting locale : '%s'"
-msgstr "'%s' f�jl �tnevez�se"
+msgstr "Nyelvi beállítások: '%s' "
 
-#: src/easytag.c:195
-#, fuzzy, c-format
+#: src/easytag.c:197
+#, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
-msgstr "A jelenleg haszn�lt helyi '%s' (�s v�g�l '%s')...\n"
+msgstr "A jelenleg használt nyelvi beállítások: '%s' (és végül '%s') ..."
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
-msgstr "%s %s by %s (ford�tva %s, %s)\n"
+msgstr "%s %s by %s (fordítva %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "Honlap:%s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
-msgstr ""
+msgstr "Ismeretlen paraméter, vagy útvonal %s \n"
 
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
-msgstr "B�ng�sz�"
+msgstr "Böngésző"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
-msgstr "F�jl"
+msgstr "Fájl"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
-msgstr "Csak olvashat� f�jl"
+msgstr "Csak olvasható fájl"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 msgid "File Link Broken"
-msgstr "Hib�s f�jlhivatkoz�s"
+msgstr "Hibás fájlhivatkozás"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
-msgstr "?, R�teg ?"
+msgstr "?, Réteg ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
-msgstr "Bit�rt�k:"
+msgstr "Bitérték:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "Frekvencia:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 src/mpeg_header.c:377
 msgid "Mode:"
-msgstr "M�d:"
+msgstr "Mód:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
-#: src/easytag.c:4073
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
-msgstr "M�ret:"
+msgstr "Méret:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? kb"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "Hossz:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
-msgstr "ID3 c�mk�k"
+msgstr "ID3 címkék"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
-msgstr "C�mkemez�k"
+msgstr "Címkemezők"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
-msgstr "M� c�me:"
+msgstr "Mű címe:"
 
 # bubble help
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr ""
-"Pici gomb megnyom�sa:\n"
-"A kijel�lt f�jlok megc�mk�z�se a megadott n�vvel"
+"Pici gomb megnyomása:\n"
+"A kijelölt fájlok megcímkézése a megadott névvel"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
-msgstr "El�ad�:"
+msgstr "Előadó:"
 
 # bubble help
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr ""
-"Pici gomb megnyom�sa:\n"
-"A kijel�lt f�jlok megc�mk�z�se a megadott el�ad�val"
+"Pici gomb megnyomása:\n"
+"A kijelölt fájlok megcímkézése a megadott előadóval"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "Album neve:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr ""
-"Pici gomb megnyom�sa:\n"
-"A kijel�lt f�jlok megc�mk�z�se a megadott albumn�vvel"
+"Pici gomb megnyomása:\n"
+"A kijelölt fájlok megcímkézése a megadott albumnévvel"
 
 #. Disc Number
-#: src/easytag.c:642
-#, fuzzy
+#: src/easytag.c:654
 msgid "CD:"
-msgstr "CD"
+msgstr "CD:"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr ""
-"Pici gomb megnyom�sa:\n"
-"A kijel�lt f�jlok megc�mk�z�se a megadott CD lemez sz�mmal"
+"Pici gomb megnyomása:\n"
+"A kijelölt fájlok megcímkézése a megadott CD lemez számmal"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
-msgstr "�v:"
+msgstr "Év:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr ""
-"Pici gomb megnyom�sa:\n"
-"A kijel�lt f�jlok megc�mk�z�se a megadott �vsz�mmal"
+"Pici gomb megnyomása:\n"
+"A kijelölt fájlok megcímkézése a megadott évszámmal"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
-"Pici gomb megnyom�sa:\n"
-"Minden kijel�lt s�v n�vekv� megsz�moz�sa. 01-t�l kezdve"
+"Pici gomb megnyomása:\n"
+"Minden kijelölt sáv növekvő megszámozása. 01-től kezdve"
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
-msgstr "Sorsz�m #;"
+msgstr "Sorszám #;"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr ""
-"Pici gomb megnyom�sa:\n"
-"A k�nyvt�rban tal�lhat� f�jlok sz�m�nak automatikus megad�sa"
+"Pici gomb megnyomása:\n"
+"A könyvtárban található fájlok számának automatikus megadása"
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr ""
-"Pici gomb megnyom�sa:\n"
-"A kijel�lt f�jlok megc�mk�z�se a megadott sz�mmal"
+"Pici gomb megnyomása:\n"
+"A kijelölt fájlok megcímkézése a megadott számmal"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
-msgstr "M�faj:"
+msgstr "Műfaj:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr ""
-"Pici gomb megnyom�sa:\n"
-"A kijel�lt f�jlok megc�mk�z�se a megadott m�fajjal"
+"Pici gomb megnyomása:\n"
+"A kijelölt fájlok megcímkézése a megadott műfajjal"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
-msgstr "Megjegyz�s:"
+msgstr "Megjegyzés:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 msgid "Tag selected files with this comment"
 msgstr ""
-"Pici gomb megnyom�sa:\n"
-"A kijel�lt f�jlok megc�mk�z�se a megadott megjegyz�ssel"
+"Pici gomb megnyomása:\n"
+"A kijelölt fájlok megcímkézése a megadott megjegyzéssel"
 
 #. 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
+#: src/easytag.c:830
 msgid "Composer:"
-msgstr "Szerz�:"
+msgstr "Szerző:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr ""
-"Pici gomb megnyom�sa:\n"
-"A kijel�lt f�jlok megc�mk�z�se a megadott szerz�vel "
+"Pici gomb megnyomása:\n"
+"A kijelölt fájlok megcímkézése a megadott szerzővel "
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
-msgstr "Eredeti el�ad�:"
+msgstr "Eredeti előadó:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr ""
-"Pici gomb megnyom�sa:\n"
-"A kijel�lt f�jlok megc�mk�z�se a megadott Eredeti el�ad�val"
+"Pici gomb megnyomása:\n"
+"A kijelölt fájlok megcímkézése a megadott Eredeti előadóval"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
-msgstr "Kiad�:"
+msgstr "Kiadó:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr ""
-"Pici gomb megnyom�sa:\n"
-"A kijel�lt f�jlok megc�mk�z�se a megadott kiad�val"
+"Pici gomb megnyomása:\n"
+"A kijelölt fájlok megcímkézése a megadott kiadóval"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr ""
-"Pici gomb megnyom�sa:\n"
-"A kijel�lt f�jlok megc�mk�z�se a megadott URL-lel"
+"Pici gomb megnyomása:\n"
+"A kijelölt fájlok megcímkézése a megadott URL-lel"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
-msgstr "K�dol�:"
+msgstr "Kódoló:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr ""
-"Pici gomb megnyom�sa:\n"
-"A kijel�lt f�jlok megc�mk�z�se a megadott k�dol�val"
+"Pici gomb megnyomása:\n"
+"A kijelölt fájlok megcímkézése a megadott kódolóval"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
-msgstr "K�pek"
+msgstr "Képek"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
-msgstr "K�pek:"
+msgstr "Képek:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
-msgstr "Csak fogja meg �s h�zza bele a k�pet."
+msgstr "Csak fogja meg és húzza bele a képet."
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr ""
-"Pici gomb megnyom�sa:\n"
-"A kijel�lt f�jlok megc�mk�z�se a megadott k�ppel"
+"Pici gomb megnyomása:\n"
+"A kijelölt fájlok megcímkézése a megadott képpel"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 msgid "Add pictures to the tag (drag and drop is also available)."
-msgstr "K�p hozz�ad�sa. (H�zd �s ejtsd funkci�)"
+msgstr "Kép hozzáadása. (Húzd és ejtsd funkció)"
 
-#: src/easytag.c:1051
+#: src/easytag.c:1063
 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."
+"A kijelölt kép eltávolítása. Ha nem jelöl ki semmit, minden kép törlődik."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
-msgstr "Kijel�lt k�p(ek) ment�se a merevlemezre."
+msgstr "Kijelölt kép(ek) mentése a merevlemezre."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
-msgstr "K�p jellemz�i"
+msgstr "Kép jellemzői"
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
-msgstr "Minden f�jl megc�mk�zve a megadott %s c�mmel."
+msgstr "Minden fájl megcímkézve a megadott %s címmel."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
-msgstr "M� c�me mez� t�r�lve."
+msgstr "Mű címe mező törölve."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
-msgstr "A kijel�lt f�jlok megc�mk�zve a megadott %s el�ad�val"
+msgstr "A kijelölt fájlok megcímkézve a megadott %s előadóval"
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
-msgstr "El�ad� mez� t�r�lve"
+msgstr "Előadó mező törölve"
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
-msgstr "A kijel�lt f�jlok megc�mk�zve a megadott '%s' albummal"
+msgstr "A kijelölt fájlok megcímkézve a megadott '%s' albummal"
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
-msgstr "Album neve mez� t�r�lve"
+msgstr "Album neve mező törölve"
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
-msgstr "A kijel�lt f�jlok megc�mk�zve a '%s' CD lemez sz�mmal"
+msgstr "A kijelölt fájlok megcímkézve a '%s' CD lemez számmal"
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
-msgstr "CD lemez sz�m mez� t�r�lve"
+msgstr "CD lemez szám mező törölve"
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
-msgstr "A kijel�lt f�jlok megc�mk�zve a megadott '%s' �vvel"
+msgstr "A kijelölt fájlok megcímkézve a megadott '%s' évvel"
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
-msgstr "�v mez� t�r�lve"
+msgstr "Év mező törölve"
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
-msgstr "A kijel�lt f�jlok megc�mk�zve a megadott sz�moz�ssal mint 'xx/%s'."
+msgstr "A kijelölt fájlok megcímkézve a megadott számozással mint 'xx/%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
-msgstr "A kijel�lt f�jlok megc�mk�zve a megadott sz�moz�ssal mint 'xx'"
+msgstr "A kijelölt fájlok megcímkézve a megadott számozással mint 'xx'"
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
-msgstr "Sorsz�m mez� t�r�lve"
+msgstr "Sorszám mező törölve"
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
-msgstr "A kijel�lt s�vok n�vekv�en sorsz�mozva."
+msgstr "A kijelölt sávok növekvően sorszámozva."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
-msgstr "A kijel�lt f�jlok megc�mk�zve a megadott '%s' m�fajjal."
+msgstr "A kijelölt fájlok megcímkézve a megadott '%s' műfajjal."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
-msgstr "M�faj mez� t�r�lve"
+msgstr "Műfaj mező törölve"
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
-msgstr "A kijel�lt f�jlok megc�mk�zve a '%s' megjegyz�ssel."
+msgstr "A kijelölt fájlok megcímkézve a '%s' megjegyzéssel."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
-msgstr "Megjegyz�s mez� t�r�lve"
+msgstr "Megjegyzés mező törölve"
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
-msgstr "A kijel�lt f�jlok megc�mk�zve a megadott '%s' szerz�vel"
+msgstr "A kijelölt fájlok megcímkézve a megadott '%s' szerzővel"
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
-msgstr "Szerz� mez� t�r�lve"
+msgstr "Szerző mező törölve"
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
-msgstr "A kijel�lt f�jlok megc�mk�zve a megadott '%s'. Eredeti el�ad�val"
+msgstr "A kijelölt fájlok megcímkézve a megadott '%s'. Eredeti előadóval"
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
-msgstr "Az Eredeti el�ad� mez� t�r�lve"
+msgstr "Az Eredeti előadó mező törölve"
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
-msgstr "A kijel�lt f�jlok megc�mk�zve a megadott '%s' kiad�val"
+msgstr "A kijelölt fájlok megcímkézve a megadott '%s' kiadóval"
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
-msgstr "A Kiad� mez� t�r�lve"
+msgstr "A Kiadó mező törölve"
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
-msgstr "A kijel�lt f�jlok megc�mk�zve a megadott '%s' URL-lel"
+msgstr "A kijelölt fájlok megcímkézve a megadott '%s' URL-lel"
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
-msgstr "Az URL mez� t�r�lve"
+msgstr "Az URL mező törölve"
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
-msgstr "A kijel�lt f�jlok megc�mk�zve a megadott '%s' k�dol�val"
+msgstr "A kijelölt fájlok megcímkézve a megadott '%s' kódolóval"
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
-msgstr "A K�dol� mez� t�r�lve"
+msgstr "A Kódoló mező törölve"
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
-msgstr "A kijel�lt f�jlok megc�mk�zve a megadott '%s' k�ppel"
+msgstr "A kijelölt fájlok megcímkézve a megadott '%s' képpel"
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
-msgstr "A K�pek mez� t�r�lve"
+msgstr "A Képek mező törölve"
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
-msgstr "V�lasszon m�dot �s maszkot, �s ism�telje meg"
+msgstr "Válasszon módot és maszkot, és ismételje meg"
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
-msgstr "Minden c�mke feldolgozva"
+msgstr "Minden címke feldolgozva"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
-msgstr "Minden c�mke t�r�lve"
+msgstr "Minden címke törölve"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
-msgstr "Minden f�jl elmentve..."
+msgstr "Minden fájl elmentve..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
-msgstr "F�jlok r�szben elmentve..."
+msgstr "Fájlok részben elmentve..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
-msgstr "F�jlok r�szben t�r�lve..."
+msgstr "Fájlok részben törölve..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
-msgstr "Minden f�jl t�r�lve..."
+msgstr "Minden fájl törölve..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
 "'%s' ?"
 msgstr ""
-"Be�rja a c�mk�t ebbe a f�jlba: \n"
+"Beírja a címkét ebbe a fájlba: \n"
 "'%s' ?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
-msgstr "C�mke �r�sa..."
+msgstr "Címke írása..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
-msgstr "�tnevez�s"
+msgstr "Átnevezés"
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2217,16 +2238,16 @@ msgid ""
 "to \n"
 "'%s' ?"
 msgstr ""
-"Val�ban �t akarja nevezni a(z) \n"
-"'%s' f�jlt\n"
+"Valóban át akarja nevezni a(z) \n"
+"'%s' fájlt\n"
 "erre: '%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
-msgstr "K�nyvt�r �tnevez�se..."
+msgstr "Könyvtár átnevezése..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2234,16 +2255,16 @@ msgid ""
 "to \n"
 "'%s' ?"
 msgstr ""
-"Val�ban �t akarja nevezni a(z) \n"
-"'%s' k�nyvt�rat\n"
+"Valóban át akarja nevezni a(z) \n"
+"'%s' könyvtárat\n"
 "erre: '%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
-msgstr "F�jl �tnevez�se..."
+msgstr "Fájl átnevezése..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2251,37 +2272,37 @@ msgid ""
 "to \n"
 "'%s' ?"
 msgstr ""
-"Val�ban �t akarja nevezni a(z) \n"
-"'%s' f�jlt\n"
+"Valóban át akarja nevezni a(z) \n"
+"'%s' fájlt\n"
 "erre: '%s' ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
-msgstr "'%s' c�mk�j�nek �r�sa"
+msgstr "'%s' címkéjének írása"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 msgid "Tag(s) written"
-msgstr "C�mk�k ki�rva"
+msgstr "Címkék kiírva"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2586 src/easytag.c:2591
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
 "(%s)"
 msgstr ""
-"A c�mk�k nem �rhat�k ebbe a f�jlba: '%s'!\n"
+"A címkék nem írhatók ebbe a fájlba: '%s'!\n"
 "(Nem %s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, c-format
 msgid "Renaming file '%s'"
-msgstr "'%s' f�jl �tnevez�se"
+msgstr "'%s' fájl átnevezése"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2737 src/easytag.c:2769 src/easytag.c:2941
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2289,15 +2310,15 @@ msgid ""
 "'%s'!\n"
 "(%s)"
 msgstr ""
-"Nem lehet �tnevezni a '%s' f�jlt!\n"
+"Nem lehet átnevezni a '%s' fájlt!\n"
 "erre: '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
-msgstr "Nem t�rt�nt �tnevez�s..."
+msgstr "Nem történt átnevezés..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2305,33 +2326,33 @@ msgid ""
 "because the following file already exists:\n"
 "'%s'"
 msgstr ""
-"Nem lehet �tnevezni a \n"
-"'%s' f�jlt\n"
-", mert ilyen nev� f�jl m�r l�tezik:\n"
+"Nem lehet átnevezni a \n"
+"'%s' fájlt\n"
+", mert ilyen nevű fájl már létezik:\n"
 "'%s'"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
 "'%s'!\n"
 "(%s)"
 msgstr ""
-"A c�lk�nyvt�r l�trehoz�sa sikertelen\n"
+"A célkönyvtár létrehozása sikertelen\n"
 "'%s'!\n"
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
-msgstr "F�jl �tnevezve '%s'-r�l '%s'-re"
+msgstr "Fájl átnevezve '%s'-ról '%s'-re"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
-msgstr "F�jlok �tnevezve..."
+msgstr "Fájlok átnevezve..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2339,20 +2360,20 @@ msgid ""
 "(%s)"
 msgstr ""
 "'%s'\n"
-"(%s) k�nyvt�r t�rl�se sikertelen!"
+"(%s) könyvtár törlése sikertelen!"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
-msgstr "F�jl �tnevezve '%s'-r�l '%s'-re"
+msgstr "Fájl átnevezve '%s'-ról '%s'-re"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
-msgstr "F�jlok �tnevezve..."
+msgstr "Fájlok átnevezve..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2360,33 +2381,33 @@ msgid ""
 "'%s'!\n"
 "(%s)"
 msgstr ""
-"Nem lehet �tnevezni a '%s' f�jlt!\n"
+"Nem lehet átnevezni a '%s' fájlt!\n"
 "erre: '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
-msgstr "Nem t�rt�nt �tnevez�s..."
+msgstr "Nem történt átnevezés..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
 "'%s' ?"
 msgstr ""
-"V�glegesen t�r�lni k�v�nja a(z) \n"
-"'%s' f�jlt?"
+"Véglegesen törölni kívánja a(z) \n"
+"'%s' fájlt?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
-msgstr "F�jl t�rl�se..."
+msgstr "Fájl törlése..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
-msgstr "'%s' f�jl t�r�lve"
+msgstr "'%s' fájl törölve"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2394,128 +2415,128 @@ msgid ""
 "(%s)"
 msgstr ""
 "'%s'\n"
-"(%s)k�nyvt�r nem olvashat�."
+"(%s)könyvtár nem olvasható."
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
-msgstr "Beolvas�s..."
+msgstr "Beolvasás..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
-msgstr "F�jl: %s"
+msgstr "Fájl: %s"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, 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."
+msgstr "'%d' db fájl található ebben a könyvtárban és alkönyvtáraiban."
 
-#: src/easytag.c:3239
+#: src/easytag.c:3356
 #, c-format
 msgid "Found %d file(s) in this directory."
-msgstr "'%d' db f�jl tal�lhat� ebben a k�nyvt�rban."
+msgstr "'%d' db fájl található ebben a könyvtárban."
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3252 src/et_core.c:2696
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
-msgstr "%u f�jl"
+msgstr "%u fájl"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
-msgstr "Nem tal�lhat� f�jl ebben a k�nyvt�rban �s alk�nyvt�raiban."
+msgstr "Nem található fájl ebben a könyvtárban és alkönyvtáraiban."
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
-msgstr "Nem tal�lhat� f�jl ebben a k�nyvt�rban!"
+msgstr "Nem található fájl ebben a könyvtárban!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
-msgstr "Bet�lt�s"
+msgstr "Betöltés"
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
-msgstr "Bet�lt�s le�ll�t�sa"
+msgstr "Betöltés leállítása"
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
-msgstr "Adja meg az �tvizsg�land� k�nyvt�rat!"
+msgstr "Adja meg az átvizsgálandó könyvtárat!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
-msgstr "A kijel�lt f�jlok megc�mk�zve a megadott mez�kkel"
+msgstr "A kijelölt fájlok megcímkézve a megadott mezőkkel"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
-msgstr "Als�von�s �s '%20' sztring sz�k�zz� alak�t�sa"
+msgstr "Alsóvonás és '%20' sztring szóközzé alakítása"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
-msgstr "Sz�k�z als�von�ss� alak�t�sa"
+msgstr "Szóköz alsóvonássá alakítása"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
-msgstr "MINDENT NAGYBET�SRE"
+msgstr "MINDENT NAGYBETŰSRE"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
-msgstr "mindent kisbet�sre"
+msgstr "mindent kisbetűsre"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
-msgstr "Els� bet� legyen nagybet�"
+msgstr "Első betű legyen nagybetű"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
-msgstr "Minden Sz� Els� Bet�je Legyen Nagybet�"
+msgstr "Minden Szó Első Betűje Legyen Nagybetű"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
-msgstr "Sz�k�z�k elt�vol�t�sa"
+msgstr "Szóközök eltávolítása"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
-msgstr "Sz�k�z minden nagybet� el�"
+msgstr "Szóköz minden nagybetű elé"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 msgid "Remove duplicate spaces or underscores"
-msgstr "Minden dupla sz�k�z �s als�von�s elt�vol�t�sa"
+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:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
-msgstr "EasyTAG %s: rendellenes kil�p�s! (PId: %d)."
+msgstr "EasyTAG %s: rendellenes kilépés! (PId: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
-#, fuzzy, c-format
+#: src/easytag.c:4443 src/easytag.c:4452
+#, c-format
 msgid "Received signal %s (%d)\a"
-msgstr "%s (%d) szign�l keletkezett!\n"
+msgstr "%s (%d) szignál vétele!\a"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 ""
-"Val�sz�n�leg egy hib�t tal�lt az EasyTAG-ben. K�rem k�ldje el a hiba "
-"le�r�s�t egy gdb visszavezet�ssel ('gdb easytag core' majd 'bt' �s 'l' (kis "
+"Valószínűleg egy hibát talált az EasyTAG-ben. Kérem küldje el a hiba "
+"leírását egy gdb visszavezetéssel ('gdb easytag core' majd 'bt' és 'l' (kis "
 "el)\n"
-"<easytag@gmail.com> c�mre."
+"<easytag@gmail.com> címre."
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
-msgstr "Ismeretlen szign�l"
+msgstr "Ismeretlen szignál"
 
-#: src/easytag.c:4479
-#, fuzzy, c-format
+#: src/easytag.c:4597
+#, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2533,108 +2554,104 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Haszn�lat: easytag [param�ter] \n"
-"vagy: easytag [k�nyvt�r]\n"
+"Használat: easytag [paraméter] \n"
+"vagy: easytag [könyvtár]\n"
 "\n"
-"Param�ter:\n"
+"Paraméter:\n"
 "-------\n"
-"-h, --help        Ki�rja ezt a sz�veget �s kil�p.\n"
-"-v, --version     Alapvet� inf�.-kat �r ki �s kil�p.\n"
+"-h, --help        Kiírja ezt a szöveget és kilép.\n"
+"-v, --version     Alapvető infó.-kat ír ki és kilép.\n"
 "\n"
-"K�nyvt�r:\n"
+"Könyvtár:\n"
 "----------\n"
-"c:/el�r�si_�t/a_f�jlokhoz  Egy abszol�t �tvonalat t�lt be,\n"
-"/el�r�si_�t/a_f�jlokhoz.  Egy abszol�t �tvonalat t�lt be,\n"
-"el�r�si_�tvonal/a_f�jlokhoz.  Relat�v �tvonal haszn�lata.\n"
-"\n"
+"%s/elérési_út/a_fájlokhoz  Egy abszolút útvonalat tölt be,\n"
+"elérési_útvonal/a_fájlokhoz.  Relatív útvonal használata.\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
-msgstr "EasyTAG: Norm�lis kil�p�s."
+msgstr "EasyTAG: Normális kilépés."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
 msgstr ""
-"N�h�ny f�jl megv�ltozott\n"
-"Szeretn� menteni a v�ltoz�sokat?"
+"Néhány fájl megváltozott\n"
+"Szeretné menteni a változásokat?"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
-msgstr " Biztosan ki akar l�pni? "
+msgstr " Biztosan ki akar lépni? "
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
-msgstr "ID3 c�mk�k"
+msgstr "ID3 címkék"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
-msgstr "Ogg Vorbis c�mk�k"
+msgstr "Ogg Vorbis címkék"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
-msgstr "FLAC Vorbis c�mk�k"
+msgstr "FLAC Vorbis címkék"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
-msgstr "APE c�mk�k"
+msgstr "APE címkék"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
-msgstr "MP4/M4A/AAC c�mk�k"
+msgstr "MP4/M4A/AAC címkék"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
-msgstr ""
+msgstr "WavPack címke"
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
-msgstr "MP3 f�jl"
+msgstr "MP3 fájl"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
-msgstr "MP2 f�jl"
+msgstr "MP2 fájl"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
-msgstr "Ogg Vorbis f�jl"
+msgstr "Ogg Vorbis fájl"
 
-# ikon megjegyz�s
-#: src/et_core.c:2573
-#, fuzzy
+# ikon megjegyzés
+#: src/et_core.c:2582
 msgid "Speex File"
-msgstr "K�vetkez� f�jl"
+msgstr "Speex fájl"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
-msgstr "FLAC f�jl"
+msgstr "FLAC fájl"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
-msgstr "MusePack f�jl"
+msgstr "MusePack fájl"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
-msgstr "Monkey's Audio f�jl"
+msgstr "Monkey's Audio fájl"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
-msgstr "MP4/AAC f�jl"
+msgstr "MP4/AAC fájl"
 
-#: src/et_core.c:2599
-#, fuzzy
+#: src/et_core.c:2608
 msgid "Wavpack File"
-msgstr "MusePack f�jl"
+msgstr "WavPack fájl"
 
-#: src/et_core.c:2873
-#, fuzzy, c-format
+#: src/et_core.c:2882
+#, c-format
 msgid "Pictures (%d)"
-msgstr "K�pek"
+msgstr "Képek (%d)"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2642,88 +2659,93 @@ 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/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
 "into system filename encoding\n"
 "(Try setting the environment variable G_FILENAME_ENCODING)."
 msgstr ""
-"A '%s' f�jln�v �tkonvert�l�s sikertelen!'\n"
-"(Pr�b�lja meg a k�rnyezetet vari�lni:\n"
+"A '%s' fájlnév átkonvertálás sikertelen!'\n"
+"(Próbálja meg a környezetet variálni:\n"
 " G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
-msgstr "F�jln�v ford�t�sok (?)"
+msgstr "Fájlnév fordítások (?)"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
-msgstr "A %s'f�jln�v %d karakterek miatt csonkitott lesz!\n"
+msgstr "A %s'fájlnév %d karakterek miatt csonkitott lesz!\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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
-msgstr "K�dol�:"
+msgstr "Kódoló:"
 
 #. 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/flac_header.c:312 src/mp4_header.c:286 src/ogg_header.c:267
 #: src/wavpack_header.c:88
 msgid "Channels:"
-msgstr "Csatorn�k:"
+msgstr "Csatornák:"
 
-#: src/flac_tag.c:140 src/flac_tag.c:741
-#, fuzzy, c-format
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
+#, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
-msgstr "Hiba a '%s' (%s) f�jl megnyit�sa k�zben."
+msgstr "Hiba a '%s' mint FLAC (%s) fájl megnyitása közben."
+
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
-msgstr "HIBA: A megjegyz�s �r�sa k�zben a(z) '%s' (%s) f�jlba."
+msgstr "HIBA: A megjegyzés írása közben a(z) '%s' (%s) fájlba."
 
-#: src/flac_tag.c:990 src/ogg_tag.c:759
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
-msgstr "'%s' c�mk�je ki�rva"
+msgstr "'%s' címkéje kiírva"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
-msgstr "'%s' f�jl c�mk�je elt�vol�tva"
+msgstr "'%s' fájl címkéje eltávolítva"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
-msgstr "Hiba a(z) '%s' (%s) f�jl ID3v1 c�mk�j�nek elt�vol�t�sakor"
+msgstr "Hiba a(z) '%s' (%s) fájl ID3v1 címkéjének eltávolításakor"
 
-#: src/id3_tag.c:490 src/id3_tag.c:557
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
-msgstr "Hiba a(z) '%s' (%s) f�jl ID3v2 c�mk�j�nek elt�vol�t�sakor"
+msgstr "Hiba a(z) '%s' (%s) fájl ID3v2 címkéjének eltávolításakor"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
-msgstr "Hiba a(z) '%s' (%s) f�jl ID3v2 c�mk�j�nek friss�t�sekor"
+msgstr "Hiba a(z) '%s' (%s) fájl ID3v2 címkéjének frissítésekor"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2737,452 +2759,379 @@ msgid ""
 "\n"
 "File : %s"
 msgstr ""
-"Megpr�b�lta elmenteni ezt a c�mk�t ebben a form�tumban, de a rendszer id3lib "
-"f�jlja hib�s.\n"
-"Ha �jrat�lti ezt a f�jlt, n�h�ny karakter hib�san fog megjelenni, mivel a "
-"hiba miatt hib�san is ker�lt ki�r�sra.\n"
-"A jav�t�shoz az id3lib f�jlt kell megfoltozni.\n"
-"A folt el�rhet� az EasyTAG csomag forr�s�ban.\n"
-" src/id3lib/ patch_id3lib_3.8.3_UTF16_writing_bug.diff\n"
-"Ez az �zenet minden indul�sn�l csak egyszer jelenik meg.\n"
+"Megpróbálta elmenteni ezt a címkét ebben a formátumban, de a rendszer id3lib "
+"fájlja hibás.\n"
+"Ha újratölti ezt a fájlt, néhány karakter hibásan fog megjelenni, mivel a "
+"hiba miatt hibásan is került kiírásra.\n"
+"A javításhoz az id3lib fájlt kell megfoltozni.\n"
+"A folt elérhető az EasyTAG csomag forrásában.\n"
+" src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff\n"
+"Ez az üzenet minden indulásnál csak egyszer jelenik meg.\n"
 "\n"
 "File : %s"
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
-msgstr "Hiba a(z) '%s' (%s) f�jl ID3v1 c�mk�j�nek friss�t�sekor"
+msgstr "Hiba a(z) '%s' (%s) fájl ID3v1 címkéjének frissítésekor"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
-msgstr "'%s' c�mk�je friss�tve"
+msgstr "'%s' címkéje frissítve"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
-msgstr "Nem t�rt�nt hiba"
+msgstr "Nem történt hiba"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
-msgstr "Nincs el�g mem�ria"
+msgstr "Nincs elég memória"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
-msgstr "Nincs feldolgozand� adat"
+msgstr "Nincs feldolgozandó adat"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
-msgstr "Hib�s form�tum� adat"
+msgstr "Hibás formátumú adat"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
-msgstr "Nincs �rhat� puffer"
+msgstr "Nincs írható puffer"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
-msgstr "A puffer t�l kicsi"
+msgstr "A puffer túl kicsi"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
-msgstr "Hib�s form�tum azonos�t�"
+msgstr "Hibás formátum azonosító"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
-msgstr "A keresett f�jl nem tal�lhat�"
+msgstr "A keresett fájl nem található"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
-msgstr "Ismeretlen mez�t�pus"
+msgstr "Ismeretlen mezőtípus"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
-msgstr "Ennek a f�jlnak m�r van c�mk�je"
+msgstr "Ennek a fájlnak már van címkéje"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
-msgstr "Hib�s ID3 c�mke verzi�"
+msgstr "Hibás ID3 címke verzió"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
-msgstr "Nincs feldolgozand� f�jl"
+msgstr "Nincs feldolgozandó fájl"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
-msgstr "Megp�b�l csak olvashat� f�jlba �rni"
+msgstr "Megpóbál csak olvasható fájlba írni"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
-msgstr "Hiba a be/kit�m�r�t�s k�zben"
+msgstr "Hiba a be/kitömörítés közben"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "Ismeretlen hiba!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, 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 ""
-"Ez egy hib�s form�tum� f�jl: '%s'\n"
-"Az id3lib �ltal nem �rtelmezhet� c�mk�k miatt, feldolgoz�s meghius�l."
+"Ez egy hibás formátumú fájl: '%s'\n"
+"Az id3lib által nem értelmezhető címkék miatt a feldolgozás meghiúsul."
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
-msgstr "Hib�s f�jl..."
+msgstr "Hibás fájl..."
 
-#: src/log.c:91
+#: src/log.c:95
 msgid "Log"
-msgstr ""
-
-#: src/misc.c:214
-msgid " OK "
-msgstr " OK "
-
-#: src/misc.c:219
-msgid " Yes "
-msgstr " Igen "
-
-#: src/misc.c:224
-msgid " No "
-msgstr " Nem "
-
-#: src/misc.c:229
-msgid " Apply "
-msgstr " Alkalmaz "
-
-#: src/misc.c:234
-msgid " Save "
-msgstr " Ment "
-
-#: src/misc.c:239
-msgid " Cancel "
-msgstr " M�gsem "
-
-#: src/misc.c:244
-msgid " Close "
-msgstr " Bez�r "
+msgstr "Információk "
 
-#: src/misc.c:249
-msgid " Write "
-msgstr " �r�s "
-
-#: src/misc.c:254
-msgid " Execute "
-msgstr " Futtat�s "
-
-#: src/misc.c:259
-msgid " Search "
-msgstr "Keres�s "
-
-#: src/misc.c:264
-msgid " Browse... "
-msgstr "Tall�z..."
+#: src/misc.c:773
+msgid "Select file..."
+msgstr "Fájl kiválasztása..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
-msgstr "K�nyvt�r kiv�laszt�sa..."
+msgstr "Könyvtár kiválasztása..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "F�jl kiv�laszt�sa..."
-
-#: src/misc.c:931
-#, fuzzy
+#: src/misc.c:852
 msgid "Warning..."
-msgstr "Bet�lt�s"
+msgstr "Figyelem..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
-msgstr ""
+msgstr "Nincs audió lejátszó beállítva"
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
-msgstr "M3u listaf�jl k�sz�t�s"
+msgstr "M3u listafájl készítés"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
-msgstr "M3U listaf�jl neve"
+msgstr "M3u listafájl neve"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
-msgstr "K�nyvt�r nev�nek haszn�lata"
+msgstr "Könyvtár nevének használata"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
-msgstr "Maszkok szerkeszt�se"
+msgstr "Maszkok szerkesztése"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
-msgstr "M3u listaf�jl be�ll�t�sok"
+msgstr "M3u listafájl beállítások"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
-msgstr "Csak a kijel�lt f�jlokat tartalmazza"
+msgstr "Csak a kijelölt fájlokat tartalmazza"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
 msgstr ""
-"Ha akt�v�lja, csak a kijel�lt f�jlok lesznek az m3u listaf�jlban. Egy�bk�nt "
-"minden f�jl beleker�l."
+"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:1397
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
-msgstr "Teljes el�r�si �t haszn�lata az m3u list�ban"
+msgstr "Teljes elérési út használata az M3u listában"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 msgid "Use relative path for files in playlist"
-msgstr "Relat�v el�r�si �t haszn�lata az m3u list�ban"
+msgstr "Relatív elérési út használata az M3u listában"
 
 #. Create playlist in parent directory
-#: src/misc.c:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
-msgstr "M3u listaf�jl �r�sa a sz�l� k�nyvt�rba"
+msgstr "M3u listafájl írása a szülő könyvtárba"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 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)"
+"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:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
-msgstr "Dos-Windows f�le k�nyvt�r elv�laszt� haszn�lata"
+msgstr "Dos-Windows féle könyvtár elválasztó használata"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 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"
+"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:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
-msgstr "M3u listaf�jl tartalma"
+msgstr "M3u listafájl tartalma"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
-msgstr "Csak lista k�sz�t�se a f�jlokr�l"
+msgstr "Csak lista készítése a fájlokról"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
-msgstr "Inform�ci� �r�s a f�jlnevet haszn�lva"
+msgstr "Információ írás a fájlnevet használva"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
-msgstr "Inform�ci� �r�s ezt a maszkot haszn�lva:"
+msgstr "Információ írás ezt a maszkot használva:"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
 "Overwrite?"
 msgstr ""
-"'%s' listaf�jl m�r l�tezik!\n"
-"Fel�l�rja?"
+"'%s' listafájl már létezik!\n"
+"Felülírja?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
-msgstr "M3u listaf�jl �r�sa..."
+msgstr "M3u listafájl írása..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
 "(%s)"
 msgstr ""
-"A '%s' listaf�jl �r�sa sikertelen!\n"
+"A '%s' listafájl írása sikertelen!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
-msgstr "'%s' listaf�jl elk�sz�lt"
+msgstr "'%s' listafájl elkészült"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1964
-msgid "Track"
-msgstr "S�v"
-
-#: src/misc.c:1967 src/picture.c:821
-msgid "Composer"
-msgstr "Szerz�"
-
-#: src/misc.c:1968
-msgid "Orig. Artist"
-msgstr "Eredeti el�ad�"
-
-#: src/misc.c:1969
-msgid "Copyright"
-msgstr "Kiad�"
-
-#: src/misc.c:1970
-msgid "URL"
-msgstr "URL"
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 msgid "Encoded by"
-msgstr "K�dol�"
+msgstr "Kódoló"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
-msgstr "F�jlkeres�s"
+msgstr "Fájlkeresés"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 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"
+"Írja be a keresendő szót vagy ne írjon be semmit, és minden fájl látható lesz"
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "Hol keressen?"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 msgid "the File Name"
-msgstr "f�jln�vben"
+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:2033
+#: src/misc.c:1984
 msgid "the Tag"
-msgstr "c�mk�ben"
+msgstr "címkében"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
-msgstr "kis �s NAGYBET�K megk�l�nb�ztet�se"
+msgstr "kis és NAGYBETŰK megkülönböztetése"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
-msgstr "%d darab tal�lat"
+msgstr "%d darab találat"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
-msgstr "F�jlnevek bet�lt�se TXT f�jlb�l"
+msgstr "Fájlnevek betöltése TXT fájlból"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 msgid "File :"
-msgstr "F�jl:"
+msgstr "Fájl:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2787
+#: src/misc.c:2738
 msgid " Load "
-msgstr " Bet�lt "
+msgstr " Betölt "
 
-#: src/misc.c:2810
-#, fuzzy
+#: src/misc.c:2761
 msgid "Content of TXT file"
-msgstr "F�jl �tnevez�s�nek meger�s�t�se"
+msgstr "TXT fájl tartalom"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2831 src/misc.c:2925
-#, fuzzy
+#: src/misc.c:2782 src/misc.c:2876
 msgid "Insert a blank line before the selected line"
-msgstr "Sz�k�z besz�r�sa minden NAGYBET�S sz� el�"
+msgstr "Üres hely beszúrása a kijelölt vonal elé"
 
+# Sor törlése - volt régen.
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2840 src/misc.c:2934
-#, fuzzy
+#: src/misc.c:2791 src/misc.c:2885
 msgid "Delete the selected line"
-msgstr "Sor t�rl�se"
+msgstr "Kijelölt vonal 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
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 msgid "Delete all blank lines"
-msgstr "Minden �res sor t�rl�se"
+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
+#: src/misc.c:2812 src/misc.c:2906
 msgid "Move up the selected line"
-msgstr "Csak a kijel�lt f�jlokat tartalmazza"
+msgstr "Kijelölt sor felljebb mozgatása"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2870 src/misc.c:2964
-#, fuzzy
+#: src/misc.c:2821 src/misc.c:2915
 msgid "Move down the selected line"
-msgstr "Csak a kijel�lt f�jlokat tartalmazza"
+msgstr "Kijelölt sor lejjebb mozgatása"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
-msgstr "�jrat�lt�s"
+msgstr "Újratöltés"
 
-#: src/misc.c:2903
-#, fuzzy
+#: src/misc.c:2854
 msgid "List of files"
-msgstr "Csak lista k�sz�t�se a f�jlokr�l"
+msgstr "Fájllista"
 
-#: src/misc.c:2998
-#, fuzzy
+#: src/misc.c:2949
 msgid "Selected line:"
-msgstr "Minden sor kijel�l�se"
+msgstr "Kijelölt sor:"
 
 # bubble help
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
 msgstr ""
-"Ha akt�v�lja ezt az opci�t akkor a bet�lt�s ut�n a f�jlnevek a feldolgoz� "
-"aktu�lis be�ll�t�saival �r�dnak fel�l.\n"
-"(A feldolgoz�ablak most nyitva)."
+"Ha aktíválja ezt az opciót akkor a betöltés után a fájlnevek a feldolgozó "
+"aktuális beállításaival íródnak felül.\n"
+"(A feldolgozóablak most nyitva)."
 
-#: src/misc.c:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
-msgstr "�res sor besz�r�sa"
+msgstr "Üres sor beszúrása"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
-msgstr "Sor t�rl�se"
+msgstr "Sor törlése"
 
-#: src/misc.c:3424
-#, fuzzy
+#: src/misc.c:3376
 msgid "Move up this line"
-msgstr "Maszk felfel� mozgat�sa"
+msgstr "Aktuális sor felfelé mozgatása"
 
-#: src/misc.c:3430
-#, fuzzy
+#: src/misc.c:3382
 msgid "Move down this line"
-msgstr "Maszk lefel� mozgat�sa"
+msgstr "Aktuális sor lefelé mozgatása"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
@@ -3197,9 +3146,9 @@ msgstr "Audio"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
-msgstr "Ismeretlen MP4 form�tum"
+msgstr "Ismeretlen MP4 formátum"
 
 #: src/mp4_header.c:273 src/mpeg_header.c:365
 #, c-format
@@ -3208,24 +3157,23 @@ msgstr "~%d kb/s"
 
 #: src/mpeg_header.c:78
 msgid "Stereo"
-msgstr ""
+msgstr "Sztereó"
 
 #: src/mpeg_header.c:79
 msgid "Joint stereo"
-msgstr ""
+msgstr "Joint sztereó"
 
 #: src/mpeg_header.c:80
 msgid "Dual channel"
-msgstr ""
+msgstr "Két sávos hang"
 
 #: src/mpeg_header.c:81
 msgid "Single channel"
-msgstr ""
+msgstr "Egy sávos hang"
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
-msgstr "M�velet ism�tl�se a h�tralev� f�jlokra"
+msgstr "Művelet ismétlése a hátralevő fájlokra"
 
 #: src/ogg_header.c:100
 #, c-format
@@ -3233,26 +3181,28 @@ msgid ""
 "Ogg Vorbis: The specified bitstream does not exist or the file has been "
 "initialized improperly (file: '%s')."
 msgstr ""
+"Ogg Vorbis: a speciális adatfolyam nem létezik, vagy helytelenül lett "
+"inicializálva (%s fájl)"
 
 #: src/ogg_header.c:131
 #, c-format
 msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
-msgstr ""
+msgstr "Ogg Vorbis: Hiba a médiából történő olvasás közben.(fájl: '%s')."
 
 #: src/ogg_header.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
-msgstr "Az Ogg Vorbis adatfolyam nem tartalmaz vorbis adatot."
+msgstr "A(z) %s Ogg Vorbis adatfolyam nem tartalmaz vorbis adatot."
 
 #: src/ogg_header.c:137
 #, c-format
 msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
-msgstr ""
+msgstr "Ogg Vorbis: Vorbis verzió rossz párosítás  (fájl: '%s')."
 
 #: src/ogg_header.c:140
 #, c-format
 msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
-msgstr ""
+msgstr "Ogg Vorbis: Érvénytelen adatfolyam fejléc (fájl '%s')."
 
 #: src/ogg_header.c:143
 #, c-format
@@ -3260,250 +3210,258 @@ msgid ""
 "Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack corruption "
 "(file: '%s')."
 msgstr ""
+"Ogg Vorbis: Belső logikai hiba, ez mutatja a verem hibáját. (fájl: '%s')."
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
-msgstr "HIBA: '%s' (%s) f�jl vorbisk�nt val� megnyit�sakor."
+msgstr "HIBA: '%s' (%s) fájl vorbisként való megnyitásakor."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
-msgstr "Figyelem: Az Ogg Vorbis f�jl '%s' ID3v2 c�mk�t tartalmaz."
+msgstr "Figyelem: Az Ogg Vorbis fájl '%s' ID3v2 címkét tartalmaz."
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
-msgstr "K�p hozz�ad�sa"
+msgstr "Kép hozzáadása"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
-msgstr "Minden f�jl"
+msgstr "Minden fájl"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
-msgstr "PNG �s JPEG"
+msgstr "PNG és JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
-msgstr "K�p jellemz�i %d/%d"
+msgstr "Kép jellemzői %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
-msgstr "K�p t�pusa"
+msgstr "Kép típusa"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
-msgstr "K�pek le�r�sa:"
+msgstr "Képek leírása:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
-msgstr "K�p ment�se %d/%d"
+msgstr "Kép mentése %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
 "'%s'\n"
 "Do you want to overwrite?"
 msgstr ""
-"A k�vetkez� f�jl m�r l�tezik:\n"
+"A következő fájl már létezik:\n"
 "'%s'\n"
-"Fel�l�rja?"
+"Felülírja?"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
-msgstr "F�jl ment�se..."
+msgstr "Fájl mentése..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "JPEG"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "PNG"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
-msgstr "Ismeretlen form�tum"
+msgstr "Ismeretlen formátum"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32 pixeles PNG ikon"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
-msgstr "Egy�b ikon"
+msgstr "Egyéb ikon"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
-msgstr "Els� bor�t�"
+msgstr "Első borító"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
-msgstr "H�ts� bor�t�"
+msgstr "Hátsó borító"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
-msgstr "Bels� lap"
+msgstr "Belső lap"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
-msgstr "CD korong f�nyk�p"
+msgstr "CD korong fénykép"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
-msgstr "Sorsz�m - el�ad�"
+msgstr "Sorszám - előadó"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
-msgstr "Szerz� - el�ad�"
+msgstr "Szerző - előadó"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "Karmester"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "Banda - Zenekar"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
-msgstr "Dalsz�veg - sz�veg�r�"
+msgstr "Dalszöveg - szövegíró"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
-msgstr "Felv�tel helysz�ne"
+msgstr "Felvétel helyszíne"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
-msgstr "Felv�tel k�zben"
+msgstr "Felvétel közben"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
-msgstr "El�ad�s k�zben"
+msgstr "Előadás közben"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
-msgstr "Film - Video felv�tel"
+msgstr "Film - Video felvétel"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
-msgstr "Egy f�nyes sz�nes hal"
+msgstr "Egy fényes színes hal"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
-msgstr "Illusztr�ci�"
+msgstr "Illusztráció"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
-msgstr "Banda - El�ad� log�ja"
+msgstr "Banda - Előadó logója"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
-msgstr "Kiad� - st�di� log�ja"
+msgstr "Kiadó - stúdió logója"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
-msgstr "Ismeretlen k�p t�pus"
+msgstr "Ismeretlen kép típus"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
-msgstr "k�ppont"
+msgstr "képpont"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
-msgstr "T�pus"
+msgstr "Típus"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
-msgstr "Le�r�s"
+msgstr "Leírás"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 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."
+"A kép megjelenítése nem lehetséges mert túl kevés adat áll rendelkezésre."
 
-#: src/picture.c:987
+#: src/picture.c:1018
 msgid "Loading Picture File..."
-msgstr "K�p bet�lt�se..."
+msgstr "Kép betöltése..."
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
 "'%s'!\n"
 "(%s)"
 msgstr ""
-"'%s' (%s) f�jl megnyit�sa sikertelen!\n"
+"'%s' (%s) fájl megnyitása sikertelen!\n"
 " "
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
-msgstr "K�p bet�lt�se sikertelen..."
+msgstr "Kép betöltése sikertelen..."
 
 #. Title
 #: src/prefs.c:118
 msgid "Preferences..."
-msgstr "Tulajdons�gok..."
+msgstr "Tulajdonságok..."
 
 #. File Browser frame
 #: src/prefs.c:156
 msgid "File Browser"
-msgstr "F�jlb�ng�sz� be�ll�t�sok"
+msgstr "Fájlböngésző beállítások"
 
-# Ikon megjegyz�s
+# Ikon megjegyzés
 #. Label
 #: src/prefs.c:167
-#, fuzzy
 msgid "Default directory :"
-msgstr "Ugr�s az alap�rtelmezett k�nyvt�rra"
+msgstr "Alapértelmezett könyvtár: "
 
 #: src/prefs.c:179
 msgid ""
 "Specify the directory where your files are located. This path will be loaded "
 "when EasyTAG starts without parameter."
 msgstr ""
-"Itt adhatja meg az alap�rtelmezett k�nyvt�rat. Minden ind�t�skor erre a "
-"k�nyvt�rra pozici�n�l�dik a kurzor, ha param�ter n�lk�l ind�tja az EasyTAG-"
+"Itt adhatja meg az alapértelmezett könyvtárat. Minden indításkor erre a "
+"könyvtárra poziciónálódik a kurzor, ha paraméter nélkül indítja az EasyTAG-"
 "et."
 
 #. Load directory on startup
 #: src/prefs.c:200
 msgid ""
 "Load on startup the default directory or the directory passed as argument"
-msgstr ""
+msgstr "Az alapértelmezett könyvtárban lévő fájlok betöltése"
 
 #: 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 ""
-"F�jlok bet�lt�se amikor az EasyTAG a megadott k�nyvt�rba l�p.\n"
-"Ez fel�lb�r�lhat� az indul�skor megadott param�terrel. (easytag /el�r�si_�t/"
-"mp3_f�jl)."
+"Fájlok betöltése, amikor a program a megadott könyvtárba lép.\n"
+"Ez felülbírálható az induláskor megadott paraméterrel.\n"
+"(Pld.: easytag /útvonal/mp3_fájlok)."
 
 #. Browse subdirectories
 #: src/prefs.c:208
 msgid "Search subdirectories"
-msgstr "Alk�nyvt�rak tartalm�nak bet�lt�se"
+msgstr "Alkönyvtárak tartalmának betöltése"
 
 # bubble help
 #: src/prefs.c:211
 msgid "Search subdirectories for files when reading a directory into the tree."
-msgstr "Alk�nyvt�rak tartalm�nak bet�lt�se"
+msgstr "Alkönyvtárak tartalmának betöltése"
 
 #. Open the node to show subdirectories
 #: src/prefs.c:215
-#, fuzzy
 msgid "Show subdirectories when selecting a directory"
-msgstr "Alk�nyvt�rak megjelen�t�se a f�k�nyvt�r bet�lt�sekor"
+msgstr "Alkönyvtárak megjelenítése a szülőkönyvtár betöltésekor"
 
 # not necessary (hungarian)
 # bubble help
@@ -3511,27 +3469,27 @@ msgstr "Alk�nyvt�rak megjelen�t�se a f�k�nyvt�r bet�lt�sekor"
 msgid ""
 "This expands the selected node into the file browser to display the sub-"
 "directories."
-msgstr "Alk�nyvt�rak megjelen�t�se a f�k�nyvt�r bet�lt�sekor"
+msgstr "Alkönyvtárak megjelenítése a szülőkönyvtár betöltésekor"
 
 #. Browse hidden directories
 #: src/prefs.c:223
 msgid "Search hidden directories"
-msgstr "Rejtett k�nyvt�rak tartalm�nak bet�lt�se"
+msgstr "Rejtett könyvtárak tartalmának betöltése"
 
 # bubble help
 #: src/prefs.c:228
 msgid "Search hidden directories for files (directories starting by a '.')."
-msgstr "Rejtett k�nyvt�rak tartalm�nak bet�lt�se"
+msgstr "Rejtett könyvtárak tartalmának betöltése"
 
 #. User interface
 #: src/prefs.c:247
 msgid "User Interface"
-msgstr "Felhaszn�l�i fel�let"
+msgstr "Felhasználói felület"
 
 #. Show header infos
 #: src/prefs.c:254
 msgid "Show header informations of file"
-msgstr "A f�jl bels� inform�ci�inak mutat�sa"
+msgstr "A fájl belső információinak mutatása"
 
 # bubble help
 #: src/prefs.c:257
@@ -3539,196 +3497,192 @@ msgid ""
 "If activated, informations about the file as the bitrate, the time, the "
 "size, will be displayed under the filename entry."
 msgstr ""
-"Inform�ci�kat mutat a f�jlr�l, mint p�ld�ul a bit�rt�k, a sz�m hossza, a "
-"m�ret."
+"Információkat mutat a fájlról, mint például a bitérték, a szám hossza, a "
+"méret."
 
 #: src/prefs.c:264
 msgid "Display changed files in list using :"
-msgstr "M�dos�tott f�jl megjelen�t�se:"
+msgstr "Módosított fájl megjelenítése:"
 
 #: src/prefs.c:267
 msgid "Red color"
-msgstr "V�kony piros bet�kkel"
+msgstr "Vékony piros betűkkel"
 
 #: src/prefs.c:273
 msgid "Bold style"
-msgstr "Vastag fekete bet�kkel"
+msgstr "Vastag fekete betűkkel"
 
 #. Sorting List Options
 #: src/prefs.c:279
 msgid "Sorting List Options"
-msgstr "F�jllista rendez�si szempontok"
+msgstr "Fájllista rendezési szempontok"
 
 #. Sorting method
 #: src/prefs.c:289
 msgid "Sort the file list by :"
-msgstr "F�jllista rendez�se:"
+msgstr "Fájllista rendezése:"
 
 #. Two columns
 #. Items of option menu
 #: src/prefs.c:300
 msgid "Ascending file name"
-msgstr "F�jln�v szerint n�vekv�en"
+msgstr "Fájlnév szerint növekvően"
 
 #: src/prefs.c:301
 msgid "Descending file name"
-msgstr "F�jln�v szerint cs�kken�en"
+msgstr "Fájlnév szerint csökkenően"
 
 #: src/prefs.c:302
 msgid "Ascending track number"
-msgstr "Sorsz�m szerint n�vekv�en"
+msgstr "Sorszám szerint növekvően"
 
 #: src/prefs.c:303
 msgid "Descending track number"
-msgstr "Sorsz�m szerint cs�kken�en"
+msgstr "Sorszám szerint csökkenően"
 
 #: src/prefs.c:304
 msgid "Ascending creation date"
-msgstr "L�trehoz�s id�pontja szerint n�vekv�en"
+msgstr "Létrehozás időpontja szerint növekvően"
 
 #: src/prefs.c:305
 msgid "Descending creation date"
-msgstr "L�trehoz�s id�pontja szerint cs�kken�en"
+msgstr "Létrehozás időpontja szerint csökkenően"
 
 #: src/prefs.c:306
 msgid "Ascending title"
-msgstr "C�m szerint n�vekv�en"
+msgstr "Cím szerint növekvően"
 
 #: src/prefs.c:307
 msgid "Descending title"
-msgstr "C�m szerint cs�kken�en"
+msgstr "Cím szerint csökkenően"
 
 #: src/prefs.c:308
 msgid "Ascending artist"
-msgstr "El�ad� szerint n�vekv�en"
+msgstr "Előadó szerint növekvően"
 
 #: src/prefs.c:309
 msgid "Descending artist"
-msgstr "El�ad� szerint cs�kken�en"
+msgstr "Előadó szerint csökkenően"
 
 #: src/prefs.c:310
 msgid "Ascending album"
-msgstr "Album szerint n�vekv�en"
+msgstr "Album szerint növekvően"
 
 #: src/prefs.c:311
 msgid "Descending album"
-msgstr "Album szerint cs�kken�en"
+msgstr "Album szerint csökkenően"
 
 #: src/prefs.c:312
 msgid "Ascending year"
-msgstr "�v szerint n�vekv�en"
+msgstr "Év szerint növekvően"
 
 #: src/prefs.c:313
 msgid "Descending year"
-msgstr "�v szerint cs�kken�en"
+msgstr "Év szerint csökkenően"
 
 #: src/prefs.c:314
 msgid "Ascending genre"
-msgstr "M�faj szerint n�vekv�en"
+msgstr "Műfaj szerint növekvően"
 
 #: src/prefs.c:315
 msgid "Descending genre"
-msgstr "M�faj szerint cs�kken�en"
+msgstr "Műfaj szerint csökkenően"
 
 #: src/prefs.c:316
 msgid "Ascending comment"
-msgstr "Megjegyz�s szerint n�vekv�en"
+msgstr "Megjegyzés szerint növekvően"
 
 #: src/prefs.c:317
 msgid "Descending comment"
-msgstr "Megjegyz�s szerint cs�kken�en"
+msgstr "Megjegyzés szerint csökkenően"
 
 # bubble help
 #: src/prefs.c:320
 msgid "Select the type of file sorting when loading a directory."
-msgstr "A f�jlrendez�s szempontja �j k�nyvt�r bet�lt�sekor."
+msgstr "A fájlrendezés szempontja új könyvtár betöltésekor."
 
 # bubble help
 #: src/prefs.c:329
 msgid "If activated, the sorting of the list will be dependent on the case."
-msgstr "kis �s NAGYBET�K megk�l�nb�ztet�se"
+msgstr "kis és NAGYBETŰK megkülönböztetése"
 
 #. Message Dialog Position
 #: src/prefs.c:333
 msgid "Message Dialog Position"
-msgstr "�zenetablak elhelyezked�se"
+msgstr "Feldolgozó ablak elhelyezkedése"
 
 #: src/prefs.c:341
 msgid "No particular position"
-msgstr "Nincs meghat�rozott poz�ci�"
+msgstr "Nincs meghatározott pozíció"
 
 # bubble help
 #: src/prefs.c:345
 msgid "Let the Window Manager to place the windows."
-msgstr "Az ablakokat az ablakkezel� helyezi el."
+msgstr "A feldolgozó ablakot az ablakkezelő helyezi el."
 
 #: src/prefs.c:350
 msgid "Center of the main window"
-msgstr "A f�ablak k�zep�n"
+msgstr "A főablak közepén"
 
 # bubble help
 #: src/prefs.c:354
 msgid "Windows should be placed in the center of the main window."
-msgstr "Az ablakok a f�ablak k�zep�n jelennek meg."
+msgstr "A feldolgozó ablak a főablak közepén jelenik meg."
 
 #: src/prefs.c:359
 msgid "Center of the screen"
-msgstr "A k�perny� k�zep�n"
+msgstr "A képernyő közepén"
 
 # bubble help
 #: src/prefs.c:363
 msgid "Windows should be placed in the center of the screen."
-msgstr "Az ablakok a k�perny� k�zep�n jelennek meg."
+msgstr "A feldolgozó ablak a képernyő közepén jelenik meg."
 
 #: src/prefs.c:368
 msgid "Mouse position"
-msgstr "Eg�rmutat� poz�ci�j�ban"
+msgstr "Egérmutató pozíciójában"
 
 # bubble help
 #: src/prefs.c:372
 msgid "Windows should be placed at the current mouse position."
-msgstr "Az �zenetek az aktu�lis eg�rpoz�ci�ban jelennek meg."
+msgstr "Az üzenetek az aktuális egérpozícióban jelennek meg."
 
 #. File Player
 #: src/prefs.c:376
 msgid "File Audio Player"
-msgstr "Zene lej�tsz�"
+msgstr "Zene lejátszó"
 
 #: src/prefs.c:388
 msgid "Player to run :"
-msgstr "Futtatand� lej�tsz�:"
+msgstr "Futtatandó lejátszó:"
 
 # bubble help
 #: 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 "Alap�rtelmezett param�terezhet� zenelej�tsz� program. (pl. 'xmms -p') "
+msgstr "Alapértelmezett paraméterezhető zenelejátszó program. (pl. 'xmms -p') "
 
 #. Log options
 #: src/prefs.c:411
-#, fuzzy
 msgid "Log Options"
-msgstr "  "
+msgstr "Információs felület"
 
 #. Show / hide log view
 #: src/prefs.c:418
-#, fuzzy
 msgid "Show log view in main window"
-msgstr "A f�ablak k�zep�n"
+msgstr "Információk mutatása a főablak aljá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)"
+"Ha aktíválja, az információs felületet, az a főablak alján lesz látható."
 
 #: src/prefs.c:428
 msgid "Max number of lines :"
-msgstr ""
+msgstr "Sorok max. száma:"
 
-# Men�sor
+# 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 "
@@ -3740,7 +3694,7 @@ msgstr ""
 #.
 #: src/prefs.c:447 src/prefs.c:448
 msgid "File Settings"
-msgstr "F�jln�v be�ll�t�sok"
+msgstr "Fájlnév beállítások"
 
 #. File (name) Options
 #: src/prefs.c:458
@@ -3750,7 +3704,7 @@ msgstr "  "
 #: 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)"
+"Szabálytalan karakterek cseréje a fájlnevekben (Windows és CD-ROM számára)"
 
 # bubble help
 #: src/prefs.c:467
@@ -3760,60 +3714,60 @@ msgid ""
 "problem when renaming the file. This is usefull when renaming the file from "
 "the tag with the scanner."
 msgstr ""
-"A szab�lytalan karakterek cser�je FAT32/16 �s ISO9660 + Joliet "
-"f�jlrendszerek sz�m�ra, ('\\', ':', '*', '?', '\"', '<', '>', '|') az "
-"�tnevez�skor felmer�l� probl�m�k megel�z�s�re. Hasznos, ha a c�mkemez�ket "
-"haszn�lva nevezz�k �t a f�jlokat a feldolgoz�val."
+"A szabálytalan karakterek cseréje FAT32/16 és ISO9660 + Joliet "
+"fájlrendszerek számára, ('\\', ':', '*', '?', '\"', '<', '>', '|') az "
+"átnevezéskor felmerülő problémák megelőzésére. Hasznos, ha a címkemezőket "
+"használva nevezzük át a fájlokat a feldolgozóval."
 
 #. Extension case (lower/upper?)
 #: src/prefs.c:476
 msgid "Convert filename extension to :"
-msgstr "F�jln�v kiterjeszt�s �talak�t�sa:"
+msgstr "Fájlnév kiterjesztés átalakítása:"
 
 #: src/prefs.c:479
 msgid "Lower Case"
-msgstr "kisbet�sre"
+msgstr "kisbetűsre"
 
 # bubble help
 #: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
-msgstr "P�ld�ul: f�jln�v.mp3"
+msgstr "Például: fájlnév.mp3"
 
 #: src/prefs.c:485
 msgid "Upper Case"
-msgstr "NAGYBET�SRE"
+msgstr "NAGYBETŰSRE"
 
 # bubble help
 #: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
-msgstr "P�ld�ul: f�jln�v.MP3"
+msgstr "Például: fájlnév.MP3"
 
 #: src/prefs.c:491
 msgid "No Change"
-msgstr "Nincs v�ltoztat�s"
+msgstr "Nincs változtatás"
 
 # bubble help
 #: src/prefs.c:494
 msgid "The extension will not be converted"
-msgstr "A kiterjeszt�s nem v�ltozik"
+msgstr "A kiterjesztés nem változik"
 
 #. Preserve modification time
 #: src/prefs.c:497
 msgid "Preserve modification time of the file"
-msgstr "A f�jl eredeti d�tum�nak v�delme"
+msgstr "A fájl eredeti dátumának védelme"
 
 # bubble help
 #: 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."
+msgstr "A fájl eredeti dátuma nem változik mentéskor."
 
 #. Change directory modification time
 #: src/prefs.c:504
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
-msgstr ""
+msgstr "A fájldátumok frissítése. (Ajánlott ha az Amarok-ot használja)"
 
 #: src/prefs.c:508
 msgid ""
@@ -3824,13 +3778,17 @@ msgid ""
 "performance reasons, they refresh file informations by detecting changes of "
 "the parent directory."
 msgstr ""
+"Amennyiben ezt az opciót választja, a fájldátumok felülíódnak a címke "
+"írásakor, módosításakor. \n"
+"Az Amarok induláskor frissíti a saját adatbázisát és ezáltal a helyes már "
+"kitöltött címkéket tudja mutatni,"
 
 #. Character Set for File Name
 #: 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."
+"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:532
@@ -3841,7 +3799,7 @@ msgstr "  "
 
 #: src/prefs.c:540
 msgid "Try an other character encoding"
-msgstr "Pr�b�lja meg m�sik karakter k�dol�ssal"
+msgstr "Próbálja meg másik karakter kódolással"
 
 #: src/prefs.c:544
 msgid ""
@@ -3849,46 +3807,46 @@ msgid ""
 "your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
 "for 'ro'). If it fails, it will try the character encoding ISO-8859-1."
 msgstr ""
-"Ha ezt az opci�t v�lasztja, megpr�b�lja a k�dol�st az �n helyi "
-"be�ll�t�sainak megfelel�en �sszekapcsolni a nyelvi be�ll�t�ssal\n"
-"(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."
+"Ha ezt az opciót választja, megpróbálja a kódolást az ön helyi "
+"beállításainak megfelelően összekapcsolni a nyelvi beállítással\n"
+"(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: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"
+msgstr "A rendszerkódolás használata, és a nem megfelelő karakterek átírása"
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 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 ""
-"Ezzel az opci�val el�rheti, hogy amennyiben a karakterk�szletben nem "
-"tal�lhat� meg az adott karakter, akkor 1 vagy t�bb hasonl� form�j� karaktert "
-"pr�b�l beilleszteni helyette."
+"Ezzel az opcióval elérheti, hogy amennyiben a karakterkészletben nem "
+"található meg az adott karakter, akkor 1 vagy több hasonló formájú karaktert "
+"próbál beilleszteni helyette."
 
 #: 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"
+msgstr "A rendszerkódolás használata, és a nem megfelelő karakterek eldobása"
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
 msgstr ""
-"Ezzel az opci�val eldobja azokat a karaktereket, amelyek nem szerepelnek az "
-"adott karakterk�szletben."
+"Ezzel az opcióval eldobja azokat a karaktereket, amelyek nem szerepelnek az "
+"adott karakterkészletben."
 
 #.
 #. * Tag Settings
 #.
 #: src/prefs.c:572 src/prefs.c:573
 msgid "Tag Settings"
-msgstr "C�mke be�ll�t�sok"
+msgstr "Címke beállítások"
 
 #. Tag Options
 #: src/prefs.c:582
@@ -3897,7 +3855,7 @@ msgstr "  "
 
 #: src/prefs.c:588
 msgid "Auto completion of date if not complete"
-msgstr "�v automatikus kieg�sz�t�se, ha hi�nyos"
+msgstr "Év automatikus kiegészítése, ha hiányos"
 
 # bubble help
 #: src/prefs.c:591
@@ -3906,12 +3864,12 @@ msgid ""
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
 "1996, 95 => 1995, ...)."
 msgstr ""
-"Megpr�b�lja kieg�sz�teni az �v mez�t, ha csak egyjegy� sz�m �ll "
-"rendelkez�sre."
+"Megpróbálja kiegészíteni az év mezöt, ha csak egyjegyű szám áll "
+"rendelkezésre."
 
 #: 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)"
+msgstr "A sorszám mezőt kitöltő számok formátuma (1, 01, 001)"
 
 # bubble help
 #: src/prefs.c:601
@@ -3920,12 +3878,12 @@ msgid ""
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
 "'10',...). Else it keeps the 'raw' track value."
 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."
+"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: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"
+msgstr "Ogg Vorbis fájlok esetén XMMS formátumba is írjon megjegyzést"
 
 # bubble help
 #: src/prefs.c:619
@@ -3936,26 +3894,26 @@ msgid ""
 "don't want other apps to complain about an unknown field. Comments won't be "
 "shown in XMMS, though."
 msgstr ""
-"Az XMMS helytelen�l ismeri fel a megjegyz�seket az Ogg Vorbis f�jlokban m�s "
-"programokkal ellent�tben.\n"
-"T�ny, hogy �ltal�ban ez a mez� 'comment=' c�mkek�nt van jel�lve, m�g az XMMS "
-"csak '='-t haszn�l. Kapcsolja ki ezt a param�tert ha nem szeretn�, hogy m�s "
-"programok ne panaszkodjanak egy ismeretlen mez� miatt. A megjegyz�sek nem "
-"fognak l�tszani az XMMS-ben."
+"Az XMMS - más programokkal ellentétben - helytelenül ismeri fel a "
+"megjegyzéseketaz Ogg Vorbis fájlokban.\n"
+"Tény, hogy általában ez a mező 'comment=' címkeként van jelölve, míg az XMMS "
+"csak '='-t használ. Kapcsolja ki ezt a paramétert ha nem szeretné, hogy más "
+"programok ne panaszkodjanak egy ismeretlen mező miatt.A megjegyzések nem "
+"fognak látszani az XMMS-ben."
 
 #: 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:"
+msgstr "Címkemezők feldolgozása esetén a Page Up/Page Down gombok viselkedése:"
 
 #: src/prefs.c:643
 msgid "Keep focus to the same tag field"
-msgstr "A f�kuszt ugyanazon a mez�n tartja"
+msgstr "A fókuszt ugyanazon a mezőn tartja"
 
 #: 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."
+msgstr "A fókusz mindig a (Mű címe)-re ugrik."
 
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(SetFocusToFirstTagField),SET_FOCUS_TO_FIRST_TAG_FIELD);
 #.
@@ -3963,7 +3921,7 @@ msgstr "A f�kusz mindig a (M� c�me)-re ugrik."
 #.
 #: src/prefs.c:657 src/prefs.c:658
 msgid "ID3 Tag Settings"
-msgstr "ID3 c�mke be�ll�t�sok"
+msgstr "ID3 címke beállítások"
 
 #. Tag Rules frame
 #: src/prefs.c:670
@@ -3972,9 +3930,8 @@ msgstr "  "
 
 #. Write ID3 tags in FLAC files
 #: 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"
+msgstr "ID3 címke írása FLAC fájlba FLAC címkével"
 
 # bubble help
 #: src/prefs.c:685
@@ -3982,13 +3939,13 @@ 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 ""
-"Ha ezt az opci�t v�lasztja, az ID3 c�mk�k a FLAC f�jlokhoz is hozz�ad�dnak. "
-"Ellenkez� esetben a c�mkemez�k tartalma t�rl�dik."
+"Ha ezt az opciót választja, az ID3 címkék a FLAC fájlokhoz is hozzáadódnak. "
+"Ellenkező esetben a címkemezők tartalma törlődik."
 
 #. Strip tag when fields (managed by EasyTAG) are empty
 #: 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"
+msgstr "Címke tartalmának törlése ha minden mező üresre van állítva"
 
 # bubble help
 #: src/prefs.c:693
@@ -3998,75 +3955,70 @@ msgid ""
 "you to strip the whole tag when these seven standard data fields have been "
 "set to blank."
 msgstr ""
-"Az ID3v2 c�mke tartalmazhat m�s adatokat is az\n"
-" EasyTag-gal haszn�lhat� mez�k�n k�v�l, mint p�ld�ul egy csatolt k�pet, "
-"dalsz�veget. Ez a param�ter kit�rli a teljes c�mk�t, ha az alap c�mkemez�k "
-"�resre vannak �ll�tva."
+"Az ID3v2 címke tartalmazhat más adatokat is az\n"
+" EasyTag-gal használható mezőkön kívül, mint például egy csatolt képet, "
+"dalszöveget. Ez a paraméter kitörli a teljes címkét, ha az alap címkemezők "
+"üresre vannak állítva."
 
 #. Convert old ID3v2 tag version
 #: src/prefs.c:699
 msgid "Automatically convert old ID3v2 tag versions"
-msgstr "Automatikus konvert�l�s a r�gi ID3v2 c�mk�b�l"
+msgstr "Automatikus konvertálás a régi ID3v2 címkéből"
 
 # bubble help
 #: 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."
+msgstr "Automatikus konvertálás a régi ID3v2 címkéből az új ID3v2.3-verzióra."
 
 #. Use CRC32
 #: src/prefs.c:706
 msgid "Use CRC32"
-msgstr ""
+msgstr "CRC32 használata"
 
 #: src/prefs.c:709
-#, fuzzy
 msgid "Set CRC32 in the ID3v2 tags"
-msgstr "ID3v2.x c�mke �r�sa"
+msgstr "CRC32 beállítása az ID3v2 címkénél"
 
 #. Use Compression
 #: src/prefs.c:712
 msgid "Use Compression"
-msgstr ""
+msgstr "Tömörítés"
 
 #: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
-msgstr ""
+msgstr "ID3v2 címke tömörítésének beállítása"
 
 #. Character Set for writing ID3 tag
 #: src/prefs.c:718
-#, fuzzy
 msgid "Character Set for writing ID3 tags"
-msgstr "Karakterk�szlet az ID3 c�mk�khez"
+msgstr "Karakterkészlet az ID3 címkék ÍRÁSÁHOZ"
 
 #. ID3v2 tags
 #: src/prefs.c:725
-#, fuzzy
 msgid "ID3v2 tags"
-msgstr "ID3v2.x c�mke �r�sa"
+msgstr "ID3v2.x címkék"
 
 #. Write ID3v2 tag
 #: src/prefs.c:738
 msgid "Write ID3v2 tag"
-msgstr "ID3v2.x c�mke �r�sa"
+msgstr "ID3v2.x címke írása"
 
 # bubble help
 #: src/prefs.c:741
-#, fuzzy
 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 ""
-"Ha ezt az opci�t v�lasztja, az mp3 f�jl ELEJ�N tal�lhat� ID3v2 c�mke ker�l "
-"bejegyz�sre, fel�l�r�sra.\n"
-"Ellenkez� esetben a c�mkemez�k tartalma t�rl�dik."
+"Ha ezt az opciót választja, az mp3 fájl ELEJÉN található ID3v2.4 címke kerül "
+"bejegyzésre, felülírásra.\n"
+"Ellenkező esetben a címkemezők tartalma törlődik."
 
 #. ID3v2 tag version
 #: src/prefs.c:748
-#, fuzzy
 msgid "Version:"
-msgstr "Le�r�s:"
+msgstr "Verzió:"
 
 #: src/prefs.c:755
 msgid ""
@@ -4074,89 +4026,98 @@ msgid ""
 " - ID3v2.3 is written using id3lib,\n"
 " - ID3v2.4 is written using libid3tag (recommended)."
 msgstr ""
+"Az ID3v2.x címke kiválasztása ÍRÁSHOZ:\n"
+" - ID3v2.3 címke id3lib használatával\n"
+" - ID3v2.4 címke libid3tag használatával (ajánlott)"
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
-msgstr ""
+msgstr "Kódolás:"
 
 # src/trans.h:267
 #. Unicode
 #: src/prefs.c:777
-#, fuzzy
 msgid "Unicode "
-msgstr "Unicode (UTF-8)"
+msgstr "Unicode"
 
 #: src/prefs.c:785
-#, fuzzy
 msgid "Unicode type to use"
-msgstr "K�dol�"
+msgstr "Unicode típus"
 
 # bubble help
 #: 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."
+"A címkeadatok ÍRÁSÁRA használt karakterkészlet a felhasználói felületen."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
-msgstr ""
+msgstr "További beállítások az iconv() segítségével:"
 
-#: src/prefs.c:822 src/prefs.c:888
-#, fuzzy
+#: src/prefs.c:823 src/prefs.c:892
 msgid "No"
-msgstr " Nem "
+msgstr "Nem"
 
-#: src/prefs.c:827 src/prefs.c:893
-msgid "//TRANSLIT"
+#: src/prefs.c:826 src/prefs.c:895
+#, fuzzy
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
 msgstr ""
+"Ezzel az opcióval elérheti, hogy amennyiben a karakterkészletben nem "
+"található meg az adott karakter, akkor 1 vagy több hasonló formájú karaktert "
+"próbál beilleszteni helyette."
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:831 src/prefs.c:900
+msgid "//TRANSLIT"
+msgstr "//ÁTÍR"
+
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
-msgstr ""
+msgstr "//KIHAGY"
 
 #. ID3v1 tags
-#: src/prefs.c:844
-#, fuzzy
+#: src/prefs.c:848
 msgid "ID3v1 tags"
-msgstr "ID3 c�mk�k"
+msgstr "ID3v1 címkék"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
-msgstr "ID3v1.x c�mke �r�sa"
+msgstr "ID3v1.x címke írása"
 
 # bubble help
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
 msgstr ""
-"Ha ezt az opci�t v�lasztja, az mp3 f�jl V�G�N tal�lhat� ID3v1 c�mke ker�l "
-"bejegyz�sre, fel�l�r�sra.\n"
-"Ellenkez� esetben a c�mkemez�k tartalma t�rl�dik."
+"Ha ezt az opciót választja, az mp3 fájl VÉGÉN található ID3v1 címke kerül "
+"bejegyzésre, felülírásra.\n"
+"Ellenkező esetben a címkemezők tartalma törlődik."
 
 # bubble help
-#: src/prefs.c:878
-#, fuzzy
+#: src/prefs.c:882
 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."
+"A címkeadatok ÍRÁSÁRA használt karakterkészlet a felhasználói felületen."
 
 #. Character Set for reading tag
-#: src/prefs.c:910
-#, fuzzy
+#: src/prefs.c:917
 msgid "Character Set for reading ID3 tags"
-msgstr "Karakterk�szlet az ID3 c�mk�khez"
+msgstr "Karakterkészlet az ID3 címkék OLVASÁSÁHOZ"
 
-#: src/prefs.c:924
+# Jerome - this is not standard?
+#: src/prefs.c:931
 msgid "Non-standart:"
-msgstr ""
+msgstr "Nem szabvány:"
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -4171,892 +4132,893 @@ msgid ""
 "  - 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 "Ez a karakterk�dol�s haszn�lata a c�mke olvas�s�hoz"
+msgstr "Ezen karakterkódolás használata a címke olvasásához"
 
 # bubble help
-#: src/prefs.c:947
+#: src/prefs.c:954
 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."
+"A címkeadatok OLVASÁSÁRA használt karakterkészlet a felhasználói felületen."
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
-msgstr "Feldolgoz�"
+msgstr "Feldolgozó"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
-msgstr "C�mkemez�k kit�lt�se - Karakterkonverzi�"
+msgstr "Címkemezők kitöltése - Karakterkonverzió"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
-msgstr "Als�von�s �s '%20' sztring sz�k�zz� alak�t�sa"
+msgstr "Alsóvonás és '%20' sztring szóközzé alakítása"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
-msgstr "Sz�k�z als�von�ss� alak�t�sa"
+msgstr "Szóköz alsóvonássá alakítása"
 
 # bubble help
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 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."
+msgstr "A megadott konvertálás automatikusan végrehajtódik."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
-msgstr "�tnevez�s - Karakterkonverzi�"
+msgstr "Átnevezés - Karakterkonverzió"
 
 # bubble help
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 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."
+msgstr "A megadott konvertálás automatikusan végrehajtódik."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 msgid "Process Fields Scanner - Character Conversion"
-msgstr "Feldolgoz� - Karakterkonverzi�"
+msgstr "Feldolgozó - Karakterkonverzió"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1034
+#: src/prefs.c:1041
 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."
+msgstr "Ne kezdje nagybetűvel a cikkek és az előtagok első szavát."
 
 # bubble help
-#: src/prefs.c:1038
+#: src/prefs.c:1045
 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 ""
-"Ne konvert�lja a cikkek, el�tagok �s hasonl�k els� bet�j�t nagybet�re, ha a "
-"feldolgoz� 'Minden sz� els� bet�je legyen nagybet�' opci�ja be van kapcsolva."
+"Ne konvertálja a cikkek, előtagok és hasonlók első betűjét nagybetűre, ha a "
+"feldolgozó 'Minden szó első betűje legyen nagybetű' opciója be van kapcsolva."
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
-msgstr "Feldolgoz�ablak"
+msgstr "Feldolgozóablak"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
-msgstr "Feldolgoz�ablak megnyit�sa ind�t�skor"
+msgstr "Feldolgozóablak megnyitása indításkor"
 
 # bubble help
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
-msgstr "Feldolgoz�ablak megnyit�sa ind�t�skor"
+msgstr "Feldolgozóablak megnyitása indításkor"
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
-msgstr "Feldolgoz�ablak mindig fel�l"
+msgstr "Feldolgozóablak mindig felül"
 
 # bubble help
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
-msgstr "Feldolgoz�ablak mindig fel�l"
+msgstr "Feldolgozóablak mindig felül"
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
-msgstr "Mez�k"
+msgstr "Mezők"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
-msgstr "Mez�k fel�l�r�sa a c�mk�k feldolgoz�sakor"
+msgstr "Mezők felülírása a címkék feldolgozásakor"
 
 # bubble help
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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 ""
-"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."
+"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:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
-msgstr "Ez a sz�veg az alap�rtelmezett 'megjegyz�s':"
+msgstr "Ez a szöveg az alapértelmezett 'megjegyzés':"
 
 # bubble help
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
 msgstr ""
-"Ha ezt az opci�t v�lasztja, akkor alap�rtelmezetten kit�lt�dik a "
-"'megjegyz�s' mez� a megadott sz�veggel."
+"Ha ezt az opciót választja, akkor alapértelmezetten kitöltődik a "
+"'megjegyzés' mező a megadott szöveggel."
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 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 "
+msgstr "CRC32 ellenőrző kód írása alapértelmezett 'megjegyzés'-ként "
 
-#: src/prefs.c:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
 msgstr ""
-"Ha ezt az opci�t v�lasztja, akkor alap�rtelmezetten kit�lt�dik a "
-"'megjegyz�s' mez� a CRC-32 ellen�rz� �sszeggel."
+"Ha ezt az opciót választja, akkor alapértelmezetten kitöltődik a "
+"'megjegyzés' mező a CRC-32 ellenőrző összeggel."
 
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
-msgstr "CD adatb�zis"
+msgstr "CD adatbázis"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 msgid "Server Settings for Automatic Search"
-msgstr "Szerver be�ll�t�sok az Automatikus keres�shez"
+msgstr "Szerver beállítások az Automatikus kereséshez"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
-msgstr "N�v:"
+msgstr "Név:"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "Port:"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
-msgstr "CGI el�r�si �t:"
+msgstr "CGI elérési út:"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 msgid "Server Settings for Manual Search"
-msgstr "Szerver be�ll�t�sok a manu�lis keres�shez"
+msgstr "Szerver beállítások a manuális kereséshez"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
-#, fuzzy
+#: src/prefs.c:1246
 msgid "Local CD Data Base"
-msgstr "CD adatb�zis"
+msgstr "Helyi CD adatbázis"
 
-#: src/prefs.c:1247
-#, fuzzy
+#: src/prefs.c:1254
 msgid "Path :"
-msgstr "CGI el�r�si �t:"
+msgstr "Útvonal:"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 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 ""
+"Speciális könyvtár ahol a helyi adatbázis tárolódik. A helyi adatbázis "
+"könyvtár tartalmazza az adatokat a 'blues', 'classical', 'country', 'data', "
+"'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' and 'misc'.zenei "
+"stílusokról."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
-msgstr "Proxy be�ll�t�s"
+msgstr "Proxy beállítás"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
-msgstr "Proxy haszn�lata"
+msgstr "Proxy használata"
 
 # bubble help
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
-msgstr "Proxy be�ll�t�sok aktiv�l�sa."
+msgstr "Proxy beállítások aktiválása."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
-msgstr "G�pn�v:"
+msgstr "Gépnév:"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "Proxy szerver neve."
 
 # bubble help
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "Proxy szerver portja."
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
-msgstr "Felhaszn�l� neve:"
+msgstr "Felhasználó neve:"
 
 # bubble help
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
-msgstr "A felhaszn�l� neve a proxy szerveren."
+msgstr "A felhasználó neve a proxy szerveren."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
-msgstr "Felhaszn�l� jelszava:"
+msgstr "Felhasználó jelszava:"
 
 # bubble help
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 msgid "Password of user for the the proxy server."
-msgstr "A proxy szerver felhaszn�l�j�nak jelszava."
+msgstr "A proxy szerver felhasználójának jelszava."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
-msgstr "S�v neve"
+msgstr "Sáv neve"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
-"A megfelel� audio f�jl kiv�laszt�sa (poz�ci� szerint vagy DLM haszn�lat�val, "
-"ha az aktiv�lva van)"
+"A megfelelő audio fájl kiválasztása (pozíció szerint vagy DLM használatával, "
+"ha az aktiválva van)"
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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 ""
-"Ha aktiv�lja ezt az opci�t, a f�jln�v sor�nak kiv�laszt�sakor a k�zponti "
-"list�ban is kiv�laszt�sra ker�l a megfelel� f�jl. "
+"Ha aktiválja ezt az opciót, a fájlnév sorának kiválasztásakor a központi "
+"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:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
 msgstr ""
-"A s�vok c�me �s az audio f�jlnevek �sszevet�se (DLM) algoritmus "
-"haszn�lat�val."
+"A sávok címe és az audio fájlnevek összevetése (DLM) algoritmus "
+"használatával."
 
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
-msgstr "Meger�s�t�s"
+msgstr "Megerősítés"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
-msgstr "Programb�l val� kil�p�s meger�s�t�se"
+msgstr "Programból való kilépés megerősítése"
 
 # bubble help
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 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"
+msgstr "Programból való kilépés megerősítése"
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
-msgstr "C�mke �r�s�nak meger�s�t�se"
+msgstr "Címke írásának megerősítése"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
-msgstr "F�jl �tnevez�s�nek meger�s�t�se"
+msgstr "Fájl átnevezésének megerősítése"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
-msgstr "F�jl t�rl�s�nek meger�s�t�se"
+msgstr "Fájl törlésének megerősítése"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
-msgstr "M3u listaf�jl �r�s�nak meger�s�t�se"
+msgstr "M3u listafájl írásának megerősítése"
 
 #. 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
+#: src/prefs.c:1429
 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"
+"Változtatások életbe léptetése (de nem mentése!), majd az ablak bezárása"
 
-#: src/prefs.c:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
-msgstr "Ablak bez�r�sa ment�s n�lk�l"
+msgstr "Ablak bezárása mentés nélkül"
 
 # bubble help
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 msgid "Save changes and close this window"
-msgstr "V�ltoztat�sok ment�se, majd az ablak bez�r�sa"
+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:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
-msgstr "(P�ld�ul : %.*d - f�jln�v.mp3)"
+msgstr "(Például : %.*d - fájlnév.mp3)"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
-msgstr "A v�ltoz�sok �letbe l�ptek"
+msgstr "A változások életbe léptek"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
-msgstr "Be�ll�t�sok elmentve"
+msgstr "Beállítások elmentve"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
-msgstr "A be�ll�t�sok nem v�ltoztak"
+msgstr "A beállítások nem változtak"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
 "'%s'\n"
 "(%s) "
 msgstr ""
-"A megadott alap�rtelmezett k�nyvt�r �l�r�si �tja nem �rv�nyes!\n"
+"A megadott alapértelmezett könyvtár élérési útja nem érvényes!\n"
 "'%s'\n"
 " (%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
-msgstr "Nem k�nyvt�r"
+msgstr "Nem könyvtár"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
-msgstr "A '%s' audio lej�tsz� nem tal�lhat�!"
+msgstr "A '%s' zene lejátszó nem található!"
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
-msgstr "Mez�k kit�lt�se"
+msgstr "Mezők kitöltése"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
-msgstr "�tnevez�s"
+msgstr "Átnevezés"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
-msgstr "Mez�feldolgoz�s"
+msgstr "Mezöfeldolgozás"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
-msgstr "C�mke sikeresen feldolgozva..."
+msgstr "Címke sikeresen feldolgozva..."
 
-#: src/scan.c:355
-#, fuzzy, c-format
+#: src/scan.c:359
+#, c-format
 msgid "Tag successfully scanned...(%s)"
-msgstr "C�mke sikeresen feldolgozva...(%s)"
+msgstr "Címke sikeresen feldolgozva...(%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
+"Címke keresés: meglepő..., a %s kiterjesztés alapján nem találom a %s fájl "
+"nevet!"
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, 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"
+msgstr "Hiba a feldolgozáskor: nem található a '%s' elválasztó '%s'-ben"
 
-#: src/scan.c:663
+#: src/scan.c:667
 #, 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"
+msgstr "A %s fájl átkonvertálása nem lehetséges ebben a rendszerben"
 
-#: src/scan.c:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
-msgstr "�j f�jln�v sikeresen feldolgozva..."
+msgstr "Új fájlnév sikeresen feldolgozva..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
-msgstr "�j f�jln�v sikeresen feldolgozva...(%s)"
+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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
-msgstr "C�mke �s f�jln�v feldolgoz�s"
+msgstr "Címke és fájlnév feldolgozás"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
-msgstr "Feldolgoz�: "
+msgstr "Feldolgozó: "
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
-msgstr "Feldolgoz�t�pus v�laszt�sa"
+msgstr "Feldolgozótípus választása"
 
 # bubble help
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
-msgstr "Feldolgoz� ablak megnyit�sa / Kijel�lt f�jlok feldolgoz�sa"
+msgstr "Feldolgozó ablak megnyitása / Kijelölt fájlok feldolgozása"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
-msgstr "Feldolgoz� be�ll�t�sai"
+msgstr "Feldolgozó beállításai"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
-msgstr "Maszkszerkeszt�t mutat/rejt"
+msgstr "Maszkszerkesztőt mutat/rejt"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
-msgstr "Pusk�t mutat/rejt"
+msgstr "Puskát mutat/rejt"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
-msgstr "Ablak bez�r�sa"
+msgstr "Ablak bezárása"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
 msgstr ""
-"V�lassza ki a megfelel� maszkot, vagy �rjon egy �jat a c�mk�k kit�lt�s�hez."
+"Válassza ki a megfelelő maszkot, vagy írjon egy újat a címkék kitöltéséhez."
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
-msgstr "El�n�zet"
+msgstr "Előnézet"
 
 # bubble help
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
-msgstr "Kit�lt�s a megadott maszkkal"
+msgstr "Kitöltés a megadott maszkkal"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 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 ""
-"V�lassza ki a megfelel� maszkot, vagy �rjon egy �jat a c�mk�k kit�lt�s�hez."
+"Válassza ki a megfelelő maszkot, vagy írjon egy újat a címkék kitöltéséhez."
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
-msgstr "F�jl�tnevez�s el�n�zet..."
+msgstr "Fájlátnevezés előnézet..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
-msgstr "Mez�k kijel�l�se:"
+msgstr "Mezők kijelölése:"
 
 # bubble help
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
 msgstr ""
-"Az itt l�that� gombok k�z�l jel�lje ki azokat melyeket sz�ks�gesnek tart."
+"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:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "F"
 
 # bubble help
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
-msgstr "F�jln�v mez� feldolgoz�sa"
+msgstr "Fájlnév mező feldolgozása"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "T"
 
 # bubble help
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
-msgstr "M� c�me mez� feldolgoz�sa"
+msgstr "Mű címe mező feldolgozása"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "Ar"
 
 # bubble help
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
-msgstr "El�ad� mez� feldolgoz�sa"
+msgstr "Előadó mező feldolgozása"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "Al"
 
 # bubble help
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
-msgstr "Album neve mez� feldolgoz�sa"
+msgstr "Album neve mező feldolgozása"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "G"
 
 # bubble help
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
-msgstr "M�faj mez� feldolgoz�sa"
+msgstr "Műfaj mező feldolgozása"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "Cm"
 
 # bubble help
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
-msgstr "Megjegyz�s mez� feldolgoz�sa"
+msgstr "Megjegyzés mező feldolgozása"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "Cp"
 
 # bubble help
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
-msgstr "Szerz� mez� feldolgoz�sa"
+msgstr "Szerző mező feldolgozása"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "O"
 
 # bubble help
-#: src/scan.c:2173
+#: src/scan.c:2242
 msgid "Process original artist field"
-msgstr "Eredeti el�ad� mez� feldolgoz�sa"
+msgstr "Eredeti előadó mező feldolgozása"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Cr"
 
 # bubble help
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
-msgstr "Kiad� mez� feldolgoz�sa"
+msgstr "Kiadó mező feldolgozása"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
 # bubble help
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
-msgstr "URL mez� feldolgoz�sa"
+msgstr "URL mező feldolgozása"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "E"
 
 # bubble help
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
-msgstr "K�dol� mez� feldolgoz�sa"
+msgstr "Kódoló mező feldolgozása"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
-msgstr "Kijel�l�s megford�t�sa"
+msgstr "Kijelölés megfordítása"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
-msgstr "Kijel�l�s/Kijel�l�s megfordit�sa - mindenhol"
+msgstr "Kijelölés/Kijelölés megforditása - mindenhol"
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
-msgstr "Als�von�s �s '%20' sztring sz�k�zz� alak�t�sa"
+msgstr "Alsóvonás és '%20' sztring szóközzé alakítása"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "Karaktercsere ezt:"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "ebbe: "
 
 # bubble help
-#: src/scan.c:2281
+#: src/scan.c:2350
 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"
+msgstr "Alsóvonás és '%20' sztring szóközzé alakítása"
 
 # bubble help
-#: src/scan.c:2284
+#: src/scan.c:2353
 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"
+msgstr "A szóköz karakterek alsóvonássá alakítása"
 
-#: src/scan.c:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
-msgstr ""
+msgstr "Cserélje le a szöveget valami másra, és figyeljen a betűérzékenységre."
 
 # bubble help
-#: src/scan.c:2319
+#: src/scan.c:2388
 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"
+msgstr "MINDEGYIK KARAKTERT NAGYBETŰSRE CSERÉLI"
 
 # bubble help
-#: src/scan.c:2322
+#: src/scan.c:2391
 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"
+msgstr "mindegyik karaktert kisbetűsre cseréli"
 
 # bubble help
-#: src/scan.c:2325
+#: src/scan.c:2394
 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"
+msgstr "Csak a legelső karaktert cseréli nagybetűsre"
 
 # bubble help
-#: src/scan.c:2328
+#: src/scan.c:2397
 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"
+msgstr "Minden Szó Első Betűjét Nagybetűsre Cseréli"
 
-#: src/scan.c:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
-msgstr "Sz�k�z besz�r�sa minden NAGYBET�S sz� el�"
+msgstr "Szóköz beszúrása minden NAGYBETŰS szó elé"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
-msgstr "Dupla sz�k�z�k, �s als�von�sok t�rl�se"
+msgstr "Dupla szóközök, és alsóvonások törlése"
 
 # bubble help
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
-"Minden sz�k�z elt�vol�t�sa a szavak k�z�l.\n"
-"P�lda: 'Sz�veg a kijel�lt ablakban' --> 'Sz�vegakijel�ltablakban'"
+"Minden szóköz eltávolítása a szavak közül.\n"
+"Példa: 'Szöveg a kijelölt ablakban' --> 'Szövegakijelöltablakban'"
 
 # bubble help
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
-"Sz�k�z beilleszt�se minden nagybet�s karakter el�.\n"
-"P�lda: 'Sz�vegAKijel�ltablakban' --> 'Sz�veg A Kijel�ltablakban'."
+"Szóköz beillesztése minden nagybetűs karakter elé.\n"
+"Példa: 'SzövegAKijelöltablakban' --> 'Szöveg A Kijelöltablakban'."
 
 # bubble help
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
 msgstr ""
-"Egym�s mellett l�v� dupla, vagy t�bb sz�k�z �s als�von�s cs�kkent�se EGY "
-"als�von�s �s sz�k�zre. P�lda: Ez itt   egy__ p�lda__Sz�veg > Ez itt "
-"egy_p�lda_Sz�veg"
+"Egymás mellett lévő dupla, vagy több szóköz és alsóvonás csökkentése EGY "
+"alsóvonás és szóközre. Példa: Ez itt   egy__ példa__Szöveg > Ez itt "
+"egy_példa_Szöveg"
 
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "Puska"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
-msgstr "%a : el�ad�"
+msgstr "%a : előadó"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
-msgstr "%c : megjegyz�s"
+msgstr "%c : megjegyzés"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
-msgstr "%p : szerz�"
+msgstr "%p : szerző"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
-msgstr "%r : kiad�"
+msgstr "%r : kiadó"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
-msgstr "%d : CD lemez sz�ma"
+msgstr "%d : CD lemez száma"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
-msgstr "%e : k�dol�"
+msgstr "%e : kódoló"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
-msgstr "%g : m�faj"
+msgstr "%g : műfaj"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
-msgstr "%i : mell�z�tt"
+msgstr "%i : mellőzött"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
-msgstr "%l : s�vok sz�ma"
+msgstr "%l : sávok száma"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
-msgstr "%o : Eredeti el�ad�"
+msgstr "%o : Eredeti előadó"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
-msgstr "%n : sorsz�m"
+msgstr "%n : sorszám"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
-msgstr "%t : c�m"
+msgstr "%t : cím"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
-msgstr "%y : �v"
+msgstr "%y : év"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
-msgstr "Maszkszerkeszt�"
+msgstr "Maszkszerkesztő"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
-msgstr "�j maszk"
+msgstr "Új maszk"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
-msgstr "Maszk felfel� mozgat�sa"
+msgstr "Maszk felfelé mozgatása"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
-msgstr "Maszk lefel� mozgat�sa"
+msgstr "Maszk lefelé mozgatása"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
-msgstr "Maszk k�tszerez�se"
+msgstr "Maszk kétszerezése"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
-msgstr "Alapmaszkok hozz�ad�sa"
+msgstr "Alapmaszkok hozzáadása"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
-msgstr "Maszk elt�vol�t�sa"
+msgstr "Maszk eltávolítása"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
-msgstr "Maszkok ment�se"
+msgstr "Maszkok mentése"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
-msgstr "�j_maszk"
+msgstr "Új maszk"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
-msgstr "M�sol�s: Nincs kijel�lt sor!"
+msgstr "Másolás: Nincs kijelölt sor!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
-msgstr "Elt�vol�t�s: Nincs kijel�lt sor!"
+msgstr "Eltávolítás: Nincs kijelölt sor!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
-msgstr "Felfel� mozgat�s: Nincs kijel�lt sor!"
+msgstr "Felfelé mozgatás: Nincs kijelölt sor!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
-msgstr "Lefel� mozgat�s: Nincs kijel�lt sor!"
+msgstr "Lefelé mozgatás: Nincs kijelölt sor!"
 
-#: src/setting.c:889
-#, fuzzy, c-format
+#: src/setting.c:888
+#, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
-msgstr "HIBA: A konfigur�ci�s f�jl nem �rhat� %s (%s)a"
+msgstr "HIBA: A konfigurációs fájl nem írható %s (%s)a"
 
-#: src/setting.c:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
-msgstr "A konfigur�ci�s f�jl megnyit�sa sikertelen '%s' (%s)"
+msgstr "A konfigurációs fájl megnyitása sikertelen '%s' (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 msgid "Loading default configuration..."
-msgstr "Alap�rtelmezett be�ll�t�sok bet�lt�se..."
+msgstr "Alapértelmezett beállítások betöltése..."
 
-#: 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
-msgstr "'%s' (%s)-t megnyit�sa sikertelen"
+msgstr "'%s' (%s)-t megnyitása sikertelen"
 
-#: src/setting.c:1278
-#, fuzzy, c-format
+#: src/setting.c:1277
+#, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
-msgstr "HIBA: A lista nem �rhat� %s (%s) f�jlba"
+msgstr "HIBA: A lista nem írható %s (%s) fájlba"
 
 #. Fall back to defaults
-#: src/setting.c:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
-msgstr "Alap�rtelmezett C�mke kit�lt�s maszkok bet�lt�se..."
+msgstr "Alapértelmezett Címke kitöltés maszkok betöltése..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
-msgstr "Alap�rtelmezett f�jl �tnevez� maszkok bet�lt�se..."
+msgstr "Alapértelmezett fájl átnevező maszkok betöltése..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
-msgstr "Alap�rtelmezett k�nyvt�r �tnevez� maszkok bet�lt�se..."
+msgstr "Alapértelmezett könyvtár átnevező maszkok betöltése..."
 
-#: src/setting.c:1606
-#, fuzzy
+#: src/setting.c:1607
 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"
+msgstr "HIBA: A Kezdő könyvtár környezeti változója nincs definiálva!"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
-msgstr "HIBA: Nem lehet l�trehozni a '%s'(%s) k�nyvt�rat!"
+msgstr "HIBA: Nem lehet létrehozni a '%s'(%s) könyvtárat!"
 
 #: src/vcedit.c:287
 msgid "Input truncated or empty."
-msgstr "A bemenet csonka, vagy �res."
+msgstr "A bemenet csonka, vagy üres."
 
 #: src/vcedit.c:289
 msgid "Input is not an Ogg bitstream."
@@ -5064,244 +5026,111 @@ msgstr "A bemenet nem Ogg Vorbis adatfolyam."
 
 #: src/vcedit.c:307
 msgid "Error reading first page of Ogg bitstream."
-msgstr "Hiba az Ogg Vorbis adatfolyam els� oldal�nak olvas�sakor."
+msgstr "Hiba az Ogg Vorbis adatfolyam első oldalának olvasásakor."
 
 #: src/vcedit.c:313
 msgid "Error reading initial header packet."
-msgstr "Hiba a kezdeti fejl�c csomag olvas�sakor."
+msgstr "Hiba a kezdeti fejléc csomag olvasásakor."
 
 #: src/vcedit.c:341
-#, fuzzy
 msgid "Ogg bitstream contains neither speex or vorbis data."
-msgstr "Az Ogg Vorbis adatfolyam nem tartalmaz vorbis adatot."
+msgstr "Az Ogg Vorbis adatfolyam nem tartalmaz speex vagy vorbis adatot."
 
 #: src/vcedit.c:375
 msgid "Corrupt secondary header."
-msgstr "Hib�s m�sodlagos fejl�c."
+msgstr "Hibás másodlagos fejléc."
 
 #: src/vcedit.c:405
 msgid "Need to save extra headers - TODO!!"
-msgstr ""
+msgstr "Extra fejléc elmentése szükséges - TODO!!"
 
 #: src/vcedit.c:419
 msgid "EOF before end of vorbis headers."
-msgstr "EOF a vorbis fejl�c v�ge el�tt."
+msgstr "EOF a vorbis fejléc vége előtt."
 
 #: src/vcedit.c:584
 msgid "Corrupt or missing data, continuing..."
-msgstr "Hib�s, vagy hi�nyos adat, M�velet folytat�sa..."
+msgstr "Hibás, vagy hiányos adat, Művelet folytatása..."
 
 #: src/vcedit.c:621
 msgid ""
 "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr ""
-"Hiba a kimenetre val� �r�s k�zben. Kimeneti adatfolyam hib�s, vagy csonka."
+"Hiba a kimenetre való írás közben. Kimeneti adatfolyam hibás, vagy csonka."
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
-msgstr ""
+msgstr "%s DLL-t nem találom."
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
-msgstr ""
+msgstr "%s DLL betöltése nem sikerült."
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
-msgstr ""
+msgstr "Ez a verzió a %s %s -t tartalmazza."
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
-msgstr ""
+msgstr "A %s funkció nem található a %s dll-ben."
 
-# egy�b men�
+# egyéb menü
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
-#, fuzzy, c-format
+#: src/win32/win32dep.c:302
+#, c-format
 msgid "Audio player: '%s'"
-msgstr "_Zene lej�tsz� futtat�sa"
+msgstr "Zene lejátszó: %s"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 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:"
+msgstr "EasyTAG beállítási könyvtára: %s"
 
-#, 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�)"
+#~ msgid "libid3tag %s"
+#~ msgstr "libid3tag %s"
 
-#, fuzzy
-#~ msgid "ID3V2 tag Version"
-#~ msgstr "Hib�s ID3 c�mke verzi�"
+#~ msgid "id3lib %d.%d.%d"
+#~ msgstr "id3lib %d.%d.%d"
 
-# src/trans.h:266
-#~ msgid "Unicode (UTF-7)"
-#~ msgstr "Unicode (UTF-7)"
+#~ msgid " OK "
+#~ msgstr " OK "
 
-# src/trans.h:266
-#~ msgid "Unicode (UTF-16BE)"
-#~ msgstr "Unicode (UTF-16BE)"
+#~ msgid " Yes "
+#~ msgstr " Igen "
 
-# src/trans.h:266
-#~ msgid "Unicode (UTF-16LE)"
-#~ msgstr "Unicode (UTF-16LE)"
+#~ msgid " No "
+#~ msgstr " Nem "
 
-#~ msgid "Use padding"
-#~ msgstr "Kit�lt�s haszn�lata"
+#~ msgid " Apply "
+#~ msgstr " Alkalmaz "
 
-#~ msgid ""
-#~ "Set padding in the ID3v2 tags for faster writing during next changes in "
-#~ "the tag."
-#~ msgstr "A kit�lt�s be�ll�t�sa az ID3 c�mk�k gyorsabb �r�s�t eredm�nyezi."
+#~ msgid " Save "
+#~ msgstr " Ment "
 
-#~ msgid "Always save tags to ISO-8859-1 character set"
-#~ msgstr "Mindig ISO-8859-1-be mentsen"
+#~ msgid " Cancel "
+#~ msgstr " Mégsem "
 
-# bubblehelp
-#~ 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 ""
-#~ "Haszn�lja az ISO-8859-1 k�szletet a c�mke �r�s�hoz.\n"
-#~ "Ez a k�szlet j� az ID3v1 �s ID3v2-h�z is. De az ISO-8859-1 k�szletben nem "
-#~ "tal�lhat� karakterek eldob�sra ker�lnek."
-
-#~ msgid ""
-#~ "Try to save tags to ISO-8859-1. If it isn't possible then use UNICODE "
-#~ "(recommended)"
-#~ msgstr ""
-#~ "Az ISO-8859-1 els�dleges haszn�lata. A fel nem ismert karakterek eset�n "
-#~ "UNICODE-ra v�lt�s. (Aj�nlott)"
-
-#~ 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 ""
-#~ "Ha nem tudja ISO-8859-1-be konvert�lni, az UNICODE karakterk�szletet "
-#~ "fogja haszn�lni. Az Unicode haszn�lhat� ID3v2, de nem haszn�lhat� ID3v1 "
-#~ "cimk�khez\n"
-#~ "(mivel ez EGY karakteres k�dol�s) \n"
-#~ "\n"
-#~ "Ha a 'Nem standard karakterk�szlet haszn�lata az ID3 cimk�k �r�sakor' "
-#~ "opci�n�l m�sik karakterk�szletet v�lasztunk, az ISO-8859-1 helyett, akkor "
-#~ "AZT fogja haszn�lni.\n"
-#~ "Valamint szab�lyokat is tudunk defini�lni arra az esetre, ha nem tudn� "
-#~ "k�dolni a karaktert. "
-
-#~ msgid "Always save tags to UNICODE character set"
-#~ msgstr "Mindig UNICODE-ba mentsen"
-
-#~ 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 ""
-#~ "Az UNICODE k�szlet haszn�lata az ID3v2 c�mk�khez. Az ID3v1 c�mk�k "
-#~ "alap�rtelmezetten mindig ISO-8859-1 k�dol�ssal vannak mentve."
-
-#~ msgid ""
-#~ "For ISO-8859-1 fields, override with the following character encodings "
-#~ "(for expert users only!): "
-#~ msgstr ""
-#~ "ISO-8859-1 k�szlet feldolgoz�sa a k�vetkez� k�dol�ssal: (csak szak�rt�k "
-#~ "r�sz�re!)"
+#~ msgid " Close "
+#~ msgstr " Bezár "
 
-# bubble help
-#~ msgid "Use non standard character set for reading ID3 tags: "
-#~ msgstr "A nem standard karakterk�dol�s haszn�lata az ID3 c�mk�k olvas�sakor"
+#~ msgid " Write "
+#~ msgstr " Írás "
 
-# bubble help
-#~ msgid "Use non standard character set for writing ID3 tags: "
-#~ msgstr "A nem standard karakterk�dol�s haszn�lata az ID3 c�mk�k �r�sakor"
-
-# bubble help
-#~ 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 "Ez a karakterk�dol�s haszn�lata a c�mke �r�s�hoz. "
-
-#~ msgid ""
-#~ "For ISO-8859-1 fields, apply also these rules if some characters can't be "
-#~ "converted when writing tags:"
-#~ msgstr ""
-#~ "Az ISO-8859-1 mez�k eset�n ezeket a szab�lyokat is alkalmazza, ha "
-#~ "egycimke �r�sakor nem lehet konvert�lni a karaktereket:"
-
-#~ msgid "Do nothing"
-#~ msgstr "Nincs v�ltoztat�s"
-
-#~ msgid "Force using the character encoding and activate the transliteration"
-#~ msgstr ""
-#~ "A rendszerk�dol�s k�nyszer�tett haszn�lata, �s a nem megfelel� karakterek "
-#~ "�t�r�sa"
-
-#~ msgid ""
-#~ "Force using the character encoding and silently discard some characters"
-#~ msgstr ""
-#~ "A rendszerk�dol�s haszn�lata, �s a nem megfelel� karakterek eldob�sa"
-
-#~ msgid ""
-#~ "The character set translation from '%s'\n"
-#~ "to '%s' isn't supported!"
-#~ msgstr ""
-#~ "A karakterk�szlet ford�t�s '%s'-r�l \n"
-#~ " '%s'-re nem t�mogatott!"
-
-#, fuzzy
-#~ msgid "ERROR while opening file: '%s' (%s)"
-#~ msgstr "Hiba a '%s' (%s) f�jl megnyit�sa k�zben.a"
+#~ msgid " Execute "
+#~ msgstr " Futtatás "
 
-#~ msgid "Load on startup the directory"
-#~ msgstr "Indul�skor az al�bb megadott k�nyvt�r tartalm�nak bet�lt�se"
+#~ msgid " Search "
+#~ msgstr "Keresés "
 
-#~ msgid "#:"
-#~ msgstr "CD #:"
+#~ msgid " Browse... "
+#~ msgstr "Tallózás..."
diff --git a/po/it.gmo b/po/it.gmo
index 80e5bc8..53e61af 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index ded8aa7..9377ce0 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-10-15 23:53+0200\n"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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:134
+#: src/about.c:140
 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,199 +31,194 @@ msgstr ""
 "semplice e stuzzicante interfaccia GTK+ rende più facile mettere le "
 "etichette in ambiente GNU/Linux."
 
-#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(traduzione tedesca)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(traduzione russa)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(traduzione olandese)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(traduzione svedese)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(traduzione ungherese)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(traduzione italiana)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(traduzione giapponese)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(traduzione ucraina)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(traduzione ceca)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(traduzione spagnola)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(traduzione polacca)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(traduzione rumena)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(traduzione danese)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(traduzione greca)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(traduzione portoghese brasiliana)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr "(traduzione bulgara)"
 
-#: src/about.c:171
+#: src/about.c:177
 msgid "(Chinese translation)"
 msgstr "(traduzione cinese)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(traduzione cinese)"
+
+#: src/about.c:179
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(traduzione greca)"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(traduzione tedesca)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "Commento"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "Informazioni..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "Informazioni"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compilato il: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(usando: GTK+ %d.%d.%d e id3lib %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "Autore: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "Posta elettronica: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Pagina web: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "Descrizione:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(il supporto per i file MP3 è stato disabilitato)"
 
-#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
-#: src/about.c:452 src/about.c:462
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(il supporto per i file MP3 è stato disabilitato)"
 
-#: src/about.c:410
+#: src/about.c:452
 #, fuzzy
 msgid "available"
 msgstr "Non c'è più memoria disponibile"
 
-#: src/about.c:420
+#: src/about.c:463
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(il supporto per i file Ogg Vorbis è stato disabilitato)"
 
-#: src/about.c:430
+#: src/about.c:475
 #, fuzzy
 msgid "Speex file support"
 msgstr "(il supporto per i file MP3 è stato disabilitato)"
 
-#: src/about.c:440
+#: src/about.c:491
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(il supporto per i file FLAC è stato disabilitato)"
 
-#: src/about.c:450
+#: src/about.c:504
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(il supporto per i file MP4/AAC è stato disabilitato)"
 
-#: src/about.c:460
+#: src/about.c:516
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(il supporto per i file MP3 è stato disabilitato)"
@@ -231,33 +226,33 @@ msgstr "(il supporto per i file MP3 è stato disabilitato)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "Ringraziamenti"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "Traduzioni:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "Generale:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "Modifiche"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "Si è verificato un errore aprendo il file '%s' (%s)."
@@ -433,7 +428,7 @@ msgstr "Decrescente per campionamento"
 msgid "Open File(s) with ..."
 msgstr "Apri file con..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "Seleziona tutti i file"
 
@@ -441,7 +436,7 @@ msgstr "Seleziona tutti i file"
 msgid "Unselect All Files"
 msgstr "Deseleziona tutti i file"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "Inverti la selezione dei file"
 
@@ -587,7 +582,7 @@ msgstr "Rinomina cartella..."
 msgid "Reload Directory"
 msgstr "Ricarica cartella"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "Sfoglia cartella con..."
 
@@ -726,17 +721,17 @@ msgstr "Non riesco ad incorporare lo UI. L'errore è stato: %s\n"
 msgid "Ready to start..."
 msgstr "Pronto a partire..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 msgid "New default path for files selected"
 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:4550 src/easytag.c:4570 src/easytag.c:4589
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "Conferma..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -744,68 +739,116 @@ msgstr ""
 "Alcuni file sono stati modificati ma non salvati.\n"
 "Vuoi salvarli prima di cambiare cartella?"
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 msgid "<All albums>"
 msgstr "<Tutti gli album>"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "Albero"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "Nome File"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "Titolo"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "Artista"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "Album"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "Anno"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "Traccia"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "Genere"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "Compositore"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "Artista Originale"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "Diritti d'autore"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "URL"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "Codificato da"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "# Album"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 msgid "# Files"
 msgstr "# File"
 
-#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
-msgid "Album"
-msgstr "Album"
-
-#: src/browser.c:2822
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "Vai alla cartella genitrice"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "Immetti una cartella da sfogliare."
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "Albero"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "Seleziona una cartella da sfogliare!"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "Artista & Album"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "Rinomina la cartella"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Rinomina la cartella '%s' in: "
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "Usa maschera:"
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 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:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -814,31 +857,31 @@ msgstr ""
 "nella Finestra Analizzatore) per rinominare la cartella dai campi "
 "dell'etichetta."
 
-#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
-#: src/scan.c:2119 src/scan.c:2465
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "La Maschera Analizzatore non è valida"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 msgid "Rename directory preview..."
 msgstr "Anteprima di rinomina cartella..."
 
-#. 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "Errore..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "Devi scrivere il nome di una cartella!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -849,16 +892,22 @@ msgstr ""
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -867,7 +916,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -876,7 +925,7 @@ msgstr ""
 "Non posso rinominare nulla perché il nome della cartella esiste già!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -891,88 +940,88 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "Cartella rinominata"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "Programma da eseguire:"
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 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:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "Apri file con..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 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:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "Devi immettere il nome di un programma!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Non ho potuto trovare il programma '%s'!"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Non è possibile eseguire %s (errore %d)!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "Non posso eseguire una nuova istanza di un altro processo!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Comando eseguito:  '%s %s'"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "Artista / Album"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Category"
 msgstr "Categoria"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:229 src/cddb.c:438
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "Nome Traccia"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "Tempo"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "Ricerca Database CD"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "Ricerca Automatica"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 msgid "Request CD database :"
 msgstr "Richiesta Database CD:"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -980,16 +1029,16 @@ msgstr ""
 "Ricerca automaticamente il database CDDB usando il file selezionato "
 "(l'ordine è importante!) per generare il CddbID."
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "Interrompi la ricerca...  "
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr "Usa Cddb locale"
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1001,15 +1050,15 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "Ricerca Manuale"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "Parole:"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr ""
 "Immetti le parole da cercare (separate da uno spazio o da un segno '+')"
@@ -1017,124 +1066,124 @@ msgstr ""
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "Cerca In:"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "Ogni Campo"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "Altro"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "Ogni Categoria"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "Classica"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Varie"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "Colonna sonora"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "inclusi: funk, soul, rap, pop, industrial, metal, ecc."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "film, spettacoli"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "altre che non rientrano nelle categorie precedenti"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr "Categorie "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "Risultati:"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "Cerca:"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "Immetti le parole da cercare nella lista seguente"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "Cerca Successivo"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "Cerca Precedente"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Mostra solo linee rosse (o mostra tutte le linee) nella lista 'Artista / "
 "Album'"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "Deseleziona tutte le linee"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "Inverti la selezione delle linee"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "Seleziona tutte le linee"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1147,52 +1196,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "Imposta A:"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 msgid "All"
 msgstr "Tutto"
 
-#: src/cddb.c:721 src/misc.c:1958
-msgid "File Name"
-msgstr "Nome File"
-
-#: src/cddb.c:722 src/misc.c:1959
-msgid "Title"
-msgstr "Titolo"
-
-#: src/cddb.c:725 src/misc.c:1963
-msgid "Year"
-msgstr "Anno"
-
-#: src/cddb.c:726
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "Traccia #"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 msgid "# Tracks"
 msgstr "# Tracce"
 
-#: 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:3013
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "Esegui l'analisi corrente per ogni file"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "Corrispondi linee con l'algoritmo Levenshtein"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:777 src/prefs.c:1362
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1207,15 +1240,15 @@ msgstr ""
 "applicare i risultati cddb, invece di usare direttamente l'ordine della "
 "posizione."
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 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:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "Pronto a cercare..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1223,76 +1256,76 @@ msgstr ""
 "Album: '%s', artista: '%s', lunghezza: '%s', anno: '%s', genere: '%s', ID: '%"
 "s'"
 
-#: src/cddb.c:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "Inverti selezione"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "Ordina per Numero Traccia"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "Ordina per Nome Traccia"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Risolvo il nodo '%s'..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Non riesco a risolvere il nodo '%s' (%s)!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, 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:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Connessione al nodo '%s', porta '%d'..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Non riesco a connettermi al nodo '%s' (%s)!"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Connesso al nodo '%s'"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Ricezione dati (%s)..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Si è verificato un errore leggendo la risposta cddb (%s)!"
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Non riesco a creare il file '%s' (%s)"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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:2246 src/cddb.c:2564 src/cddb.c:3397
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "Invio richiesta..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Non riesco ad inviare la richiesta (%s)!"
@@ -1301,91 +1334,92 @@ msgstr "Non riesco ad inviare la richiesta (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "Ricezione dati..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 msgid "The server returned a wrong answer!"
 msgstr "Il server ha fornito una risposta sbagliata!"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Il server ha fornito una risposta sbagliata! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 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:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Sono stati trovati %d album corrispondenti"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Sto ricevendo i dati della pagina %d..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Sto ricevendo i dati della pagina %d..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr "Altri risultati da caricare..."
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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:2889
+#: src/cddb.c:2893
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d file selezionati!"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 msgid "Local CD search..."
 msgstr "Ricerca CD locale..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
+#, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 "Il percorso per 'Database Locale CD' non è stato definito!\n"
 "Impostalo nella finestra delle preferenze."
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, 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:3268
+#: src/cddb.c:3276
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Sono stati trovati %d album corrispondenti per DiscID '%s'"
 
-#: src/cddb.c:3364
+#: src/cddb.c:3372
 #, 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:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "Sto caricando l'elenco delle tracce dell'album..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1398,7 +1432,7 @@ msgstr ""
 "\n"
 "Vuoi davvero continuare?"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "Scrivi Etichette da CDDB..."
 
@@ -1583,75 +1617,75 @@ msgstr "Occidentale (ISO-8859-15)"
 msgid "Western (Windows-1252)"
 msgstr "Occidentale (Windows-1252)"
 
-#: src/charset.c:542
-#, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
+#: src/charset.c:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 "Il nome del file '%s' non ha potuto essere convertito nel formato UTF-8 (%"
 "s).\n"
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "UTF-8 non valido"
 
-#: src/charset.c:641
-#, c-format
+#: src/charset.c:642
+#, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
 "La stringa UTF-8 '%s' potrebbe non venir convertita nella codifica del file "
 "(%s)\n"
 
-#: src/charset.c:705
-#, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+#: src/charset.c:706
+#, fuzzy, c-format
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 "La stringa '%s' non ha potuto essere convertito nel formato UTF-8 (%s).\n"
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "Avvio EasyTAG %s (PId: %d) ..."
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, fuzzy, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "Attualmente sto utilizzando la versione %d.%d.%d di id3lib..."
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "Attualmente sto utilizzando la versione %d.%d.%d di id3lib..."
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr ""
 "La variabile EASYTAGLANG è stata definita. Imposto la localizzazione: '%s' "
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, c-format
 msgid "Setting locale : '%s'"
 msgstr "Imposto localizzazione : '%s'"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr ""
 "Attualmente sto usando la localizzazione '%s' (ed eventualmente '%s')..."
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s da %s (compilato %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "Pagina Web: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr "Parametro o percorso sconosciuto '%s'\n"
@@ -1659,139 +1693,139 @@ msgstr "Parametro o percorso sconosciuto '%s'\n"
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "Navigatore"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "File"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "File in sola lettura"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 msgid "File Link Broken"
 msgstr "Il collegamento del file è interrotto"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, Livello ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "Freq:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Modalità:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
-#: src/easytag.c:4073
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "Dimensione:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? kb"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "Tempo:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "Etichetta"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "Comune"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "Titolo:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "Etichetta i file selezionati con questo titolo"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "Artista:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr "Etichetta i file selezionati con questo artista"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr "Etichetta i file selezionati con questo nome d'album"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr "Etichetta i file selezionati con questo numero di disco"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "Anno:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "Etichetta i file selezionati con questo anno"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Numera tutte le tracce in sequenza. Inizia con 01 in ogni sottocartella."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "Traccia #:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1799,280 +1833,280 @@ msgstr ""
 "Imposta il numero di file alle tracce selezionate, nella stessa cartella del "
 "file visualizzato."
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr "Etichetta i file selezionati con questo numero di tracce"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "Genere:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "Etichetta i file selezionati con questo genere"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "Commento:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 msgid "Tag selected files with this comment"
 msgstr "Etichetta i file selezionati con questo commento"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:818
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "Compositore:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr "Etichetta i file selezionati con questo compositore"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "Artista Originale:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr "Etichetta i file selezionati con questo artista originale"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "Diritti d'autore:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "Etichetta i file selezionati con questi diritti d'autore"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "Etichetta i file selezionati con questa URL"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "Codificato da:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr "Etichetta i file codificati con questo nome di codificatore"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "Immagini"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "Immagini:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "Puoi usare il trascina e rilascia per aggiungere delle immagini."
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "Etichetta i file selezionati con queste immagini"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 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
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr "Rimuovi le immagini selezionate o tutte le immagini."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "Salva le immagini selezionate sul disco rigido."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "Imposta le proprietà delle immagini selezionate."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "I file selezionati sono stati etichettati con il titolo '%s'."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "Il titolo è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "I file selezionati sono stati etichettati con l'artista '%s'."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "L'artista è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr ""
 "I file selezionati sono stati etichettati con con il nome d'album '%s'."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "Il nome dell'album è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "I file selezionati sono stati etichettati con il numero di disco '%s'."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "Il numero di disco è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "I file selezionati sono stati etichettati con l'anno '%s'."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "L'anno è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr ""
 "I file selezionati sono stati etichettati con una traccia tipo 'xx/%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr "I file selezionati sono stati etichettati con una traccia tipo 'xx'."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "Il numero di traccia è stato rimosso dai file selezionati."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "Le tracce selezionate sono state numerate in sequenza."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "I file selezionati sono stati etichettati con il genere '%s'."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "Il genere è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "I file selezionati sono stati etichettati con il commento '%s'."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "Il commento è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "I file selezionati sono stati etichettati con il compositore '%s'."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "Il compositore è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr ""
 "I file selezionati sono stati etichettati con l'artista originale '%s'."
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "L'artista originale è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "I file selezionati sono stati etichettati con i diritti d'autore '%s'."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "I diritti d'autore sono stati rimossi dai file selezionati."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "I file selezionati sono stati etichettati con l'URL '%s'."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "L'URL è stata rimossa dai file selezionati."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr ""
 "I file selezionati sono stati etichettati con il nome del codificatore '%s'."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr "Il nome del codificatore è stato rimosso dai file selezionati."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "I file selezionati sono stati etichettati con le immagini."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "Le immagini sono state rimosse dai file selezionati."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Seleziona Modalità e Maschera e ripeti la stessa azione"
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "Tutte le etichette sono state analizzate"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "Tutte le etichette sono state rimosse"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "Tutti i file sono stati salvati..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "I file sono stati parzialmente salvati..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "I file sono stati in parte eliminati..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "Tutti i file sono stati eliminati..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2081,16 +2115,16 @@ msgstr ""
 "Vuoi scrivere l'etichetta del file\n"
 " '%s'?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "Scrivi Etichetta..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr "Rinomina File e Cartella..."
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2104,11 +2138,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr "Rinomina Cartella..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2122,11 +2156,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "Rinomina File..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2139,17 +2173,17 @@ msgstr ""
 "in \n"
 "'%s' ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Scrittura dell'etichetta di '%s'"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 msgid "Tag(s) written"
 msgstr "Etichette scritte"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2586 src/easytag.c:2591
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2158,14 +2192,14 @@ msgstr ""
 "Non posso scrivere l'etichetta nel file '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Rinomino il file '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2737 src/easytag.c:2769 src/easytag.c:2941
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2178,11 +2212,11 @@ msgstr ""
 "'%s'! \n"
 "(%s) "
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "File non rinominato/i..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2195,7 +2229,7 @@ msgstr ""
 "perché il file seguente esiste già:\n"
 " '%s'"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2207,16 +2241,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Il file '%s' è stato rinominato in '%s'"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "File rinominato/i..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2228,17 +2262,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Ho spostato il file '%s' su '%s'"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
 msgstr "File spostato/i..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2251,11 +2285,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
 msgstr "File non spostato/i..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2264,16 +2298,16 @@ msgstr ""
 "Vuoi davvero eliminare definitivamente il file\n"
 "'%s' ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "Elimina File..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Il file '%s' è stato eliminato"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2285,111 +2319,111 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "Ricerca in corso..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "File: '%s'"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, 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:3239
+#: src/easytag.c:3356
 #, 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:3252 src/et_core.c:2696
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u file"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 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:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "Non è stato trovato alcun file in questa cartella!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "Ricerca..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "  INTERROMPI la ricerca...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "Seleziona una cartella da sfogliare!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "Etichetta i file selezionati con questo campo"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Converti '_' e '%20' in spazi"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "Converti ' ' in '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "Tutto maiuscolo"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "Tutto minuscolo"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "Prima lettera maiuscola"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "Prima lettera maiuscola per ogni parola"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "Rimuovi spazi"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "Inserisci degli spazi prima delle lettere maiuscole"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 msgid "Remove duplicate spaces or underscores"
 msgstr "Rimuovi spazi o trattini duplicati"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: uscita anomala! (PId: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Ricevuto segnale %s (%d) "
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 "
@@ -2398,11 +2432,11 @@ msgstr ""
 "Probabilmente hai scoperto un baco in EasyTAG. Per favore, invia un rapporto "
 "via backtrace gdb ('gdb easytag core' poi 'bt' and 'l') a easytag@gmail.com"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "Segnale sconosciuto"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2436,11 +2470,11 @@ msgstr ""
 "path_to/files              Usa un percorso relativo.\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: uscita normale."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2448,78 +2482,78 @@ msgstr ""
 "Alcuni file sono stati modificati ma non salvati...\n"
 "Vuoi salvarli prima di uscire dal programma?"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr "Vuoi veramente uscire dal programma?"
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "Etichetta ID3"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Etichetta Ogg Vorbis"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "Etichetta Vorbis FLAC"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "Etichetta APE"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr "Etichetta MP4/M4A/AAC"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr "Etichetta Wavpack"
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "File MP3"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "File MP2"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "File Ogg Vorbis"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 #, fuzzy
 msgid "Speex File"
 msgstr "File successivo"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "File FLAC"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "File MusePack"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "File Monkey's Audio"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr "File MP4/AAC"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 msgid "Wavpack File"
 msgstr "File Wavpack"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "Immagini"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2527,14 +2561,14 @@ 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/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2545,11 +2579,11 @@ msgstr ""
 "nella codifica del sistema\n"
 "(Prova impostando la variabile d'ambiente G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "Traduzione del nome file"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Il nome file '%s' eccede di %d caratteri e sarà quindi troncato!\n"
@@ -2559,7 +2593,7 @@ msgstr "Il nome file '%s' eccede di %d caratteri e sarà quindi troncato!\n"
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "Codificatore:"
@@ -2568,53 +2602,58 @@ msgstr "Codificatore:"
 #. 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/flac_header.c:312 src/mp4_header.c:286 src/ogg_header.c:267
 #: src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Canali:"
 
-#: src/flac_tag.c:140 src/flac_tag.c:741
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "Si è verificato un errore aprendo il file '%s' (%s).\a"
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "ERRORE: non è possibile scrivere i commenti sul file '%s' (%s)."
 
-#: src/flac_tag.c:990 src/ogg_tag.c:759
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "L'etichetta di '%s' è stata scritta"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "L'etichetta di '%s' è stata rimossa"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr ""
 "Si è verificato un errore durante la rimozione dell'etichetta ID3v1 di '%"
 "s' (%s)"
 
-#: src/id3_tag.c:490 src/id3_tag.c:557
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr ""
 "Si è verificato un errore durante la rimozione dell'etichetta ID3v2 di '%"
 "s' (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr ""
 "Si è verificato un errore durante l'aggiornamento dell'etichetta ID3v2 di '%"
 "s' (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2639,79 +2678,79 @@ msgstr ""
 "\n"
 "File: %s"
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr ""
 "Si è verificato un errore durante l'aggiornamento dell'etichetta ID3v1 di '%"
 "s' (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "L'etichetta di '%s' è stata aggiornata"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "Non ci sono errori da riportare"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "Non c'è più memoria disponibile"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "Non ci sono dati da elaborare"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "Dati formattati impropriamente"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "Non c'è un buffer sul quale scrivere"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "Il buffer è troppo piccolo"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "L'identificatore ID del frame non è valido"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "Il campo richiesto non è stato trovato"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "Il tipo di campo è sconosciuto"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "L'etichetta è già allegata al file"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "La versione dell'etichetta non è valida"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "Non ci sono file da elaborare"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "Si è cercato di scrivere su un file a sola lettura"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "Errore nella compressione/decompressione"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "Messaggio d'errore sconosciuto!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2720,126 +2759,82 @@ msgstr ""
 "Il seguente file danneggiato: '%s'\n"
 "non verrà processato dal programma perché causerebbe un errore in id3lib."
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
 msgstr "File danneggiato..."
 
-#: src/log.c:91
+#: src/log.c:95
 msgid "Log"
 msgstr "Registro"
 
-#: src/misc.c:214
-msgid " OK "
-msgstr " OK"
-
-#: src/misc.c:219
-msgid " Yes "
-msgstr " Sì "
-
-#: src/misc.c:224
-msgid " No "
-msgstr " No "
-
-#: src/misc.c:229
-msgid " Apply "
-msgstr " Applica "
-
-#: src/misc.c:234
-msgid " Save "
-msgstr " Salva "
-
-#: src/misc.c:239
-msgid " Cancel "
-msgstr " Annulla "
-
-#: src/misc.c:244
-msgid " Close "
-msgstr " Chiudi "
-
-#: src/misc.c:249
-msgid " Write "
-msgstr " Scrivi "
-
-#: src/misc.c:254
-msgid " Execute "
-msgstr " Esegui "
-
-#: src/misc.c:259
-msgid " Search "
-msgstr " Ricerca "
-
-#: src/misc.c:264
-msgid " Browse... "
-msgstr " Sfoglia... "
+#: src/misc.c:773
+msgid "Select file..."
+msgstr "Seleziona file..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "Seleziona cartella..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "Seleziona file..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 msgid "Warning..."
 msgstr "Attenzione..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr "Nessun riproduttore audio definito!"
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "Genera una playlist"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "Nome della playlist M3U"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "Usa il nome di una cartella"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "Modifica Maschere"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "Opzioni Playlist"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "Includi solo i file selezionati"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2847,31 +2842,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:1397
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "Usa un percorso completo per i file nella playlist"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 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:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "Crea la playlist nella cartella genitrice"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 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:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "Usa il separatore delle cartelle in stile DOS"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2879,23 +2874,23 @@ msgstr ""
 "Questa opzione sostituisce il separatore di cartelle UNIX  '/' con quello "
 "DOS '\\'."
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "Contenuto Playlist"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "Scrivi solo la lista dei file"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "Scrivi le informazioni usando il nome del file"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "Scrivi le informazioni usando:"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2904,12 +2899,12 @@ msgstr ""
 "Il file della playlist '%s' esiste già!\n"
 "Sovrascrivo?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "Scrivi Playlist..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2918,44 +2913,24 @@ msgstr ""
 "Non è possibile scrivere la playlist nel file '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "È stato scritto il file della playlist '%s'"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1964
-msgid "Track"
-msgstr "Traccia"
-
-#: src/misc.c:1967 src/picture.c:821
-msgid "Composer"
-msgstr "Compositore"
-
-#: src/misc.c:1968
-msgid "Orig. Artist"
-msgstr "Artista Originale"
-
-#: src/misc.c:1969
-msgid "Copyright"
-msgstr "Diritti d'autore"
-
-#: src/misc.c:1970
-msgid "URL"
-msgstr "URL"
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "Codificato da"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "Cerca file"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2963,93 +2938,93 @@ msgstr ""
 "tutti i file."
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "In:"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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:2033
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "è l'Etichetta"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Maiuscolo e minuscolo"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Trovati: %d file"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "Carica i nomi dei file da un file di testo"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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:2787
+#: src/misc.c:2738
 msgid " Load "
 msgstr "Carica "
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, 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
+#: src/misc.c:2782 src/misc.c:2876
 #, fuzzy
 msgid "Insert a blank line before the selected line"
 msgstr "Inserisci uno spazio prima di una lettera maiuscola"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2840 src/misc.c:2934
+#: src/misc.c:2791 src/misc.c:2885
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "Elimina questa linea"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 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
+#: src/misc.c:2812 src/misc.c:2906
 #, 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
+#: src/misc.c:2821 src/misc.c:2915
 #, 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "Ricarica"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "Scrivi solo la lista dei file"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "Seleziona tutte le linee"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3058,20 +3033,20 @@ msgstr ""
 "attiva e dopo che i nomi dei file sono stati caricati (la finestra "
 "dell'analizzatore deve essere aperta)."
 
-#: src/misc.c:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "Inserisci una linea vuota"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "Elimina questa linea"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "Sposta Su questa Maschera"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "Sposta Giù questa Maschera"
@@ -3089,7 +3064,7 @@ msgstr "Audio"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr "Formato MP4 non valido"
 
@@ -3114,8 +3089,7 @@ msgstr "Canale doppio "
 msgid "Single channel"
 msgstr "Canale singolo"
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "Ripeti l'azione per i file rimanenti"
 
@@ -3153,48 +3127,48 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "ERRORE: non è possibile aprire il file '%s' come vorbis (%s)."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Attenzione: il file Ogg Vorbis '%s' contiene un'etichetta ID3v2."
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "Aggiungi immagini"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "Ogni File"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG e JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "Proprietà Immagine %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "Tipo Immagine"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "Descrizione Immagine:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "Salva immagine %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3205,115 +3179,120 @@ msgstr ""
 "'%s'\n"
 "Vuoi davvero sovrascriverlo?"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "Salva file..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "Immagine JPEG"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "Immagine PNG"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "Immagine sconosciuta"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "File icona PNG a 32x32 pixel"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "Altro file icona"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "Copertina (fronte)"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "Copertina (retro)"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr "Pagina di volantino"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr "Mezzo (cioè il lato dell'etichetta di un CD)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr "Carica artista/carica esecutore/solista"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "Artista/esecutore"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "Conduttore"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "Gruppo/Orchestra"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "Lirico/scrittore testo"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "Località di registrazione"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "Durante la registrazione"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "Durante l'esecuzione"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "Cattura schermo film/video"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "Un pesce di colore intenso"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "Illustrazione"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "Logo gruppo/artista"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "Logo editore/studio"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "Tipo d'immagine sconosciuta"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "pixel"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "Tipo"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3321,11 +3300,16 @@ 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:987
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr "Sto caricando l'immagine..."
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3336,7 +3320,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr "L'immagine non è stata caricata..."
 
@@ -3746,7 +3730,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "Forza l'uso della codifica di sistema ed attiva la traslitterazione"
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3763,7 +3747,7 @@ msgstr ""
 "Forza l'uso della codifica di sistema e rifiuta silenziosamente alcuni "
 "caratteri"
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3965,7 +3949,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr ""
 
@@ -3986,35 +3970,45 @@ msgstr "Gruppo di caratteri usato per scrivere i dati dell'etichetta nel file."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 #, fuzzy
 msgid "No"
 msgstr " No "
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+#, fuzzy
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+"Con questa opzione, un carattere che non possa essere rappresentato nella "
+"codifica scelta potrà venire approssimato ad uno o più caratteri somiglianti."
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "Etichetta ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "Scrivi etichetta ID3v1.x"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4022,22 +4016,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:878
+#: src/prefs.c:882
 #, 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:910
+#: src/prefs.c:917
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Gruppo di caratteri per le etichette ID3"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -4068,32 +4062,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:947
+#: src/prefs.c:954
 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:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "Analizzatore"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Analizzatore Riempi etichetta - Conversione Caratteri"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr ""
 "Converti il carattere trattino-basso '_' e la stringa '%20' nello spazio ' '"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Converti lo spazio ' ' nel trattino-basso '_'"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4102,11 +4096,11 @@ msgstr ""
 "dall'analizzatore per etichette, se questa opzione è attivata."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Analizzatore Rinomina File - Conversione Caratteri"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4115,18 +4109,18 @@ msgstr ""
 "dall'analizzatore per nomi di file, se questa opzione è attivata."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 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:1034
+#: src/prefs.c:1041
 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:1038
+#: src/prefs.c:1045
 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 "
@@ -4139,15 +4133,15 @@ msgstr ""
 "Voce'invece di 'Testo In Una Voce')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "Finestra Analizzatore"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "Apri la Finestra Analizzatore all'avvio"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4155,11 +4149,11 @@ msgstr ""
 "Attiva questa opzione per aprire automaticamente la finestra "
 "dell'analizzatore all'avvio di EasyTAG."
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "Finestra dell'analizzatore sempre in primo piano"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4168,16 +4162,16 @@ msgstr ""
 "se questa opzione è attivata."
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "Campi"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "Sovrascrivi i campi durante la scansione dell'etichetta"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4186,11 +4180,11 @@ msgstr ""
 "Verranno riempiti solo i campi vuoti se disattivata, se questa opzione è "
 "attivata."
 
-#: src/prefs.c:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "Imposta questo testo come commento predefinito:"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4199,12 +4193,12 @@ msgstr ""
 "commento quando usi l'analizzatore 'Riempi Etichetta'."
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 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:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4215,42 +4209,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "Database CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 msgid "Server Settings for Automatic Search"
 msgstr "Impostazioni Server per Ricerca Automatica"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "Nome:"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "Porta:"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "Percorso CGI:"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 msgid "Server Settings for Manual Search"
 msgstr "Impostazioni Server per Ricerca Manuale"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 msgid "Local CD Data Base"
 msgstr "Database Locale CD"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 msgid "Path :"
 msgstr "Percorso:"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4263,52 +4257,52 @@ msgstr ""
 "'soundtrack' e 'misc'."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "Impostazioni Proxy"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "Utilizza un proxy"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "Imposta come attive le impostazioni del server proxy."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "Nome Nodo:"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "Nome del server proxy."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "Porta del server proxy."
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "Nome Utente:"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "Nome dell'utente per il server proxy."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "Password Ptente:"
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 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:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "Elenco Nomi Traccia"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4316,7 +4310,7 @@ msgstr ""
 "Seleziona il file audio corrispondente (concordemente alla posizione o al "
 "DLM se attivato più sotto)"
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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."
@@ -4326,7 +4320,7 @@ msgstr ""
 "attivata."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4337,15 +4331,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "Conferma"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "Conferma l'uscita dal programma"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4353,19 +4347,19 @@ msgstr ""
 "Apre una finestra di dialogo per chiedere conferma prima di uscire dal "
 "programma, se questa opzione è attivata."
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "Conferma la scrittura delle etichette"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "Conferma il cambio del nome dei file"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "Conferma l'eliminazione dei file"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "Conferma la scrittura della playlist"
 
@@ -4373,37 +4367,37 @@ msgstr "Conferma la scrittura della playlist"
 #. //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
+#: src/prefs.c:1429
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Applica le modifiche (senza salvare) e chiudi questa finestra"
 
-#: src/prefs.c:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "Chiudi questa finestra senza salvare"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 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:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Esempio: %.*d_-_Nome_traccia_1.mp3)"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "Le modifiche sono state applicate"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "La configurazione è stata salvata"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "La configurazione è rimasta invariata"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4414,37 +4408,37 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "Non una cartella"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Il riproduttore audio '%s' non può essere trovato!"
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "Riempi Etichetta"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "Rinomina File e Cartella"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "Processa Campi"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "L'etichetta è stata analizzata con successo..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "L'etichetta è stata analizzata con successo... (%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
@@ -4452,23 +4446,23 @@ msgstr ""
 "Analizzatore Etichetta: strano.... l'estensione '%s' non è stata trovata nel "
 "nome file '%s'!"
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, 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:663
+#: src/scan.c:667
 #, 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:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "Il nuovo nome del file è stato processato con successo..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Il nuovo nome del file è stato processato con successo... (%s)"
@@ -4476,41 +4470,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "Scansione Etichetta e Nome File"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "Analizzatore: "
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "Seleziona il tipo di analizzatore da usare"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "Apri la finestra dell'analizzatore / Scansiona i file selezionati"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "Opzioni Analizzatore"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "Mostra/Nascondi Modificatore Maschere"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "Mostra/Nascondi Legenda"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4520,15 +4514,15 @@ msgstr ""
 "etichette."
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "Anteprima riempimento etichette..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr "Anticipa la maschera con il percorso corrente"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4541,15 +4535,15 @@ msgstr ""
 "carattere è /, altrimenti è relativo al vecchio percorso."
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "Anteprima rinomina file..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "Seleziona i campi:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4558,126 +4552,126 @@ msgstr ""
 "Scegli quelli di tuo proprio interesse."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
 msgstr "Processa il campo nome"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "Processa il campo titolo"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "Processa il campo artista"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "Processa il campo album"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "Processa il campo genere"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "Processa il campo commento"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "Processa il campo compositore"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 msgid "Process original artist field"
 msgstr "Processa il campo artista originale"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "Processa il campo diritti d'autore"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr "Processa il campo URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr "Processa il campo nome del codificatore"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "Inverti Selezione"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "Seleziona/Deseleziona Tutto."
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Converti '_' e '%20' in ' '"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "Converti:"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "a:"
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4685,7 +4679,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:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4693,12 +4687,12 @@ msgstr ""
 "Il carattere spazio è sostituito con un trattino-basso. Esempio, prima: "
 "'Testo in una voce', dopo: 'Testo_in_una_voce'."
 
-#: src/scan.c:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4706,7 +4700,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:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4714,7 +4708,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:2325
+#: src/scan.c:2394
 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'."
@@ -4722,7 +4716,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:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4730,15 +4724,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:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "Inserisci uno spazio prima di una lettera maiuscola"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "Rimuovi i duplicati di spazi ed i trattini-bassi"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4746,7 +4740,7 @@ msgstr ""
 "Rimuovi tutti gli spazi fra le parole. Esempio, prima: 'Testo In Una Voce', "
 "dopo:  'TestoInUnaVoce'."
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4754,7 +4748,7 @@ msgstr ""
 "Viene inserito uno spazio prima di ogni lettera maiuscola. Esempio, prima:  "
 "'TestoInUnaVoce', dopo:  'Testo In Una Voce'."
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4765,183 +4759,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artista"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c : commento"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p : compositore"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r : diritti d'autore"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr "%d: numero disco"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : codificato da"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g : genere"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorato"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l : numero di tracce"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : artista originale"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n : traccia"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t : titolo"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y : anno"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "Modificatore Maschera"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "Crea Nuova Maschera"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "Sposta Su questa Maschera"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "Sposta Giù questa Maschera"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "Duplica Maschera"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "Aggiungi Maschere Predefinite"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "Rimuovi Maschera"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "Salva Maschere"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "Nuova_maschera"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "Copia: nessuna riga selezionata!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "Rimuovi: nessuna riga selezionata!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "Sposta su: nessuna riga selezionata!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "Sposta giù: nessuna riga selezionata!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "ERRORE: non riesco a scrivere il file di configurazione %s (%s)\a"
 
-#: src/setting.c:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Non riesco ad aprire il file di configurazione '%s' (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 msgid "Loading default configuration..."
 msgstr "Carico la configurazione predefinita..."
 
-#: 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, 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:1278
+#: src/setting.c:1277
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "ERRORE: non riesco a scrivere la lista nel file %s (%s)\a"
 
 #. Fall back to defaults
-#: src/setting.c:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Carico le maschere preimpostate di 'Riempi Etichetta'..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "Carico le maschere preimpostate di 'Rinomina File'..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Carico le maschere preimpostate di 'Rinomina Cartella'..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "ERRORE: la variabile d'ambiente HOME non è definita!"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ERRORE: non riesco a creare la cartella '%s' (%s)!"
@@ -4995,42 +4989,75 @@ msgstr ""
 "d'uscita potrebbe risultare danneggiato o troncato."
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr "DLL '%s' non trovata. Provo a caricarla..."
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr "Non è stato possibili caricare la DLL '%s'"
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr "Questa versione di '%s' contiene '%s'"
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr "La funzione '%s' non è stata trovata nella dll '%s'"
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, c-format
 msgid "Audio player: '%s'"
 msgstr "Riproduttore Audio: '%s'"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr "Cartella delle impostazioni EasyTAG: '%s'"
 
+#~ msgid " OK "
+#~ msgstr " OK"
+
+#~ msgid " Yes "
+#~ msgstr " Sì "
+
+#~ msgid " No "
+#~ msgstr " No "
+
+#~ msgid " Apply "
+#~ msgstr " Applica "
+
+#~ msgid " Save "
+#~ msgstr " Salva "
+
+#~ msgid " Cancel "
+#~ msgstr " Annulla "
+
+#~ msgid " Close "
+#~ msgstr " Chiudi "
+
+#~ msgid " Write "
+#~ msgstr " Scrivi "
+
+#~ msgid " Execute "
+#~ msgstr " Esegui "
+
+#~ msgid " Search "
+#~ msgstr " Ricerca "
+
+#~ msgid " Browse... "
+#~ msgstr " Sfoglia... "
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/ja.gmo b/po/ja.gmo
index 20836e0..3685a64 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index 100cf10..986e79e 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-10-15 23:53+0200\n"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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:134
+#: src/about.c:140
 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,199 +25,194 @@ msgstr ""
 "クールな GTK+ インタフェースを採用しているので、GNU/Linux で簡単にタグの編集"
 "ができます。"
 
-#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(ドイツ語)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(ロシア語)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(オランダ語)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(スウェーデン語)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(ハンガリー語)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(イタリア語)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(日本語)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(ウクライナ語)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(チェコ語)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(スペイン語)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(ポーランド語)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(ルーマニア語)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(デンマーク語)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(ギリシア語)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(ブラジル・ポルトガル語)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr "(ブルガリア語)"
 
-#: src/about.c:171
+#: src/about.c:177
 msgid "(Chinese translation)"
 msgstr "(中国語)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(中国語)"
+
+#: src/about.c:179
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(ギリシア語)"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(ドイツ語)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "コメント"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "情報..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "情報"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(ビルドした日付: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(ビルド環境: GTK+ %d.%d.%d と id3lib %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "作者: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-メール: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "ウェブ・ページ: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "紹介:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 #, 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
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(MP3 ファイルはサポートしていません)"
 
-#: src/about.c:410
+#: src/about.c:452
 #, fuzzy
 msgid "available"
 msgstr "有効なメモリがありません"
 
-#: src/about.c:420
+#: src/about.c:463
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(Ogg Vorbis ファイルはサポートしていません)"
 
-#: src/about.c:430
+#: src/about.c:475
 #, fuzzy
 msgid "Speex file support"
 msgstr "(MP3 ファイルはサポートしていません)"
 
-#: src/about.c:440
+#: src/about.c:491
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(FLAC ファイルはサポートしていません)"
 
-#: src/about.c:450
+#: src/about.c:504
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(MP4/AAC ファイルはサポートしていません)"
 
-#: src/about.c:460
+#: src/about.c:516
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(MP3 ファイルはサポートしていません)"
@@ -225,33 +220,33 @@ msgstr "(MP3 ファイルはサポートしていません)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "貢献者"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "翻訳:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "全般:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "変更点"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "ファイルのオープン中にエラー: '%s' (%s)"
@@ -427,7 +422,7 @@ msgstr "サンプリングレートで降順"
 msgid "Open File(s) with ..."
 msgstr "他のプログラムで開く..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "全ファイルの選択"
 
@@ -435,7 +430,7 @@ msgstr "全ファイルの選択"
 msgid "Unselect All Files"
 msgstr "全ファイルの未選択"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "ファイル選択の反転"
 
@@ -581,7 +576,7 @@ msgstr "フォルダ名の変更..."
 msgid "Reload Directory"
 msgstr "フォルダの再読み込み"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "他のプログラムで参照 ..."
 
@@ -720,17 +715,17 @@ msgstr "UI をマージできませんでした (エラー: %s)\n"
 msgid "Ready to start..."
 msgstr "起動完了..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 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
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "確認..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -738,65 +733,113 @@ msgstr ""
 "いくつかのファイルを変更しましたが、保存していません...\n"
 "フォルダを移動する前に保存しますか？"
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 msgid "<All albums>"
 msgstr "<全てのアルバム>"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "ツリー"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "ファイル名"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "タイトル"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "演奏者"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "アルバム名"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "制作年"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "トラック"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "ジャンル"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "コンポーザ"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "演奏者:"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "ライセンス"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "URL"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "エンコーダ"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "# アルバム"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 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
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "上のフォルダへ移動します"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "参照するフォルダを入力して下さい。"
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "ツリー"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "参照するフォルダを選択して下さい！"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "演奏者 / アルバム"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "フォルダ名の変更"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "変更後のフォルダ '%s' の名前 : "
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "使用するマスク :"
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 msgid "If activated, it will use masks to rename directory."
 msgstr "これを有効にすると、フォルダ名を変更する時のマスクとして使用します"
 
-#: src/browser.c:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -804,31 +847,31 @@ 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
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "スキャナマスクが正しくありません"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "エラー..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "フォルダ名を入力して下さい！"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -839,16 +882,22 @@ msgstr ""
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -857,7 +906,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -866,7 +915,7 @@ msgstr ""
 "このフォルダ名が既に存在しているので、名前を変更できません！\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -881,86 +930,86 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "フォルダ名を変更しました"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "実行するプログラム :"
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "実行するプログラム名を入力して下さい。引数は現在のフォルダ名になります。"
 
-#: src/browser.c:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "他のプログラムで開く..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "実行するプログラム名を入力して下さい。引数は現在のファイル名になります。"
 
-#: src/browser.c:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "プログラム名を入力して下さい！"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "プログラム '%s' が見つかりません！"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "%sを実行できません！ (エラー %d)\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "子プロセスを作成すできません！\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "コマンドと引数 : '%s %s'"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "演奏者 / アルバム"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 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
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "トラック名"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "演奏時間"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "CD データベースの検索"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "自動検索"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 msgid "Request CD database :"
 msgstr "CD データベースへの要求 :"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -968,16 +1017,16 @@ msgstr ""
 "指定したファイルを使って CddbID を生成するようCDDBへ自動的に要求します (順番"
 "も関係します！)"
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "検索の停止..."
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -988,138 +1037,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "手動検索"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "単語 :"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "検索する単語を入力して下さい (区切り記号: スペース ' ' または '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "検索対象 :"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "全てのフィールド"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "その他"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "全てのカテゴリ"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "ブルース"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "クラッシック"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "カントリー"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "フォーク"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "ジャズ"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "その他"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "ニューエイジ"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "レゲ"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "ロック"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "サウンドトラック"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "ファンク、ソウル、ラップ、ポップ、インダストリアル、メタルなどを含む"
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "映画、ショー"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "上記のカテゴリに一致しないその他のもの"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr " カテゴリ "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "結果 :"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "検索 :"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "次の一覧の中に検索する単語を入力して下さい"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "次を検索します"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "前を検索します"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 #, fuzzy
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "赤線または全ての線を表示します"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "全ての行を未選択にする"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "選択した行を未選択に反転します"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "全ての行を選択します"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1132,52 +1181,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "セット先 :"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 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
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "トラック #"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 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
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "各ファイルに現在のスキャナを実行する"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 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
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1190,15 +1223,15 @@ msgstr ""
 "Levenshtein Metric) を適用します (これは楽曲ファイルに相当するものを選択した"
 "り、CDDB の結果を適用する時に使用します)"
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "指定した行または (もし行が指定されなければ) 全ての行を読み込みます"
 
-#: src/cddb.c:798 src/misc.c:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "検索の準備完了..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1206,76 +1239,76 @@ msgstr ""
 "アルバム: '%s', 演奏者: '%s', 時間: '%s', 制作年: '%s', ジャンル: '%s', ID: "
 "'%s'"
 
-#: src/cddb.c:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "選択範囲を反転する"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "トラック番号で並び替え"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "トラック名で並べ替え"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "ホスト '%s' の検索中 ..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "ホスト '%s' (%s) の名前解決ができません！"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "新しいソケット (%s) を生成できません！"
 
 #. Open connection to the server
-#: src/cddb.c:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "ホスト '%s' (ポート '%d') に接続中 ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "ホスト '%s' (%s) に接続できません！"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "ホスト '%s' に接続しました"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "データ (%s) の受信中 ..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "cddb からの応答 (%s) の読み込み中にエラー！"
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "ファイル '%s' (%s) を生成できません"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "リクエストの送信中 ..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "リクエスト (%s) を送信できません！"
@@ -1284,90 +1317,90 @@ msgstr "リクエスト (%s) を送信できません！"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "データの受信中 ..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 msgid "The server returned a wrong answer!"
 msgstr "サーバがおかしなデータを返してきました！"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "サーバがおかしなデータを返してきました！ (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
 msgstr "すみません、現在ウエブ検索はダウンしています！"
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "一致するアルバムが %d 個見つかりました"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "%d ページのデータの受信中..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "%d ページのデータの受信中..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr "さらに読み込んだ結果..."
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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
+#: src/cddb.c:2893
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d 個のファイルを選択しました"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 #, fuzzy
 msgid "Local CD search..."
 msgstr "検索の準備完了..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "リクエストの要求中 (CddbId: %s, トラック番号: %d, サイズ: %d) ..."
 
-#: src/cddb.c:3268
+#: src/cddb.c:3276
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "一致するアルバムが %d 個見つかりました"
 
-#: src/cddb.c:3364
+#: src/cddb.c:3372
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "ファイル '%s' (%s) が開けません"
 
 #. Load the track list of the album
-#: src/cddb.c:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "アルバムのトラック一覧の読み込み中 ..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1380,7 +1413,7 @@ msgstr ""
 "\n"
 "続行してもよろしいですか？"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "CDDB からタグの書き込み中..."
 
@@ -1565,72 +1598,72 @@ msgstr "西洋 (ISO-8859-15)"
 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"
+#: src/charset.c:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 "ファイル名 '%s' を UTF-8 (%s) エンコーディングに変換できませんでした。\n"
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "不正な UTF-8"
 
-#: src/charset.c:641
-#, c-format
+#: src/charset.c:642
+#, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 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"
+#: src/charset.c:706
+#, fuzzy, c-format
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 "'%s' という文字列を UTF-8 (%s) エンコーディングに変換できませんでした。\n"
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, fuzzy, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "EasyTAG %s (PID: %d)の起動中...\n"
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, fuzzy, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "現在使用中の id3lib のバージョン %d.%d.%d ...\n"
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, fuzzy, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "現在使用中の id3lib のバージョン %d.%d.%d ...\n"
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr ""
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, fuzzy, c-format
 msgid "Setting locale : '%s'"
 msgstr "ファイル名の変更中 (%s)"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, fuzzy, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr "現在使用しているロケールは '%s' (最終的には '%s')...\n"
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s - 開発者 %s (ビルド日時 %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "ウェブページ: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr ""
@@ -1638,140 +1671,140 @@ msgstr ""
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "参照"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "ファイル"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "読み込み専用のファイルです"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 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
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, レイヤー ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "ビットレート:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? KB/秒"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "周波数:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 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
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "サイズ:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? KB"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "演奏時間:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "タグ"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "共通"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "タイトル:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "このタイトルを選択したファイルにタグ付けします"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "演奏者:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr "この演奏者を選択したファイルにタグ付けします"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "アルバム:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr "このアルバム名を選択したファイルにタグ付けします"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 #, fuzzy
 msgid "CD:"
 msgstr "CD"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr "このディスク番号を選択したファイルにタグ付けします"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "制作年:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "この制作年を選択したファイルにタグ付けします"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 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
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "トラック #:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1779,274 +1812,274 @@ msgstr ""
 "表示されているファイルと同じフォルダで、選択したトラック数に対するファイル数"
 "をセットします"
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr "このトラック番号を選択したファイルにタグ付けします"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "ジャンル:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "このジャンルを選択したファイルにタグ付けします"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "コメント:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 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
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "コンポーザ:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr "このコンポーザを選択したファイルにタグ付けします"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "演奏者:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr "この演奏者を選択したファイルにタグ付けします"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "ライセンス:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "このライセンスを選択したファイルにタグ付けします"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "このURLを選択したファイルにタグ付けします"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "エンコーダ:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr "このエンコーダを選択したファイルにタグ付けします"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "画像"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "画像:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "画像をドラッグ＆ドロップして追加できます"
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "これらの画像を選択したファイルにタグ付けします"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "画像をタグに追加します (ドラッグ＆ドロップも可能)"
 
-#: src/easytag.c:1051
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr "選択した画像または全ての画像を削除します"
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "選択した画像を保存します"
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "選択した画像のプロパティを設定します"
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "選択したファイルにタイトル '%s' をタグ付けしました"
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "選択したファイルからタイトルを削除しました"
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "選択したファイルに演奏者 '%s' をタグ付けしました"
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "選択したファイルから演奏者を削除しました"
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "選択したファイルにアルバム名 '%s' をタグ付けしました"
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "選択したファイルからアルバム名を削除しました"
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "選択したファイルにディスク番号 '%s' をタグ付けしました"
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "選択したファイルからディスク番号を削除しました"
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "選択したファイルに制作年 '%s' をタグ付けしました"
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "選択したファイルから制作年を削除しました"
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "選択したファイルにトラック番号 'xx/%s' をタグ付けしました"
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr "選択したファイルにトラック番号 'xx' をタグ付けしました"
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "選択したファイルからトラック番号を削除しました"
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "選択したトラック番号を順番に付与しました"
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "選択したファイルにジャンル '%s' をタグ付けしました"
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "選択したファイルからジャンルを削除しました"
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "選択したファイルにコメント '%s' をタグ付けしました"
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "選択したファイルからコメントを削除しました"
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "選択したファイルにコンポーザ '%s' をタグ付けしました"
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "選択したファイルからコンポーザを削除しました"
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "選択したファイルにオリジナルの演奏者 '%s' をタグ付けしました"
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "選択したファイルからオリジナル演奏者を削除しました"
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "選択したファイルにライセンス '%s' をタグ付けしました"
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "選択したファイルからライセンスを削除しました"
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "選択したファイルに URL '%s' をタグ付けしました"
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "選択したファイルから URL を削除しました"
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "選択したファイルにエンコーディング '%s' をタグ付けしました"
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr "選択したファイルからエンコーディングを削除しました"
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "選択したファイルに画像 '%s' をタグ付けしました"
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "選択したファイルから画像を削除しました"
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "モードとマスクを指定して、同様の操作を繰り返して下さい"
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "全てのタグはスキャン済みです"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "全てのタグが削除されています"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "全てのファイルが保存されました..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "ファイルの一部が保存されました..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "ファイルの一部が削除されました..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "全てのファイルが削除されました..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2055,16 +2088,16 @@ msgstr ""
 "次のファイル にタグを書き込みますか？\n"
 "%s"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "タグの書き込み中..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr "ファイル名とフォルダ名の変更..."
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2078,11 +2111,11 @@ msgstr ""
 "'%s'"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr "フォルダ名の変更..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2096,11 +2129,11 @@ msgstr ""
 "'%s'"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "ファイル名の変更中..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2113,17 +2146,17 @@ msgstr ""
 "=>\n"
 "'%s'"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "'%s' のタグが書き込まれました"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 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
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2132,14 +2165,14 @@ msgstr ""
 "ファイル '%s' にタグを書き込めません！\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, 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
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2152,11 +2185,11 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "ファイル名は変更されませんでした..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2169,7 +2202,7 @@ msgstr ""
 "次のファイルは既に存在していますからです:\n"
 "'%s'"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2181,16 +2214,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "ファイル名 '%s' => '%s' へ変更されました"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "ファイル名が変更されました..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2202,17 +2235,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "ファイル '%s' => '%s' へ移動しました"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
 msgstr "ファイルを移動しました..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2225,11 +2258,11 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
 msgstr "ファイルは移動しませんでした..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2238,16 +2271,16 @@ msgstr ""
 "次のファイルを完全に削除しても宜しいですか？\n"
 "'%s'"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "ファイルの削除..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "ファイル '%s' が削除されました"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2259,109 +2292,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "検索中..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "ファイル: '%s'"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "このフォルダ配下に %d 個のファイルが見つかりました"
 
-#: src/easytag.c:3239
+#: src/easytag.c:3356
 #, 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
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u 個のファイル"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
 msgstr "このフォルダ配下にはファイルがありませんでした！"
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "このフォルダの中にはファイルがありませんでした！"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "検索中..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "  検索の停止...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "参照するフォルダを選択して下さい！"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "選択したファイルにこのフィールドをタグ付けします"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "'_' と '%20' をスペースに変換する"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "' ' を '_' に変換する"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "全て大文字にする"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "全て小文字にする"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "最初の文字だけ大文字にする"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "単語の最初の文字だけ大文字にする"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "スペースを削除する"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "大文字の前にスペースを挿入する"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 msgid "Remove duplicate spaces or underscores"
 msgstr "重複したスペースまたはアンダースコアを削除する"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: 異常終了しました！ (PID: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, fuzzy, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "シグナル %s (%d) を受け取りました\a\n"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 "
@@ -2371,11 +2404,11 @@ msgstr ""
 "(`gdb easytag core` して 'bt' と 'l' コマンドの結果) を easytag@gmail.com ま"
 "でメールして下さい。"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "不明なシグナル"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2409,11 +2442,11 @@ msgstr ""
 "path_to/files     現在のフォルダからファイルを読み込む\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: 正常に終了しました。"
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2421,79 +2454,79 @@ msgstr ""
 "いくつかのファイルを変更しましたが、保存していません...\n"
 "プログラムを終了する前に保存しますか？"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr " 本当にプログラムを終了しますか？"
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "ID3 タグ"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis タグ"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis タグ"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "APE タグ"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC タグ"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "MP3 ファイル"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "MP2 ファイル"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis ファイル"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 #, fuzzy
 msgid "Speex File"
 msgstr "次のファイルへジャンプします"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "FLAC ファイル"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "MusePack ファイル"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "Monkey's オーディオ・ファイル"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr "MP4/AAC ファイル"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 #, fuzzy
 msgid "Wavpack File"
 msgstr "MusePack ファイル"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "画像"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2501,14 +2534,14 @@ msgid "%d kb/s"
 msgstr "%d KB/秒"
 
 #. Samplerate
-#: src/et_core.c:2917 src/flac_header.c:304 src/monkeyaudio_header.c:91
+#: src/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2519,11 +2552,11 @@ msgstr ""
 "変換できませんでした : '%s'\n"
 "(環境変数 G_FILENAME_ENCODING を設定してみて下さい)"
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "ファイル名の翻訳"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "ファイル名 '%s' が %d 文字だけ多すぎるので切りつめます！\n"
@@ -2533,7 +2566,7 @@ msgstr "ファイル名 '%s' が %d 文字だけ多すぎるので切りつめ�
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "エンコーダ:"
@@ -2542,49 +2575,54 @@ msgstr "エンコーダ:"
 #. 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/flac_header.c:312 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
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "ファイルのオープン中にエラー: '%s' (%s)\n"
 "\a"
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "ERROR: ファイル '%s' (%s) にコメントを書き込むのに失敗しました。"
 
-#: src/flac_tag.c:990 src/ogg_tag.c:759
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "'%s' のタグが書き込まれました"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "'%s' のタグを削除しました"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "'%s' (%s) の ID3v1 タグの削除中にエラー"
 
-#: src/id3_tag.c:490 src/id3_tag.c:557
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "'%s' (%s) の ID3v2 タグの削除中にエラー"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "'%s' (%s) の ID3v2 タグの更新中にエラー"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2609,77 +2647,77 @@ msgstr ""
 "\n"
 "ファイル : %s"
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "'%s' (%s) の ID3v1 タグの更新中にエラー"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "'%s' のタグを更新しました"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "エラーはありません"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "有効なメモリがありません"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "解析するデータがありません"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "データのフォーマットが不適切です"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "書き込むバッファがありません"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "バッファが小さすぎます"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "フレーム ID が正しくありません。"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "指定したフィールドが見つかりません"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "フィールドの種類が不明です"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "既にタグがファイルについています"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "タグのバージョンが正しくありません"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "解析するファイルがありません"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "読み込み専用のファイルに書き込もうとしています"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "圧縮/非圧縮エラーです"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "不明なエラーです！"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2688,127 +2726,83 @@ msgstr ""
 "次に示すような壊れたファイル '%s' は\n"
 "id3lib の中でエラーを引き起こすためプログラムが正常に処理しません。"
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
 msgstr "壊れたファイル..."
 
-#: src/log.c:91
+#: src/log.c:95
 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:773
+msgid "Select file..."
+msgstr "ファイルの選択..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "フォルダの選択..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "ファイルの選択..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 #, fuzzy
 msgid "Warning..."
 msgstr "検索中..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "演奏一覧の生成"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "M3U 演奏一覧の名前"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "フォルダ名を使用する"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "マスクの編集"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "演奏一覧のオプション"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "指定したファイルのみ含める"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2816,29 +2810,29 @@ msgstr ""
 "これを有効にすると、選択したファイルのみ演奏一覧へ書き込まれます (無効にする"
 "と、全てのファイルが書き込まれます)"
 
-#: src/misc.c:1397
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "演奏一覧の中でファイルのフルパス名を使用する"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 msgid "Use relative path for files in playlist"
 msgstr "演奏一覧の中でファイルに関連するパス名を使用する"
 
 #. Create playlist in parent directory
-#: src/misc.c:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "演奏一覧を親フォルダに生成する"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "これを有効にすると、演奏一覧を親フォルダに生成します"
 
 #. DOS Separator
-#: src/misc.c:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "DOS フォルダの区切りを使用する"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2846,23 +2840,23 @@ msgstr ""
 "これは UNIX フォルダの区切り '/' を DOS の区切り '\\' へ置き換えるオプション"
 "です"
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "演奏一覧の内容"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "演奏一覧ファイルの保存のみ"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "ファイル名で使用する情報の保存のみ"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "書き込む情報 :"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2871,12 +2865,12 @@ msgstr ""
 "演奏一覧ファイル '%s' は既に存在します！\n"
 "上書きしますか？"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "演奏一覧の書き込み中..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2885,44 +2879,24 @@ msgstr ""
 "演奏一覧ファイル '%s' を書き込めません！\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "演奏一覧ファイル '%s' が書き込まれました"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 msgid "CD"
 msgstr "CD"
 
-#: 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 "URL"
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "エンコーダ"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "ファイルの検索"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2930,112 +2904,112 @@ msgstr ""
 "示します)"
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "対象 :"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "タグ"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "大小文字を無視する"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "一致するファイル: %d 個"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "TEXT ファイルからファイル名を読み込む"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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:2787
+#: src/misc.c:2738
 msgid " Load "
 msgstr " 読み込む "
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, 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
+#: src/misc.c:2782 src/misc.c:2876
 #, 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
+#: src/misc.c:2791 src/misc.c:2885
 #, 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
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 msgid "Delete all blank lines"
 msgstr "空行を全て削除する"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2861 src/misc.c:2955
+#: src/misc.c:2812 src/misc.c:2906
 #, 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
+#: src/misc.c:2821 src/misc.c:2915
 #, 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "再読込"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "演奏一覧ファイルの保存のみ"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "全ての行を選択します"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 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
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "空行を挿入する"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "この行を削除する"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "このマスクを上に移動します"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "このマスクを下に移動します"
@@ -3053,7 +3027,7 @@ msgstr "オーディオ"
 msgid "Unknown"
 msgstr "不明"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr "MP4 フォーマットが不正です"
 
@@ -3078,8 +3052,7 @@ msgstr ""
 msgid "Single channel"
 msgstr ""
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "残りのファイルに対して処理を繰り返します"
 
@@ -3117,48 +3090,48 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "ERROR: ファイル '%s' を vorbis (%s) として開くのに失敗しました。"
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "警告: Ogg Vorbis ファイル '%s' には ID3v2 タグがあります。"
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "画像の追加"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "全てのファイル"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG と JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "画像 %d/%d のプロパティ "
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "種類:"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "説明:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "画像 %d/%d の保存"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3169,115 +3142,120 @@ msgstr ""
 "'%s'\n"
 "上書きしてもよろしいですか？"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "ファイルの保存..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "JPEG 画像"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "PNG 画像"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "不明"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "PNG 形式のアイコン"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "別の種類のアイコン"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "ジャケット (表)"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "ジャケット (裏)"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr "チラシ"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr "メディア (例: CDのラベル)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr "メインの演奏者/出演者/ソロ"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "演奏者/出演者"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "指揮者"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "バンド/オーケストラ"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "作詞"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "録音場所"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "録音時間"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "演奏時間"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "映画/ビデオのキャプチャ"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "A bright coloured fish"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "イラスト"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "バンド/演奏者のロゴ"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "販売元/スタジオのロゴ"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "不明"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "ピクセル"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "種類"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "説明"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3285,11 +3263,16 @@ msgstr ""
 "画像用のバッファを生成するために必要なデータを読み込むことができなかったた"
 "め、画像を表示できません。"
 
-#: src/picture.c:987
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr "画像ファイルの読み込み中..."
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3300,7 +3283,7 @@ msgstr ""
 "'%s'\n"
 "(%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr "画像ファイルを読み込んでいません..."
 
@@ -3697,7 +3680,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "システムのエンコーディングに強制的に変換して音訳してみる"
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3712,7 +3695,7 @@ msgid ""
 "characters"
 msgstr "システムのエンコーディングに強制的に変換して変換できない文字は無視する"
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3908,7 +3891,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr ""
 
@@ -3929,35 +3912,45 @@ msgstr "ファイルのタグ情報を書き込む際に使用する文字セッ
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 #, fuzzy
 msgid "No"
 msgstr " いいえ "
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+#, fuzzy
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+"このオプションを指定すると、文字が対象となる文字セットで表現できない時は、そ"
+"の文字に似た一個以上の文字に近似します"
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "ID3 タグ"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "ID3 Ver1.x でタグを書き込む"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3965,22 +3958,22 @@ msgstr ""
 "これを有効にすると、MP3 ファイルの最後に ID3 Ver1 タグが追加/更新されます (そ"
 "れ以外は削除します)"
 
-#: src/prefs.c:878
+#: src/prefs.c:882
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "ファイルのタグ情報を書き込む際に使用する文字セットです"
 
 #. Character Set for reading tag
-#: src/prefs.c:910
+#: src/prefs.c:917
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "ID3 タグの文字セット"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -4009,31 +4002,31 @@ msgstr ""
 "込まれたタグを読み込むために 'Windows-1251' を選択して下さい (Unix の場合は "
 "'KOI8-R')"
 
-#: src/prefs.c:947
+#: src/prefs.c:954
 msgid "Character set used to read tag data in the file."
 msgstr "ファイルのタグ情報を読み込む際に使用する文字セットです"
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "スキャナ"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "タグ付与スキャナ - 文字セットの変換"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "アンダースコア '_' と文字列 '%20' をスペース ' ' に変換する"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "スペース ' ' をアンダースコア '_' に変換する"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4041,11 +4034,11 @@ msgstr ""
 "これを有効にすると、タグのスキャナでマスクを適用した際にこの変換を使用します"
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "ファイル名変更のスキャナ - 文字セットの変換"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4054,17 +4047,17 @@ msgstr ""
 "します"
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "PFS - 文字セットの変換"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1034
+#: src/prefs.c:1041
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "前置詞や箇条書きの場合は先頭にある文字を大文字にしない"
 
-#: src/prefs.c:1038
+#: src/prefs.c:1045
 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 "
@@ -4076,15 +4069,15 @@ msgstr ""
 "Entry' ではなく 'Text in an Entry')"
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "スキャナ・ウィンドウ"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "起動時にスキャナ・ウィンドウを開く"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4092,11 +4085,11 @@ msgstr ""
 "これを有効にすると、EasyTAG が起動されたら自動的にスキャナ・ウィンドウが開き"
 "ます"
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "スキャナ・ウィンドウを常に上に配置する"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4105,16 +4098,16 @@ msgstr ""
 "れます"
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "フィールド"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "タグのスキャン時にフィールドを上書きする"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4122,11 +4115,11 @@ msgstr ""
 "これを有効にすると、スキャナはフィールドの中のテキストを新しいテキストに置き"
 "換えます (無効にすると、空のフィールドのみ埋められます)"
 
-#: src/prefs.c:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "このテキストをデフォルトのコメントにする :"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4135,12 +4128,12 @@ msgstr ""
 "合にこのオプションを有効にして下さい"
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 "デフォルトのコメントに CRC32 を使用します (ID3 タグが付いたファイルのみ)"
 
-#: src/prefs.c:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4151,44 +4144,44 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "CD データベース"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 msgid "Server Settings for Automatic Search"
 msgstr "自動検索のサーバ側の設定"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "名前 :"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "ポート番号 :"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "CGI パス名 :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 msgid "Server Settings for Manual Search"
 msgstr "手動検索のサーバ側の設定"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "CD データベース"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 #, fuzzy
 msgid "Path :"
 msgstr "CGI パス名 :"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4197,58 +4190,58 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "プロキシの設定"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "プロキシを使う"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "利用するプロキシ・サーバを入力して下さい"
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "ホスト名 :"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "プロキシ・サーバの名前"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "プロキシ・サーバのポート番号"
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "ユーザ名 :"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "プロキシ・サーバに対するユーザ名です"
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "ユーザ・パスワード :"
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 msgid "Password of user for the the proxy server."
 msgstr "プロキシ・サーバに対するユーザのパスワードです"
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "トラック名の一覧"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr "関連する楽曲ファイルを選択する (位置または DLM に相当するもの)"
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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."
@@ -4257,7 +4250,7 @@ msgstr ""
 "ファイルも自動的に選択します"
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4266,33 +4259,33 @@ msgstr "楽曲ファイルの名前に一致するタイトルに DLM を適用�
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "確認メッセージ"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "プログラムの終了を確認する"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr "これを有効にすると、プログラム終了時に確認ダイアログが表示されます"
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "タグの書き込みを確認する"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "ファイル名の変更を確認する"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "ファイルの削除を確認する"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "演奏一覧の書き込みを確認する"
 
@@ -4300,37 +4293,37 @@ msgstr "演奏一覧の書き込みを確認する"
 #. //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
+#: src/prefs.c:1429
 msgid "Apply changes (but don't save) and close this window"
 msgstr "設定を適用して(保存はしません)、このダイアログを閉じます"
 
-#: src/prefs.c:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "設定を保存せずに、このダイアログを閉じます"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 msgid "Save changes and close this window"
 msgstr "設定を保存して、このダイアログを閉じます"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(例 : %.*d_-_Track_name_1.mp3)"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "設定が適用されました"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "設定が保存されました"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "設定が変更されませんでした"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4341,57 +4334,57 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "フォルダではありません"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "オーディオ・プレイヤー '%s' が見つかりません！"
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "タグを付与する"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "ファイル名とフォルダ名の変更"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "フィールドを編集する"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "タグのスキャンが完了しました..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "タグのスキャンが完了しました...(%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "スキャンエラー: セパレータ '%s' ('%s' の中にある) が見つかりません"
 
-#: src/scan.c:663
+#: src/scan.c:667
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "ファイル '%s' をシステムのエンコーディングに変換できませんでした"
 
-#: src/scan.c:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "新しいファイル名のスキャンが完了しました..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "新しいファイル名のスキャンが完了しました...(%s)"
@@ -4399,41 +4392,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "タグとファイル名のスキャン"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "スキャナ :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "使用するスキャナのタイプを選択して下さい"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "スキャナ・ウィンドを開くか、指定したファイルをスキャンします"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "スキャナに関連するオプションです"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "マスクエディタの表示を ON/OFF します"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "凡例の表示を ON/OFF します"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "このウィンドウを閉じます"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4442,15 +4435,15 @@ msgstr ""
 "選択または入力して下さい (タグフィールドを埋めるときに使用します)"
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "タグの埋め込みのプレビュー..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr "このパスをマスクする接頭子"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4463,15 +4456,15 @@ msgstr ""
 "て扱い、それ以外は相対パスとして扱います"
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "ファイル名変更のプレビュー..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "フィールドの選択:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4480,126 +4473,126 @@ msgstr ""
 "下さい。"
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
 msgstr "プロセスファイル名・フィールド"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "プロセスタイトル・フィールド"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "プロセスファイル・演奏者フィールド"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "プロセスアルバム・フィールド"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "プロセス・ジャンル・フィールド"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "プロセスコメント・フィールド"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "プロセス・コンポーザ・フィールド"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 msgid "Process original artist field"
 msgstr "プロセス・オリジナルの演奏者フィールド"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "プロセス・ライセンス・フィールド"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr "プロセス URL フィールド"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr "プロセス・エンコーディング・フィールド"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "選択範囲の反転"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "全て選択/選択解除"
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "'_' と '%20' を ' ' に変換する"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "変換 :"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "→"
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4607,7 +4600,7 @@ msgstr ""
 "アンダースコアまたは文字列 %20 を一つのスペースに置き換えます (例: 変換前"
 "='Text%20In%20An_Entry' 変換後='Text In An Entry')"
 
-#: src/scan.c:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4615,12 +4608,12 @@ msgstr ""
 "スペースを一つのアンダースコアに置き換えます (例: 変換前='Text In An Entry' "
 "変換後='Text_In_An_Entry')"
 
-#: src/scan.c:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4628,7 +4621,7 @@ msgstr ""
 "全てのフィールドの全ての文字を大文字に変換します (例: 変換前='Text IN AN "
 "entry' 変換後='TEXT IN AN ENTRY')"
 
-#: src/scan.c:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4636,7 +4629,7 @@ msgstr ""
 "全てのフィールドの全ての文字を小文字に変換します (例: 変換前='TEXT IN an "
 "entry' 変換後='text in an entry')"
 
-#: src/scan.c:2325
+#: src/scan.c:2394
 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'."
@@ -4644,7 +4637,7 @@ msgstr ""
 "全てのフィールドの最初の文字を大文字に、その他の文字を小文字置き換えます "
 "(例: 変換前='text IN An ENTRY' 変換後='Text in an entry')"
 
-#: src/scan.c:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4652,15 +4645,15 @@ msgstr ""
 "全てのフィールドの各単語の最初の文字を大文字に、その他の文字を小文字に置き換"
 "えます (例: 変換前='Text in an ENTRY' 変換後='Text In An Entry')"
 
-#: src/scan.c:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "大文字の前にスペースを挿入する"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "重複するスペースまたはアンダースコアを削除する"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4668,7 +4661,7 @@ msgstr ""
 "単語間にあるスペースを全て削除します (例: 変換前='Text In An Entry' 変換後"
 "='TextInAnEntry')"
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4676,7 +4669,7 @@ msgstr ""
 "各大文字の前にスペースを挿入します (例: 変換前='TextInAnEntry' 変換後='Text "
 "In An Entry')"
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4687,161 +4680,161 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "凡例"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a : 演奏者"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : アルバム"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c : コメント"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p : コンポーザ"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r : ライセンス"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : ディスクの番号"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : エンコーディング"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g : ジャンル"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : 無視"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l : トラック番号"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : 演奏者"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n : トラック"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t : タイトル"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y : 制作年"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "マスク・エディタ"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "新しいマスクを作成します"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "このマスクを上に移動します"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "このマスクを下に移動します"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "マスクの複製を作成します"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "デフォルト・マスクを追加します"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "マスクを削除します"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "マスクを保存します"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "新しいマスク"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "複製: マスクが選択されていません！"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "削除: マスクが選択されていません！"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "上に移動: マスクが選択されていません！"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "下に移動: マスクが選択されていません！"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr ""
 "ERROR: 設定ファイルを保存できません: %s (%s)\n"
 "\a"
 
-#: src/setting.c:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "設定ファイル '%s' を開けません (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "ファイル '%s' (%s) を生成または開けません"
 
-#: src/setting.c:1278
+#: src/setting.c:1277
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
@@ -4849,28 +4842,28 @@ msgstr ""
 "\a"
 
 #. Fall back to defaults
-#: src/setting.c:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "デフォルトの 'タグを埋める' マスクをロード中..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "デフォルトの 'ファイル名変更' マスクをロード中..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "デフォルトの 'フォルダ名変更' マスクをロード中..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "エラー: 環境変数 $HOME が定義されていません！\n"
 "\n"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "エラー: フォルダ '%s' を生成できません！ (%s)"
@@ -4920,42 +4913,75 @@ msgstr ""
 "められています。"
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr ""
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr ""
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr ""
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr ""
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, fuzzy, c-format
 msgid "Audio player: '%s'"
 msgstr "オーディオ・プレイヤーの起動"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid " OK "
+#~ msgstr " 確認 "
+
+#~ msgid " Yes "
+#~ msgstr " はい "
+
+#~ msgid " No "
+#~ msgstr " いいえ "
+
+#~ msgid " Apply "
+#~ msgstr " 適用 "
+
+#~ msgid " Save "
+#~ msgstr " 保存 "
+
+#~ msgid " Cancel "
+#~ msgstr " キャンセル "
+
+#~ msgid " Close "
+#~ msgstr " 閉じる "
+
+#~ msgid " Write "
+#~ msgstr " 書き込み "
+
+#~ msgid " Execute "
+#~ msgstr " 実行 "
+
+#~ msgid " Search "
+#~ msgstr "検索"
+
+#~ msgid " Browse... "
+#~ msgstr " 参照... "
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/nl.gmo b/po/nl.gmo
index e587055..cc61f32 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index f1597b6..fbd3db0 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-10-15 23:53+0200\n"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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:134
+#: src/about.c:140
 #, fuzzy
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
@@ -29,203 +29,198 @@ msgstr ""
 "FLAC-, Ogg Vorbis, MusePack en Monkeys Audio-bestanden. De handige GTK+-"
 "interface maakt het taggen erg eenvoudig."
 
-#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(Duitse vertaling)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(Russische vertaling)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(Nederlandse vertaling)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(Zweedse vertaling)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(Hongaarse vertaling)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(Italiaanse vertaling)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(Japanse vertaling)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(Oekraïnse vertaling)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(Tsjechische vertaling)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(Spaanse vertaling)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(Poolse vertaling)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(Roemeense vertaling)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(Deense vertaling)"
 
-#: src/about.c:168
+#: src/about.c:174
 #, fuzzy
 msgid "(Greek translation)"
 msgstr "(Duitse vertaling)"
 
-#: src/about.c:169
+#: src/about.c:175
 #, fuzzy
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Japanse vertaling)"
 
-#: src/about.c:170
+#: src/about.c:176
 #, fuzzy
 msgid "(Bulgarian translation)"
 msgstr "(Hongaarse vertaling)"
 
-#: src/about.c:171
+#: src/about.c:177
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(Japanse vertaling)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(Japanse vertaling)"
+
+#: src/about.c:179
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(Duitse vertaling)"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(Duitse vertaling)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "Commentaar"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "Info..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "Info"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(gecompileerd: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(gebruikt: GTK+ %d.%d.%d en id3lib %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "Auteur: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Homepage: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "Beschrijving:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 
-#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
-#: src/about.c:452 src/about.c:462
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 
-#: src/about.c:410
+#: src/about.c:452
 #, fuzzy
 msgid "available"
 msgstr "(Niet beschikbaar)"
 
-#: src/about.c:420
+#: src/about.c:463
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(Ondersteuning voor Ogg Vorbis-bestanden uitgeschakeld)"
 
-#: src/about.c:430
+#: src/about.c:475
 #, fuzzy
 msgid "Speex file support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 
-#: src/about.c:440
+#: src/about.c:491
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 
-#: src/about.c:450
+#: src/about.c:504
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 
-#: src/about.c:460
+#: src/about.c:516
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
@@ -233,33 +228,33 @@ msgstr "(Ondersteuning voor FLAC-bestanden uitgeschakeld)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "Met dank aan"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "Vertalingen:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "Algemeen:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "Wijzigingen"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr ""
@@ -437,7 +432,7 @@ msgstr "Aflopend op sample-frequentie"
 msgid "Open File(s) with ..."
 msgstr "Openen met..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "Alles selecteren"
 
@@ -445,7 +440,7 @@ msgstr "Alles selecteren"
 msgid "Unselect All Files"
 msgstr "Niets selecteren"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "Bestandsselectie omkeren"
 
@@ -593,7 +588,7 @@ msgstr "Map hernoemen..."
 msgid "Reload Directory"
 msgstr "Map herladen"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "Bladeren door map met ..."
 
@@ -737,17 +732,17 @@ msgstr "Could not merge UI, error was: %s\n"
 msgid "Ready to start..."
 msgstr "Klaar om te beginnen..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 msgid "New default path for files selected"
 msgstr "Nieuwe standaardmap voor bestanden geselecteerd"
 
 #. 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
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "Bevestigen..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -755,68 +750,120 @@ msgstr ""
 "Sommige bestanden zijn aangepast, maar niet opgeslagen...\n"
 "Wilt u deze opslaan voor u de map verlaat?"
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 #, fuzzy
 msgid "<All albums>"
 msgstr "Albums"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "Boomstructuur"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "Bestandsnaam"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "Titel"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "Artiest"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "Album"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "Jaar"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "Track"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "Genre"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+#, fuzzy
+msgid "Composer"
+msgstr "Componist:"
+
+#: src/browser.c:2945 src/misc.c:1919
+#, fuzzy
+msgid "Orig. Artist"
+msgstr "Orig. artiest:"
+
+#: src/browser.c:2945 src/misc.c:1920
+#, fuzzy
+msgid "Copyright"
+msgstr "Copyright:"
+
+#: src/browser.c:2946 src/misc.c:1921
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "Encoded door:"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "Albums"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 msgid "# Files"
 msgstr "Bestanden"
 
-#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
-msgid "Album"
-msgstr "Album"
-
-#: src/browser.c:2822
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "Ga naar bovenliggende map"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "Geef een map in om te bekijken."
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "Boomstructuur"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "Voer een mapnaam in om te bekijken."
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "Artiest & Album"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "Map hernoemen"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "De map '%s' hernoemen naar:"
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "Gebruik masker: "
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 #, 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:3263
+#: src/browser.c:3649
 #, fuzzy
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
@@ -825,32 +872,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:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
-#: src/scan.c:2119 src/scan.c:2465
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "Onjuist verwerkingsmasker"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 #, fuzzy
 msgid "Rename directory preview..."
 msgstr "Voorbeeld hernoemen..."
 
-#. 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "Fout..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "Je moet wel een naam invoeren!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -860,16 +907,22 @@ msgstr ""
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -878,7 +931,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -887,7 +940,7 @@ msgstr ""
 "De map kan niet hernoemd worden omdat de mapnaam al bestaat!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -902,73 +955,73 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "Map hernoemd"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "Programma: "
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 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:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "Openen met..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 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:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "Je moet wel een programmanaam invoeren!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr ""
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, fuzzy, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Kan '%s' (%s) niet uitvoeren\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "Kan geen proces afsplitsen!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Commando uitgevoerd: '%s %s'"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "Artiest / Album"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Category"
 msgstr "Categorie"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:229 src/cddb.c:438
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "Titel"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "Duur:"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 #, fuzzy
 msgid "CD Data Base Search"
 msgstr "Doorzoek CDDB"
@@ -976,16 +1029,16 @@ msgstr "Doorzoek CDDB"
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "Automatisch zoeken"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 #, fuzzy
 msgid "Request CD database :"
 msgstr "CDDB database:"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -993,16 +1046,16 @@ msgstr ""
 "CDDB database raadplegen aan de hand van de geselecteerde bestanden (de "
 "volgorde is belangrijk) om een CDDB-ID te verkrijgen"
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "Zoeke afbreken..."
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1013,138 +1066,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "Handmatig zoeken"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "Zoektermen: "
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Geef de zoektermen in (gescheiden door een spatie of '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "Zoeken in: "
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "Alle velden"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "Andere"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "Alle categorieën"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "Klassiek"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Diversen"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "New age"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "inclusief funk, soul, rap, pop, industrial, metal, etc."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "films, shows"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "andere"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr "Categorieën"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "Resultaten: "
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "Zoeken: "
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "Geef de zoektermen in de onderstaande lijst in"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "Volgende zoeken"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "Vorige zoeken"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 #, fuzzy
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "Toon enkel rode lijnen / Toon alle lijnen"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "Alle lijnen deselecteren"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "Lijnselectie omkeren"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "Alle lijnen selecteren"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 #, fuzzy
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
@@ -1157,52 +1210,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "Plaats in: "
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 msgid "All"
 msgstr "Alles"
 
-#: src/cddb.c:721 src/misc.c:1958
-msgid "File Name"
-msgstr "Bestandsnaam"
-
-#: src/cddb.c:722 src/misc.c:1959
-msgid "Title"
-msgstr "Titel"
-
-#: src/cddb.c:725 src/misc.c:1963
-msgid "Year"
-msgstr "Jaar"
-
-#: src/cddb.c:726
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "Tracknr."
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 msgid "# Tracks"
 msgstr "Aantal tracks"
 
-#: 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:3013
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "Verwerk ieder bestand met huidige instellingen"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 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
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1211,91 +1248,91 @@ msgid ""
 "instead of using directly the position order."
 msgstr ""
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 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:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "Klaar om te zoeken..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, 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:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "Selectie omkeren"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "Sorteer lijst volgens tracknummer"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "Sorteer lijst volgens titel"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Opzoeken '%s'..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Kan host '%s' (%s) niet vinden"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, 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:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Bezig met verbinden naar '%s', poort '%d' ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Kan geen verbinding maken met '%s' (%s)!"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Verbonden met '%s'"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Bezig met inlezen resultaten (%s)..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, 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:1770
+#: src/cddb.c:1771
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Kan bestand '%s' (%s) niet openen\n"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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:2246 src/cddb.c:2564 src/cddb.c:3397
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "Bezig met opzoeken ..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Kan niet opzoeken (%s)!"
@@ -1304,92 +1341,92 @@ msgstr "Kan niet opzoeken (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "Bezig met inlezen resultaten ..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "De server gaf een verkeerd antwoord! (%s)"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "De server gaf een verkeerd antwoord! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
 msgstr ""
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "%d passende albums gevonden"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Bezig met inlezen resultaten (%s)..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Bezig met inlezen resultaten (%s)..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 #, 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:2889
+#: src/cddb.c:2893
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2895
+#: src/cddb.c:2899
 #, fuzzy, c-format
 msgid "%d file(s) selected!"
 msgstr "%u bestanden"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Klaar om te zoeken..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, 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:3268
+#: src/cddb.c:3276
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "%d passende albums gevonden"
 
-#: src/cddb.c:3364
+#: src/cddb.c:3372
 #, 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:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "Inlezen van albumtracklijst ..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1402,7 +1439,7 @@ msgstr ""
 "\n"
 "Wilt u verder gaan?"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "Schrijf tag van CDDB..."
 
@@ -1587,74 +1624,74 @@ msgstr "Westers (ISO-8859-15)"
 msgid "Western (Windows-1252)"
 msgstr "Westers (Windows-1252)"
 
-#: src/charset.c:542
+#: src/charset.c:543
 #, fuzzy, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 "De bestandsnaam '%s' kan niet omgezet worden naar UTF-8. (Probeer de "
 "omgevingsvariabele G_FILENAME_ENCODING eens in te stellen): %s\n"
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "Ongeldige UTF-8"
 
-#: src/charset.c:641
+#: src/charset.c:642
 #, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
 "De bestandsnaam '%s' kan niet omgezet worden naar UTF-8. (Probeer de "
 "omgevingsvariabele G_FILENAME_ENCODING eens in te stellen): %s\n"
 
-#: src/charset.c:705
+#: src/charset.c:706
 #, fuzzy, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 "De bestandsnaam '%s' kan niet omgezet worden naar UTF-8. (Probeer de "
 "omgevingsvariabele G_FILENAME_ENCODING eens in te stellen): %s\n"
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, fuzzy, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "EasyTAG %s wordt gestart (PId: %d) ...\n"
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, fuzzy, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "Gebruikt id3lib versie %d.%d.%d...\n"
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, fuzzy, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "Gebruikt id3lib versie %d.%d.%d...\n"
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr ""
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, fuzzy, c-format
 msgid "Setting locale : '%s'"
 msgstr "Hernoemen bestand '%s'"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr ""
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s door %s (gecompileerd %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "Homepage: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr ""
@@ -1662,141 +1699,141 @@ msgstr ""
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "Bestandsbeheer"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "Bestand"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "Bestand is \"Alleen Lezen\""
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 msgid "File Link Broken"
 msgstr "Bestand niet gevonden"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, Layer ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "Freq:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Mode:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
-#: src/easytag.c:4073
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "Grootte:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? kb"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "Tijdsduur:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "Tag"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 #, fuzzy
 msgid "Common"
 msgstr "Commentaar"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "Titel:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "Gebruik deze titel voor geselecteerde bestanden"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "Artiest:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr "Gebruik deze artiest voor geselecteerde bestanden"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr "Gebruik albumtitel voor geselecteerde bestanden"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 #, fuzzy
 msgid "CD:"
 msgstr "CDDB"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 #, fuzzy
 msgid "Tag selected files with this disc number"
 msgstr "Gebruik deze componist voor geselecteerde bestanden"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "Jaar:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "Gebruik dit jaar voor geselecteerde bestanden"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr "Nummer alle tracks oplopend. Start in iedere submap opnieuw met 01."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "Track:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1804,281 +1841,281 @@ msgstr ""
 "Vul het aantal bestanden in de directory van het geselecteerde bstand in als "
 "aantal tracks van het album."
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr "Gebruik dit aantal tracks voor geselecteerde bestanden"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "Genre:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "Gebruik dit genre voor geselecteerde bestanden"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "Commentaar:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 msgid "Tag selected files with this comment"
 msgstr "Gebruik dit commentaar voor geselecteerde bestanden"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:818
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "Componist:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr "Gebruik deze componist voor geselecteerde bestanden"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "Orig. artiest:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr "Gebruik deze originele artiest voor geselecteerde bestanden"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "Gebruik dit copyright voor geselecteerde bestanden"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "Gebruik deze URL voor geselecteerde bestanden"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "Encoded door:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr "Gebruik deze encoder-naam voor geselecteerde bestanden"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr ""
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr ""
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr ""
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 #, fuzzy
 msgid "Tag selected files with these pictures"
 msgstr "Gebruik deze titel voor geselecteerde bestanden"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr ""
 
-#: src/easytag.c:1051
+#: src/easytag.c:1063
 #, fuzzy
 msgid "Remove selected pictures, else all pictures."
 msgstr "URL van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 #, fuzzy
 msgid "Save the selected pictures on the hard disk."
 msgstr "Tekenset voor bestanden op harde schijf."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 #, fuzzy
 msgid "Set properties of the selected pictures."
 msgstr "Titel '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Titel '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "Titels van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Artiest '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "Artiest van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Album '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "Album van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, fuzzy, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Componist '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 #, fuzzy
 msgid "Removed disc number from selected files."
 msgstr "Tracknummer van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Jaar '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "Jaar van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Het tracknummer werd in geselecteerde bestanden genoteerd als 'xx/%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Het tracknummer werd in geselecteerde bestanden genoteerd als 'xx'."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "Tracknummer van geselecteerde bestanden verwijderd."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "Geslecteerde tracks zijn oplopend genummerd."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Genre '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "Genre van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Commentaar '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "Commentaar van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Componist '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "Componist van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Originele artiest '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "Originele artiest van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Copyright '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "Copyright van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "URL '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "URL van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Encoder-naam '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr "Encoder-naam van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 #, fuzzy
 msgid "Selected files tagged with pictures."
 msgstr "Titel '%s' is gebruikt voor geselecteerde bestanden."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 #, fuzzy
 msgid "Removed pictures from selected files."
 msgstr "Titels van geselecteerde bestanden verwijderd."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Selecteer mode en masker en herhaal de actie"
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "Alle tags zijn verwerkt"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "Alle tags zijn verwijderd"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "Alle bestanden zijn bewaard..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "De bestanden zijn gedeeltelijk opgeslagen..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "De bestanden zijn gedeeltelijk gewist..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "Alle bestanden zijn gewist..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2087,17 +2124,17 @@ msgstr ""
 "Wilt u de tag van het bestand\n"
 "'%s' opslaan?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "Tag op opslaan..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 #, fuzzy
 msgid "Rename File and Directory..."
 msgstr "Map hernoemen"
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, fuzzy, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2111,12 +2148,12 @@ msgstr ""
 "'%s' hernoemen?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 #, fuzzy
 msgid "Rename Directory..."
 msgstr "Map hernoemen..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, fuzzy, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2130,11 +2167,11 @@ msgstr ""
 "'%s' hernoemen?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "Bestand hernoemen..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2147,17 +2184,17 @@ msgstr ""
 "naar \n"
 "'%s' hernoemen?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Tag van '%s' aan het schrijven"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 msgid "Tag(s) written"
 msgstr "Tags opgeslagen"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2586 src/easytag.c:2591
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2166,14 +2203,14 @@ msgstr ""
 "Kan tag niet opslaan in bestand: '%s' !\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Hernoemen bestand '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2737 src/easytag.c:2769 src/easytag.c:2941
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2187,11 +2224,11 @@ msgstr ""
 "'%s'.\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "Bestanden niet hernoemd..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2205,7 +2242,7 @@ msgstr ""
 "'%s'\n"
 "al bestaat."
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, fuzzy, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2217,16 +2254,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Het bestand '%s' is hernoemd naar '%s'"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "Bestanden hernoemd..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, fuzzy, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2238,18 +2275,18 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, fuzzy, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Het bestand '%s' is hernoemd naar '%s'\n"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 #, fuzzy
 msgid "File(s) moved..."
 msgstr "Bestanden hernoemd..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, fuzzy, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2263,12 +2300,12 @@ msgstr ""
 "'%s'.\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 #, fuzzy
 msgid "File(s) not moved..."
 msgstr "Bestanden niet hernoemd..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2278,16 +2315,16 @@ msgstr ""
 " '%s'\n"
 "wilt verwijderen?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "Verwijder bestand..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Bestand '%s' gewist"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2299,109 +2336,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "Bezig met zoeken..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "Bestand: '%s'"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "%d bestanden gevonden in deze map en submappen"
 
-#: src/easytag.c:3239
+#: src/easytag.c:3356
 #, 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:3252 src/et_core.c:2696
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u bestanden"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
 msgstr "Deze map en de submappen bevatten geen bestanden!"
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "Deze map bevat geen bestanden!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "Bezig met zoeken..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "  STOP met zoeken...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "Voer een mapnaam in om te bekijken."
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "Gebruik dit veld voor geselecteerde bestanden"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Converteer '_' en '%20' naar spaties"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "Converteer ' ' naar '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "Allemaal hoofdletters"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "Allemaal kleine letters"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "Eerste letter hoofdletter"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "Iedere eerste letter hoofdletter"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "Verwijder spaties"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "Voeg spatie toe voor iedere hoofdletter"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 msgid "Remove duplicate spaces or underscores"
 msgstr "Verwijder dubbele spaties of underscores"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: afgebroken! (PId: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, fuzzy, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Signaal ontvangen: %s (%d)\a\n"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 #, fuzzy
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
@@ -2412,11 +2449,11 @@ msgstr ""
 "met debuginformatie ('gdb easytag core' gevolgd door 'bt' en 'l') te zenden "
 "naar easytag@gmail.com"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "Onbekend signaal"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2449,11 +2486,11 @@ msgstr ""
 "., ./                  De huidige map laden.\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: normaal afgesloten! Tot ziens..."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2461,80 +2498,80 @@ msgstr ""
 "Sommige bestanden zijn aangepast maar niet opgeslagen...\n"
 "Wilt u deze opslaan voor u het programma verlaat?"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr " Wilt u EasyTAG werkelijk verlaten?"
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "ID3-tag"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis-tag"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis-tag"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "APE-tag"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr ""
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "MP3-bestand"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "MP2-bestand"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis-bestand"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 #, fuzzy
 msgid "Speex File"
 msgstr "Volgende bestand"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "FLAC-bestand"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "MusePack-bestand"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "Monkey's Audio-bestand"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 #, fuzzy
 msgid "MP4/AAC File"
 msgstr "MP2-bestand"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 #, fuzzy
 msgid "Wavpack File"
 msgstr "MusePack-bestand"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, c-format
 msgid "Pictures (%d)"
 msgstr ""
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2542,14 +2579,14 @@ 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/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2560,11 +2597,11 @@ msgstr ""
 "naar systeemcodering (Probeer de \n"
 "omgevingsvariabele G_FILENAME_ENCODING eens in te stellen): '%s'"
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "Bestandsnaam vertalingen"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr ""
@@ -2574,7 +2611,7 @@ msgstr ""
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "Encoder:"
@@ -2583,50 +2620,55 @@ msgstr "Encoder:"
 #. 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/flac_header.c:312 src/mp4_header.c:286 src/ogg_header.c:267
 #: src/wavpack_header.c:88
 #, fuzzy
 msgid "Channels:"
 msgstr "Wijzigingen"
 
-#: src/flac_tag.c:140 src/flac_tag.c:741
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "FOUT tijdens het openen van bestand: '%s' (%s).\n"
 "\a"
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "FOUT: Kan commentaar niet opslaan in bestand: %s (%s)."
 
-#: src/flac_tag.c:990 src/ogg_tag.c:759
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Tag weggeschreven van '%s'"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Tag verwijderd van '%s'"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Fout bij het verwijderen van ID3v1 tag van '%s' (%s)"
 
-#: src/id3_tag.c:490 src/id3_tag.c:557
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Fout bij het verwijderen van ID3v2 tag van '%s' (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Fout bij het aanpassen van ID3v2 tag van '%s' (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2641,205 +2683,161 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Fout bij het aanpassen van ID3v1 tag van '%s' (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Tag aangepast van '%s'"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "Geen fouten gemeld"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "Geen geheugen vrij"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "Geen gegevens te verwerken"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "Onjuist geformatteerde data"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "Geen buffer om in te schrijven"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "Buffer is te klein"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "Ongeldig frame ID"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "Veld niet gevonden"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "Onbekend veldtype"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "Tag is al gekoppeld aan een bestand"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "Ongeldige versie van tag"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "Geen bestand om te verwerken"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "Poging tot schrijven naar alleen-lezen bestand"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "Fout bij compressie/decompressie"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "Onbekende fout!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
 "will cause an error in id3lib, it will not be processed by the program."
 msgstr ""
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 #, fuzzy
 msgid "Corrupted file..."
 msgstr "Selecteer bestand..."
 
-#: src/log.c:91
+#: src/log.c:95
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:214
-msgid " OK "
-msgstr " OK "
-
-#: src/misc.c:219
-msgid " Yes "
-msgstr " Ja "
-
-#: src/misc.c:224
-msgid " No "
-msgstr " Nee "
-
-#: src/misc.c:229
-msgid " Apply "
-msgstr " Toepassen "
-
-#: src/misc.c:234
-msgid " Save "
-msgstr " Opslaan "
-
-#: src/misc.c:239
-msgid " Cancel "
-msgstr " Annuleren "
-
-#: src/misc.c:244
-msgid " Close "
-msgstr " Sluiten "
-
-#: src/misc.c:249
-msgid " Write "
-msgstr " Opslaan "
-
-#: src/misc.c:254
-msgid " Execute "
-msgstr " Uitvoeren "
-
-#: src/misc.c:259
-msgid " Search "
-msgstr " Zoeken "
-
-#: src/misc.c:264
-msgid " Browse... "
-msgstr "Bladeren..."
+#: src/misc.c:773
+msgid "Select file..."
+msgstr "Selecteer bestand..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "Selecteer map..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "Selecteer bestand..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 #, fuzzy
 msgid "Warning..."
 msgstr "Bezig met zoeken..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "Creëer playlist"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "M3U-playlistnaam"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "Gebruik mapnaam"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "Bewerk maskers"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "Playlist-instellingen"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "Alleen geselecteerde bestanden meetellen"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2847,30 +2845,30 @@ msgstr ""
 "Indien waar, zullen alleen de geselecteerde bestanden in de afspeellijst "
 "gezet worden, anders wordt alles toegevoegd."
 
-#: src/misc.c:1397
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "Gebruik volledig pad voor bestanden in lijst"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 msgid "Use relative path for files in playlist"
 msgstr "Gebruik relatief pad voor bestanden in lijst"
 
 #. Create playlist in parent directory
-#: src/misc.c:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "Maak playlist in bovenliggende map"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 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:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "Gebruik DOS directory scheidingsteken"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2878,23 +2876,23 @@ msgstr ""
 "Deze optie vervangt het UNIX directory scheidingsteken '/' door dat van DOS "
 "'\\'."
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "Playlist inhoud"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "Bewaar enkel lijst met bestanden"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "Gebruik bestandsnaam om te bewaren"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "Bewaar info gebruik makend van: "
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2903,12 +2901,12 @@ msgstr ""
 "Playlist bestand '%s' bestaat reeds!\n"
 "Overschrijven?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "Sla playlist op..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2917,144 +2915,120 @@ msgstr ""
 "Kan playlist niet opslaan in bestand: %s!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Playlist weggeschreven van '%s'"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 #, fuzzy
 msgid "CD"
 msgstr "CDDB"
 
-#: src/misc.c:1964
-msgid "Track"
-msgstr "Track"
-
-#: src/misc.c:1967 src/picture.c:821
-#, fuzzy
-msgid "Composer"
-msgstr "Componist:"
-
-#: src/misc.c:1968
-#, fuzzy
-msgid "Orig. Artist"
-msgstr "Orig. artiest:"
-
-#: src/misc.c:1969
-#, fuzzy
-msgid "Copyright"
-msgstr "Copyright:"
-
-#: src/misc.c:1970
-#, fuzzy
-msgid "URL"
-msgstr "URL:"
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 #, fuzzy
 msgid "Encoded by"
 msgstr "Encoded door:"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "Zoek bestand"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "In :"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 #, 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:2033
+#: src/misc.c:1984
 #, fuzzy
 msgid "the Tag"
 msgstr "Tag op opslaan..."
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "%d bestanden gevonden"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "Laad bestandsnamen uit tekstbestand"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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:2787
+#: src/misc.c:2738
 msgid " Load "
 msgstr "Laden "
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, 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
+#: src/misc.c:2782 src/misc.c:2876
 #, 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
+#: src/misc.c:2791 src/misc.c:2885
 #, fuzzy
 msgid "Delete the selected line"
 msgstr "Lijn wissen"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 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
+#: src/misc.c:2812 src/misc.c:2906
 #, 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
+#: src/misc.c:2821 src/misc.c:2915
 #, 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "Herladen"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "Bewaar enkel lijst met bestanden"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "Alle lijnen selecteren"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3062,20 +3036,20 @@ msgstr ""
 "Deze optie zorgt ervoor dat de bestanden worden verwerkt zodra de "
 "bestandsnamen zijn ingelezen (het verwerkingsvenster moet geopend zijn)."
 
-#: src/misc.c:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "Witregel invoegen"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "Lijn wissen"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "Verplaats masker naar boven in lijst"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "Verplaats masker naar beneden in lijst"
@@ -3094,7 +3068,7 @@ msgstr ""
 msgid "Unknown"
 msgstr "Onbekend signaal"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr ""
 
@@ -3119,8 +3093,7 @@ msgstr ""
 msgid "Single channel"
 msgstr ""
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "Doe hetzelfde voor de andere bestanden"
 
@@ -3158,50 +3131,50 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "FOUT tijdens het openen van bestand: '%s'als vorbis (%s)."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Opgelet: HEt Ogg Vorbis-bestand '%s' bevat een ID3v2-tag."
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr ""
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 #, fuzzy
 msgid "All Files"
 msgstr "Alle velden"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr ""
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr ""
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr ""
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 #, fuzzy
 msgid "Picture Description:"
 msgstr "Beschrijving:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr ""
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3209,132 +3182,142 @@ msgid ""
 "Do you want to overwrite?"
 msgstr ""
 
-#: src/picture.c:734
+#: src/picture.c:719
 #, fuzzy
 msgid "Save file..."
 msgstr "Selecteer bestand..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr ""
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr ""
 
-#: src/picture.c:790
+#: src/picture.c:807
 #, fuzzy
 msgid "Unknown image"
 msgstr "Onbekend signaal"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr ""
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr ""
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr ""
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr ""
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr ""
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr ""
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr ""
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr ""
 
-#: src/picture.c:817
+#: src/picture.c:834
 #, fuzzy
 msgid "Conductor"
 msgstr "Country"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr ""
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr ""
 
-#: src/picture.c:825
+#: src/picture.c:842
 #, fuzzy
 msgid "Recording location"
 msgstr "Aflopend op duratie"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr ""
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr ""
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr ""
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr ""
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr ""
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr ""
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr ""
 
-#: src/picture.c:841
+#: src/picture.c:860
 #, fuzzy
 msgid "Unknown picture type"
 msgstr "Onbekend veldtype"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 #, fuzzy
 msgid "pixels"
 msgstr "Velden"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr ""
 
-#: src/picture.c:882
+#: src/picture.c:901
 #, fuzzy
 msgid "Description"
 msgstr "Beschrijving:"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 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
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr ""
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, fuzzy, c-format
 msgid ""
 "Can't open file :\n"
@@ -3342,7 +3325,7 @@ msgid ""
 "(%s)"
 msgstr "Kan bestand '%s' (%s) niet openen\n"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr ""
 
@@ -3741,7 +3724,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3754,7 +3737,7 @@ msgid ""
 "characters"
 msgstr ""
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3949,7 +3932,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr ""
 
@@ -3971,35 +3954,42 @@ msgstr "Karakterset voor weergave op het scherm."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 #, fuzzy
 msgid "No"
 msgstr " Nee "
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "ID3-tag"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "Gebruik ID3v1.x-tags"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4007,22 +3997,22 @@ msgstr ""
 "Wanneer aangevinkt, zullen er aan de MP3 bestanden ID3v1-tags worden "
 "toegevoegd. Anders worden zij verwijderd."
 
-#: src/prefs.c:878
+#: src/prefs.c:882
 #, 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:910
+#: src/prefs.c:917
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Codering voor ID3-tags."
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -4039,7 +4029,7 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:947
+#: src/prefs.c:954
 #, fuzzy
 msgid "Character set used to read tag data in the file."
 msgstr "Karakterset voor weergave op het scherm."
@@ -4047,24 +4037,24 @@ msgstr "Karakterset voor weergave op het scherm."
 #.
 #. * Scanner
 #.
-#: src/prefs.c:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "Verwerkingsvenster"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Verwerkingsvenster - Tekenconversie"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Converteer '_' en '%20' naar spatie ' '"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Converteer spatie ' ' naar underscore '_'"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4073,11 +4063,11 @@ msgstr ""
 "toepassen van een masker op tags."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Bestanden hernoemen - Tekenconversie"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4086,18 +4076,18 @@ msgstr ""
 "toepassen van een masker op bestandsnamen."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Cosmetisch - Tekenconversie"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1034
+#: src/prefs.c:1041
 #, 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:1038
+#: src/prefs.c:1045
 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 "
@@ -4106,25 +4096,25 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "Verwerkingsvenster"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "Verwerkingsvenster openen bij starten"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 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:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "Verwerkingsvenster altijd bovenop"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4133,16 +4123,16 @@ msgstr ""
 "hoofdvenster."
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "Velden"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "Overschrijf velden bij het verwerken van de bestanden"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4151,11 +4141,11 @@ msgstr ""
 "door de nieuwe tekst.  Wanneer uitgeschakeld, worden alleen de lege velden "
 "gevuld."
 
-#: src/prefs.c:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "Gebruik deze tekst als standaard voor het commentaarveld :"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4163,11 +4153,11 @@ msgstr ""
 "Wanneer ingeschakeld wordt standaard deze tekst gebruikt als commentaar."
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 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:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4178,46 +4168,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr ""
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Automatisch zoeken"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "Naam: "
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "Poort: "
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "CGI-pad: "
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Instellingen server"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "Doorzoek CDDB"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 #, fuzzy
 msgid "Path :"
 msgstr "CGI-pad: "
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4226,66 +4216,66 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "Proxy"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "Gebruik een proxyserver"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "Activeer de instellingen van de proxyserver."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "Computernaam: "
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "Naam van de proxyserver."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "Poort van de proxyserver."
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "Gebruikersnaam: "
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "Naam van de gebruiker van de proxyserver."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "Wachtwoord: "
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 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:1342
+#: src/prefs.c:1349
 #, fuzzy
 msgid "Track Name List"
 msgstr "Titel"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4294,33 +4284,33 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "Bevestiging"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "Bevestiging voor het afsluiten van EasyTAG"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 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:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "Bevestiging voor het opslaan van tags"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "Bevestiging voor het hernoemen van bestanden"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "Bevestiging voor het wissen van bestanden"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "Bevestiging voor het opslaan van playlists"
 
@@ -4328,37 +4318,37 @@ msgstr "Bevestiging voor het opslaan van playlists"
 #. //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
+#: src/prefs.c:1429
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Veranderingen toepassen (maar niet opslaan!) en sluit dit venster"
 
-#: src/prefs.c:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "Sluit dit venster zonder de veranderingen op te slaan"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 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:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr ""
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "Veranderingen toegepast"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "Voorkeuren opgeslagen"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "Voorkeuren onveranderd"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4369,58 +4359,58 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "Het is geen map"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr ""
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "Vul tag"
 
-#: src/scan.c:175
+#: src/scan.c:179
 #, fuzzy
 msgid "Rename File and Directory"
 msgstr "Map hernoemen"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "Cosmetisch"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "Tag succesvol verwerkt..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Tag succesvol verwerkt...(%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, 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:663
+#: src/scan.c:667
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Kan bestandsnaam '%s' niet omzetten naar systeemcodering."
 
-#: src/scan.c:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "Nieuw bestand succesvol verwerkt..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nieuw bestand succesvol verwerkt...(%s)"
@@ -4428,41 +4418,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "Bewerk tags en bestandsnamen"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "Bewerking:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "Selecteer de bewerking"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "Open verwerkingsvenster / Geselecteerde bestanden verwerken"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "Instellingen verwerkingsvenster"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "Verbergen / Weergeven maskerbewerking"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "Verbergen / Weergeven legenda"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "Sluit dit venster"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4471,15 +4461,15 @@ msgstr ""
 "te vullen vanuit de bestandsnamen"
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "Voorbeeld van ingevulde tag..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 #, fuzzy
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
@@ -4491,15 +4481,15 @@ msgstr ""
 "bestandsnaam aan te passen op basis van de tag."
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "Voorbeeld hernoemen..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "Selecteer velden:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4508,131 +4498,131 @@ msgstr ""
 "worden. Selecteer degene die u interesseren."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "B"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
 msgstr "Bestandsnaam veld"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "Titel veld"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "Artiest veld"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "Album veld"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "Verwerk genre veld"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr ""
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "Componist veld"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 #, fuzzy
 msgid "Process original artist field"
 msgstr "Artiest veld"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 #, fuzzy
 msgid "Cr"
 msgstr "C"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 #, fuzzy
 msgid "Process copyright field"
 msgstr "Commentaar veld"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr ""
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 #, fuzzy
 msgid "Process URL field"
 msgstr "Titel veld"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr ""
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 #, fuzzy
 msgid "Process encoder name field"
 msgstr "Bestandsnaam veld"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "Selectie omkeren"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "Selecteer alles/niets."
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Vervang '_' en '%20' door ' '"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "Zet om :"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "naar : "
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4640,7 +4630,7 @@ msgstr ""
 "Converteer '_' en '%20' naar spaties (bv: 'Een%20stukje_Tekst' wordt 'Een "
 "stukje Tekst')."
 
-#: src/scan.c:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4648,12 +4638,12 @@ msgstr ""
 "De spatie wordt vervangen door een underscore (bv: 'Een stukje tekst' wordt "
 "'Een_stukje_tekst')."
 
-#: src/scan.c:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4661,7 +4651,7 @@ msgstr ""
 "Alle letters worden hoofdletters (bv 'Een STUKJE tekst' wordt 'EEN STUKJE "
 "TEKST')."
 
-#: src/scan.c:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4669,7 +4659,7 @@ msgstr ""
 "Alle letters worden hoofdletters (bv 'Een STUKJE tekst' wordt 'EEN STUKJE "
 "TEKST')."
 
-#: src/scan.c:2325
+#: src/scan.c:2394
 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'."
@@ -4677,7 +4667,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:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4685,22 +4675,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:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "Voeg een spatie in voor iedere hoofdletter"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "Verwijder dubbele spaties en underscores"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 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:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4708,7 +4698,7 @@ msgstr ""
 "Voor iedere hoofdletter wordt een spatie geplaatst. (bv: 'EenStukjeTekst' "
 "wordt 'Een Stukje Tekst')."
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4719,185 +4709,185 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artiest"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c : commentaar"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, fuzzy, c-format
 msgid "%p : composer"
 msgstr "%c : commentaar"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr ""
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr ""
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, fuzzy, c-format
 msgid "%e : encoded by"
 msgstr "Encoder:"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g : genre"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : genegeerd"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l: aantal tracks"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, fuzzy, c-format
 msgid "%o : orig. artist"
 msgstr "%a : artiest"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n : tracknummer"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t : titel"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr ""
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y : jaar"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "Maskerbewerking"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "Maak nieuw masker"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "Verplaats masker naar boven in lijst"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "Verplaats masker naar beneden in lijst"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "Kopieer Masker"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "Voeg standaardmaskers toe"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "Verwijder masker"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "Sla maskers op"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "Nieuw masker"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "Kopiëren: Geen rij geselecteerd!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "Verwijderen: Geen rij geselecteerd!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "Naar boven: Geen rij geselecteerd!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "Naar beneden: Geen rij geselecteerd!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "FOUT: Kan voorkeuren niet opslaan: %s (%s)"
 
-#: src/setting.c:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Kan voorkeuren niet openen '%s' (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 msgid "Loading default configuration..."
 msgstr "Voorkeuren worden geladen..."
 
-#: 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, fuzzy, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Kan bestand '%s' (%s) niet openen"
 
-#: src/setting.c:1278
+#: src/setting.c:1277
 #, 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:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Bezig met laden van standaardmaskers..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "Bezig met laden van standaardmaskers..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 #, fuzzy
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Bezig met laden van standaardmaskers..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "FOUT: De omgevingsvariabele HOME is niet gedefinieerd!\n"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "FOUT: Kan de map '%s' niet aanmaken (%s)!"
@@ -4947,42 +4937,75 @@ msgstr ""
 "afgebroken."
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr ""
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr ""
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr ""
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr ""
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, fuzzy, c-format
 msgid "Audio player: '%s'"
 msgstr "Beluister nummers"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid " OK "
+#~ msgstr " OK "
+
+#~ msgid " Yes "
+#~ msgstr " Ja "
+
+#~ msgid " No "
+#~ msgstr " Nee "
+
+#~ msgid " Apply "
+#~ msgstr " Toepassen "
+
+#~ msgid " Save "
+#~ msgstr " Opslaan "
+
+#~ msgid " Cancel "
+#~ msgstr " Annuleren "
+
+#~ msgid " Close "
+#~ msgstr " Sluiten "
+
+#~ msgid " Write "
+#~ msgstr " Opslaan "
+
+#~ msgid " Execute "
+#~ msgstr " Uitvoeren "
+
+#~ msgid " Search "
+#~ msgstr " Zoeken "
+
+#~ msgid " Browse... "
+#~ msgstr "Bladeren..."
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/pl.gmo b/po/pl.gmo
index b0df0b8..6a930e1 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index e4cc94d..0f9b322 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -18,7 +18,7 @@ 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"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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"
@@ -27,7 +27,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: src/about.c:134
+#: src/about.c:140
 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,199 +38,194 @@ msgstr ""
 "i �adny interfejs sprawia, �e tagowanie plik�w staje si� �atwiejsze pod GNU/"
 "Linuksem."
 
-#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(Niemieckie t�umaczenie)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(Rosyjskie t�umaczenie)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(Holenderskie t�umaczenie)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(Szwedzkie t�umaczenie)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(W�gierskie t�umaczenie)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(W�oskie t�umaczenie)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(Japo�skie t�umaczenie)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(Ukrai�skie t�umaczenie)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(Czeskie t�umaczenie)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(Hiszpa�skie t�umaczenie)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(Polskie t�umaczenie)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(Rumu�skie t�umaczenie)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(Du�skie t�umaczenie)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(Greckie t�umaczenie)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Brazyliskie Portugalskie t�umaczenie)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr "(Bu�garskie t�umaczenie)"
 
-#: src/about.c:171
+#: src/about.c:177
 msgid "(Chinese translation)"
 msgstr "(Chi�skie t�umaczenie)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(Chi�skie t�umaczenie)"
+
+#: src/about.c:179
 msgid "(Hebrew translation)"
 msgstr "(Hebrajskie t�umaczenie)"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(Niemieckie t�umaczenie)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
 # To musi by� krotkie
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "Komentarz"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "Informacje o..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "Informacje o"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(kompilacja: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(u�ywanie: GTK+ %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Strona WWW: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "Opis:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(Wsparcie dla plik�w MP3 wy��czone)"
 
-#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
-#: src/about.c:452 src/about.c:462
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(Wsparcie dla tag�w ID3v2.3 wy��czone)"
 
-#: src/about.c:410
+#: src/about.c:452
 #, fuzzy
 msgid "available"
 msgstr "Brak dost�pnej pami�ci"
 
-#: src/about.c:420
+#: src/about.c:463
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(Wsparcie dla plik�w Ogg Vorbis wy��czone)"
 
-#: src/about.c:430
+#: src/about.c:475
 #, fuzzy
 msgid "Speex file support"
 msgstr "(Wsparcie dla plik�w Speex wy��czone)"
 
-#: src/about.c:440
+#: src/about.c:491
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(Wsparcie dla plik�w FLAC wy��czone)"
 
-#: src/about.c:450
+#: src/about.c:504
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(Wsparcie dla plik�w MP4/AAC wy��czone)"
 
-#: src/about.c:460
+#: src/about.c:516
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(Wsparcie dla plik�w WavPack wy��czone)"
@@ -238,33 +233,33 @@ msgstr "(Wsparcie dla plik�w WavPack wy��czone)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "Podzi�kowania"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "T�umaczenia:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "Og�lne:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "Zmiany"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "B��D podczas otwierania pliku: \"%s\" (%s)."
@@ -440,7 +435,7 @@ msgstr "Malej�co wed�ug cz�stotliwo�ci"
 msgid "Open File(s) with ..."
 msgstr "Otw�rz plik(i) za pomoc� ..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "Zaznacz wszystkie pliki"
 
@@ -448,7 +443,7 @@ msgstr "Zaznacz wszystkie pliki"
 msgid "Unselect All Files"
 msgstr "Odznacz wszystkie pliki"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "Odwr�� zaznaczenie"
 
@@ -594,7 +589,7 @@ msgstr "Zmie� nazw� katalogu..."
 msgid "Reload Directory"
 msgstr "Ponownie wczytaj katalog"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "Przegl�daj katalog za pomoc�..."
 
@@ -734,17 +729,17 @@ msgstr "Nie mo�na scali� UI, b��d: %s\n"
 msgid "Ready to start..."
 msgstr "Gotowy do pracy..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 msgid "New default path for files selected"
 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:4550 src/easytag.c:4570 src/easytag.c:4589
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "Potwierd�..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -752,65 +747,113 @@ msgstr ""
 "Cz�� plik�w zosta�a zmodyfikowana ale zmiany nie zosta�y zapisane.\n"
 "Czy zapisa� te zmiany przed zmian� katalogu?"
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 msgid "<All albums>"
 msgstr "<Wszystkie albumy>"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "Drzewo"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "Nazwa pliku"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "Tytu�"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "Artysta"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "Album"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "Rok"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "�cie�ka"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "Gatunek"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "Kompozytor"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "Artysta"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "Prawa autorskie"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "URL"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "Koder"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "# Album"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 msgid "# Files"
 msgstr "# Pliki"
 
-#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
-msgid "Album"
-msgstr "Album"
-
-#: src/browser.c:2822
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "Id� do katalogu nadrz�dnego"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "Podaj katalog do przegl�dania."
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "Drzewo"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "Wybierz katalog do przegl�dania!"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "Artysta i Album"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "Zmiana nazwy katalogu"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Zmiana nazwy katalogu \"%s\" na: "
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "Maska : "
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 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:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -818,31 +861,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:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
-#: src/scan.c:2119 src/scan.c:2465
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "Nieprawid�owa maska skanera"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 msgid "Rename directory preview..."
 msgstr "Podgl�d zmiany nazwy katalogu..."
 
-#. 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "B��d..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "Musisz wprowadzi� nazw� katalogu!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -853,16 +896,22 @@ msgstr ""
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -871,7 +920,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -880,7 +929,7 @@ msgstr ""
 "Zmiana nazwy katalogu nie jest mo�liwa. Katalog ju� istnieje!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -895,87 +944,87 @@ msgstr ""
 "\"%s\"!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "Nazwa katalogu zmieniona"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "Program do uruchomienia : "
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 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:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "Otw�rz plik za pomoc� ..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 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:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "Musisz poda� nazw� programu!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Aplikacja \"%s\" nie zosta�a znaleziona!"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Nie mo�na uruchomi� %s (b��d %d)!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "Nie mo�na utworzy� procesu potomnego!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Wykonano polecenie: \"%s %s\""
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "Artysta / Album"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Category"
 msgstr "Kategoria"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:229 src/cddb.c:438
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "Nazwa �cie�ki"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "Czas"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "Wyszukiwanie w CDDB"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "Automatyczne wyszukiwanie"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 msgid "Request CD database :"
 msgstr "��dana baza danych CD :"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -983,16 +1032,16 @@ msgstr ""
 "��daj automatycznie danych z CDDB u�ywaj�c zaznaczonych plik�w (kolejno�� "
 "jest wa�na!) aby wygenerowa� CddbID."
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "Zatrzymaj wyszukiwanie ..."
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr "U�yj lokalnej Cddb"
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1003,15 +1052,15 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "Manualne wyszukiwanie"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "S�owa : "
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr ""
 "Pole do wprowadzania szukanej frazy (s�owa oddzielone spacj� lub \"+\")"
@@ -1019,122 +1068,122 @@ msgstr ""
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "Wyszukiwanie w : "
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "Wszystkie pola"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "Inne"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "Wszystkie kategorie"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "Klasyczna"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "R�ne"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "�cie�ka filmowa"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "kategoria zawiera: funk, soul, rap, pop, industrial, metal, etc."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "filmy, przedstawienia"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "Wszystkie pozosta�e nie wyszczeg�lnione w powy�szych kategoriach"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr " Kategorie "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "Wyniki : "
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "Szukaj : "
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "Wyszukiwanie w li�cie poni�ej"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "Szukaj nast�pny"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "Szukaj poprzedni"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "Pokazuje czerwone / wszystkie linie na li�cie \"Artysta / Album\""
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "Odznacza wszystkie linie"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "Odwraca zaznaczenie linii"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "Zaznacz wszystkie linie"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1148,52 +1197,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "Ustaw w : "
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 msgid "All"
 msgstr "Wszystkie"
 
-#: src/cddb.c:721 src/misc.c:1958
-msgid "File Name"
-msgstr "Nazwa pliku"
-
-#: src/cddb.c:722 src/misc.c:1959
-msgid "Title"
-msgstr "Tytu�"
-
-#: src/cddb.c:725 src/misc.c:1963
-msgid "Year"
-msgstr "Rok"
-
-#: src/cddb.c:726
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "# �cie�ki"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 msgid "# Tracks"
 msgstr "# �cie�ek"
 
-#: 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:3013
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "Uruchom skaner dla ka�dego pliku"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "Dopasuj linie wed�ug algorytmu Levenshteina"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:777 src/prefs.c:1362
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1207,15 +1240,15 @@ msgstr ""
 "przy zaznaczaniu odpowiedniego pliku audio lub zatwierdzaniu wynik�w cddb, "
 "zamiast u�ywania kolejno�ci pozycji."
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 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:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "Gotowy do wyszukiwania..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1223,76 +1256,76 @@ msgstr ""
 "Album \"%s\", artysta: \"%s\", d�ugo��: \"%s\", rok: \"%s\", gatunek: \"%s"
 "\", ID: \"%s\""
 
-#: src/cddb.c:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "Odwr�� zaznaczenie"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "Sortuj wed�ug numeru �cie�ki"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "Sortuj wed�ug nazwa �cie�ki"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Wyszukiwanie serwera \"%s\" ..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Nie mo�na znale�� serwera \"%s\" (%s)!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, 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:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "��czenie z serwerem \"%s\", port \"%d\" ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Nie mo�na po��czy� si� z serwerem \"%s\" (%s)!"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Po��czony z serwerem \"%s\""
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Odbieranie danych (%s) ..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "B��d podczas odczytywania odpowiedzi CDDB: %s!"
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Nie mo�na utworzy� pliku \"%s\" (%s)"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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:2246 src/cddb.c:2564 src/cddb.c:3397
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "Wysy�anie zapytania ..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Nie mo�na wys�a� zapytania (%s)!"
@@ -1301,91 +1334,92 @@ msgstr "Nie mo�na wys�a� zapytania (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "Odbieranie danych ..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 msgid "The server returned a wrong answer!"
 msgstr "Serwer zwr�ci� z�� odpowied�!"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Serwer zwr�ci� z�� odpowied�! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Przykro mi, przeszukiwanie www nie dzia�a w tym momencie!"
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Znaleziono %d pasuj�cy(ch) album(�w)"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Odbieranie danych ze strony %d (album %d/%d) ..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Odbieranie danych ze strony %d ..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr "Wi�cej wynik�w do za�adowania ..."
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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:2889
+#: src/cddb.c:2893
 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:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d plik�w zaznaczonych!"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 msgid "Local CD search..."
 msgstr "Gotowy do wyszukiwania..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
+#, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 "Nie zidentyfikowano �cie�ki dla lokalnej bazy CDDB!\n"
 "Wprowad� j� w oknie ustawie�."
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, 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:3268
+#: src/cddb.c:3276
 #, 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:3364
+#: src/cddb.c:3372
 #, 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:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "Wczytywanie listy �cie�ek albumu ..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1397,7 +1431,7 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuowa� ?"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "Zapisz tagi z CDDB..."
 
@@ -1582,68 +1616,68 @@ msgstr "Zachodnie (ISO-8859-15)"
 msgid "Western (Windows-1252)"
 msgstr "Zachodnie (Windows-1252)"
 
-#: src/charset.c:542
-#, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
+#: src/charset.c:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Plik \"%s\" nie mo�e by� przekonwertowany na UTF-8 (%s).\n"
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "Niew�a�ciwe UTF-8"
 
-#: src/charset.c:641
-#, c-format
+#: src/charset.c:642
+#, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr "Wiersz UTF-8 \"%s\" nie mo�e by� przekonwertowany na plik (%s)\n"
 
-#: src/charset.c:705
-#, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+#: src/charset.c:706
+#, fuzzy, c-format
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Wiersz \"%s\" nie mo�e by� przekonwertowany na UTF-8 (%s).\n"
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "Uruchamianie EasyTAG %s (PId: %d) ..."
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "U�ywanie libid3tag w wersji %s ..."
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "U�ywanie id3lib w wersji %d.%d.%d ..."
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr "Zmienna EASYTAGLANG zdefiniowana. Ustawiam locale : \"%s\""
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, c-format
 msgid "Setting locale : '%s'"
 msgstr "Ustawiam locale : \"%s\""
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr "Aktualnie u�ywam lokalizacji \"%s\" (i ewentualnie \"%s\")..."
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s - autor %s (kompilacja %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "Strona WWW: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr "Nieznany parametr lub �cie�ka \"%s\"\n"
@@ -1651,74 +1685,74 @@ msgstr "Nieznany parametr lub �cie�ka \"%s\"\n"
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "Przegl�darka"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "Plik"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "Plik tylko do odczytu"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 msgid "File Link Broken"
 msgstr "Uszkodzony odno�nik do pliku"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, Warstwa ?"
 
 # "G�sto�� bitowa:" ?
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "Pr�bkowanie:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "Cz�stotliwo��:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Tryb:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
-#: src/easytag.c:4073
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? kb"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "Czas:"
 
 # "Znacznik" ?
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "Tag"
 
@@ -1726,63 +1760,63 @@ msgstr "Tag"
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "Og�lne"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "Tytu�:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr ""
 "Tytu� z tego pola zostanie wstawiony do pozosta�ych zaznaczonych plik�w"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "Artysta:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr ""
 "Artysta z tego pola zostanie wstawiony do pozosta�ych zaznaczonych plik�w"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr ""
 "Nazwa albumu z tego pola zostanie wstawiona do pozosta�ych zaznaczonych "
 "plik�w"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr ""
 "Numer dysku z tego pola zostanie wstawiony do pozosta�ych zaznaczonych plik�w"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "Rok:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "Rok z tego pola zostanie wstawiony do pozosta�ych zaznaczonych plik�w"
 
 #  numeruj po koleji wszystkie pliki. Zaczynaj od 01 w ka�dym podkatalogu.
 #                 ^ koleji?:P
-#: src/easytag.c:693
+#: src/easytag.c:705
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Nadaje wszystkim plikom kolejne numery �cie�ek. Zaczyna od 01 w ka�dym "
@@ -1790,12 +1824,12 @@ msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "�cie�ka #:"
 
 # TODO cos tu nie gra
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1803,29 +1837,29 @@ msgstr ""
 "Ustaw liczb� plik�w w tym samym katalogu co wy�wietlany plik jako liczb� "
 "�cie�ek."
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr ""
 "Numer �cie�ki z tego pola zostanie wstawiony do pozosta�ych zaznaczonych "
 "plik�w"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "Gatunek:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr ""
 "Gatunek z tego pola zostanie wstawiony do pozosta�ych zaznaczonych plik�w"
 
 # "Komentarz:\n"
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "Komentarz:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 msgid "Tag selected files with this comment"
 msgstr ""
 "Komentarz z tego pola zostanie wstawiony do pozosta�ych zaznaczonych plik�w"
@@ -1833,52 +1867,52 @@ msgstr ""
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:818
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "Kompozytor:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr ""
 "Kompozytor z tego pola zostanie wstawiony do pozosta�ych zaznaczonych plik�w"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "Oryginalny artysta:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr ""
 "Oryginalny artysta z tego pola zostanie wstawiony do pozosta�ych "
 "zaznaczonych plik�w"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "Prawa autorskie:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr ""
 "Prawa autorskie z tego pola zostan� wstawione do pozosta�ych zaznaczonych "
 "plik�w"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "URL z tego pola zostan� wstawione do pozosta�ych zaznaczonych plik�w"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "Skompresowany przez:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr ""
 "Imi� osoby, przez kt�r� plik zosta� utworzony z tego pola zostanie wstawione "
@@ -1887,209 +1921,209 @@ msgstr ""
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "Obrazy"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "Obrazy:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "Mo�esz przeci�gn�� i upu�ci� obrazy tutaj."
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "Wstaw dane obrazy do pozosta�ych zaznaczonych plik�w"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 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
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr ""
 "Usu� zaznaczone obrazy, w przypadku braku zaznaczenia usu� wszystkie obrazy."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "Zapisz zaznaczone obrazy na twardym dysku."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "Zmie� w�a�ciwo�ci zaznaczonych obraz�w."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Zaznaczonym plikom ustawiono tytu� \"%s\"."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "Usuni�to tytu�y zaznaczonym plikom."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Zaznaczonym plikom ustawiono artysta na \"%s\"."
 
 # TODO
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "Usuni�to artyst� z zaznaczonych plik�w."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Zaznaczonym plikom ustawiono album na \"%s\"."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "Usuni�to album z zaznaczonych plik�w."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Zaznaczonym plikom ustawiono numer dysku na \"%s\"."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "Usuni�to numer dysku z zaznaczonych plik�w."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Zaznaczonym plikom ustawiono rok na \"%s\"."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "Usuni�to rok z zaznaczonych plik�w."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Zaznaczonym plikom ustawiono numer �cie�ki na \"xx/%s\"."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Zaznaczonym plikom ustawiono numer �cie�ki na \"xx\"."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "Usuni�to numer �cie�ki z zaznaczonych plik�w."
 
 # TODO
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "Zaznaczone pliki ponumerowano wed�ug kolejno�ci."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Zaznaczonym plikom ustawiono gatunek na \"%s\"."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "Usuni�to gatunek z zaznaczonych plik�w."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Zaznaczonym plikom ustawiono komentarz na \"%s\"."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "Usuni�to komentarz z zaznaczonych plik�w."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Zaznaczonym plikom ustawiono kompozytora na \"%s\"."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "Usuni�to kompozytora z zaznaczonych plik�w."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Zaznaczonym plikom ustawiono artyst� na \"%s\"."
 
 # TODO
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "Usuni�to artyst� z zaznaczonych plik�w."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Zaznaczonym plikom ustawiono prawa autorskie na \"%s\"."
 
 # TODO
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "Usuni�to prawa autorskie z zaznaczonych plik�w."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Zaznaczonym plikom ustawiono URL na \"%s\"."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "Usuni�to URL z zaznaczonych plik�w."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Zaznaczonym plikom ustawiono koder na \"%s\"."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr "Usuni�to imi� koduj�cego z zaznaczonych plik�w."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "Ustawiono obrazy w zaznaczonych plikach."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "Usuni�to obrazy zaznaczonym plikom."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Wybierz tryb i mask�, po czym ponownie wybierz t� komend�"
 
 # TODO
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "Wszystkie tagi zosta�y zeskanowane"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "Wszystkie tagi zosta�y usuni�te"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "Wszystkie pliki zosta�y zapisane..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "Pliki zosta�y cz�ciowo zapisane..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "Pliki zosta�y cz�ciowo skasowane..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "Wszystkie pliki zosta�y skasowane..."
 
 # TODO
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2098,16 +2132,16 @@ msgstr ""
 "Czy chcesz zapisa� taga pliku\n"
 "\"%s\" ?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "Zapisywanie taga..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr "Zmie� nazw� pliku i katalogu..."
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2121,11 +2155,11 @@ msgstr ""
 "\"%s\" ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr "Zmie� nazw� katalogu..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2139,11 +2173,11 @@ msgstr ""
 "\"%s\" ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "Zmiana nazwy pliku..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2156,17 +2190,17 @@ msgstr ""
 "na \n"
 "\"%s\" ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Zapisano tag \"%s\""
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 msgid "Tag(s) written"
 msgstr "Tag(i) zapisane"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2586 src/easytag.c:2591
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2175,14 +2209,14 @@ msgstr ""
 "Nie mog� zapisa� taga w pliku \"%s\"!\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Zmiana nazwy pliku \"%s\""
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2737 src/easytag.c:2769 src/easytag.c:2941
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2195,11 +2229,11 @@ msgstr ""
 "\"%s\"!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "Plik(i) kt�rym nie zmieniono nazwy..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2212,7 +2246,7 @@ msgstr ""
 "Plik o podanej nazwie ju� istnieje:\n"
 "\"%s\""
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2224,16 +2258,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Zmieniono nazw� pliku \"%s\" na \"%s\""
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "Plik(i) kt�rym zmieniono nazw�..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2245,17 +2279,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Przeniesiono plik \"%s\" do \"%s\""
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
 msgstr "Przeniesiono plik(i)..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2268,11 +2302,11 @@ msgstr ""
 "\"%s\"!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
 msgstr "Plik(i) nie zosta�y przeniesione..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2281,16 +2315,16 @@ msgstr ""
 "Czy na pewno chcesz usun�� plik\n"
 "\"%s\" ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "Usuni�cie pliku..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Usuni�to plik \"%s\""
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2302,110 +2336,110 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "Trwa wyszukiwanie..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "Plik: \"%s\""
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, 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:3239
+#: src/easytag.c:3356
 #, 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:3252 src/et_core.c:2696
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u plik(�w)"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
 msgstr "Nie znaleziono �adnego pliku w tym katalogu i jego podkatalogach!"
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "Nie znaleziono �adnego pliku w tym katalogu!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "Wyszukiwanie..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "  ZATRZYMAJ wyszukiwanie...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "Wybierz katalog do przegl�dania!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr ""
 "Warto�� z tego pola zostanie wstawiona do pozosta�ych zaznaczonych plik�w"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Zamiana \"_\" i \"%20\" na spacje"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "Zamiana \" \" na \"_\""
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "Wszystko du�� liter�"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "Wszystko ma�� liter�"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "Du�a pierwsza litera"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "Du�a pierwsza litera ka�dego s�owa"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "Usu� spacje"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "Wstawia spacje przed du�� liter�"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 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:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Nienormalne wyj�cie! (PId: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Otrzymano sygna� %s (%d)"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 "
@@ -2415,12 +2449,12 @@ 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:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "Nieznany sygna�"
 
 # fixme
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2453,11 +2487,11 @@ msgstr ""
 "., ./                wczytanie obecnego katalogu.\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normalne wyj�cie."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2465,77 +2499,77 @@ msgstr ""
 "Niekt�re pliki zosta�y zmodyfikowane, lecz nie s� zapisane.\n"
 "Czy chcesz je zapisa� przed zako�czeniem programu?"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr " Czy na pewno chcesz wyj�� z programu? "
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "ID3 Tag"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis Tag"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis Tag"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "APE Tag"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC Tag"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr "Tag Wavpack"
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "Plik MP3"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "Plik MP2"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "Plik Ogg Vorbis"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 msgid "Speex File"
 msgstr "Plik Speex"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "Plik FLAC"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "Plik MusePack"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "Plik Monkey's Audio"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr "Plik MP4/AAC"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 msgid "Wavpack File"
 msgstr "Plik Wavpack"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, c-format
 msgid "Pictures (%d)"
 msgstr "Obrazy (%d)"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2543,14 +2577,14 @@ 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/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2561,11 +2595,11 @@ msgstr ""
 "na systemowe kodowanie nazw plik�w\n"
 "(Spr�buj zmieni� warto�� zmiennej systemowej G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "T�umaczenie nazw plik�w"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Nazwa pliku \"%s\" przekracza liczb� znak�w %d i b�dzie obci�ta!\n"
@@ -2575,7 +2609,7 @@ msgstr "Nazwa pliku \"%s\" przekracza liczb� znak�w %d i b�dzie obci�ta!\n"
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "Koder:"
@@ -2584,48 +2618,53 @@ msgstr "Koder:"
 #. 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/flac_header.c:312 src/mp4_header.c:286 src/ogg_header.c:267
 #: src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Kana�y:"
 
-#: src/flac_tag.c:140 src/flac_tag.c:741
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "B��D podczas otwierania pliku: \"%s\" jako FLAC (%s)."
 
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
 # TODO
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "B��D: Nie uda�o si� zapisa� komentarzy do pliku \"%s\" (%s)."
 
-#: src/flac_tag.c:990 src/ogg_tag.c:759
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Zapisano tag pliku \"%s\""
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Usuni�to tag z pliku \"%s\""
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "B��d podczas usuwania taga ID3v1 pliku: \"%s\" (%s)"
 
-#: src/id3_tag.c:490 src/id3_tag.c:557
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "B��d podczas usuwania taga ID3v2 pliku: \"%s\" (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "B��d podczas uaktualniania taga ID3v2 pliku: \"%s\" (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2650,78 +2689,78 @@ msgstr ""
 "\n"
 "Plik: %s"
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "B��d podczas uaktualniania taga ID3v1 pliku: \"%s\" (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Uaktualniono tag w pliku \"%s\""
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "Nie odnotowano b��d�w"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "Brak dost�pnej pami�ci"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "Brak danych do przetwarzania"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "Niepoprawnie sformatowane dane"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "Brak bufora do zapisu"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "Bufor jest za ma�y"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "Nieprawid�owy identyfikator ramki"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "��dane pole nie zosta�o znalezione"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "Nieznany typ pola"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "Plik ju� posiada do��czony tag"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "Nieprawid�owa wersja taga"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "Brak plik�w do przetwarzania"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "Pr�ba zapisania do pliku tylko do odczytu"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "B��d podczas kompresji/dekompresji"
 
 # m�j ulubiony ;-)
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "Nieznany komunikat o b��dzie!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2730,126 +2769,82 @@ msgstr ""
 "Uszkodzony plik \"%s\" spowoduje\n"
 "b��d w id3lib, wi�c nie b�dzie on przetwarzany przez program."
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
 msgstr "Uszkodzony plik..."
 
-#: src/log.c:91
+#: src/log.c:95
 msgid "Log"
 msgstr "Dziennik"
 
-#: src/misc.c:214
-msgid " OK "
-msgstr " OK "
-
-#: src/misc.c:219
-msgid " Yes "
-msgstr " Tak "
-
-#: src/misc.c:224
-msgid " No "
-msgstr " Nie "
-
-#: src/misc.c:229
-msgid " Apply "
-msgstr " Zastosuj "
-
-#: src/misc.c:234
-msgid " Save "
-msgstr " Zapisz "
-
-#: src/misc.c:239
-msgid " Cancel "
-msgstr " Anuluj "
-
-#: src/misc.c:244
-msgid " Close "
-msgstr " Zamknij "
-
-#: src/misc.c:249
-msgid " Write "
-msgstr " Zapisz "
-
-#: src/misc.c:254
-msgid " Execute "
-msgstr " Wykonaj "
-
-#: src/misc.c:259
-msgid " Search "
-msgstr " Szukaj "
-
-#: src/misc.c:264
-msgid " Browse... "
-msgstr "Przegl�daj... "
+#: src/misc.c:773
+msgid "Select file..."
+msgstr "Wybierz plik..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "Wybierz katalog..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "Wybierz plik..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 msgid "Warning..."
 msgstr "Ostrze�enie..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr "Brak zdefiniowanego odtwarzacza audio!"
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "Utworzenie listy odtwarzania"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "Nazwa listy odtwarzania M3U"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "Nazwa katalogu"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "Edytuj maski"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "Opcje listy odtwarzania"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "Do��cz tylko zaznaczone pliki"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2857,30 +2852,30 @@ msgstr ""
 "Je�li aktywowane, tylko zaznaczone pliki b�d� zapisywanie do playlisty. W "
 "przeciwnym przypadku, wszystkie pliki b�d� zapisane."
 
-#: src/misc.c:1397
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "U�ycie bezwzgl�dnych �cie�ek do plik�w"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 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:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "Utworzenie listy odtwarzania w katalogu nadrz�dnym"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 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:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "U�ycie separatora katalogu DOS"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2888,24 +2883,24 @@ msgstr ""
 "opcja zast�puje separator katalogu UNIKSA \"/\" na znak separatora DOSa \"\\"
 "\"."
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "Zawarto�� listy odtwarzania"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "Tylko listy plik�w"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 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:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "Dodatkowa informacja z maski:"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2914,12 +2909,12 @@ msgstr ""
 "Lista odtwarzania \"%s\" ju� istnieje!\n"
 "Nadpisa�?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "Zapis listy odtwarzania..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2928,44 +2923,24 @@ msgstr ""
 "Nie mo�na zapisa� listy odtwarzania \"%s\"!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Zapisano list� odtwarzania \"%s\""
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1964
-msgid "Track"
-msgstr "�cie�ka"
-
-#: src/misc.c:1967 src/picture.c:821
-msgid "Composer"
-msgstr "Kompozytor"
-
-#: src/misc.c:1968
-msgid "Orig. Artist"
-msgstr "Artysta"
-
-#: src/misc.c:1969
-msgid "Copyright"
-msgstr "Prawa autorskie"
-
-#: src/misc.c:1970
-msgid "URL"
-msgstr "URL"
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "Koder"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "Wyszukiwanie pliku"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2973,93 +2948,93 @@ msgstr ""
 "wy�wietli� wszystkie pliki."
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "W : "
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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:2033
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "znaczniku"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Rozr�nianie wielko�ci liter"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Znaleziono: %d plik(�w)"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "Wczytanie nazw plik�w z pliku TXT"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 msgid "File :"
 msgstr "Plik : "
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: src/misc.c:2787
+#: src/misc.c:2738
 msgid " Load "
 msgstr " Wczytaj "
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, 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
+#: src/misc.c:2782 src/misc.c:2876
 #, 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
+#: src/misc.c:2791 src/misc.c:2885
 #, 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
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 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
+#: src/misc.c:2812 src/misc.c:2906
 #, 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
+#: src/misc.c:2821 src/misc.c:2915
 #, 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "Od�wie�"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "Tylko listy plik�w"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "Zaznacz wszystkie linie"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3067,20 +3042,20 @@ msgstr ""
 "Po wczytaniu nazw plik�w zostanie uruchomiony aktualnie wybrany skaner (okno "
 "skanera musi by� otwarte)."
 
-#: src/misc.c:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "Wstaw pusty wiersz"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "Usu� t� lini�"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "Przesu� mask� do g�ry"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "Przesu� mask� w d�"
@@ -3099,7 +3074,7 @@ msgstr "Audio"
 msgid "Unknown"
 msgstr "Nieznany sygna�"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr "Nieprawid�owy format MP4"
 
@@ -3124,8 +3099,7 @@ msgstr "Dwukana�owy"
 msgid "Single channel"
 msgstr "Jednokana�owy"
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "Powt�rz akcj� dla pozosta�ych plik�w"
 
@@ -3169,48 +3143,48 @@ msgstr ""
 "(plik: \"%s\")."
 
 # TODO
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "B��D: Nie uda�o si� otworzy� pliku: \"%s\" jako Vorbis (%s)."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Ostrze�enie: Plik Ogg Vorbis \"%s\" zawiera tag ID3v2."
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "Dodaj obrazy"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG i JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "W�a�ciwo�ci obrazu %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "Typ obrazu"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "Opis obrazu:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "Zapis obrazu %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3221,115 +3195,120 @@ msgstr ""
 "\"%s\"\n"
 "Czy chcesz go nadpisa�?"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "Zapis pliku..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "Obraz JPEG"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "Obraz PNG"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "Nieznany obraz"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "Ikona 32x32 pikseli (PNG)"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "Inna ikona"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "Ok�adka (prz�d)"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "Ok�adka (ty�)"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr "�rodek ok�adki"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr "Media (np. strona z nadrukiem na CD)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr "Prowadz�cy artysta/wykonawca/solista"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "Artysta/wykonawca"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "Dyrygent"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "Zesp�/Orkiestra"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "Tek�ciarz/Autor tekst�w"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "Miejsce nagrywania"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "Podczas nagrywania"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "Podczas wyst�pu"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "Zrzut ekranu z filmu/video"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "Jaskrawa pokolorowana ryba"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "Ilustracja"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "Logo zespo�u/artysty"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "Logo wydawcy/studia"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "Nieznany typ obrazu"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "pikseli"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "Typ"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "Opis"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3337,11 +3316,16 @@ msgstr ""
 "Nie mog� wy�wietli� obrazu, poniewa� za ma�a ilo�� danych zosta�a "
 "przeczytana by stwierdzi� jak utworzy� bufor obrazu."
 
-#: src/picture.c:987
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr "Wczytywanie pliku obrazu..."
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3352,7 +3336,7 @@ msgstr ""
 "\"%s\"!\n"
 "(%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr "Plik obrazu nie zosta� za�adowany..."
 
@@ -3756,7 +3740,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr "Wymu� u�ywanie systemowego kodowania znak�w i w��cz t�umaczenie znak�w"
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3773,7 +3757,7 @@ msgid ""
 msgstr ""
 "Wymu� u�ywanie systemowego kodowania znak�w i odrzu� nie pasuj�ce znaki "
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3971,7 +3955,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr "Zestaw znak�w:"
 
@@ -3990,33 +3974,44 @@ msgstr "Zestaw znak�w u�ywany do zapisywania tag�w w pliku."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr "Dodatkowe ustawienia dla iconv():"
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 msgid "No"
 msgstr "Nie"
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+#, fuzzy
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+"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\")."
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 msgid "ID3v1 tags"
 msgstr "Tagi ID3v1"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "Zapisywanie tag�w ID3v1.x"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4024,20 +4019,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:878
+#: src/prefs.c:882
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Zestaw znak�w u�ywany do zapisywania tag�w ID3v1 w pliku."
 
 #. Character Set for reading tag
-#: src/prefs.c:910
+#: src/prefs.c:917
 msgid "Character Set for reading ID3 tags"
 msgstr "Zestaw�w znak�w dla odczytu tag�w ID3"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr "Niestandardowy:"
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -4066,32 +4061,32 @@ msgstr ""
 "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:947
+#: src/prefs.c:954
 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:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "Skaner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Wype�nij tagi - konwersja znak�w"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Zmie� znaki podkre�lenia \"_\" i ci�gi \"%20\" na spacje \" \""
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Zmie� spacje \" \" na podkre�lenia \"_\""
 
 # TODO
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4100,12 +4095,12 @@ msgstr ""
 "skanera dla tag�w."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Zmie� nazw� pliku - konwersja znak�w"
 
 # TODO
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4114,17 +4109,17 @@ msgstr ""
 "skanera dla nazw plik�w."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 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:1034
+#: src/prefs.c:1041
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "Nie zmieniaj pierwszych liter s��w kluczowych na du�e."
 
-#: src/prefs.c:1038
+#: src/prefs.c:1045
 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 "
@@ -4136,41 +4131,41 @@ msgstr ""
 "zamiast \"Text In An Entry\" otrzymasz \"Text in an Entry\")."
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "Okno Skanera"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "Otw�rz okno skanera podczas uruchamiania"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr "Automatycznie otwieranie okno skanera podczas uruchamiania EasyTAG."
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "Okno skanera zawsze na wierzchu"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 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:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "Pola"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "Nadpisywanie p�l podczas przetwarzania taga"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4178,11 +4173,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:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "Ustaw ten tekst jako domy�lny komentarz : "
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4191,11 +4186,11 @@ msgstr ""
 "podczas u�ywania skanera \"Wype�nij znacznik\"."
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 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:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4206,42 +4201,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "Baza danych CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 msgid "Server Settings for Automatic Search"
 msgstr "Ustawienia serwera dla automatycznego wyszukiwania"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "Nazwa : "
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "Port : "
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "�cie�ka CGI : "
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 msgid "Server Settings for Manual Search"
 msgstr "Ustawienia serwera dla r�cznego wyszukiwania"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 msgid "Local CD Data Base"
 msgstr "Lokalna baza danych CD"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 msgid "Path :"
 msgstr "�cie�ka : "
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4254,52 +4249,52 @@ msgstr ""
 "\"soundtrack\" oraz \"misc\"."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "Ustawienia po�rednika (proxy)"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "Korzystanie z po�rednika"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "Uaktywnia ustawienia serwera po�rednicz�cego."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "Nazwa komputera : "
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "Nazwa serwera po�rednicz�cego."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "Port serwera po�rednicz�cego."
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "Nazwa u�ytkownika : "
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "Nazwa u�ytkownika dla serwera po�rednicz�cego."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "Has�o u�ytkownika : "
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 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:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "Lista �cie�ek"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4307,7 +4302,7 @@ msgstr ""
 "Zaznacz odpowiedni plik audio (odno�nie pozycji albo DLM, je�li aktywowane "
 "poni�ej)"
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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."
@@ -4316,7 +4311,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:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4327,15 +4322,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "Potwierdzenia"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "Potwierd� wyj�cie z programu"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4343,19 +4338,19 @@ msgstr ""
 "Je�li aktywne, wy�wietla okno dialogowe prosz�ce o potwierdzenie przed "
 "wyj�ciem z programu."
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "Potwierd� zapisanie tag�w pliku"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "Potwierd� zmian� nazwy pliku"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "Potwierd� kasowanie pliku"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "Potwierd� zapisanie listy odtwarzania"
 
@@ -4363,37 +4358,37 @@ msgstr "Potwierd� zapisanie listy odtwarzania"
 #. //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
+#: src/prefs.c:1429
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Zastosuj zmiany (lecz nie zapisuj) i zamknij to okno"
 
-#: src/prefs.c:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "Zamknij to okno bez zapisywania zmian"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 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:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Przyk�ad: %.*d_-_Nazwa_�cie�ki_1.mp3)"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "Zastosowano zmiany"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "Konfiguracja zapisana"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "Konfiguracja nie zmieniona"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4404,37 +4399,37 @@ msgstr ""
 "\"%s\"\n"
 "(%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "To nie jest katalog"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Nie mo�na znale�� programu \"%s\"!"
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "Wype�nij znacznik"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "Zmie� nazw� pliku"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "Przetwarzaj pola"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "Znacznik pomy�lnie zeskanowany..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Znacznik pomy�lnie zeskanowany (%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
@@ -4442,22 +4437,22 @@ msgstr ""
 "Skaner tag�w: dziwne..., rozszerzenie \"%s\" nie zosta�o znalezione w pliku "
 "\"%s\"!"
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, 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:663
+#: src/scan.c:667
 #, 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:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "Nowa nazwa pliku pomy�lnie zeskanowana..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nowa nazwa pliku pomy�lnie zeskanowana...(%s)"
@@ -4465,42 +4460,42 @@ 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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "Skanowanie znacznik�w i nazw plik�w"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "Skaner: "
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "Wybierz rodzaj skanera, kt�ry ma zosta� u�yty"
 
 # TODO
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "Wy�wietlenie okna skanera / skanowanie zaznaczonych plik�w"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "Opcje skanera"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "Wy�wietl / Ukryj edytor masek"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "Wy�wietl / Ukryj legend�"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "Zamyka bie��ce okno"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4510,15 +4505,15 @@ msgstr ""
 
 # fixme
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "Podgl�d zmiany taga..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr "Dodaj do maski przedrostek aktualnej �cie�ki"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4532,15 +4527,15 @@ msgstr ""
 "wzgl�dna."
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "Podgl�d zmiany nazwy pliku..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "Wybierz pola:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4549,126 +4544,126 @@ msgstr ""
 "przetworzone. Wybierz te, kt�re maj� by� zmienione."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "N"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
 msgstr "Przetwarzanie pola nazwa pliku"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "Przetwarzanie pola tytu�"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "Przetwarzanie pola artysta"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "Przetwarzanie pola album"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "R"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "Przetwarzanie pola rodzaj"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "Km"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "Przetwarzanie pola komentarz"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "Kp"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "Przetwarzanie pola kompozytor"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 msgid "Process original artist field"
 msgstr "Przetwarzanie pola oryginalny artysta"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "Przetwarzanie pola prawa autorskie"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr "Przetwarzanie pola URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr "Przetwarzanie pola nazwa encodera"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "Odwr�cenie zaznaczenia"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "Wybierz/Odznacz wszystko."
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Konwersja \"_\" i \"%20\" na \" \""
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "Konwersja: "
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "na: "
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4676,7 +4671,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:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4684,12 +4679,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:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4697,7 +4692,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:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4705,7 +4700,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:2325
+#: src/scan.c:2394
 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'."
@@ -4714,7 +4709,7 @@ msgstr ""
 "liter�. Przyk�ad, przed: \"Tekst W Jakim� POLU\", po: \"Tekst w jakim� polu"
 "\"."
 
-#: src/scan.c:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4723,15 +4718,15 @@ msgstr ""
 "liter�. Przyk�ad, przed: \"Tekst w jakim� POLU\", po: \"Tekst W Jakim� Polu"
 "\"."
 
-#: src/scan.c:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "Wstawia spacj� przed wielka liter�"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "Usuwa duplikaty spacji lub podkre�le�"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4739,7 +4734,7 @@ msgstr ""
 "Wszystkie spacje pomi�dzy s�owami s� usuwane. Przyk�ad, przed: \"Tekst W "
 "Jakim� Polu\", po: \"TekstWJakim�Polu\"."
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4747,7 +4742,7 @@ msgstr ""
 "Spacja jest wstawiana przed ka�d� wielk� liter�. Przyk�ad, przed: "
 "\"TekstWJakim�Polu\", po: \"Tekst W Jakim� Polu\"."
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4758,183 +4753,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a: artysta"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b: album"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c: komentarz"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p : kompozytor"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r: prawa autorskie    "
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr "%d: numer dysku"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e: skompresowany przez    "
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g: gatunek"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i: ignorowane"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l: liczba �cie�ek"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o: oryg. artysta"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n: �cie�ka"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t: tytu�"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u: URL"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y: rok"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "Edytor masek"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "Utw�rz now� mask�"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "Przesu� mask� do g�ry"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "Przesu� mask� w d�"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "Zduplikuj mask�"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "Dodaj domy�ln� mask�"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "Usu� mask�"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "Zapisz maski"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "Nowa_maska"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "Kopiowanie: Nie wybrano wiersza!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "Usuwanie: Nie wybrano wiersza!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "Przewijanie w g�r�: Nie wybrano wiersza!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "Przewijanie w d�: Nie wybrano wiersza!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, 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:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Nie mo�na otworzy� pliku konfiguracji \"%s\" (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 msgid "Loading default configuration..."
 msgstr "Wczytywanie domy�lnej konfiguracji..."
 
-#: 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Nie mo�na otworzy� lub utworzy� pliku \"%s\" (%s)"
 
-#: src/setting.c:1278
+#: src/setting.c:1277
 #, 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:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Wczytywanie domy�lnych masek \"Wype�nij tagi\"..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "Wczytywanie domy�lnych masek \"Zmie� nazw� pliku\"..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Wczytywanie domy�lnych masek \"Zmie� nazw� katalogu\"..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "B��D: Zmienna �rodowiskowa HOME nie jest zdefiniowana!"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "B��D: Nie mo�na utworzy� katalogu \"%s\" (%s)!"
@@ -4984,42 +4979,75 @@ msgstr ""
 "B��d zapisu strumienia na wyj�cie. Wyj�cie mo�e by� niepoprawne lub obci�te."
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr "Biblioteka DLL \"%s\" nie znaleziona. Pr�ba jej za�adowania..."
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr "Biblioteka DLL \"%s\" nie mo�e by� za�adowana"
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr "Ta wersja \"%s\" zawiera \"%s\""
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr "Nie znaleziono funkcji \"%s\" w bibliotece DLL \"%s\""
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, fuzzy, c-format
 msgid "Audio player: '%s'"
 msgstr "Uruchom odtwarzacz audio: \"%s\""
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr "Katalog ustawie� EasyTAG: \"%s\""
 
+#~ msgid " OK "
+#~ msgstr " OK "
+
+#~ msgid " Yes "
+#~ msgstr " Tak "
+
+#~ msgid " No "
+#~ msgstr " Nie "
+
+#~ msgid " Apply "
+#~ msgstr " Zastosuj "
+
+#~ msgid " Save "
+#~ msgstr " Zapisz "
+
+#~ msgid " Cancel "
+#~ msgstr " Anuluj "
+
+#~ msgid " Close "
+#~ msgstr " Zamknij "
+
+#~ msgid " Write "
+#~ msgstr " Zapisz "
+
+#~ msgid " Execute "
+#~ msgstr " Wykonaj "
+
+#~ msgid " Search "
+#~ msgstr " Szukaj "
+
+#~ msgid " Browse... "
+#~ msgstr "Przegl�daj... "
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index af3145d..e075eca 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 73227cd..471dc81 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-10-15 23:53+0200\n"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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:134
+#: src/about.c:140
 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,198 +30,193 @@ 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:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(Tradução alemã)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(Tradução russa)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(Tradução holandesa)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(Tradução sueca)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(Tradução húngara)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(Tradução italiana)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(Tradução japonesa)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(Tradução ucraniana)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(Tradução tcheca)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(Tradução espanhola)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(Tradução polonesa)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(Tradução romena)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(Tradução dinamarquesa)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(Tradução grega)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Tradução português do Brasil)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr "(Tradução búlgara)"
 
-#: src/about.c:171
+#: src/about.c:177
 msgid "(Chinese translation)"
 msgstr "(Tradução chinesa)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(Tradução chinesa)"
+
+#: src/about.c:179
 msgid "(Hebrew translation)"
 msgstr "(Tradução hebraica)"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(Tradução alemã)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "Comentário"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "Sobre..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "Sobre"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compilado: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(usando: GTK+ %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Página na Web: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "Descrição:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(Suporte a arquivos MP3 desabilitado)"
 
-#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
-#: src/about.c:452 src/about.c:462
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(Suporte a etiquetas ID3v2.3 desabilitado)"
 
-#: src/about.c:410
+#: src/about.c:452
 #, fuzzy
 msgid "available"
 msgstr "Sem memória disponível"
 
-#: src/about.c:420
+#: src/about.c:463
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(Suporte a arquivos Ogg Vorbis desabilitado)"
 
-#: src/about.c:430
+#: src/about.c:475
 #, fuzzy
 msgid "Speex file support"
 msgstr "(Suporte a arquivos Speex desabilitado)"
 
-#: src/about.c:440
+#: src/about.c:491
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(Suporte a arquivos FLAC desabilitado)"
 
-#: src/about.c:450
+#: src/about.c:504
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(Suporte a arquivos MP4/AAC desabilitado)"
 
-#: src/about.c:460
+#: src/about.c:516
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(Suporte a arquivos WavPack desabilitado)"
@@ -229,33 +224,33 @@ msgstr "(Suporte a arquivos WavPack desabilitado)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "Agradecimentos"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "Traduções:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "Principalmente:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "Modificações"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "ERRO ao abrir o arquivo: '%s' (%s)."
@@ -431,7 +426,7 @@ msgstr "Descendente pelo taxa de amostragem"
 msgid "Open File(s) with ..."
 msgstr "Abrir Arquivo(s) com..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "Selecionar Todos os Arquivos"
 
@@ -439,7 +434,7 @@ msgstr "Selecionar Todos os Arquivos"
 msgid "Unselect All Files"
 msgstr "Deselecionar Todos os Arquivos"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "Inverter a Seleção dos Arquivos"
 
@@ -585,7 +580,7 @@ msgstr "Renomear Diretório..."
 msgid "Reload Directory"
 msgstr "Recarregar Diretório"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "Navegar no Diretório com..."
 
@@ -724,17 +719,17 @@ msgstr "Não foi possível unir a IU, o erro foi: %s\n"
 msgid "Ready to start..."
 msgstr "Pronto para começar..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 msgid "New default path for files selected"
 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:4550 src/easytag.c:4570 src/easytag.c:4589
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "Confirme..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -742,65 +737,113 @@ msgstr ""
 "Alguns arquivos modificados não foram salvos...\n"
 "Você quer salvá-los antes de mudar de diretório?"
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 msgid "<All albums>"
 msgstr "<Todos os álbuns>"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "Árvore"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "Nome do Arquivo"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "Título"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "Artista"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "Álbum"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "Ano"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "Faixa"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "Gênero"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "Compositor"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "Artista Orig."
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "Copyright"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "URL"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "Codificador por"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "# Álbuns"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 msgid "# Files"
 msgstr "# Arquivos"
 
-#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
-msgid "Album"
-msgstr "Álbum"
-
-#: src/browser.c:2822
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "Ir para o diretório superior"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "Escolha um diretório para navegar."
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "Árvore"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "Selecione um diretório para navegar!"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "Artista & Álbum"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "Renomear o diretório"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Renomear o diretório '%s' para: "
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "Usar a máscara:"
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 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:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -808,31 +851,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:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
-#: src/scan.c:2119 src/scan.c:2465
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "Máscara de Verificação Inválida"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 msgid "Rename directory preview..."
 msgstr "Pré-visualização da renomeação do diretório..."
 
-#. 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "Erro..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "Você deve digitar um nome para o diretório!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -843,16 +886,22 @@ msgstr ""
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -861,7 +910,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -870,7 +919,7 @@ msgstr ""
 "Não foi possível renomear porque esse nome de diretório já existe!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -885,88 +934,88 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "Diretório Renomeado"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "Programa para executar:"
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 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:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "Abrir Arquivo com..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 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:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "Você deve digitar o nome do programa!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "O programa '%s' não foi encontrado!"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Não foi possível executar %s (erro %d)!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "Não foi possível separar outro processo!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Comando executado: '%s %s'"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "Artista / Álbum"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Category"
 msgstr "Categoria"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:229 src/cddb.c:438
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "Nome da Faixa"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "Tempo"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "Procurar no Banco de Dados de CDs"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "Busca Automática"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 msgid "Request CD database :"
 msgstr "Requisitar banco de dados de CD:"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -974,16 +1023,16 @@ msgstr ""
 "Requisitar automaticamente o banco de dados CDDB usando os arquivos "
 "selecionados (a ordem é importante!) para gerar o CddbID."
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "Parar a busca..."
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr "Usar Cddb local"
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -994,139 +1043,139 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "Busca Manual"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "Palavras:"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Digite as palavras para procurar (separadas por um espaço ou '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "Buscar Em:"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "Todos os Campos"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "Outro"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "Todas as Categorias"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "Clássico"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Diversas"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "Trilha Sonora"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "incluindo: funk, soul, rap, pop, industrial, metal, etc."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "filmes, shows"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "outras que não se enquadrem nas categorias acima"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr " Categorias "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "Resultados:"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "Procurar:"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "Digite as palavras para buscar na lista abaixo"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "Procurar Próximo"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "Procurar Anterior"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Mostrar apenas linhas vermelhas (ou mostrar todas as linhas) na lista "
 "'Artista / Álbum'"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "Deselecionar todas as linhas"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "Inverter linhas selecionadas"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "Selecionar todas as linhas"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1139,52 +1188,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "Definir Em:"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 msgid "All"
 msgstr "Todos"
 
-#: src/cddb.c:721 src/misc.c:1958
-msgid "File Name"
-msgstr "Nome do Arquivo"
-
-#: src/cddb.c:722 src/misc.c:1959
-msgid "Title"
-msgstr "Título"
-
-#: src/cddb.c:725 src/misc.c:1963
-msgid "Year"
-msgstr "Ano"
-
-#: src/cddb.c:726
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "Faixa #"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 msgid "# Tracks"
 msgstr "# Faixas"
 
-#: 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:3013
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "Executar a verificação atual para cada arquivo"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "Coincidir linhas com o algoritmo Levenshtein"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:777 src/prefs.c:1362
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1199,93 +1232,93 @@ msgstr ""
 "correspondente, ou ao aplicar os resultados CDDB, ao invés de usar "
 "diretamente a ordem na lista."
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 "Carrega as linhas selecionadas ou todas as linhas (se nenhuma linha estiver "
 "selecionada)."
 
-#: src/cddb.c:798 src/misc.c:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "Pronto para procurar..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, 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:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "Inverter seleção"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "Organizar pelo Número da Faixa"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "Organizar pelo Nome da Faixa"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Determinando host '%s'..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Não foi possível determinar o host '%s' (%s)!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, 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:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Conectando ao host '%s', porta '%d'..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Não foi possível conectar ao host '%s' (%s)!"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Conectado ao host '%s'"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Recebendo dados (%s)..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Erro ao ler a resposta do cddb (%s)!"
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Não foi possível criar o arquivo '%s' (%s)"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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:2246 src/cddb.c:2564 src/cddb.c:3397
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "Enviando requisição..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Não foi possível enviar a requisição (%s)!"
@@ -1294,92 +1327,93 @@ msgstr "Não foi possível enviar a requisição (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "Recebendo dados..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 msgid "The server returned a wrong answer!"
 msgstr "O servidor retornou uma resposta incorreta!"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "O servidor retornou uma resposta incorreta! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 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:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Encontrado(s) %d álbum(ns) iguais"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Recebendo dados da página %d (álbum %d/%d)..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Recebendo dados da página %d..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr "Mais resultados para carregar..."
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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:2889
+#: src/cddb.c:2893
 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:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d arquivo(s) selecionado(s)!"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 msgid "Local CD search..."
 msgstr "Busca de CD local..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
+#, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 "O caminho para o 'Banco de Dados de CDs Local' não foi definido!\n"
 "Preencha-o na janela de preferências."
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, 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:3268
+#: src/cddb.c:3276
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Encontrados %d álbuns iguais para o DiscID '%s'"
 
-#: src/cddb.c:3364
+#: src/cddb.c:3372
 #, 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:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "Carregando lista das faixas do álbum..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1392,7 +1426,7 @@ msgstr ""
 "\n"
 "Deseja continuar?"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "Gravar Etiqueta do CDDB..."
 
@@ -1577,70 +1611,70 @@ msgstr "Ocidental (ISO-8859-15)"
 msgid "Western (Windows-1252)"
 msgstr "Ocidental (Windows-1252)"
 
-#: src/charset.c:542
-#, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
+#: src/charset.c:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "O nome do arquivo '%s' não pode ser convertido em UTF-8 (%s).\n"
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "UTF-8 Inválido"
 
-#: src/charset.c:641
-#, c-format
+#: src/charset.c:642
+#, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
 "A seqüência UTF-8 '%s' não pôde ser convertida na codificação do nome "
 "arquivo (%s)\n"
 
-#: src/charset.c:705
-#, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+#: src/charset.c:706
+#, fuzzy, c-format
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "A seqüencia '%s' não pôde ser convertida em UTF-8 (%s).\n"
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "Inicializando EasyTAG %s (PId: %d)..."
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "Usando atualmente libid3tag versão %s ..."
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "Usando atualmente id3lib versão %d.%d.%d..."
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr "Variável EASYTAGLANG definida. Configurando o local: '%s'"
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, c-format
 msgid "Setting locale : '%s'"
 msgstr "Configurando o local: '%s'"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr "Usando atualmente o local '%s' (e eventualmente '%s')..."
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s por %s (compilado %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "Página na Web: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr "Parâmetro desconhecido ou caminho '%s'\n"
@@ -1648,128 +1682,128 @@ msgstr "Parâmetro desconhecido ou caminho '%s'\n"
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "Navegador"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "Arquivo"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "Arquivo Somente Leitura"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 msgid "File Link Broken"
 msgstr "Link de Arquivo Quebrado"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, Camada ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "Taxa de Bits:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "Freq:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Modo:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
-#: src/easytag.c:4073
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? kb"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "Tempo:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "Etiqueta"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "Comuns"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "Título:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "Etiquetar arquivos selecionados com esse título"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "Artista:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr "Etiquetar arquivos selecionados com esse artista"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "Álbum:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr "Etiquetar arquivos selecionados com esse nome do álbum"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr "Etiquetar arquivos selecionados com esse número do disco"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "Ano:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "Etiquetar arquivos selecionados com esse ano"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Numerar os arquivos selecionados seqüencialmente. Começar com 01 em cada "
@@ -1777,11 +1811,11 @@ msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "Faixa #:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1789,274 +1823,274 @@ msgstr ""
 "Definir o número de arquivos, no mesmo diretório do arquivo exibido, para as "
 "faixas selecionadas."
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr "Etiquetar os arquivos selecionados com esse número de faixa"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "Gênero:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "Etiquetar os arquivos selecionados com esse gênero"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 msgid "Tag selected files with this comment"
 msgstr "Etiquetar os arquivos selecionados com esse comentário"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:818
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "Compositor:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr "Etiquetar os arquivos selecionados com esse compositor"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "Artista Orig.:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr "Etiquetar os arquivos selecionados com esse artista original"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "Etiquetar os arquivos selecionados com esse copyright"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "Etiquetar os arquivos selecionados com essa URL"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "Codificado por:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr "Etiquetar os arquivos selecionados com esse nome do codificador"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "Imagens"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "Imagens:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "Você pode usar 'arrastar e soltar' para adicionar uma imagem."
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "Etiqueta os arquivos selecionados com essas imagens"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 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
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr "Remover as imagens selecionadas, ou todas as imagens."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "Salvar as imagens selecionadas no disco rígido."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "Definir as propriedades dos arquivos selecionados."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Arquivos selecionados etiquetados com o título '%s'."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "Remover o título dos arquivos selecionados."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Arquivos selecionados etiquetados com o artista '%s'."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "Remover artista dos arquivos selecionados."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Arquivos selecionados etiquetados com o álbum '%s'."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "Nome do álbum removido dos arquivos selecionados."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Arquivos selecionados etiquetados com o número do disco '%s'."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "Número do disco removido dos arquivos selecionados."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Arquivos selecionados etiquetados com o ano '%s'."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "Ano removido dos arquivos selecionados."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Arquivos selecionados etiquetados com a faixa como 'xx/%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Arquivos selecionados etiquetados com a faixa como 'xx'."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "Número da faixa removido dos arquivos selecionados."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "Faixas selecionadas numeradas seqüencialmente."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Arquivos selecionados etiquetados com o gênero '%s'."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "Gênero removido dos arquivos selecionados."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Arquivos selecionados etiquetados com o comentário '%s'."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "Comentário removido dos arquivos selecionados."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Arquivos selecionados etiquetados com o compositor '%s'."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "Compositor removido dos arquivos selecionados."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Arquivos selecionados etiquetados com o artista original '%s'."
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "Artista original removido dos arquivos selecionados."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Arquivos selecionados etiquetados com o copyright '%s'."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "Copyright removido dos arquivos selecionados."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Arquivos selecionados etiquetados com a URL '%s'."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "URL removida dos arquivos selecionados."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Arquivos selecionados etiquetados com o nome do codificador '%s'."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr "Nome do codificador removido dos arquivos selecionados."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "Arquivos selecionados etiquetados com imagens."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "Imagens removidas dos arquivos selecionados."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Seleciona Modo e Máscara, e refaz a mesma ação"
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "Todas as etiquetas foram verificadas"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "Todas as etiquetas foram removidas"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "Todas os arquivos foram salvos..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "Arquivos foram parcialmente salvos..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "Arquivos foram parcialmente apagados..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "Todos os arquivos foram apagados..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2065,16 +2099,16 @@ msgstr ""
 "Deseja gravar a etiqueta no arquivo\n"
 "'%s' ?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "Gravar Etiqueta..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr "Renomear Arquivo e Diretório..."
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2088,11 +2122,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr "Renomear Diretório..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2106,11 +2140,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "Renomear Arquivo..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2123,17 +2157,17 @@ msgstr ""
 "para \n"
 "'%s' ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Gravando etiqueta em '%s'"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 msgid "Tag(s) written"
 msgstr "Etiqueta(s) gravada(s)"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2586 src/easytag.c:2591
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2142,14 +2176,14 @@ msgstr ""
 "Não foi possível gravar a etiqueta no arquivo '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Renomeando o arquivo '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2737 src/easytag.c:2769 src/easytag.c:2941
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2162,11 +2196,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "Arquivos não foram renomeados..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2179,7 +2213,7 @@ msgstr ""
 "porque o seguinte arquivo já existe:\n"
 "'%s'"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2191,16 +2225,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Arquivo '%s' renomeado para '%s'"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "Arquivos renomeados..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2212,17 +2246,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Arquivo '%s' movido para '%s'"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
 msgstr "Arquivo(s) movidos..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2235,11 +2269,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
 msgstr "Arquivo(s) não foram movidos..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2248,16 +2282,16 @@ msgstr ""
 "Tem certeza que deseja apagar definitivamente o arquivo\n"
 "'%s' ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "Apagar Arquivo..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Arquivo '%s' apagado"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2269,109 +2303,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "Busca em progresso..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "Arquivo: '%s'"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, 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:3239
+#: src/easytag.c:3356
 #, 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:3252 src/et_core.c:2696
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u arquivo(s)"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
 msgstr "Nenhum arquivo encontrado nesse diretório e subdiretórios!"
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "Nenhum arquivo encontrado nesse diretório!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "Procurando..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "  PARAR a busca...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "Selecione um diretório para navegar!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "Etiquetar arquivos selecionados com esse campo"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Converter '_' e '%20' para espaços"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "Converter ' ' para '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "Todas maiúsculas"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "Todas minúsculas"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "Primeira letra maiúscula"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "Primeira letra de cada palavra maiúscula"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "Remover espaços"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "Inserir espaço antes da letra maiúscula"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 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:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Saída anormal! (PId: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Recebido o sinal %s (%d)\a"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 "
@@ -2381,11 +2415,11 @@ 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:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "Sinal desconhecido"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2419,11 +2453,11 @@ msgstr ""
 "caminho_para/arquivos     Usar um caminho relativo.\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Saída normal."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2431,77 +2465,77 @@ msgstr ""
 "Alguns arquivos modificados não foram salvos...\n"
 "Você deseja salvá-los antes de fechar o programa?"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr " Tem certeza que deseja fechar o programa? "
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "Etiqueta ID3"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Etiqueta Ogg Vorbis"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "Etiqueta FLAC"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "Etiqueta APE"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr "Etiqueta MP4/M4A/AAC"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr "Etiqueta Wavpack"
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "Arquivo MP3"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "Arquivo MP2"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "Arquivo Ogg Vorbis"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 msgid "Speex File"
 msgstr "Arquivo Speex"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "Arquivo FLAC"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "Arquivo MusePack"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "Arquivo Monkey's"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr "Arquivo MP4/AAC"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 msgid "Wavpack File"
 msgstr "Arquivo Wavpack"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, c-format
 msgid "Pictures (%d)"
 msgstr "Imagens (%d)"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2509,14 +2543,14 @@ 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/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2527,11 +2561,11 @@ msgstr ""
 "em um nome de arquivo na codificação do sistema\n"
 "(Tente ajustar a variável de ambiente G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "Tradução do nome do arquivo"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "O nome do arquivo '%s' excede %d caracteres e será truncado!\n"
@@ -2541,7 +2575,7 @@ msgstr "O nome do arquivo '%s' excede %d caracteres e será truncado!\n"
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "Codificador:"
@@ -2550,47 +2584,52 @@ msgstr "Codificador:"
 #. 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/flac_header.c:312 src/mp4_header.c:286 src/ogg_header.c:267
 #: src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Canais:"
 
-#: src/flac_tag.c:140 src/flac_tag.c:741
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "ERRO ao abrir o arquivo: '%s' como FLAC (%s)."
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "ERRO: Falha ao gravar comentários no arquivo '%s' (%s)."
 
-#: src/flac_tag.c:990 src/ogg_tag.c:759
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Gravada etiqueta de '%s'"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Removida etiqueta de '%s'"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Erro enquanto removia etiqueta ID3v1 de '%s' (%s)"
 
-#: src/id3_tag.c:490 src/id3_tag.c:557
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Erro enquanto removia etiqueta ID3v2 de '%s' (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Erro enquanto atualizava etiqueta ID3v2 de '%s' (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2615,77 +2654,77 @@ msgstr ""
 "\n"
 "Arquivo: %s"
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Erro enquanto atualizava etiqueta ID3v1 de '%s' (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Etiqueta atualizada de '%s'"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "Nenhum erro reportado"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "Sem memória disponível"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "Sem dados para analisar"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "Dados formatados incorretamente"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "Sem buffer para gravar para"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "Buffer é muito pequeno"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "ID do quadro inválido"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "Campo requerido não encontrado"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "Tipo de campo desconhecido"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "Etiqueta já está anexada ao arquivo"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "Versão da etiqueta inválida"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "Nenhum arquivo para analisar"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "Tentando gravar para um arquivo somente-leitura"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "Erro na compressão/descompressão"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "Mensagem de erro desconhecida!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2694,126 +2733,82 @@ msgstr ""
 "Como o seguinte arquivo corrompido: '%s'\n"
 "iria causar um erro na id3lib, ele não será processado pelo programa."
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
 msgstr "Arquivo corrompido..."
 
-#: src/log.c:91
+#: src/log.c:95
 msgid "Log"
 msgstr "Log"
 
-#: src/misc.c:214
-msgid " OK "
-msgstr " OK "
-
-#: src/misc.c:219
-msgid " Yes "
-msgstr " Sim "
-
-#: src/misc.c:224
-msgid " No "
-msgstr " Não "
-
-#: src/misc.c:229
-msgid " Apply "
-msgstr " Aplicar "
-
-#: src/misc.c:234
-msgid " Save "
-msgstr " Salvar "
-
-#: src/misc.c:239
-msgid " Cancel "
-msgstr " Cancelar "
-
-#: src/misc.c:244
-msgid " Close "
-msgstr " Fechar "
-
-#: src/misc.c:249
-msgid " Write "
-msgstr " Gravar "
-
-#: src/misc.c:254
-msgid " Execute "
-msgstr " Executar "
-
-#: src/misc.c:259
-msgid " Search "
-msgstr " Procurar "
-
-#: src/misc.c:264
-msgid " Browse... "
-msgstr " Navegar... "
+#: src/misc.c:773
+msgid "Select file..."
+msgstr "Arquivo selecionado..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "Diretório selecionado..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "Arquivo selecionado..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 msgid "Warning..."
 msgstr "Atenção..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr "Nenhum reprodutor de áudio definido!"
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "Gerar uma lista de músicas"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "Nome da Lista de músicas M3U"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "Usar o nome do diretório"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "Editar Máscaras"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "Opções da Lista de músicas"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "Incluir somente os arquivos selecionados"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2821,29 +2816,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:1397
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "Usar o caminho absoluto para os arquivos na lista de músicas"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 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:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "Criar uma lista de músicas no diretório acima"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 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:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "Usar separador de diretório DOS"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2851,23 +2846,23 @@ msgstr ""
 "Essa opção substitui o separador de diretório UNIX '/' por um separador DOS "
 "'\\'."
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "Conteúdo da Lista de músicas"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "Gravar somente a lista dos arquivos"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "Gravar informações usando o nome do arquivo"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "Gravar informações usando:"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2876,12 +2871,12 @@ msgstr ""
 "O arquivo de lista de músicas '%s' já existe!\n"
 "Sobrescrever?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "Gravar Lista de músicas..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2890,44 +2885,24 @@ msgstr ""
 "Não foi possível gravar o arquivo de lista de músicas '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Gravando o arquivo de lista de músicas '%s'"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1964
-msgid "Track"
-msgstr "Faixa"
-
-#: src/misc.c:1967 src/picture.c:821
-msgid "Composer"
-msgstr "Compositor"
-
-#: src/misc.c:1968
-msgid "Orig. Artist"
-msgstr "Artista Orig."
-
-#: src/misc.c:1969
-msgid "Copyright"
-msgstr "Copyright"
-
-#: src/misc.c:1970
-msgid "URL"
-msgstr "URL"
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "Codificador por"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "Procurar um arquivo"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2935,93 +2910,93 @@ msgstr ""
 "exibir todos os arquivos."
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "No:"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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:2033
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "Etiqueta"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Sensível à capitalização"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Encontrado: %d arquivo(s)"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "Carregar os nomes dos arquivos de um arquivo TXT"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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:2787
+#: src/misc.c:2738
 msgid " Load "
 msgstr " Carregar "
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, 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
+#: src/misc.c:2782 src/misc.c:2876
 #, 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
+#: src/misc.c:2791 src/misc.c:2885
 #, 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
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 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
+#: src/misc.c:2812 src/misc.c:2906
 #, 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
+#: src/misc.c:2821 src/misc.c:2915
 #, 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "Recarregar"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "Gravar somente a lista dos arquivos"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "Selecionar todas as linhas"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3030,20 +3005,20 @@ msgstr ""
 "selecionado atualmente será executado (a janela do verificador deverá estar "
 "aberta)."
 
-#: src/misc.c:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "Inserir uma linha em branco"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "Apagar essa linha"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "Mover essa Máscara para Cima"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "Mover essa Máscara para Baixo"
@@ -3061,7 +3036,7 @@ msgstr "Áudio"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr "Formato MP4 inválido"
 
@@ -3086,8 +3061,7 @@ msgstr "Canal duplo"
 msgid "Single channel"
 msgstr "Canal único"
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "Repetir a ação para o resto dos arquivos"
 
@@ -3129,48 +3103,48 @@ msgstr ""
 "Ogg Vorbis: Falta de lógica interna, indica um bug ou erro/corrupção de "
 "memória (arquivo: '%s')."
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "ERRO: Falha ao abrir o arquivo: '%s' como vorbis (%s)."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Atenção: O arquivo Ogg Vorbis '%s' contém uma etiqueta ID3v2."
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "Adicionar imagens"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "Todos os Arquivos"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG e JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "Propriedades da Imagem %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "Tipo da Imagem"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "Descrição da Imagem:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "Salvar imagem %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3181,115 +3155,120 @@ msgstr ""
 "'%s'\n"
 "Deseja sobrescrever?"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "Salvar arquivo..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "Imagem JPEG"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "Imagem PNG"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "Imagem desconhecida"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32 pixels: ícone de arquivo PNG"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "Outro ícone de arquivo"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "Capa (frente)"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "Capa (atrás)"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr "Página do folheto"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr "Media (ex. etiqueta lateral do CD)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr "Artista principal/músico principal/solista"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "Artista/músico"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "Maestro"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "Banda/Orquestra"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "Letrista/escritor"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "Local da gravação"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "Duração da gravação"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "Duração da performance"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "Captura de tela de filme/vídeo"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "Um peixe de cores fortes"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "Ilustração"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "Logotipo da banda/artista"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "Logotipo do distribuidor/estúdio"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "Tipo de imagem desconhecida"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "pixels"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "Tipo"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "Descrição"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3297,11 +3276,16 @@ 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:987
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr "Carregando Arquivo de Imagem..."
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3312,7 +3296,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr "O arquivo de imagem não foi carregado..."
 
@@ -3718,7 +3702,7 @@ msgstr ""
 "Forçar o uso da codificação de caracteres do sistema e ativar a "
 "transliteração"
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3736,7 +3720,7 @@ msgstr ""
 "Forçar o uso da codificação de caracteres do sistema e descartar "
 "silenciosamente alguns caracteres"
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3934,7 +3918,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr "Conjunto de caracteres:"
 
@@ -3954,33 +3938,44 @@ msgstr ""
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr "Configurações adicionais para o iconv():"
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 msgid "No"
 msgstr "Não"
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+#, fuzzy
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+"Com essa opção, quando um caractere não puder ser representado no conjunto "
+"de caracteres alvo, ele será aproximado através de um ou vários caracteres "
+"parecidos."
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr "//TRANSLITERAR"
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr "//IGNORAR"
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 msgid "ID3v1 tags"
 msgstr "Etiquetas ID3v1"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "Gravar etiqueta ID3v1.x"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3988,22 +3983,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:878
+#: src/prefs.c:882
 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:910
+#: src/prefs.c:917
 msgid "Character Set for reading ID3 tags"
 msgstr "Conjunto de Caracteres para a leitura das etiquetas ID3"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr "Fora do padrão:"
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -4034,31 +4029,31 @@ msgstr ""
 "caracteres 'Windows-1251' para carregar etiquetas gravadas no Windows. E "
 "'KOI8-R' para carregar etiquetas gravadas em sistemas Unix."
 
-#: src/prefs.c:947
+#: src/prefs.c:954
 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:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "Verificador"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Verificador de Preenchimento da Etiqueta - Conversão de Caracteres"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Converter caractere underscore '_' e a seqüencia '%20' para espaço ' '"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Converter espaço ' ' para underscore '_'"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4067,11 +4062,11 @@ msgstr ""
 "etiquetas."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Verificador de Renomeamento de Arquivos - Conversão de Caracteres"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4080,19 +4075,19 @@ msgstr ""
 "nome dos arquivos."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 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:1034
+#: src/prefs.c:1041
 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:1038
+#: src/prefs.c:1045
 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 "
@@ -4105,15 +4100,15 @@ msgstr ""
 "de 'Texto Em Uma Entrada')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "Janela do Verificador"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "Abrir a Janela do Verificador na inicialização"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4121,11 +4116,11 @@ msgstr ""
 "Ative essa opção para abrir automaticamente a janela do verificador quando o "
 "EasyTAG iniciar."
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "Janela do verificador sempre no topo"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4134,16 +4129,16 @@ msgstr ""
 "principal."
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "Campos"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "Sobrescrever campos ao verificar as etiquetas"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4152,11 +4147,11 @@ msgstr ""
 "novo. Se desativado, somente os campos em branco da etiqueta serão "
 "preenchidos."
 
-#: src/prefs.c:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "Definir esse texto como o comentário padrão:"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4165,13 +4160,13 @@ msgstr ""
 "comentário ao usar o 'Verificador de Preenchimento'."
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 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:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4182,42 +4177,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "Banco de Dados de CDs"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 msgid "Server Settings for Automatic Search"
 msgstr "Configurações do Servidor para Busca Automática"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "Nome:"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "Porta:"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "Caminho CGI:"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 msgid "Server Settings for Manual Search"
 msgstr "Configurações do Servidor para Busca Manual"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 msgid "Local CD Data Base"
 msgstr "Banco de Dados de CDs Local"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 msgid "Path :"
 msgstr "Caminho:"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4230,52 +4225,52 @@ msgstr ""
 "'soundtrack' e 'misc'.\""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "Opções Proxy"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "Usar um proxy"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "Definir as opções ativas do servidor proxy."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "Nome do Host:"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "Nome do servidor proxy."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "Porta do servidor proxy."
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "Nome do Usuário:"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "Nome do usuário do servidor proxy."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "Senha do Usuário:"
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 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:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "Lista do Nome das Faixas"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4283,7 +4278,7 @@ msgstr ""
 "Selecionar o arquivo de áudio correspondente (de acordo com a posição ou com "
 "o DLM, se ativado abaixo)"
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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."
@@ -4292,7 +4287,7 @@ msgstr ""
 "correspondente na lista principal também será selecionado."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4303,15 +4298,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "Confirmação"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "Confirmar ao sair do programa"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4319,19 +4314,19 @@ msgstr ""
 "Se ativada, será aberta uma caixa de diálogo pedindo confirmação antes de "
 "fechar o programa."
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "Confirmar a gravação da etiqueta no arquivo"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "Confirmar a renomeação do arquivo"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "Confirmar a remoção do arquivo"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "Confirmar a gravação da lista de músicas"
 
@@ -4339,37 +4334,37 @@ msgstr "Confirmar a gravação da lista de músicas"
 #. //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
+#: src/prefs.c:1429
 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:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "Fechar essa janela sem salvar"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 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:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Exemplo: %.*d_-_Nome_da_faixa_1.mp3)"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "Modificações aplicadas"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "Configuração salva"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "Configuração inalterada"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4380,37 +4375,37 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "Não é um diretório"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "O reprodutor de áudio '%s' não foi encontrado!"
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "Preencher Etiqueta"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "Renomear Arquivo e Diretório"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "Processar Campos"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "Etiqueta verificada com sucesso..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Etiqueta verificada com sucesso...(%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
@@ -4418,24 +4413,24 @@ msgstr ""
 "Verificador de etiqueta: estranho..., a extensão '%s' não foi encontrada no "
 "nome de arquivo '%s'!"
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, 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:663
+#: src/scan.c:667
 #, 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:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "Novo nome do arquivo verificado com sucesso..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Novo nome do arquivo verificado com sucesso...(%s)"
@@ -4443,41 +4438,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "Verificação da Etiqueta e do Nome do Arquivo"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "Verificador:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "Selecionar o tipo do verificador"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "Abrir janela do verificador / Verificar arquivos selecionados"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "Opções do Verificador"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "Mostrar / Esconder o Editor de Máscaras"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "Mostrar / Esconder Legendas"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "Fechar essa janela"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4486,15 +4481,15 @@ msgstr ""
 "o nome do arquivo e o caminho. Usado para preencher campos das etiquetas."
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "Pré-visualização do preenchimento da etiqueta..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr "Prefixo da máscara no caminho atual"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4507,15 +4502,15 @@ msgstr ""
 "contrário é relativo ao caminho anterior."
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "Pré-visualização da renomeação do arquivo..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "Campos selecionados:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4524,126 +4519,126 @@ msgstr ""
 "Selecione os que lhe interessam."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "A"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 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:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "Processar o campo do título"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "Processar o campo do artista"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "Processar o campo do álbum"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "Processar o campo do gênero"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "Processar o campo do comentário"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "Processar o campo do compositor"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "A"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 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:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "Processar o campo de copyright"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr "Processar o campo da URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "C"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr "Processar o campo do nome do codificador"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "Inverter Seleção"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "Selecionar/Deselecionar Todos."
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Converter '_' e '%20' para ' '"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "Converter:"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "para: "
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4652,7 +4647,7 @@ msgstr ""
 "Por exemplo, antes: 'Texto%20Em%20Uma_Entrada', depois: 'Texto Em Uma "
 "Entrada'."
 
-#: src/scan.c:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4660,12 +4655,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:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4673,7 +4668,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:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4681,7 +4676,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:2325
+#: src/scan.c:2394
 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'."
@@ -4690,7 +4685,7 @@ msgstr ""
 "campos). Por exemplo, antes: 'Texto EM Uma ENTRADA', depois: 'Texto em uma "
 "entrada'."
 
-#: src/scan.c:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4699,15 +4694,15 @@ msgstr ""
 "campos). Por exemplo, antes: 'Texto em uma ENTRADA', depois: 'Texto Em Uma "
 "Entrada'."
 
-#: src/scan.c:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "Insere um espaço antes de uma letra maiúscula"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "Remove espaços ou underscores duplicados"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4715,7 +4710,7 @@ msgstr ""
 "Todos os espaços entre palavras são removidos. Por exemplo, antes: 'Texto Em "
 "Uma Entrada', depois: 'TextoEmUmaEntrada'."
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4723,7 +4718,7 @@ msgstr ""
 "Um espaço é inserido antes de cada letra maiúscula. Por exemplo, antes: "
 "'TextoEmUmaEntrada', depois: 'Texto Em Uma Entrada'."
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4734,183 +4729,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a: artista"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b: álbum"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c: comentário"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p: compositor"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r: copyright"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr "%d: número do disco"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e: codificado por"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g: gênero"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i: ignorado"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l: número de faixas"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o: artista orig."
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n: faixa"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t: título"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u: URL"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y: ano"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "Editor de Máscara"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "Criar Nova Máscara"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "Mover essa Máscara para Cima"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "Mover essa Máscara para Baixo"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "Duplicar Máscara"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "Adicionar Máscaras Padrão"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "Remover Máscara"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "Salvar Máscaras"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "Nova_máscara"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "Copiar: Nenhuma coluna selecionada!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "Remover: Nenhuma coluna selecionada!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "Mover para Cima: Nenhuma coluna selecionada!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "Mover para Baixo: Nenhuma coluna selecionada!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, 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:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, 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:1033
+#: src/setting.c:1032
 msgid "Loading default configuration..."
 msgstr "Carregando configuração padrão..."
 
-#: 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, 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:1278
+#: src/setting.c:1277
 #, 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:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Carregando as máscaras padrão de 'Preenchimento de Etiqueta..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "Carregando as máscaras padrão de 'Renomear Arquivo'..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Carregando as máscaras padrão de 'Renomear Diretório'..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "ERRO: A variável de ambiente HOME não está definida!"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ERRO: Não foi possível criar o diretório '%s' (%s)!"
@@ -4959,42 +4954,75 @@ msgstr ""
 "ou truncado."
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr "A DLL '%s' não foi encontrada. Tente carregá-la..."
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr "A DLL '%s' não pôde ser carregada"
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr "Essa versão de '%s' contém '%s'"
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr "A função '%s não foi encontrada na dll '%s'"
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, c-format
 msgid "Audio player: '%s'"
 msgstr "Reprodutor de áudio: '%s'"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr "Diretório de configurações do EasyTAG: '%s'"
 
+#~ msgid " OK "
+#~ msgstr " OK "
+
+#~ msgid " Yes "
+#~ msgstr " Sim "
+
+#~ msgid " No "
+#~ msgstr " Não "
+
+#~ msgid " Apply "
+#~ msgstr " Aplicar "
+
+#~ msgid " Save "
+#~ msgstr " Salvar "
+
+#~ msgid " Cancel "
+#~ msgstr " Cancelar "
+
+#~ msgid " Close "
+#~ msgstr " Fechar "
+
+#~ msgid " Write "
+#~ msgstr " Gravar "
+
+#~ msgid " Execute "
+#~ msgstr " Executar "
+
+#~ msgid " Search "
+#~ msgstr " Procurar "
+
+#~ msgid " Browse... "
+#~ msgstr " Navegar... "
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/ro.gmo b/po/ro.gmo
index c0f13fb..0338b9d 100644
--- a/po/ro.gmo
+++ b/po/ro.gmo
diff --git a/po/ro.po b/po/ro.po
index 862553a..685d464 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-10-15 23:53+0200\n"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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:134
+#: src/about.c:140
 #, fuzzy
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
@@ -28,203 +28,198 @@ msgstr ""
 "etichtelor fisierelor MP3, MP2, FLAC, Ogg Vorbis, MusePack si Monkey Audio. "
 "Interfata sa simpla (GTK+) face etichetarea mai simpla."
 
-#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(Traducerea germana)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(Traducerea rus�)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(Traducerea olandez�)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(Traducerea suedez�)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(Traducerea ungar�)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(Traducerea italian�)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(Traducerea japonez�)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(Traducerea ucrainian�)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(Traducerea ceh�)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(Traducerea spaniol�)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(Traducerea polonez�)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(Traducerea rom�n�)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(Traducerea daneza)"
 
-#: src/about.c:168
+#: src/about.c:174
 #, fuzzy
 msgid "(Greek translation)"
 msgstr "(Traducerea germana)"
 
-#: src/about.c:169
+#: src/about.c:175
 #, fuzzy
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Traducerea japonez�)"
 
-#: src/about.c:170
+#: src/about.c:176
 #, fuzzy
 msgid "(Bulgarian translation)"
 msgstr "(Traducerea ungar�)"
 
-#: src/about.c:171
+#: src/about.c:177
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(Traducerea japonez�)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(Traducerea japonez�)"
+
+#: src/about.c:179
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(Traducerea germana)"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(Traducerea germana)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "Comentariu"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "Despre..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "Despre"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(compilat: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(folosind: GTK+ %d.%d.%d si id3lib %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Pagin� de web: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "Descriere:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 #, fuzzy
 msgid "MP3 file support"
 msgstr "(Suportul pentru FLAC dezactivat)"
 
-#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
-#: src/about.c:452 src/about.c:462
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(Suportul pentru FLAC dezactivat)"
 
-#: src/about.c:410
+#: src/about.c:452
 #, fuzzy
 msgid "available"
 msgstr "Nu este destul� memorie"
 
-#: src/about.c:420
+#: src/about.c:463
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(Suportul pentru Ogg Vorbis dezactivat)"
 
-#: src/about.c:430
+#: src/about.c:475
 #, fuzzy
 msgid "Speex file support"
 msgstr "(Suportul pentru FLAC dezactivat)"
 
-#: src/about.c:440
+#: src/about.c:491
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(Suportul pentru FLAC dezactivat)"
 
-#: src/about.c:450
+#: src/about.c:504
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(Suportul pentru FLAC dezactivat)"
 
-#: src/about.c:460
+#: src/about.c:516
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(Suportul pentru FLAC dezactivat)"
@@ -232,33 +227,33 @@ msgstr "(Suportul pentru FLAC dezactivat)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "Mul�umiri"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "Traduceri:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "General:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "Schimbari"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "Eroare �n timpul deschiderii fisierului: '%s' (%s)."
@@ -434,7 +429,7 @@ msgstr "Ordoneaza lista descrescator dupa rata de esantionare"
 msgid "Open File(s) with ..."
 msgstr "Deschide fisierul(-ele) cu ..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "Alege toate fisierele"
 
@@ -442,7 +437,7 @@ msgstr "Alege toate fisierele"
 msgid "Unselect All Files"
 msgstr "Deselecteaza toate fisierele"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "Inveseaza alegerea"
 
@@ -590,7 +585,7 @@ msgstr "Redenumeste directorul..."
 msgid "Reload Directory"
 msgstr "Re�ncarc� directorul"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "Navigheaz� directorul cu ..."
 
@@ -730,17 +725,17 @@ msgstr "Nu pot uni interfata, eroarea a fost: %s\n"
 msgid "Ready to start..."
 msgstr "Gata s� pornesc..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 msgid "New default path for files selected"
 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:4550 src/easytag.c:4570 src/easytag.c:4589
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "Confirm�ri..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -748,67 +743,115 @@ 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:2040
+#: src/browser.c:2164
 #, fuzzy
 msgid "<All albums>"
 msgstr "# Albume"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "Arbore"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "Numele fi�ierlui"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "Titlu"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "Artist"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "Album"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "An"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "Pist�"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "Gen"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "Compozitor"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "Artist initial"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "Drept de autor"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "URL"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "Codor"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "# Albume"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 msgid "# Files"
 msgstr "# Fisiere"
 
-#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
-msgid "Album"
-msgstr "Album"
-
-#: src/browser.c:2822
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "Mergi �n directorul parinte"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "Introduce�i un director de navigat."
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "Arbore"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "Alege�i un director de navigat!"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "Artist si Album"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "Redenume�te directorul"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Redenume�te directorul '%s' : "
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "Foloseste masca:"
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 #, 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:3263
+#: src/browser.c:3649
 #, fuzzy
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
@@ -818,32 +861,32 @@ msgstr ""
 "examina numele de fi�iere �i calea. Folosit pentru a completa c�mpurile "
 "etichetei."
 
-#: src/browser.c:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
-#: src/scan.c:2119 src/scan.c:2465
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "Mask de examinare invalid"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 #, fuzzy
 msgid "Rename directory preview..."
 msgstr "Previziualizeaz� redenumirea fi�ierului"
 
-#. 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "Eroare..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "Trebuie s� introduce�i un nume de director!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, 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."
@@ -852,16 +895,22 @@ msgstr "Nu pot converti '%s' in codarea fisierului. Alegeti alt nume."
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -870,7 +919,7 @@ msgstr "Nu pot converti '%s' in codarea fisierului. Alegeti alt nume."
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -879,7 +928,7 @@ msgstr ""
 "Nu pot redenumi pentru c� acest nume de director exist� deja!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -894,88 +943,88 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "Director redenumit"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "Program de executat :"
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 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:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "Deschide fisierul cu ..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 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:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "Trebuie s� introduce�i un nume de fi�ier!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr ""
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, fuzzy, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Nu pot executa %s (%s)!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "Nu pot porni (fork) alt proces!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Comanda executat� : '%s %s'"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "Artist / Album"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Category"
 msgstr "Categorie"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:229 src/cddb.c:438
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "Num�rul pistei"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "Timp"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "Cautare CD in baza de date"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "Cautare automata"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 #, fuzzy
 msgid "Request CD database :"
 msgstr "Cere baza de date FreeDB:"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -983,16 +1032,16 @@ msgstr ""
 "Cere automat baza CDDB folosit fisierele alese (ordinea e importanta!) "
 "pentru a genera CddbID."
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr " Opreste cautarea...  "
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1003,138 +1052,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "Cautare manuala"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "Cuvinte :"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Introduce�i cuvintele de c�utat (separate de un spa�iu sau '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "Caut� �n :"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "Toate c�mpurile"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "Altele"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "Toate categoriile"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "Clasic"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Diverse"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Raggae"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "Coloan�Sonor�"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "inclus: funk, soul, rap, pop, industrial, metal, etc."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "filme, spectacole"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "altele care nu se �ncadreaz� �n categoriile de mai sus"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr " Categorii "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "Rezultate :"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "C�utare :"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "Introduceti cuvintele de cautat in lista de mai jos"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "Cauta urmatorul"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "Cauta precedentul"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 #, fuzzy
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "Afisaza doar liniile rosii/toate liniile"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "Deselecteaza toate liniile"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "Inverseaza alegerea liniilor"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "Alege toate liniile"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1148,52 +1197,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "Fixeaz� �n :"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 msgid "All"
 msgstr "Toate"
 
-#: src/cddb.c:721 src/misc.c:1958
-msgid "File Name"
-msgstr "Numele fi�ierlui"
-
-#: src/cddb.c:722 src/misc.c:1959
-msgid "Title"
-msgstr "Titlu"
-
-#: src/cddb.c:725 src/misc.c:1963
-msgid "Year"
-msgstr "An"
-
-#: src/cddb.c:726
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "Pist� #"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 msgid "# Tracks"
 msgstr "# Piste"
 
-#: 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:3013
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "Ruleaza examinatorul curent pentru fiecare fisier"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 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
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1202,91 +1235,91 @@ msgid ""
 "instead of using directly the position order."
 msgstr ""
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 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:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "Gata s� caut..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, 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:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "Inverseaza alegerea"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "Ordoneaza lista crescator dupa numar"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "Ordoneaza dupa numele pistei"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Rezolv gazda '%s'..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Nu pot rezolva gazda '%s' (%s)!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, 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:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "M� conectez la gazda '%s', port '%d' ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Nu m� pot conecta la gazda '%s' (%s)!"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Conectat la gazda '%s'"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Primesc datele (%s) ..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, 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:1770
+#: src/cddb.c:1771
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Nu pot crea sau deschide '%s' (%s)"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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:2246 src/cddb.c:2564 src/cddb.c:3397
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "Trimit cerere ..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Nu pot trimite cerere (%s)!"
@@ -1295,91 +1328,91 @@ msgstr "Nu pot trimite cerere (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "Primesc datele ..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "Serverul a intors un raspuns gresit! (%s)"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Serverul a intors un raspuns gresit! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Regret, cautarea web este inaccesibila"
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Am g�sit %d album(e)"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Primesc datele (%s) ..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Primesc datele (%s) ..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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:2889
+#: src/cddb.c:2893
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d fisier(e) alese!"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Gata s� caut..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, 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:3268
+#: src/cddb.c:3276
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Am g�sit %d album(e)"
 
-#: src/cddb.c:3364
+#: src/cddb.c:3372
 #, 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:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "�ncarc lista de piste a albumului"
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1392,7 +1425,7 @@ msgstr ""
 "\n"
 "Continuati?"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "Scrie eticheta din CDDB..."
 
@@ -1577,68 +1610,68 @@ msgstr "Vestic (ISO-8859-15)"
 msgid "Western (Windows-1252)"
 msgstr "Vestic (Windows-1252)"
 
-#: src/charset.c:542
+#: src/charset.c:543
 #, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "Unicode invalid(UTF-8)"
 
-#: src/charset.c:641
+#: src/charset.c:642
 #, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
 
-#: src/charset.c:705
+#: src/charset.c:706
 #, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, fuzzy, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "Pornesc EasyTAG %s (Pld: %d) ...\n"
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, fuzzy, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "Folosesc id3lib versiunea %d.%d.%d ...\n"
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, fuzzy, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "Folosesc id3lib versiunea %d.%d.%d ...\n"
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr ""
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, fuzzy, c-format
 msgid "Setting locale : '%s'"
 msgstr "Redenumesc fi�ierul '%s'"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr ""
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s de %s (compilat %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "Pagin� de web: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr ""
@@ -1646,140 +1679,140 @@ msgstr ""
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "Navigator"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "Fi�ier"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "Fi�ier doar citire"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 msgid "File Link Broken"
 msgstr "Leg�tur� fi�ier incorect�"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, Strat ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "Frecven��:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 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
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "Lungime:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? kb"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "Timp:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "Etichet�"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "Comun"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "Titlu:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "Eticheteaza fisierele alese cu titlul acesta"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "Artist:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr "Eticheteaza toate fisierele cu artistul acesta"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr "Eticheteaza fisierele alese cu albumul acesta"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 #, fuzzy
 msgid "CD:"
 msgstr "CD"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr "Eticheteaza fisierele alese cu acest numar de disc"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "An:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "Eticheteaza fisierele alese cu anul acesta"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Numara pistele alese secvential. Porneste de la 01 �n fiecare subdirector"
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "Pist� #:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1787,274 +1820,274 @@ msgstr ""
 "Alegeti numarul de fisiere, din acelasi director cu fisierul afisat, pentru "
 "pistele alese"
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr "Eticheteaza fisierele alese cu acest numar de piste"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "Gen"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "Eticheteaza fisierele alese cu acest gen"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "Comentariu:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 msgid "Tag selected files with this comment"
 msgstr "Eticheteaza fisierele alese cu acest comentariu"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:818
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "Compozitor:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr "Eticheteaza fisierele alese cu acest compozitor"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "Artist initial:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr "Eticheteaza toate fisierele cu artistul initial acesta"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "Drept de autor:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "Eticheteaza toate fisierele cu 'dreptul de autor' acesta"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "Eticheteaza fisierele alese cu URL-ul acesta"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "Codor:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr "Eticheteaza fisierele alese cu acest codor"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "Imagini"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "Imagini:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "Puteti folosi 'drag and drop' pentru a adauga o imagine."
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "Eticheteaza fisierele alese cu aceste imagini"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 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
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr "Sterge imaginile alese sau toate imaginile."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "Salveaza imaginile alese pe hard disc"
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "Alegeti proprietatile imaginilor alese."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Fisierele alese etichetate cu titlul '%s'."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "Sters titlul din fisierele alese."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Toate fisierele etichetate cu artistul '%s'."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "Sters artistul din toate fisierele."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Fisierele alese etichetate cu albumul '%s'."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "Sters albumul din fisierele alese."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Fisierele alese etichetate cu numarul de disc '%s'."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "Sters numarul de disc din fisierele alese."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Fisierele alese etichetate cu anul '%s'."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "Sters anul din fisierele alese."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Fisierele alese etichetate cu pista 'xx/%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Fisierele alese etichetate cu pista 'xx'."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "Sters numarul pistei din fisierele alese."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "Pistele alese etichetate secvential."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Fisierele alese etichetate cu genul '%s'."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "Sters genul din fisierele alese."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Fisierele alese etichetate cu comentariul '%s'."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "Sters comentariul din fisierele alese."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Fisierele alese etichetate cu compozitorul '%s'."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "Sters compozitorul din fisierele alese."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Toate fisierele etichetate cu artistul initial '%s'."
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "Sters artistul intial din toate fisierele."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Toate fisierele etichetate cu 'dreptul de autor' '%s'."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "Sters 'dreptul de autor' din toate fisierele."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Fisierele alese etichetate cu URL '%s'."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "Sters URL din fisierele alese."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Fisierele alese etichetate cu codorul '%s'."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr "Sters codorul din fisierele alese."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "Fisierele alese etichetate cu imagini '%s'."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "Sters imaginile din fisierele alese."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Alege�i modul �i masca �i ref� aceea�i actiune"
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "Toate etichetele au fost examinate"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "Toate etichetele au fost �terse"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "Toate fi�ierele au fost salvate..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "Fi�ierele au fost par�ial salvate..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "Fisierele au fost partial sterse..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "Toate fisierele au fost sterse..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2063,17 +2096,17 @@ msgstr ""
 "Dori�i s� scrie�i eticheta fi�ierului\n"
 "'%s' ?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "Scriu eticheta..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 #, fuzzy
 msgid "Rename File and Directory..."
 msgstr "Redenumeste fisierul si directorul"
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, fuzzy, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2087,12 +2120,12 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 #, fuzzy
 msgid "Rename Directory..."
 msgstr "Redenumeste directorul..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, fuzzy, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2106,11 +2139,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "Redenume�te fi�ierul..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2123,17 +2156,17 @@ msgstr ""
 "�n \n"
 "'%s' ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Scriu eticheta la '%s'"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 msgid "Tag(s) written"
 msgstr "Eticheta(le) scris(e)"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2586 src/easytag.c:2591
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2142,14 +2175,14 @@ msgstr ""
 "Nu pot scrie eticheta �n fi�ierul '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Redenumesc fi�ierul '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2737 src/easytag.c:2769 src/easytag.c:2941
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2162,11 +2195,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "Fi�ierul(ele) neredenumite..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2179,7 +2212,7 @@ msgstr ""
 "pentru c� urm�torul fi�ier deja exist�:\n"
 "'%s'"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2191,16 +2224,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Fi�ier redenumit '%s' �n '%s'"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "Fisierul(ele) redenumite..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, fuzzy, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2212,18 +2245,18 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, fuzzy, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Fi�ier redenumit '%s' �n '%s'\n"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 #, fuzzy
 msgid "File(s) moved..."
 msgstr "Fisierul(ele) redenumite..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, fuzzy, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2236,12 +2269,12 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 #, fuzzy
 msgid "File(s) not moved..."
 msgstr "Fi�ierul(ele) neredenumite..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2250,16 +2283,16 @@ msgstr ""
 "Sigur doriti sa stergeti definitiv fisierul\n"
 "'%s' ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "�terge fi�ierul..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Fisierul '%s' a fost sters"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2271,109 +2304,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "C�utare �n curs..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "Fi�ier: '%s'"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, 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:3239
+#: src/easytag.c:3356
 #, 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:3252 src/et_core.c:2696
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u fisier(e)"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 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:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "Nici un fi�ier nu a fost g�sit �n acest director!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "Caut..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "  Opre�te c�utarea...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "Alege�i un director de navigat!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "Eticheteaza fisierele alese cu titlul acesta"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Schimb� '_' �i '%20' �n spa�ii"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "Schimb� ' ' �n '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "Toate majuscule"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "Toate minuscule"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "Prima liter� majuscul�"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "Prima liter� a fiec�rui cuv�nt majuscul�"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "�terge spa�iile"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "Introdu spa�iu �nainte de majuscul�"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 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:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Ie�ire anormal�! (PId: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, fuzzy, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Primit semnalul %s (%d)\n"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 #, fuzzy
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
@@ -2383,11 +2416,11 @@ msgstr ""
 "Probabil ati gasit o problema cu EasyTAG. Va rog sa trimiteti un raport cu "
 "gdb backtrace ('gdb easytag core' apoi 'bt') la easytag@gmail.com\n"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "Semnal necunoscut"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2419,11 +2452,11 @@ msgstr ""
 "/calea_spre/fisiere   Folositi o cale absoluta pentru a �ncarca\n"
 "., ./                 �ncarca directorul curent\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Ie�ire normal�."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2431,80 +2464,80 @@ msgstr ""
 "Unele fi�iere au fost modificate dar nu �i salvate...\n"
 "Dori�i s� le salvez �nainte de ie�ire?"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr " Sigur vre�i s� ie�iti din program? "
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "Etichet� ID3"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Eticheta Ogg Vorbis"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "Eticheta FLAC Vorbis"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "Eticheta APE"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr ""
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "Fi�ier MP3"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "Fi�ier MP2"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "Fi�ier Ogg Vorbis"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 #, fuzzy
 msgid "Speex File"
 msgstr "Urmatorul fisier"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "Fi�ier FLAC"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "Fisier MusePack"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "Fisier Monkey's Audio"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 #, fuzzy
 msgid "MP4/AAC File"
 msgstr "Fi�ier MP2"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 #, fuzzy
 msgid "Wavpack File"
 msgstr "Fisier MusePack"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "Imagini"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2512,14 +2545,14 @@ 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/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2530,11 +2563,11 @@ msgstr ""
 "in codarea sistemului de fisiere\n"
 "(Incercati sa modificati variabila de mediu G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "Optiuni ale conversiei numelui de fisier"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr ""
@@ -2544,7 +2577,7 @@ msgstr ""
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "Codor:"
@@ -2553,50 +2586,55 @@ msgstr "Codor:"
 #. 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/flac_header.c:312 src/mp4_header.c:286 src/ogg_header.c:267
 #: src/wavpack_header.c:88
 #, fuzzy
 msgid "Channels:"
 msgstr "Schimbari"
 
-#: src/flac_tag.c:140 src/flac_tag.c:741
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "Eroare �n timpul deschiderii fisierului: '%s' (%s).\n"
 "\a"
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "Eroare: Am e�uat s� scriu comentariile �n fi�ierul '%s' (%s)."
 
-#: src/flac_tag.c:990 src/ogg_tag.c:759
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Eticheta de la '%s' scris�"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "�ters eticheta de la '%s'"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Eroare �n timp ce �tergeam eticheta ID3v1 de la '%s' (%s)"
 
-#: src/id3_tag.c:490 src/id3_tag.c:557
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Eroare �n timp ce �tergeam eticheta ID3v2 de la '%s' (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Eroare �n timp ce actualizam eticheta ID3v2 de la '%s' (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2611,205 +2649,161 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Eroare �n timp ce actualizam eticheta ID3v1 de la '%s' (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Eticheta de la '%s' actualizat�"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "F�r� erori"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "Nu este destul� memorie"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "Nici o informa�ie de examinat"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "Date incorect formatate"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "Nici o memorie tampon �n care s� scriu"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "Memoria tampon este prea mic�"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "Frame ID incorect"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "C�mpul cerut negasit"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "Tip de c�mp necunoscut"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "Eticheta este deja ata�at� unui fi�ier"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "Versiune de etichet� incorect�"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "Nici un fi�ier de examinat"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "�ncercare de scriere a unui fi�ier disponibil doar pentru citire"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "Eroare la compresie/decompresie"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "Mesaj de eroare necunoscut!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
 "will cause an error in id3lib, it will not be processed by the program."
 msgstr ""
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 #, fuzzy
 msgid "Corrupted file..."
 msgstr "Salvati fisierul..."
 
-#: src/log.c:91
+#: src/log.c:95
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:214
-msgid " OK "
-msgstr " OK "
-
-#: src/misc.c:219
-msgid " Yes "
-msgstr " Da "
-
-#: src/misc.c:224
-msgid " No "
-msgstr " Nu "
-
-#: src/misc.c:229
-msgid " Apply "
-msgstr " Aplica "
-
-#: src/misc.c:234
-msgid " Save "
-msgstr " Salveaz� "
-
-#: src/misc.c:239
-msgid " Cancel "
-msgstr " Anuleaz� "
-
-#: src/misc.c:244
-msgid " Close "
-msgstr " �nchide "
-
-#: src/misc.c:249
-msgid " Write "
-msgstr " Scrie "
-
-#: src/misc.c:254
-msgid " Execute "
-msgstr " Execut� "
-
-#: src/misc.c:259
-msgid " Search "
-msgstr " Caut� "
-
-#: src/misc.c:264
-msgid " Browse... "
-msgstr " Navigheaz�... "
+#: src/misc.c:773
+msgid "Select file..."
+msgstr "Alege�i fi�ierul..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "Alege�i directorul..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "Alege�i fi�ierul..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 #, fuzzy
 msgid "Warning..."
 msgstr "Caut..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "Genereaz� un playlist"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "Numele M3U playlist"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "Folose�te numele de director"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "Modific� mask"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "Op�iuni playlist"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "Include doar fisierele alese"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2817,29 +2811,29 @@ msgstr ""
 "Daca se activeaza doar fisierele alese vor fi scrise in \"playlist\". Altfel "
 "toate vor fi scrise."
 
-#: src/misc.c:1397
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "Folose�te calea complet� pentru fi�ierele din playlist"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 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:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "Creaza playlist in directorul parinte"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 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:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "Foloseste separatorul de directoare din DOS"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2847,23 +2841,23 @@ msgstr ""
 "Aceasta optiune schimba separatorul de directoare UNIX '/' in separatorul "
 "DOS '\\'."
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "Con�inutul playlist"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "List� de fi�iere disponibile doar pentru scriere"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "Scrie informa�iile folosind numele de fi�ier"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "Scrie informa�iile folosind :"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2872,12 +2866,12 @@ msgstr ""
 "Fi�ierul playlist '%s' exist� deja!\n"
 "Suprascriu?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "Scriu playlist..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2886,44 +2880,24 @@ msgstr ""
 "Nu pot scrie fi�ierul playlist '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Am scris fi�ierul playlist '%s'"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1964
-msgid "Track"
-msgstr "Pist�"
-
-#: src/misc.c:1967 src/picture.c:821
-msgid "Composer"
-msgstr "Compozitor"
-
-#: src/misc.c:1968
-msgid "Orig. Artist"
-msgstr "Artist initial"
-
-#: src/misc.c:1969
-msgid "Copyright"
-msgstr "Drept de autor"
-
-#: src/misc.c:1970
-msgid "URL"
-msgstr "URL"
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "Codor"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "Caut� un fi�ier"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2931,95 +2905,95 @@ msgstr ""
 "afisa toate fisierele."
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "�n :"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 #, 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:2033
+#: src/misc.c:1984
 #, fuzzy
 msgid "the Tag"
 msgstr "Scriu eticheta..."
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Cu majuscule seminifcative"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Gasit : %d fi�ier(e)"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "�ncarc� numele de fi�ier dintr-un fi�ier TXT"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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:2787
+#: src/misc.c:2738
 msgid " Load "
 msgstr " �ncarc� "
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, fuzzy
 msgid "Content of TXT file"
 msgstr "Confirm� redenumirea fi�ierului"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2831 src/misc.c:2925
+#: src/misc.c:2782 src/misc.c:2876
 #, fuzzy
 msgid "Insert a blank line before the selected line"
 msgstr "Introdu un spa�iu �nainte de o majuscul�"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2840 src/misc.c:2934
+#: src/misc.c:2791 src/misc.c:2885
 #, 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
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 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
+#: src/misc.c:2812 src/misc.c:2906
 #, 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
+#: src/misc.c:2821 src/misc.c:2915
 #, 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "Re�ncarc�"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "List� de fi�iere disponibile doar pentru scriere"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "Alege toate liniile"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3028,20 +3002,20 @@ msgstr ""
 "examinatorul curent va fi rulat (fereastra examinatorului trebuie sa fie "
 "deschisa)."
 
-#: src/misc.c:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "Introdu o linie goal�"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "�terge aceast� linie"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "Mut� sus aceast� masc�"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "Mut� jos aceast� masc�"
@@ -3060,7 +3034,7 @@ msgstr ""
 msgid "Unknown"
 msgstr "Imagine necunoscuta"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr ""
 
@@ -3085,8 +3059,7 @@ msgstr ""
 msgid "Single channel"
 msgstr ""
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "Repet� ac�iunea pentru celelalte fi�iere"
 
@@ -3124,48 +3097,48 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "Eroare: Am e�uat s� deschis fi�ierul: '%s' ca vorbis (%s)."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Atentie: Fisierul Ogg Vorbis '%s' contine o eticheta ID3V2."
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "Adauga imagini"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "Toate fisierele"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG si JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "Proprietatile imaginii %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "Tipul imaginii"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "Descriere imagine:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "Salveaza imaginea %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3176,125 +3149,135 @@ msgstr ""
 "'%s'\n"
 "Vreti sa suprascrieti?"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "Salvati fisierul..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "Imagine JPEG"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "Imagine PNG"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "Imagine necunoscuta"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "Icon PNG de 32x32 pixeli"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "Alt icon"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "Coperta (fata)"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "Coperta (spate)"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr "Pagina brosura"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr "Media (ex. cotorul CD)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr "Artistul de baza/solo"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "Artist/interpret"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "Dirijor"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "Formatie/Orchestra"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "Versuri/textier"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "Locul inregistrarii"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "In timpul inregistrarii"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "In timpul spectacolului"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "Captura de ecran"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "Un peste colorat intens"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "Ilustratie"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "Emblema formatie/artist"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "Emblema distribuitor/studio"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "Tip de imagine necunoscut"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "pixeli"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "Tip"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "Descriere"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 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
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr ""
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, fuzzy, c-format
 msgid ""
 "Can't open file :\n"
@@ -3302,7 +3285,7 @@ msgid ""
 "(%s)"
 msgstr "Nu pot deschide '%s' (%s)\n"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr ""
 
@@ -3705,7 +3688,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3718,7 +3701,7 @@ msgid ""
 "characters"
 msgstr ""
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3914,7 +3897,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr ""
 
@@ -3935,35 +3918,42 @@ msgstr "Setul de caractere folsit pentru a scrie etichetele in fisier."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 #, fuzzy
 msgid "No"
 msgstr " Nu "
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "Etichet� ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "Scrie etichet� ID3v1.x"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3971,22 +3961,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:878
+#: src/prefs.c:882
 #, 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:910
+#: src/prefs.c:917
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Setul de caractere pentru etichetele ID3"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -4003,7 +3993,7 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:947
+#: src/prefs.c:954
 msgid "Character set used to read tag data in the file."
 msgstr ""
 "Setul de caractere folsit pentru a citi informatiile din etichete din fisier."
@@ -4011,24 +4001,24 @@ msgstr ""
 #.
 #. * Scanner
 #.
-#: src/prefs.c:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "Examinator"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Schimba caracterele"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Schimb� '_' �i '%20' �n spa�ii ' '"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Schimb� spa�iile �n '_'"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4037,11 +4027,11 @@ msgstr ""
 "examinatorului de etichete."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Schimba caracterele"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4050,17 +4040,17 @@ msgstr ""
 "examinatorului de fisiere."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 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:1034
+#: src/prefs.c:1041
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: src/prefs.c:1038
+#: src/prefs.c:1045
 #, fuzzy
 msgid ""
 "Don't convert first letter of the words like prepositions, articles and "
@@ -4073,15 +4063,15 @@ msgstr ""
 "cuvint'."
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "Fereastra examinatorului"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "Deschide fereastra examinatorului la pornire"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4089,11 +4079,11 @@ msgstr ""
 "Activa�i aceast� op�iune pentru a deschide automat freastra examinatorului "
 "c�nd EasyTAG este pornit."
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "Fereastra examinatorului tot timpul deasupra"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4102,16 +4092,16 @@ msgstr ""
 "fereastra principal�."
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "C�mpuri"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "Suprascrie c�mpurile c�nd examinezi etichetele"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4120,11 +4110,11 @@ msgstr ""
 "noul text. Dac� este dezactivat�, numai c�mpurile goale ale etichetei vor fi "
 "completate."
 
-#: src/prefs.c:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "Fixeaz� acest text drept comentariu implicit :"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4133,13 +4123,13 @@ msgstr ""
 "comentariu c�nd folosi�i 'Completeaz� eticheta'."
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 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:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4150,46 +4140,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "Baza de date CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Cautare automata"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "Nume :"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "Calea CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Set�ri server"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "Baza de date CD"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 #, fuzzy
 msgid "Path :"
 msgstr "Calea CGI :"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4198,59 +4188,59 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "Set�ri proxy"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "Folose�te proxy"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "Fixeaz� active set�rile serverului proxy."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "Nume gazda :"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "Numele serverlui proxy."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "Portul serverlui proxy"
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "Nume utilizator:"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "Numele utilizatorului serverlui proxy."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "Parola utilizatorului:"
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 msgid "Password of user for the the proxy server."
 msgstr "Parola utilizatorului serverlui proxy."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "Lista numelor de pista"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 #, 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:1353
+#: src/prefs.c:1360
 #, fuzzy
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
@@ -4260,7 +4250,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:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4269,15 +4259,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "Confirm�ri"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "Confirm� ie�irea din program"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4285,19 +4275,19 @@ msgstr ""
 "Dac� este activat�, deschide o fereastr� de dialog s� cear� confirmarea "
 "�nainte de p�rasirea programului."
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "Confirm� scrierea etichetei fi�ierului"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "Confirm� redenumirea fi�ierului"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "Confirma stergerea fisierului"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "Confirm� scrierea playlist"
 
@@ -4305,37 +4295,37 @@ msgstr "Confirm� scrierea playlist"
 #. //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
+#: src/prefs.c:1429
 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:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "�nchide fereastra f�r� s� salvezi"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 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:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr ""
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "Schimb�rile aplicate"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "Configura�ia salvat�"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "Configura�ia neschimbat�"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4346,58 +4336,58 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "Nu este director"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr ""
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "Completeaz� eticheta"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "Redenumeste fisierul si directorul"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "Prelucreaz� fi�ierele"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "Eticheta examinat� cu succes..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Eticheta examinata cu succes...(%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, 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:663
+#: src/scan.c:667
 #, 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:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "Noul nume de fi�ier examinat cu succes..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Noul nume de fi�ier examinat cu succes...(%s)"
@@ -4405,41 +4395,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "Examinarea etichetei �i numelui de fi�ier"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "Examinator :"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "Alege�i tipul de examinator"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "Deschide fereastra examinatorului / Examinati fisierele alese"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "Op�iunile examinatorului"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "Arat� / ascunde editorul mask"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "Arat� / ascunde legenda"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "�nchide aceast� fereastr�"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4449,15 +4439,15 @@ msgstr ""
 "etichetei."
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "Completeaza previzualizarea etichetei..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr "Pune calea actuala inaintea mastii"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4470,15 +4460,15 @@ msgstr ""
 "cale absoluta, altfel este relativ la vechea cale."
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "Previziualizeaz� redenumirea fi�ierului"
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "Alege�i c�mpurile:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4487,126 +4477,126 @@ msgstr ""
 "Alege�i acelea care v� intereseaz�."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 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:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "Prelucrez c�mpul titlu"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "Prelucrez c�mpul artist"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "Prelucrez c�mpul album"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "Prelucrez c�mpul gen"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "Prelucrez c�mpul comentariu"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "Prelucrez c�mpul compozitor"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 msgid "Process original artist field"
 msgstr "Prelucrez c�mpul artist initial"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "Prelucrez c�mpul 'drept de autor'"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr "Prelucrez c�mpul URL"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr "Prelucrez c�mpul nume de codor"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "Inveseaz� alegerea"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "Alege/dealege toate."
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Schimb� '_' �i '%20' �n ' '"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "Conversie :"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "la : "
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4614,7 +4604,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:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4622,12 +4612,12 @@ msgstr ""
 "Spa�iul este �nlocuit de un '_'. Examplu, �nainte: 'text introdus', dup�: "
 "'text_introdus'."
 
-#: src/scan.c:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4635,7 +4625,7 @@ msgstr ""
 "Schimb� toate cuvintele �n toate c�mpurile �n majuscule. Exemplu, �nainte "
 "'Text INTROUDS', dup�: 'TEXT INTRODUS'."
 
-#: src/scan.c:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4643,7 +4633,7 @@ msgstr ""
 "Schimb� toate cuvintele �n toate c�mpurile �n minuscule. Exemplu, �nainte: "
 "'TEXT �nainte', dup�: 'text �nainte'."
 
-#: src/scan.c:2325
+#: src/scan.c:2394
 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'."
@@ -4651,7 +4641,7 @@ msgstr ""
 "Schimb� ini�iala primului cuv�nt �n toate c�mpurile �n majuscul�. Exemplu "
 "�nainte: 'tEXt �nainte', dup�: 'Text �nainte'."
 
-#: src/scan.c:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4659,15 +4649,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:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "Introdu un spa�iu �nainte de o majuscul�"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "�terge spa�iile sau '_' multiple"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4675,7 +4665,7 @@ msgstr ""
 "Toate pa�iile dintre cuvinte s� fie �terse. Exemplu, �nainte: 'Text "
 "�nainte', dup�: 'Text�nainte'."
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4683,7 +4673,7 @@ msgstr ""
 "Un spa�iu este introdus �nainte de fiecare majuscul�. Exemplu, �nainte: "
 "'Text�nainte', dup�: 'Text �nainte'."
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4694,159 +4684,159 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "Legend�"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artist"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c : comentariu"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%c : compozitor"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r: drept autor"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr ""
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e: codat de"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g : gen"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorat"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l : num�r de piste"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%a : artist initial"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n : pist�"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t : titlu"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y : an"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "Editor de m�ti"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "Creaz� o masc� nou�"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "Mut� sus aceast� masc�"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "Mut� jos aceast� masc�"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "Copiaz� masca"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "Adaug� o masc� implicit�"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "�terge masca"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "Salveaz� masca"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "Masc� nou�"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "Copiaz�: Nici un r�nd ales!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "�terge: Nici un r�nd ales!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "Mut� sus: Nici un r�nd ales!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "Mut� jos: Nici un r�nd ales!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "Eroare: Nu pot scrie fisierul configuratie: %s (%s)\a"
 
-#: src/setting.c:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Nu pot deschide fi�ierul configura�ie '%s' (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 msgid "Loading default configuration..."
 msgstr "�ncarc configura�ia implicit�..."
 
-#: 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Nu pot crea sau deschide '%s' (%s)"
 
-#: src/setting.c:1278
+#: src/setting.c:1277
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
@@ -4854,29 +4844,29 @@ msgstr ""
 "\a"
 
 #. Fall back to defaults
-#: src/setting.c:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "�ncarc mask 'Completeaz� eticheta' implicit..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "�ncarc mask-ul 'Redenume�te fi�ierul' implicit..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 #, fuzzy
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "�ncarc mask-ul 'Redenume�te fi�ierul' implicit..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "Eroare: Variabila de mediu $HOME nu este definit�!\n"
 "\n"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "Eroare: Nu pot crea directorul '%s' (%s)!"
@@ -4926,42 +4916,75 @@ msgstr ""
 "sau trunchiat."
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr ""
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr ""
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr ""
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr ""
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, fuzzy, c-format
 msgid "Audio player: '%s'"
 msgstr "Execut� playerul audio"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid " OK "
+#~ msgstr " OK "
+
+#~ msgid " Yes "
+#~ msgstr " Da "
+
+#~ msgid " No "
+#~ msgstr " Nu "
+
+#~ msgid " Apply "
+#~ msgstr " Aplica "
+
+#~ msgid " Save "
+#~ msgstr " Salveaz� "
+
+#~ msgid " Cancel "
+#~ msgstr " Anuleaz� "
+
+#~ msgid " Close "
+#~ msgstr " �nchide "
+
+#~ msgid " Write "
+#~ msgstr " Scrie "
+
+#~ msgid " Execute "
+#~ msgstr " Execut� "
+
+#~ msgid " Search "
+#~ msgstr " Caut� "
+
+#~ msgid " Browse... "
+#~ msgstr " Navigheaz�... "
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/ru.gmo b/po/ru.gmo
index 34ad2dd..5bb7786 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index 6f2ce6c..e9d3336 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-10-15 23:53+0200\n"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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:134
+#: src/about.c:140
 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,200 +27,195 @@ msgstr ""
 "MP3, MP2, FLAC, MusePack, MP4/AAC, Monkey's Audio и Ogg Vorbis с удобным "
 "интерфейсом GTK+ для GNU/Linux."
 
-#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(перевод на немецкий)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(перевод на русский)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(перевод на голландский)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(перевод на шведский)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(перевод на венгерский)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(перевод на итальянский)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(перевод на японский)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(перевод на украинский)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(перевод на чешский)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(перевод на испанский)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(перевод на польский)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(перевод на румынский)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(перевод на датский)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(перевод на греческий)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(перевод на бразильский португальский)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr "(перевод на болгарский)"
 
-#: src/about.c:171
+#: src/about.c:177
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(перевод на японский)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(перевод на японский)"
+
+#: src/about.c:179
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(перевод на греческий)"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(перевод на немецкий)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "Комментарий"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "О программе..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "О программе"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(скомпилировано: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(используются: GTK+ %d.%d.%d и id3lib %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "Автор: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "Эл. адрес: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Веб-страница:"
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "Описание:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 #, 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
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(поддержка MP3 отключена)"
 
-#: src/about.c:410
+#: src/about.c:452
 #, fuzzy
 msgid "available"
 msgstr "Не хватает памяти"
 
-#: src/about.c:420
+#: src/about.c:463
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(поддержка Ogg Vorbis отключена)"
 
-#: src/about.c:430
+#: src/about.c:475
 #, fuzzy
 msgid "Speex file support"
 msgstr "(поддержка MP3 отключена)"
 
-#: src/about.c:440
+#: src/about.c:491
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(поддержка FLAC отключена)"
 
-#: src/about.c:450
+#: src/about.c:504
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(поддержка MP4/AAC отключена)"
 
-#: src/about.c:460
+#: src/about.c:516
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(поддержка MP3 отключена)"
@@ -228,33 +223,33 @@ msgstr "(поддержка MP3 отключена)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "Благодарности"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "Переводы:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "Общее:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "Изменения"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "ОШИБКА при открытии файла: '%s' (%s)."
@@ -430,7 +425,7 @@ msgstr "В порядке убывания по частоте дискрети�
 msgid "Open File(s) with ..."
 msgstr "Открыть файл(ы) с помощью..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "Выделить все файлы"
 
@@ -438,7 +433,7 @@ msgstr "Выделить все файлы"
 msgid "Unselect All Files"
 msgstr "Убрать выделение со всех файлов"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "Инвертировать выделение файлов"
 
@@ -584,7 +579,7 @@ msgstr "Переименовать к_аталог..."
 msgid "Reload Directory"
 msgstr "Обновить каталог"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "Просмотреть каталог с помощью..."
 
@@ -723,17 +718,17 @@ msgstr "Не могу объединить, ошибка: %s\n"
 msgid "Ready to start..."
 msgstr "Готов к запуску..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 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
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "Подтвердить..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -741,66 +736,114 @@ msgstr ""
 "Некоторые файлы были изменены, но не сохранены...\n"
 "Сохранить изменения перед сменой каталога?"
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 #, fuzzy
 msgid "<All albums>"
 msgstr "# Альбомы"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "Дерево"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "Имя файла"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "Название"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "Исполнитель"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "Альбом"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "Год"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "Дорожка"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "Жанр"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "Композитор"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "Первый исполнитель"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "Авторство"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "Ссылка (URL)"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "Кодировщик"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "# Альбомы"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 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
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "Перейти на уровень выше"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "Перейти к каталогу"
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "Дерево"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "Выберите каталог для просмотра!"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "Исполнитель и альбом"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "Переименовать каталог"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Переименовать каталог '%s' в:"
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "Использовать маску:"
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 msgid "If activated, it will use masks to rename directory."
 msgstr "Если выбрано, маски будут использоваться для переименования каталогов."
 
-#: src/browser.c:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -808,31 +851,31 @@ 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
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "Недопустимая маска для сканера"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "Ошибка..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "Необходимо ввести имя каталога!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -843,16 +886,22 @@ msgstr ""
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -861,7 +910,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -870,7 +919,7 @@ msgstr ""
 "Невозможно переименовать, так как каталог с таким именем уже существует!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -885,87 +934,87 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "Каталог переименован"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "Программа для запуска:"
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Введите имя программы. В качестве параметра ей будет передан текущий каталог."
 
-#: src/browser.c:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "Открыть файл с помощью..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Введите имя программы. В качестве параметра ей будет передан текущий файл."
 
-#: src/browser.c:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "Необходимо ввести название программы!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Программа '%s' не найдена!"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Не могу выполнить %s (ошибка %d)!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "Не удалось создать новый процесс!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Выполненная команда: '%s %s'"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "Исполнитель / альбом"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 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
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "Название дорожки"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "Время"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "Поиск в базе данных компакт-дисков"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "Автоматический поиск"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 #, fuzzy
 msgid "Request CD database :"
 msgstr "Запрос к базе FreeDB:"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -973,16 +1022,16 @@ msgstr ""
 "Автоматически обращаться к базе CDDB, используя выделенные файлы (порядок "
 "важен!), для получения CddbID."
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "Остановить поиск..."
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -993,138 +1042,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "Самостоятельный поиск"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "Слова:"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Введите слова для поиска, разделённые пробелами или '+'"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "Поиск в:"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "Все поля"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "Прочее"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "Все категории"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Блюз"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "Классика"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Кантри"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Фолк"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Джаз"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Разное"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "Новая волна"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Регги"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Рок"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "Дорожка к фильму"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "включает: фанк, соул, рэп, поп, индастриал, метал и т.д."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "фильмы, постановки"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "остальные, не попавшие в указанные категории"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr "Категории"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "Результаты:"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "Поиск:"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "Введите слова для поиска в списке внизу"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "Поиск вперёд"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "Поиск назад"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 #, fuzzy
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr "Показывать красные строки / все строки"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "Отменить выделение"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "Инвертировать выделение"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "Выделить все строки"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1137,52 +1186,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "Установить в:"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 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
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "Дорожка #"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 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
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "Выполнить сканирование для каждого файла"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 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
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1194,15 +1227,15 @@ msgstr ""
 "использоваться для сравнения названий из CDDB с именами файлов в текущем "
 "каталоге и выбора лучших совпадений."
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "Загрузить выделенные строки или все строки (если нет выделенных)."
 
-#: src/cddb.c:798 src/misc.c:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "Готов к поиску..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1210,76 +1243,76 @@ msgstr ""
 "Альбом: '%s', исполнитель: '%s', общее время: '%s', год: '%s', жанр: '%s', "
 "ID: '%s'"
 
-#: src/cddb.c:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "Инвертировать выделение"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "Сортировать по номеру дорожки"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "Сортировать по имени дорожки"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Поиск узла '%s' ..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Не удалось найти узел '%s' (%s)!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "Не удалось создать новое соединение (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Подключение к серверу '%s', порт '%d'..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Не удалось подключиться к серверу '%s' (%s)!"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Установлено соединение с '%s'"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Получение данных (%s) ..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Ошибка при удалении тега ID3v1 в '%s' (%s)\n"
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Не удалось создать или открыть файл '%s' (%s)\n"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "Отправляется запрос..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Не удалось отправить запрос (%s)!"
@@ -1288,91 +1321,91 @@ msgstr "Не удалось отправить запрос (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "Получение данных..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "Сервер вернул неправильный ответ! (%s)"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Сервер вернул неправильный ответ! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Поиск в веб сейчас недоступен!"
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Найдено %d подходящих альбомов"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Получение данных (%s) ..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Получение данных (%s) ..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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
+#: src/cddb.c:2893
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "Выделено %d файл(ов)!"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 #, fuzzy
 msgid "Local CD search..."
 msgstr "Готов к поиску..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Отправляется запрос (CddbId: %s, #дорожек: %d, общее время: %d) ..."
 
-#: src/cddb.c:3268
+#: src/cddb.c:3276
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Найдено %d подходящих альбомов"
 
-#: src/cddb.c:3364
+#: src/cddb.c:3372
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Не открывается файл '%s' (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "Загружается список дорожек альбома..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1385,7 +1418,7 @@ msgstr ""
 "\n"
 "Продолжить?"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "Записывается тег из CDDB..."
 
@@ -1570,69 +1603,69 @@ msgstr "Западноевропейская (ISO-8859-15)"
 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"
+#: src/charset.c:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Имя файла '%s' невозможно преобразовать в UTF-8 (%s).\n"
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "Недопустимая строка UTF-8"
 
-#: src/charset.c:641
-#, c-format
+#: src/charset.c:642
+#, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
 "Строку UTF-8 '%s' невозможно преобразовать в кодировку имени файла (%s)\n"
 
-#: src/charset.c:705
+#: src/charset.c:706
 #, fuzzy, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Имя файла '%s' невозможно преобразовать в UTF-8 (%s).\n"
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, fuzzy, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "Запускается EasyTAG %s, (pid %d)\n"
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, fuzzy, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "Используемая версия id3lib %d.%d.%d\n"
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, fuzzy, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "Используемая версия id3lib %d.%d.%d\n"
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr ""
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, fuzzy, c-format
 msgid "Setting locale : '%s'"
 msgstr "Переименование файла '%s'"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, fuzzy, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr "Используется локаль '%s' (и, возможно, '%s')...\n"
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s %s (скомпилировано %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "Веб-страница: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr ""
@@ -1640,129 +1673,129 @@ msgstr ""
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "Браузер"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "Файл"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "Файл только для чтения"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 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
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, Уровень ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "Скорость потока:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? кб/c"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "Частота:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Гц"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 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
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "Размер:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? кб"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "Время:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "Тег"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "Общее"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "Название:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "Записать в теги выделенных файлов название"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "Исполнитель:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr "Записать в теги выделенных файлов исполнителя"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "Альбом:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr "Записать в теги выделенных файлов название альбома"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 #, fuzzy
 msgid "CD:"
 msgstr "CD"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr "Записать в теги выделенных файлов номер диска"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "Год:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "Записать в теги выделенных файлов год"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Выбранные дорожки последовательно нумеруются. В каждом подкаталоге нумерация "
@@ -1770,11 +1803,11 @@ msgstr ""
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "Номер дорожки:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1782,274 +1815,274 @@ msgstr ""
 "Записать число, равное количеству файлов в том же каталоге с отображаемым "
 "файлом, в выделенные файлы."
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr "Записать в теги выделенных файлов число дорожек"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "Жанр:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "Записать в теги выделенных файлов жанр"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "Комментарий:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 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
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "Композитор:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr "Записать в теги выделенных файлов композитора"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "Первый исполнитель:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr "Записать в теги выделенных файлов первого исполнителя"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "Авторское право:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "Записать в теги выделенных файлов авторское право"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "Ссылка (URL):"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "Записать в теги выделенных файлов ссылку (URL)"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "Кодировщик:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr "Записать в теги выделенных файлов кодировщик"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "Картинки"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "Картинки:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "Для добавления картинки можно использовать перетаскивание."
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "Записать картинки в теги выделенных файлов"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Добавить картинки в тег."
 
-#: src/easytag.c:1051
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr "Удалить все или выбранные картинки"
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "Сохранить выделенные картинки на диск."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "Установить свойства для выделенных картинок."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "В теги выделенных файлов записано название '%s'."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "В выбранных файлах удалено поле 'Название'."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "В теги выделенных файлов записан исполнитель '%s'."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "В выбранных файлах удалено поле 'Исполнитель'."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "В теги выделенных файлов записан альбом '%s'."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "В выбранных файлах удалено поле 'Альбом'."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "В теги выделенных файлов записан номер диска '%s'."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "В выбранных файлах удалено поле 'Номер диска'."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "В теги выделенных файлов записан год '%s'."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "В выбранных файлах удалено поле 'Год'."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "В выделенных файлах поле 'Дорожка' будет выглядеть так: 'xx/%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr "В выделенных файлах поле 'Дорожка' будет выглядеть так: 'xx'."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "В выбранных файлах удалено поле 'Номер дорожки'."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "Выделенные дорожки последовательно пронумерованы."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "В теги выделенных файлов записан жанр '%s'."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "В выбранных файлах удалено поле 'Жанр'."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "В теги выделенных файлов записан комментарий '%s'."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "В выбранных файлах удалено поле 'Комментарий'."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "В теги выделенных файлов записан композитор '%s'."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "В выбранных файлах удалено поле 'Композитор'."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "В теги выделенных файлов записан первый исполнитель '%s'."
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "В выбранных файлах удалено поле 'Первый исполнитель'."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "В теги выделенных файлов записано авторское право '%s'."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "В выбранных файлах удалено поле 'Авторское право'."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "В теги выделенных файлов записана ссылка (URL) '%s'."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "В выбранных файлах удалено поле 'Ссылка (URL)'."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "В теги выделенных файлов записан кодировщик '%s'."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr "В выбранных файлах удалено поле 'Кодировщик'."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "В выделенные файлы записаны картинки"
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "Картинки удалены из выделенных файлов"
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Выберите Режим и Маску и повторите действие еще раз"
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "Все теги были просканированы"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "Все теги были удалены"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "Все файлы были сохранены..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "Часть файлов была сохранена..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "Часть файлов была удалена..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "Все файлы были удалены..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2058,16 +2091,16 @@ msgstr ""
 "Записать тег в файл\n"
 "'%s' ?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "Запись тега..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr "Переименование файла и каталога..."
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2081,11 +2114,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr "Переименование каталог..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2099,11 +2132,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "Переименование файла..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2116,17 +2149,17 @@ msgstr ""
 "в\n"
 "'%s' ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Записывается тег файла '%s'"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 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
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2135,14 +2168,14 @@ msgstr ""
 "Не удалось записать тег в файл '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, 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
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2155,11 +2188,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "Файл(ы) не переименован(ы)..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2172,7 +2205,7 @@ msgstr ""
 "Файл с таким именем уже существует:\n"
 "'%s'"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2184,16 +2217,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Файл '%s' переименован в '%s'"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "Файл(ы) переименован(ы)..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2205,17 +2238,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Файл '%s' переименован в '%s'"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
 msgstr "Файл(ы) перемещены..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2228,11 +2261,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
 msgstr "Файл(ы) не перемещены..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2241,16 +2274,16 @@ msgstr ""
 "Удалить файл\n"
 "'%s' ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "Удалить файл..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Файл '%s' удалён"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2262,109 +2295,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "Выполняется поиск..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "Файл: '%s'"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Найдено %d файлов в каталоге и его подкаталогах."
 
-#: src/easytag.c:3239
+#: src/easytag.c:3356
 #, 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
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u файл(ов)"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
 msgstr "В этом каталоге и его подкаталогах  файлы не найдены!"
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "В этом каталоге файлы не найдены!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "Поиск..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "Остановить поиск..."
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "Выберите каталог для просмотра!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "Записать это поле в теги выделенных файлов"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Преобразовать '_' и '%20' в пробелы"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "Преобразовать ' ' в '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "Всё заглавными"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "Всё строчными"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "Первая заглавная"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "Каждое слово начинается с заглавной буквы"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "Удалить пробелы"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "Вставить пробел перед заглавной буквой"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 msgid "Remove duplicate spaces or underscores"
 msgstr "Удалять повторяющиеся пробелы и подчёркивания"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Выход из-за сбоя!. (PId: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, fuzzy, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Получен сигнал %s (%d)\a\n"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 "
@@ -2374,11 +2407,11 @@ msgstr ""
 "ошибке с текстом обратной трассировки, создаваемым программой gdb ('gdb "
 "easytag core' затем  'bt' и 'l') по адресу easytag@gmail.com"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "Неизвестный сигнал"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2411,11 +2444,11 @@ msgstr ""
 "путь_к/файлам     Использовать относительный путь.\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Выход."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2423,79 +2456,79 @@ msgstr ""
 "Есть несохраненные изменения...\n"
 "Записать их перед выходом?"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr "Вы действительно хотите закрыть программу?"
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "Тег ID3"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Тег Ogg Vorbis"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "Тег FLAC Vorbis"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "Тег APE"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr "Тег MP4/M4A/AAC"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "файл MP3"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "файл MP2"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "файл Ogg Vorbis"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 #, fuzzy
 msgid "Speex File"
 msgstr "Следующий файл"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "файлов FLAC"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "файл MusePack"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "файл Monkey's Audio "
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr "файл MP4/AAC"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 #, fuzzy
 msgid "Wavpack File"
 msgstr "файл MusePack"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, fuzzy, c-format
 msgid "Pictures (%d)"
 msgstr "Картинки"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2503,14 +2536,14 @@ msgid "%d kb/s"
 msgstr "%d кб/с"
 
 #. Samplerate
-#: src/et_core.c:2917 src/flac_header.c:304 src/monkeyaudio_header.c:91
+#: src/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Гц"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2521,11 +2554,11 @@ msgstr ""
 "в системную кодировку для имён файлов\n"
 "(Попробуйте установить переменную окружения G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "Перевод имени файла"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Длина имени файла '%s' больше, чем %d, и будет усечено!\n"
@@ -2535,7 +2568,7 @@ msgstr "Длина имени файла '%s' больше, чем %d, и буд
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "Кодировщик:"
@@ -2544,49 +2577,54 @@ msgstr "Кодировщик:"
 #. 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/flac_header.c:312 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
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr ""
 "ОШИБКА при открытии файла: '%s' (%s).\n"
 "\a"
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, 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
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Записан тег файла '%s'"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Удалён тег в '%s'"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, 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
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Ошибка при удалении тега ID3v2 в '%s' (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Ошибка при обновлении тега ID3v2 в '%s' (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2601,77 +2639,77 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Ошибка при обновлении тега ID3v1 в '%s' (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Обновлён тег в '%s'"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "Сообщений об ошибках не было"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "Не хватает памяти"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "Нет данных для анализа"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "Неправильно отформатированные данные"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "Нет буфера для записи"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "Буфер слишком мал"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "Недопустимый ID фрейма"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "Запрашиваемое поле не найдено"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "Неизвестный тип поля"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "Тег уже прикреплён к файлу"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "Неправильная версия тега"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "Нет файла для анализа"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "Попытка записи в файл только для чтения"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "Ошибка при компрессии/декомпрессии"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "Неизвестное сообщение об ошибке!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2680,127 +2718,83 @@ msgstr ""
 "Повреждённый файл: '%s'\n"
 "приведёт к ошибке в библиотеке id3lib, поэтому не будет обрабатываться."
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
 msgstr "Повреждённый файл..."
 
-#: src/log.c:91
+#: src/log.c:95
 msgid "Log"
 msgstr ""
 
-#: src/misc.c:214
-msgid " OK "
-msgstr "OK"
-
-#: 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:773
+msgid "Select file..."
+msgstr "Выберите файл..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "Выберите каталог..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "Выберите файл..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 #, fuzzy
 msgid "Warning..."
 msgstr "Поиск..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "Б"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "КБ"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "МБ"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "ГБ"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "ТБ"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "Создать список записей"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "Название списка записей M3U"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "Использовать имя каталога"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "Редактировать маски"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "Параметры списка записей"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "Включать только выделенные файлы"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2808,51 +2802,51 @@ msgstr ""
 "Если выбрано, только выделенные файлы будут помещаться в список записей, "
 "иначе будут использованы все файлы."
 
-#: src/misc.c:1397
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "Использовать абсолютный путь для файлов в списке записей"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 msgid "Use relative path for files in playlist"
 msgstr "Использовать относительный путь для файлов в списке записей"
 
 #. Create playlist in parent directory
-#: src/misc.c:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "Создавать список записей в родительском каталоге"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "Если выбрано, список записей будет создаваться в родительском каталоге"
 
 #. DOS Separator
-#: src/misc.c:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "Использовать разделитель каталогов DOS"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr "Заменить разделитель каталогов '/' на разделитель в стиле DOS '\\'."
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "Содержимое списка записей"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "Записать только список файлов"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "Записать информацию, используя имя файла"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "Записать информацию используя:"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2861,12 +2855,12 @@ msgstr ""
 "Файл списка записей '%s' уже существует!\n"
 "Перезаписать его?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "Сохранить список записей..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2875,136 +2869,116 @@ msgstr ""
 "Не удалось сохранить список записей  '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Сохранён список записей '%s'"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 msgid "CD"
 msgstr "CD"
 
-#: 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 "Ссылка (URL)"
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "Кодировщик"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "Искать файл"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr "Введите слово для поиска в файлах. "
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "В:"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "Тег"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Учитывать регистр"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Найден(о): %d файл(ов)"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "Загрузить имена файлов из файла"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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
+#: src/misc.c:2738
 msgid " Load "
 msgstr "Загрузить"
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, 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
+#: src/misc.c:2782 src/misc.c:2876
 #, 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
+#: src/misc.c:2791 src/misc.c:2885
 #, 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
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 msgid "Delete all blank lines"
 msgstr "Удалить все пустые строки"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2861 src/misc.c:2955
+#: src/misc.c:2812 src/misc.c:2906
 #, 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
+#: src/misc.c:2821 src/misc.c:2915
 #, 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "Перезагрузить"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "Записать только список файлов"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "Выделить все строки"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3012,20 +2986,20 @@ msgstr ""
 "Если выбрано, то после загрузки всех имен файлов текущие установки сканера "
 "будут применены (окно сканера должно быть открыто)."
 
-#: src/misc.c:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "Вставить пустую строку"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "Удалить эту строку"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "Переместить выбранную маску вверх"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "Переместить выбранную маску вниз"
@@ -3043,7 +3017,7 @@ msgstr "Аудиозапись"
 msgid "Unknown"
 msgstr "Неизвестен"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr "неверный формат MP4"
 
@@ -3068,8 +3042,7 @@ msgstr ""
 msgid "Single channel"
 msgstr ""
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "Повторить действие для оставшихся файлов"
 
@@ -3107,48 +3080,48 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "Ошибка при попытке открыть файл '%s' как Vorbis (%s)."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Внимание: Файл Ogg Vorbis '%s' содержит тег ID3v2."
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "Добавить картинки"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "Все файлы"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG и JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "Свойства картинки %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "Тип картинки"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "Описание картинки:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "Сохранить картинку %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3159,126 +3132,136 @@ msgstr ""
 "'%s'\n"
 "Перезаписать?"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "Сохранить файл..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "Картинка JPEG"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "Картинка PNG"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "Неизвестное тип картинки"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "Пиктограмма размером 32x32 формата PNG"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "Другая пиктограмма файла"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "Обложка (спереди)"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "Обложка (сзади)"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr "Обложка внутри"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr "Носитель (например, лицевая сторона компакт-диска)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr "Солист/вокалист"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "Артист/исполнитель"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "Дирижёр"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "Группа/оркестр"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "Автор стихов/текста"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "Место записи"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "Во время записи"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "Во время исполнения"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "Кадр из фильма/съёмки"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "Ярко раскрашенная рыба"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "Иллюстрация"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "Логотип исполнителя"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "Логотип студии/издателя"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "Неизвестный тип изображения"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "пиксели"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "Тип"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "Описание"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 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
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr "Загружается файл изображения..."
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3289,7 +3272,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr "Файл с изображением на загружен..."
 
@@ -3685,7 +3668,7 @@ msgid ""
 msgstr ""
 "Принудительно использовать системную кодировку и активировать транслитерацию"
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3702,7 +3685,7 @@ msgstr ""
 "Принудительно использовать системную кодировку и игнорировать некорректные "
 "символы"
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3899,7 +3882,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr ""
 
@@ -3920,35 +3903,45 @@ msgstr "Кодировка, используемая для записи тег�
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 #, fuzzy
 msgid "No"
 msgstr "Нет"
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+#, fuzzy
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+"Если выбрано, символ, которого нет в целевой кодировке, может быть "
+"представлен с помощью одного или нескольких похожих символов."
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "Тег ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "Записывать тег ID3v1.x"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3956,22 +3949,22 @@ msgstr ""
 "Если выбрано, теги ID3v1 будут добавлены или обновлены в конце МР3 файлов. "
 "Иначе они будут отрезаны."
 
-#: src/prefs.c:878
+#: src/prefs.c:882
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Кодировка, используемая для записи тега в файл."
 
 #. Character Set for reading tag
-#: src/prefs.c:910
+#: src/prefs.c:917
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "Кодировка для тегов ID3"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -3996,31 +3989,31 @@ msgstr ""
 "эту опцию и выделите UTF-8.- если Unicode не используется, можно выбрать "
 "другую корировку."
 
-#: src/prefs.c:947
+#: src/prefs.c:954
 msgid "Character set used to read tag data in the file."
 msgstr "Кодировка, используемая для чтения тега в файле."
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "Сканер"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Сканер заполнения тегов - Преобразование символов"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Заменять подчеркивания '_' и строки '%20' на пробелы ' '"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Преобразовывать пробел ' ' в подчёркивание '_'"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4029,11 +4022,11 @@ msgstr ""
 "сканера для тегов."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Сканер переименования файлов - Преобразование символов"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4042,17 +4035,17 @@ msgstr ""
 "сканера для имён файлов."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Сканер обработки полей - Преобразование символов"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1034
+#: src/prefs.c:1041
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "Не переводить в верхний регистр первые буквы предлогов и артиклей."
 
-#: src/prefs.c:1038
+#: src/prefs.c:1045
 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 +4057,15 @@ msgstr ""
 "слово начинается с заглавной буквы'."
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "Окно сканера"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "Открывать окно сканера при запуске"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4080,11 +4073,11 @@ msgstr ""
 "Если выбрано, окно сканера будет появляться автоматически при загрузке "
 "EasyTAG."
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "Окно сканера всегда поверх других окон"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4092,16 +4085,16 @@ msgstr ""
 "Если выбрано, окно с масками будет всегда находиться поверх главного окна."
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "Поля"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "Заменять поля при сканировании тегов"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4109,11 +4102,11 @@ msgstr ""
 "Если выбрано, сканер будет заменять существующий текст в полях на новый, "
 "иначе будут заполняться только пустые поля."
 
-#: src/prefs.c:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "Комментарий по умолчанию:"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4122,13 +4115,13 @@ msgstr ""
 "использовании сканера заполнения тегов."
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 "Записывать контрольную сумму CRC32 в поле 'Комментарий' (только для тегов "
 "ID3)."
 
-#: src/prefs.c:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4139,46 +4132,46 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "База данных CD"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 #, fuzzy
 msgid "Server Settings for Automatic Search"
 msgstr "Автоматический поиск"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "Имя:"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "Порт сервера:"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "Путь к CGI:"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "Установки сервера"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "База данных CD"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 #, fuzzy
 msgid "Path :"
 msgstr "Путь к CGI:"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 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,58 +4180,58 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "Настройки прокси-сервера"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "Использовать прокси"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "Активировать настройки прокси-сервера."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "Имя сервера:"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "Имя прокси-сервера."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "Порт прокси-сервера."
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "Имя пользователя:"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "Имя для авторизации на прокси-сервере."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "Пароль:"
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 msgid "Password of user for the the proxy server."
 msgstr "Имя для авторизации на прокси-сервере."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "Список названий дорожек"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr "Выберите соответствующий файл (в зависимости от позиции или DLM)"
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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."
@@ -4247,7 +4240,7 @@ msgstr ""
 "будет выделен соответствующий файл."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4258,15 +4251,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "Подтверждения"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "Подтверждать выход из программы"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4274,19 +4267,19 @@ msgstr ""
 "Если выбрано, перед выходом из приложения будет появляться диалоговое окно "
 "для подтверждения."
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "Подтверждать запись тега в файл"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "Подтверждать переименования файла"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "Подтверждать удаление файла"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "Подтверждать сохранение списка записей"
 
@@ -4294,37 +4287,37 @@ msgstr "Подтверждать сохранение списка записе�
 #. //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
+#: src/prefs.c:1429
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Применить изменения (но не сохранять) и закрыть это окно"
 
-#: src/prefs.c:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "Закрывать это окно без сохранения"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 msgid "Save changes and close this window"
 msgstr "Сохранить изменения и закрыть окно"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Пример : %.*d_-_Название_1.mp3)"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "Изменения применены"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "Настройки сохранены"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "Настройки не изменились"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4335,57 +4328,57 @@ msgstr ""
 "'%s'\n"
 " (%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "Не является каталогом"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Проигрыватель аудиофайлов '%s' не найден!"
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "Заполнить тег"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "Переименовать файл и каталог"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "Обработать поля"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "Теги успешно прочитаны..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Теги успешно прочитаны...(%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Ошибка сканирования: не найден разделитель '%s' в '%s'"
 
-#: src/scan.c:663
+#: src/scan.c:667
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Не удалось преобразовать '%s' в системную кодировку для имён файлов."
 
-#: src/scan.c:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "Новое имя файла было просканировано..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Новое имя файла было просканировано...(%s)"
@@ -4393,41 +4386,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "Сканер тегов и имён файлов"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "Сканер:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "Выберите тип используемого сканера"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "Открыть окно сканера / Сканировать выбранные файлы"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "Параметры сканера"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "Показать/скрыть редактор масок"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "Показать/скрыть подсказку"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "Закрыть это ок_но"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4436,15 +4429,15 @@ msgstr ""
 "пути и имени файла. Используется для заполнения полей тегов."
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "Предварительный просмотр заполнения тега"
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr "Добавить к маске текущий путь"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4457,15 +4450,15 @@ msgstr ""
 "абсолютный, иначе относительный."
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "Предварительный просмотр переименования файла"
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "Выбрать поля:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4474,126 +4467,126 @@ msgstr ""
 "которые вас интересуют."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
 msgstr "Обработать поле 'Имя файла'"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "Обработать поле 'Название'"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "Обработать поле 'Исполнитель'"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "Обработать поле 'Альбом'"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "Обработать поле 'Жанр'"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "Обработать поле 'Комментарий'"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "Обработать поле 'Композитор'"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 msgid "Process original artist field"
 msgstr "Обработать поле 'Первый исполнитель'"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "Обработать поле 'Авторское право'"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr "Обработать поле 'Ссылка (URL)'"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr "Обработать поле 'Кодировщик'"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "Инвертировать выделение"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "Выделить/Снять выделение"
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Преобразовать '_' и '%20' в ' '"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "Преобразовать:"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "в: "
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4601,7 +4594,7 @@ msgstr ""
 "Подчеркивание или подстрока '%20' будет заменены на пробел. Например, 'Текст%"
 "20В_Поле' будет заменено на 'Текст В Поле'."
 
-#: src/scan.c:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4609,12 +4602,12 @@ msgstr ""
 "Пробел будет заменён на подчеркивание. Например, 'Текст В Поле' будет "
 "заменено на 'Текст_В_Поле'."
 
-#: src/scan.c:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4622,7 +4615,7 @@ msgstr ""
 "Все слова во всех полях будут переведены в верхний регистр. Например, 'Текст "
 "В Поле' будет заменено на 'ТЕКСТ В ПОЛЕ'."
 
-#: src/scan.c:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4630,7 +4623,7 @@ msgstr ""
 "Все слова во всех полях будут переведены в нижний регистр. Например, 'ТексТ "
 "В Поле' будет заменено на 'текст в поле'."
 
-#: src/scan.c:2325
+#: src/scan.c:2394
 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'."
@@ -4638,7 +4631,7 @@ msgstr ""
 "Первые слова во всех полях будут начинаться с заглавной буквы. Например, "
 "'текст В Поле' будет заменено на 'Текст в поле'."
 
-#: src/scan.c:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4646,15 +4639,15 @@ msgstr ""
 "Все слова во всех полях будут начинаться с заглавной буквы. Например, 'текст "
 "в Поле' будет заменено на 'Текст В Поле'."
 
-#: src/scan.c:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "Вставить пробел перед заглавной буквой"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "Удалить повторяющиеся пробелы или подчёркивания"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4662,7 +4655,7 @@ msgstr ""
 "Все пробелы между словами будут удалены. Например, 'Текст В Поле' будет "
 "заменено на 'ТекстВПоле'."
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4670,7 +4663,7 @@ msgstr ""
 "Перед каждой заглавной буквой будет вставлен пробел. Например, 'ТекстВПоле' "
 "будет заменено на 'Текст В Поле'."
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4681,161 +4674,161 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "Подсказка"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a: Исполнитель"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b: Альбом"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c: Комментарий"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p: Композитор"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r: Авторское право"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr "%d: номер диска"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e: Кодировщик"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g: Жанр"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i: Не используется"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l: Количество дорожек"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o: Первый исполнитель"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n: Дорожка"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t: Название"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u: Ссылка (URL)"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y: Год"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "Редактор масок"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "Создать новую маску"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "Переместить выбранную маску вверх"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "Переместить выбранную маску вниз"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "Дублировать маску"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "Удалить маски по умолчанию"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "Удалить маску"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "Сохранить маски"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "Новая_маска"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "Копирование: Нет выбранных строк!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "Удаление: Нет выбранных строк!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "Вниз: Строка не выбрана!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "Вверх: Строка не выбрана!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr ""
 "ОШИБКА: Не удалось сохранить файл настроек: %s (%s)\n"
 "\a"
 
-#: src/setting.c:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Не удалось открыть файл настроек '%s' (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Не удалось создать или открыть файл '%s' (%s)"
 
-#: src/setting.c:1278
+#: src/setting.c:1277
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr ""
@@ -4843,28 +4836,28 @@ msgstr ""
 "\a"
 
 #. Fall back to defaults
-#: src/setting.c:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Загрузка масок по умолчанию для заполнения тегов..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "Загрузка масок по умолчанию для переименования файлов..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Загрузка начальных масок для переименования каталогов..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "ОШИБКА: Переменная окружения HOME не определена!\n"
 "\n"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "ОШИБКА: Не удалось создать каталог '%s' (%s)!"
@@ -4913,42 +4906,75 @@ msgstr ""
 "Ошибка при записи потока. Выходной поток может быть повреждён или усечён."
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr ""
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr ""
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr ""
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr ""
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, fuzzy, c-format
 msgid "Audio player: '%s'"
 msgstr "Запустить проигрыватель"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid " OK "
+#~ msgstr "OK"
+
+#~ msgid " Yes "
+#~ msgstr "Да"
+
+#~ msgid " No "
+#~ msgstr "Нет"
+
+#~ msgid " Apply "
+#~ msgstr "Применить"
+
+#~ msgid " Save "
+#~ msgstr "Сохранить"
+
+#~ msgid " Cancel "
+#~ msgstr "Отменить"
+
+#~ msgid " Close "
+#~ msgstr "Закрыть"
+
+#~ msgid " Write "
+#~ msgstr "Записать"
+
+#~ msgid " Execute "
+#~ msgstr "Выполнить"
+
+#~ msgid " Search "
+#~ msgstr "Поиск"
+
+#~ msgid " Browse... "
+#~ msgstr "Просмотр..."
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/sr.gmo b/po/sr.gmo
index 76521f9..9d9a22a 100644
--- a/po/sr.gmo
+++ b/po/sr.gmo
diff --git a/po/sr.po b/po/sr.po
index a9477c5..c1aea5f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2007-12-09 18:16+0100\n"
 "PO-Revision-Date: 2007-09-04 09:53+0100\n"
 "Last-Translator: Милош Поповић <gpopac@gmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Poedit-Country: SERBIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/about.c:134
+#: src/about.c:140
 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,198 +30,193 @@ msgstr ""
 "Vorbis, MP4/AAC, MusePack и Monkey аудио датотекама. Његово једноставно и "
 "лепо ГТК+ окружење чини означавање у ГНУ/Линуксу системима лакшим."
 
-#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(Немачки превод)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(Руски превод)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(Холандски превод)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(Шветски превод)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(Мађарски translation)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(Италијански превод)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(Јапански превод)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(Украински превод)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(Чешки превод)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(Шпански превод)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(Пољски превод)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(Румунски превод)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(Дански превод)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(Грчки превод)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Бразилско-португалски превод)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr "(Бугарски превод)"
 
-#: src/about.c:171
+#: src/about.c:177
 msgid "(Chinese translation)"
 msgstr "(Кинески превод)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(Кинески превод)"
+
+#: src/about.c:179
 msgid "(Hebrew translation)"
 msgstr "(Хебрејски превод)"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(Немачки превод)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "Коментар"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "О програму..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "О програму"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(Превео: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(Користи: GTK+ %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "Аутор: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "Мејл адреса: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Интернет страница: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "Опис:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 #, 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
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(ID3v2.3 ознаке су искључене)"
 
-#: src/about.c:410
+#: src/about.c:452
 #, fuzzy
 msgid "available"
 msgstr "Немате доступну меморију"
 
-#: src/about.c:420
+#: src/about.c:463
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(Подршка за Ogg Vorbis датотеке је искључена)"
 
-#: src/about.c:430
+#: src/about.c:475
 #, fuzzy
 msgid "Speex file support"
 msgstr "(Подршка за Speex датотеке је искључена)"
 
-#: src/about.c:440
+#: src/about.c:491
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(Подршка за FLAC датотеке је искључена)"
 
-#: src/about.c:450
+#: src/about.c:504
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(Подршка за MP4/AAC датотеке је искључена)"
 
-#: src/about.c:460
+#: src/about.c:516
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(Подршка за WavPack датотеке је искључена)"
@@ -229,33 +224,33 @@ msgstr "(Подршка за WavPack датотеке је искључена)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "Захвалност"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "Преводи:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "Опште:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "Промене"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "Грешка при отварању датотеке: „%s“ (%s)."
@@ -431,7 +426,7 @@ msgstr "Опадајуће, по учестаности тока"
 msgid "Open File(s) with ..."
 msgstr "Отвори датотеку(е) са..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "Изабери све датотеке"
 
@@ -439,7 +434,7 @@ msgstr "Изабери све датотеке"
 msgid "Unselect All Files"
 msgstr "Отпусти све датотеке"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "Обрнуто изабери датотеке"
 
@@ -585,7 +580,7 @@ msgstr "Преименуј директоријум..."
 msgid "Reload Directory"
 msgstr "Освежи директоријум"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "Отвори директоријум са..."
 
@@ -724,17 +719,17 @@ msgstr "Не могу да спојим UI, грешка: %s\n"
 msgid "Ready to start..."
 msgstr "Све је спремно за почетак..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 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
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "Потврди..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -742,65 +737,113 @@ msgstr ""
 "Неке датотеке су измењене, али нису сачуване...\n"
 "Да ли желите да их сачувате пре промене директоријума?"
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 msgid "<All albums>"
 msgstr "<Сви албуми>"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "Стабло"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "Име датотеке"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "Наслов"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "Извођач"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "Албум"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "Година"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "Нумера"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "Жанр"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "Композитор"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "Ориг. извођач"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "Ауторско право"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "УРЛ"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "Кодирано помоћу"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "#Албуми"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 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
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "Иди у родитељски директоријум"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "Унеси директоријум за претрагу."
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "Стабло"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "Изабери директоријум за преглед!"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "Извођач и албум"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "Преименуј директоријум"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Преименуј директоријум „%s“ у:"
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "Користи маску:"
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 msgid "If activated, it will use masks to rename directory."
 msgstr "Уколик је активно, користиће маске за преименовање директоријума."
 
-#: src/browser.c:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -808,31 +851,31 @@ 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
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "Неисправна маска скенера"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "Грешка..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "Морате да унесете име директоријума!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -842,16 +885,22 @@ msgstr ""
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -860,7 +909,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -869,7 +918,7 @@ msgstr ""
 "Не могу да преименујем јер директоријум са тим именом већ постоји!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -884,87 +933,87 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "Директоријум преименован"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "Програм за покретање:"
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Унесите програм за покретање. Он ће добити тренутни директоријум као "
 "параметар."
 
-#: src/browser.c:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "Отвори датотеку са..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Унесите програм за покретање. Он ће добити означену датотеку као параметар."
 
-#: src/browser.c:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "Морате унети име програма!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Програм „%s“ није нађен!"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Не могу да покренем %s (грешка %d)!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "Не могу да разгранам у још један процес!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Извршена команда : „%s %s“"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "Извођач / Албум"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 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
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "Наслов нумере"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "Време"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "Претрага базе ЦД података"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "Аутоматска претрага"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 msgid "Request CD database :"
 msgstr "Затражи ЦД базу :"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -972,16 +1021,16 @@ msgstr ""
 "Претражује аутоматски ЦД базу користећи изабране датотеке (редослед је "
 "важан!) да би начинио ЦД идентификациони код."
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "Прекини претрагу..."
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr "Користи локалну ЦД базу"
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -992,138 +1041,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "Ручна претрага"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "Речи :"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Унеси речи за претрагу (раздвојене размаком или знаком „+“)"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "Тражи у :"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "Сва поља"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "Остало"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "Све категорије"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Блуз"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "Класика"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Кантри"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Голк"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Џез"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Остало"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "Нови талас"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Реге"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Рок"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "Звучна трака"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "укључује : фанк, соул, реп, поп, индастриал, метал,..."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "филмови, кабаре"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "остало што се не уклапа у горе наведене категорије"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr "Категорије"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "Резултати :"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "Тражи :"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "Упишите кључне речи за претрагу у листи поред"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "Тражи следеће"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "Тражи претходно"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Прикажи само црвене редове (или прикажи све линије) у “извођач/албум“ листи"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "Отпусти све редове"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "Обрнуто изабери редове"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "Изабери све редове"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1136,52 +1185,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "Унеси у :"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 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
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "Нумера #"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 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
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "Примени текући скенер за сваку датотеку."
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 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
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1195,16 +1228,16 @@ msgstr ""
 "Ово ће бити коришћено када изаберете одговарајућу аудио датотеку или "
 "примените резултате из ЦД базе података, уместо да директно користи редослед."
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 "Учитај изабране редове или све редове (уколико ни једна није изабрана)."
 
-#: src/cddb.c:798 src/misc.c:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "Спремно за претрагу..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1212,76 +1245,76 @@ msgstr ""
 "Албум: '%s', извођач: '%s', дужина нумере: '%s', година: '%s', жанр: '%s', "
 "ИД: '%s'"
 
-#: src/cddb.c:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "Изабери обратно"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "Сортирај по броју нумере"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "Сортирај по имену нумере"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Приступам серверу „%s“ ..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Не могу да приступим серверу „%s“ (%s)!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "Не могу да направим нову утичницу (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Повезивање на сервер „%s“, порт „%d“ ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Не могу да се повежем са сервером „%s“ (%s)!"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Успостављена веза са сервером „%s“"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Преносим податке (%s) ..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Грешка при читању одговора из ЦД базе (%s)!"
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Не могу да направим датотеку „%s“ (%s)"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "Шаљем захтев ..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Не могу да пошаљем захтев (%s)!"
@@ -1290,91 +1323,92 @@ msgstr "Не могу да пошаљем захтев (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "Примам податке ..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 msgid "The server returned a wrong answer!"
 msgstr "Сервер је вратио погрешан одговор!"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Сервер је вратио погрешан одговор! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
 msgstr "Нажалост, веб базирана претрага је тренутно онеспособљена!"
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Нађен(о) %d албум(а) са поклапањем"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Примам податке странице %d (албум %d/%d)..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Примам податке странице %d ..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr "Још резултата да учитам..."
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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
+#: src/cddb.c:2893
 msgid "More than 99 files selected! Can't send request!"
 msgstr "Више од 99 датотека је изабрано! Не могу да пошаљем захтев!"
 
-#: src/cddb.c:2895
+#: src/cddb.c:2899
 #, fuzzy, c-format
 msgid "%d file(s) selected!"
 msgstr "%d датотека изабрана"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 msgid "Local CD search..."
 msgstr "Локална претрага ЦД-а..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
+#, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 "Путања до „локалне ЦД базе“ није дефинисана!\n"
 "Унесите је у прозору са поставкама."
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr "Шаљем захтев (ЦД база: %s, #нумере: %d, дужина диска: %d) ..."
 
-#: src/cddb.c:3268
+#: src/cddb.c:3276
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Нађено %d албум(а) са поклапањем за диск ИД „%s“"
 
-#: src/cddb.c:3364
+#: src/cddb.c:3372
 #, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "Не могу да учитам датотеку: „%s“ (%s)!"
 
 #. Load the track list of the album
-#: src/cddb.c:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "Читам листу нумера албума..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1387,7 +1421,7 @@ msgstr ""
 "\n"
 "Да ли желите да наставите?"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "Упиши ознаке из ЦД базе..."
 
@@ -1572,69 +1606,69 @@ msgstr "Западњачки (ISO-8859-15)"
 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"
+#: src/charset.c:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Име датотеке „%s“ не може бити преведено у UTF-8 (%s).\n"
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "Неисправан UTF-8"
 
-#: src/charset.c:641
-#, c-format
+#: src/charset.c:642
+#, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 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"
+#: src/charset.c:706
+#, fuzzy, c-format
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Карактер „%s“ не може бити преведен у UTF-8 (%s).\n"
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "Покрећем EasyTAG %s (PId: %d) ..."
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "Користим libid3tag верзије %s ..."
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "Користим id3lib верзије %d.%d.%d ..."
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr "Промењљива EASYTAGLANG дефинисана. Постављам локализацију: „%s“"
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, c-format
 msgid "Setting locale : '%s'"
 msgstr "Постављам локализацију: „%s“"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr "Тренутно користим локализацију „%s„ (и евентуално „%s“)..."
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s од %s (преведен %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "Интернет презентација: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr "Непознати параметар у стази „%s“\n"
@@ -1642,139 +1676,139 @@ msgstr "Непознати параметар у стази „%s“\n"
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "Прегледач"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "Датотека"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "Неизмењљива датотека"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 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
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?. Слој ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "Битски проток:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "Учестаност:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 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
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "Величина:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? kb"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "Време:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "Ознака"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "Честа поља"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "Наслов:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "Додај ознаку наслов обележеним датотекама"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "Извођач:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr "Додај ознаку извођач обележеним датотекама"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "Албум:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr "Додај ознаку албум обележеним датотекама"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 msgid "CD:"
 msgstr "ЦД:"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr "Додај ознаку број ЦД-а обележеним датотекама"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "Година:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "Додај ознаку година обележеним датотекама"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 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
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "Нумера #:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1782,274 +1816,274 @@ msgstr ""
 "Унеси број датотека, у истом директоријуму као и приказана датотека, да би "
 "изабрао нумере."
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr "Додај ознаку број нумера обележеним датотекама"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "Жанр:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "Додај ознаку жанр обележеним датотекама"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "Коментар:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 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
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "Композитор:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr "Додај ознаку композитор обележеним датотекама"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "Ориг. извођач:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr "Додај ознаку оригинални извођач обележеним датотекама"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "Ауторско право:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "Додај ознаку ауторско право обележеним датотекама"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "УРЛ:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "Додај ознаку УРЛ обележеним датотекама"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "Кодирано помоћу:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr "Додај ознаку за програм којим су кодиране обележене датотекама"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "Слике"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "Слике:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "Можете превући слике у овај дијалог да би их додали."
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "Додај слике обележеним датотекама"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr "Додај слике у ознаку (превлачење је такође доступно)."
 
-#: src/easytag.c:1051
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr "Уклони изабране слике, у супротном све слике."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "Сачувај изабране слике на тврди диск."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "Постави атрибуте изабраних слика."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Изабране датотеке означене насловом „%s“."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "Уклоњен наслов из изабраних датотека."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Изабране датотеке означене извођачем „%s“."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "Уклоњен извођача из изабраних датотека."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Изабране датотеке означене албумом „%s“."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "Уклоњено име албума из изабраних датотека."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Изабране датотеке означене бројем диска „%s“."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "Уклоњен број диска из изабраних датотека."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Изабране датотеке означене годином „%s“."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "Уклоњена година из изабраних датотека."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Изабране датотеке означене називом типа „xx/%s“."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Изабране датотеке означене називом типа „xx“."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "Уклоњен број нумере из изабраних датотека."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "Изабране датотеке побројане редом."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Изабране датотеке означене жанром „%s“."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "Уклоњен жанр из изабраних датотека."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Изабране датотеке означене коментаром „%s“."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "Уклоњен коментар из изабраних датотека."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Изабране датотеке означене композитором „%s“."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "Уклоњен композитор из изабраних датотека."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Изабране датотеке означене са оригиналним извођачем „%s“."
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "Уклоњен оригинални извођач из изабраних датотека."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Изабране датотеке означене ауторским правом „%s“."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "Уклоњено ауторско право из изабраних датотека."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Изабране датотеке означене УРЛ-ом „%s“."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "Уклоњен УРЛ из изабраних датотека."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Изабране датотеке означене са именом кодера „%s“."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr "Уклоњено име кодера из изабраних датотека."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "Изабране датотеке означене сликама."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "Уклоњене слике из изабраних датотека."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Изабрани мод и маска, и понови су исте команде."
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "Све ознаке су скениране"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "Све ознаке су уклоњене"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "Све датотеке су сачуване..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "Датотеке су половично сачуване..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "Датотеке су половично уклоњене..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "Све датотеке су уклоњене..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2058,16 +2092,16 @@ msgstr ""
 "Да ли желите да упишете ознаку датотеке\n"
 "„%s“ ?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "Упиши ознаку..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr "Преименуј датотеку и директоријум..."
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2081,11 +2115,11 @@ msgstr ""
 "„%s“ ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr "Преименуј директоријум..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2099,11 +2133,11 @@ msgstr ""
 "„%s“ ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "Преименуј датотеку..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2116,17 +2150,17 @@ msgstr ""
 "у \n"
 "„%s“ ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Уписивање ознаке од „%s“"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 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
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2135,14 +2169,14 @@ msgstr ""
 "Не могу да упишем ознаку у датотеку „%s“!\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, 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
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2155,11 +2189,11 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "Датотека(е) нису преименоване..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2172,7 +2206,7 @@ msgstr ""
 "јер следећа већ постоји:\n"
 "„%s“"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2184,16 +2218,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Преименована датотека „%s“ у „%s“"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "Датотека(е) преименоване..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2205,17 +2239,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Премештена датотека „%s“ to „%s“"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
 msgstr "Датотека(е) премештене..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2228,11 +2262,11 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
 msgstr "Датотека(е) нисо премештене..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2241,16 +2275,16 @@ msgstr ""
 "Да ли заиста желите да уклоните датотеку\n"
 "„%s“ ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "Уклони датотеку..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Датотека „%s“ уклођена"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2262,110 +2296,110 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "Претрага у току..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "Датотека: „%s“"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "Нађено %d датотека(е) у овом директоријуму и под-директоријумима."
 
-#: src/easytag.c:3239
+#: src/easytag.c:3356
 #, 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
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u датотека(е)"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
 msgstr ""
 "Ни једна датотека није пронађена у овом директоријуму и под-директоријумима!"
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "Ни једна датотека није пронађена у овом директоријуму!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "Тражим..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "Прекини претрагу..."
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "Изабери директоријум за преглед!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "Означи изабране датотеке овим пољем"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Преведи „_“ и „%20“ у размак"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "Преведи „ “ у „_“"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "Сва слова велика"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "Сва слова мала"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "Прво слово велико"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "Прво слово сваке речи велико"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "Уклони размаке"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "Убаци размак пре велико слова"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 msgid "Remove duplicate spaces or underscores"
 msgstr "Уклони дупле размаке или доње цртице"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Ненормално изашао! (ПИД: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Добијен сигнал %s (%d)\a"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 "
@@ -2375,11 +2409,11 @@ msgstr ""
 "извештај грешке са gdb повратни ход („gdb easytag core“ затим „bt“ и „l“) и "
 "информацијама како се грешка може изазвати на easytag@gmail.com"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "Непознат сигнал"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2413,11 +2447,11 @@ msgstr ""
 "путања_до/датотека     Користи релативну путању.\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Нормалан излаз."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2425,77 +2459,77 @@ msgstr ""
 "Неке датотеке су измењене али нису сачуване...\n"
 "Желите ли да их сачувате пре изласка из програма?"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr "Да ли заиста желите да изађете из програма?"
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "ID3 ознака"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis ознака"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis ознака"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "APE ознака"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC ознака"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr "Wavpack ознака"
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "MP3 датотека"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "MP2 даотека"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis датотека"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 msgid "Speex File"
 msgstr "Speex датотека"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "FLAC датотека"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "MusePack датотека"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "Monkey аудио датотека"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr "MP4/AAC датотека"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 msgid "Wavpack File"
 msgstr "Wavpack датеотека"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, c-format
 msgid "Pictures (%d)"
 msgstr "Слике (%d)"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2503,14 +2537,14 @@ 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/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2521,11 +2555,11 @@ msgstr ""
 "у кодирање потребно за систем датотека\n"
 "(Покушајте да наместите променљиву G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "Преводи имена датотеке"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Име датотеке „%s“ премашује %d карактера и биће скраћено!\n"
@@ -2535,7 +2569,7 @@ msgstr "Име датотеке „%s“ премашује %d карактер�
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "Кодер:"
@@ -2544,47 +2578,52 @@ msgstr "Кодер:"
 #. 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/flac_header.c:312 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
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, 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
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, 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
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Уписана ознаку у „%s“"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Уклоњена ознака из „%s“"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, 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
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Грешка при уклањању ID3v2 ознаке из „%s“ (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Грешка при промени ID3v2 ознаке у „%s“ (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2609,77 +2648,77 @@ msgstr ""
 "\n"
 "Датотека : %s"
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Грешка при промени ID3v1 ознаке у „%s“ (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Ознака у „%s“ промењена"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "Нису пријављене грешке"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "Немате доступну меморију"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "Нема података за обраду"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "Неисправно форматирани подаци"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "Нема бафера за упис"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "Бафер је сувише мало"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "Неисправан ИД оквира"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "Затражено поље није нађено"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "Непознат тип поља"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "Ознака је већ додана датотеци"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "Неисправна верзија ознаке"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "Нема датотеке за обраду"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "Покушавам са упишем у датотеку без дозвола за упис"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "Грешка при компресији/декомпресији"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "Непозната порука о грешци!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2688,126 +2727,82 @@ msgstr ""
 "Следећа оштећена датотека: „%s“\n"
 "ће проузроковати грешку у id3lib, па неће бити обрађена од стране програма."
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
 msgstr "Оштећена датотека"
 
-#: src/log.c:91
+#: src/log.c:95
 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:773
+msgid "Select file..."
+msgstr "Одабери датотеку..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "Одабери директоријум..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "Одабери датотеку..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 msgid "Warning..."
 msgstr "Упозорење..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr "Није дефинисан програм за репродукцију звука!"
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "Начини листу нумера"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "Име M3U листе нумера"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "Користи име директоријума"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "Уреди маске"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "Опције листе нумера"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "Укључи само изабране датотеке"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2815,53 +2810,53 @@ msgstr ""
 "Уколико је активирано, само изабране датотеке ће бити уписане у листу "
 "нумера. У супротном, све датотеке ће бити уписане."
 
-#: src/misc.c:1397
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "Користи пуне путање за датотеке у листи нумера"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 msgid "Use relative path for files in playlist"
 msgstr "Користи релативне путање за датотеке у листи нумера"
 
 #. Create playlist in parent directory
-#: src/misc.c:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "Начини листу нумера у родитељском директоријуму"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Уколико је активирано, листа ће бити начињена у родитељском директоријуму."
 
 #. DOS Separator
-#: src/misc.c:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "Користи ДОС-ов раздвајач датотека"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 "Ова опција мења УНИКС-ов раздвајач датотека „/“ у ДОС-ов раздвајач „\\“."
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "Садржај листе нумера"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "Упиши само листу датотека"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "Упиши информације користећи име датотеке"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "Упиши информације користећи :"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2870,12 +2865,12 @@ msgstr ""
 "Датотека са листом нумера „%s“ већ постоји!\n"
 "Да је препишем?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "Уписујем листу нумера..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2884,44 +2879,24 @@ msgstr ""
 "Не могу да упишем листу нумера „%s“!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Листа нумера „%s“ је начињена"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 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
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "Кодирано помоћу"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "Нађи датотеку"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2929,93 +2904,93 @@ msgstr ""
 "датотека."
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "У :"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "ознака"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Разликуј велика и мала лова"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Нађена(о) : %d датотека(е)"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "Учитај имена датотека из текстуалног фајла"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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
+#: src/misc.c:2738
 msgid " Load "
 msgstr "Учитај"
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, 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
+#: src/misc.c:2782 src/misc.c:2876
 #, 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
+#: src/misc.c:2791 src/misc.c:2885
 #, 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
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 msgid "Delete all blank lines"
 msgstr "Уклони све празне редове"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2861 src/misc.c:2955
+#: src/misc.c:2812 src/misc.c:2906
 #, 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
+#: src/misc.c:2821 src/misc.c:2915
 #, 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "Освежи"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "Упиши само листу датотека"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "Изабери све редове"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3023,20 +2998,20 @@ msgstr ""
 "Активирањем ове опције, након учитавања имена датотека, тренутно изабрани "
 "скенер ће бити покренут (прозор скенера мора бити отворено)."
 
-#: src/misc.c:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "Унеси празан ред"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "Уклони овај ред"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "Помери маску нагоре"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "Помери маску надоле"
@@ -3054,7 +3029,7 @@ msgstr "Аудио"
 msgid "Unknown"
 msgstr "Непознато"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr "MP4 формат неисправан"
 
@@ -3079,8 +3054,7 @@ msgstr "Два канала"
 msgid "Single channel"
 msgstr "Један канал"
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "Понови операцију на остатак датотека"
 
@@ -3122,48 +3096,48 @@ msgstr ""
 "Ogg Vorbis: Унутарња логичка грешка, указује на грешку у програму или гомилу "
 "оштећења (датотека: „%s“)."
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "Грешка: Неуспело отварање датотеке: „%s“ као vorbis (%s)."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Упозорење : Ogg Vorbis датотека „%s“ садржи ID3v2 ознаку."
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "Додај слике"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "Све датотеке"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG и JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "Поставке слике %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "Тип слике"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "Опис слике:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "Сачувај слику %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3174,115 +3148,120 @@ msgstr ""
 "„%s“\n"
 "Желите ли да је препишете?"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "Сачувај датотеку..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "JPEG слика"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "PNG слика"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "Непозната слика"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "PNG иконица, 32x32 пиксела"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "Остале иконице датотеке"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "Омот (лице)"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "Омот (полеђина)"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr "Страна са летком"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr "Медијум (пр. страна са натписом ЦД-а)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr "Водећи уметник/водећи извођач/солиста"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "Уметник/Извођач"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "Диригент"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "Бенд/Оркестар"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "Аутор текстова"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "Место снимања"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "У току снимања"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "У току извођења"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "Филм/Видео запис"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "Светло обојена риба"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "Илустрација"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "Лого бенда/извођача"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "Лого издавача/студија"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "Непознати тип слике"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "пиксела"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "Тип"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "Опис"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3290,11 +3269,16 @@ msgstr ""
 "Не могу да прикажем слику јер је недовољно података учитано да бих знао како "
 "да направим бафер слике."
 
-#: src/picture.c:987
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr "Учитавам датотеку са сликом..."
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3305,7 +3289,7 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr "Датотека са сликом није учитана..."
 
@@ -3719,7 +3703,7 @@ msgstr ""
 "Приморај коришћење системског кодирања карактера и активирај превођење "
 "знакова"
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3735,7 +3719,7 @@ msgid ""
 msgstr ""
 "Приморај коришћење системског кодирања карактера и занемари неке карактере"
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3932,7 +3916,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr "Сет карактера:"
 
@@ -3951,33 +3935,43 @@ msgstr "Сет карактера коришћен за упис ознака у
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr "Додатне поставке за iconv():"
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 msgid "No"
 msgstr "Не"
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+#, fuzzy
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+"Са овом опцијом, када карактер не може бити представљен жељеним сетом "
+"карактера, биће преведен у неки од њему сличних карактера."
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr "Преведи"
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr "Игнориши"
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 msgid "ID3v1 tags"
 msgstr "ID3v1 ознаке"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "Упиши ID3v1.x ознаку"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3985,20 +3979,20 @@ msgstr ""
 "Уколико је активирано, ID3v1 ознака ће бити додата или промењена на крају "
 "MP3 датотека. У супротном ће бити уклоњена."
 
-#: src/prefs.c:878
+#: src/prefs.c:882
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "Сет карактера за упис ID3v1 ознака у датотеци."
 
 #. Character Set for reading tag
-#: src/prefs.c:910
+#: src/prefs.c:917
 msgid "Character Set for reading ID3 tags"
 msgstr "Сет карактера за читање ID3 ознака."
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr "Нестандардно:"
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -4028,31 +4022,31 @@ msgstr ""
 "читање ознака уписаних под Windows-ом, или „KOI8-R“ за читање ознака "
 "уписаним под Уникс системима."
 
-#: src/prefs.c:947
+#: src/prefs.c:954
 msgid "Character set used to read tag data in the file."
 msgstr "Сет карактера коришћен при читању ознака у датотекама."
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "Скенер"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Скенер за попуњавање ознаке - превођење карактера"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Преведи доње цртице „_“ и карактер „%20“ у размак „ “"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Преведи размак „ “ у дољу цртицу „_“"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4061,11 +4055,11 @@ msgstr ""
 "из скенера или ознака."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Скенер за промену имена датотекама - превођење карактера"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4074,17 +4068,17 @@ msgstr ""
 "из скенера или имена датотека."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "Скенер за обраду поља - превођење карактера"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1034
+#: src/prefs.c:1041
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr "Немој да повећаш прво слово речи за неке предлоге и чланове."
 
-#: src/prefs.c:1038
+#: src/prefs.c:1045
 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 "
@@ -4096,15 +4090,15 @@ msgstr ""
 "велико“ (на пример, добићете „Text in an Entry“ уместо „Text In An Entry“)."
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "Прозор скенера"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "Отвори прозор скенера при покретању програма"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4112,11 +4106,11 @@ msgstr ""
 "Активирање ове опције ће аутоматски отворити прозор скенера при покретању "
 "EasyTAG програма."
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "Прозор скенера увек на врху"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4125,16 +4119,16 @@ msgstr ""
 "главног прозора."
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "Поља"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "Препиши сва поља при скенирању ознаке"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4142,11 +4136,11 @@ msgstr ""
 "Уколико је активирано, скенер ће заменити постојећи текст у пољима новим. "
 "Уколико није, само празна поља ознака ће бити попуњена."
 
-#: src/prefs.c:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "Постави овај текст као подразумевани коментар:"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4155,12 +4149,12 @@ msgstr ""
 "поље коментара при коришћењу „Скенера за попуњавање ознака“"
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 "Користи CRC32 као подразумевани коментар (само за датотеке са ID3 ознакама)."
 
-#: src/prefs.c:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4171,42 +4165,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "ЦД база података"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 msgid "Server Settings for Automatic Search"
 msgstr "Поставке сервера за аутоматску претрагу"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "Име :"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "Порт :"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "CGI путања :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 msgid "Server Settings for Manual Search"
 msgstr "Поставке сервера за ручну претрагу"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 msgid "Local CD Data Base"
 msgstr "Локална ЦД баса података"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 msgid "Path :"
 msgstr "Путања :"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4218,52 +4212,52 @@ msgstr ""
 "„folk“, „jazz“, „newage“, „reggae“, „rock“, „soundtrack“ и „misc“."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "Поставке мрежног посредника"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "Користи мрежни посредник"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "Активира поставке мрежног посредника."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "Име посредника :"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "Име сервера мрежног посредника."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "Порт мрежног посредника"
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "Корисничко име :"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "Име корисника мрежног посредника."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "Лозинка :"
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 msgid "Password of user for the the proxy server."
 msgstr "Лозинка корисника мрежног посредника."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "Листа имена нумера"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4271,7 +4265,7 @@ msgstr ""
 "Изабери одговарајућу аудио датотеку (судећи по месту или ДЛМ-у уколико је "
 "активирано испод)"
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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."
@@ -4280,7 +4274,7 @@ msgstr ""
 "аудио датотека у главној листи ће такође бити изабрана."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4291,34 +4285,34 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "Потврде"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "Потврди излазак из програма"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr ""
 "Уколико је активирано, отвара се окно за потврду пре изласка из програма."
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "Потврди упис ознаке и датотеку"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "Потврди преименовање датотеке"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "Потврди брисање датотеке"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "Потврди прављење листе нумера"
 
@@ -4326,37 +4320,37 @@ msgstr "Потврди прављење листе нумера"
 #. //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
+#: src/prefs.c:1429
 msgid "Apply changes (but don't save) and close this window"
 msgstr "Примени измене (али немој да их сачуваш) и затвори овај прозор"
 
-#: src/prefs.c:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "Затвори овај прозор без чувања"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 msgid "Save changes and close this window"
 msgstr "Сачува измене и затвори прозор"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Пример:%.*d_-_Име_нумере_1.mp3 )"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "Измене су примењене"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "Поставке су сачуване"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "Поставке нису мењане"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4366,58 +4360,58 @@ msgstr ""
 "Изабрана путања за подразумевану стазу до датотека није исправна!n„%s“\n"
 "(%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "Није директоријум"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Програм за репродукцију звука „%s“ није нађен!"
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "Попуни ознаку"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "Преименуј датотеку и директоријум"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "Обради поља"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "Ознака успешно скенирана..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Ознака успешно скенирана... (%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, 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
+#: src/scan.c:481 src/scan.c:510
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Грешка скенера: не могу да нађем раздвајач „%s“ у „%s“"
 
-#: src/scan.c:663
+#: src/scan.c:667
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr "Не могу да преведем име датотеке „%s“ у систем кодирања имена датотеке"
 
-#: src/scan.c:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "Ново име датотеке успешно скенирано..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Ново име датотеке успешно скенирано...(%s)"
@@ -4425,41 +4419,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "Скенер ознака и имена датотека"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "Скенер:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "Изабери тип скенера за употребу"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "Отвори прозор скенера / Скенирај изабране датотеке"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "Опције скенера"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "Прикажи / Сакриј уређивач маски"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "Прикажи / Сакриј легенду"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "Затвори овај прозор"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4468,15 +4462,15 @@ msgstr ""
 "имену датотеке или путањи. Користи се за попуњавање поља ознака."
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "Преглед попуњавања ознаке..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr "Маска префикса са тренутном путањом"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4489,15 +4483,15 @@ msgstr ""
 "у супротној је релативна у односу на стару путању."
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "Преглед преименовања датотеке..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "Изабери поља:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4506,126 +4500,126 @@ msgstr ""
 "вам требају."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "Д"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
 msgstr "Обради поље за име датотеке."
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "Н"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "Обради поље „Наслов“."
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "И"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "Обради поље „Извођач“."
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "А"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "Обради поље „Албум“."
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "Ж"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "Обради поље „Жанр“."
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "К"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "Обради поље „Коментар“."
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "Кп"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "Обради поље „Композитор“."
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "О"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 msgid "Process original artist field"
 msgstr "Обради поље „Оригинални извођач“."
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Ап"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "Обради поље „Ауторско право“."
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "У"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr "Обради поље „УРЛ“."
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "Кд"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr "Обради поље „Кодирано поноћу“."
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "Изабери обратно"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "Изабери све/ништа"
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Преведи „_“ и „%20“ у „ “"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "Преведи:"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "у:"
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4633,7 +4627,7 @@ msgstr ""
 "Доње цртице и карактер „%20“ између речи ће бити замењени размаком. На "
 "пример „Текст%20у%20неком_пољу“ ће постати „Тексту неком пољу“."
 
-#: src/scan.c:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4641,12 +4635,12 @@ msgstr ""
 "Размак између речи биће замењен доњом цртицом. На пример „Текст у неком "
 "пољу“ ће постати „Текст_у_неком_пољу“."
 
-#: src/scan.c:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4654,7 +4648,7 @@ msgstr ""
 "Све речи у пољима испиши великим словима. На пример „Текст У НЕКОМ пољу“ ће "
 "постати „ТЕКСТ У НЕКОМ ПОЉУ“."
 
-#: src/scan.c:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4662,7 +4656,7 @@ msgstr ""
 "Све речи у пољима испиши малим словима. На пример „ТЕКСТ У неком пољу“ ће "
 "постати „текст у неком пољу“."
 
-#: src/scan.c:2325
+#: src/scan.c:2394
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4670,7 +4664,7 @@ msgstr ""
 "Прво слово сваког поља промени у велико. На пример „текст У Неком ПОЉУ“ ће "
 "постати „Текст у неком пољу“."
 
-#: src/scan.c:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4678,15 +4672,15 @@ msgstr ""
 "Свако прво слово речи у пољима промени у велико. На пример „Текст у неком "
 "ПОЉУ“ ће постати „Текст У Неком Пољу“."
 
-#: src/scan.c:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "Уметни размак пре великог слова"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "Уклони дупле размаке или доње цртице"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4694,7 +4688,7 @@ msgstr ""
 "Уклања све размаке између речи. На пример „Текст У Неком Пољу“ ће постати "
 "„ТекстУНекомПољу“."
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4702,7 +4696,7 @@ msgstr ""
 "Додаје размак пре сваког великог слова. На пример „ТекстУНекомПољу“ ће "
 "постати „Текст У Неком Пољу“."
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4713,183 +4707,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "Легенда"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a : извођач"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : албум"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c : коментар"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p : композитор"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r : ауторско право"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : број ЦД-а"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : кодирано помоћу"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g : жанр"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : игнорисано"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l : број нумера"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : ориг. ивођач"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n : нумера"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t : наслов"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u : УРЛ"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y : година"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "Уређивач маски"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "Направи нову маску"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "Помери маску нагоре"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "Помери маску надоле"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "Размножи маску"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "Додај подразумевану маску"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "Уклони маску"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "Сачувај маску"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "Нова _маска"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "Умножи: Није изабран ред!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "Уклони: Није изабран ред!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "Помери нагоре: Није изабран ред!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "Помери надоле: Није изабран ред!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "Грешка: Не могу да упишем датотеку са поставкама: %s (%s)"
 
-#: src/setting.c:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Не могу да отворим датотеку са поставкама „%s“ (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Не могу да направим или отворим датотеку „%s“ (%s)"
 
-#: src/setting.c:1278
+#: src/setting.c:1277
 #, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "Грешка: Не могу да упишем листу у датотеку: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Учитавам подразумеване маске за „Попуни ознаку“..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "Учитавам подразумеване маске за „Преименуј датотеку“..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Учитавам подразумеване маске за „Преименуј директоријум“..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "Грешка: Промењљива окружења „HOME“ није одређена!"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "Грешка: Не могу да направим директоријум „%s“ (%s)!"
@@ -4937,42 +4931,75 @@ msgstr ""
 "Грешка при упису тока у излаз. Излазни ток је можда оштећен или скраћен."
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, 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
+#: src/win32/win32dep.c:183
 #, 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
+#: src/win32/win32dep.c:194
 #, 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
+#: src/win32/win32dep.c:201
 #, 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
+#: src/win32/win32dep.c:302
 #, 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
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr "Директоријум са поставкама: „%s“"
 
+#~ msgid " OK "
+#~ msgstr "У реду"
+
+#~ msgid " Yes "
+#~ msgstr "Да"
+
+#~ msgid " No "
+#~ msgstr "Не"
+
+#~ msgid " Apply "
+#~ msgstr "Примени"
+
+#~ msgid " Save "
+#~ msgstr "Сачувај"
+
+#~ msgid " Cancel "
+#~ msgstr "Занемари"
+
+#~ msgid " Close "
+#~ msgstr "Затвори"
+
+#~ msgid " Write "
+#~ msgstr "Упиши"
+
+#~ msgid " Execute "
+#~ msgstr "Покрени"
+
+#~ msgid " Search "
+#~ msgstr "Тражи"
+
+#~ msgid " Browse... "
+#~ msgstr "Нађи..."
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/sr@Latn.gmo b/po/sr@Latn.gmo
index 1a74c8b..804d40c 100644
--- a/po/sr@Latn.gmo
+++ b/po/sr@Latn.gmo
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 335f560..3bec40d 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Poedit-Country: SERBIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/about.c:134
+#: src/about.c:140
 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,198 +30,193 @@ msgstr ""
 "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
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(Nemački prevod)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(Ruski prevod)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(Holandski prevod)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(Švetski prevod)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(Mađarski translation)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(Italijanski prevod)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(Japanski prevod)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(Ukrainski prevod)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(Češki prevod)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(Španski prevod)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(Poljski prevod)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(Rumunski prevod)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(Danski prevod)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(Grčki prevod)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Brazilsko-portugalski prevod)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr "(Bugarski prevod)"
 
-#: src/about.c:171
+#: src/about.c:177
 msgid "(Chinese translation)"
 msgstr "(Kineski prevod)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(Kineski prevod)"
+
+#: src/about.c:179
 msgid "(Hebrew translation)"
 msgstr "(Hebrejski prevod)"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(Nemački prevod)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "Komentar"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "O programu..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "O programu"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(Preveo: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(Koristi: GTK+ %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "Mejl adresa: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Internet stranica: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "Opis:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 #, 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
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(ID3v2.3 oznake su isključene)"
 
-#: src/about.c:410
+#: src/about.c:452
 #, fuzzy
 msgid "available"
 msgstr "Nemate dostupnu memoriju"
 
-#: src/about.c:420
+#: src/about.c:463
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(Podrška za Ogg Vorbis datoteke je isključena)"
 
-#: src/about.c:430
+#: src/about.c:475
 #, fuzzy
 msgid "Speex file support"
 msgstr "(Podrška za Speex datoteke je isključena)"
 
-#: src/about.c:440
+#: src/about.c:491
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(Podrška za FLAC datoteke je isključena)"
 
-#: src/about.c:450
+#: src/about.c:504
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(Podrška za MP4/AAC datoteke je isključena)"
 
-#: src/about.c:460
+#: src/about.c:516
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(Podrška za WavPack datoteke je isključena)"
@@ -229,33 +224,33 @@ msgstr "(Podrška za WavPack datoteke je isključena)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "Zahvalnost"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "Prevodi:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "Opšte:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "Promene"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "Greška pri otvaranju datoteke: „%s“ (%s)."
@@ -431,7 +426,7 @@ msgstr "Opadajuće, po učestanosti toka"
 msgid "Open File(s) with ..."
 msgstr "Otvori datoteku(e) sa..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "Izaberi sve datoteke"
 
@@ -439,7 +434,7 @@ msgstr "Izaberi sve datoteke"
 msgid "Unselect All Files"
 msgstr "Otpusti sve datoteke"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "Obrnuto izaberi datoteke"
 
@@ -585,7 +580,7 @@ msgstr "Preimenuj direktorijum..."
 msgid "Reload Directory"
 msgstr "Osveži direktorijum"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "Otvori direktorijum sa..."
 
@@ -724,17 +719,17 @@ msgstr "Ne mogu da spojim UI, greška: %s\n"
 msgid "Ready to start..."
 msgstr "Sve je spremno za početak..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 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
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "Potvrdi..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -742,65 +737,113 @@ msgstr ""
 "Neke datoteke su izmenjene, ali nisu sačuvane...\n"
 "Da li želite da ih sačuvate pre promene direktorijuma?"
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 msgid "<All albums>"
 msgstr "<Svi albumi>"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "Stablo"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "Ime datoteke"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "Naslov"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "Izvođač"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "Album"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "Godina"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "Numera"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "Žanr"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "Kompozitor"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "Orig. izvođač"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "Autorsko pravo"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "URL"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "Kodirano pomoću"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "#Albumi"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 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
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "Idi u roditeljski direktorijum"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "Unesi direktorijum za pretragu."
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "Stablo"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "Izaberi direktorijum za pregled!"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "Izvođač i album"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "Preimenuj direktorijum"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Preimenuj direktorijum „%s“ u:"
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "Koristi masku:"
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 msgid "If activated, it will use masks to rename directory."
 msgstr "Ukolik je aktivno, koristiće maske za preimenovanje direktorijuma."
 
-#: src/browser.c:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -808,31 +851,31 @@ 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
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "Neispravna maska skenera"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "Greška..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "Morate da unesete ime direktorijuma!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -842,16 +885,22 @@ msgstr ""
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -860,7 +909,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -869,7 +918,7 @@ msgstr ""
 "Ne mogu da preimenujem jer direktorijum sa tim imenom već postoji!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -884,87 +933,87 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "Direktorijum preimenovan"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "Program za pokretanje:"
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 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
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "Otvori datoteku sa..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 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
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "Morate uneti ime programa!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Program „%s“ nije nađen!"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, 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
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "Ne mogu da razgranam u još jedan proces!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Izvršena komanda : „%s %s“"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "Izvođač / Album"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 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
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "Naslov numere"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "Vreme"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "Pretraga baze CD podataka"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "Automatska pretraga"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 msgid "Request CD database :"
 msgstr "Zatraži CD bazu :"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -972,16 +1021,16 @@ msgstr ""
 "Pretražuje automatski CD bazu koristeći izabrane datoteke (redosled je "
 "važan!) da bi načinio CD identifikacioni kod."
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "Prekini pretragu..."
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr "Koristi lokalnu CD bazu"
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -992,138 +1041,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "Ručna pretraga"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "Reči :"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 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
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "Traži u :"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "Sva polja"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "Ostalo"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "Sve kategorije"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Bluz"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "Klasika"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Kantri"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Golk"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Džez"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Ostalo"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "Novi talas"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Rege"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Rok"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "Zvučna traka"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "uključuje : fank, soul, rep, pop, indastrial, metal,..."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "filmovi, kabare"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 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
+#: src/cddb.c:515
 msgid " Categories "
 msgstr "Kategorije"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "Rezultati :"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "Traži :"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 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
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "Traži sledeće"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "Traži prethodno"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 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
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "Otpusti sve redove"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "Obrnuto izaberi redove"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "Izaberi sve redove"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1137,52 +1186,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "Unesi u :"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 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
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "Numera #"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 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
+#: src/cddb.c:766 src/misc.c:2964
 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
+#: src/cddb.c:773
 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
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1197,16 +1230,16 @@ msgstr ""
 "ili primenite rezultate iz CD baze podataka, umesto da direktno koristi "
 "redosled."
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 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
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "Spremno za pretragu..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1214,76 +1247,76 @@ msgstr ""
 "Album: '%s', izvođač: '%s', dužina numere: '%s', godina: '%s', žanr: '%s', "
 "ID: '%s'"
 
-#: src/cddb.c:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "Izaberi obratno"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "Sortiraj po broju numere"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "Sortiraj po imenu numere"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Pristupam serveru „%s“ ..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Ne mogu da pristupim serveru „%s“ (%s)!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, 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
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Povezivanje na server „%s“, port „%d“ ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, 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
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Uspostavljena veza sa serverom „%s“"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Prenosim podatke (%s) ..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Greška pri čitanju odgovora iz CD baze (%s)!"
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, 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
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "Šaljem zahtev ..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Ne mogu da pošaljem zahtev (%s)!"
@@ -1292,91 +1325,92 @@ 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
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "Primam podatke ..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 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
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Server je vratio pogrešan odgovor! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 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
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Nađen(o) %d album(a) sa poklapanjem"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Primam podatke stranice %d (album %d/%d)..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Primam podatke stranice %d ..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr "Još rezultata da učitam..."
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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
+#: src/cddb.c:2893
 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
+#: src/cddb.c:2899
 #, fuzzy, c-format
 msgid "%d file(s) selected!"
 msgstr "%d datoteka izabrana"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 msgid "Local CD search..."
 msgstr "Lokalna pretraga CD-a..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
+#, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 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
+#: src/cddb.c:3123
 #, 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
+#: src/cddb.c:3276
 #, 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
+#: src/cddb.c:3372
 #, 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
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "Čitam listu numera albuma..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1389,7 +1423,7 @@ msgstr ""
 "\n"
 "Da li želite da nastavite?"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "Upiši oznake iz CD baze..."
 
@@ -1574,69 +1608,69 @@ msgstr "Zapadnjački (ISO-8859-15)"
 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"
+#: src/charset.c:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 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
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "Neispravan UTF-8"
 
-#: src/charset.c:641
-#, c-format
+#: src/charset.c:642
+#, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 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"
+#: src/charset.c:706
+#, fuzzy, c-format
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Karakter „%s“ ne može biti preveden u UTF-8 (%s).\n"
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "Pokrećem EasyTAG %s (PId: %d) ..."
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "Koristim libid3tag verzije %s ..."
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "Koristim id3lib verzije %d.%d.%d ..."
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr "Promenjljiva EASYTAGLANG definisana. Postavljam lokalizaciju: „%s“"
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, c-format
 msgid "Setting locale : '%s'"
 msgstr "Postavljam lokalizaciju: „%s“"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr "Trenutno koristim lokalizaciju „%s„ (i eventualno „%s“)..."
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s od %s (preveden %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "Internet prezentacija: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr "Nepoznati parametar u stazi „%s“\n"
@@ -1644,139 +1678,139 @@ msgstr "Nepoznati parametar u stazi „%s“\n"
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "Pregledač"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "Datoteka"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "Neizmenjljiva datoteka"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 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
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?. Sloj ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "Bitski protok:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "Učestanost:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 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
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "Veličina:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? kb"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "Vreme:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "Oznaka"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "Česta polja"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "Naslov:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "Dodaj oznaku naslov obeleženim datotekama"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "Izvođač:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr "Dodaj oznaku izvođač obeleženim datotekama"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr "Dodaj oznaku album obeleženim datotekama"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr "Dodaj oznaku broj CD-a obeleženim datotekama"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "Godina:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "Dodaj oznaku godina obeleženim datotekama"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 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
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "Numera #:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1784,274 +1818,274 @@ msgstr ""
 "Unesi broj datoteka, u istom direktorijumu kao i prikazana datoteka, da bi "
 "izabrao numere."
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr "Dodaj oznaku broj numera obeleženim datotekama"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "Žanr:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "Dodaj oznaku žanr obeleženim datotekama"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "Komentar:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 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
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "Kompozitor:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr "Dodaj oznaku kompozitor obeleženim datotekama"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "Orig. izvođač:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr "Dodaj oznaku originalni izvođač obeleženim datotekama"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "Autorsko pravo:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "Dodaj oznaku autorsko pravo obeleženim datotekama"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "Dodaj oznaku URL obeleženim datotekama"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "Kodirano pomoću:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 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
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "Slike"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "Slike:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 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
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "Dodaj slike obeleženim datotekama"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 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
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr "Ukloni izabrane slike, u suprotnom sve slike."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "Sačuvaj izabrane slike na tvrdi disk."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "Postavi atribute izabranih slika."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Izabrane datoteke označene naslovom „%s“."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "Uklonjen naslov iz izabranih datoteka."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Izabrane datoteke označene izvođačem „%s“."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "Uklonjen izvođača iz izabranih datoteka."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Izabrane datoteke označene albumom „%s“."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "Uklonjeno ime albuma iz izabranih datoteka."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Izabrane datoteke označene brojem diska „%s“."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "Uklonjen broj diska iz izabranih datoteka."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Izabrane datoteke označene godinom „%s“."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "Uklonjena godina iz izabranih datoteka."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Izabrane datoteke označene nazivom tipa „xx/%s“."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Izabrane datoteke označene nazivom tipa „xx“."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 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
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "Izabrane datoteke pobrojane redom."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Izabrane datoteke označene žanrom „%s“."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "Uklonjen žanr iz izabranih datoteka."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Izabrane datoteke označene komentarom „%s“."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "Uklonjen komentar iz izabranih datoteka."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Izabrane datoteke označene kompozitorom „%s“."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "Uklonjen kompozitor iz izabranih datoteka."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, 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
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "Uklonjen originalni izvođač iz izabranih datoteka."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Izabrane datoteke označene autorskim pravom „%s“."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "Uklonjeno autorsko pravo iz izabranih datoteka."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Izabrane datoteke označene URL-om „%s“."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "Uklonjen URL iz izabranih datoteka."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Izabrane datoteke označene sa imenom kodera „%s“."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr "Uklonjeno ime kodera iz izabranih datoteka."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "Izabrane datoteke označene slikama."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "Uklonjene slike iz izabranih datoteka."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Izabrani mod i maska, i ponovi su iste komande."
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "Sve oznake su skenirane"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "Sve oznake su uklonjene"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "Sve datoteke su sačuvane..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "Datoteke su polovično sačuvane..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "Datoteke su polovično uklonjene..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "Sve datoteke su uklonjene..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2060,16 +2094,16 @@ msgstr ""
 "Da li želite da upišete oznaku datoteke\n"
 "„%s“ ?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "Upiši oznaku..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr "Preimenuj datoteku i direktorijum..."
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2083,11 +2117,11 @@ msgstr ""
 "„%s“ ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr "Preimenuj direktorijum..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2101,11 +2135,11 @@ msgstr ""
 "„%s“ ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "Preimenuj datoteku..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2118,17 +2152,17 @@ msgstr ""
 "u \n"
 "„%s“ ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Upisivanje oznake od „%s“"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 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
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2137,14 +2171,14 @@ msgstr ""
 "Ne mogu da upišem oznaku u datoteku „%s“!\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, 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
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2157,11 +2191,11 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "Datoteka(e) nisu preimenovane..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2174,7 +2208,7 @@ msgstr ""
 "jer sledeća već postoji:\n"
 "„%s“"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2186,16 +2220,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Preimenovana datoteka „%s“ u „%s“"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "Datoteka(e) preimenovane..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2207,17 +2241,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Premeštena datoteka „%s“ to „%s“"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
 msgstr "Datoteka(e) premeštene..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2230,11 +2264,11 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
 msgstr "Datoteka(e) niso premeštene..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2243,16 +2277,16 @@ msgstr ""
 "Da li zaista želite da uklonite datoteku\n"
 "„%s“ ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "Ukloni datoteku..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Datoteka „%s“ uklođena"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2264,110 +2298,110 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "Pretraga u toku..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "Datoteka: „%s“"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, 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
+#: src/easytag.c:3356
 #, 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
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u datoteka(e)"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 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
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "Ni jedna datoteka nije pronađena u ovom direktorijumu!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "Tražim..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "Prekini pretragu..."
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "Izaberi direktorijum za pregled!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "Označi izabrane datoteke ovim poljem"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Prevedi „_“ i „%20“ u razmak"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "Prevedi „ “ u „_“"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "Sva slova velika"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "Sva slova mala"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "Prvo slovo veliko"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 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
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "Ukloni razmake"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "Ubaci razmak pre veliko slova"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 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
+#: src/easytag.c:4442 src/easytag.c:4450
 #, 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
+#: src/easytag.c:4443 src/easytag.c:4452
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Dobijen signal %s (%d)\a"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 "
@@ -2377,11 +2411,11 @@ msgstr ""
 "izveštaj greške sa gdb povratni hod („gdb easytag core“ zatim „bt“ i „l“) i "
 "informacijama kako se greška može izazvati na easytag@gmail.com"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "Nepoznat signal"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2415,11 +2449,11 @@ msgstr ""
 "putanja_do/datoteka     Koristi relativnu putanju.\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normalan izlaz."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2427,77 +2461,77 @@ msgstr ""
 "Neke datoteke su izmenjene ali nisu sačuvane...\n"
 "Želite li da ih sačuvate pre izlaska iz programa?"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr "Da li zaista želite da izađete iz programa?"
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "ID3 oznaka"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis oznaka"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis oznaka"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "APE oznaka"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC oznaka"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr "Wavpack oznaka"
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "MP3 datoteka"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "MP2 daoteka"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis datoteka"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 msgid "Speex File"
 msgstr "Speex datoteka"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "FLAC datoteka"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "MusePack datoteka"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "Monkey audio datoteka"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr "MP4/AAC datoteka"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 msgid "Wavpack File"
 msgstr "Wavpack dateoteka"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, 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/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2505,14 +2539,14 @@ 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/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2523,11 +2557,11 @@ msgstr ""
 "u kodiranje potrebno za sistem datoteka\n"
 "(Pokušajte da namestite promenljivu G_FILENAME_ENCODING)."
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "Prevodi imena datoteke"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, 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"
@@ -2537,7 +2571,7 @@ msgstr "Ime datoteke „%s“ premašuje %d karaktera i biće skraćeno!\n"
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "Koder:"
@@ -2546,47 +2580,52 @@ msgstr "Koder:"
 #. 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/flac_header.c:312 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
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, 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
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, 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
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Upisana oznaku u „%s“"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Uklonjena oznaka iz „%s“"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, 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
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, 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
+#: src/id3_tag.c:513
 #, 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
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2611,77 +2650,77 @@ msgstr ""
 "\n"
 "Datoteka : %s"
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, 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
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Oznaka u „%s“ promenjena"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "Nisu prijavljene greške"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "Nemate dostupnu memoriju"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "Nema podataka za obradu"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "Neispravno formatirani podaci"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "Nema bafera za upis"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "Bafer je suviše malo"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "Neispravan ID okvira"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "Zatraženo polje nije nađeno"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "Nepoznat tip polja"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "Oznaka je već dodana datoteci"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "Neispravna verzija oznake"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "Nema datoteke za obradu"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 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
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "Greška pri kompresiji/dekompresiji"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "Nepoznata poruka o grešci!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2690,126 +2729,82 @@ 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
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
 msgstr "Oštećena datoteka"
 
-#: src/log.c:91
+#: src/log.c:95
 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:773
+msgid "Select file..."
+msgstr "Odaberi datoteku..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "Odaberi direktorijum..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "Odaberi datoteku..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 msgid "Warning..."
 msgstr "Upozorenje..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr "Nije definisan program za reprodukciju zvuka!"
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "Načini listu numera"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "Ime M3U liste numera"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "Koristi ime direktorijuma"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "Uredi maske"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "Opcije liste numera"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "Uključi samo izabrane datoteke"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2817,53 +2812,53 @@ msgstr ""
 "Ukoliko je aktivirano, samo izabrane datoteke će biti upisane u listu "
 "numera. U suprotnom, sve datoteke će biti upisane."
 
-#: src/misc.c:1397
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "Koristi pune putanje za datoteke u listi numera"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 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
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "Načini listu numera u roditeljskom direktorijumu"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 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
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "Koristi DOS-ov razdvajač datoteka"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 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
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "Sadržaj liste numera"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "Upiši samo listu datoteka"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "Upiši informacije koristeći ime datoteke"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "Upiši informacije koristeći :"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2872,12 +2867,12 @@ msgstr ""
 "Datoteka sa listom numera „%s“ već postoji!\n"
 "Da je prepišem?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "Upisujem listu numera..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2886,44 +2881,24 @@ msgstr ""
 "Ne mogu da upišem listu numera „%s“!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Lista numera „%s“ je načinjena"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 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
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "Kodirano pomoću"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "Nađi datoteku"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2931,93 +2906,93 @@ msgstr ""
 "datoteka."
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "U :"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "oznaka"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Razlikuj velika i mala lova"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Nađena(o) : %d datoteka(e)"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "Učitaj imena datoteka iz tekstualnog fajla"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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
+#: src/misc.c:2738
 msgid " Load "
 msgstr "Učitaj"
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, 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
+#: src/misc.c:2782 src/misc.c:2876
 #, 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
+#: src/misc.c:2791 src/misc.c:2885
 #, 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
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 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
+#: src/misc.c:2812 src/misc.c:2906
 #, 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
+#: src/misc.c:2821 src/misc.c:2915
 #, 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "Osveži"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "Upiši samo listu datoteka"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "Izaberi sve redove"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3025,20 +3000,20 @@ msgstr ""
 "Aktiviranjem ove opcije, nakon učitavanja imena datoteka, trenutno izabrani "
 "skener će biti pokrenut (prozor skenera mora biti otvoreno)."
 
-#: src/misc.c:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "Unesi prazan red"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "Ukloni ovaj red"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "Pomeri masku nagore"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "Pomeri masku nadole"
@@ -3056,7 +3031,7 @@ msgstr "Audio"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr "MP4 format neispravan"
 
@@ -3081,8 +3056,7 @@ msgstr "Dva kanala"
 msgid "Single channel"
 msgstr "Jedan kanal"
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "Ponovi operaciju na ostatak datoteka"
 
@@ -3124,48 +3098,48 @@ 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
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, 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
+#: src/ogg_tag.c:166
 #, 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
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "Dodaj slike"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "Sve datoteke"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG i JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "Postavke slike %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "Tip slike"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "Opis slike:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "Sačuvaj sliku %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3176,115 +3150,120 @@ msgstr ""
 "„%s“\n"
 "Želite li da je prepišete?"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "Sačuvaj datoteku..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "JPEG slika"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "PNG slika"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "Nepoznata slika"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "PNG ikonica, 32x32 piksela"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "Ostale ikonice datoteke"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "Omot (lice)"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "Omot (poleđina)"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr "Strana sa letkom"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr "Medijum (pr. strana sa natpisom CD-a)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr "Vodeći umetnik/vodeći izvođač/solista"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "Umetnik/Izvođač"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "Bend/Orkestar"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "Autor tekstova"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "Mesto snimanja"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "U toku snimanja"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "U toku izvođenja"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "Film/Video zapis"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "Svetlo obojena riba"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "Ilustracija"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "Logo benda/izvođača"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "Logo izdavača/studija"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "Nepoznati tip slike"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "piksela"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "Tip"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "Opis"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3292,11 +3271,16 @@ 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
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr "Učitavam datoteku sa slikom..."
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3307,7 +3291,7 @@ msgstr ""
 "„%s“!\n"
 "(%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr "Datoteka sa slikom nije učitana..."
 
@@ -3722,7 +3706,7 @@ msgstr ""
 "Primoraj korišćenje sistemskog kodiranja karaktera i aktiviraj prevođenje "
 "znakova"
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3738,7 +3722,7 @@ msgid ""
 msgstr ""
 "Primoraj korišćenje sistemskog kodiranja karaktera i zanemari neke karaktere"
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3935,7 +3919,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr "Set karaktera:"
 
@@ -3954,33 +3938,43 @@ 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
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr "Dodatne postavke za iconv():"
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 msgid "No"
 msgstr "Ne"
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+#, fuzzy
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+"Sa ovom opcijom, kada karakter ne može biti predstavljen željenim setom "
+"karaktera, biće preveden u neki od njemu sličnih karaktera."
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr "Prevedi"
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr "Ignoriši"
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 msgid "ID3v1 tags"
 msgstr "ID3v1 oznake"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "Upiši ID3v1.x oznaku"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3988,20 +3982,20 @@ msgstr ""
 "Ukoliko je aktivirano, ID3v1 oznaka će biti dodata ili promenjena na kraju "
 "MP3 datoteka. U suprotnom će biti uklonjena."
 
-#: src/prefs.c:878
+#: src/prefs.c:882
 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
+#: src/prefs.c:917
 msgid "Character Set for reading ID3 tags"
 msgstr "Set karaktera za čitanje ID3 oznaka."
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr "Nestandardno:"
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -4031,31 +4025,31 @@ msgstr ""
 "čitanje oznaka upisanih pod Windows-om, ili „KOI8-R“ za čitanje oznaka "
 "upisanim pod Uniks sistemima."
 
-#: src/prefs.c:947
+#: src/prefs.c:954
 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
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "Skener"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Skener za popunjavanje oznake - prevođenje karaktera"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 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
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Prevedi razmak „ “ u dolju crticu „_“"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4064,11 +4058,11 @@ msgstr ""
 "maske iz skenera ili oznaka."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Skener za promenu imena datotekama - prevođenje karaktera"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4077,17 +4071,17 @@ msgstr ""
 "maske iz skenera ili imena datoteka."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 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
+#: src/prefs.c:1041
 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
+#: src/prefs.c:1045
 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 "
@@ -4099,15 +4093,15 @@ msgstr ""
 "veliko“ (na primer, dobićete „Text in an Entry“ umesto „Text In An Entry“)."
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "Prozor skenera"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "Otvori prozor skenera pri pokretanju programa"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4115,11 +4109,11 @@ msgstr ""
 "Aktiviranje ove opcije će automatski otvoriti prozor skenera pri pokretanju "
 "EasyTAG programa."
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "Prozor skenera uvek na vrhu"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4128,16 +4122,16 @@ msgstr ""
 "glavnog prozora."
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "Polja"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "Prepiši sva polja pri skeniranju oznake"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4145,11 +4139,11 @@ msgstr ""
 "Ukoliko je aktivirano, skener će zameniti postojeći tekst u poljima novim. "
 "Ukoliko nije, samo prazna polja oznaka će biti popunjena."
 
-#: src/prefs.c:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "Postavi ovaj tekst kao podrazumevani komentar:"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4158,12 +4152,12 @@ msgstr ""
 "polje komentara pri korišćenju „Skenera za popunjavanje oznaka“"
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 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
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4174,42 +4168,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "CD baza podataka"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 msgid "Server Settings for Automatic Search"
 msgstr "Postavke servera za automatsku pretragu"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "Ime :"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "CGI putanja :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 msgid "Server Settings for Manual Search"
 msgstr "Postavke servera za ručnu pretragu"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 msgid "Local CD Data Base"
 msgstr "Lokalna CD basa podataka"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 msgid "Path :"
 msgstr "Putanja :"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4221,52 +4215,52 @@ msgstr ""
 "„folk“, „jazz“, „newage“, „reggae“, „rock“, „soundtrack“ i „misc“."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "Postavke mrežnog posrednika"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "Koristi mrežni posrednik"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "Aktivira postavke mrežnog posrednika."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "Ime posrednika :"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "Ime servera mrežnog posrednika."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "Port mrežnog posrednika"
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "Korisničko ime :"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "Ime korisnika mrežnog posrednika."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "Lozinka :"
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 msgid "Password of user for the the proxy server."
 msgstr "Lozinka korisnika mrežnog posrednika."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "Lista imena numera"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4274,7 +4268,7 @@ msgstr ""
 "Izaberi odgovarajuću audio datoteku (sudeći po mestu ili DLM-u ukoliko je "
 "aktivirano ispod)"
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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."
@@ -4283,7 +4277,7 @@ msgstr ""
 "audio datoteka u glavnoj listi će takođe biti izabrana."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4294,34 +4288,34 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "Potvrde"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "Potvrdi izlazak iz programa"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 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
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "Potvrdi upis oznake i datoteku"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "Potvrdi preimenovanje datoteke"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "Potvrdi brisanje datoteke"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "Potvrdi pravljenje liste numera"
 
@@ -4329,37 +4323,37 @@ msgstr "Potvrdi pravljenje liste numera"
 #. //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
+#: src/prefs.c:1429
 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
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "Zatvori ovaj prozor bez čuvanja"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 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
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Primer:%.*d_-_Ime_numere_1.mp3 )"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "Izmene su primenjene"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "Postavke su sačuvane"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "Postavke nisu menjane"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4369,59 +4363,59 @@ msgstr ""
 "Izabrana putanja za podrazumevanu stazu do datoteka nije ispravna!n„%s“\n"
 "(%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "Nije direktorijum"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, 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
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "Popuni oznaku"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "Preimenuj datoteku i direktorijum"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "Obradi polja"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "Oznaka uspešno skenirana..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Oznaka uspešno skenirana... (%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, 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
+#: src/scan.c:481 src/scan.c:510
 #, 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
+#: src/scan.c:667
 #, 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
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "Novo ime datoteke uspešno skenirano..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Novo ime datoteke uspešno skenirano...(%s)"
@@ -4429,41 +4423,41 @@ msgstr "Novo ime datoteke uspešno skenirano...(%s)"
 #. The init position is define below, cause the scanner window must be showed before
 #. * to be able to move it.
 #. Title
-#: src/scan.c:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "Skener oznaka i imena datoteka"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "Skener:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "Izaberi tip skenera za upotrebu"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "Otvori prozor skenera / Skeniraj izabrane datoteke"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "Opcije skenera"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "Prikaži / Sakrij uređivač maski"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "Prikaži / Sakrij legendu"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "Zatvori ovaj prozor"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4472,15 +4466,15 @@ msgstr ""
 "imenu datoteke ili putanji. Koristi se za popunjavanje polja oznaka."
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "Pregled popunjavanja oznake..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr "Maska prefiksa sa trenutnom putanjom"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4493,15 +4487,15 @@ msgstr ""
 "apsolutna, u suprotnoj je relativna u odnosu na staru putanju."
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "Pregled preimenovanja datoteke..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "Izaberi polja:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4510,126 +4504,126 @@ msgstr ""
 "vam trebaju."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "D"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 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
+#: src/scan.c:2223
 msgid "T"
 msgstr "N"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "Obradi polje „Naslov“."
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "I"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "Obradi polje „Izvođač“."
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "A"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "Obradi polje „Album“."
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "Ž"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "Obradi polje „Žanr“."
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "K"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "Obradi polje „Komentar“."
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "Kp"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "Obradi polje „Kompozitor“."
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 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
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Ap"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "Obradi polje „Autorsko pravo“."
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr "Obradi polje „URL“."
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "Kd"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr "Obradi polje „Kodirano ponoću“."
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "Izaberi obratno"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "Izaberi sve/ništa"
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Prevedi „_“ i „%20“ u „ “"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "Prevedi:"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "u:"
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4637,7 +4631,7 @@ msgstr ""
 "Donje crtice i karakter „%20“ između reči će biti zamenjeni razmakom. Na "
 "primer „Tekst%20u%20nekom_polju“ će postati „Tekstu nekom polju“."
 
-#: src/scan.c:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4645,12 +4639,12 @@ 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
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4658,7 +4652,7 @@ msgstr ""
 "Sve reči u poljima ispiši velikim slovima. Na primer „Tekst U NEKOM polju“ "
 "će postati „TEKST U NEKOM POLJU“."
 
-#: src/scan.c:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4666,7 +4660,7 @@ msgstr ""
 "Sve reči u poljima ispiši malim slovima. Na primer „TEKST U nekom polju“ će "
 "postati „tekst u nekom polju“."
 
-#: src/scan.c:2325
+#: src/scan.c:2394
 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'."
@@ -4674,7 +4668,7 @@ msgstr ""
 "Prvo slovo svakog polja promeni u veliko. Na primer „tekst U Nekom POLJU“ će "
 "postati „Tekst u nekom polju“."
 
-#: src/scan.c:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4682,15 +4676,15 @@ 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
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "Umetni razmak pre velikog slova"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "Ukloni duple razmake ili donje crtice"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4698,7 +4692,7 @@ msgstr ""
 "Uklanja sve razmake između reči. Na primer „Tekst U Nekom Polju“ će postati "
 "„TekstUNekomPolju“."
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4706,7 +4700,7 @@ msgstr ""
 "Dodaje razmak pre svakog velikog slova. Na primer „TekstUNekomPolju“ će "
 "postati „Tekst U Nekom Polju“."
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4717,183 +4711,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "Legenda"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a : izvođač"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c : komentar"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p : kompozitor"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r : autorsko pravo"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : broj CD-a"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : kodirano pomoću"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g : žanr"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorisano"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l : broj numera"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : orig. ivođač"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n : numera"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t : naslov"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y : godina"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "Uređivač maski"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "Napravi novu masku"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "Pomeri masku nagore"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "Pomeri masku nadole"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "Razmnoži masku"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "Dodaj podrazumevanu masku"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "Ukloni masku"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "Sačuvaj masku"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "Nova _maska"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "Umnoži: Nije izabran red!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "Ukloni: Nije izabran red!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "Pomeri nagore: Nije izabran red!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "Pomeri nadole: Nije izabran red!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, 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
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Ne mogu da otvorim datoteku sa postavkama „%s“ (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, 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
+#: src/setting.c:1277
 #, 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
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Učitavam podrazumevane maske za „Popuni oznaku“..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "Učitavam podrazumevane maske za „Preimenuj datoteku“..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Učitavam podrazumevane maske za „Preimenuj direktorijum“..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "Greška: Promenjljiva okruženja „HOME“ nije određena!"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "Greška: Ne mogu da napravim direktorijum „%s“ (%s)!"
@@ -4941,42 +4935,75 @@ 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
+#: src/win32/win32dep.c:178
 #, 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
+#: src/win32/win32dep.c:183
 #, 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
+#: src/win32/win32dep.c:194
 #, 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
+#: src/win32/win32dep.c:201
 #, 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
+#: src/win32/win32dep.c:302
 #, 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
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr "Direktorijum sa postavkama: „%s“"
 
+#~ msgid " OK "
+#~ msgstr "U redu"
+
+#~ msgid " Yes "
+#~ msgstr "Da"
+
+#~ msgid " No "
+#~ msgstr "Ne"
+
+#~ msgid " Apply "
+#~ msgstr "Primeni"
+
+#~ msgid " Save "
+#~ msgstr "Sačuvaj"
+
+#~ msgid " Cancel "
+#~ msgstr "Zanemari"
+
+#~ msgid " Close "
+#~ msgstr "Zatvori"
+
+#~ msgid " Write "
+#~ msgstr "Upiši"
+
+#~ msgid " Execute "
+#~ msgstr "Pokreni"
+
+#~ msgid " Search "
+#~ msgstr "Traži"
+
+#~ msgid " Browse... "
+#~ msgstr "Nađi..."
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/sv.gmo b/po/sv.gmo
index 64c8f21..e1ed2b5 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 5c381cd..f8b57ef 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Poedit-Language: Swedish\n"
 "X-Poedit-Country: SWEDEN\n"
 
-#: src/about.c:134
+#: src/about.c:140
 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,225 +27,220 @@ 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:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(Tysk översättning)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(Rysk översättning)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(Holländsk översättning)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(Svensk översättning)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(Ungersk översättning)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(Italiensk översättning)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(Japansk översättning)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(Ukrainsk översättning)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(Tjeckisk översättning)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(Spansk översättning)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(Polsk översättning)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(Rumänsk översättning)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(Dansk översättning)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(Grekisk översättning)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(Brasilien Portugisisk översättning)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr "(Bulgarisk översättning)"
 
-#: src/about.c:171
+#: src/about.c:177
 msgid "(Chinese translation)"
 msgstr "(Kinesisk översättning)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(Kinesisk översättning)"
+
+#: src/about.c:179
 msgid "(Hebrew translation)"
 msgstr "(Hebreisk översättning)"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(Tysk översättning)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr "Tilläggs Namn"
 
-#: src/about.c:227
+#: src/about.c:234
 #, fuzzy
 msgid "Status"
 msgstr "Statut"
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "Kommentar"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "Om..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "Om"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(Kompilerad: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(använder: GTK+ %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "Upphovsman: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-post: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Web-sida: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "Beskrivning:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr "Tillägg"
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr "libid3tag %s"
-
-#: src/about.c:394
+#: src/about.c:433
 msgid "MP3 file support"
 msgstr "Support för MP3 filer"
 
-#: src/about.c:396 src/about.c:422 src/about.c:432 src/about.c:442
-#: src/about.c:452 src/about.c:462
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 msgid "enabled"
 msgstr "tillgänglig"
 
-#: 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr "avstängd"
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr "id3lib %d.%d.%d"
-
-#: src/about.c:408
+#: src/about.c:449
 msgid "ID3v2.3 tags writting support"
 msgstr "för skrivning av ID3v2.3 taggar"
 
-#: src/about.c:410
+#: src/about.c:452
 msgid "available"
 msgstr "tillgänglig"
 
-#: src/about.c:420
+#: src/about.c:463
 msgid "Ogg Vorbis file support"
 msgstr "Support för Ogg Vorbis filer"
 
-#: src/about.c:430
+#: src/about.c:475
 msgid "Speex file support"
 msgstr "Support för Speex filer"
 
-#: src/about.c:440
+#: src/about.c:491
 msgid "FLAC file support"
 msgstr "Support för FLAC filer"
 
-#: src/about.c:450
+#: src/about.c:504
 msgid "MP4/AAC file support"
 msgstr "Support för MP4/AAC filer"
 
-#: src/about.c:460
+#: src/about.c:516
 msgid "WavPack file support"
 msgstr "Support för WavPack filer"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "Tack"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "Översättningar:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "Allmänt:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "Ändringar"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "FEL vid försök att öppna fil: '%s' (%s)."
@@ -421,7 +416,7 @@ msgstr "Fallande ordning efter samplerate"
 msgid "Open File(s) with ..."
 msgstr "Öppna Fil(er) med ..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "Välj Alla Filer"
 
@@ -429,7 +424,7 @@ msgstr "Välj Alla Filer"
 msgid "Unselect All Files"
 msgstr "Avmarkera Alla Filer"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "Invertera Fil Val"
 
@@ -575,7 +570,7 @@ msgstr "Döp Om Katalogen"
 msgid "Reload Directory"
 msgstr "Ladda Om Katalogen"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "Bläddra i Kataloger med ..."
 
@@ -714,17 +709,17 @@ msgstr "Kunde inte slå samman UI, fel var: %s\n"
 msgid "Ready to start..."
 msgstr "Färdig att starta ..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 msgid "New default path for files selected"
 msgstr "Ny förinställd sökväg vald för filer"
 
 #. Some files haven't been saved
 #. Some files aren't saved
-#: src/browser.c:713 src/easytag.c:4550 src/easytag.c:4570 src/easytag.c:4589
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "Bekräfta..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -732,65 +727,113 @@ msgstr ""
 "En del filer har ändrats men inte sparats...\n"
 "Vill du spara dessa innan byte av katalog?"
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 msgid "<All albums>"
 msgstr "<Alla album>"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, 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:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "Träd"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "FilNamn"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "Titel"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "Artist"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "Album"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "År"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "Spår"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "Genre"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "Kompositör"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "Orig. Artist"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "Copyright"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "URL"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "Kodad av"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "# Album"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 msgid "# Files"
 msgstr "# Filer"
 
-#: src/browser.c:2802 src/cddb.c:437 src/cddb.c:724 src/misc.c:1961
-msgid "Album"
-msgstr "Album"
-
-#: src/browser.c:2822
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "Gå till föräldra-katalog"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "Skriv in en katalog att bläddra i."
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "Träd"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "Välj en katalog att bläddra i!"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "Artist & Album"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "Byta namn på katalogen"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "Byta namn på katalogen '%s' till : "
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "Använd mask :"
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 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:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -798,31 +841,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:3283 src/misc.c:1362 src/misc.c:1459 src/scan.c:2052
-#: src/scan.c:2119 src/scan.c:2465
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "Fel Scanner Mask"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 msgid "Rename directory preview..."
 msgstr "Namnge förhandsvisning av katalog..."
 
-#. 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "Fel..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "Du måste skriva in ett katalognamn!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -833,16 +876,22 @@ msgstr ""
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -851,7 +900,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -860,7 +909,7 @@ msgstr ""
 "Kunde inte ändra namnet, katalognamnet existerar redan!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -875,88 +924,88 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "Katalognamnet ändrades"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "Program att köra :"
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 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:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "Öppna fil med ..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 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:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "Du måste skriva in ett programnamn!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr "Programmet '%s' kunde inte hittas!"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "Kunde inte starta %s (fel %d)!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "Kan inte starta en ny process!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "Exekverat kommando : '%s %s'"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "Artist / Album"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Category"
 msgstr "Kategori"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: src/cddb.c:229 src/cddb.c:438
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "Spår Namn"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "Tid"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "CD Data Bas Sökning"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "Automatisk Sökning"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 msgid "Request CD database :"
 msgstr " CD databas förfrågan :"
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
@@ -964,16 +1013,16 @@ msgstr ""
 "Använd valda filer för att göra en automatisk förfrågan hos CDDB databas "
 "(ordningen är viktig!) för att generera CddbID."
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "Stoppa sökningen ..."
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr "Använd lokal Cddb"
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -984,138 +1033,138 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "Manuell Sökning"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "Ord :"
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Skriv in sökorden (separerade med mellanslag eller '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "Sök I :"
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "Alla Fält"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "Andra"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "Alla Kategorier"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "Blues"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "Klassiskt"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "Country"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "Folk"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "Diverse"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "Newage"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "Rock"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "inkluderat : funk, soul, rapp, pop, industriell, metall, etc."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "filmer, shower"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "annat som inte passar i ovanstående kategorier"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr "Kategorier"
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "Resultat :"
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "Sök :"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "Skriv in sökord på raden nedan"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "Sök Nästa"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "Sök Föregående"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Visa endast röda rader (eller visa alla rader) i 'Artist / Album' listan"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "Välj bort alla rader"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "Invertera rad valet"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "Välj alla raderna"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1128,52 +1177,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "Sätt Till :"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 msgid "All"
 msgstr "Alla"
 
-#: src/cddb.c:721 src/misc.c:1958
-msgid "File Name"
-msgstr "FilNamn"
-
-#: src/cddb.c:722 src/misc.c:1959
-msgid "Title"
-msgstr "Titel"
-
-#: src/cddb.c:725 src/misc.c:1963
-msgid "Year"
-msgstr "År"
-
-#: src/cddb.c:726
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "Spår #"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 msgid "# Tracks"
 msgstr "# Spår"
 
-#: 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:3013
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr "Kör nuvarande scanner för varje fil"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 msgid "Match lines with the Levenshtein algorithm"
 msgstr "Matcha rader med Levenshteins algoritm"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:777 src/prefs.c:1362
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1188,91 +1221,91 @@ msgstr ""
 "applicering av cddb resultatet, istället för att använda direkt positions "
 "ordning."
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 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:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "Redo att söka..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, 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:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "Invertera urvalet"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "Sortera efter Spårnummer"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "Sortera efter Spårnamn"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "Kopplar upp mot värd '%s' ..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "Kunde inte koppla upp mot värd '%s' (%s)!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, 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:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "Kopplar upp mot värd '%s', på port '%d' ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "Kan inte kontakta värd '%s' (%s)!"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Uppkopplad mot värd '%s'"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "Emottager data (%s) ..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "Fel vid läsning av cddb svar (%s)!"
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "Kan inte skapa fil '%s' (%s)"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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:2246 src/cddb.c:2564 src/cddb.c:3397
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "Skickar förfrågan ..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "Kan inte skicka förfrågan (%s)!"
@@ -1281,91 +1314,92 @@ msgstr "Kan inte skicka förfrågan (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "Emottager data ..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 msgid "The server returned a wrong answer!"
 msgstr "Servern returnerade ett fel svar!"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "Servern returnerade ett fel svar! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 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:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "Hittade %d matchande album"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "Emottager data för sidan %d (album %d/%d)..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, c-format
 msgid "Receiving data of page %d ..."
 msgstr "Emottager data för sidan %d ..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr "Flera resultat att ladda ..."
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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:2889
+#: src/cddb.c:2893
 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:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
 msgstr "%d fil(er) vald(a)!"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 msgid "Local CD search..."
 msgstr "Lokal CD sökning..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
+#, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 "Sökväg för 'Lokal CD Data-Bas' har inte definerats!\n"
 "Skriv in sökvägen i preferens fönstret"
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, 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:3268
+#: src/cddb.c:3276
 #, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "Hittade %d matchande album för DiskID '%s'"
 
-#: src/cddb.c:3364
+#: src/cddb.c:3372
 #, 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:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "Laddar albumets spår lista ..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1378,7 +1412,7 @@ msgstr ""
 "\n"
 "Vill du fortsätta ?"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "Skriv taggen från CDDB..."
 
@@ -1563,69 +1597,69 @@ msgstr "Western (ISO-8859-15)"
 msgid "Western (Windows-1252)"
 msgstr "Western (Windows-1252)"
 
-#: src/charset.c:542
-#, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
+#: src/charset.c:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Filnamnet '%s' kunde inte konverteras till UTF-8 (%s).\n"
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "Ogiltig UTF-8"
 
-#: src/charset.c:641
-#, c-format
+#: src/charset.c:642
+#, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
 "UTF-8 strängen '%s' kunde inte konverteras till filnamnets kodning (%s)\n"
 
-#: src/charset.c:705
-#, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+#: src/charset.c:706
+#, fuzzy, c-format
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Strängen '%s' kunde inte konverteras till UTF-8 (%s).\n"
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "Startar EasyTAG %s (PId: %d) ..."
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "Förnärvarande används libid3tag version %s ..."
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "Förnärvarande används id3lib version %d.%d.%d ..."
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr "Variabeln EASYTAGLANG har definierats. Ställer in lokal : '%s'"
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, c-format
 msgid "Setting locale : '%s'"
 msgstr "Ställer in lokal : '%s'"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr "Förnärvarande används lokal '%s' (och eventuellt '%s')..."
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s av %s (kompilerat %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "Web Sida: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr "Okänd parameter eller sökväg '%s'\n"
@@ -1633,138 +1667,138 @@ msgstr "Okänd parameter eller sökväg '%s'\n"
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "Bläddrare"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "Fil"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "Läs Endast Fil"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 msgid "File Link Broken"
 msgstr "Fil Länken är Bruten"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, Lager ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "Bitvärde:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "Frekvens:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 src/mpeg_header.c:377
 msgid "Mode:"
 msgstr "Typ:"
 
-#: src/easytag.c:493 src/easytag.c:507 src/easytag.c:4071 src/easytag.c:4072
-#: src/easytag.c:4073
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "Storlek:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? kb"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "Tid:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "Tagg"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "Vanlig"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "Titel:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
 msgstr "Tagga valda filer med denna titel"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "Artist:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
 msgstr "Tagga valda filer med denna artist"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "Album:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
 msgstr "Tagga valda filer med detta albums namn"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 msgid "CD:"
 msgstr "CD:"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
 msgstr "Tagga valda filer med detta disknummer"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "År:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
 msgstr "Tagga valda filer med detta år"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr "Numrera valda spår sekvensiellt. Starta med 01 i vardera underkatalog."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "Spår #:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1772,274 +1806,274 @@ msgstr ""
 "Ställ in antalet filer, i samma katalog som den visade filen, till valda "
 "antal spår."
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
 msgstr "Tagga Valda filer med dessa spårnummer"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "Genre:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
 msgstr "Tagga valda filer med denna genre"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 msgid "Tag selected files with this comment"
 msgstr "Tagga valda filer med denna kommentar"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:818
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr "Kompositör:"
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
 msgstr "Tagga valda filer med denna kompositör"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "Orig. Artist:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
 msgstr "Tagga valda filer med denna original artist"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
 msgstr "Tagga valda filer med detta copyright"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr "URL:"
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
 msgstr "Tagga valda filer med detta URL"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "Kodat av:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
 msgstr "Tagga valda filer med denna avkodarens namn"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "Bilder"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr "Bilder:"
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "Du kan använda drag och släpp för att lägga till bilder."
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
 msgstr "Tagga valda filer med dessa bilder"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 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
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
 msgstr "Ta bort valda bilder, annars alla bilder."
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
 msgstr "Spara de valda bilderna till hårddisken."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
 msgstr "Ställ in rättigheterna för de valda bilderna."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Tagga valda filer med denna titel '%s'."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
 msgstr "Avlägsna titel från valda filer."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Valda filer taggade med denna artist '%s'."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
 msgstr "Avlägsna artist från valda filer"
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Valda filer taggade med detta album '%s'."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
 msgstr "Avlägsna albumnamn från valda filer"
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "Välj filer taggade med CD nummer '%s'."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
 msgstr "Avlägsna CD nummer från valda filer."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Valda filer taggade med år '%s'."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
 msgstr "Avlägsna år från valda filer"
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Valda filer taggade med spårnummer på detta vis 'xx/%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Valda filer taggade med spårnummer på detta vis 'xx'."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
 msgstr "Avlägsna spårnummer från valda filer."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
 msgstr "Valda spår numrerade sekvensiellt."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Valda filer taggade med genre '%s'."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
 msgstr "Avlägsna genre från valda filer."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Valda filer taggade med kommentar '%s'."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
 msgstr "Avlägsna kommentar från valda filer."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Valda filer taggade med kompositör '%s'."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
 msgstr "Avlägsna kompositör från valda filer."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Valda filer taggade med original artist '%s'."
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
 msgstr "Avlägsna original artist från valda filer."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Valda filer taggade med copyright '%s'."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
 msgstr "Avlägsna copyright från valda filer."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Valda filer taggade med URL '%s'."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
 msgstr "Avlägsna URL från valda filer."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Valda filer taggade med avkodarens namn '%s'."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
 msgstr "Avlägsna avkodarens namn från valda filer."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
 msgstr "Valda filer taggade med bilder."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
 msgstr "Avlägsna bilder från valda filer."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Välj Läge och Mask och förbered för liknande åtgärd"
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "Alla taggarna har scannats"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "Alla taggarna har avlägsnats"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "Alla filerna har sparats..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "Filer har delvis sparats..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "Filer har delvis raderats..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "Alla filerna har raderats..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2048,16 +2082,16 @@ msgstr ""
 "Vill du skriva taggen till filen\n"
 "'%s' ?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "Skriv Tagg..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
 msgstr "Ändra Namn på Fil och Katalog..."
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2071,11 +2105,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr "Ändra Katalognamn..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2089,11 +2123,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "Ändra Filnamn..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2106,17 +2140,17 @@ msgstr ""
 "till \n"
 "'%s' ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Skriver tagg i '%s'"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 msgid "Tag(s) written"
 msgstr "Tagg(ar) skrevs"
 
 #. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
-#: src/easytag.c:2586 src/easytag.c:2591
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2125,14 +2159,14 @@ msgstr ""
 "Kan inte skriva taggen i fil '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, c-format
 msgid "Renaming file '%s'"
 msgstr "Ändrar namn på fil '%s'"
 
 #. Renaming file to the temporary filename has failed
 #. Renaming file from the temporary filename has failed
-#: src/easytag.c:2737 src/easytag.c:2769 src/easytag.c:2941
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2145,11 +2179,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "Fil(er) inte omdöpta..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2162,7 +2196,7 @@ msgstr ""
 "pågrund av att filen redan existerar:\n"
 "'%s'"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2174,16 +2208,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "Filnamnet '%s' ändrat till '%s'"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "Fil(erna) om döpta..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2195,17 +2229,17 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "Flyttade fil '%s' till '%s'"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
 msgstr "Fil(erna) flyttade..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2218,11 +2252,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
 msgstr "Fil(er) ej flyttade..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2231,16 +2265,16 @@ msgstr ""
 "Är du säker på att du definitivt vill radera fil\n"
 "'%s' ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "Radera Fil..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Fil '%s' raderad"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2252,109 +2286,109 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "Sökning pågår..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "Fil: '%s'"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, 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:3239
+#: src/easytag.c:3356
 #, 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:3252 src/et_core.c:2696
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u fil(er)"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
 msgstr "Hittade ingen fil i denna katalog och underkataloger!"
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "Ingen fil hittades i denna katalog!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "Söker..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "  STOPPA sökningen...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "Välj en katalog att bläddra i!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
 msgstr "Tagga valda filer med detta fält"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Konvertera '_' och '%20' till mellanslag"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "Konvertera ' ' till '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "Enbart versaler"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "Enbart gemener"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "Första bokstaven versal"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "Första bokstaven versal i alla orden"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "Avlägsna mellanslag"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "Lägg in mellanslag före varje versal"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 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:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: Onormal avstängning! (PId: %d)."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "Mottog signal %s (%d)\a"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 "
@@ -2364,11 +2398,11 @@ msgstr ""
 "med en gdb bakåtspårning ('gdb easytag core' sedan 'bt' och 'l') och "
 "information om hur man kan upprepa detta till easytag@gmail.com"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "Okänd signal"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2402,11 +2436,11 @@ msgstr ""
 "Sökväg_till/filer     Använd en relativ sökväg.\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Avslutades Normalt."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2414,77 +2448,77 @@ msgstr ""
 "Vissa filer har modifierats men inte sparats...\n"
 "Vill du spara dessa filer innan du avslutar programmet?"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr "Vill du avsluta programmet?"
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "ID3 Tagg"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis Tagg"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis Tagg"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "APE Tagg"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC Tagg"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr "Wavpack Tagg"
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "MP3 Fil"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "MP2 Fil"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis Fil"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 msgid "Speex File"
 msgstr "Speex Fil"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "FLAC Fil"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "MusePack Fil"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "Monkey's Audio Fil"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr "MP4/AAC Fil"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 msgid "Wavpack File"
 msgstr "Wavpack Fil"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, c-format
 msgid "Pictures (%d)"
 msgstr "Bilder (%d)"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2492,14 +2526,14 @@ 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/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2510,11 +2544,11 @@ 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:664
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
 msgstr "Översättning filnamn"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr "Filnamnet '%s' översteg %d tecken och kommer att förkortas!\n"
@@ -2524,7 +2558,7 @@ msgstr "Filnamnet '%s' översteg %d tecken och kommer att förkortas!\n"
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "Kodare:"
@@ -2533,47 +2567,52 @@ msgstr "Kodare:"
 #. 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/flac_header.c:312 src/mp4_header.c:286 src/ogg_header.c:267
 #: src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Kanaler:"
 
-#: src/flac_tag.c:140 src/flac_tag.c:741
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "FEL vid försök att öppna fil: '%s' som FLAC (%s)."
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
 msgstr "FEL: Misslyckades med att skriva kommentarer till filen '%s' (%s)."
 
-#: src/flac_tag.c:990 src/ogg_tag.c:759
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Skriver tagg av '%s'"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Avlägsna taggen från '%s'"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Fel vid borttagning av ID3v1 taggen från '%s' (%s)"
 
-#: src/id3_tag.c:490 src/id3_tag.c:557
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Fel vid borttagning av ID3v2 taggen från '%s' (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Fel vid uppdatering av ID3v2 taggen från '%s' (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2597,77 +2636,77 @@ msgstr ""
 "\n"
 "Fil : %s"
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Fel vid uppdatering av ID3v1 taggen från '%s' (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Uppdaterade taggen på '%s'"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "Inga fel rapporterades"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "Inte tillräckligt mycket minne"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "Ingen data att analysera"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "Inkorrekt formaterad data"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "Ingen buffert att skriva till"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "Bufferten är för liten"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "Inkorrekt ram ID"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "Efterfrågat fält kunde inte hittas"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "Okänd fält typ"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "Taggen är redan kopplad till en fil"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "Inkorrekt tagg version"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "Ingen fil att analysera"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "Försök att skriva till fil med enbart läs-rättigheter"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "Fel vid komprimering/av-komprimering"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "Okänt felmeddelande!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
@@ -2676,126 +2715,82 @@ msgstr ""
 "Eftersom följande korrupta fil: '%s'\n"
 "kommer att orsaka fel i id3lib, kommer den inte att köras av programmet."
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
 msgstr "Trasig fil..."
 
-#: src/log.c:91
+#: src/log.c:95
 msgid "Log"
 msgstr "Logg"
 
-#: src/misc.c:214
-msgid " OK "
-msgstr "OK"
-
-#: src/misc.c:219
-msgid " Yes "
-msgstr "Ja"
-
-#: src/misc.c:224
-msgid " No "
-msgstr "Nej"
-
-#: src/misc.c:229
-msgid " Apply "
-msgstr "Utför"
-
-#: src/misc.c:234
-msgid " Save "
-msgstr "Spara"
-
-#: src/misc.c:239
-msgid " Cancel "
-msgstr "Avbryt"
-
-#: src/misc.c:244
-msgid " Close "
-msgstr "Stäng"
-
-#: src/misc.c:249
-msgid " Write "
-msgstr "Skriv"
-
-#: src/misc.c:254
-msgid " Execute "
-msgstr "Kör"
-
-#: src/misc.c:259
-msgid " Search "
-msgstr "Sök"
-
-#: src/misc.c:264
-msgid " Browse... "
-msgstr "Bläddra..."
+#: src/misc.c:773
+msgid "Select file..."
+msgstr "Välj fil..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "Välj katalog..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "Välj fil..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 msgid "Warning..."
 msgstr "Varning..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr "Ingen ljud-spelare har definierats"
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "B"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "KB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "MB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "GB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "TB"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "Generera en spel-lista"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "M3U Spel-lista Namn"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "Använd katalogens namn"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "Editera Maskar"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "Spel-lista valmöjligheter"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "Inkludera enbart de valda filerna"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2803,52 +2798,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:1397
+#: src/misc.c:1323
 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:1400
+#: src/misc.c:1326
 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:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "Skapa en spel-lista i föräldra katalogen"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 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:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "Använd DOS-katalogs separering"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 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:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "Spel-lista Innehåll"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "Skriv enbart en lista över filerna"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "Använd filnamnet för att skriva info"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "Skriva info användandes :"
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2857,12 +2852,12 @@ msgstr ""
 "Spel-listan '%s' existerar redan!\n"
 "Skriva över?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "Skriva Spel-lista..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -2871,44 +2866,24 @@ msgstr ""
 "Kan inte skriva spel-listan '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Skrev Spel-lista '%s'"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 msgid "CD"
 msgstr "CD"
 
-#: src/misc.c:1964
-msgid "Track"
-msgstr "Spår"
-
-#: src/misc.c:1967 src/picture.c:821
-msgid "Composer"
-msgstr "Kompositör"
-
-#: src/misc.c:1968
-msgid "Orig. Artist"
-msgstr "Orig. Artist"
-
-#: src/misc.c:1969
-msgid "Copyright"
-msgstr "Copyright"
-
-#: src/misc.c:1970
-msgid "URL"
-msgstr "URL"
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "Kodad av"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "Sök efter fil"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2916,93 +2891,93 @@ msgstr ""
 "att visa alla filer."
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "I :"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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:2033
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "Taggen"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "Teckenkänsligt"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "Hittade : %d fil(er)"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "Ladda filnamn från en TXT fil"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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:2787
+#: src/misc.c:2738
 msgid " Load "
 msgstr " Ladda"
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, fuzzy
 msgid "Content of TXT file"
 msgstr "Bekräfta namnbyte av fil"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2831 src/misc.c:2925
+#: src/misc.c:2782 src/misc.c:2876
 #, 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
+#: src/misc.c:2791 src/misc.c:2885
 #, 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
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 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
+#: src/misc.c:2812 src/misc.c:2906
 #, 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
+#: src/misc.c:2821 src/misc.c:2915
 #, 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "Ladda om"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "Skriv enbart en lista över filerna"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "Välj alla raderna"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3010,20 +2985,20 @@ 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:3403
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "Lägg till en blank rad"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "Radera denna rad"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "Flytta Upp denna Mask"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "Flytta Ned denna Mask"
@@ -3041,7 +3016,7 @@ msgstr "Ljud"
 msgid "Unknown"
 msgstr "Okänd"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr "MP4 formatet är ogiltigt"
 
@@ -3066,8 +3041,7 @@ msgstr "Dual channel"
 msgid "Single channel"
 msgstr "Single channel"
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "Upprepa åtgärden för resterande filer"
 
@@ -3109,48 +3083,48 @@ msgstr ""
 "Ogg Vorbis: Internt logiskt fel, indikerar en bug eller stapel/mägnd "
 "förvanskning (file: '%s')."
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "FEL: Misslyckades med att öppna filen: '%s' som en vorbis (%s)."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Varning : Ogg Vorbis filen '%s' innehåller en ID3v2 tagg."
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "Lägg till bilder"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "Alla Filer"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG och JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr "Bild Rättigheter %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "BildTyp"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "Bild Beskrivning:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr "Spara bild %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3161,115 +3135,120 @@ msgstr ""
 "'%s'\n"
 "Vill du skriva över den?"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "Spara fil..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "JPEG bild"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "PNG bild"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "Okänd bild"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32 pixel PNG fils ikon"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr "Annan fil ikon"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr "Konvolut (framsida)"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr "Konvolut (baksida)"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr "Ströskrifts sida"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr "Media (e.g. etikettsida av CD)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr "Lead artist/lead performer/solist"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "Artist/performer"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "Band/Orkester"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr "Lyrik/text författare"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
 msgstr "Plats för inspelning"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr "Under inspelning"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr "Under framträdande"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr "Film/video upptagning"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr "En ljust färgad fisk"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr "Illustration"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr "Band/Artist-logotyp"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr "Utgivare/studio-logotyp"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
 msgstr "Okänd bildtyp"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "pixtlar"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "Typ"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
@@ -3277,11 +3256,16 @@ 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:987
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr "Laddar bildfil..."
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3292,7 +3276,7 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr "Bildfilen är inte laddad..."
 
@@ -3697,7 +3681,7 @@ msgid ""
 msgstr ""
 "Tvinga fram användande av systemets teckenkodning och aktivera översättningen"
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3715,7 +3699,7 @@ msgstr ""
 "Tvinga fram användande av systemets teckenkodning och avlägsna somliga "
 "tecken i tysthet"
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3912,7 +3896,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr "Teckenkod"
 
@@ -3931,33 +3915,44 @@ 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:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr "Nuvarande inställning för iconv():"
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 msgid "No"
 msgstr "Nej"
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+#, fuzzy
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+"Med denna möjlighet, när ett tecken inte kan representeras av "
+"teckensnittstabellen så kan den eventuellt representeras av en eller flera "
+"liknande tecken."
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr "//IGNORERA"
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 msgid "ID3v1 tags"
 msgstr "ID3v1 taggar"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "Skriv ID3v1.x taggen"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -3965,21 +3960,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:878
+#: src/prefs.c:882
 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:910
+#: src/prefs.c:917
 msgid "Character Set for reading ID3 tags"
 msgstr "Teckenuppsättning för ID3 taggar"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr "Ej standard:"
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -4010,31 +4005,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:947
+#: src/prefs.c:954
 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:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "Scanner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "Fyll Tagg Scanner - Tecken Konvertering"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "Konvertera nedsänkta streck '_' och '%20' strängar till mellanslag ' '"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "Konvertera mellanslag ' ' till nedsänkta streck '_'"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
@@ -4043,11 +4038,11 @@ msgstr ""
 "mask från scannern av taggar."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "Döpa om Filer Scanner - Tecken Konvertering"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
@@ -4056,19 +4051,19 @@ msgstr ""
 "scanner till filnamnen."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 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:1034
+#: src/prefs.c:1041
 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:1038
+#: src/prefs.c:1045
 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 "
@@ -4081,15 +4076,15 @@ msgstr ""
 "inledande text' istället för 'En Inledande Text')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "Scanner-Fönster"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "Öppna Scanner-Fönstret vid start"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4097,11 +4092,11 @@ msgstr ""
 "Aktivera denna möjlighet för att automatiskt öppna scanner-fönstret vid "
 "start av EasyTAG."
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "Scanner-fönstret alltid överst"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4110,16 +4105,16 @@ msgstr ""
 "ovan på huvud fönstret."
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "Fält"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "Skriv över fälten när taggar scannas"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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."
@@ -4128,11 +4123,11 @@ msgstr ""
 "nya texten. Om avaktiverad så fylls enbart de blanka fälten i taggen med ny "
 "text."
 
-#: src/prefs.c:1085
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "Använd denna text som förvald kommentar :"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
@@ -4141,11 +4136,11 @@ msgstr ""
 "fältet vid användning av 'Fyll Tagg' scannern."
 
 #. CRC32 comment
-#: src/prefs.c:1105
+#: src/prefs.c:1112
 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:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4156,42 +4151,42 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "CD Data Bas"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 msgid "Server Settings for Automatic Search"
 msgstr "Server Inställningar för Automatisk Sökning"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "Namn :"
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "Port :"
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "CGI Sökväg :"
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 msgid "Server Settings for Manual Search"
 msgstr "Server Inställningar för Manuell Sökning"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 msgid "Local CD Data Base"
 msgstr "Lokal CD DataBas"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 msgid "Path :"
 msgstr "Sökväg :"
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4204,52 +4199,52 @@ msgstr ""
 "'diverse'."
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "Proxy Inställningar"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "Använd en proxy"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "Aktivera inställningarna för proxy servern."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "Värd Namn :"
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "Namnge proxy servern."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "Port att använda för proxy servern."
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "Användar Namn :"
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "Namn på användare för proxy servern."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "Användarens Lösenord :"
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 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:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "Spår Namn Lista"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4257,7 +4252,7 @@ msgstr ""
 "Välj motsvarande ljudfil (I enlighet med positionen eller DLM om aktiverad "
 "nedan)"
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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."
@@ -4266,7 +4261,7 @@ msgstr ""
 "av ljudfilen i huvud-listan."
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4277,15 +4272,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "Bekräfta"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "Bekräfta avslut av program"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4293,19 +4288,19 @@ msgstr ""
 "Om aktiverat kommer en dialog att öppnas med förfrågan efter bekräftelse "
 "före avslut av program."
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "Bekräfta skrivning av fil-tagg"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "Bekräfta namnbyte av fil"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "Bekräfta raderande av fil"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "Bekräfta skrivning av spellista"
 
@@ -4313,37 +4308,37 @@ msgstr "Bekräfta skrivning av spellista"
 #. //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
+#: src/prefs.c:1429
 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:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "Stäng detta fönster utan att spara"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 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:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr "(Exempel : %.*d_-_Spår_namn_1.mp3)"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "Ändringarna har applicerats"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "Konfigurationen sparad"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "Konfigurationen oförändrad"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4354,58 +4349,58 @@ msgstr ""
 "'%s'\n"
 "(%s) "
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "Inte en katalog"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr "Ljud-spelaren '%s' kan inte hittas!"
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "Fyll Tagg"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "Byt Namn på Fil och Katalog"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "Bearbeta Fält"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "Taggar framgångsrikt scannade..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "Taggar framgångsrikt scannade...(%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, 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:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, 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:663
+#: src/scan.c:667
 #, 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:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "Nytt filnamn framgångsrikt scannat..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "Nytt filnamn framgångsrikt scannat...(%s)"
@@ -4413,41 +4408,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "Tagg och Filnamns scanner"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "Scanner:"
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "Välj typ av scanner att använda"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "Öppna scanner fönstret / Scanna valda filer"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "Scanner Val"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "Visa / Dölj Mask-Editorn"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "Visa / Dölj Legend"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "Stäng detta fönster"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
@@ -4456,15 +4451,15 @@ msgstr ""
 "filnamn och sökväg med. Används för att fylla i tagg fält."
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "Förhandsvisning av fil-tagg..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr "Förinställ mask till nuvarande sökväg"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4477,15 +4472,15 @@ msgstr ""
 "en absolut sökväg, i annat fall är den relativ till den gamla sökvägen."
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "Förhandsvisning av filer med ändrade namn..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "Välj fält:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
@@ -4494,126 +4489,126 @@ msgstr ""
 "intresserar dej."
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
 msgstr "F"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
 msgstr "Bearbeta filnamns-fält"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "Bearbeta titel-fält"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "Bearbeta filens artist-fält"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "Bearbeta album-fält"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "Bearbeta genre-fält"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "Ko"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "Bearbeta kommentar-fält"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "K"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
 msgstr "Bearbeta kompositör-fält"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 msgid "Process original artist field"
 msgstr "Bearbeta original artist-fält"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Co"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
 msgstr "Bearbeta copyright-fält"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
 msgstr "Bearbeta URL-fält"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "A"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
 msgstr "Bearbeta avkodar namn-fält"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "Invertera Valen"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "Välj/Välj bort Alla."
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "Konvertera '_' och '%20' till ' '"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "Konvertera:"
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 msgid "to: "
 msgstr "till: "
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4621,7 +4616,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:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4629,12 +4624,12 @@ msgstr ""
 "Mellanslag byts ut mot ett nedsänkt streck. Exempelvis, före:  'En Inledande "
 "Text', Efter: 'En%20Inledande_Text'."
 
-#: src/scan.c:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4642,7 +4637,7 @@ msgstr ""
 "Konvertera alla ord i ett fält till versaler. Exempel, före: 'En INLEDANDE "
 "text', efter: 'EN INLEDANDE TEXT'."
 
-#: src/scan.c:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4650,7 +4645,7 @@ msgstr ""
 "Konvertera alla ord i ett fält till gemener. Exempel, före: 'En INLEDANDE "
 "text', efter: 'en inledande text'."
 
-#: src/scan.c:2325
+#: src/scan.c:2394
 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'."
@@ -4658,7 +4653,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:2328
+#: src/scan.c:2397
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4666,15 +4661,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:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "Lägg till ett mellanslag före en stor bokstav"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "Ta bort upprepningar av mellanslag eller nedsänkta streck"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4682,7 +4677,7 @@ msgstr ""
 "Alla mellanslag tas bort. Exempel, före: 'En Inledande Text', efter: "
 "'EnInledandeText'."
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4690,7 +4685,7 @@ msgstr ""
 "Ett mellanslag sätts in mellan varje versal. Exempel, före: "
 "'EnInledandeText', efter: 'En Inledande Text'."
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4701,183 +4696,183 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "Legend"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a : artist"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : album"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c : kommentar"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p : kompositör"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r : copyright"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr "%d : skiv-nummer"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e : kodad av"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g : genre"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : ignorerad"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l : antal spår"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o : orig. artist"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n : spår"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t : titel"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr "%u : URL"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y : år"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "Mask Editor"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "Skapa en Ny Mask"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "Flytta Upp denna Mask"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "Flytta Ned denna Mask"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "Kopiera Mask"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "Lägga till Förvald Mask"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "Ta bort Mask"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "Spara Mask"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "Ny_mask"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "Kopiering: Ingen rad vald!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "Ta bort: Ingen rad vald!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "Flytta Upp: Ingen rad vald!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "Flytta Ned: Ingen rad vald!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "FEL: Kan inte skriva konfigurations fil: %s (%s)"
 
-#: src/setting.c:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "Kan inte öppna konfigurations fil %s (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 msgid "Loading default configuration..."
 msgstr "Laddar förinställd konfiguration..."
 
-#: 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "Kan inte skapa eller öppna fil '%s' (%s)"
 
-#: src/setting.c:1278
+#: src/setting.c:1277
 #, 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:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "Laddar default 'Fyll Tagg' mask..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "Laddar default 'Ändra Namn på Fil'-mask..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "Laddar default 'Ändra Namn på Katalog'-mask..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr "FEL: Miljövariabeln HOME har inte definierats!"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "FEL: Kan inte skapa katalog '%s' (%s)!"
@@ -4926,42 +4921,81 @@ msgstr ""
 "vara korrupt eller avbruten."
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr "DLL '%s' hittades inte. Försöka att ladda den..."
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr "DLL '%s' kunde inte laddas"
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr "Denna version av '%s' innehåller '%s'"
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr "Funktionen '%s' kunnde inte hittas i dll '%s'"
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, c-format
 msgid "Audio player: '%s'"
 msgstr "Ljud Spelare: '%s'"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr "EasyTAG inställnings katalog: '%s'"
 
+#~ msgid "libid3tag %s"
+#~ msgstr "libid3tag %s"
+
+#~ msgid "id3lib %d.%d.%d"
+#~ msgstr "id3lib %d.%d.%d"
+
+#~ msgid " OK "
+#~ msgstr "OK"
+
+#~ msgid " Yes "
+#~ msgstr "Ja"
+
+#~ msgid " No "
+#~ msgstr "Nej"
+
+#~ msgid " Apply "
+#~ msgstr "Utför"
+
+#~ msgid " Save "
+#~ msgstr "Spara"
+
+#~ msgid " Cancel "
+#~ msgstr "Avbryt"
+
+#~ msgid " Close "
+#~ msgstr "Stäng"
+
+#~ msgid " Write "
+#~ msgstr "Skriv"
+
+#~ msgid " Execute "
+#~ msgstr "Kör"
+
+#~ msgid " Search "
+#~ msgstr "Sök"
+
+#~ msgid " Browse... "
+#~ msgstr "Bläddra..."
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/uk.gmo b/po/uk.gmo
index c848ddc..7096dcc 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index 2bd944b..3722815 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-10-15 23:53+0200\n"
+"POT-Creation-Date: 2007-12-09 18:16+0100\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:134
+#: src/about.c:140
 #, fuzzy
 msgid ""
 "    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
@@ -28,205 +28,200 @@ msgstr ""
 "MP2, FLAC, Ogg Vorbis, MusePack �� Monkey's Audio. ������� �� ��ɤ���� "
 "��������� GTK+ �������� ������� ������ ��Ǧ�."
 
-#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(�������� �������)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(�������� ��Ӧ������)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(�������� ��������)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(�������� ���̦������)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
 msgstr "(�������� �����������)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(�������� �������)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(�������� ����������)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(�������� ����������)"
 
-#: src/about.c:167
+#: src/about.c:173
 #, fuzzy
 msgid "(Danish translation)"
 msgstr "(�������� ����������)"
 
-#: src/about.c:168
+#: src/about.c:174
 #, fuzzy
 msgid "(Greek translation)"
 msgstr "(�������� �������)"
 
-#: src/about.c:169
+#: src/about.c:175
 #, fuzzy
 msgid "(Brazilian Portuguese translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:170
+#: src/about.c:176
 #, fuzzy
 msgid "(Bulgarian translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:171
+#: src/about.c:177
 #, fuzzy
 msgid "(Chinese translation)"
 msgstr "(�������� ���������)"
 
-#: src/about.c:172
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(�������� ���������)"
+
+#: src/about.c:179
 #, fuzzy
 msgid "(Hebrew translation)"
 msgstr "(�������� �������)"
 
-#: src/about.c:173
+#: src/about.c:180
 #, fuzzy
 msgid "(Serbian translation)"
 msgstr "(�������� �������)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
 msgstr ""
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
 msgstr ""
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "��������"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "���..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "���"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(ڦ�����: %s)"
 
-#: src/about.c:297
+#: src/about.c:320
 #, fuzzy, c-format
 msgid "(using: GTK+ %d.%d.%d)"
 msgstr "(������������: gtk+ %d.%d.%d �� id3lib %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "�����: %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "E-mail: %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "������� ���Ҧ���: "
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "��������������:"
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
 msgstr ""
 
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
-
-#: src/about.c:394
+#: src/about.c:433
 #, fuzzy
 msgid "MP3 file support"
 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
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 #, fuzzy
 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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
 msgstr ""
 
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
-
-#: src/about.c:408
+#: src/about.c:449
 #, fuzzy
 msgid "ID3v2.3 tags writting support"
 msgstr "(������� OGG ��������)"
 
-#: src/about.c:410
+#: src/about.c:452
 #, fuzzy
 msgid "available"
 msgstr "����������� ���'�Ԧ"
 
-#: src/about.c:420
+#: src/about.c:463
 #, fuzzy
 msgid "Ogg Vorbis file support"
 msgstr "(������� OGG ��������)"
 
-#: src/about.c:430
+#: src/about.c:475
 #, fuzzy
 msgid "Speex file support"
 msgstr "(������� OGG ��������)"
 
-#: src/about.c:440
+#: src/about.c:491
 #, fuzzy
 msgid "FLAC file support"
 msgstr "(������� OGG ��������)"
 
-#: src/about.c:450
+#: src/about.c:504
 #, fuzzy
 msgid "MP4/AAC file support"
 msgstr "(������� OGG ��������)"
 
-#: src/about.c:460
+#: src/about.c:516
 #, fuzzy
 msgid "WavPack file support"
 msgstr "(������� OGG ��������)"
@@ -234,33 +229,33 @@ msgstr "(������� OGG ��������)"
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "������"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "���������:\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "������Φ:\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "�ͦ��"
 
-#: src/about.c:560
+#: src/about.c:620
 #, 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: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
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' (%s)."
 msgstr "������� צ������� �����: '%s' (%s)."
@@ -477,7 +472,7 @@ msgstr "��������� �� ��������� ������� ����������æ�"
 msgid "Open File(s) with ..."
 msgstr "�������� �� ���������..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "������� �Ӧ ����"
 
@@ -485,7 +480,7 @@ msgstr "������� �Ӧ ����"
 msgid "Unselect All Files"
 msgstr "��������� ��¦���"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "����������� ��¦���"
 
@@ -659,7 +654,7 @@ msgstr "������������� �������..."
 msgid "Reload Directory"
 msgstr "���������� �������"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "����������� �� ���������..."
 
@@ -823,17 +818,17 @@ msgstr ""
 msgid "Ready to start..."
 msgstr "������� �� ������..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 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
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "������������..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -841,101 +836,151 @@ msgstr ""
 "���˦ ����� �ͦ����, ��� �� ��������...\n"
 "�� � ��Ԧ�� �������� �ͦ�� ����� ������� � ��������?"
 
-#: src/browser.c:2040
+#: src/browser.c:2164
 #, fuzzy
 msgid "<All albums>"
 msgstr "������"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr ""
 
-#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr ""
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "��'� �����"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "���������"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "����������"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "������"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "��"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "���� N"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "�����"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+#, fuzzy
+msgid "Composer"
+msgstr "%c : ��������"
+
+#: src/browser.c:2945 src/misc.c:1919
+#, fuzzy
+msgid "Orig. Artist"
+msgstr "����������:"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr ""
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr ""
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "�����������:"
+
+#: src/browser.c:2947
 #, fuzzy
 msgid "# Albums"
 msgstr "������"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 #, fuzzy
 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
+#: src/browser.c:2968
 #, fuzzy
 msgid "Go to parent directory"
 msgstr "������� � ������ �������"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "������� ������� ��� ���������."
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr ""
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "����Ҧ�� ������� ��� ���������!"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 #, fuzzy
 msgid "Artist & Album"
 msgstr "���������� / ������"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "�������������� ��������"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
 msgstr "������������� ������� '%s' ��: "
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "�� ������: "
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 msgid "If activated, it will use masks to rename directory."
 msgstr ""
 
-#: src/browser.c:3263
+#: src/browser.c:3649
 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
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "���������� ����� ��� �������"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 #, fuzzy
 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "�������..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "�̦� ������ ��'� ��������!"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
 msgstr ""
@@ -944,16 +989,22 @@ msgstr ""
 #. // 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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -962,7 +1013,7 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, c-format
 msgid ""
 "Can't rename because this directory name already exists!\n"
@@ -971,7 +1022,7 @@ msgstr ""
 "�� ���� �������������, ��˦���� ����� ������� ��� �!\n"
 "(%s)"
 
-#: src/browser.c:3513 src/browser.c:3539
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -986,69 +1037,69 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
 msgstr "������� �������������"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "�������� ��������: "
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr "���Ħ�� ��'� ��������. �������� ������� ���� �� ����������."
 
-#: src/browser.c:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "�������� �� ���������..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr "���Ħ�� ��'� ��������. �������� ���� ���� �� ����������."
 
-#: src/browser.c:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "�̦� ������ ��'� ��������!"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
 msgstr ""
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, fuzzy, c-format
 msgid "Can't execute %s (error %d)!\n"
 msgstr "���������� �������� %s (%s)!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
 msgstr "�� ���� ������ ����� ������!\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
 msgstr "�������� �������: '%s %s'"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "���������� / ������"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 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
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "����� �����"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "���"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 #, fuzzy
 msgid "CD Data Base Search"
 msgstr "����� � CDDB"
@@ -1056,31 +1107,31 @@ msgstr "����� � CDDB"
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr ""
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 msgid "Request CD database :"
 msgstr ""
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 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
+#: src/cddb.c:305 src/cddb.c:415
 #, fuzzy
 msgid "Stop the search ..."
 msgstr "  �������� �����...  "
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
 msgstr ""
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1089,139 +1140,139 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 #, fuzzy
 msgid "Manual Search"
 msgstr " ������ "
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
 msgstr "�����: "
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "���Ħ�� ����� ��� ������ (���Ħ��Φ ��������� ��� '+')"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
 msgstr "�� ������: "
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
 msgstr "�Ӧ ����"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "����"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "�Ӧ ������Ҧ�"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
 msgstr "����"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
 msgstr "�������"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
 msgstr "����Ҧ"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
 msgstr "�������"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
 msgstr "����"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
 msgstr "����"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
 msgstr "���� �����"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
 msgstr "���Ǧ"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
 msgstr "���"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
 msgstr "��������"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
 msgstr "�������: ����, ����, ���, ���, ������Ҧ��, �����, ����."
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "Ʀ����, �������"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
 msgstr "Ԧ, �� �� �������� ���Φ� � ������������� ������Ҧ�"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
 msgstr " ������Ҧ� "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "����������: "
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "�����:"
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
 msgstr "���Ħ�� ����� ��� ������ � ������"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "������ ���������"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "������ ��������"
 
-#: src/cddb.c:571
+#: src/cddb.c:572
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
 msgstr "��������� ��¦���"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 #, fuzzy
 msgid "Invert lines selection"
 msgstr "����������� ��¦���"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "������� �Ӧ �����"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1231,52 +1282,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: src/cddb.c:712
+#: src/cddb.c:713
 msgid "Set Into :"
 msgstr "��������� ��:"
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 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
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "���� N"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 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
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
 msgstr ""
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 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
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1285,15 +1320,15 @@ msgid ""
 "instead of using directly the position order."
 msgstr ""
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 
-#: src/cddb.c:798 src/misc.c:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "������� �� ������..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1301,78 +1336,78 @@ msgstr ""
 "������: '%s', ����������: '%s', �������: '%s', Ҧ�: '%s', ����: '%s', ID: '%"
 "s'"
 
-#: src/cddb.c:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "����������� ��¦���"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 #, fuzzy
 msgid "Sort by Track Number"
 msgstr "��������� �� ���������� ������ �����"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 #, fuzzy
 msgid "Sort by Track Name"
 msgstr "����� �����"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "���������� ���Φ ����� '%s'..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "�� ���� ��������� ��'� ����� '%s' (%s)!"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, c-format
 msgid "Can't create a new socket (%s)!"
 msgstr "�� ���� �������� ����� ����� (%s)!"
 
 #. Open connection to the server
-#: src/cddb.c:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "��'������� � '%s', ���� '%d'..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "�� ���� �'�������� �� '%s' (%s)!"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "��'������ �� '%s'"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
 msgstr "��������� ����� (%s)..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, fuzzy, c-format
 msgid "Error when reading cddb response (%s)!"
 msgstr "������� ��������� ���� ID3v1 � '%s' (%s)."
 
-#: src/cddb.c:1770
+#: src/cddb.c:1771
 #, fuzzy, c-format
 msgid "Can't create file '%s' (%s)"
 msgstr "�� ���� צ������ ���� '%s' (%s)"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
 msgstr "���������� ������..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "�� ���� ��Ħ����� ����� (%s)!"
@@ -1381,92 +1416,92 @@ msgstr "�� ���� ��Ħ����� ����� (%s)!"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
 msgstr "��������� �����..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 #, fuzzy
 msgid "The server returned a wrong answer!"
 msgstr "����������� צ���צ�� �������! (%s)"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
 msgstr "����������� צ���צ�� �������! (%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
 msgstr ""
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
 msgstr "�������� %d �������(��)"
 
-#: src/cddb.c:2585
+#: src/cddb.c:2589
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
 msgstr "��������� ����� (%s)..."
 
-#: src/cddb.c:2587
+#: src/cddb.c:2591
 #, fuzzy, c-format
 msgid "Receiving data of page %d ..."
 msgstr "��������� ����� (%s)..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
 msgstr ""
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 #, 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:2889
+#: src/cddb.c:2893
 msgid "More than 99 files selected! Can't send request!"
 msgstr ""
 
-#: src/cddb.c:2895
+#: src/cddb.c:2899
 #, fuzzy, c-format
 msgid "%d file(s) selected!"
 msgstr "%u ����(��)"
 
-#: src/cddb.c:2970
+#: src/cddb.c:2974
 #, fuzzy
 msgid "Local CD search..."
 msgstr "������� �� ������..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
 msgstr ""
 
-#: src/cddb.c:3268
+#: src/cddb.c:3276
 #, fuzzy, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
 msgstr "�������� %d �������(��)"
 
-#: src/cddb.c:3364
+#: src/cddb.c:3372
 #, fuzzy, c-format
 msgid "Can't load file: '%s' (%s)!"
 msgstr "�� ���� צ������ ���� '%s' (%s)"
 
 #. Load the track list of the album
-#: src/cddb.c:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "������������ ������ ���˦� �������..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, fuzzy, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1478,7 +1513,7 @@ msgstr ""
 "\n"
 "����������?"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
 msgstr "����� ���� �� ������ CDDB..."
 
@@ -1663,69 +1698,69 @@ msgstr "��Ȧ��� (ISO-8859-15)"
 msgid "Western (Windows-1252)"
 msgstr "��Ȧ��� (Windows-1252)"
 
-#: src/charset.c:542
+#: src/charset.c:543
 #, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 #, fuzzy
 msgid "Invalid UTF-8"
 msgstr "���� (UTF-8)"
 
-#: src/charset.c:641
+#: src/charset.c:642
 #, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
 
-#: src/charset.c:705
+#: src/charset.c:706
 #, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s).\n"
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 
 #. Starting messages
-#: src/easytag.c:177
+#: src/easytag.c:179
 #, fuzzy, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
 msgstr "������ EasyTAG %s (PId: %d) ...\n"
 
-#: src/easytag.c:179
+#: src/easytag.c:181
 #, fuzzy, c-format
 msgid "Currently using libid3tag version %s ..."
 msgstr "����������դ���� id3lib ���Ӧ� %d.%d.%d...\n"
 
-#: src/easytag.c:182
+#: src/easytag.c:184
 #, fuzzy, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
 msgstr "����������դ���� id3lib ���Ӧ� %d.%d.%d...\n"
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
 msgstr ""
 
-#: src/easytag.c:191
+#: src/easytag.c:193
 #, fuzzy, c-format
 msgid "Setting locale : '%s'"
 msgstr "�������������� ����� '%s'"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
 msgstr ""
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
 msgstr "%s %s צ� %s (ڦ�����: %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "������� ���Ҧ���: %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
 msgstr ""
@@ -1733,171 +1768,171 @@ msgstr ""
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
 msgstr "����������"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "����"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "���� ��� �������"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 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
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
 msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
 msgstr "?, Layer ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "������:"
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
 msgstr "? ��/�"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "�������:"
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
 msgstr "? ��"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 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
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
 msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "���ͦ�:"
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
 msgstr "? ��"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "���:"
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "���"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "��������"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "���������:"
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 #, fuzzy
 msgid "Tag selected files with this title"
 msgstr "������������ �Ӧ ����� ����� ����������"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "����������:"
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 #, fuzzy
 msgid "Tag selected files with this artist"
 msgstr "������������ �Ӧ ����� ��� ����������"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "������:"
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 #, fuzzy
 msgid "Tag selected files with this album name"
 msgstr "������������ �Ӧ ����� ������ ����� �������"
 
 #. Disc Number
-#: src/easytag.c:642
+#: src/easytag.c:654
 #, fuzzy
 msgid "CD:"
 msgstr "CDDB"
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 #, fuzzy
 msgid "Tag selected files with this disc number"
 msgstr "������������ �Ӧ ����� ��� ����������"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "��:"
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 #, fuzzy
 msgid "Tag selected files with this year"
 msgstr "������������ �Ӧ ����� ��� �����"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 #, fuzzy
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr "������������� �Ӧ �����. �������� � 01 � ������� Ц�������ڦ."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "���� N:"
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr ""
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 #, fuzzy
 msgid "Tag selected files with this number of tracks"
 msgstr "������������ �Ӧ ����� ��� �� ������� �����"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "�����:"
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 #, fuzzy
 msgid "Tag selected files with this genre"
 msgstr "������������ �Ӧ ����� ��� �� ������"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "��������:"
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 #, fuzzy
 msgid "Tag selected files with this comment"
 msgstr "������������ �Ӧ ����� ��� ����������"
@@ -1905,53 +1940,53 @@ msgstr "������������ �Ӧ ����� ��� ����������"
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: src/easytag.c:818
+#: src/easytag.c:830
 msgid "Composer:"
 msgstr ""
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 #, fuzzy
 msgid "Tag selected files with this composer"
 msgstr "������������ �Ӧ ����� ��� ����������"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 #, fuzzy
 msgid "Orig. Artist:"
 msgstr "����������:"
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 #, fuzzy
 msgid "Tag selected files with this original artist"
 msgstr "������������ �Ӧ ����� ��� ����������"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr ""
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 #, fuzzy
 msgid "Tag selected files with this copyright"
 msgstr "������������ �Ӧ ����� ��� ����������"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
 msgstr ""
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 #, fuzzy
 msgid "Tag selected files with this URL"
 msgstr "������������ �Ӧ ����� ��� �����"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 #, fuzzy
 msgid "Encoded by:"
 msgstr "�����������:"
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 #, fuzzy
 msgid "Tag selected files with this encoder name"
 msgstr "������������ �Ӧ ����� ��� �� ������"
@@ -1959,223 +1994,223 @@ msgstr "������������ �Ӧ ����� ��� �� ������"
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr ""
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
 msgstr ""
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr ""
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 #, fuzzy
 msgid "Tag selected files with these pictures"
 msgstr "������������ �Ӧ ����� ����� ����������"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 msgid "Add pictures to the tag (drag and drop is also available)."
 msgstr ""
 
-#: src/easytag.c:1051
+#: src/easytag.c:1063
 #, fuzzy
 msgid "Remove selected pictures, else all pictures."
 msgstr "�������� ��� � ��Ħ����� ���̦�"
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 #, fuzzy
 msgid "Save the selected pictures on the hard disk."
 msgstr "���������, �� ����������դ���� � ������ �� �����."
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 #, fuzzy
 msgid "Set properties of the selected pictures."
 msgstr "�Ӧ ����� ������������ ���������� '%s'."
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, fuzzy, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "�Ӧ ����� ������������ ���������� '%s'."
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 #, fuzzy
 msgid "Removed title from selected files."
 msgstr "� �Ӧ� ���̦� �������� ���������."
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, fuzzy, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "�Ӧ ����� ������������ ���������� '%s'."
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 #, fuzzy
 msgid "Removed artist from selected files."
 msgstr "� �Ӧ� ���̦� �������� ���������."
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, fuzzy, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "�Ӧ ����� ������������ ������ ������� '%s'."
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 #, fuzzy
 msgid "Removed album name from selected files."
 msgstr "� �Ӧ� ���̦� �������� ����� �������."
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, fuzzy, c-format
 msgid "Selected files tagged with disc number '%s'."
 msgstr "�Ӧ ����� ������������ ���������� '%s'."
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 #, fuzzy
 msgid "Removed disc number from selected files."
 msgstr "� �Ӧ� ���̦� �������� ����� �����."
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, fuzzy, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "�Ӧ ����� ������������ '%s' �����."
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 #, fuzzy
 msgid "Removed year from selected files."
 msgstr "� �Ӧ� ���̦� �������� Ҧ� �������æ�."
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, fuzzy, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "�Ӧ ����� ������������ ������� ����� �� ������ 'xx/%s'."
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 #, fuzzy
 msgid "Selected files tagged with track like 'xx'."
 msgstr "�Ӧ ����� ������������ ������� ����� �� ������ 'xx'."
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 #, fuzzy
 msgid "Removed track number from selected files."
 msgstr "� �Ӧ� ���̦� �������� ����� �����."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 #, fuzzy
 msgid "Selected tracks numbered sequentially."
 msgstr "������������� ���˦�: %d."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, fuzzy, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "�Ӧ ����� ������������ ������ '%s'."
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 #, fuzzy
 msgid "Removed genre from selected files."
 msgstr "� �Ӧ� ���̦� �������� ����� ���˦�."
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, fuzzy, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "�Ӧ ����� ������������ ���������� '%s'."
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 #, fuzzy
 msgid "Removed comment from selected files."
 msgstr "� �Ӧ� ���̦� �������� �������Ҧ."
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, fuzzy, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "�Ӧ ����� ������������ ���������� '%s'."
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 #, fuzzy
 msgid "Removed composer from selected files."
 msgstr "� �Ӧ� ���̦� �������� �������Ҧ."
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, fuzzy, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "�Ӧ ����� ������������ ���������� '%s'."
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 #, fuzzy
 msgid "Removed original artist from selected files."
 msgstr "� �Ӧ� ���̦� �������� ���������."
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, fuzzy, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "�Ӧ ����� ������������ ���������� '%s'."
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 #, fuzzy
 msgid "Removed copyright from selected files."
 msgstr "� �Ӧ� ���̦� �������� ���������."
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, fuzzy, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "�Ӧ ����� ������������ '%s' �����."
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 #, fuzzy
 msgid "Removed URL from selected files."
 msgstr "� �Ӧ� ���̦� �������� Ҧ� �������æ�."
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, fuzzy, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "�Ӧ ����� ������������ ������ '%s'."
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 #, fuzzy
 msgid "Removed encoder name from selected files."
 msgstr "� �Ӧ� ���̦� �������� ����� ���˦�."
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 #, fuzzy
 msgid "Selected files tagged with pictures."
 msgstr "�Ӧ ����� ������������ ���������� '%s'."
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 #, fuzzy
 msgid "Removed pictures from selected files."
 msgstr "� �Ӧ� ���̦� �������� ���������."
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "����Ҧ�� ����� �� �����, �� �����Ҧ�� æ � Ħ�"
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
 msgstr "������������ �Ӧ ����"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
 msgstr "�Ӧ ���� ��������..."
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
 msgstr "�Ӧ ���� ��������..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
 msgstr "������� ���̦� ��������..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
 msgstr "������� ���̦� ��������..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
 msgstr "�Ӧ ����� ��������..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, c-format
 msgid ""
 "Do you want to write the tag of file\n"
@@ -2184,17 +2219,17 @@ msgstr ""
 "�� Ħ���� ������ �������� ��� � ����\n"
 "'%s' ?"
 
-#: src/easytag.c:2426 src/easytag.c:2431
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
 msgstr "����� ����..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 #, fuzzy
 msgid "Rename File and Directory..."
 msgstr "�������������� ��������"
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, fuzzy, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2208,12 +2243,12 @@ msgstr ""
 "'%s' ?"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 #, fuzzy
 msgid "Rename Directory..."
 msgstr "������������� �������..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, fuzzy, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2227,11 +2262,11 @@ msgstr ""
 "'%s' ?"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "������������� ����..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2244,17 +2279,17 @@ msgstr ""
 "�� \n"
 "'%s' ?"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "����� ���� �� '%s'"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 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
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
@@ -2263,14 +2298,14 @@ msgstr ""
 "�� ���� ������������ ���� '%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, 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
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2283,11 +2318,11 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2745 src/easytag.c:2777 src/easytag.c:2792 src/easytag.c:2949
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
 msgstr "����� �� �������������..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2300,7 +2335,7 @@ msgstr ""
 "��˦���� ��� ���դ ���� � ����� ������:\n"
 "'%s'"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, fuzzy, c-format
 msgid ""
 "Can't create target directory\n"
@@ -2312,16 +2347,16 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2838
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
 msgstr "'%s' ������������� � '%s'"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
 msgstr "����� �������������..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, fuzzy, c-format
 msgid ""
 "Can't remove old directory\n"
@@ -2333,18 +2368,18 @@ msgstr ""
 "(%s)"
 
 #. Renaming file has succeeded
-#: src/easytag.c:2885
+#: src/easytag.c:2963
 #, fuzzy, c-format
 msgid "Moved file '%s' to '%s'"
 msgstr "'%s' ������������� � '%s'"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 #, fuzzy
 msgid "File(s) moved..."
 msgstr "����� �������������..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, fuzzy, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2357,12 +2392,12 @@ msgstr ""
 "'%s'!\n"
 "(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 #, fuzzy
 msgid "File(s) not moved..."
 msgstr "����� �� �������������..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, c-format
 msgid ""
 "Do you really want to delete definitively the file\n"
@@ -2371,16 +2406,16 @@ msgstr ""
 "�� Ħ���� ������ �������� ����\n"
 "'%s' ?"
 
-#: src/easytag.c:2986 src/easytag.c:2990
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "��������� ���̦�..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "���� '%s' ��������"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
@@ -2392,110 +2427,110 @@ msgstr ""
 "(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "������ �����..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "����: '%s'"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
 msgstr "���˦��� ��������� ���̦� � ����� ������ڦ �� Ц����������: %d"
 
-#: src/easytag.c:3239
+#: src/easytag.c:3356
 #, 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
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
 msgstr "%u ����(��)"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
 msgstr "� ����� ������ڦ �� ���� Ц���������� ����� ���̦� MP3!"
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
 msgstr "� ����� ������ڦ ����� ���̦� � �������!"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "�����..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
 msgstr "  �������� �����...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
 msgstr "����Ҧ�� ������� ��� ���������!"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 #, fuzzy
 msgid "Tag selected files with this field"
 msgstr "������������ �Ӧ ����� ����� ����������"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
 msgstr "��ͦ������ '_' �� '%20' �� ���¦��"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "��ͦ������ ' ' �� '_'"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "�������� �������"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "������ ̦������"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "� �����ϧ ̦����"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "� �����ϧ ����� ����� �����"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
 msgstr "�������� ���¦��"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "�������� ���¦� ����� ������� ̦�����"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 msgid "Remove duplicate spaces or underscores"
 msgstr "�������� ��������Φ ���¦�� �� Ц����������"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s: ����������� ���������� (PId: %d)!."
 
-#: src/easytag.c:4325 src/easytag.c:4334
+#: src/easytag.c:4443 src/easytag.c:4452
 #, fuzzy, c-format
 msgid "Received signal %s (%d)\a"
 msgstr "�������� ������ %s (%d)\a"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 #, fuzzy
 msgid ""
 "You have probably found a bug in EasyTAG. Please, send a bug report with a "
@@ -2506,11 +2541,11 @@ msgstr ""
 "���������� gdb ('gdb easytag core' ��Ԧ� 'bt') �� ������ j.couderc@ifrance."
 "com\n"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "��צ����� ������"
 
-#: src/easytag.c:4479
+#: src/easytag.c:4597
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2543,11 +2578,11 @@ msgstr ""
 "., ./             �� ����������� �������� �������.\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: ��������� ����������."
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before exiting the program?"
@@ -2555,81 +2590,81 @@ msgstr ""
 "���˦ ����� �ͦ����, ��� �� ��������...\n"
 "�� � ��Ԧ�� �������� �ͦ�� ����� ������� � ��������?"
 
-#: src/easytag.c:4570
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
 msgstr " �� Ħ���� ������ ����� � ��������? "
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "��� ID3"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "��� OGG Vorbis"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 #, fuzzy
 msgid "FLAC Vorbis Tag"
 msgstr "��� OGG Vorbis"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "��� APE"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr ""
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
 msgstr ""
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "���� MP3"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "���� MP2"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "���� OGG Vorbis"
 
-#: src/et_core.c:2573
+#: src/et_core.c:2582
 #, fuzzy
 msgid "Speex File"
 msgstr "/����/��������� ����"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "���� FLAC"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "���� MusePack"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "���� Monkey's Audio"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 #, fuzzy
 msgid "MP4/AAC File"
 msgstr "���� MP2"
 
-#: src/et_core.c:2599
+#: src/et_core.c:2608
 #, fuzzy
 msgid "Wavpack File"
 msgstr "���� MusePack"
 
-#: src/et_core.c:2873
+#: src/et_core.c:2882
 #, c-format
 msgid "Pictures (%d)"
 msgstr ""
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
@@ -2637,14 +2672,14 @@ msgid "%d kb/s"
 msgstr "%d ��/c"
 
 #. Samplerate
-#: src/et_core.c:2917 src/flac_header.c:304 src/monkeyaudio_header.c:91
+#: src/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d ��"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, c-format
 msgid ""
 "Could not convert filename : '%s'\n"
@@ -2652,12 +2687,12 @@ msgid ""
 "(Try setting the environment variable G_FILENAME_ENCODING)."
 msgstr ""
 
-#: src/et_core.c:3060 src/scan.c:664
+#: src/et_core.c:3069 src/scan.c:668
 #, fuzzy
 msgid "Filename translation"
 msgstr "��������� ���� ���̦�"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
 msgstr ""
@@ -2667,7 +2702,7 @@ msgstr ""
 #. 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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "�����������:"
@@ -2676,47 +2711,52 @@ msgstr "�����������:"
 #. 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/flac_header.c:312 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
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
 #, fuzzy, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
 msgstr "������� צ������� �����: '%s' (%s)."
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, 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
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "�������� ��� � '%s'"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "�������� ��� � '%s'"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, 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
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "������� ��������� ���� ID3v2 � '%s' (%s)."
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "������� ���������� ���� ID3v1 � '%s' (%s)."
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2731,256 +2771,212 @@ msgid ""
 "File : %s"
 msgstr ""
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "������� ���������� ���� ID3v1 � '%s' (%s)."
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "��������� ��� � '%s'"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
 msgstr "����ϧ �������"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
 msgstr "����������� ���'�Ԧ"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
 msgstr "��Φ צ����Φ"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
 msgstr "������������ ������� �����"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
 msgstr "������� ����� ������"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
 msgstr "������� �����"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
 msgstr "������������ ID �����"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
 msgstr "�� �������� צ���צ��� ����"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
 msgstr "��צ����� ��� ����"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
 msgstr "��� ��� ������ �� �����"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
 msgstr "��צ��� ���Ӧ� ����"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
 msgstr "�� ������ ����"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
 msgstr "������ ������ � ���� '���� ��� ������'"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
 msgstr "������� ������Ӧ�/��������Ӧ�"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
 msgstr "��צ���� �������!"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, c-format
 msgid ""
 "As the following corrupted file: '%s'\n"
 "will cause an error in id3lib, it will not be processed by the program."
 msgstr ""
 
-#: src/id3_tag.c:1214
+#: src/id3_tag.c:1224
 #, fuzzy
 msgid "Corrupted file..."
 msgstr "������� ����..."
 
-#: src/log.c:91
+#: src/log.c:95
 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:773
+msgid "Select file..."
+msgstr "������� ����..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "����Ҧ�� �������..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "������� ����..."
-
-#: src/misc.c:931
+#: src/misc.c:852
 #, fuzzy
 msgid "Warning..."
 msgstr "�����..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
 msgstr ""
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, 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
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
 msgstr "�"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
 msgstr "��"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
 msgstr "��"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
 msgstr "��"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
 msgstr "��"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "��������� ������ צ���������"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "��'� ������ צ��������� M3U"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "�� ������ ��������"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
 msgstr "���������� �����"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "��������� ������ צ���������"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 #, fuzzy
 msgid "Include only the selected files"
 msgstr "��������� �����Φ �ͦ�� � ��Ħ����� ������"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 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
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
 msgstr "������ ���� � ������ צ���������"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 msgid "Use relative path for files in playlist"
 msgstr "��������� ���� � ������ צ���������"
 
 #. Create playlist in parent directory
-#: src/misc.c:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
 msgstr "������� ������ צ��������� � ���������� ������ڦ"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 
 #. DOS Separator
-#: src/misc.c:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "��������������� ���Ħ����� ������Ǧ� DOS"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "�ͦ�� ������ צ���������"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
 msgstr "���������� ���� ������ ���̦�"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
 msgstr "���������� �������æ� �Ǧ��� � ������ �����"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
 msgstr "���������� �������æ� �Ǧ��� �: "
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
@@ -2989,12 +2985,12 @@ msgstr ""
 "C����� צ��������� '%s' ��� ���դ!\n"
 "������������?"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "����� ������ צ���������..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
@@ -3003,161 +2999,139 @@ msgstr ""
 "�� ���� �������� ������ צ��������� '%s'!\n"
 "(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "�������� ������ צ��������� '%s'"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 #, fuzzy
 msgid "CD"
 msgstr "CDDB"
 
-#: src/misc.c:1964
-msgid "Track"
-msgstr "���� N"
-
-#: src/misc.c:1967 src/picture.c:821
-#, fuzzy
-msgid "Composer"
-msgstr "%c : ��������"
-
-#: src/misc.c:1968
-#, fuzzy
-msgid "Orig. Artist"
-msgstr "����������:"
-
-#: src/misc.c:1969
-msgid "Copyright"
-msgstr ""
-
-#: src/misc.c:1970
-msgid "URL"
-msgstr ""
-
-#: src/misc.c:1971
+#: src/misc.c:1922
 #, fuzzy
 msgid "Encoded by"
 msgstr "�����������:"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "������ ����"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "��:"
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 #, 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:2033
+#: src/misc.c:1984
 #, fuzzy
 msgid "the Tag"
 msgstr "����� ����..."
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "�ŭ�����-��������"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
 msgstr "��������: %d ����(��)"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "����������� ������ ���̦� � ���������� �����"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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
+#: src/misc.c:2738
 msgid " Load "
 msgstr " ����������� "
 
-#: src/misc.c:2810
+#: src/misc.c:2761
 #, 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
+#: src/misc.c:2782 src/misc.c:2876
 #, 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
+#: src/misc.c:2791 src/misc.c:2885
 #, 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
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 msgid "Delete all blank lines"
 msgstr "�������� �Ӧ �����Φ �����"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2861 src/misc.c:2955
+#: src/misc.c:2812 src/misc.c:2906
 #, 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
+#: src/misc.c:2821 src/misc.c:2915
 #, 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
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "����������"
 
-#: src/misc.c:2903
+#: src/misc.c:2854
 #, fuzzy
 msgid "List of files"
 msgstr "���������� ���� ������ ���̦�"
 
-#: src/misc.c:2998
+#: src/misc.c:2949
 #, fuzzy
 msgid "Selected line:"
 msgstr "������� �Ӧ �����"
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 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
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "�������� ������ �����"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
 msgstr "�������� ��� �����"
 
-#: src/misc.c:3424
+#: src/misc.c:3376
 #, fuzzy
 msgid "Move up this line"
 msgstr "������ �� ���� ����æ�"
 
-#: src/misc.c:3430
+#: src/misc.c:3382
 #, fuzzy
 msgid "Move down this line"
 msgstr "�������� �� ���� ����æ�"
@@ -3176,7 +3150,7 @@ msgstr ""
 msgid "Unknown"
 msgstr "��צ����� ������"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr ""
 
@@ -3201,8 +3175,7 @@ msgstr ""
 msgid "Single channel"
 msgstr ""
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
 msgstr "��������� Ħ� �� ���Ԧ ���̦�"
 
@@ -3240,50 +3213,50 @@ msgid ""
 "(file: '%s')."
 msgstr ""
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
 msgstr "�������: ������� צ������� �����: '%s' �� vorbis (%s)."
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr ""
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr ""
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 #, fuzzy
 msgid "All Files"
 msgstr "�Ӧ ����"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr ""
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
 msgstr ""
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr ""
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 #, fuzzy
 msgid "Picture Description:"
 msgstr "��������������:"
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
 msgstr ""
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
@@ -3291,132 +3264,142 @@ msgid ""
 "Do you want to overwrite?"
 msgstr ""
 
-#: src/picture.c:734
+#: src/picture.c:719
 #, fuzzy
 msgid "Save file..."
 msgstr "������� ����..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr ""
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr ""
 
-#: src/picture.c:790
+#: src/picture.c:807
 #, fuzzy
 msgid "Unknown image"
 msgstr "��צ����� ������"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
 msgstr ""
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
 msgstr ""
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
 msgstr ""
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
 msgstr ""
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
 msgstr ""
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
 msgstr ""
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
 msgstr ""
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr ""
 
-#: src/picture.c:817
+#: src/picture.c:834
 #, fuzzy
 msgid "Conductor"
 msgstr "����Ҧ"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr ""
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
 msgstr ""
 
-#: src/picture.c:825
+#: src/picture.c:842
 #, fuzzy
 msgid "Recording location"
 msgstr "��������� �� ��������� ���� צ���������"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
 msgstr ""
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
 msgstr ""
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
 msgstr ""
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
 msgstr ""
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
 msgstr ""
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
 msgstr ""
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
 msgstr ""
 
-#: src/picture.c:841
+#: src/picture.c:860
 #, fuzzy
 msgid "Unknown picture type"
 msgstr "��צ����� ��� ����"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 #, fuzzy
 msgid "pixels"
 msgstr "����"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr ""
 
-#: src/picture.c:882
+#: src/picture.c:901
 #, fuzzy
 msgid "Description"
 msgstr "��������������:"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 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
+#: src/picture.c:1018
 msgid "Loading Picture File..."
 msgstr ""
 
-#: src/picture.c:1081
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
 #, fuzzy, c-format
 msgid ""
 "Can't open file :\n"
@@ -3424,7 +3407,7 @@ msgid ""
 "(%s)"
 msgstr "�� ���� צ������ ���� '%s' (%s)\n"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
 msgstr ""
 
@@ -3822,7 +3805,7 @@ msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
@@ -3835,7 +3818,7 @@ msgid ""
 "characters"
 msgstr ""
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -4026,7 +4009,7 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: src/prefs.c:769 src/prefs.c:867
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
 msgstr ""
 
@@ -4048,35 +4031,42 @@ msgstr "���������, �� ����������դ���� ��� ������ ��Ǧ� � ��������Ӧ ��������."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: src/prefs.c:822 src/prefs.c:888
+#: src/prefs.c:823 src/prefs.c:892
 #, fuzzy
 msgid "No"
 msgstr "�����"
 
-#: src/prefs.c:827 src/prefs.c:893
+#: src/prefs.c:826 src/prefs.c:895
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr ""
+
+#: src/prefs.c:831 src/prefs.c:900
 msgid "//TRANSLIT"
 msgstr ""
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: src/prefs.c:844
+#: src/prefs.c:848
 #, fuzzy
 msgid "ID3v1 tags"
 msgstr "��� ID3"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "��������� ����� ID3v1.x"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
@@ -4084,22 +4074,22 @@ msgstr ""
 "���������, ��� �������� �� ����������� ���� ID3v1 � ˦�æ MP3-���̦�. ������ "
 "���� ������ ��Ҧ��Φ."
 
-#: src/prefs.c:878
+#: src/prefs.c:882
 #, fuzzy
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr "���������, �� ����������դ���� ��� ������ ��Ǧ� � ��������Ӧ ��������."
 
 #. Character Set for reading tag
-#: src/prefs.c:910
+#: src/prefs.c:917
 #, fuzzy
 msgid "Character Set for reading ID3 tags"
 msgstr "������������� �����̦�"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
 msgstr ""
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -4116,7 +4106,7 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: src/prefs.c:947
+#: src/prefs.c:954
 #, fuzzy
 msgid "Character set used to read tag data in the file."
 msgstr "���������, �� ����������դ���� ��� ������ ��Ǧ� � ��������Ӧ ��������."
@@ -4124,55 +4114,55 @@ msgstr "���������, �� ����������դ���� ��� ������ ��Ǧ� � ��������Ӧ ��������."
 #.
 #. * Scanner
 #.
-#: src/prefs.c:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "������"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 #, fuzzy
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "������� �������������"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "������������ ������ Ц���������� '_' �� ����� '%20' �� ���¦� ' '"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "������������ ���¦� ' ' �� Ц���������� '_'"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 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
+#: src/prefs.c:1008
 #, fuzzy
 msgid "Rename File Scanner - Character Conversion"
 msgstr "������� �������������"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 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
+#: src/prefs.c:1034
 #, fuzzy
 msgid "Process Fields Scanner - Character Conversion"
 msgstr "������� �������������"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1034
+#: src/prefs.c:1041
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: src/prefs.c:1038
+#: src/prefs.c:1045
 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 "
@@ -4181,15 +4171,15 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "����� �������"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "�������� צ��� ������� �� ������� ������"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
@@ -4197,11 +4187,11 @@ msgstr ""
 "���������, ��� צ��� ������� ����������� צ���������� �� ������� ������ "
 "EasyTAG."
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
 msgstr "����� ������� ������ ������"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
@@ -4210,37 +4200,37 @@ msgstr ""
 "צ���."
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
 msgstr "����"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
 msgstr "�������������� ���� � �����Ӧ ���������� ��Ǧ�"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "����� �� ������� ��������:"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 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
+#: src/prefs.c:1112
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 
-#: src/prefs.c:1109
+#: src/prefs.c:1116
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4249,45 +4239,45 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: src/prefs.c:1120 src/prefs.c:1121
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr ""
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
+#: src/prefs.c:1137
 msgid "Server Settings for Automatic Search"
 msgstr ""
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "�����: "
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "����: "
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "���� �� CGI: "
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
+#: src/prefs.c:1211
 #, fuzzy
 msgid "Server Settings for Manual Search"
 msgstr "��������� �������"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
+#: src/prefs.c:1246
 #, fuzzy
 msgid "Local CD Data Base"
 msgstr "����� � CDDB"
 
-#: src/prefs.c:1247
+#: src/prefs.c:1254
 #, fuzzy
 msgid "Path :"
 msgstr "���� �� CGI: "
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 msgid ""
 "Specify the directory where are located the local cd data base. The local cd "
 "data base contains the eleven following directories 'blues', 'classical', "
@@ -4296,66 +4286,66 @@ msgid ""
 msgstr ""
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "��������� ����Ӧ"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "��������������� ����Ӧ"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
 msgstr "��������� ��������� ����Ӧ-�������."
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "������: "
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
 msgstr "��'� ����Ӧ-�������."
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
 msgstr "���� ����Ӧ-�������."
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "��'� �����������: "
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
 msgstr "��'� ����������� ��� ����Ӧ-�������."
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "������: "
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 msgid "Password of user for the the proxy server."
 msgstr "������ ����������� ��� ����Ӧ-�������."
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1342
+#: src/prefs.c:1349
 #, fuzzy
 msgid "Track Name List"
 msgstr "����� �����"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4364,15 +4354,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "������������"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
 msgstr "������������ ������ � ��������"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4380,19 +4370,19 @@ msgstr ""
 "���� ����������, ����� Ħ������� צ��� �� ������� Ц����������� ����� "
 "������� � ��������."
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
 msgstr "������������ ������ ���� �� �����"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
 msgstr "������������ �������������� �����"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
 msgstr "������������ ��������� �����"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
 msgstr "������������ ������ ������ צ���������"
 
@@ -4400,37 +4390,37 @@ msgstr "������������ ������ ������ צ���������"
 #. //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
+#: src/prefs.c:1429
 msgid "Apply changes (but don't save) and close this window"
 msgstr "����������� �ͦ�� (��� �� ���Ҧ����) �� ������� צ���"
 
-#: src/prefs.c:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
 msgstr "������� צ��� ��� ����������"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 msgid "Save changes and close this window"
 msgstr "�������� �ͦ�� � ������� �� צ���"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
 msgstr ""
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "�ͦ�� ���������Φ"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "���Ʀ����æ� ���������"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "���Ʀ����æ� �� �ͦ����"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, fuzzy, c-format
 msgid ""
 " The selected path for 'Default path to files' isn't valid!\n"
@@ -4441,58 +4431,58 @@ msgstr ""
 "%s\n"
 "(%s)"
 
-#: src/prefs.c:1738
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "�� �� �������"
 
-#: src/prefs.c:1839
+#: src/prefs.c:1861
 #, c-format
 msgid "The audio file player '%s' can't be found!"
 msgstr ""
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "��������� ���"
 
-#: src/scan.c:175
+#: src/scan.c:179
 #, fuzzy
 msgid "Rename File and Directory"
 msgstr "�������������� ��������"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
 msgstr "������� ��̦�"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
 msgstr "��� ������������..."
 
-#: src/scan.c:355
+#: src/scan.c:359
 #, fuzzy, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "��� ������������... (%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
 msgstr ""
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "������� �������: �� ���� ������ ���Ħ����� '%s' � '%s'"
 
-#: src/scan.c:663
+#: src/scan.c:667
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
 msgstr ""
 
-#: src/scan.c:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "���� ��'� ����� ������������..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "���� ��'� ����� ������������... (%s)"
@@ -4500,57 +4490,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:1909
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "���������� ���� �� ���Φ �����"
 
 #. Option Menu
-#: src/scan.c:1931
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "������: "
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
 msgstr "����Ҧ��, ���� ��� ������� �����������"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 #, fuzzy
 msgid "Open scanner window / Scan selected files"
 msgstr "��������� ��Ħ��Φ �����"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "��������� �������"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "��������/������� �������� �����"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "��������/������� �������"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "������� צ���"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 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
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "�������� ��������..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4559,212 +4549,212 @@ msgid ""
 msgstr ""
 
 #. Preview label
-#: src/scan.c:2125
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "�������� ������: �������������� �����..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
 msgstr "����Ҧ�� ����:"
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 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
+#: src/scan.c:2220
 msgid "F"
 msgstr "�"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
 msgstr "����������� ���� ���Φ �����"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "�"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
 msgstr "����������� ���� ���������"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "�"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
 msgstr "����������� ���� ���������"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "�"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
 msgstr "����������� ���� �������"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "��"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
 msgstr "����������� ���� �����"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 #, fuzzy
 msgid "Cm"
 msgstr "�"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
 msgstr "����������� ���� ���������"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 #, fuzzy
 msgid "Cp"
 msgstr "�"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 #, fuzzy
 msgid "Process composer field"
 msgstr "����������� ���� ���������"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr ""
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 #, fuzzy
 msgid "Process original artist field"
 msgstr "����������� ���� ���������"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 #, fuzzy
 msgid "Cr"
 msgstr "�"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 #, fuzzy
 msgid "Process copyright field"
 msgstr "����������� ���� ���������"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr ""
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 #, fuzzy
 msgid "Process URL field"
 msgstr "����������� ���� ���������"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr ""
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 #, fuzzy
 msgid "Process encoder name field"
 msgstr "����������� ���� ���Φ �����"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "����������� ��¦���"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
 msgstr "�������/��������� ��¦���."
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "������������ '_'�� '%20' �� ' '"
 
-#: src/scan.c:2250
+#: src/scan.c:2319
 #, fuzzy
 msgid "Convert:"
 msgstr "����: "
 
-#: src/scan.c:2252
+#: src/scan.c:2321
 #, fuzzy
 msgid "to: "
 msgstr "�: "
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 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:2284
+#: src/scan.c:2353
 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
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
 msgstr ""
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 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
+#: src/scan.c:2391
 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
+#: src/scan.c:2394
 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
+#: src/scan.c:2397
 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
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
 msgstr "�������� ������� ����� ������� ̦�����"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
 msgstr "�������� ��������Φ ���¦�� �� Ц����������"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4773,187 +4763,187 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "�������"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a : ����������"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b : ������"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c : ��������"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, fuzzy, c-format
 msgid "%p : composer"
 msgstr "%c : ��������"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr ""
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
 msgstr ""
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, fuzzy, c-format
 msgid "%e : encoded by"
 msgstr "�����������:"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g : �����"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i : �����դ����"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
 msgstr "%l : ˦��˦��� ���˦�"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, fuzzy, c-format
 msgid "%o : orig. artist"
 msgstr "%a : ����������"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n : ����"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t : �����"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
 msgstr ""
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y : Ҧ�"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "�������� �����"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "�������� ���� �����"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "������ �� ���� ����æ�"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "�������� �� ���� ����æ�"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "��������� �����"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "������ ������"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "�������� �����"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "�������� �����"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "����_�����"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
 msgstr "�������: �� ������� �����!"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
 msgstr "��������: �� ������� �����!"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
 msgstr "�ͦ����� �����: �� ������� �����!"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
 msgstr "�ͦ����� ����: �� ������� �����!"
 
-#: src/setting.c:889
+#: src/setting.c:888
 #, fuzzy, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
 msgstr "�������: �� ���� �������� ���� �������Ҧ�: %s (%s)"
 
-#: src/setting.c:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
 msgstr "�� ���� צ������ ���� �������Ҧ� '%s' (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, fuzzy, c-format
 msgid "Can't create or open file '%s' (%s)"
 msgstr "�� ���� צ������ ���� '%s' (%s)"
 
-#: src/setting.c:1278
+#: src/setting.c:1277
 #, fuzzy, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
 msgstr "�������: �� ���� �������� ������ � ����: %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
 msgstr "������������ �����ϧ ����� '��������� ����'..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
 msgstr "������������ �����ϧ ����� '������������� �����'..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 #, fuzzy
 msgid "Loading default 'Rename Directory' masks..."
 msgstr "������������ �����ϧ ����� '������������� �����'..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 #, fuzzy
 msgid "ERROR: The environment variable HOME is not defined!"
 msgstr ""
 "�������: �ͦ��� HOME �� ���������!\n"
 "\n"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
 msgstr "�������: �� ���� �������� ������� '%s' (%s)!"
@@ -5003,42 +4993,75 @@ msgstr ""
 "��Ҧ�����."
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
 msgstr ""
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
 msgstr ""
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
 msgstr ""
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
 msgstr ""
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
+#: src/win32/win32dep.c:302
 #, fuzzy, c-format
 msgid "Audio player: '%s'"
 msgstr "����������� ���������"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 msgid "EasyTAG settings dir: '%s'"
 msgstr ""
 
+#~ msgid " OK "
+#~ msgstr " ��� "
+
+#~ msgid " Yes "
+#~ msgstr " ��� "
+
+#~ msgid " No "
+#~ msgstr " � "
+
+#~ msgid " Apply "
+#~ msgstr " ����������� "
+
+#~ msgid " Save "
+#~ msgstr " �������� "
+
+#~ msgid " Cancel "
+#~ msgstr " ��������� "
+
+#~ msgid " Close "
+#~ msgstr " ������� "
+
+#~ msgid " Write "
+#~ msgstr " �������� "
+
+#~ msgid " Execute "
+#~ msgstr " �������� "
+
+#~ msgid " Search "
+#~ msgstr " ������ "
+
+#~ msgid " Browse... "
+#~ msgstr " ��������... "
+
 #~ msgid ""
 #~ "The entered path is invalid!:\n"
 #~ "%s\n"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index c97eff2..e66b546 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fde7579..e87d598 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,258 +1,247 @@
+# translation of easytag.po to Simplified Chinese
 # Chinese translations for easytag package
 # easytag 软件包的简体中文翻译.
 # Copyright (C) 2006 THE easytag'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the easytag package.
-# Yang Jinsong <shannleon@gmail.com>, 2006.
+# Yang Jinsong <shannleon@gmail.com>, 2006, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: easytag 1.99.9\n"
+"Project-Id-Version: easytag-2.1.3\n"
 "Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2007-12-09 18:16+0100\n"
+"PO-Revision-Date: 2007-10-25 18:58+0800\n"
+"Last-Translator: Yang Jinsong <shannleon@gmail.com>\n"
+"Language-Team: Simplified Chinese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.10.2\n"
 
-#: src/about.c:134
+#: src/about.c:140
 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's Audio 文件标签的有用工具。简洁美观的 GTK+ 界面让 GNU/Linux 下编辑"
+"音频文 件标签变得简单而高效。"
 
-#: src/about.c:142 src/about.c:143 src/about.c:144 src/about.c:145
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
 msgid "(German translation)"
 msgstr "(德语翻译)"
 
-#: src/about.c:146 src/about.c:147
+#: src/about.c:152 src/about.c:153
 msgid "(Russian translation)"
 msgstr "(俄语翻译)"
 
-#: src/about.c:148 src/about.c:149
+#: src/about.c:154 src/about.c:155
 msgid "(Dutch translation)"
 msgstr "(荷兰语翻译)"
 
-#: src/about.c:150 src/about.c:151
+#: src/about.c:156 src/about.c:157
 msgid "(Swedish translation)"
 msgstr "(瑞典语翻译)"
 
-#: src/about.c:152 src/about.c:153 src/about.c:154
+#: src/about.c:158 src/about.c:159 src/about.c:160
 msgid "(Hungarian translation)"
 msgstr "(匈牙利语翻译)"
 
-#: src/about.c:155 src/about.c:156
+#: src/about.c:161 src/about.c:162
 msgid "(Italian translation)"
 msgstr "(意大利语翻译)"
 
-#: src/about.c:157
+#: src/about.c:163
 msgid "(Japanese translation)"
 msgstr "(日语翻译)"
 
-#: src/about.c:158 src/about.c:159
+#: src/about.c:164 src/about.c:165
 msgid "(Ukrainian translation)"
-msgstr ""
+msgstr "(乌克兰语翻译)"
 
-#: src/about.c:160 src/about.c:161
+#: src/about.c:166 src/about.c:167
 msgid "(Czech translation)"
 msgstr "(捷克语翻译)"
 
-#: src/about.c:162 src/about.c:163 src/about.c:164
+#: src/about.c:168 src/about.c:169 src/about.c:170
 msgid "(Spanish translation)"
 msgstr "(西班牙语翻译)"
 
-#: src/about.c:165
+#: src/about.c:171
 msgid "(Polish translation)"
 msgstr "(波兰语翻译)"
 
-#: src/about.c:166
+#: src/about.c:172
 msgid "(Romanian translation)"
 msgstr "(罗马尼亚语翻译)"
 
-#: src/about.c:167
+#: src/about.c:173
 msgid "(Danish translation)"
 msgstr "(丹麦语翻译)"
 
-#: src/about.c:168
+#: src/about.c:174
 msgid "(Greek translation)"
 msgstr "(希腊语翻译)"
 
-#: src/about.c:169
+#: src/about.c:175
 msgid "(Brazilian Portuguese translation)"
 msgstr "(巴西葡萄牙语翻译)"
 
-#: src/about.c:170
+#: src/about.c:176
 msgid "(Bulgarian translation)"
 msgstr "(保加利亚语翻译)"
 
-#: src/about.c:171
-#, fuzzy
+#: src/about.c:177
 msgid "(Chinese translation)"
-msgstr "(日语翻译)"
+msgstr "(简体中文翻译)"
 
-#: src/about.c:172
-#, fuzzy
+#: src/about.c:178
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(繁体中文翻译)"
+
+#: src/about.c:179
 msgid "(Hebrew translation)"
-msgstr "(希腊语翻译)"
+msgstr "(Hebrew translation)"
 
-#: src/about.c:173
-#, fuzzy
+#: src/about.c:180
 msgid "(Serbian translation)"
-msgstr "(德语翻译)"
+msgstr "(Serbian translation)"
 
-#: src/about.c:226
+#: src/about.c:233
 msgid "Extension Name"
-msgstr ""
+msgstr "后缀名"
 
-#: src/about.c:227
+#: src/about.c:234
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
-#: src/about.c:228 src/misc.c:1966
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
 msgid "Comment"
 msgstr "备注"
 
 #. Config
-#: src/about.c:244
+#: src/about.c:252
 msgid "About..."
 msgstr "关于..."
 
 #.
 #. * Tab for common informations
 #.
-#: src/about.c:262 src/bar.c:236
+#: src/about.c:270 src/bar.c:236
 msgid "About"
 msgstr "关于"
 
-#: src/about.c:293
+#: src/about.c:316
 #, c-format
 msgid "(compiled: %s)"
 msgstr "(编译于： %s)"
 
-#: src/about.c:297
-#, fuzzy, c-format
+#: src/about.c:320
+#, c-format
 msgid "(using: GTK+ %d.%d.%d)"
-msgstr "(使用： GTK+ %d.%d.%d 与 id3lib %d.%d.%d)"
+msgstr "(使用： GTK+ %d.%d.%d)"
 
-#: src/about.c:305
+#: src/about.c:328
 #, c-format
 msgid "Author: %s"
 msgstr "作者： %s"
 
-#: src/about.c:309 src/easytag.c:212
+#: src/about.c:332 src/easytag.c:214
 #, c-format
 msgid "E-mail: %s"
 msgstr "电子邮件： %s"
 
-#: src/about.c:315
+#: src/about.c:338
 msgid "Web Page: "
 msgstr "Web 页面："
 
-#: src/about.c:328
+#: src/about.c:351
 msgid "Description:"
 msgstr "描述："
 
 #.
 #. * Tab for extensions
 #.
-#: src/about.c:344
+#: src/about.c:367
 msgid "Extensions"
-msgstr ""
-
-#: src/about.c:390
-#, c-format
-msgid "libid3tag %s"
-msgstr ""
+msgstr "后缀"
 
-#: src/about.c:394
-#, fuzzy
+#: src/about.c:433
 msgid "MP3 file support"
-msgstr "(MP4/AAC 文件支持被禁止)"
+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
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
 msgid "enabled"
-msgstr ""
+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
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
 msgid "disabled"
-msgstr ""
-
-#: src/about.c:404
-#, c-format
-msgid "id3lib %d.%d.%d"
-msgstr ""
+msgstr "不允许"
 
-#: src/about.c:408
-#, fuzzy
+#: src/about.c:449
 msgid "ID3v2.3 tags writting support"
-msgstr "(MP4/AAC 文件支持被禁止)"
+msgstr "ID3V2.3 标签写入支持"
 
-#: src/about.c:410
+#: src/about.c:452
 msgid "available"
-msgstr ""
+msgstr "可用"
 
-#: src/about.c:420
-#, fuzzy
+#: src/about.c:463
 msgid "Ogg Vorbis file support"
-msgstr "(Ogg Vorbis 文件支持被禁止)"
+msgstr "Ogg Vorbis 文件支持"
 
-#: src/about.c:430
-#, fuzzy
+#: src/about.c:475
 msgid "Speex file support"
-msgstr "(MP4/AAC 文件支持被禁止)"
+msgstr "Speex 文件支持"
 
-#: src/about.c:440
-#, fuzzy
+#: src/about.c:491
 msgid "FLAC file support"
-msgstr "(FLAC 文件支持被禁止)"
+msgstr "FLAC 文件支持"
 
-#: src/about.c:450
-#, fuzzy
+#: src/about.c:504
 msgid "MP4/AAC file support"
-msgstr "(MP4/AAC 文件支持被禁止)"
+msgstr "MP4/AAC 文件支持"
 
-#: src/about.c:460
-#, fuzzy
+#: src/about.c:516
 msgid "WavPack file support"
-msgstr "(MP4/AAC 文件支持被禁止)"
+msgstr "WavPack 文件支持"
 
 #.
 #. * Tab for thanks
 #.
-#: src/about.c:473
+#: src/about.c:531
 msgid "Thanks"
 msgstr "致谢"
 
-#: src/about.c:493
+#: src/about.c:551
 msgid "Translations:\n"
 msgstr "翻译：\n"
 
-#: src/about.c:521
+#: src/about.c:581
 msgid "General:\n"
 msgstr "一般：\n"
 
-#: src/about.c:538
+#: src/about.c:598
 msgid "Changes"
 msgstr "变更"
 
-#: src/about.c:560
-#, fuzzy, c-format
+#: src/about.c:620
+#, c-format
 msgid "Can't open file '%s' (%s)\n"
-msgstr "无法打开文件 “%s” (%s)"
+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
-#, fuzzy, c-format
+#: src/ape_tag.c:74 src/et_core.c:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
+#, c-format
 msgid "ERROR while opening file: '%s' (%s)."
-msgstr "打开文件 “%s” (%s) 时发生错误。"
+msgstr "文件打开时出错： “%s” (%s)。"
 
 #.
 #. * Main Menu Actions
@@ -375,11 +364,11 @@ msgstr "URL 降序"
 
 #: src/bar.c:175
 msgid "Ascending by encoder name"
-msgstr "编码器名称升序"
+msgstr "编码器名升序"
 
 #: src/bar.c:176
 msgid "Descending by encoder name"
-msgstr "编码器名称降序"
+msgstr "编码器名降序"
 
 #: src/bar.c:177
 msgid "Ascending by file type"
@@ -425,7 +414,7 @@ msgstr "采样率降序"
 msgid "Open File(s) with ..."
 msgstr "使用其他程序打开..."
 
-#: src/bar.c:189 src/cddb.c:325
+#: src/bar.c:189 src/cddb.c:326
 msgid "Select All Files"
 msgstr "选择所有文件"
 
@@ -433,7 +422,7 @@ msgstr "选择所有文件"
 msgid "Unselect All Files"
 msgstr "取消选择所有文件"
 
-#: src/bar.c:191 src/cddb.c:332
+#: src/bar.c:191 src/cddb.c:333
 msgid "Invert Files Selection"
 msgstr "反向选择文件"
 
@@ -467,11 +456,11 @@ msgstr "下一个文件"
 
 #: src/bar.c:196
 msgid "_Last File"
-msgstr "最后的文件(_L)"
+msgstr "最后一个文件(_L)"
 
 #: src/bar.c:196
 msgid "Last File"
-msgstr "最后的文件"
+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..
@@ -485,11 +474,11 @@ msgstr "扫描文件"
 
 #: src/bar.c:200
 msgid "_Remove Tag(s)"
-msgstr "删除标签(_R)"
+msgstr "移除标签(_R)"
 
 #: src/bar.c:200
 msgid "Remove Tag(s)"
-msgstr "删除标签"
+msgstr "移除标签"
 
 #: src/bar.c:201
 msgid "_Undo Last File(s) Changes"
@@ -501,7 +490,7 @@ msgstr "撤消最后的文件变更"
 
 #: src/bar.c:202
 msgid "R_edo Last File(s) Changes"
-msgstr "重做最后的文件变更"
+msgstr "重做最后的文件变更(_E)"
 
 #: src/bar.c:202
 msgid "Redo Last File(s) Changes"
@@ -516,14 +505,12 @@ msgid "Save File(s)"
 msgstr "保存文件"
 
 #: src/bar.c:204
-#, fuzzy
 msgid "_Force Saving File(s)"
-msgstr "扫描文件(_C)"
+msgstr "强制保存文件(_F)"
 
 #: src/bar.c:204
-#, fuzzy
 msgid "Force Saving File(s)"
-msgstr "扫描文件"
+msgstr "强制保存文件"
 
 #: src/bar.c:205
 msgid "Undo Last Changes"
@@ -543,7 +530,7 @@ msgstr "退出"
 
 #: src/bar.c:209
 msgid "_Browser"
-msgstr "浏览(_B)"
+msgstr "浏览器(_B)"
 
 #: src/bar.c:210
 msgid "Go to _Home Directory"
@@ -581,7 +568,7 @@ msgstr "重命名目录..."
 msgid "Reload Directory"
 msgstr "重新载入目录"
 
-#: src/bar.c:216 src/browser.c:3641
+#: src/bar.c:216 src/browser.c:4062
 msgid "Browse Directory with ..."
 msgstr "使用其他程序浏览目录..."
 
@@ -595,7 +582,7 @@ msgstr "刷新树(_R)"
 
 #: src/bar.c:220 src/bar.c:249
 msgid "S_canner"
-msgstr "扫描(_C)"
+msgstr "扫描器(_C)"
 
 #: src/bar.c:221
 msgid "_Fill Tag(s) ..."
@@ -615,20 +602,19 @@ msgstr "重命名文件和目录..."
 
 #: src/bar.c:223
 msgid "_Process Field(s) ..."
-msgstr "处理列(_P)..."
+msgstr "处理域(_P)..."
 
 #: src/bar.c:223
 msgid "Process Fields(s) ..."
-msgstr "处理列..."
+msgstr "处理域..."
 
 #: src/bar.c:225
 msgid "_Misc"
 msgstr "其他(_M)"
 
 #: src/bar.c:226
-#, fuzzy
 msgid "Search _File(s) ..."
-msgstr "搜索文件(_E)..."
+msgstr "搜索文件(_F)..."
 
 #: src/bar.c:226
 msgid "Search File(s)..."
@@ -644,7 +630,7 @@ msgstr "CDDB 搜索..."
 
 #: src/bar.c:228
 msgid "Load Filenames from TXT ..."
-msgstr "从文本文件装载文件名..."
+msgstr "从文本文件载入文件名..."
 
 #: src/bar.c:229
 msgid "Write Playlist ..."
@@ -696,7 +682,7 @@ msgstr "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 "清除日志"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
 #: src/bar.c:264
@@ -715,23 +701,23 @@ msgstr "显示树浏览器 / 按艺术家和专辑显示"
 #: src/bar.c:306
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
-msgstr ""
+msgstr "无法合并界面，错误： %s\n"
 
 #: src/bar.c:406
 msgid "Ready to start..."
 msgstr "准备就绪..."
 
-#: src/browser.c:326
+#: src/browser.c:330
 msgid "New default path for files selected"
-msgstr "新的选择文件默认目录"
+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
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
 msgid "Confirm..."
 msgstr "确认..."
 
-#: src/browser.c:713
+#: src/browser.c:722
 msgid ""
 "Some files have been modified but not saved...\n"
 "Do you want to save them before changing the directory?"
@@ -739,114 +725,167 @@ msgstr ""
 "有些文件被更改了但却没有保存...\n"
 "您希望在变更目录前保存它们吗？"
 
-#: src/browser.c:2040
-#, fuzzy
+#: src/browser.c:2164
 msgid "<All albums>"
-msgstr "# 专辑"
+msgstr "<所有专辑>"
 
-#: src/browser.c:2434
+#: src/browser.c:2574
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
-msgstr ""
+msgstr "错误：搜索 “%s”，无法在树中找到节点 %s。"
+
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "树"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "文件名"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "标题"
 
-#: src/browser.c:2801 src/cddb.c:436 src/cddb.c:723 src/misc.c:1960
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
 msgid "Artist"
 msgstr "艺术家"
 
-#: src/browser.c:2801
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "专辑"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "年份"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "音轨"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "流派"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "作曲家"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "原始艺术家"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "版权所有"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "URL"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "使用的编码器"
+
+#: src/browser.c:2947
 msgid "# Albums"
 msgstr "# 专辑"
 
-#: src/browser.c:2801 src/browser.c:2802
+#: src/browser.c:2947 src/browser.c:2948
 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
+#: src/browser.c:2968
 msgid "Go to parent directory"
 msgstr "前往上层目录"
 
-#: src/browser.c:2839
+#: src/browser.c:2985
 msgid "Enter a directory to browse."
 msgstr "键入目录以浏览。"
 
-#: src/browser.c:2914
-msgid "Tree"
-msgstr "树"
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "选择一个目录以浏览！"
 
-#: src/browser.c:2957
+#: src/browser.c:3120
 msgid "Artist & Album"
 msgstr "艺术家 & 专辑"
 
-#: src/browser.c:3206
+#: src/browser.c:3592
 msgid "Rename the directory"
 msgstr "重命名目录"
 
-#: src/browser.c:3222
+#: src/browser.c:3608
 #, c-format
 msgid "Rename the directory '%s' to : "
-msgstr "重命名目录 “%s” 为： "
+msgstr "重命名目录 '%s' 为： "
 
-#: src/browser.c:3241 src/misc.c:1342
+#: src/browser.c:3627 src/misc.c:1268
 msgid "Use mask :"
 msgstr "使用掩码："
 
-#: src/browser.c:3244
+#: src/browser.c:3630
 msgid "If activated, it will use masks to rename directory."
-msgstr "如果激活，则会使用掩码重命名目录。"
+msgstr "如果激活则使用掩码重命名目录。"
 
-#: src/browser.c:3263
+#: src/browser.c:3649
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
-msgstr ""
+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
+#: src/browser.c:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
 msgid "Invalid Scanner Mask"
 msgstr "非法的扫描器掩码"
 
 #. Preview label
-#: src/browser.c:3289
+#: src/browser.c:3675
 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
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
 msgid "Error..."
 msgstr "错误..."
 
-#: src/browser.c:3405
+#: src/browser.c:3795
 msgid "You must type a directory name!"
 msgstr "您必须输入一个目录名！"
 
-#: src/browser.c:3420
+#: src/browser.c:3815
 #, c-format
 msgid "Could not convert '%s' into filename encoding. Please use another name."
-msgstr ""
+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);
+#. msgbox = msg_box_new(_("Confirm..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
 #. g_free(msg);
-#. msg_box_hide_check_button(MSG_BOX(msgbox));
-#. button = msg_box_run(MSG_BOX(msgbox));
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
 #. gtk_widget_destroy(msgbox);
 #.
-#. switch (button)
+#. switch (response)
 #. {
-#. case BUTTON_YES:
+#. case GTK_STOCK_YES:
 #. // Here we must rename all files with the new location, and remove the directory
 #.
 #. Rename_File ()
@@ -855,14 +894,16 @@ msgstr ""
 #. case BUTTON_NO:
 #. break;
 #. }
-#: src/browser.c:3478
+#: src/browser.c:3881
 #, 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
+#: src/browser.c:3922 src/browser.c:3954
 #, c-format
 msgid ""
 "Can't rename directory \n"
@@ -871,295 +912,285 @@ msgid ""
 "'%s'!\n"
 "(%s)"
 msgstr ""
+"无法重命名目录\n"
+"“%s”\n"
+" 为 \n"
+"“%s”！\n"
+"(%s)"
 
-#: src/browser.c:3582
+#: src/browser.c:4003
 msgid "Directory renamed"
-msgstr "目录已重命名"
+msgstr "目录已被重命名"
 
-#: src/browser.c:3660 src/browser.c:3820
+#: src/browser.c:4081 src/browser.c:4241
 msgid "Program to run :"
 msgstr "要运行的程序："
 
-#: src/browser.c:3672
+#: src/browser.c:4093
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
-msgstr ""
+msgstr "键入要运行的程序名。它将以当前目录为参数。"
 
-#: src/browser.c:3801
+#: src/browser.c:4222
 msgid "Open File with ..."
 msgstr "使用其他程序打开文件..."
 
-#: src/browser.c:3832
+#: src/browser.c:4253
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
-msgstr ""
+msgstr "键入要运行的程序名。它将以当前文件为参数。"
 
-#: src/browser.c:3985
+#: src/browser.c:4410
 msgid "You must type a program name!"
 msgstr "您必须输入一个程序名！"
 
-#: src/browser.c:3998 src/misc.c:942
+#: src/browser.c:4424 src/misc.c:868
 #, c-format
 msgid "The program '%s' can't be found!"
-msgstr "程序 “%s” 无法被找到！"
+msgstr "程序 “%s” 未被找到！"
 
-#: src/browser.c:4047 src/misc.c:988
+#: src/browser.c:4479 src/misc.c:914
 #, c-format
 msgid "Can't execute %s (error %d)!\n"
-msgstr ""
+msgstr "无法执行 %s (错误 %d)!\n"
 
-#: src/browser.c:4066 src/misc.c:1027
+#: src/browser.c:4498 src/misc.c:953
 msgid "Can't fork another process!\n"
-msgstr ""
+msgstr "无法创建另一个进程！\n"
 
-#: src/browser.c:4100
+#: src/browser.c:4532
 #, c-format
 msgid "Executed command : '%s %s'"
-msgstr ""
+msgstr "已执行命令： “%s %s”"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 msgid "Artist / Album"
 msgstr "艺术家 / 专辑"
 
-#: src/cddb.c:228
+#: src/cddb.c:229
 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
+#: src/cddb.c:230 src/cddb.c:439
 msgid "Track Name"
 msgstr "音轨名"
 
-#: src/cddb.c:229
+#: src/cddb.c:230
 msgid "Time"
 msgstr "时间"
 
-#: src/cddb.c:240
+#: src/cddb.c:241
 msgid "CD Data Base Search"
 msgstr "CD 数据库搜索"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: src/cddb.c:272
+#: src/cddb.c:273
 msgid "Automatic Search"
 msgstr "自动搜索"
 
-#: src/cddb.c:284
+#: src/cddb.c:285
 msgid "Request CD database :"
-msgstr ""
+msgstr "请求 CD 数据库："
 
-#: src/cddb.c:294
+#: src/cddb.c:295
 msgid ""
 "Request automatically the CDDB database using the selected files (the order "
 "is important!) to generate the CddbID."
-msgstr ""
+msgstr "自动使用所选文件(顺序很重要！)请求 CDDB 数据库生成 CddbID。"
 
-#: src/cddb.c:304 src/cddb.c:414
+#: src/cddb.c:305 src/cddb.c:415
 msgid "Stop the search ..."
 msgstr "停止搜索..."
 
 #. Check box to run the scanner
-#: src/cddb.c:311
+#: src/cddb.c:312
 msgid "Use local Cddb"
-msgstr ""
+msgstr "使用本地 CDDB"
 
-#: src/cddb.c:314 src/cddb.c:768
+#: src/cddb.c:315 src/cddb.c:769
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
-msgstr ""
+msgstr "选项被激活时，装入域以后当前选择的扫描器将运行(扫描器窗口必须已打开)。"
 
 #.
 #. * 2 - Page for manual search
 #.
-#: src/cddb.c:359
+#: src/cddb.c:360
 msgid "Manual Search"
 msgstr "手动搜索"
 
-#: src/cddb.c:374
+#: src/cddb.c:375
 msgid "Words :"
-msgstr "词："
+msgstr "词语："
 
-#: src/cddb.c:386
+#: src/cddb.c:387
 msgid "Enter the words to search (separated by a space or '+')"
-msgstr "键入需要搜索的词 (使用空格或“+”号分隔)"
+msgstr "键入需要搜索的词 (使用空格或 “+” 号分隔)"
 
 #.
 #. * Search options
 #.
-#: src/cddb.c:426
+#: src/cddb.c:427
 msgid "Search In :"
-msgstr "寻找："
+msgstr "搜索："
 
-#: src/cddb.c:434
+#: src/cddb.c:435
 msgid "All Fields"
-msgstr "所有列"
+msgstr "所有域"
 
-#: src/cddb.c:439 src/picture.c:799 src/prefs.c:800
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
 msgid "Other"
 msgstr "其他"
 
-#: src/cddb.c:461
+#: src/cddb.c:462
 msgid "All Categories"
 msgstr "所有类别"
 
-#: src/cddb.c:463
+#: src/cddb.c:464
 msgid "Blues"
-msgstr "蓝调"
+msgstr "Blues"
 
-#: src/cddb.c:464
+#: src/cddb.c:465
 msgid "Classical"
-msgstr "古典"
+msgstr "Classical"
 
-#: src/cddb.c:465
+#: src/cddb.c:466
 msgid "Country"
-msgstr "乡村"
+msgstr "Country"
 
-#: src/cddb.c:466
+#: src/cddb.c:467
 msgid "Folk"
-msgstr "民族"
+msgstr "Folk"
 
-#: src/cddb.c:467
+#: src/cddb.c:468
 msgid "Jazz"
-msgstr "爵士"
+msgstr "Jazz"
 
 #.
 #. * Misc
 #.
-#: src/cddb.c:468 src/prefs.c:236 src/prefs.c:237
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
 msgid "Misc"
-msgstr "其他"
+msgstr "Misc"
 
-#: src/cddb.c:469
+#: src/cddb.c:470
 msgid "Newage"
-msgstr ""
+msgstr "Newage"
 
-#: src/cddb.c:470
+#: src/cddb.c:471
 msgid "Reggae"
-msgstr "雷鬼"
+msgstr "Reggae"
 
-#: src/cddb.c:471
+#: src/cddb.c:472
 msgid "Rock"
-msgstr "摇滚"
+msgstr "Rock"
 
-#: src/cddb.c:472
+#: src/cddb.c:473
 msgid "Soundtrack"
-msgstr "原声"
+msgstr "Soundtrack"
 
-#: src/cddb.c:509
+#: src/cddb.c:510
 msgid "included : funk, soul, rap, pop, industrial, metal, etc."
-msgstr "包括： funk，灵魂，绕舌，流行，工业，重金属，其他。"
+msgstr "包括: funk, soul, rap, pop, industrial, metal, 其它。"
 
-#: src/cddb.c:510
+#: src/cddb.c:511
 msgid "movies, shows"
 msgstr "电影，表演"
 
-#: src/cddb.c:511
+#: src/cddb.c:512
 msgid "others that do not fit in the above categories"
-msgstr "其他不附和上面的类别的"
+msgstr "其他不符合以上类别的"
 
 #. Button to display/hide the categories
-#: src/cddb.c:514
+#: src/cddb.c:515
 msgid " Categories "
-msgstr "类别"
+msgstr " 类别 "
 
 #.
 #. * Results command
 #.
-#: src/cddb.c:522
+#: src/cddb.c:523
 msgid "Results :"
 msgstr "结果："
 
-#: src/cddb.c:529 src/misc.c:2012
+#: src/cddb.c:530 src/misc.c:1963
 msgid "Search :"
 msgstr "搜索："
 
-#: src/cddb.c:542
+#: src/cddb.c:543
 msgid "Enter the words to search in the list below"
-msgstr "输入词在下面的列表中搜索"
+msgstr "输入词语在下面的列表中搜索"
 
-#: src/cddb.c:554
+#: src/cddb.c:555
 msgid "Search Next"
 msgstr "搜索下一个"
 
-#: src/cddb.c:560
+#: src/cddb.c:561
 msgid "Search Previous"
 msgstr "搜索上一个"
 
-#: src/cddb.c:571
-#, fuzzy
+#: src/cddb.c:572
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
-msgstr "只显示红色行 / 显示所有行"
+msgstr "在 “艺术家/专辑” 列表中只显示红色行（或所有行）"
 
-#: src/cddb.c:577 src/cddb.c:1503
+#: src/cddb.c:578 src/cddb.c:1504
 msgid "Unselect all lines"
-msgstr "取消选择所有行"
+msgstr "撤销选择所有行"
 
-#: src/cddb.c:583
+#: src/cddb.c:584
 msgid "Invert lines selection"
 msgstr "反向选择行"
 
-#: src/cddb.c:589 src/cddb.c:1498
+#: src/cddb.c:590 src/cddb.c:1499
 msgid "Select all lines"
 msgstr "选择所有行"
 
-#: src/cddb.c:702
+#: src/cddb.c:703
 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
+#: src/cddb.c:713
 msgid "Set Into :"
-msgstr ""
+msgstr "设置到："
 
-#: src/cddb.c:719
+#: src/cddb.c:720
 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
+#: src/cddb.c:727
 msgid "Track #"
 msgstr "音轨 #"
 
-#: src/cddb.c:727
+#: src/cddb.c:728
 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
+#: src/cddb.c:766 src/misc.c:2964
 msgid "Run the current scanner for each file"
-msgstr ""
+msgstr "每一个文件都运行当前的扫描器"
 
 #. Check box to use DLM (also used in the preferences window)
-#: src/cddb.c:772
+#: src/cddb.c:773
 msgid "Match lines with the Levenshtein algorithm"
-msgstr ""
+msgstr "使用 Levenshtein 算法匹配行"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: src/cddb.c:777 src/prefs.c:1362
+#: src/cddb.c:778 src/prefs.c:1369
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM : Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every file "
@@ -1167,91 +1198,94 @@ msgid ""
 "when selecting the corresponding audio file, or applying cddb results, "
 "instead of using directly the position order."
 msgstr ""
+"此选项激活时，Levenshtein (DLM： Damerau-Levenshtein 矩阵) 算法将被用来匹配当"
+"前目 录中每个文件的 CDDB 标题并选择最佳匹配。在选择音频文件或应用 CDDB 结果时"
+"将被使用， 而 不是直接读取位置顺序。"
 
-#: src/cddb.c:789
+#: src/cddb.c:790
 msgid "Load the selected lines or all lines (if no line selected)."
-msgstr ""
+msgstr "加载所选行或所有行（如果没有行被选中的话）。"
 
-#: src/cddb.c:798 src/misc.c:2255
+#: src/cddb.c:799 src/misc.c:2206
 msgid "Ready to search..."
 msgstr "搜索准备就绪..."
 
-#: src/cddb.c:1318
+#: src/cddb.c:1319
 #, 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:1508
+#: src/cddb.c:1509
 msgid "Invert selection"
 msgstr "反向选择"
 
-#: src/cddb.c:1516
+#: src/cddb.c:1517
 msgid "Sort by Track Number"
 msgstr "按音轨号排序"
 
-#: src/cddb.c:1521
+#: src/cddb.c:1522
 msgid "Sort by Track Name"
 msgstr "按音轨名排序"
 
-#: src/cddb.c:1619
+#: src/cddb.c:1620
 #, c-format
 msgid "Resolving host '%s' ..."
 msgstr "正在解析主机 “%s”..."
 
-#: src/cddb.c:1627
+#: src/cddb.c:1628
 #, c-format
 msgid "Can't resolve host '%s' (%s)!"
 msgstr "无法解析主机 “%s” (%s)！"
 
-#: src/cddb.c:1642
+#: src/cddb.c:1643
 #, c-format
 msgid "Can't create a new socket (%s)!"
-msgstr "无法创建新套接字 (%s)！"
+msgstr "无法创建新的套接字 (%s)！"
 
 #. Open connection to the server
-#: src/cddb.c:1656
+#: src/cddb.c:1657
 #, c-format
 msgid "Connecting to host '%s', port '%d' ..."
 msgstr "正在连接主机 “%s”，端口 “%d” ..."
 
-#: src/cddb.c:1663
+#: src/cddb.c:1664
 #, c-format
 msgid "Can't connect to host '%s' (%s)!"
 msgstr "无法连接主机 “%s” (%s)！"
 
-#: src/cddb.c:1669
+#: src/cddb.c:1670
 #, c-format
 msgid "Connected to host '%s'"
-msgstr "已连接主机 “%s”"
+msgstr "已连接到主机 “%s”"
 
-#: src/cddb.c:1752
+#: src/cddb.c:1753
 #, c-format
 msgid "Receiving data (%s) ..."
-msgstr "接受数据 (%s) ..."
+msgstr "正在接收数据 (%s) ..."
 
-#: src/cddb.c:1764
+#: src/cddb.c:1765
 #, c-format
 msgid "Error when reading cddb response (%s)!"
-msgstr ""
+msgstr "读取 CDDB 响应时发生错误 (%s)！"
 
-#: src/cddb.c:1770
-#, fuzzy, c-format
+#: src/cddb.c:1771
+#, c-format
 msgid "Can't create file '%s' (%s)"
-msgstr "无法打开文件 “%s” (%s)\n"
+msgstr "无法创建文件 “%s” (%s)"
 
-#: src/cddb.c:1813 src/misc.c:3168 src/setting.c:1318
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
 #, 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
+#: src/cddb.c:2249 src/cddb.c:2568 src/cddb.c:3405
 msgid "Sending request ..."
-msgstr "发送请求 ..."
+msgstr "正在发送请求 ..."
 
-#: src/cddb.c:2250 src/cddb.c:2568 src/cddb.c:3125 src/cddb.c:3401
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
 #, c-format
 msgid "Can't send the request (%s)!"
 msgstr "无法发送请求 (%s)！"
@@ -1260,90 +1294,92 @@ msgstr "无法发送请求 (%s)！"
 #. * Read the answer
 #.
 #. Read the answer
-#: src/cddb.c:2272 src/cddb.c:3138 src/cddb.c:3410
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
 msgid "Receiving data ..."
-msgstr "接受数据 ..."
+msgstr "正在接收数据 ..."
 
-#: src/cddb.c:2279 src/cddb.c:2597 src/cddb.c:3145 src/cddb.c:3417
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
 msgid "The server returned a wrong answer!"
-msgstr ""
+msgstr "服务器返回一个错误响应！"
 
-#: src/cddb.c:2293 src/cddb.c:2613 src/cddb.c:3160 src/cddb.c:3432
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
 #, c-format
 msgid "The server returned a wrong answer! (%s)"
-msgstr ""
+msgstr "服务器返回一个错误响应！(%s)"
 
-#: src/cddb.c:2440
+#: src/cddb.c:2443
 msgid "Sorry, the web-based search is currently down!"
-msgstr ""
+msgstr "对不起，基于 Web 的搜索当前不可用！"
 
-#: src/cddb.c:2442 src/cddb.c:2785
+#: src/cddb.c:2445 src/cddb.c:2789
 #, c-format
 msgid "Found %d matching album(s)"
-msgstr "找到 %d 个符合的专辑"
+msgstr "找到 %d 个匹配的专辑"
 
-#: src/cddb.c:2585
-#, fuzzy, c-format
+#: src/cddb.c:2589
+#, c-format
 msgid "Receiving data of page %d (album %d/%d)..."
-msgstr "接受数据 (%s) ..."
+msgstr "正在接收页 %d 中的数据 (专辑 %d/%d)..."
 
-#: src/cddb.c:2587
-#, fuzzy, c-format
+#: src/cddb.c:2591
+#, c-format
 msgid "Receiving data of page %d ..."
-msgstr "接受数据 (%s) ..."
+msgstr "正在接收页 %d 中的数据..."
 
-#: src/cddb.c:2752
+#: src/cddb.c:2756
 msgid "More results to load ..."
-msgstr ""
+msgstr "载入更多结果..."
 
-#: src/cddb.c:2881
+#: src/cddb.c:2885
 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
+#: src/cddb.c:2893
 msgid "More than 99 files selected! Can't send request!"
-msgstr ""
+msgstr "超过 99 个文件被选择！无法发送请求！"
 
-#: src/cddb.c:2895
+#: src/cddb.c:2899
 #, c-format
 msgid "%d file(s) selected!"
-msgstr "%d 个文件被选择"
+msgstr "%d 个文件被选择！"
 
-#: src/cddb.c:2970
-#, fuzzy
+#: src/cddb.c:2974
 msgid "Local CD search..."
-msgstr "搜索准备就绪..."
+msgstr "本地 CD 搜索..."
 
-#: src/cddb.c:2971
+#: src/cddb.c:2978
+#, fuzzy
 msgid ""
 "The path for 'Local CD Data Base' wasn't defined!\n"
-"Fill it in the preferences window."
+"Fill it in the preferences window before to use this search."
 msgstr ""
+"“本地 CD 数据库” 路径未设置！\n"
+"请在首选项窗口中设置。"
 
 #. g_print("Request : '%s'\n", cddb_in);
-#: src/cddb.c:3115
+#: src/cddb.c:3123
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
-msgstr ""
+msgstr "正在发送请求 (CddbId： %s， 音轨数： %d， 时长： %d)..."
 
-#: src/cddb.c:3268
-#, fuzzy, c-format
+#: src/cddb.c:3276
+#, c-format
 msgid "Found %d matching album(s) for DiscID '%s'"
-msgstr "找到 %d 个符合的专辑"
+msgstr "发现 %d 个专辑匹配 DiscID “%s”"
 
-#: src/cddb.c:3364
-#, fuzzy, c-format
+#: src/cddb.c:3372
+#, c-format
 msgid "Can't load file: '%s' (%s)!"
-msgstr "无法打开文件 “%s” (%s)"
+msgstr "无法加载文件：“%s” (%s)！"
 
 #. Load the track list of the album
-#: src/cddb.c:3622
+#: src/cddb.c:3630
 msgid "Loading album track list ..."
 msgstr "正在载入专辑音轨列表 ..."
 
-#: src/cddb.c:3797
+#: src/cddb.c:3827
 #, c-format
 msgid ""
 "Be careful, you are applying %d lines of the CDDB results to %d lines in the "
@@ -1351,50 +1387,53 @@ msgid ""
 "\n"
 "Do you want to continue ?"
 msgstr ""
+"请小心，您正在应用 %d 行的 CDDB 搜寻结果到 %d 行的文件列表！\n"
+"\n"
+"您是否要继续？"
 
-#: src/cddb.c:3800
+#: src/cddb.c:3830
 msgid "Write Tag from CDDB..."
-msgstr "从 CDDB 写入标签"
+msgstr "从 CDDB 写入标签..."
 
 #: src/charset.c:49
 msgid "Arabic (IBM-864)"
-msgstr ""
+msgstr "Arabic (IBM-864)"
 
 #: src/charset.c:50
 msgid "Arabic (ISO-8859-6)"
-msgstr ""
+msgstr "Arabic (ISO-8859-6)"
 
 #: src/charset.c:51
 msgid "Arabic (Windows-1256)"
-msgstr ""
+msgstr "Arabic (Windows-1256)"
 
 #: src/charset.c:52
 msgid "Baltic (ISO-8859-13)"
-msgstr ""
+msgstr "Baltic (ISO-8859-13)"
 
 #: src/charset.c:53
 msgid "Baltic (ISO-8859-4)"
-msgstr ""
+msgstr "Baltic (ISO-8859-4)"
 
 #: src/charset.c:54
 msgid "Baltic (Windows-1257)"
-msgstr ""
+msgstr "Baltic (Windows-1257)"
 
 #: src/charset.c:55
 msgid "Celtic (ISO-8859-14)"
-msgstr ""
+msgstr "Celtic (ISO-8859-14)"
 
 #: src/charset.c:56
 msgid "Central European (IBM-852)"
-msgstr ""
+msgstr "Central European (IBM-852)"
 
 #: src/charset.c:57
 msgid "Central European (ISO-8859-2)"
-msgstr ""
+msgstr "Central European (ISO-8859-2)"
 
 #: src/charset.c:58
 msgid "Central European (Windows-1250)"
-msgstr ""
+msgstr "Central European (Windows-1250)"
 
 #: src/charset.c:59
 msgid "Chinese Simplified (GB18030)"
@@ -1414,96 +1453,96 @@ msgstr "繁体中文 (Big5-HKSCS)"
 
 #: src/charset.c:63
 msgid "Cyrillic (IBM-855)"
-msgstr ""
+msgstr "Cyrillic (IBM-855)"
 
 #: src/charset.c:64
 msgid "Cyrillic (ISO-8859-5)"
-msgstr ""
+msgstr "Cyrillic (ISO-8859-5)"
 
 #: src/charset.c:65
 msgid "Cyrillic (ISO-IR-111)"
-msgstr ""
+msgstr "Cyrillic (ISO-IR-111)"
 
 #: src/charset.c:66
 msgid "Cyrillic (KOI8-R)"
-msgstr ""
+msgstr "Cyrillic (KOI8-R)"
 
 #: src/charset.c:67
 msgid "Cyrillic (Windows-1251)"
-msgstr ""
+msgstr "Cyrillic (Windows-1251)"
 
 #: src/charset.c:68
 msgid "Cyrillic/Russian (CP-866)"
-msgstr ""
+msgstr "Cyrillic/Russian (CP-866)"
 
 #: src/charset.c:69
 msgid "Cyrillic/Ukrainian (KOI8-U)"
-msgstr ""
+msgstr "Cyrillic/Ukrainian (KOI8-U)"
 
 #: src/charset.c:70
 msgid "English (US-ASCII)"
-msgstr ""
+msgstr "English (US-ASCII)"
 
 #: src/charset.c:71
 msgid "Greek (ISO-8859-7)"
-msgstr ""
+msgstr "Greek (ISO-8859-7)"
 
 #: src/charset.c:72
 msgid "Greek (Windows-1253)"
-msgstr ""
+msgstr "Greek (Windows-1253)"
 
 #: src/charset.c:73
 msgid "Hebrew (IBM-862)"
-msgstr ""
+msgstr "Hebrew (IBM-862)"
 
 #: src/charset.c:74
 msgid "Hebrew (Windows-1255)"
-msgstr ""
+msgstr "Hebrew (Windows-1255)"
 
 #: src/charset.c:75
 msgid "Japanese (EUC-JP)"
-msgstr ""
+msgstr "Japanese (EUC-JP)"
 
 #: src/charset.c:76
 msgid "Japanese (ISO-2022-JP)"
-msgstr ""
+msgstr "Japanese (ISO-2022-JP)"
 
 #: src/charset.c:77
 msgid "Japanese (Shift_JIS)"
-msgstr ""
+msgstr "Japanese (Shift_JIS)"
 
 #: src/charset.c:78
 msgid "Korean (EUC-KR)"
-msgstr ""
+msgstr "Korean (EUC-KR)"
 
 #: src/charset.c:79
 msgid "Nordic (ISO-8859-10)"
-msgstr ""
+msgstr "Nordic (ISO-8859-10)"
 
 #: src/charset.c:80
 msgid "South European (ISO-8859-3)"
-msgstr ""
+msgstr "South European (ISO-8859-3)"
 
 #: src/charset.c:81
 msgid "Thai (TIS-620)"
-msgstr ""
+msgstr "Thai (TIS-620)"
 
 #: src/charset.c:82
 msgid "Turkish (IBM-857)"
-msgstr ""
+msgstr "Turkish (IBM-857)"
 
 #: src/charset.c:83
 msgid "Turkish (ISO-8859-9)"
-msgstr ""
+msgstr "Turkish (ISO-8859-9)"
 
 #: src/charset.c:84
 msgid "Turkish (Windows-1254)"
-msgstr ""
+msgstr "Turkish (Windows-1254)"
 
 #. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
 #: src/charset.c:86
 msgid "Unicode (UTF-8)"
-msgstr ""
+msgstr "Unicode (UTF-8)"
 
 #. {N_("Unicode (UTF-16BE)"),                "UTF-16BE"      },
 #. {N_("Unicode (UTF-16LE)"),                "UTF-16LE"      },
@@ -1511,523 +1550,525 @@ msgstr ""
 #. {N_("Unicode (UTF-32LE)"),                "UTF-32LE"      },
 #: src/charset.c:93
 msgid "Vietnamese (VISCII)"
-msgstr ""
+msgstr "Vietnamese (VISCII)"
 
 #: src/charset.c:94
 msgid "Vietnamese (Windows-1258)"
-msgstr ""
+msgstr "Vietnamese (Windows-1258)"
 
 #: src/charset.c:95
 msgid "Visual Hebrew (ISO-8859-8)"
-msgstr ""
+msgstr "Visual Hebrew (ISO-8859-8)"
 
 #: src/charset.c:96
 msgid "Western (IBM-850)"
-msgstr ""
+msgstr "Western (IBM-850)"
 
 #: src/charset.c:97
 msgid "Western (ISO-8859-1)"
-msgstr ""
+msgstr "Western (ISO-8859-1)"
 
 #: src/charset.c:98
 msgid "Western (ISO-8859-15)"
-msgstr ""
+msgstr "Western (ISO-8859-15)"
 
 #: src/charset.c:99
 msgid "Western (Windows-1252)"
-msgstr ""
+msgstr "Western (Windows-1252)"
 
-#: src/charset.c:542
-#, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s).\n"
-msgstr ""
+#: src/charset.c:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
+msgstr "文件名 “%s” 无法被转换为 UTF-8 (%s)。\n"
 
-#: src/charset.c:543 src/charset.c:642 src/charset.c:706
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
 msgid "Invalid UTF-8"
 msgstr "非法 UTF-8"
 
-#: src/charset.c:641
-#, c-format
+#: src/charset.c:642
+#, fuzzy, c-format
 msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"
-msgstr ""
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
+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 ""
+#: src/charset.c:706
+#, fuzzy, c-format
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
+msgstr "字符串 “%s” 无法被转换为 UTF-8 (%s)。\n"
 
 #. Starting messages
-#: src/easytag.c:177
-#, fuzzy, c-format
+#: src/easytag.c:179
+#, c-format
 msgid "Starting EasyTAG %s (PId: %d) ..."
-msgstr "正在启动 EasyTAG %s (PId：%d) ...\n"
+msgstr "正在启动 EasyTAG %s (PId：%d) ..."
 
-#: src/easytag.c:179
-#, fuzzy, c-format
+#: src/easytag.c:181
+#, c-format
 msgid "Currently using libid3tag version %s ..."
-msgstr "当前使用的 id3lib 版本 %d.%d.%d ...\n"
+msgstr "当前使用的 libid3tag 库版本 %s ..."
 
-#: src/easytag.c:182
-#, fuzzy, c-format
+#: src/easytag.c:184
+#, c-format
 msgid "Currently using id3lib version %d.%d.%d ..."
-msgstr "当前使用的 id3lib 版本 %d.%d.%d ...\n"
+msgstr "当前使用的 id3lib 库版本 %d.%d.%d ..."
 
-#: src/easytag.c:189
+#: src/easytag.c:191
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
-msgstr ""
+msgstr "变量 EASYTAGLANG 已定义。设置本地区域为： “%s”"
 
-#: src/easytag.c:191
-#, fuzzy, c-format
+#: src/easytag.c:193
+#, c-format
 msgid "Setting locale : '%s'"
-msgstr "正在重命名文件 “%s”"
+msgstr "设置本地区域为： “%s”"
 
-#: src/easytag.c:195
+#: src/easytag.c:197
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')..."
-msgstr ""
+msgstr "Currently using locale '%s' (and eventually '%s')..."
 
-#: src/easytag.c:211
+#: src/easytag.c:213
 #, c-format
 msgid "%s %s by %s (compiled %s, %s)\n"
-msgstr ""
+msgstr "%s %s by %s (compiled %s, %s)\n"
 
-#: src/easytag.c:213
+#: src/easytag.c:215
 #, c-format
 msgid "Web Page: %s"
 msgstr "网址： %s"
 
-#: src/easytag.c:288
+#: src/easytag.c:290
 #, c-format
 msgid "Unknown parameter or path '%s'\n"
-msgstr ""
+msgstr "未知的参数或路径 “%s”\n"
 
 #.
 #. * Browser
 #.
-#: src/easytag.c:402 src/prefs.c:145 src/prefs.c:146
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
 msgid "Browser"
-msgstr "浏览"
+msgstr "浏览器"
 
-#: src/easytag.c:424 src/et_core.c:2605
+#: src/easytag.c:436 src/et_core.c:2614
 msgid "File"
 msgstr "文件"
 
-#: src/easytag.c:450
+#: src/easytag.c:462
 msgid "Read Only File"
 msgstr "只读文件"
 
-#: src/easytag.c:453
+#: src/easytag.c:465
 msgid "File Link Broken"
-msgstr ""
+msgstr "断裂的文件链接"
 
 #. Default values are MPs data
 #. MPEG, Layer versions
-#: src/easytag.c:467 src/easytag.c:4066 src/mpeg_header.c:354
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
 msgid "MPEG"
-msgstr ""
+msgstr "MPEG"
 
-#: src/easytag.c:469 src/easytag.c:4067
+#: src/easytag.c:481 src/easytag.c:4185
 msgid "?, Layer ?"
-msgstr ""
+msgstr "?，层 ?"
 
-#: src/easytag.c:474
+#: src/easytag.c:486
 msgid "Bitrate:"
 msgstr "比特率："
 
-#: src/easytag.c:476 src/easytag.c:4068
+#: src/easytag.c:488 src/easytag.c:4186
 msgid "? kb/s"
-msgstr ""
+msgstr "? kb/s"
 
-#: src/easytag.c:481
+#: src/easytag.c:493
 msgid "Freq:"
 msgstr "频率："
 
-#: src/easytag.c:483 src/easytag.c:4069
+#: src/easytag.c:495 src/easytag.c:4187
 msgid "? Hz"
-msgstr ""
+msgstr "? Hz"
 
 #. Mode
-#: src/easytag.c:491 src/easytag.c:4070 src/mpeg_header.c:377
+#: src/easytag.c:503 src/easytag.c:4188 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
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
 msgid "?"
-msgstr ""
+msgstr "?"
 
-#: src/easytag.c:498
+#: src/easytag.c:510
 msgid "Size:"
 msgstr "大小："
 
-#: src/easytag.c:500
+#: src/easytag.c:512
 msgid "? kb"
-msgstr ""
+msgstr "? kb"
 
-#: src/easytag.c:505
+#: src/easytag.c:517
 msgid "Time:"
 msgstr "时间："
 
 #. Main Frame
-#: src/easytag.c:551 src/et_core.c:2543
+#: src/easytag.c:563 src/et_core.c:2552
 msgid "Tag"
 msgstr "标签"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: src/easytag.c:573
+#: src/easytag.c:585
 msgid "Common"
 msgstr "一般"
 
 #. Title
-#: src/easytag.c:585
+#: src/easytag.c:597
 msgid "Title:"
 msgstr "标题："
 
-#: src/easytag.c:598
+#: src/easytag.c:610
 msgid "Tag selected files with this title"
-msgstr ""
+msgstr "以此标题标志所选文件"
 
 #. Artist
-#: src/easytag.c:605
+#: src/easytag.c:617
 msgid "Artist:"
 msgstr "艺术家："
 
-#: src/easytag.c:617
+#: src/easytag.c:629
 msgid "Tag selected files with this artist"
-msgstr ""
+msgstr "以此艺术家标志所选文件"
 
 #. Album
-#: src/easytag.c:623
+#: src/easytag.c:635
 msgid "Album:"
 msgstr "专辑："
 
-#: src/easytag.c:636
+#: src/easytag.c:648
 msgid "Tag selected files with this album name"
-msgstr ""
+msgstr "以此专辑名标志所选文件"
 
 #. Disc Number
-#: src/easytag.c:642
-#, fuzzy
+#: src/easytag.c:654
 msgid "CD:"
-msgstr "光盘"
+msgstr "光盘："
 
-#: src/easytag.c:658
+#: src/easytag.c:670
 msgid "Tag selected files with this disc number"
-msgstr ""
+msgstr "以此光盘号标志所选文件"
 
 #. Year
-#: src/easytag.c:664
+#: src/easytag.c:676
 msgid "Year:"
 msgstr "年份："
 
-#: src/easytag.c:681
+#: src/easytag.c:693
 msgid "Tag selected files with this year"
-msgstr ""
+msgstr "以此年份标志所选文件"
 
-#: src/easytag.c:693
+#: src/easytag.c:705
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
+"Number selected tracks sequentially. Starts at 01 in each subdirectory."
 
 #. To have enought space to display the icon
 #. To have enought space to display the icon
-#: src/easytag.c:702
+#: src/easytag.c:714
 msgid "Track #:"
 msgstr "音轨 #："
 
-#: src/easytag.c:728
+#: src/easytag.c:740
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
-msgstr ""
+msgstr "将相同目录中显示的文件数号码作为所选音轨。"
 
-#: src/easytag.c:747
+#: src/easytag.c:759
 msgid "Tag selected files with this number of tracks"
-msgstr ""
+msgstr "以此音轨数标志所选文件"
 
 #. Genre
-#: src/easytag.c:753
+#: src/easytag.c:765
 msgid "Genre:"
 msgstr "流派："
 
-#: src/easytag.c:778
+#: src/easytag.c:790
 msgid "Tag selected files with this genre"
-msgstr ""
+msgstr "以此流派标志所选文件"
 
 #. Comment
-#: src/easytag.c:784
+#: src/easytag.c:796
 msgid "Comment:"
 msgstr "备注："
 
-#: src/easytag.c:809
+#: src/easytag.c:821
 msgid "Tag selected files with this comment"
-msgstr ""
+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
+#: src/easytag.c:830
 msgid "Composer:"
-msgstr "作曲："
+msgstr "作曲家："
 
-#: src/easytag.c:830
+#: src/easytag.c:842
 msgid "Tag selected files with this composer"
-msgstr ""
+msgstr "以此作曲家标志所选文件"
 
 #. Original Artist / Performer
-#: src/easytag.c:837
+#: src/easytag.c:849
 msgid "Orig. Artist:"
 msgstr "原始艺术家："
 
-#: src/easytag.c:849
+#: src/easytag.c:861
 msgid "Tag selected files with this original artist"
-msgstr ""
+msgstr "以此原始艺术家标志所选文件"
 
 #. Copyright
-#: src/easytag.c:856
+#: src/easytag.c:868
 msgid "Copyright:"
 msgstr "版权所有："
 
-#: src/easytag.c:868
+#: src/easytag.c:880
 msgid "Tag selected files with this copyright"
-msgstr ""
+msgstr "以此版权标志所选文件"
 
 #. URL
-#: src/easytag.c:875
+#: src/easytag.c:887
 msgid "URL:"
-msgstr ""
+msgstr "URL："
 
-#: src/easytag.c:887
+#: src/easytag.c:899
 msgid "Tag selected files with this URL"
-msgstr ""
+msgstr "以此 URL 标志所选文件"
 
 #. Encoded by
-#: src/easytag.c:894
+#: src/easytag.c:906
 msgid "Encoded by:"
 msgstr "使用的编码器："
 
-#: src/easytag.c:906
+#: src/easytag.c:918
 msgid "Tag selected files with this encoder name"
-msgstr ""
+msgstr "以此编码器名标志所选文件"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: src/easytag.c:966
+#: src/easytag.c:978
 msgid "Pictures"
 msgstr "图片"
 
 #. Picture
-#: src/easytag.c:977
+#: src/easytag.c:989
 msgid "Pictures:"
-msgstr "图片"
+msgstr "图片："
 
-#: src/easytag.c:997
+#: src/easytag.c:1009
 msgid "You can use drag and drop to add picture."
 msgstr "您可以使用拖放操作增加图片。"
 
-#: src/easytag.c:1035
+#: src/easytag.c:1047
 msgid "Tag selected files with these pictures"
-msgstr ""
+msgstr "以此图片标志所选文件"
 
-#: src/easytag.c:1045
+#: src/easytag.c:1057
 msgid "Add pictures to the tag (drag and drop is also available)."
-msgstr ""
+msgstr "为标签增加图片 (可使用拖放操作)。"
 
-#: src/easytag.c:1051
+#: src/easytag.c:1063
 msgid "Remove selected pictures, else all pictures."
-msgstr ""
+msgstr "删除所选图片，否则删除全部图片。"
 
-#: src/easytag.c:1061
+#: src/easytag.c:1073
 msgid "Save the selected pictures on the hard disk."
-msgstr ""
+msgstr "保存所选图片至硬盘。"
 
-#: src/easytag.c:1068
+#: src/easytag.c:1080
 msgid "Set properties of the selected pictures."
-msgstr ""
+msgstr "为所选图片设置属性。"
 
-#: src/easytag.c:1148
+#: src/easytag.c:1160
 #, c-format
 msgid "Selected files tagged with title '%s'."
-msgstr ""
+msgstr "选择标题被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1150
+#: src/easytag.c:1162
 msgid "Removed title from selected files."
-msgstr ""
+msgstr "从所选文件中移除标题。"
 
-#: src/easytag.c:1167
+#: src/easytag.c:1179
 #, c-format
 msgid "Selected files tagged with artist '%s'."
-msgstr ""
+msgstr "选择艺术家被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1169
+#: src/easytag.c:1181
 msgid "Removed artist from selected files."
-msgstr ""
+msgstr "从所选文件中移除艺术家。"
 
-#: src/easytag.c:1186
+#: src/easytag.c:1198
 #, c-format
 msgid "Selected files tagged with album '%s'."
-msgstr ""
+msgstr "选择专辑被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1188
+#: src/easytag.c:1200
 msgid "Removed album name from selected files."
-msgstr ""
+msgstr "从所选文件中移除专辑名。"
 
-#: src/easytag.c:1205
+#: src/easytag.c:1217
 #, c-format
 msgid "Selected files tagged with disc number '%s'."
-msgstr ""
+msgstr "碟片号码被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1207
+#: src/easytag.c:1219
 msgid "Removed disc number from selected files."
-msgstr ""
+msgstr "从所选文件中移除碟片号码。"
 
-#: src/easytag.c:1224
+#: src/easytag.c:1236
 #, c-format
 msgid "Selected files tagged with year '%s'."
-msgstr ""
+msgstr "选择年份被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1226
+#: src/easytag.c:1238
 msgid "Removed year from selected files."
-msgstr ""
+msgstr "从所选文件中移除年份。"
 
-#: src/easytag.c:1254 src/easytag.c:1350
+#: src/easytag.c:1266 src/easytag.c:1362
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
-msgstr ""
+msgstr "选择音轨被标志为像 “xx/%s” 的文件。"
 
-#: src/easytag.c:1257
+#: src/easytag.c:1269
 msgid "Selected files tagged with track like 'xx'."
-msgstr ""
+msgstr "选择音轨被标志为像 “xx” 的文件。"
 
-#: src/easytag.c:1261 src/easytag.c:1353
+#: src/easytag.c:1273 src/easytag.c:1365
 msgid "Removed track number from selected files."
-msgstr ""
+msgstr "从所选文件中移除音轨号。"
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: src/easytag.c:1319
+#: src/easytag.c:1331
 msgid "Selected tracks numbered sequentially."
-msgstr ""
+msgstr "Selected tracks numbered sequentially."
 
-#: src/easytag.c:1371
+#: src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with genre '%s'."
-msgstr ""
+msgstr "选择流派被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1373
+#: src/easytag.c:1385
 msgid "Removed genre from selected files."
-msgstr ""
+msgstr "从所选文件中移除流派。"
 
-#: src/easytag.c:1397
+#: src/easytag.c:1409
 #, c-format
 msgid "Selected files tagged with comment '%s'."
-msgstr ""
+msgstr "选择备注被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1399
+#: src/easytag.c:1411
 msgid "Removed comment from selected files."
-msgstr ""
+msgstr "从所选文件中移除备注。"
 
-#: src/easytag.c:1416
+#: src/easytag.c:1428
 #, c-format
 msgid "Selected files tagged with composer '%s'."
-msgstr ""
+msgstr "选择作曲家被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1418
+#: src/easytag.c:1430
 msgid "Removed composer from selected files."
-msgstr ""
+msgstr "从所选文件中移除作曲家。"
 
-#: src/easytag.c:1435
+#: src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
-msgstr ""
+msgstr "选择原始艺术家被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1437
+#: src/easytag.c:1449
 msgid "Removed original artist from selected files."
-msgstr ""
+msgstr "从所选文件中移除原始艺术家。"
 
-#: src/easytag.c:1454
+#: src/easytag.c:1466
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
-msgstr ""
+msgstr "选择版权被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1456
+#: src/easytag.c:1468
 msgid "Removed copyright from selected files."
-msgstr ""
+msgstr "从所选文件中移除版权。"
 
-#: src/easytag.c:1473
+#: src/easytag.c:1485
 #, c-format
 msgid "Selected files tagged with URL '%s'."
-msgstr ""
+msgstr "选择 URL 被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1475
+#: src/easytag.c:1487
 msgid "Removed URL from selected files."
-msgstr ""
+msgstr "从所选文件中移除 URL。"
 
-#: src/easytag.c:1492
+#: src/easytag.c:1504
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
-msgstr ""
+msgstr "选择编码器被标志为 “%s” 的文件。"
 
-#: src/easytag.c:1494
+#: src/easytag.c:1506
 msgid "Removed encoder name from selected files."
-msgstr ""
+msgstr "从所选文件中移除编码器名。"
 
-#: src/easytag.c:1529
+#: src/easytag.c:1541
 msgid "Selected files tagged with pictures."
-msgstr ""
+msgstr "选择被标注为拥有图片的文件。"
 
-#: src/easytag.c:1531
+#: src/easytag.c:1543
 msgid "Removed pictures from selected files."
-msgstr ""
+msgstr "从所选文件中移除图片。"
 
-#: src/easytag.c:1770
+#: src/easytag.c:1782
 msgid "Select Mode and Mask, and redo the same action"
-msgstr ""
+msgstr "选择模式与掩码，并重做相同动作。"
 
-#: src/easytag.c:1825
+#: src/easytag.c:1837
 msgid "All tags have been scanned"
-msgstr ""
+msgstr "所有标签都已扫描"
 
-#: src/easytag.c:1882
+#: src/easytag.c:1894
 msgid "All tags have been removed"
-msgstr ""
+msgstr "所有标签都已移除"
 
-#: src/easytag.c:2177 src/easytag.c:2200
+#: src/easytag.c:2189 src/easytag.c:2212
 msgid "All files have been saved..."
-msgstr ""
+msgstr "所有文件都已保存..."
 
-#: src/easytag.c:2198
+#: src/easytag.c:2210
 msgid "Files have been partially saved..."
-msgstr ""
+msgstr "文件部分被保存..."
 
-#: src/easytag.c:2348
+#: src/easytag.c:2360
 msgid "Files have been partially deleted..."
-msgstr ""
+msgstr "文件部分被删除..."
 
-#: src/easytag.c:2350
+#: src/easytag.c:2362
 msgid "All files have been deleted..."
-msgstr ""
+msgstr "所有文件都已删除..."
 
-#: src/easytag.c:2422
+#: src/easytag.c:2435
 #, 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
+#: src/easytag.c:2439 src/easytag.c:2452
 msgid "Write Tag..."
-msgstr ""
+msgstr "写入标签..."
 
 #. Directories and filename changed
-#: src/easytag.c:2488
+#: src/easytag.c:2516
 msgid "Rename File and Directory..."
-msgstr ""
+msgstr "重命名文件与目录..."
 
-#: src/easytag.c:2489
+#: src/easytag.c:2517
 #, c-format
 msgid ""
 "Do you want to rename the file and directory \n"
@@ -2035,13 +2076,17 @@ msgid ""
 "to \n"
 "'%s' ?"
 msgstr ""
+"您是否想重命名文件与目录\n"
+"“%s”\n"
+"为 \n"
+"“%s”？"
 
 #. Only directories changed
-#: src/easytag.c:2494
+#: src/easytag.c:2522
 msgid "Rename Directory..."
 msgstr "重命名目录..."
 
-#: src/easytag.c:2495
+#: src/easytag.c:2523
 #, c-format
 msgid ""
 "Do you want to rename the directory \n"
@@ -2049,17 +2094,17 @@ msgid ""
 "to \n"
 "'%s' ?"
 msgstr ""
-"您是否想要重命名目录 \n"
+"您是否想重命名目录 \n"
 "“%s”\n"
 "为 \n"
-"“%s” ？"
+"“%s”？"
 
 #. Only filename changed
-#: src/easytag.c:2501
+#: src/easytag.c:2529
 msgid "Rename File..."
 msgstr "重命名文件..."
 
-#: src/easytag.c:2502
+#: src/easytag.c:2530
 #, c-format
 msgid ""
 "Do you want to rename the file \n"
@@ -2067,36 +2112,38 @@ msgid ""
 "to \n"
 "'%s' ?"
 msgstr ""
-"您是否想要重命名文件 \n"
+"您是否想重命名文件 \n"
 "“%s”\n"
 "为 \n"
-"“%s” ？"
+"“%s”？"
 
-#: src/easytag.c:2571
+#: src/easytag.c:2613
 #, c-format
 msgid "Writing tag of '%s'"
-msgstr ""
+msgstr "正在写入 “%s” 的标签"
 
-#: src/easytag.c:2577
+#: src/easytag.c:2619
 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
+#: src/easytag.c:2628 src/easytag.c:2633
 #, c-format
 msgid ""
 "Can't write tag in file '%s'!\n"
 "(%s)"
 msgstr ""
+"无法写入文件 “%s” 的标签！\n"
+"(%s)"
 
-#: src/easytag.c:2717
+#: src/easytag.c:2765
 #, 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
+#: src/easytag.c:2785 src/easytag.c:2823 src/easytag.c:3031
 #, c-format
 msgid ""
 "Can't rename file '%s'\n"
@@ -2104,12 +2151,16 @@ msgid ""
 "'%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
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
 msgid "File(s) not renamed..."
-msgstr ""
+msgstr "文件未被重命名..."
 
-#: src/easytag.c:2784
+#: src/easytag.c:2844
 #, c-format
 msgid ""
 "Can't rename file \n"
@@ -2117,45 +2168,55 @@ msgid ""
 "because the following file already exists:\n"
 "'%s'"
 msgstr ""
+"无法重命名文件 \n"
+"“%s”\n"
+"因为此文件已存在：\n"
+"“%s”"
 
-#: src/easytag.c:2816
+#: src/easytag.c:2882
 #, 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
+#: src/easytag.c:2910
 #, c-format
 msgid "Renamed file '%s' to '%s'"
-msgstr ""
+msgstr "已重命名文件 “%s” 为 “%s”"
 
-#: src/easytag.c:2844
+#: src/easytag.c:2916
 msgid "File(s) renamed..."
-msgstr ""
+msgstr "文件已被改名..."
 
-#: src/easytag.c:2854 src/easytag.c:2901
+#: src/easytag.c:2926 src/easytag.c:2979
 #, 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
+#: src/easytag.c:2963
 #, c-format
 msgid "Moved file '%s' to '%s'"
-msgstr ""
+msgstr "已移动文件 “%s” 到 “%s”"
 
-#: src/easytag.c:2891
+#: src/easytag.c:2969
 msgid "File(s) moved..."
-msgstr ""
+msgstr "文件已移动..."
 
 #. Moving file has failed
-#: src/easytag.c:2923
+#: src/easytag.c:3007
 #, c-format
 msgid ""
 "Can't move file '%s'\n"
@@ -2163,151 +2224,163 @@ msgid ""
 "'%s'!\n"
 "(%s)"
 msgstr ""
+"无法移动文件 “%s”\n"
+" 到 \n"
+"“%s”！\n"
+"(%s)"
 
-#: src/easytag.c:2931
+#: src/easytag.c:3021
 msgid "File(s) not moved..."
-msgstr ""
+msgstr "文件未移动..."
 
-#: src/easytag.c:2983
+#: src/easytag.c:3080
 #, 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
+#: src/easytag.c:3083 src/easytag.c:3096
 msgid "Delete File..."
 msgstr "删除文件..."
 
-#: src/easytag.c:3012
+#: src/easytag.c:3124
 #, c-format
 msgid "File '%s' deleted"
 msgstr "文件 “%s” 已删除"
 
-#: src/easytag.c:3147
+#: src/easytag.c:3259
 #, c-format
 msgid ""
 "Can't read directory :\n"
 "'%s'\n"
 "(%s)"
 msgstr ""
+"无法读取目录：\n"
+"“%s”\n"
+"(%s)"
 
 #. Read the directory recursively
-#: src/easytag.c:3170
+#: src/easytag.c:3287
 msgid "Search in progress..."
 msgstr "搜索进行中..."
 
-#: src/easytag.c:3187 src/et_core.c:2612
+#: src/easytag.c:3304 src/et_core.c:2621
 #, c-format
 msgid "File: '%s'"
 msgstr "文件： “%s”"
 
-#: src/easytag.c:3237
+#: src/easytag.c:3354
 #, c-format
 msgid "Found %d file(s) in this directory and subdirectories."
-msgstr ""
+msgstr "在此目录与其子目录中找到 %d 个文件。"
 
-#: src/easytag.c:3239
+#: src/easytag.c:3356
 #, c-format
 msgid "Found %d file(s) in this directory."
-msgstr ""
+msgstr "在此目录中找到 %d 个文件。"
 
 #. And refresh the number of files in this directory
-#: src/easytag.c:3252 src/et_core.c:2696
+#: src/easytag.c:3369 src/et_core.c:2705
 #, c-format
 msgid "%u file(s)"
-msgstr ""
+msgstr "%u 个文件"
 
-#: src/easytag.c:3258
+#: src/easytag.c:3375
 msgid "No file found in this directory and subdirectories!"
-msgstr ""
+msgstr "在此目录与其子目录中未发现文件！"
 
-#: src/easytag.c:3260
+#: src/easytag.c:3377
 msgid "No file found in this directory!"
-msgstr ""
+msgstr "在此目录中未发现文件！"
 
-#: src/easytag.c:3348
+#: src/easytag.c:3465
 msgid "Searching..."
 msgstr "正在搜索..."
 
 #. Button to stop...
-#: src/easytag.c:3368
+#: src/easytag.c:3485
 msgid "  STOP the search...  "
-msgstr " 停止搜索... "
+msgstr "  停止搜索...  "
 
 #. Open the last selected scanner
-#: src/easytag.c:4093
+#: src/easytag.c:4211
 msgid "Select a directory to browse!"
-msgstr "选择目录以浏览！"
+msgstr "选择一个目录以浏览！"
 
 #. Menu items
-#: src/easytag.c:4229
+#: src/easytag.c:4347
 msgid "Tag selected files with this field"
-msgstr ""
+msgstr "以此域标志所选文件"
 
-#: src/easytag.c:4240
+#: src/easytag.c:4358
 msgid "Convert '_' and '%20' to spaces"
-msgstr ""
+msgstr "转换 “_” 和 “%20” 为空格"
 
-#: src/easytag.c:4247 src/scan.c:2245
+#: src/easytag.c:4365 src/scan.c:2314
 msgid "Convert ' ' to '_'"
 msgstr "转换 “ ” 为 “_”"
 
 #. Group: capitalize, ...
-#: src/easytag.c:4258 src/scan.c:2294
+#: src/easytag.c:4376 src/scan.c:2363
 msgid "All uppercase"
 msgstr "所有字母大写"
 
-#: src/easytag.c:4265 src/scan.c:2295
+#: src/easytag.c:4383 src/scan.c:2364
 msgid "All downcase"
 msgstr "所有字母小写"
 
-#: src/easytag.c:4272 src/scan.c:2296
+#: src/easytag.c:4390 src/scan.c:2365
 msgid "First letter uppercase"
 msgstr "第一个字母大写"
 
-#: src/easytag.c:4279 src/scan.c:2297
+#: src/easytag.c:4397 src/scan.c:2366
 msgid "First letter uppercase of each word"
 msgstr "每个词第一个字母大写"
 
 #. Group: insert/remove spaces
-#: src/easytag.c:4290 src/scan.c:2336
+#: src/easytag.c:4408 src/scan.c:2405
 msgid "Remove spaces"
-msgstr "删除空格"
+msgstr "移除空格"
 
-#: src/easytag.c:4297
+#: src/easytag.c:4415
 msgid "Insert space before uppercase letter"
 msgstr "大写字母前插入空格"
 
-#: src/easytag.c:4304
+#: src/easytag.c:4422
 msgid "Remove duplicate spaces or underscores"
-msgstr "产出多余的空格或下划线"
+msgstr "移除多余的空格或下划线"
 
 #. gchar commmand[256];
 #. To send messages to the console...
-#: src/easytag.c:4324 src/easytag.c:4332
+#: src/easytag.c:4442 src/easytag.c:4450
 #, c-format
 msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
 msgstr "EasyTAG %s： 非正常退出！(PId： %d)。"
 
-#: src/easytag.c:4325 src/easytag.c:4334
-#, fuzzy, c-format
+#: src/easytag.c:4443 src/easytag.c:4452
+#, c-format
 msgid "Received signal %s (%d)\a"
-msgstr "收到信号 %s (%d) \n"
+msgstr "收到信号 %s (%d)\a"
 
-#: src/easytag.c:4327 src/easytag.c:4336
+#: src/easytag.c:4445 src/easytag.c:4454
 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 backtrace 输出 "
+"(方法为 “gdb easytag core” 输入 “bt” 与 “l”) 与使错误重现的方法的错误报告 到 "
+"easytag@gmail.com"
 
-#: src/easytag.c:4463
+#: src/easytag.c:4581
 msgid "Unknown signal"
 msgstr "未知信号"
 
-#: src/easytag.c:4479
-#, fuzzy, c-format
+#: src/easytag.c:4597
+#, c-format
 msgid ""
 "\n"
 "Usage: easytag [option] \n"
@@ -2335,130 +2408,133 @@ msgstr ""
 "\n"
 "目录：\n"
 "-------\n"
-"/path_to/files    使用绝对路径载入，\n"
+"%s/path_to/files  使用绝对路径载入，\n"
 "path_to/files     使用相对路径。\n"
 "\n"
 
-#: src/easytag.c:4507
+#: src/easytag.c:4625
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG： 正常退出。"
 
-#: src/easytag.c:4550 src/easytag.c:4589
+#: src/easytag.c:4672 src/easytag.c:4723
 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
+#: src/easytag.c:4698
 msgid " Do you really want to exit the program? "
-msgstr " 您是否真要退出程序？ "
+msgstr " 您是否真的要退出程序？ "
 
-#: src/et_core.c:2509
+#: src/et_core.c:2518
 msgid "ID3 Tag"
 msgstr "ID3 标签"
 
-#: src/et_core.c:2515
+#: src/et_core.c:2524
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis 标签"
 
-#: src/et_core.c:2521
+#: src/et_core.c:2530
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis 标签"
 
-#: src/et_core.c:2526
+#: src/et_core.c:2535
 msgid "APE Tag"
 msgstr "APE 标签"
 
-#: src/et_core.c:2531
+#: src/et_core.c:2540
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC 标签"
 
-#: src/et_core.c:2537
+#: src/et_core.c:2546
 msgid "Wavpack Tag"
-msgstr ""
+msgstr "Wavpack 标签"
 
-#: src/et_core.c:2557
+#: src/et_core.c:2566
 msgid "MP3 File"
 msgstr "MP3 文件"
 
-#: src/et_core.c:2561
+#: src/et_core.c:2570
 msgid "MP2 File"
 msgstr "MP2 文件"
 
-#: src/et_core.c:2567
+#: src/et_core.c:2576
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis 文件"
 
-#: src/et_core.c:2573
-#, fuzzy
+#: src/et_core.c:2582
 msgid "Speex File"
-msgstr "下一个文件"
+msgstr "Speex 文件"
 
-#: src/et_core.c:2579
+#: src/et_core.c:2588
 msgid "FLAC File"
 msgstr "FLAC 文件"
 
-#: src/et_core.c:2584
+#: src/et_core.c:2593
 msgid "MusePack File"
 msgstr "MusePack 文件"
 
-#: src/et_core.c:2588
+#: src/et_core.c:2597
 msgid "Monkey's Audio File"
 msgstr "Monkey's Audio 文件"
 
-#: src/et_core.c:2593
+#: src/et_core.c:2602
 msgid "MP4/AAC File"
 msgstr "MP4/AAC 文件"
 
-#: src/et_core.c:2599
-#, fuzzy
+#: src/et_core.c:2608
 msgid "Wavpack File"
-msgstr "MusePack 文件"
+msgstr "Wavpack 文件"
 
-#: src/et_core.c:2873
-#, fuzzy, c-format
+#: src/et_core.c:2882
+#, c-format
 msgid "Pictures (%d)"
-msgstr "图片"
+msgstr "图片 (%d)"
 
 #. Bitrate
-#: src/et_core.c:2912 src/flac_header.c:299 src/monkeyaudio_header.c:86
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
 #: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
 #: src/ogg_header.c:257 src/wavpack_header.c:78
 #, c-format
 msgid "%d kb/s"
-msgstr ""
+msgstr "%d kb/s"
 
 #. Samplerate
-#: src/et_core.c:2917 src/flac_header.c:304 src/monkeyaudio_header.c:91
+#: src/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
 #: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
 #: src/ogg_header.c:262 src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
-msgstr ""
+msgstr "%d Hz"
 
-#: src/et_core.c:3057
+#: src/et_core.c:3066
 #, 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
+#: src/et_core.c:3069 src/scan.c:668
 msgid "Filename translation"
-msgstr ""
+msgstr "文件名翻译"
 
-#: src/et_core.c:4536 src/et_core.c:4544
+#: src/et_core.c:4551 src/et_core.c:4559
 #, c-format
 msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
-msgstr ""
+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/flac_header.c:298 src/monkeyaudio_header.c:96 src/musepack_header.c:98
 #: src/ogg_header.c:245 src/wavpack_header.c:72
 msgid "Encoder:"
 msgstr "编码器："
@@ -2467,49 +2543,52 @@ msgstr "编码器："
 #. 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/flac_header.c:312 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
-#, fuzzy, c-format
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
+#, c-format
 msgid "ERROR while opening file: '%s' as FLAC (%s)."
+msgstr "当做 FLAC 打开文件：“%s” 时发生错误 (%s)。"
+
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
 msgstr ""
-"打开文件 “%s” (%s) 时发生错误。\n"
-"\a"
 
-#: src/flac_tag.c:983 src/ogg_tag.c:752
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
 #, c-format
 msgid "ERROR: Failed to write comments to file '%s' (%s)."
-msgstr ""
+msgstr "错误： 为文件 “%s” 写入备注时操作失败 (%s)。"
 
-#: src/flac_tag.c:990 src/ogg_tag.c:759
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
 #, c-format
 msgid "Written tag of '%s'"
-msgstr ""
+msgstr "写入 “%s” 的标签"
 
-#: src/id3_tag.c:484
+#: src/id3_tag.c:488
 #, c-format
 msgid "Removed tag of '%s'"
-msgstr ""
+msgstr "移除 “%s” 的标签"
 
-#: src/id3_tag.c:488 src/id3_tag.c:585
+#: src/id3_tag.c:492 src/id3_tag.c:595
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
-msgstr ""
+msgstr "移除 “%s” 的 ID3v1 标签时发生错误 (%s)"
 
-#: src/id3_tag.c:490 src/id3_tag.c:557
+#: src/id3_tag.c:494 src/id3_tag.c:567
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
-msgstr ""
+msgstr "移除 “%s” 的 ID3v2 标签时发生错误 (%s)"
 
-#: src/id3_tag.c:509
+#: src/id3_tag.c:513
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
-msgstr ""
+msgstr "更新 “%s” 的 ID3v2 标签时发生错误 (%s)"
 
-#: src/id3_tag.c:531
+#: src/id3_tag.c:535
 #, c-format
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
@@ -2523,431 +2602,373 @@ msgid ""
 "\n"
 "File : %s"
 msgstr ""
+"您尝试将此标签保存为 Unicode 编码但探测到您的 id3lib 版本有错误。\n"
+"如果您重新装入此文件，则标签中某些字符将不能被正确地显示...\n"
+"请为您的 id3lib 打个补丁 src/id3lib/patch_id3lib_3.8.3_UTF16_writing_but."
+"diff\n"
+"EasyTAG 源码中已提供此补丁。\n"
+"请注意此消息仅显示一次。\n"
+"\n"
+"文件： %s"
 
-#: src/id3_tag.c:577
+#: src/id3_tag.c:587
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
-msgstr ""
+msgstr "更新 “%s” 的 ID3v1 标签时发生错误 (%s)"
 
-#: src/id3_tag.c:591
+#: src/id3_tag.c:601
 #, c-format
 msgid "Updated tag of '%s'"
-msgstr ""
+msgstr "已更新 “%s” 的标签"
 
-#: src/id3_tag.c:610
+#: src/id3_tag.c:620
 msgid "No error reported"
-msgstr ""
+msgstr "没有报告的错误"
 
-#: src/id3_tag.c:612
+#: src/id3_tag.c:622
 msgid "No available memory"
-msgstr ""
+msgstr "没有可用内存"
 
-#: src/id3_tag.c:614
+#: src/id3_tag.c:624
 msgid "No data to parse"
-msgstr ""
+msgstr "没有要处理的数据"
 
-#: src/id3_tag.c:616
+#: src/id3_tag.c:626
 msgid "Improperly formatted data"
-msgstr ""
+msgstr "数据格式不正确"
 
-#: src/id3_tag.c:618
+#: src/id3_tag.c:628
 msgid "No buffer to write to"
-msgstr ""
+msgstr "没有写入的缓冲区"
 
-#: src/id3_tag.c:620
+#: src/id3_tag.c:630
 msgid "Buffer is too small"
-msgstr ""
+msgstr "缓冲区太小"
 
-#: src/id3_tag.c:622
+#: src/id3_tag.c:632
 msgid "Invalid frame ID"
-msgstr ""
+msgstr "非法的帧 ID"
 
-#: src/id3_tag.c:624
+#: src/id3_tag.c:634
 msgid "Requested field not found"
-msgstr ""
+msgstr "请求的域未发现"
 
-#: src/id3_tag.c:626
+#: src/id3_tag.c:636
 msgid "Unknown field type"
-msgstr ""
+msgstr "未知的域类型"
 
-#: src/id3_tag.c:628
+#: src/id3_tag.c:638
 msgid "Tag is already attached to a file"
-msgstr ""
+msgstr "文件已标签"
 
-#: src/id3_tag.c:630
+#: src/id3_tag.c:640
 msgid "Invalid tag version"
-msgstr ""
+msgstr "非法的标签版本"
 
-#: src/id3_tag.c:632
+#: src/id3_tag.c:642
 msgid "No file to parse"
-msgstr ""
+msgstr "没有要处理的文件"
 
-#: src/id3_tag.c:634
+#: src/id3_tag.c:644
 msgid "Attempting to write to a read-only file"
-msgstr ""
+msgstr "正在尝试写入只读文件"
 
-#: src/id3_tag.c:636
+#: src/id3_tag.c:646
 msgid "Error in compression/uncompression"
-msgstr ""
+msgstr "压缩/解压时发生错误"
 
-#: src/id3_tag.c:638
+#: src/id3_tag.c:648
 msgid "Unknown error message!"
-msgstr ""
+msgstr "未知的错误消息！"
 
-#: src/id3_tag.c:1212
+#: src/id3_tag.c:1222
 #, 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
-#, fuzzy
+#: src/id3_tag.c:1224
 msgid "Corrupted file..."
-msgstr "保存文件..."
+msgstr "破损的文件..."
 
-#: src/log.c:91
+#: src/log.c:95
 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 " 应用 "
+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:773
+msgid "Select file..."
+msgstr "选择文件..."
 
-#: src/misc.c:856
+#: src/misc.c:778
 msgid "Select directory..."
 msgstr "选择目录..."
 
-#: src/misc.c:861
-msgid "Select file..."
-msgstr "选择文件..."
-
-#: src/misc.c:931
-#, fuzzy
+#: src/misc.c:852
 msgid "Warning..."
-msgstr "正在搜索..."
+msgstr "警告..."
 
-#: src/misc.c:931
+#: src/misc.c:856
 msgid "No audio player defined!"
-msgstr ""
+msgstr "没有指定音频播放器！"
 
-#: src/misc.c:1033
+#: src/misc.c:959
 #, c-format
 msgid "Can't execute %s (%s)!\n"
-msgstr ""
+msgstr "不能执行 %s (%s)！\n"
 
 #. Units Tab of file size (bytes,kilobytes,...)
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "B"
-msgstr ""
+msgstr "B"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "KB"
-msgstr ""
+msgstr "KB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "MB"
-msgstr ""
+msgstr "MB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "GB"
-msgstr ""
+msgstr "GB"
 
-#: src/misc.c:1198 src/misc.c:1217
+#: src/misc.c:1124 src/misc.c:1143
 msgid "TB"
-msgstr ""
+msgstr "TB"
 
-#: src/misc.c:1312
+#: src/misc.c:1238
 msgid "Generate a playlist"
 msgstr "生成播放列表"
 
-#: src/misc.c:1336
+#: src/misc.c:1262
 msgid "M3U Playlist Name"
 msgstr "M3U 播放列表名"
 
-#: src/misc.c:1349
+#: src/misc.c:1275
 msgid "Use directory name"
 msgstr "使用目录名"
 
-#: src/misc.c:1373 src/misc.c:1470
+#: src/misc.c:1299 src/misc.c:1396
 msgid "Edit Masks"
-msgstr ""
+msgstr "编辑掩码"
 
 #. Playlist options
-#: src/misc.c:1381
+#: src/misc.c:1307
 msgid "Playlist Options"
 msgstr "播放列表选项"
 
-#: src/misc.c:1387
+#: src/misc.c:1313
 msgid "Include only the selected files"
 msgstr "仅包含已选择的文件"
 
-#: src/misc.c:1390
+#: src/misc.c:1316
 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
+#: src/misc.c:1323
 msgid "Use full path for files in playlist"
-msgstr ""
+msgstr "在播放列表中使用完整路径"
 
-#: src/misc.c:1400
+#: src/misc.c:1326
 msgid "Use relative path for files in playlist"
-msgstr ""
+msgstr "在播放列表中使用相对路径"
 
 #. Create playlist in parent directory
-#: src/misc.c:1410
+#: src/misc.c:1336
 msgid "Create playlist in the parent directory"
-msgstr ""
+msgstr "在上层目录中创建播放列表"
 
-#: src/misc.c:1413
+#: src/misc.c:1339
 msgid "If activated, the playlist will be created in the parent directory."
-msgstr ""
+msgstr "如果激活，播放列表将在上层目录中被创建。"
 
 #. DOS Separator
-#: src/misc.c:1417
+#: src/misc.c:1343
 msgid "Use DOS directory separator"
 msgstr "使用 DOS 目录分隔符"
 
-#: src/misc.c:1422
+#: src/misc.c:1348
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
-msgstr ""
+msgstr "此选项将替换 UNIX 目录分隔符 “/” 为 DOS 分隔符 “\\”。"
 
-#: src/misc.c:1431
+#: src/misc.c:1357
 msgid "Playlist Content"
 msgstr "播放列表内容"
 
-#: src/misc.c:1437
+#: src/misc.c:1363
 msgid "Write only list of files"
-msgstr ""
+msgstr "只写入列表中的文件"
 
-#: src/misc.c:1441
+#: src/misc.c:1367
 msgid "Write info using filename"
-msgstr ""
+msgstr "使用文件名写入信息"
 
-#: src/misc.c:1444
+#: src/misc.c:1370
 msgid "Write info using :"
-msgstr ""
+msgstr "写入信息时使用："
 
-#: src/misc.c:1704
+#: src/misc.c:1631
 #, c-format
 msgid ""
 "Playlist file '%s' already exists!\n"
 "Overwrite?"
 msgstr ""
+"播放列表文件 “%s” 已经存在！\n"
+"覆盖吗？"
 
-#: src/misc.c:1705
+#: src/misc.c:1632
 msgid "Write Playlist..."
 msgstr "写入播放列表..."
 
 #. Writing fails...
-#: src/misc.c:1719
+#: src/misc.c:1654
 #, c-format
 msgid ""
 "Can't write playlist file '%s'!\n"
 "(%s)"
 msgstr ""
+"无法写入播放列表文件 “%s”！\n"
+"(%s)"
 
-#: src/misc.c:1726
+#: src/misc.c:1667
 #, c-format
 msgid "Written playlist file '%s'"
-msgstr ""
+msgstr "播放列表文件 “%s” 已写入"
 
-#: src/misc.c:1962
+#: src/misc.c:1913
 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
+#: src/misc.c:1922
 msgid "Encoded by"
 msgstr "使用的编码器"
 
-#: src/misc.c:1982
+#: src/misc.c:1933
 msgid "Search a file"
 msgstr "搜索文件"
 
-#: src/misc.c:2022
+#: src/misc.c:1973
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
-msgstr ""
+msgstr "输入词语搜索文件，什么也不输入则显示所有文件。"
 
 #. Where...
-#: src/misc.c:2028
+#: src/misc.c:1979
 msgid "In :"
 msgstr "在："
 
-#: src/misc.c:2031
+#: src/misc.c:1982
 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
+#: src/misc.c:1984
 msgid "the Tag"
 msgstr "标签"
 
 #. Property of the search
-#: src/misc.c:2043 src/prefs.c:323
+#: src/misc.c:1994 src/prefs.c:323
 msgid "Case sensitive"
 msgstr "区分大小写"
 
-#: src/misc.c:2476
+#: src/misc.c:2427
 #, c-format
 msgid "Found : %d file(s)"
-msgstr ""
+msgstr "找到： %d 个文件"
 
-#: src/misc.c:2739
+#: src/misc.c:2690
 msgid "Load the filenames from a TXT file"
 msgstr "从文本文件中载入文件名"
 
-#: src/misc.c:2769
+#: src/misc.c:2720
 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
+#: src/misc.c:2738
 msgid " Load "
 msgstr " 装载 "
 
-#: src/misc.c:2810
-#, fuzzy
+#: src/misc.c:2761
 msgid "Content of TXT file"
-msgstr "重命名文件时确认"
+msgstr "文本文件内容"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2831 src/misc.c:2925
-#, fuzzy
+#: src/misc.c:2782 src/misc.c:2876
 msgid "Insert a blank line before the selected line"
-msgstr "插入空白行"
+msgstr "在所选行之前插入一个空白行"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2840 src/misc.c:2934
-#, fuzzy
+#: src/misc.c:2791 src/misc.c:2885
 msgid "Delete the selected line"
-msgstr "删除此行"
+msgstr "移除所选行"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2849 src/misc.c:2943 src/misc.c:3415
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
 msgid "Delete all blank lines"
-msgstr "删除所有空白行"
+msgstr "移除所有空白行"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2861 src/misc.c:2955
-#, fuzzy
+#: src/misc.c:2812 src/misc.c:2906
 msgid "Move up the selected line"
-msgstr "仅包含已选择的文件"
+msgstr "上移所选行"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2870 src/misc.c:2964
-#, fuzzy
+#: src/misc.c:2821 src/misc.c:2915
 msgid "Move down the selected line"
-msgstr "仅包含已选择的文件"
+msgstr "下移所选行"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: src/misc.c:2882 src/misc.c:2976 src/misc.c:3439
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
 msgid "Reload"
 msgstr "重新载入"
 
-#: src/misc.c:2903
-#, fuzzy
+#: src/misc.c:2854
 msgid "List of files"
-msgstr "最后的文件"
+msgstr "文件列表"
 
-#: src/misc.c:2998
-#, fuzzy
+#: src/misc.c:2949
 msgid "Selected line:"
-msgstr "选择所有行"
+msgstr "所选行："
 
-#: src/misc.c:3016
+#: src/misc.c:2967
 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
+#: src/misc.c:3355
 msgid "Insert a blank line"
 msgstr "插入空白行"
 
-#: src/misc.c:3409
+#: src/misc.c:3361
 msgid "Delete this line"
-msgstr "删除此行"
+msgstr "移除此行"
 
-#: src/misc.c:3424
-#, fuzzy
+#: src/misc.c:3376
 msgid "Move up this line"
-msgstr "上移此掩码"
+msgstr "上移此行"
 
-#: src/misc.c:3430
-#, fuzzy
+#: src/misc.c:3382
 msgid "Move down this line"
-msgstr "下移此掩码"
+msgstr "下移此行"
 
 #. Mode changed to profile name
 #: src/monkeyaudio_header.c:78 src/musepack_header.c:80
 msgid "Profile:"
-msgstr ""
+msgstr "配置："
 
 #: src/mp4_header.c:130
 msgid "Audio"
@@ -2957,35 +2978,34 @@ msgstr "音频"
 msgid "Unknown"
 msgstr "未知"
 
-#: src/mp4_header.c:211 src/mp4_tag.c:105 src/mp4_tag.c:243
+#: src/mp4_header.c:211 src/mp4_tag.c:106 src/mp4_tag.c:255
 msgid "MP4 format invalid"
 msgstr "MP4 格式非法"
 
 #: src/mp4_header.c:273 src/mpeg_header.c:365
 #, c-format
 msgid "~%d kb/s"
-msgstr ""
+msgstr "~%d kb/s"
 
 #: src/mpeg_header.c:78
 msgid "Stereo"
-msgstr ""
+msgstr "立体声"
 
 #: src/mpeg_header.c:79
 msgid "Joint stereo"
-msgstr ""
+msgstr "联合立体声"
 
 #: src/mpeg_header.c:80
 msgid "Dual channel"
-msgstr ""
+msgstr "双声道"
 
 #: src/mpeg_header.c:81
 msgid "Single channel"
-msgstr ""
+msgstr "单声道"
 
-#. mb->icon = icon;
-#: src/msgbox.c:135
+#: src/msgbox.c:101
 msgid "Repeat action for the rest of the files"
-msgstr ""
+msgstr "为其余文件重复相同动作"
 
 #: src/ogg_header.c:100
 #, c-format
@@ -2993,202 +3013,216 @@ 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 ""
+msgstr "Ogg Vorbis： 读取媒体时返回一个错误 (文件： “%s”)。"
 
 #: src/ogg_header.c:134
 #, c-format
 msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
-msgstr ""
+msgstr "Ogg Vorbis: 比特流不是 Vorbis 数据 (文件： “%s”)。"
 
 #: src/ogg_header.c:137
 #, c-format
 msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
-msgstr ""
+msgstr "Ogg Vorbis: Vorbis 版本不匹配 (文件： “%s”)。"
 
 #: src/ogg_header.c:140
 #, c-format
 msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
-msgstr ""
+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 ""
+msgstr "Ogg Vorbis: 内部逻辑错误， 发现臭虫或者堆栈出错 (文件： “%s”)。"
 
-#: src/ogg_header.c:195 src/ogg_tag.c:181 src/ogg_tag.c:573
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
 #, c-format
 msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
-msgstr ""
+msgstr "错误： 作为 Vorbis 打开文件 “%s” 时失败 (%s)。"
 
-#: src/ogg_tag.c:163
+#: src/ogg_tag.c:166
 #, c-format
 msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
-msgstr ""
+msgstr "警告： Ogg Vorbis 文件 “%s” 包含 ID3v2 标签。"
 
-#: src/picture.c:293
+#: src/picture.c:295
 msgid "Add pictures"
 msgstr "添加图片"
 
-#: src/picture.c:303 src/picture.c:661
+#: src/picture.c:305 src/picture.c:646
 msgid "All Files"
 msgstr "所有文件"
 
-#: src/picture.c:309 src/picture.c:667
+#: src/picture.c:311 src/picture.c:652
 msgid "PNG and JPEG"
 msgstr "PNG 和 JPEG"
 
-#: src/picture.c:445
+#: src/picture.c:428
 #, c-format
 msgid "Picture Properties %d/%d"
-msgstr ""
+msgstr "图片属性 %d/%d"
 
-#: src/picture.c:475
+#: src/picture.c:458
 msgid "Picture Type"
 msgstr "图像类型"
 
-#. Description
-#: src/picture.c:532
+#. Description of the picture
+#: src/picture.c:515
 msgid "Picture Description:"
 msgstr "图像描述："
 
-#: src/picture.c:649
+#: src/picture.c:634
 #, c-format
 msgid "Save picture %d/%d"
-msgstr ""
+msgstr "保存图像 %d/%d"
 
-#: src/picture.c:732
+#: src/picture.c:717
 #, c-format
 msgid ""
 "The following file already exists :\n"
 "'%s'\n"
 "Do you want to overwrite?"
 msgstr ""
+"以下文件已存在：\n"
+"“%s”\n"
+"您是否要覆盖？"
 
-#: src/picture.c:734
+#: src/picture.c:719
 msgid "Save file..."
 msgstr "保存文件..."
 
-#: src/picture.c:786
+#: src/picture.c:803
 msgid "JPEG image"
 msgstr "JPEG 图像"
 
-#: src/picture.c:788
+#: src/picture.c:805
 msgid "PNG image"
 msgstr "PNG 图像"
 
-#: src/picture.c:790
+#: src/picture.c:807
 msgid "Unknown image"
 msgstr "未知图像"
 
-#: src/picture.c:801
+#: src/picture.c:818
 msgid "32x32 pixel PNG file icon"
-msgstr ""
+msgstr "32x32 像素 PNG 文件图标"
 
-#: src/picture.c:803
+#: src/picture.c:820
 msgid "Other file icon"
-msgstr ""
+msgstr "其它文件图标"
 
-#: src/picture.c:805
+#: src/picture.c:822
 msgid "Cover (front)"
-msgstr ""
+msgstr "封面"
 
-#: src/picture.c:807
+#: src/picture.c:824
 msgid "Cover (back)"
-msgstr ""
+msgstr "封底"
 
-#: src/picture.c:809
+#: src/picture.c:826
 msgid "Leaflet page"
-msgstr ""
+msgstr "Leaflet page"
 
-#: src/picture.c:811
+#: src/picture.c:828
 msgid "Media (e.g. label side of CD)"
-msgstr ""
+msgstr "媒体 (比如光盘贴纸)"
 
-#: src/picture.c:813
+#: src/picture.c:830
 msgid "Lead artist/lead performer/soloist"
-msgstr ""
+msgstr "Lead artist/lead performer/soloist"
 
-#: src/picture.c:815
+#: src/picture.c:832
 msgid "Artist/performer"
 msgstr "艺术家 / 表演者"
 
-#: src/picture.c:817
+#: src/picture.c:834
 msgid "Conductor"
 msgstr "指挥"
 
-#: src/picture.c:819
+#: src/picture.c:836
 msgid "Band/Orchestra"
 msgstr "乐队"
 
-#: src/picture.c:823
+#: src/picture.c:840
 msgid "Lyricist/text writer"
-msgstr ""
+msgstr "Lyricist/text writer"
 
-#: src/picture.c:825
+#: src/picture.c:842
 msgid "Recording location"
-msgstr ""
+msgstr "录制地点"
 
-#: src/picture.c:827
+#: src/picture.c:844
 msgid "During recording"
-msgstr ""
+msgstr "录音中"
 
-#: src/picture.c:829
+#: src/picture.c:846
 msgid "During performance"
-msgstr ""
+msgstr "表演中"
 
-#: src/picture.c:831
+#: src/picture.c:848
 msgid "Movie/video screen capture"
-msgstr ""
+msgstr "电影/视频 屏幕捕获"
 
-#: src/picture.c:833
+#: src/picture.c:850
 msgid "A bright coloured fish"
-msgstr ""
+msgstr "A bright coloured fish"
 
-#: src/picture.c:835
+#: src/picture.c:852
 msgid "Illustration"
-msgstr ""
+msgstr "Illustration"
 
-#: src/picture.c:837
+#: src/picture.c:854
 msgid "Band/Artist logotype"
-msgstr ""
+msgstr "Band/Artist logotype"
 
-#: src/picture.c:839
+#: src/picture.c:856
 msgid "Publisher/studio logotype"
-msgstr ""
+msgstr "Publisher/studio logotype"
 
-#: src/picture.c:841
+#: src/picture.c:860
 msgid "Unknown picture type"
-msgstr ""
+msgstr "未知的图像类型"
 
-#: src/picture.c:869 src/picture.c:880
+#: src/picture.c:888 src/picture.c:899
 msgid "pixels"
 msgstr "像素"
 
-#: src/picture.c:870 src/picture.c:881
+#: src/picture.c:889 src/picture.c:900
 msgid "Type"
 msgstr "类型"
 
-#: src/picture.c:882
+#: src/picture.c:901
 msgid "Description"
 msgstr "描述"
 
-#: src/picture.c:984
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
 msgid ""
 "Can't display the picture, as not enough data has been read to determine how "
 "to create the image buffer."
-msgstr ""
+msgstr "无法显示此图像，没有足够的数据被读取以判别如何生成图像缓冲。"
 
-#: src/picture.c:987
+#: src/picture.c:1018
 msgid "Loading Picture File..."
-msgstr "载入图片文件..."
+msgstr "正在载入图片文件..."
+
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
 
-#: src/picture.c:1081
+#: src/picture.c:1120
 #, c-format
 msgid ""
 "Can't open file :\n"
@@ -3199,9 +3233,9 @@ msgstr ""
 "“%s”！\n"
 "(%s)"
 
-#: src/picture.c:1089
+#: src/picture.c:1134
 msgid "Picture file not loaded..."
-msgstr ""
+msgstr "图像文件未被载入..."
 
 #. Title
 #: src/prefs.c:118
@@ -3215,21 +3249,20 @@ msgstr "文件浏览器"
 
 #. Label
 #: src/prefs.c:167
-#, fuzzy
 msgid "Default directory :"
-msgstr "前往默认目录"
+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 ""
+msgstr "指定您的文件放置的目录。当 EasyTAG 无参数启动时此路径将被载入。"
 
 #. Load directory on startup
 #: src/prefs.c:200
 msgid ""
 "Load on startup the default directory or the directory passed as argument"
-msgstr ""
+msgstr "启动时载入默认目录或参数指定的目录"
 
 #: src/prefs.c:203
 msgid ""
@@ -3237,6 +3270,8 @@ msgid ""
 "Note that this path may be overriden by the parameter passed to easytag "
 "(easytag /path_to/mp3_files)."
 msgstr ""
+"自动搜索文件，当 EasyTAG 启动时进入默认目录。请注意此路径设置可以被以参数指定"
+"的目录覆盖 (easytag /path_to/mp3_files)。"
 
 #. Browse subdirectories
 #: src/prefs.c:208
@@ -3245,19 +3280,18 @@ msgstr "搜索子目录"
 
 #: src/prefs.c:211
 msgid "Search subdirectories for files when reading a directory into the tree."
-msgstr ""
+msgstr "将目录载入到树中的时侯搜索其子目录。"
 
 #. Open the node to show subdirectories
 #: src/prefs.c:215
-#, fuzzy
 msgid "Show subdirectories when selecting a directory"
-msgstr "选择目录时显示子目录"
+msgstr "选择目录时显示其子目录"
 
 #: src/prefs.c:219
 msgid ""
 "This expands the selected node into the file browser to display the sub-"
 "directories."
-msgstr ""
+msgstr "这将在文件浏览器中展开所选节点以显示子目录。"
 
 #. Browse hidden directories
 #: src/prefs.c:223
@@ -3266,7 +3300,7 @@ msgstr "搜索隐藏目录"
 
 #: src/prefs.c:228
 msgid "Search hidden directories for files (directories starting by a '.')."
-msgstr ""
+msgstr "查找隐藏目录 (以“.”起始的目录名)。"
 
 #. User interface
 #: src/prefs.c:247
@@ -3282,19 +3316,19 @@ msgstr "显示文件头信息"
 msgid ""
 "If activated, informations about the file as the bitrate, the time, the "
 "size, will be displayed under the filename entry."
-msgstr ""
+msgstr "如果激活，文件信息比如比特率、时间、大小等将被显示于文件名下。"
 
 #: src/prefs.c:264
 msgid "Display changed files in list using :"
-msgstr ""
+msgstr "显示列表中已更改的文件时依据："
 
 #: src/prefs.c:267
 msgid "Red color"
-msgstr ""
+msgstr "红色"
 
 #: src/prefs.c:273
 msgid "Bold style"
-msgstr ""
+msgstr "粗体"
 
 #. Sorting List Options
 #: src/prefs.c:279
@@ -3382,11 +3416,11 @@ msgstr "备注降序"
 
 #: src/prefs.c:320
 msgid "Select the type of file sorting when loading a directory."
-msgstr ""
+msgstr "选择载入目录时文件的排序类型。"
 
 #: src/prefs.c:329
 msgid "If activated, the sorting of the list will be dependent on the case."
-msgstr ""
+msgstr "如果激活，列表排序时将依据大小写。"
 
 #. Message Dialog Position
 #: src/prefs.c:333
@@ -3399,25 +3433,23 @@ msgstr "无特别位置"
 
 #: src/prefs.c:345
 msgid "Let the Window Manager to place the windows."
-msgstr "交给窗口管理器决定"
+msgstr "让窗口管理器决定窗口位置。"
 
 #: src/prefs.c:350
-#, fuzzy
 msgid "Center of the main window"
-msgstr "屏幕居中"
+msgstr "主窗口的中央"
 
 #: src/prefs.c:354
-#, fuzzy
 msgid "Windows should be placed in the center of the main window."
-msgstr "窗口将被放置在当前屏幕中央"
+msgstr "窗口将被放置在主窗口中央。"
 
 #: src/prefs.c:359
 msgid "Center of the screen"
-msgstr "屏幕居中"
+msgstr "屏幕中央"
 
 #: src/prefs.c:363
 msgid "Windows should be placed in the center of the screen."
-msgstr "窗口将被放置在当前屏幕中央"
+msgstr "窗口将被放置在当前屏幕中央。"
 
 #: src/prefs.c:368
 msgid "Mouse position"
@@ -3434,33 +3466,33 @@ msgstr "文件音频播放器"
 
 #: src/prefs.c:388
 msgid "Player to run :"
-msgstr "要运行的播放器："
+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 "标签选项"
+msgstr "日志选项"
 
 #. Show / hide log view
 #: src/prefs.c:418
-#, fuzzy
 msgid "Show log view in main window"
-msgstr "屏幕居中"
+msgstr "在主窗口中显示日志视图"
 
 #: src/prefs.c:421
 msgid "If activated, the log view would be visible in the main window."
-msgstr ""
+msgstr "如果激活，日志视图将被显示在主窗口中。"
 
 #: src/prefs.c:428
 msgid "Max number of lines :"
-msgstr ""
+msgstr "允许的最大行数："
 
 #. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
 #. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
@@ -3482,7 +3514,7 @@ msgstr "文件选项"
 
 #: src/prefs.c:464
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
-msgstr "替换文件名中的非法字符 (为 Windows 和 CD-ROM)"
+msgstr "替换文件名中的非法字符 (为了 Windows 和 CD-ROM)"
 
 #: src/prefs.c:467
 msgid ""
@@ -3491,11 +3523,14 @@ msgid ""
 "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 "将文件后缀转换为："
+msgstr "将文件名后缀转换为："
 
 #: src/prefs.c:479
 msgid "Lower Case"
@@ -3503,7 +3538,7 @@ msgstr "小写"
 
 #: src/prefs.c:482
 msgid "For example, the extension will be converted to '.mp3'"
-msgstr ""
+msgstr "例如，后缀将被转换为 “.mp3”"
 
 #: src/prefs.c:485
 msgid "Upper Case"
@@ -3511,7 +3546,7 @@ msgstr "大写"
 
 #: src/prefs.c:488
 msgid "For example, the extension will be converted to '.MP3'"
-msgstr ""
+msgstr "例如，后缀将被转换为 “.MP3”"
 
 #: src/prefs.c:491
 msgid "No Change"
@@ -3519,24 +3554,24 @@ msgstr "不变"
 
 #: src/prefs.c:494
 msgid "The extension will not be converted"
-msgstr ""
+msgstr "后缀不会被转换"
 
 #. Preserve modification time
 #: src/prefs.c:497
 msgid "Preserve modification time of the file"
-msgstr ""
+msgstr "保留文件的修改时间"
 
 #: src/prefs.c:500
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
-msgstr ""
+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 ""
+msgstr "更新文件上层目录的修改时间 (使用 Amarok 时推荐)"
 
 #: src/prefs.c:508
 msgid ""
@@ -3547,18 +3582,22 @@ msgid ""
 "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 ""
+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 ""
+msgstr "如果某些字符无法在写入文件名的时侯被转换为系统字符编码则应用规则："
 
 #: src/prefs.c:540
 msgid "Try an other character encoding"
@@ -3570,30 +3609,34 @@ msgid ""
 "your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
 "for 'ro'). If it fails, it will try the character encoding ISO-8859-1."
 msgstr ""
+"使用此选项，会尝试转换到您的当前区域编码 (比如：'fr' 为 ISO-8859-1， 'ru' 为 "
+"KOI8-R， 'ro' 为 ISO-8859-2)。如果失败，则会尝试编码 ISO-8859-1。"
 
 #: src/prefs.c:551
 msgid ""
 "Force using the system character encoding and activate the transliteration"
-msgstr ""
+msgstr "强制使用系统字符编码"
 
-#: src/prefs.c:554 src/prefs.c:830 src/prefs.c:896
+#: src/prefs.c:554 src/prefs.c:834 src/prefs.c:903
 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 ""
+msgstr "强制使用系统字符编码方式，不能被表示的字符将被丢弃"
 
-#: src/prefs.c:563 src/prefs.c:839 src/prefs.c:905
+#: src/prefs.c:563 src/prefs.c:843 src/prefs.c:912
 msgid ""
 "With this option, when a characters cannot be represented in the target "
 "character set, it will be silently discarded."
-msgstr ""
+msgstr "使用此选项，当一个字符无法被目标字符集表示的时侯，它将被丢弃。"
 
 #.
 #. * Tag Settings
@@ -3609,7 +3652,7 @@ msgstr "标签选项"
 
 #: src/prefs.c:588
 msgid "Auto completion of date if not complete"
-msgstr "自动补全日期"
+msgstr "日期不完整时自动补全"
 
 #: src/prefs.c:591
 msgid ""
@@ -3617,10 +3660,12 @@ msgid ""
 "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 "写入音轨列，使用后面的数字："
+msgstr "写入音轨域时使用以下数字："
 
 #: src/prefs.c:601
 msgid ""
@@ -3628,10 +3673,12 @@ msgid ""
 "obtain a number with 'n' digits (Ex. with two digits : '05', '09', "
 "'10',...). Else it keeps the 'raw' track value."
 msgstr ""
+"如果激活，音轨域数字位数不够时将被写入前缀的0 (比如使用两位数时： "
+"'05'，'09'，'10' 等)。 未激活时则仅使用原始的音轨值。"
 
 #: src/prefs.c:616
 msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
-msgstr ""
+msgstr "Ogg Vorbis 文件： 同时将备注写为 XMMS 格式"
 
 #: src/prefs.c:619
 msgid ""
@@ -3641,29 +3688,31 @@ msgid ""
 "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 ""
+msgstr "当使用 PageUp/PageDown 键在文件列表中移动时保持标签域的焦点于："
 
 #: src/prefs.c:643
 msgid "Keep focus to the same tag field"
-msgstr ""
+msgstr "将焦点至于相同的标签域"
 
 #: src/prefs.c:649
 msgid "Return focus to the first tag field (ie 'Title' field)"
-msgstr ""
+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
-#, fuzzy
 msgid "ID3 Tag Settings"
-msgstr "标签设置"
+msgstr "ID3 标签设置"
 
 #. Tag Rules frame
 #: src/prefs.c:670
@@ -3673,18 +3722,20 @@ 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 ""
+msgstr "为 FLAC 文件 FLAC 标签时也写入 ID3 标签"
 
 #: 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 "如果所有列都为空则去除标签"
+msgstr "如果所有域都为空则移除标签"
 
 #: src/prefs.c:693
 msgid ""
@@ -3693,6 +3744,8 @@ msgid ""
 "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
@@ -3703,38 +3756,35 @@ msgstr "自动转换旧的 ID3v2 标签版本"
 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 版本。"
+msgstr "如果激活，则老的 ID3v2 标签版本(如 ID3v2.2) 将被升级为 ID3v2.3 版本。"
 
 #. Use CRC32
 #: src/prefs.c:706
 msgid "Use CRC32"
-msgstr ""
+msgstr "使用 CRC32 校验"
 
 #: src/prefs.c:709
-#, fuzzy
 msgid "Set CRC32 in the ID3v2 tags"
-msgstr "写入 ID3v2 标签"
+msgstr "为 ID3v2 标签设置 CRC32 校验"
 
 #. Use Compression
 #: src/prefs.c:712
 msgid "Use Compression"
-msgstr ""
+msgstr "使用压缩"
 
 #: src/prefs.c:715
 msgid "Set Compression in the ID3v2 tags"
-msgstr ""
+msgstr "设置 ID3v2 标签的压缩方式"
 
 #. Character Set for writing ID3 tag
 #: src/prefs.c:718
-#, fuzzy
 msgid "Character Set for writing ID3 tags"
-msgstr "ID3 标签字符集"
+msgstr "写入 ID3 标签使用的字符集"
 
 #. ID3v2 tags
 #: src/prefs.c:725
-#, fuzzy
 msgid "ID3v2 tags"
-msgstr "写入 ID3v2 标签"
+msgstr "ID3v2 标签"
 
 #. Write ID3v2 tag
 #: src/prefs.c:738
@@ -3745,13 +3795,12 @@ msgstr "写入 ID3v2 标签"
 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 ""
+msgstr "如果激活，ID3v2.4 标志将在 MP3 文件头部被添加或更新。否则则移除。"
 
 #. ID3v2 tag version
 #: src/prefs.c:748
-#, fuzzy
 msgid "Version:"
-msgstr "描述："
+msgstr "版本："
 
 #: src/prefs.c:755
 msgid ""
@@ -3759,80 +3808,87 @@ msgid ""
 " - 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
+#: src/prefs.c:769 src/prefs.c:871
 msgid "Charset:"
-msgstr ""
+msgstr "字符集："
 
 #. Unicode
 #: src/prefs.c:777
-#, fuzzy
 msgid "Unicode "
-msgstr "使用的编码器"
+msgstr "Unicode "
 
 #: src/prefs.c:785
-#, fuzzy
 msgid "Unicode type to use"
-msgstr "使用的编码器"
+msgstr "使用的 Unicode 编码方式"
 
 #: src/prefs.c:808
 msgid "Character set used to write the tag data in the file."
-msgstr "将标签写入文件时使用的字符集。"
+msgstr "写入文件时标签所使用的字符集。"
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: src/prefs.c:818 src/prefs.c:883
+#: src/prefs.c:818 src/prefs.c:887
 msgid "Additional settings for iconv():"
-msgstr ""
+msgstr "iconv() 函数的附加设定："
 
-#: src/prefs.c:822 src/prefs.c:888
-#, fuzzy
+#: src/prefs.c:823 src/prefs.c:892
 msgid "No"
-msgstr " 否 "
+msgstr "否"
 
-#: src/prefs.c:827 src/prefs.c:893
-msgid "//TRANSLIT"
+#: src/prefs.c:826 src/prefs.c:895
+#, fuzzy
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
 msgstr ""
+"使用此选项，当一个字符无法被目标字符集表示的时侯，它将以看起来相似的字符表"
+"示。"
+
+#: src/prefs.c:831 src/prefs.c:900
+msgid "//TRANSLIT"
+msgstr "//TRANSLIT"
 
-#: src/prefs.c:836 src/prefs.c:902
+#: src/prefs.c:840 src/prefs.c:909
 msgid "//IGNORE"
-msgstr ""
+msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: src/prefs.c:844
-#, fuzzy
+#: src/prefs.c:848
 msgid "ID3v1 tags"
-msgstr "ID3 标签"
+msgstr "ID3v1 标签"
 
 #. Write ID3v1 tag
-#: src/prefs.c:858
+#: src/prefs.c:862
 msgid "Write ID3v1.x tag"
 msgstr "写入 ID3v1.x 标签"
 
-#: src/prefs.c:861
+#: src/prefs.c:865
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
-msgstr ""
+msgstr "如果激活，ID3v1 标志将在 MP3 文件头部被添加或更新。否则将移除。"
 
-#: src/prefs.c:878
-#, fuzzy
+#: src/prefs.c:882
 msgid "Character set used to write ID3v1 tag data in the file."
-msgstr "将标签写入文件时使用的字符集。"
+msgstr "写入文件时 ID3v1 标签所使用的字符集。"
 
 #. Character Set for reading tag
-#: src/prefs.c:910
-#, fuzzy
+#: src/prefs.c:917
 msgid "Character Set for reading ID3 tags"
-msgstr "ID3 标签字符集"
+msgstr "读取 ID3 标签时使用的字符集"
 
-#: src/prefs.c:924
+#: src/prefs.c:931
 msgid "Non-standart:"
-msgstr ""
+msgstr "Non-standart:"
 
-#: src/prefs.c:929
+#: src/prefs.c:936
 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 "
@@ -3848,370 +3904,392 @@ msgid ""
 "'Windows-1251' to load tags written under Windows. And 'KOI8-R' to load tags "
 "written under Unix systems."
 msgstr ""
-
-#: src/prefs.c:947
+"此字符集将被用来读取标签数据，转换 ISO-8859-1 标签域中的字符串 (ID3v2 或/和 "
+"ID3v1 标签)。\n"
+"\n"
+"比如：\n"
+"  - 在以前版本的 EasyTAG中，您可以保存 UTF-8 字符串到一个 ISO-8859-1 编码的"
+"域。 这是不正确的！要转换此类标签到 Unicode： 激活此选项并选择 UTF-8。 您必须"
+"同时激活以上 的选项 “尝试保存标签为 ISO-8859-1。 如果不可能则使用 UNICODE (推"
+"荐)” 或者 “总是保存 标签为 UNICODE 字符集”。\n"
+"  - 如果 unicod 未被使用，俄国人无法选择字符集 “Windows-1251” 来载入 Windows "
+"下写 入的标签。也无法在 Unix 系统下以 “KOI8-R” 编码载入标签。"
+
+#: src/prefs.c:954
 msgid "Character set used to read tag data in the file."
-msgstr "从文件中读取标签时使用的字符集"
+msgstr "从文件中读取标签时使用的字符集。"
 
 #.
 #. * Scanner
 #.
-#: src/prefs.c:962 src/prefs.c:963
+#: src/prefs.c:969 src/prefs.c:970
 msgid "Scanner"
 msgstr "扫描器"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: src/prefs.c:975
+#: src/prefs.c:982
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr "填充标签扫描器 - 字符转换"
 
-#: src/prefs.c:981 src/prefs.c:1007
+#: src/prefs.c:988 src/prefs.c:1014
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr "转换下划线 “_” 和字符串 “%20” 为空格 “ ”"
 
-#: src/prefs.c:983 src/prefs.c:1009
+#: src/prefs.c:990 src/prefs.c:1016
 msgid "Convert space ' ' to underscore '_'"
 msgstr "转换空格 “ ” 为下划线 “_”"
 
-#: src/prefs.c:995 src/prefs.c:997
+#: src/prefs.c:1002 src/prefs.c:1004
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
-msgstr ""
+msgstr "如果激活，此转换将在标签扫描器应用掩码时使用。"
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: src/prefs.c:1001
+#: src/prefs.c:1008
 msgid "Rename File Scanner - Character Conversion"
 msgstr "重命名文件扫描器 - 字符转换"
 
-#: src/prefs.c:1021 src/prefs.c:1023
+#: src/prefs.c:1028 src/prefs.c:1030
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
-msgstr ""
+msgstr "如果激活，此转换将在文件名扫描器应用掩码时使用。"
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: src/prefs.c:1027
+#: src/prefs.c:1034
 msgid "Process Fields Scanner - Character Conversion"
-msgstr "列扫描器 - 字符转换"
+msgstr "域扫描器 - 字符转换"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: src/prefs.c:1034
+#: src/prefs.c:1041
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
+"Don't uppercase first letter of words for some prepositions and articles."
 
-#: src/prefs.c:1038
+#: src/prefs.c:1045
 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 ""
+"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')."
 
 #. Properties of the scanner window
-#: src/prefs.c:1044
+#: src/prefs.c:1051
 msgid "Scanner Window"
 msgstr "扫描器窗口"
 
-#: src/prefs.c:1050
+#: src/prefs.c:1057
 msgid "Open the Scanner Window on startup"
 msgstr "启动时打开扫描器窗口"
 
-#: src/prefs.c:1053
+#: src/prefs.c:1060
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
-msgstr ""
+msgstr "激活此选项将使 EasyTAG 启动时自动打开扫描器窗口。"
 
-#: src/prefs.c:1056
+#: src/prefs.c:1063
 msgid "Scanner window always on top"
-msgstr "扫描器窗口置顶"
+msgstr "扫描器窗口总是置顶"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1066
 msgid ""
 "If activated, the window which contains the masks will stay always over the "
 "main window."
-msgstr ""
+msgstr "如果激活，掩码窗口将总是置于主窗口之上。"
 
 #. Other options
-#: src/prefs.c:1064
+#: src/prefs.c:1071
 msgid "Fields"
-msgstr ""
+msgstr "域"
 
 #. Overwrite text into tag fields
-#: src/prefs.c:1071
+#: src/prefs.c:1078
 msgid "Overwrite fields when scanning tag"
-msgstr "扫描标签时覆盖列"
+msgstr "扫描标签时覆盖域"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1081
 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
+#: src/prefs.c:1092
 msgid "Set this text as default comment :"
 msgstr "将此文本作为默认备注："
 
-#: src/prefs.c:1088
+#: src/prefs.c:1095
 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
+#: src/prefs.c:1112
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
-msgstr "使用 CRC32 作为默认备注 (只限用 ID3 标签的文件)。"
+msgstr "使用 CRC32 作为默认备注 (仅限使用 ID3 标签的文件)。"
 
-#: src/prefs.c:1109
+#: src/prefs.c:1116
 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
+#: src/prefs.c:1127 src/prefs.c:1128
 msgid "CD Data Base"
 msgstr "CD 数据库"
 
 #. CDDB Server Settings (Automatic Search)
-#: src/prefs.c:1130
-#, fuzzy
+#: src/prefs.c:1137
 msgid "Server Settings for Automatic Search"
-msgstr "自动搜索"
+msgstr "自动搜索的服务器设置"
 
-#: src/prefs.c:1139 src/prefs.c:1178 src/prefs.c:1212
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
 msgid "Name :"
 msgstr "名称："
 
-#: src/prefs.c:1158 src/prefs.c:1186 src/prefs.c:1221 src/prefs.c:1309
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
 msgid "Port :"
 msgstr "端口："
 
-#: src/prefs.c:1168 src/prefs.c:1196 src/prefs.c:1231
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
 msgid "CGI Path :"
 msgstr "CGI 路径："
 
 #. CDDB Server Settings (Manual Search)
-#: src/prefs.c:1204
-#, fuzzy
+#: src/prefs.c:1211
 msgid "Server Settings for Manual Search"
-msgstr "服务器设置"
+msgstr "手动搜索的服务器设置"
 
 #. Local access for CDDB (Automatic Search)
-#: src/prefs.c:1239
-#, fuzzy
+#: src/prefs.c:1246
 msgid "Local CD Data Base"
-msgstr "CD 数据库"
+msgstr "本地 CD 数据库"
 
-#: src/prefs.c:1247
-#, fuzzy
+#: src/prefs.c:1254
 msgid "Path :"
-msgstr "CGI 路径："
+msgstr "路径："
 
-#: src/prefs.c:1258
+#: src/prefs.c:1265
 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 ""
+"指定本地 CD 数据库所在的目录。本地 CD 数据库包含十一个以下的目录 'blues', "
+"'classical', 'country', 'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', "
+"'soundtrack' and 'misc'。"
 
 #. CDDB Proxy Settings
-#: src/prefs.c:1284
+#: src/prefs.c:1291
 msgid "Proxy Settings"
 msgstr "代理服务器设置"
 
-#: src/prefs.c:1293
+#: src/prefs.c:1300
 msgid "Use a proxy"
 msgstr "使用代理服务器"
 
-#: src/prefs.c:1296
+#: src/prefs.c:1303
 msgid "Set active the settings of the proxy server."
-msgstr ""
+msgstr "激活代理服务器设置"
 
-#: src/prefs.c:1301
+#: src/prefs.c:1308
 msgid "Host Name :"
 msgstr "主机名："
 
-#: src/prefs.c:1308
+#: src/prefs.c:1315
 msgid "Name of the proxy server."
-msgstr "代理服务器的名称。"
+msgstr "代理服务器名称。"
 
-#: src/prefs.c:1316
+#: src/prefs.c:1323
 msgid "Port of the proxy server."
-msgstr "代理服务器的端口。"
+msgstr "代理服务器端口。"
 
-#: src/prefs.c:1321
+#: src/prefs.c:1328
 msgid "User Name :"
 msgstr "用户名："
 
-#: src/prefs.c:1328
+#: src/prefs.c:1335
 msgid "Name of user for the the proxy server."
-msgstr "代理服务器的用户名。"
+msgstr "代理服务器用户名。"
 
-#: src/prefs.c:1329
+#: src/prefs.c:1336
 msgid "User Password :"
 msgstr "用户密码："
 
-#: src/prefs.c:1337
+#: src/prefs.c:1344
 msgid "Password of user for the the proxy server."
-msgstr "代理服务器用户的密码"
+msgstr "代理服务器用户密码。"
 
 #. Track Name list (CDDB results)
-#: src/prefs.c:1342
+#: src/prefs.c:1349
 msgid "Track Name List"
 msgstr "音轨名列表"
 
-#: src/prefs.c:1349
+#: src/prefs.c:1356
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
-msgstr ""
+msgstr "选择音频文件 (根据位置或 DLM，如果已激活)"
 
-#: src/prefs.c:1353
+#: src/prefs.c:1360
 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 ""
+msgstr "如果激活，当在音轨名列表中选中一行时，主要列表中的音频文件也将被选择。"
 
 #. Check box to use DLM (also used in the cddb window)
-#: src/prefs.c:1358
+#: src/prefs.c:1365
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
-msgstr ""
+msgstr "使用 Levenshtein 算法 (DLM) 匹配行 (使用标题) 与音频文件 (使用文件名)"
 
 #.
 #. * Confirmation
 #.
-#: src/prefs.c:1373 src/prefs.c:1374
+#: src/prefs.c:1380 src/prefs.c:1381
 msgid "Confirmation"
 msgstr "确认"
 
-#: src/prefs.c:1382
+#: src/prefs.c:1389
 msgid "Confirm exit from program"
-msgstr "确定从程序中退出"
+msgstr "退出程序时请求确认"
 
-#: src/prefs.c:1385
+#: src/prefs.c:1392
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
-msgstr ""
+msgstr "如果激活，退出程序前将打开一个对话框窗口请求确认。"
 
-#: src/prefs.c:1388
+#: src/prefs.c:1395
 msgid "Confirm writing of file tag"
-msgstr "为文件写入标签时确认"
+msgstr "为文件写入标签时请求确认"
 
-#: src/prefs.c:1392
+#: src/prefs.c:1399
 msgid "Confirm renaming of file"
-msgstr "重命名文件时确认"
+msgstr "重命名文件时请求确认"
 
-#: src/prefs.c:1396
+#: src/prefs.c:1403
 msgid "Confirm deleting of file"
-msgstr "删除文件时确认"
+msgstr "删除文件时请求确认"
 
-#: src/prefs.c:1400
+#: src/prefs.c:1407
 msgid "Confirm writing of playlist"
-msgstr "写入播放列表时确认"
+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
+#: src/prefs.c:1429
 msgid "Apply changes (but don't save) and close this window"
 msgstr "应用变更(但不保存)并关闭此窗口"
 
-#: src/prefs.c:1431
+#: src/prefs.c:1438
 msgid "Close this window without saving"
-msgstr "不保存关闭此窗口"
+msgstr "不保存变更并关闭此窗口"
 
-#: src/prefs.c:1439
+#: src/prefs.c:1446
 msgid "Save changes and close this window"
-msgstr "保存并关闭此窗口"
+msgstr "保存变更并关闭此窗口"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: src/prefs.c:1472
+#: src/prefs.c:1479
 #, c-format
 msgid "(Example : %.*d_-_Track_name_1.mp3)"
-msgstr ""
+msgstr "(示例： %.*d_-_Track_name_1.mp3)"
 
-#: src/prefs.c:1618
+#: src/prefs.c:1625
 msgid "Changes applied"
 msgstr "变更已应用"
 
-#: src/prefs.c:1637 src/setting.c:868
+#: src/prefs.c:1644 src/setting.c:867
 msgid "Configuration saved"
 msgstr "配置已保存"
 
-#: src/prefs.c:1644
+#: src/prefs.c:1651
 msgid "Configuration unchanged"
 msgstr "配置未改变"
 
-#: src/prefs.c:1736
+#: src/prefs.c:1743
 #, 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
+#: src/prefs.c:1745
 msgid "Not a directory"
 msgstr "不是一个目录"
 
-#: src/prefs.c:1839
-#, fuzzy, c-format
+#: src/prefs.c:1861
+#, c-format
 msgid "The audio file player '%s' can't be found!"
-msgstr "程序 “%s” 无法被找到！"
+msgstr "音频文件播放器 “%s” 无法被找到！"
 
-#: src/scan.c:174
+#: src/scan.c:178
 msgid "Fill Tag"
 msgstr "填充标签"
 
-#: src/scan.c:175
+#: src/scan.c:179
 msgid "Rename File and Directory"
 msgstr "重命名文件和目录"
 
-#: src/scan.c:176
+#: src/scan.c:180
 msgid "Process Fields"
-msgstr "处理列"
+msgstr "处理域"
 
-#: src/scan.c:353
+#: src/scan.c:357
 msgid "Tag successfully scanned..."
-msgstr "标签成功被扫描"
+msgstr "标签成功被扫描..."
 
-#: src/scan.c:355
-#, fuzzy, c-format
+#: src/scan.c:359
+#, c-format
 msgid "Tag successfully scanned...(%s)"
 msgstr "标签成功被扫描...(%s)"
 
-#: src/scan.c:395
+#: src/scan.c:399
 #, c-format
 msgid ""
 "Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
-msgstr ""
+msgstr "标签扫描器： 后缀 “%s” 在文件名 “%s” 中未被发现！"
 
-#: src/scan.c:477 src/scan.c:506
+#: src/scan.c:481 src/scan.c:510
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
-msgstr "扫描错误：无法找到分隔符 “%s” 在 “%s” 中"
+msgstr "扫描错误： 无法找到分隔符 “%s” 位于 “%s” 中"
 
-#: src/scan.c:663
+#: src/scan.c:667
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding."
-msgstr ""
+msgstr "无法转换文件名 “%s” 为系统文件名编码。"
 
-#: src/scan.c:686
+#: src/scan.c:697
 msgid "New file name successfully scanned..."
 msgstr "新文件名成功被扫描..."
 
-#: src/scan.c:689
+#: src/scan.c:700
 #, c-format
 msgid "New file name successfully scanned...(%s)"
 msgstr "新文件名成功被扫描...(%s)"
@@ -4219,635 +4297,583 @@ 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
+#: src/scan.c:1978
 msgid "Tag and File Name scan"
 msgstr "标签与文件名扫描"
 
 #. Option Menu
-#: src/scan.c:1931
-#, fuzzy
+#: src/scan.c:2000
 msgid "Scanner:"
 msgstr "扫描器："
 
 #. Selection of the item made at the end of the function
-#: src/scan.c:1953
+#: src/scan.c:2022
 msgid "Select the type of scanner to use"
-msgstr "选择扫描方式"
+msgstr "选择使用的扫描方式"
 
-#: src/scan.c:1962
+#: src/scan.c:2031
 msgid "Open scanner window / Scan selected files"
 msgstr "打开扫描器窗口 / 扫描选择的文件"
 
-#: src/scan.c:1975
+#: src/scan.c:2044
 msgid "Scanner Options"
 msgstr "扫描器选项"
 
-#: src/scan.c:1984
+#: src/scan.c:2053
 msgid "Show / Hide Masks Editor"
 msgstr "显示 / 隐藏掩码编辑器"
 
-#: src/scan.c:1994
+#: src/scan.c:2063
 msgid "Show / Hide Legend"
 msgstr "显示 / 隐藏图示"
 
-#: src/scan.c:2004
+#: src/scan.c:2073
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: src/scan.c:2032
+#: src/scan.c:2101
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse file name and "
 "path. Used to fill in tag fields."
-msgstr ""
+msgstr "选择或输入掩码 (参看图示) 来处理文件名和路径。用来填充标签域。"
 
 #. Preview label
-#: src/scan.c:2058
+#: src/scan.c:2127
 msgid "Fill tag preview..."
 msgstr "填充标签预览..."
 
-#: src/scan.c:2085
+#: src/scan.c:2154
 msgid "Prefix mask with current path"
-msgstr ""
+msgstr "以当前路径为掩码前缀"
 
-#: src/scan.c:2098
+#: src/scan.c:2167
 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
+#: src/scan.c:2194
 msgid "Rename file preview..."
 msgstr "重命名文件预览..."
 
-#: src/scan.c:2145
+#: src/scan.c:2214
 msgid "Select fields:"
-msgstr "选择列："
+msgstr "选择域："
 
-#: src/scan.c:2148
+#: src/scan.c:2217
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those who interest you."
-msgstr ""
+msgstr "右侧的按钮表示此域可被处理。当您对其感兴趣的时侯请选择它。"
 
 #. Advice for Translators : set the first letter of filename translated
-#: src/scan.c:2151
+#: src/scan.c:2220
 msgid "F"
-msgstr ""
+msgstr "F"
 
-#: src/scan.c:2152
+#: src/scan.c:2221
 msgid "Process file name field"
-msgstr "处理文件名列"
+msgstr "处理文件名域"
 
 #. Advice for Translators : set the first letter of title translated
-#: src/scan.c:2154
+#: src/scan.c:2223
 msgid "T"
 msgstr "T"
 
-#: src/scan.c:2155
+#: src/scan.c:2224
 msgid "Process title field"
-msgstr "处理标题列"
+msgstr "处理标题域"
 
 #. Advice for Translators : set the first letter of artist translated
-#: src/scan.c:2157
+#: src/scan.c:2226
 msgid "Ar"
 msgstr "Ar"
 
-#: src/scan.c:2158
+#: src/scan.c:2227
 msgid "Process file artist field"
-msgstr "处理艺术家列"
+msgstr "处理艺术家域"
 
 #. Advice for Translators : set the first letter of album translated
-#: src/scan.c:2160
+#: src/scan.c:2229
 msgid "Al"
 msgstr "Al"
 
-#: src/scan.c:2161
+#: src/scan.c:2230
 msgid "Process album field"
-msgstr "处理专辑列"
+msgstr "处理专辑域"
 
 #. Advice for Translators : set the first letter of genre translated
-#: src/scan.c:2163
+#: src/scan.c:2232
 msgid "G"
 msgstr "G"
 
-#: src/scan.c:2164
+#: src/scan.c:2233
 msgid "Process genre field"
-msgstr "处理流派列"
+msgstr "处理流派域"
 
 #. Advice for Translators : set the first letter of comment translated
-#: src/scan.c:2166
+#: src/scan.c:2235
 msgid "Cm"
 msgstr "Cm"
 
-#: src/scan.c:2167
+#: src/scan.c:2236
 msgid "Process comment field"
-msgstr "处理备注列"
+msgstr "处理备注域"
 
 #. Advice for Translators : set the first letter of composer translated
-#: src/scan.c:2169
+#: src/scan.c:2238
 msgid "Cp"
 msgstr "Cp"
 
-#: src/scan.c:2170
+#: src/scan.c:2239
 msgid "Process composer field"
-msgstr "处理作曲家列"
+msgstr "处理作曲家域"
 
 #. Advice for Translators : set the first letter of orig artist translated
-#: src/scan.c:2172
+#: src/scan.c:2241
 msgid "O"
 msgstr "O"
 
-#: src/scan.c:2173
+#: src/scan.c:2242
 msgid "Process original artist field"
-msgstr "处理原始艺术家列"
+msgstr "处理原始艺术家域"
 
 #. Advice for Translators : set the first letter of copyright translated
-#: src/scan.c:2175
+#: src/scan.c:2244
 msgid "Cr"
 msgstr "Cr"
 
-#: src/scan.c:2176
+#: src/scan.c:2245
 msgid "Process copyright field"
-msgstr "处理版权列"
+msgstr "处理版权域"
 
 #. Advice for Translators : set the first letter of URL translated
-#: src/scan.c:2178
+#: src/scan.c:2247
 msgid "U"
 msgstr "U"
 
-#: src/scan.c:2179
+#: src/scan.c:2248
 msgid "Process URL field"
-msgstr "处理 URL 列"
+msgstr "处理 URL 域"
 
 #. Advice for Translators : set the first letter of encoder name translated
-#: src/scan.c:2181
+#: src/scan.c:2250
 msgid "E"
 msgstr "E"
 
-#: src/scan.c:2182
+#: src/scan.c:2251
 msgid "Process encoder name field"
-msgstr "处理名称列"
+msgstr "处理编码器域"
 
-#: src/scan.c:2228
+#: src/scan.c:2297
 msgid "Invert Selection"
 msgstr "反向选择"
 
-#: src/scan.c:2237
+#: src/scan.c:2306
 msgid "Select/Unselect All."
-msgstr "全选 / 全不选"
+msgstr "全选 / 全不选。"
 
 #. Group: character conversion
-#: src/scan.c:2244
+#: src/scan.c:2313
 msgid "Convert '_' and '%20' to ' '"
 msgstr "转换 “_” 和 “%20” 为 “ ”"
 
-#: src/scan.c:2250
-#, fuzzy
+#: src/scan.c:2319
 msgid "Convert:"
 msgstr "转换："
 
-#: src/scan.c:2252
-#, fuzzy
+#: src/scan.c:2321
 msgid "to: "
-msgstr "为："
+msgstr "为： "
 
-#: src/scan.c:2281
+#: src/scan.c:2350
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
 msgstr ""
+"下划线字符或字符串 “%20” 被一个空格替换。比如，之前为 “Text%20In%"
+"20An_Entry”， 之后则为 “Text In An Entry”。"
 
-#: src/scan.c:2284
+#: src/scan.c:2353
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
 msgstr ""
+"空格字符会被一个下划线字符替换。比如，之前 “Text In An Entry”，之后 "
+"“Text_In_An_Entry”。"
 
-#: src/scan.c:2287
+#: src/scan.c:2356
 msgid ""
 "Replace a string by an other one. Note that the search is case sensitive."
-msgstr ""
+msgstr "将一个字符串替换为另外一个。 请注意搜索是区分大小写的。"
 
-#: src/scan.c:2319
+#: src/scan.c:2388
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
 msgstr ""
+"转换所有域中的词语为大写。比如，之前 “Text IN AN entry”，之后则为 “TEXT IN "
+"AN ENTRY”。"
 
-#: src/scan.c:2322
+#: src/scan.c:2391
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
 msgstr ""
+"转换所有域中的词语为小写。比如，之前 “TEXT IN an entry”，之后则为 “text in "
+"an entry”。"
 
-#: src/scan.c:2325
+#: src/scan.c:2394
 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 ""
+"转换所有域中的第一个词语首字母为大写。比如，之前 “text IN An ENTRY”，之后则"
+"为 “Text in an entry”。"
 
-#: src/scan.c:2328
+#: src/scan.c:2397
 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 ""
+"转换所有域中每个词的首字母为大写。比如，之前 “Text in an ENTRY”，之后则为 "
+"“Text In An Entry”。"
 
-#: src/scan.c:2337
+#: src/scan.c:2406
 msgid "Insert a space before an uppercase letter"
-msgstr ""
+msgstr "在大写字母之前插入一个空格"
 
-#: src/scan.c:2338
+#: src/scan.c:2407
 msgid "Remove duplicates of space or underscore"
-msgstr ""
+msgstr "移除重复的空格与下划线"
 
-#: src/scan.c:2356
+#: src/scan.c:2425
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
+"移除所有词语间的空格。比如，之前 “Text In An Entry”，之后则为 "
+"“TextInAnEntry”。"
 
-#: src/scan.c:2359
+#: src/scan.c:2428
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
+"在每一个大写字母前插入一个空格。比如，之前 “TextInAnEntry”，之后则为 “Text "
+"In An Entry”。"
 
-#: src/scan.c:2362
+#: src/scan.c:2431
 msgid ""
 "Duplicated spaces or underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
 msgstr ""
+"移除多余的空格与下划线。比如之前 “Text__In__An   Entry”，之后则为 “ "
+"Text_In_An_Entry”。"
 
 #.
 #. * Frame to display codes legend
 #.
-#: src/scan.c:2368
+#: src/scan.c:2437
 msgid "Legend"
 msgstr "图示"
 
-#: src/scan.c:2374
+#: src/scan.c:2443
 #, c-format
 msgid "%a : artist"
 msgstr "%a ：艺术家"
 
-#: src/scan.c:2377
+#: src/scan.c:2446
 msgid "%b : album"
 msgstr "%b ：专辑"
 
-#: src/scan.c:2380
+#: src/scan.c:2449
 #, c-format
 msgid "%c : comment"
 msgstr "%c ：备注"
 
-#: src/scan.c:2383
+#: src/scan.c:2452
 #, c-format
 msgid "%p : composer"
 msgstr "%p ：作曲"
 
-#: src/scan.c:2386
+#: src/scan.c:2455
 msgid "%r : copyright"
 msgstr "%r ：版权"
 
-#: src/scan.c:2389
+#: src/scan.c:2458
 #, c-format
 msgid "%d : disc number"
-msgstr ""
+msgstr "%d：光盘号"
 
-#: src/scan.c:2392
+#: src/scan.c:2461
 #, c-format
 msgid "%e : encoded by"
 msgstr "%e ：编码器"
 
-#: src/scan.c:2395
+#: src/scan.c:2464
 #, c-format
 msgid "%g : genre"
 msgstr "%g ：流派"
 
-#: src/scan.c:2398
+#: src/scan.c:2467
 #, c-format
 msgid "%i : ignored"
 msgstr "%i ：忽略"
 
-#: src/scan.c:2401
+#: src/scan.c:2470
 msgid "%l : number of tracks"
-msgstr "%l ：音轨号"
+msgstr "%l ：音轨数"
 
-#: src/scan.c:2404
+#: src/scan.c:2473
 #, c-format
 msgid "%o : orig. artist"
 msgstr "%o ：原始艺术家"
 
-#: src/scan.c:2407
+#: src/scan.c:2476
 #, c-format
 msgid "%n : track"
 msgstr "%n ：音轨"
 
-#: src/scan.c:2410
+#: src/scan.c:2479
 msgid "%t : title"
 msgstr "%t ：标题"
 
-#: src/scan.c:2413
+#: src/scan.c:2482
 #, c-format
 msgid "%u : URL"
-msgstr "%u ： URL"
+msgstr "%u ：URL"
 
-#: src/scan.c:2416
+#: src/scan.c:2485
 msgid "%y : year"
 msgstr "%y ：年份"
 
 #.
 #. * Masks Editor
 #.
-#: src/scan.c:2423
+#: src/scan.c:2492
 msgid "Mask Editor"
 msgstr "掩码编辑器"
 
-#: src/scan.c:2480
+#: src/scan.c:2549
 msgid "Create New Mask"
 msgstr "创建新掩码"
 
-#: src/scan.c:2490
+#: src/scan.c:2559
 msgid "Move Up this Mask"
 msgstr "上移此掩码"
 
-#: src/scan.c:2500
+#: src/scan.c:2569
 msgid "Move Down this Mask"
 msgstr "下移此掩码"
 
-#: src/scan.c:2510
+#: src/scan.c:2579
 msgid "Duplicate Mask"
 msgstr "复制掩码"
 
-#: src/scan.c:2520
+#: src/scan.c:2589
 msgid "Add Default Masks"
 msgstr "添加默认掩码"
 
-#: src/scan.c:2530
+#: src/scan.c:2599
 msgid "Remove Mask"
 msgstr "删除掩码"
 
-#: src/scan.c:2540
+#: src/scan.c:2609
 msgid "Save Masks"
 msgstr "保存掩码"
 
-#: src/scan.c:3117
+#: src/scan.c:3186
 msgid "New_mask"
 msgstr "新掩码(_M)"
 
-#: src/scan.c:3155
+#: src/scan.c:3224
 msgid "Copy: No row selected!"
-msgstr ""
+msgstr "复制：没有行被选择！"
 
-#: src/scan.c:3259
+#: src/scan.c:3330
 msgid "Remove: No row selected!"
-msgstr ""
+msgstr "删除： 没有行被选择！"
 
-#: src/scan.c:3306
+#: src/scan.c:3377
 msgid "Move Up: No row selected!"
-msgstr ""
+msgstr "上移： 没有行被选择！"
 
-#: src/scan.c:3359
+#: src/scan.c:3430
 msgid "Move Down: No row selected!"
-msgstr ""
+msgstr "下移： 没有行被选择！"
 
-#: src/setting.c:889
-#, fuzzy, c-format
+#: src/setting.c:888
+#, c-format
 msgid "ERROR: Can't write config file: %s (%s)"
-msgstr ""
-"错误：无法写入配置文件：%s (%s)\n"
-"\a"
+msgstr "错误： 无法写入配置文件： %s (%s)"
 
-#: src/setting.c:1032 src/setting.c:1069
+#: src/setting.c:1031 src/setting.c:1068
 #, c-format
 msgid "Can't open configuration file '%s' (%s)"
-msgstr ""
+msgstr "无法打开配置文件 “%s” (%s)"
 
-#: src/setting.c:1033
+#: src/setting.c:1032
 msgid "Loading default configuration..."
-msgstr ""
+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
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
 #, c-format
 msgid "Can't create or open file '%s' (%s)"
-msgstr ""
+msgstr "无法创建或打开文件 “%s” (%s)"
 
-#: src/setting.c:1278
-#, fuzzy, c-format
+#: src/setting.c:1277
+#, c-format
 msgid "ERROR: Can't write list to file: %s (%s)"
-msgstr ""
-"错误：无法写入配置文件：%s (%s)\n"
-"\a"
+msgstr "错误： 无法写入列表文件： %s (%s)"
 
 #. Fall back to defaults
-#: src/setting.c:1358
+#: src/setting.c:1359
 msgid "Loading default 'Fill Tag' masks..."
-msgstr ""
+msgstr "正在载入默认的 “填充标签” 掩码..."
 
 #. Fall back to defaults
-#: src/setting.c:1386
+#: src/setting.c:1387
 msgid "Loading default 'Rename File' masks..."
-msgstr ""
+msgstr "正在载入默认的 “重命名文件” 掩码..."
 
 #. Fall back to defaults
-#: src/setting.c:1413
+#: src/setting.c:1414
 msgid "Loading default 'Rename Directory' masks..."
-msgstr ""
+msgstr "正在载入默认的 “重命名目录” 掩码..."
 
-#: src/setting.c:1606
+#: src/setting.c:1607
 msgid "ERROR: The environment variable HOME is not defined!"
-msgstr ""
+msgstr "错误： 环境变量 HOME 未设置！"
 
-#: src/setting.c:1622
+#: src/setting.c:1623
 #, c-format
 msgid "ERROR: Can't create directory '%s' (%s)!"
-msgstr ""
+msgstr "错误： 无法创建目录 “%s” (%s)！"
 
 #: src/vcedit.c:287
 msgid "Input truncated or empty."
-msgstr ""
+msgstr "输入被截断或为空。"
 
 #: src/vcedit.c:289
 msgid "Input is not an Ogg bitstream."
-msgstr "输入并非 Ogg 比特流。"
+msgstr "输入不是 Ogg 比特流。"
 
 #: src/vcedit.c:307
 msgid "Error reading first page of Ogg bitstream."
-msgstr "错误读取 Ogg 比特流第一页。"
+msgstr "读取 Ogg 比特流第一页时出错。"
 
 #: src/vcedit.c:313
 msgid "Error reading initial header packet."
-msgstr ""
+msgstr "读取首个文件头数据包时出错。"
 
 #: src/vcedit.c:341
 msgid "Ogg bitstream contains neither speex or vorbis data."
-msgstr ""
+msgstr "Ogg 比特流未包含 speex 或 vorbis 数据。"
 
 #: src/vcedit.c:375
 msgid "Corrupt secondary header."
-msgstr ""
+msgstr "破损的第二个文件头数据包。"
 
 #: src/vcedit.c:405
 msgid "Need to save extra headers - TODO!!"
-msgstr ""
+msgstr "需要保存附加的文件头信息 - TODO！！"
 
 #: src/vcedit.c:419
 msgid "EOF before end of vorbis headers."
-msgstr ""
+msgstr "Vorbis 文件头信息之前文件意外结束。"
 
 #: src/vcedit.c:584
 msgid "Corrupt or missing data, continuing..."
-msgstr ""
+msgstr "破损或丢失的数据，继续操作..."
 
 #: src/vcedit.c:621
 msgid ""
 "Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr ""
+msgstr "输出数据流时出错。输出流可能被损坏或截断。"
 
 #. Log_Print(_("DLL '%s' not found. Try loading it..."), dllname);
-#: src/win32/win32dep.c:177
+#: src/win32/win32dep.c:178
 #, c-format
 msgid "DLL '%s' not found. Try loading it..."
-msgstr ""
+msgstr "动态链接库 “%s” 未被发现。尝试加载..."
 
 #. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: src/win32/win32dep.c:182
+#: src/win32/win32dep.c:183
 #, c-format
 msgid "DLL '%s' could not be loaded"
-msgstr ""
+msgstr "动态链接库 “%s” 无法被加载"
 
 #. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: src/win32/win32dep.c:193
+#: src/win32/win32dep.c:194
 #, c-format
 msgid "This version of '%s' contains '%s'"
-msgstr ""
+msgstr "本版本的 “%s” 包含 “%s”"
 
 #. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: src/win32/win32dep.c:200
+#: src/win32/win32dep.c:201
 #, c-format
 msgid "Function '%s' not found in dll '%s'"
-msgstr ""
+msgstr "函数 “%s” 未在动态链接库 “%s” 中被发现"
 
 #. Log_Print(_("Audio player: '%s'"), player);
-#: src/win32/win32dep.c:294
-#, fuzzy, c-format
+#: src/win32/win32dep.c:302
+#, c-format
 msgid "Audio player: '%s'"
-msgstr "运行音频播放器"
+msgstr "音频播放器： “%s”"
 
 #. ET_Win32_Path_Replace_Backslashes(app_data_dir);
 #. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: src/win32/win32dep.c:434
+#: src/win32/win32dep.c:442
 #, c-format
 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 "标签设置"
-
-#~ msgid "Always save tags to ISO-8859-1 character set"
-#~ msgstr "总是使用 ISO-8859-1 字符集保存标签"
-
-#~ msgid ""
-#~ "Try to save tags to ISO-8859-1. If it isn't possible then use UNICODE "
-#~ "(recommended)"
-#~ msgstr "尝试使用 ISO-8859-1 保存标签。如果不行则使用 UNICODE (推荐)"
-
-#~ msgid "Always save tags to UNICODE character set"
-#~ msgstr "总是使用 UNICODE 字符集保存标签"
-
-#~ msgid "Use non standard character set for reading ID3 tags: "
-#~ msgstr "使用非标准字符集读取 ID3 标签："
-
-#~ msgid "Use non standard character set for writing ID3 tags: "
-#~ msgstr "使用非标准字符集写入 ID3 标签："
-
-#~ msgid "Do nothing"
-#~ msgstr "什么都不做"
-
-#, fuzzy
-#~ msgid "ERROR while opening file: '%s' (%s)\a"
-#~ msgstr ""
-#~ "打开文件 “%s” (%s) 时发生错误。\n"
-#~ "\a"
-
-#~ msgid "Load on startup the directory"
-#~ msgstr "启动时装入目录"
-
-#~ msgid "#:"
-#~ msgstr "#："
-
-#~ msgid "Set yellow background for tooltips"
-#~ msgstr "将提示背景色设置为黄色"
-
-#~ msgid "Save _Configuration Now"
-#~ msgstr "立即保存配置(_C)"
-
-#~ msgid "Save Configuration Now"
-#~ msgstr "立即保存配置"
+msgstr "EasyTAG 设置目录： “%s”"
 
-#~ msgid "Set main window size"
-#~ msgstr "设置主窗口尺寸"
+#~ msgid "libid3tag %s"
+#~ msgstr "libid3tag %s"
 
-#~ msgid "Width :"
-#~ msgstr "宽："
+#~ msgid "id3lib %d.%d.%d"
+#~ msgstr "id3lib %d.%d.%d"
 
-#~ msgid "Height :"
-#~ msgstr "高："
+#~ msgid " OK "
+#~ msgstr " 确认 "
 
-#~ msgid " Get current size "
-#~ msgstr " 获取当前尺寸 "
+#~ msgid " Yes "
+#~ msgstr " 是 "
 
-#~ msgid "Position :"
-#~ msgstr "位置："
+#~ msgid " No "
+#~ msgstr " 否 "
 
-#~ msgid " Get current position "
-#~ msgstr " 获取当前位置 "
+#~ msgid " Apply "
+#~ msgstr " 应用 "
 
-#~ msgid "Set scanner window position"
-#~ msgstr "设置扫描器窗口位置"
+#~ msgid " Save "
+#~ msgstr " 保存 "
 
-#~ msgid "CD Data Base Window"
-#~ msgstr "CD 数据库窗口"
+#~ msgid " Cancel "
+#~ msgstr " 取消 "
 
-#~ msgid "Set CD Data Base window size"
-#~ msgstr "设置 CD 数据库窗口尺寸"
+#~ msgid " Close "
+#~ msgstr " 关闭 "
 
-#~ msgid "Specify the default size for the CDDB window."
-#~ msgstr "指定 CDDB 窗口的默认尺寸"
+#~ msgid " Write "
+#~ msgstr " 写入 "
 
-#~ msgid "Save the configuration before exiting the program"
-#~ msgstr "退出程序前保存配置"
+#~ msgid " Execute "
+#~ msgstr " 执行 "
 
-#~ msgid "Size Error..."
-#~ msgstr "大小错误..."
+#~ msgid " Search "
+#~ msgstr " 搜索 "
 
-#~ msgid " Window width (%d) is bigger than screen width (%d)! "
-#~ msgstr " 窗口宽度 (%d) 大于屏幕宽度 (%d)！"
+#~ msgid " Browse... "
+#~ msgstr " 浏览... "
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
new file mode 100644
index 0000000..3798734
--- /dev/null
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
new file mode 100644
index 0000000..b8a1c18
--- /dev/null
+++ b/po/zh_TW.po
@@ -0,0 +1,4910 @@
+# Chinese (Taiwan) translation of EasyTAG
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# This file is distributed under the same license as the EasyTAG package.
+# Jose Sun <josesun@gmail.com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: EasyTAG 2.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-09 18:16+0100\n"
+"PO-Revision-Date: 2007-09-25 20:57+0800\n"
+"Last-Translator: Jose Sun <josesun@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: Taiwan\n"
+
+#: src/about.c:140
+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's Audio 格式標籤的工具， 輕巧及友善的 GTK+ 介面讓你在 GNU/"
+"Linux 下編輯音樂標籤變得非常簡單。"
+
+#: src/about.c:148 src/about.c:149 src/about.c:150 src/about.c:151
+msgid "(German translation)"
+msgstr "(德文翻譯)"
+
+#: src/about.c:152 src/about.c:153
+msgid "(Russian translation)"
+msgstr "(俄文翻譯)"
+
+#: src/about.c:154 src/about.c:155
+msgid "(Dutch translation)"
+msgstr "(荷蘭文翻譯)"
+
+#: src/about.c:156 src/about.c:157
+msgid "(Swedish translation)"
+msgstr "(瑞典文翻譯)"
+
+#: src/about.c:158 src/about.c:159 src/about.c:160
+msgid "(Hungarian translation)"
+msgstr "(匈牙利文翻譯)"
+
+#: src/about.c:161 src/about.c:162
+msgid "(Italian translation)"
+msgstr "(義大利文翻譯)"
+
+#: src/about.c:163
+msgid "(Japanese translation)"
+msgstr "(日文翻譯)"
+
+#: src/about.c:164 src/about.c:165
+msgid "(Ukrainian translation)"
+msgstr "(烏克蘭文翻譯)"
+
+#: src/about.c:166 src/about.c:167
+msgid "(Czech translation)"
+msgstr "(捷克文翻譯)"
+
+#: src/about.c:168 src/about.c:169 src/about.c:170
+msgid "(Spanish translation)"
+msgstr "(西班牙文翻譯)"
+
+#: src/about.c:171
+msgid "(Polish translation)"
+msgstr "(波蘭文翻譯)"
+
+#: src/about.c:172
+msgid "(Romanian translation)"
+msgstr "(羅馬尼亞文翻譯)"
+
+#: src/about.c:173
+msgid "(Danish translation)"
+msgstr "(丹麥文翻譯)"
+
+#: src/about.c:174
+msgid "(Greek translation)"
+msgstr "(希臘文翻譯)"
+
+#: src/about.c:175
+msgid "(Brazilian Portuguese translation)"
+msgstr "(巴西葡萄牙文翻譯)"
+
+#: src/about.c:176
+msgid "(Bulgarian translation)"
+msgstr "(保加利亞文翻譯)"
+
+#: src/about.c:177
+msgid "(Chinese translation)"
+msgstr "(中文翻譯)"
+
+#: src/about.c:178
+#, fuzzy
+msgid "(Chinese (Taiwan) translation)"
+msgstr "(中文翻譯)"
+
+#: src/about.c:179
+msgid "(Hebrew translation)"
+msgstr "(希伯來文翻譯)"
+
+#: src/about.c:180
+#, fuzzy
+msgid "(Serbian translation)"
+msgstr "(德文翻譯)"
+
+#: src/about.c:233
+msgid "Extension Name"
+msgstr ""
+
+#: src/about.c:234
+msgid "Status"
+msgstr ""
+
+#: src/about.c:235 src/browser.c:2944 src/misc.c:1917
+msgid "Comment"
+msgstr "備註"
+
+#. Config
+#: src/about.c:252
+msgid "About..."
+msgstr "關於..."
+
+#.
+#. * Tab for common informations
+#.
+#: src/about.c:270 src/bar.c:236
+msgid "About"
+msgstr "關於"
+
+#: src/about.c:316
+#, c-format
+msgid "(compiled: %s)"
+msgstr "(編譯時間:  %s)"
+
+#: src/about.c:320
+#, c-format
+msgid "(using: GTK+ %d.%d.%d)"
+msgstr "(使用: GTK+ %d.%d.%d)"
+
+#: src/about.c:328
+#, c-format
+msgid "Author: %s"
+msgstr "作者: %s"
+
+#: src/about.c:332 src/easytag.c:214
+#, c-format
+msgid "E-mail: %s"
+msgstr "E-mail: %s"
+
+#: src/about.c:338
+msgid "Web Page: "
+msgstr "網頁:"
+
+#: src/about.c:351
+msgid "Description:"
+msgstr "描述:"
+
+#.
+#. * Tab for extensions
+#.
+#: src/about.c:367
+msgid "Extensions"
+msgstr ""
+
+#: src/about.c:433
+#, fuzzy
+msgid "MP3 file support"
+msgstr "(已停用 MP3 格式支援)"
+
+#: src/about.c:436 src/about.c:466 src/about.c:478 src/about.c:494
+#: src/about.c:507 src/about.c:519
+msgid "enabled"
+msgstr ""
+
+#: src/about.c:440 src/about.c:456 src/about.c:469 src/about.c:481
+#: src/about.c:498 src/about.c:510 src/about.c:522
+msgid "disabled"
+msgstr ""
+
+#: src/about.c:449
+#, fuzzy
+msgid "ID3v2.3 tags writting support"
+msgstr "(已停用 ID3v2.3 格式支援)"
+
+#: src/about.c:452
+#, fuzzy
+msgid "available"
+msgstr "記憶體不足"
+
+#: src/about.c:463
+#, fuzzy
+msgid "Ogg Vorbis file support"
+msgstr "(已停用 Ogg Vorbis 格式支援)"
+
+#: src/about.c:475
+#, fuzzy
+msgid "Speex file support"
+msgstr "(已停用 Speex 格式支援)"
+
+#: src/about.c:491
+#, fuzzy
+msgid "FLAC file support"
+msgstr "(已停用 FLAC 格式支援)"
+
+#: src/about.c:504
+#, fuzzy
+msgid "MP4/AAC file support"
+msgstr "(已停用 MP4/AAC 格式支援)"
+
+#: src/about.c:516
+#, fuzzy
+msgid "WavPack file support"
+msgstr "(已停用 WavPack 格式支援)"
+
+#.
+#. * Tab for thanks
+#.
+#: src/about.c:531
+msgid "Thanks"
+msgstr "感謝"
+
+#: src/about.c:551
+msgid "Translations:\n"
+msgstr "介面翻譯:\n"
+
+#: src/about.c:581
+msgid "General:\n"
+msgstr "一般貢獻:\n"
+
+#: src/about.c:598
+msgid "Changes"
+msgstr "變更記錄"
+
+#: src/about.c:620
+#, 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:4400 src/flac_header.c:126 src/id3_tag.c:145
+#: src/id3_tag.c:1195 src/id3_tag.c:1271 src/misc.c:1760 src/mp4_header.c:211
+#: src/mp4_header.c:220 src/mp4_tag.c:95 src/mp4_tag.c:106 src/mp4_tag.c:246
+#: src/mp4_tag.c:255 src/mpeg_header.c:209 src/ogg_header.c:82
+#: src/ogg_header.c:186 src/ogg_tag.c:142 src/ogg_tag.c:592
+#, c-format
+msgid "ERROR while opening file: '%s' (%s)."
+msgstr "開啟檔案時發生錯誤: 「%s」 (%s)"
+
+#.
+#. * Main Menu Actions
+#.
+#: src/bar.c:146
+msgid "_File"
+msgstr "檔案(_F)"
+
+#: 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:326
+msgid "Select All Files"
+msgstr "選取所有檔案"
+
+#: src/bar.c:190
+msgid "Unselect All Files"
+msgstr "取消選取所有檔案"
+
+#: src/bar.c:191 src/cddb.c:333
+msgid "Invert Files Selection"
+msgstr "反向選取檔案"
+
+#: src/bar.c:192
+msgid "Delete File(s)"
+msgstr "刪除檔案"
+
+#: src/bar.c:193
+msgid "_First File"
+msgstr "第一個檔案(_F)"
+
+#: src/bar.c:193
+msgid "First File"
+msgstr "第一個檔案"
+
+#: src/bar.c:194
+msgid "_Previous File"
+msgstr "上一個檔案(_P)"
+
+#: src/bar.c:194
+msgid "Previous File"
+msgstr "上一個檔案"
+
+#: src/bar.c:195
+msgid "_Next File"
+msgstr "下一個檔案(_N)"
+
+#: src/bar.c:195
+msgid "Next File"
+msgstr "下一個檔案"
+
+#: src/bar.c:196
+msgid "_Last File"
+msgstr "最後一個檔案(_L)"
+
+#: 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 "掃瞄檔案(_C)"
+
+#: src/bar.c:199
+msgid "Scan File(s)"
+msgstr "掃瞄檔案"
+
+#: src/bar.c:200
+msgid "_Remove Tag(s)"
+msgstr "移除標籤(_R)"
+
+#: src/bar.c:200
+msgid "Remove Tag(s)"
+msgstr "移除標籤"
+
+#: src/bar.c:201
+msgid "_Undo Last File(s) Changes"
+msgstr "復原最後檔案變更(_U)"
+
+#: src/bar.c:201
+msgid "Undo Last File(s) Changes"
+msgstr "復原最後檔案變更"
+
+#: src/bar.c:202
+msgid "R_edo Last File(s) Changes"
+msgstr "取消復原最後檔案變更(_E)"
+
+#: src/bar.c:202
+msgid "Redo Last File(s) Changes"
+msgstr "取消復原最後檔案變更"
+
+#: src/bar.c:203
+msgid "_Save File(s)"
+msgstr "儲存檔案(_S)"
+
+#: src/bar.c:203
+msgid "Save File(s)"
+msgstr "儲存檔案"
+
+#: src/bar.c:204
+msgid "_Force Saving File(s)"
+msgstr "強制儲存檔案(_F)"
+
+#: 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 "離開(_Q)"
+
+#: src/bar.c:207
+msgid "Quit"
+msgstr "離開"
+
+#: src/bar.c:209
+msgid "_Browser"
+msgstr "瀏覽(_B)"
+
+#: src/bar.c:210
+msgid "Go to _Home Directory"
+msgstr "前往家目錄(_H)"
+
+#: src/bar.c:210
+msgid "Go to Home Directory"
+msgstr "前往家目錄"
+
+#: src/bar.c:211
+msgid "Go to _Default Directory"
+msgstr "前往預設目錄(_D)"
+
+#: src/bar.c:211
+msgid "Go to Default Directory"
+msgstr "前往預設目錄"
+
+#: src/bar.c:212
+msgid "Set _Current Path as Default"
+msgstr "設定目前路徑為預設(_C)"
+
+#: 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:4062
+msgid "Browse Directory with ..."
+msgstr "瀏覽目錄以 ..."
+
+#: src/bar.c:217
+msgid "_Collapse Tree"
+msgstr "摺疊目錄(_C)"
+
+#: src/bar.c:218
+msgid "_Refresh Tree"
+msgstr "重新整理目錄(_R)"
+
+#: src/bar.c:220 src/bar.c:249
+msgid "S_canner"
+msgstr "掃瞄(_C)"
+
+#: src/bar.c:221
+msgid "_Fill Tag(s) ..."
+msgstr "標籤填入(_F) ..."
+
+#: src/bar.c:221
+msgid "Fill Tag(s) ..."
+msgstr "標籤填入 ..."
+
+#: src/bar.c:222
+msgid "_Rename File(s) and Directory ..."
+msgstr "檔案及目錄更名(_R) ..."
+
+#: src/bar.c:222
+msgid "Rename File(s) and Directory ..."
+msgstr "檔案及目錄更名 ..."
+
+#: src/bar.c:223
+msgid "_Process Field(s) ..."
+msgstr "標籤欄位處理(_P) ..."
+
+#: src/bar.c:223
+msgid "Process Fields(s) ..."
+msgstr "標籤欄位處理 ..."
+
+#: src/bar.c:225
+msgid "_Misc"
+msgstr "其他(_M)"
+
+#: src/bar.c:226
+msgid "Search _File(s) ..."
+msgstr "搜尋檔案(_F) ..."
+
+#: src/bar.c:226
+msgid "Search File(s)..."
+msgstr "搜尋檔案 ..."
+
+#: src/bar.c:227
+msgid "CD Data _Base Search ..."
+msgstr "CD 資料庫搜尋(_B) ..."
+
+#: src/bar.c:227
+msgid "CDDB Search ..."
+msgstr "CDDB 搜尋 ..."
+
+#: 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 "設定(_S)"
+
+#: src/bar.c:233
+msgid "_Preferences ..."
+msgstr "偏好設定(_P) ..."
+
+#: src/bar.c:233
+msgid "Preferences ..."
+msgstr "偏好設定 ..."
+
+#: src/bar.c:235
+msgid "_Help"
+msgstr "說明(_H)"
+
+#: src/bar.c:236
+msgid "_About"
+msgstr "關於(_A)"
+
+#.
+#. * 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 "檔案處理(_F)"
+
+#: src/bar.c:253
+msgid "CDDB Search File(s)..."
+msgstr "CDDB 搜尋檔案..."
+
+#. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
+#. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with ..."),     NULL, _("Open File(s) with ..."),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
+#: src/bar.c: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:330
+msgid "New default path for files selected"
+msgstr "已選擇新的預設檔案路徑"
+
+#. Some files haven't been saved
+#. Some files aren't saved
+#: src/browser.c:718 src/easytag.c:4668 src/easytag.c:4694 src/easytag.c:4719
+msgid "Confirm..."
+msgstr "確認..."
+
+#: src/browser.c:722
+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:2164
+msgid "<All albums>"
+msgstr "<所有專輯>"
+
+#: src/browser.c:2574
+#, c-format
+msgid "Error: Searching for %s, could not find node %s in tree."
+msgstr "錯誤: 搜尋檔案 %s 時發生錯誤，於樹狀檢視中找不到節點 %s。"
+
+#: src/browser.c:2942 src/browser.c:3069
+msgid "Tree"
+msgstr "樹狀檢視"
+
+#: src/browser.c:2943 src/cddb.c:722 src/misc.c:1909
+msgid "File Name"
+msgstr "檔名"
+
+#: src/browser.c:2943 src/cddb.c:723 src/misc.c:1910
+msgid "Title"
+msgstr "曲名"
+
+#: src/browser.c:2943 src/browser.c:2947 src/cddb.c:437 src/cddb.c:724
+#: src/misc.c:1911
+msgid "Artist"
+msgstr "演唱者"
+
+#: src/browser.c:2943 src/browser.c:2948 src/cddb.c:438 src/cddb.c:725
+#: src/misc.c:1912
+msgid "Album"
+msgstr "專輯"
+
+#: src/browser.c:2944 src/cddb.c:726 src/misc.c:1914
+msgid "Year"
+msgstr "年份"
+
+#: src/browser.c:2944 src/misc.c:1915
+msgid "Track"
+msgstr "曲目"
+
+#: src/browser.c:2944 src/cddb.c:729 src/misc.c:1916
+msgid "Genre"
+msgstr "曲風"
+
+#: src/browser.c:2945 src/misc.c:1918 src/picture.c:838
+msgid "Composer"
+msgstr "作曲者"
+
+#: src/browser.c:2945 src/misc.c:1919
+msgid "Orig. Artist"
+msgstr "原唱者"
+
+#: src/browser.c:2945 src/misc.c:1920
+msgid "Copyright"
+msgstr "版權所有"
+
+#: src/browser.c:2946 src/misc.c:1921
+msgid "URL"
+msgstr "網址"
+
+#: src/browser.c:2946
+#, fuzzy
+msgid "Encoded By"
+msgstr "編碼程式"
+
+#: src/browser.c:2947
+msgid "# Albums"
+msgstr "# 專輯"
+
+#: src/browser.c:2947 src/browser.c:2948
+msgid "# Files"
+msgstr "# 檔案"
+
+#: src/browser.c:2968
+msgid "Go to parent directory"
+msgstr "前往上層目錄"
+
+#: src/browser.c:2985
+msgid "Enter a directory to browse."
+msgstr "請輸入要瀏覽的目錄。"
+
+#: src/browser.c:2994
+#, fuzzy
+msgid "Select a directory to browse."
+msgstr "請選擇要瀏覽的目錄！"
+
+#: src/browser.c:3120
+msgid "Artist & Album"
+msgstr "演唱者及專輯"
+
+#: src/browser.c:3592
+msgid "Rename the directory"
+msgstr "重新命名目錄"
+
+#: src/browser.c:3608
+#, c-format
+msgid "Rename the directory '%s' to : "
+msgstr "重新命名目錄「%s」為: "
+
+#: src/browser.c:3627 src/misc.c:1268
+msgid "Use mask :"
+msgstr "使用遮罩 :"
+
+#: src/browser.c:3630
+msgid "If activated, it will use masks to rename directory."
+msgstr "啟用此選項會用遮罩條件來重新命名目錄。"
+
+#: src/browser.c:3649
+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:3669 src/misc.c:1288 src/misc.c:1385 src/scan.c:2121
+#: src/scan.c:2188 src/scan.c:2534
+msgid "Invalid Scanner Mask"
+msgstr "掃瞄遮罩條件無效"
+
+#. Preview label
+#: src/browser.c:3675
+msgid "Rename directory preview..."
+msgstr "重新命名目錄預覽..."
+
+#. Log_Print(LOG_ERROR,msg);
+#: src/browser.c:3791 src/browser.c:3811 src/browser.c:3883 src/browser.c:3924
+#: src/browser.c:3956 src/browser.c:4406 src/browser.c:4425 src/easytag.c:2637
+#: src/easytag.c:2787 src/easytag.c:2825 src/easytag.c:2846 src/easytag.c:2884
+#: src/easytag.c:2928 src/easytag.c:2981 src/easytag.c:3009 src/easytag.c:3033
+#: src/easytag.c:3260 src/id3_tag.c:545 src/misc.c:1655 src/picture.c:1122
+#: src/prefs.c:1746 src/prefs.c:1863
+msgid "Error..."
+msgstr "錯誤..."
+
+#: src/browser.c:3795
+msgid "You must type a directory name!"
+msgstr "你必須輸入目錄名稱！"
+
+#: src/browser.c:3815
+#, 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..."),
+#. GTK_WINDOW(MainWindow),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. msg,
+#. GTK_STOCK_DIALOG_QUESTION,
+#. GTK_STOCK_NO,  GTK_RESPONSE_NO,
+#. GTK_STOCK_YES, GTK_RESPONSE_YES,
+#. NULL);
+#. g_free(msg);
+#. response = gtk_dialog_run(GTK_DIALOG(msgbox));
+#. gtk_widget_destroy(msgbox);
+#.
+#. switch (response)
+#. {
+#. case GTK_STOCK_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:3881
+#, c-format
+msgid ""
+"Can't rename because this directory name already exists!\n"
+"(%s)"
+msgstr ""
+"無法重新命名，該目錄已存在！\n"
+"(%s)"
+
+#: src/browser.c:3922 src/browser.c:3954
+#, c-format
+msgid ""
+"Can't rename directory \n"
+"'%s'\n"
+" to \n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"無法重新命名目錄 \n"
+"「%s」\n"
+" 為 \n"
+"「%s」！\n"
+"(%s)"
+
+#: src/browser.c:4003
+msgid "Directory renamed"
+msgstr "目錄已重新命名"
+
+#: src/browser.c:4081 src/browser.c:4241
+msgid "Program to run :"
+msgstr "要執行的程式 :"
+
+#: src/browser.c:4093
+msgid ""
+"Enter the program to run. It will receive the current directory as parameter."
+msgstr "請輸入要執行的程式，目前目錄會自動引入為參數。"
+
+#: src/browser.c:4222
+msgid "Open File with ..."
+msgstr "開啟檔案以 ..."
+
+#: src/browser.c:4253
+msgid ""
+"Enter the program to run. It will receive the current file as parameter."
+msgstr "請輸入要執行的程式，目前檔案會自動引入為參數。"
+
+#: src/browser.c:4410
+msgid "You must type a program name!"
+msgstr "你必須輸入程式名稱！"
+
+#: src/browser.c:4424 src/misc.c:868
+#, c-format
+msgid "The program '%s' can't be found!"
+msgstr "找不到程式「%s」！"
+
+#: src/browser.c:4479 src/misc.c:914
+#, c-format
+msgid "Can't execute %s (error %d)!\n"
+msgstr "無法執行 %s (錯誤 %d)！\n"
+
+#: src/browser.c:4498 src/misc.c:953
+msgid "Can't fork another process!\n"
+msgstr "無法產生其他程序！\n"
+
+#: src/browser.c:4532
+#, c-format
+msgid "Executed command : '%s %s'"
+msgstr "執行命令:「%s %s」"
+
+#: src/cddb.c:229
+msgid "Artist / Album"
+msgstr "演唱者／專輯"
+
+#: src/cddb.c:229
+msgid "Category"
+msgstr "分類"
+
+#. Note: don't set "" instead of NULL else this will cause problem with translation language
+#: src/cddb.c:230 src/cddb.c:439
+msgid "Track Name"
+msgstr "曲目編號"
+
+#: src/cddb.c:230
+msgid "Time"
+msgstr "時間"
+
+#: src/cddb.c:241
+msgid "CD Data Base Search"
+msgstr "CD 資料庫搜尋"
+
+#.
+#. * 1 - Page for automatic search (generate the CDDBId from files)
+#.
+#: src/cddb.c:273
+msgid "Automatic Search"
+msgstr "自動搜尋"
+
+#: src/cddb.c:285
+msgid "Request CD database :"
+msgstr "要求 CD 資料庫 :"
+
+#: src/cddb.c:295
+msgid ""
+"Request automatically the CDDB database using the selected files (the order "
+"is important!) to generate the CddbID."
+msgstr "自動從 CDDB 資料庫要求所選取檔案 (選取次序很重要！)  的 CCDB ID。"
+
+#: src/cddb.c:305 src/cddb.c:415
+msgid "Stop the search ..."
+msgstr "停止搜尋 ..."
+
+#. Check box to run the scanner
+#: src/cddb.c:312
+msgid "Use local Cddb"
+msgstr "使用本機 CDDB"
+
+#: src/cddb.c:315 src/cddb.c:769
+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:360
+msgid "Manual Search"
+msgstr "手動搜尋"
+
+#: src/cddb.c:375
+msgid "Words :"
+msgstr "文字 :"
+
+#: src/cddb.c:387
+msgid "Enter the words to search (separated by a space or '+')"
+msgstr "請輸入要搜尋的文字 (以空格或「+」分開)"
+
+#.
+#. * Search options
+#.
+#: src/cddb.c:427
+msgid "Search In :"
+msgstr "搜尋於 :"
+
+#: src/cddb.c:435
+msgid "All Fields"
+msgstr "所有欄位"
+
+#: src/cddb.c:440 src/picture.c:816 src/prefs.c:800
+msgid "Other"
+msgstr "其他"
+
+#: src/cddb.c:462
+msgid "All Categories"
+msgstr "所有分類"
+
+#: src/cddb.c:464
+msgid "Blues"
+msgstr "Blues"
+
+#: src/cddb.c:465
+msgid "Classical"
+msgstr "Classical"
+
+#: src/cddb.c:466
+msgid "Country"
+msgstr "Country"
+
+#: src/cddb.c:467
+msgid "Folk"
+msgstr "Folk"
+
+#: src/cddb.c:468
+msgid "Jazz"
+msgstr "Jazz"
+
+#.
+#. * Misc
+#.
+#: src/cddb.c:469 src/prefs.c:236 src/prefs.c:237
+msgid "Misc"
+msgstr "Misc"
+
+#: src/cddb.c:470
+msgid "Newage"
+msgstr "Newage"
+
+#: src/cddb.c:471
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/cddb.c:472
+msgid "Rock"
+msgstr "Rock"
+
+#: src/cddb.c:473
+msgid "Soundtrack"
+msgstr "Soundtrack"
+
+#: src/cddb.c:510
+msgid "included : funk, soul, rap, pop, industrial, metal, etc."
+msgstr "包含: funk, soul, rap, pop, industrial, metal 等..."
+
+#: src/cddb.c:511
+msgid "movies, shows"
+msgstr "影片，顯示"
+
+#: src/cddb.c:512
+msgid "others that do not fit in the above categories"
+msgstr "其他不符合上列分類的檔案"
+
+#. Button to display/hide the categories
+#: src/cddb.c:515
+msgid " Categories "
+msgstr " 分類"
+
+#.
+#. * Results command
+#.
+#: src/cddb.c:523
+msgid "Results :"
+msgstr "結果 :"
+
+#: src/cddb.c:530 src/misc.c:1963
+msgid "Search :"
+msgstr "搜尋 :"
+
+#: src/cddb.c:543
+msgid "Enter the words to search in the list below"
+msgstr "請輸入下列的文字搜尋"
+
+#: src/cddb.c:555
+msgid "Search Next"
+msgstr "找下一個"
+
+#: src/cddb.c:561
+msgid "Search Previous"
+msgstr "找上一個"
+
+#: src/cddb.c:572
+msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
+msgstr "只顯示「演唱者／專輯」清單中的紅色項目 (或顯示所有項目)"
+
+#: src/cddb.c:578 src/cddb.c:1504
+msgid "Unselect all lines"
+msgstr "取消選取所有項目"
+
+#: src/cddb.c:584
+msgid "Invert lines selection"
+msgstr "反向選擇項目"
+
+#: src/cddb.c:590 src/cddb.c:1499
+msgid "Select all lines"
+msgstr "選擇所有項目"
+
+#: src/cddb.c:703
+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:713
+msgid "Set Into :"
+msgstr "設定條件 :"
+
+#: src/cddb.c:720
+msgid "All"
+msgstr "全部"
+
+#: src/cddb.c:727
+msgid "Track #"
+msgstr "曲目編號"
+
+#: src/cddb.c:728
+msgid "# Tracks"
+msgstr "曲目總數"
+
+#. Check box to run the scanner
+#: src/cddb.c:766 src/misc.c:2964
+msgid "Run the current scanner for each file"
+msgstr "對每個檔案執行目前的掃瞄"
+
+#. Check box to use DLM (also used in the preferences window)
+#: src/cddb.c:773
+msgid "Match lines with the Levenshtein algorithm"
+msgstr "以 Levenshtein 演算法比對近似項目"
+
+#. Doesn't activate it by default because if the new user don't pay attention to it,
+#. it will not understand why the cddb results aren't loaded correctly...
+#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
+#: src/cddb.c:778 src/prefs.c:1369
+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 ""
+"啟用此選項會使用 Levenshtein 演算法 (DLM : Damerau-Levenshtein 距離) 在目前目"
+"錄中尋找檔名有無和 CDDB 相似的曲名，並選擇最類似的項目。此選項可用在已選取正"
+"確的檔案後，不使用 CDDB 的結果，而直接採用曲目順序套用。"
+
+#: src/cddb.c:790
+msgid "Load the selected lines or all lines (if no line selected)."
+msgstr "載入已選的項目或所有項目 (如果未選擇)。"
+
+#: src/cddb.c:799 src/misc.c:2206
+msgid "Ready to search..."
+msgstr "已準備好搜尋 ..."
+
+#: src/cddb.c:1319
+#, 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:1509
+msgid "Invert selection"
+msgstr "反向選擇"
+
+#: src/cddb.c:1517
+msgid "Sort by Track Number"
+msgstr "依曲目編號排序"
+
+#: src/cddb.c:1522
+msgid "Sort by Track Name"
+msgstr "依曲名排序"
+
+#: src/cddb.c:1620
+#, c-format
+msgid "Resolving host '%s' ..."
+msgstr "解析主機名稱「%s」中..."
+
+#: src/cddb.c:1628
+#, c-format
+msgid "Can't resolve host '%s' (%s)!"
+msgstr "無法解析主機名稱「%s」(%s)！"
+
+#: src/cddb.c:1643
+#, c-format
+msgid "Can't create a new socket (%s)!"
+msgstr "無法建立新 Socket (%s)！"
+
+#. Open connection to the server
+#: src/cddb.c:1657
+#, c-format
+msgid "Connecting to host '%s', port '%d' ..."
+msgstr "連線到主機「%s」，埠「%d」 ..."
+
+#: src/cddb.c:1664
+#, c-format
+msgid "Can't connect to host '%s' (%s)!"
+msgstr "無法連線主機「%s」(%s)！"
+
+#: src/cddb.c:1670
+#, c-format
+msgid "Connected to host '%s'"
+msgstr "已連線主機「%s」"
+
+#: src/cddb.c:1753
+#, c-format
+msgid "Receiving data (%s) ..."
+msgstr "接收資料 (%s) 中 ..."
+
+#: src/cddb.c:1765
+#, c-format
+msgid "Error when reading cddb response (%s)!"
+msgstr "讀取 CDDB 回應時錯誤 (%s)！"
+
+#: src/cddb.c:1771
+#, c-format
+msgid "Can't create file '%s' (%s)"
+msgstr "無法建立檔案「%s」 (%s)"
+
+#: src/cddb.c:1814 src/misc.c:3119 src/setting.c:1317
+#, 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:2249 src/cddb.c:2568 src/cddb.c:3405
+msgid "Sending request ..."
+msgstr "送出要求中 ..."
+
+#: src/cddb.c:2253 src/cddb.c:2572 src/cddb.c:3133 src/cddb.c:3409
+#, c-format
+msgid "Can't send the request (%s)!"
+msgstr "無法送出要求 (%s)！"
+
+#.
+#. * Read the answer
+#.
+#. Read the answer
+#: src/cddb.c:2275 src/cddb.c:3146 src/cddb.c:3418
+msgid "Receiving data ..."
+msgstr "接收資料中 ..."
+
+#: src/cddb.c:2282 src/cddb.c:2601 src/cddb.c:3153 src/cddb.c:3425
+msgid "The server returned a wrong answer!"
+msgstr "伺服器回傳錯誤的回應！"
+
+#: src/cddb.c:2296 src/cddb.c:2617 src/cddb.c:3168 src/cddb.c:3440
+#, c-format
+msgid "The server returned a wrong answer! (%s)"
+msgstr "伺服器回傳錯誤的回應！(%s)"
+
+#: src/cddb.c:2443
+msgid "Sorry, the web-based search is currently down!"
+msgstr "抱歉，網頁搜尋目前無法使用！"
+
+#: src/cddb.c:2445 src/cddb.c:2789
+#, c-format
+msgid "Found %d matching album(s)"
+msgstr "找到 %d 個符合的專輯"
+
+#: src/cddb.c:2589
+#, c-format
+msgid "Receiving data of page %d (album %d/%d)..."
+msgstr "接收第 %d 頁的資料 (專輯 %d/%d)..."
+
+#: src/cddb.c:2591
+#, c-format
+msgid "Receiving data of page %d ..."
+msgstr "接收第 %d 頁的資料 ..."
+
+#: src/cddb.c:2756
+msgid "More results to load ..."
+msgstr "載入更多結果 ..."
+
+#: src/cddb.c:2885
+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:2893
+msgid "More than 99 files selected! Can't send request!"
+msgstr "已選取超過 99 個檔案，無法送出要求！"
+
+#: src/cddb.c:2899
+#, c-format
+msgid "%d file(s) selected!"
+msgstr "已選擇 %d 個檔案！"
+
+#: src/cddb.c:2974
+msgid "Local CD search..."
+msgstr "本機 CD 搜尋 ..."
+
+#: src/cddb.c:2978
+#, fuzzy
+msgid ""
+"The path for 'Local CD Data Base' wasn't defined!\n"
+"Fill it in the preferences window before to use this search."
+msgstr ""
+"「本機 CD 資料庫」路徑尚未指定！\n"
+"請於偏好視窗中填入。"
+
+#. g_print("Request : '%s'\n", cddb_in);
+#: src/cddb.c:3123
+#, c-format
+msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d) ..."
+msgstr "送出要求中 (CddbId: %s, 曲目總數: %d, 總長度: %d) ..."
+
+#: src/cddb.c:3276
+#, c-format
+msgid "Found %d matching album(s) for DiscID '%s'"
+msgstr "找到 %d 個符合 DiscID「%s」的專輯"
+
+#: src/cddb.c:3372
+#, c-format
+msgid "Can't load file: '%s' (%s)!"
+msgstr "無法載入檔案:「%s」(%s)！"
+
+#. Load the track list of the album
+#: src/cddb.c:3630
+msgid "Loading album track list ..."
+msgstr "載入專輯曲目清單中 ..."
+
+#: src/cddb.c:3827
+#, 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 ""
+"注意，你要套用 CDDB 中的 %d 個項目的資料到檔案清單的 %d 個項目！\n"
+"\n"
+"你確定要繼續嗎？"
+
+#: src/cddb.c:3830
+msgid "Write Tag from CDDB..."
+msgstr "從 CDDB 寫入標籤 ..."
+
+#: 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 "中歐語系 (IBM-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 "Unicode (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:543
+#, fuzzy, c-format
+msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
+msgstr "檔名「%s」無法轉換成 UTF-8 (%s)。\n"
+
+#: src/charset.c:544 src/charset.c:643 src/charset.c:707
+msgid "Invalid UTF-8"
+msgstr "UTF-8 無效"
+
+#: src/charset.c:642
+#, fuzzy, c-format
+msgid ""
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
+msgstr "UTF-8 字串「%s」無法轉換為檔名編碼 (%s)\n"
+
+#: src/charset.c:706
+#, fuzzy, c-format
+msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
+msgstr "字串「%s」無法轉換為 UTF-8 (%s)。\n"
+
+#. Starting messages
+#: src/easytag.c:179
+#, c-format
+msgid "Starting EasyTAG %s (PId: %d) ..."
+msgstr "EasyTAG %s 開始中 (PId: %d) ..."
+
+#: src/easytag.c:181
+#, c-format
+msgid "Currently using libid3tag version %s ..."
+msgstr "目前使用的 libid3tag 版本 %s ..."
+
+#: src/easytag.c:184
+#, c-format
+msgid "Currently using id3lib version %d.%d.%d ..."
+msgstr "目前使用的 id3lib 版本 %d.%d.%d ..."
+
+#: src/easytag.c:191
+#, c-format
+msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
+msgstr "變數 EASYTAGLANG 已定義，設定語言 :「%s」"
+
+#: src/easytag.c:193
+#, c-format
+msgid "Setting locale : '%s'"
+msgstr "設定語言 :「%s」"
+
+#: src/easytag.c:197
+#, c-format
+msgid "Currently using locale '%s' (and eventually '%s')..."
+msgstr "目前使用的語言「%s」(最後設定為「%s」)..."
+
+#: src/easytag.c:213
+#, c-format
+msgid "%s %s by %s (compiled %s, %s)\n"
+msgstr "%s %s 由 %s (編譯時間 %s, %s)\n"
+
+#: src/easytag.c:215
+#, c-format
+msgid "Web Page: %s"
+msgstr "網頁: %s"
+
+#: src/easytag.c:290
+#, c-format
+msgid "Unknown parameter or path '%s'\n"
+msgstr "參數或路徑「%s」無效\n"
+
+#.
+#. * Browser
+#.
+#: src/easytag.c:414 src/prefs.c:145 src/prefs.c:146
+msgid "Browser"
+msgstr "瀏覽"
+
+#: src/easytag.c:436 src/et_core.c:2614
+msgid "File"
+msgstr "檔案"
+
+#: src/easytag.c:462
+msgid "Read Only File"
+msgstr "唯讀檔案"
+
+#: src/easytag.c:465
+msgid "File Link Broken"
+msgstr "檔案連結失效"
+
+#. Default values are MPs data
+#. MPEG, Layer versions
+#: src/easytag.c:479 src/easytag.c:4184 src/mpeg_header.c:354
+msgid "MPEG"
+msgstr "MPEG"
+
+#: src/easytag.c:481 src/easytag.c:4185
+msgid "?, Layer ?"
+msgstr "?, Layer ?"
+
+#: src/easytag.c:486
+msgid "Bitrate:"
+msgstr "位元率:"
+
+#: src/easytag.c:488 src/easytag.c:4186
+msgid "? kb/s"
+msgstr "? kb/秒"
+
+#: src/easytag.c:493
+msgid "Freq:"
+msgstr "頻率:"
+
+#: src/easytag.c:495 src/easytag.c:4187
+msgid "? Hz"
+msgstr "? Hz"
+
+#. Mode
+#: src/easytag.c:503 src/easytag.c:4188 src/mpeg_header.c:377
+msgid "Mode:"
+msgstr "模式:"
+
+#: src/easytag.c:505 src/easytag.c:519 src/easytag.c:4189 src/easytag.c:4190
+#: src/easytag.c:4191
+msgid "?"
+msgstr "?"
+
+#: src/easytag.c:510
+msgid "Size:"
+msgstr "大小:"
+
+#: src/easytag.c:512
+msgid "? kb"
+msgstr "? kb"
+
+#: src/easytag.c:517
+msgid "Time:"
+msgstr "時間:"
+
+#. Main Frame
+#: src/easytag.c:563 src/et_core.c:2552
+msgid "Tag"
+msgstr "標籤"
+
+#.
+#. * 1 - Page for common tag fields
+#.
+#: src/easytag.c:585
+msgid "Common"
+msgstr "一般"
+
+#. Title
+#: src/easytag.c:597
+msgid "Title:"
+msgstr "曲名:"
+
+#: src/easytag.c:610
+msgid "Tag selected files with this title"
+msgstr "以此曲名標記所選檔案"
+
+#. Artist
+#: src/easytag.c:617
+msgid "Artist:"
+msgstr "演唱者:"
+
+#: src/easytag.c:629
+msgid "Tag selected files with this artist"
+msgstr "以此演場者標記所選檔案"
+
+#. Album
+#: src/easytag.c:635
+msgid "Album:"
+msgstr "專輯:"
+
+#: src/easytag.c:648
+msgid "Tag selected files with this album name"
+msgstr "以此專輯名稱標記所選檔案"
+
+#. Disc Number
+#: src/easytag.c:654
+msgid "CD:"
+msgstr "CD:"
+
+#: src/easytag.c:670
+msgid "Tag selected files with this disc number"
+msgstr "以此碟片編號標記所選檔案"
+
+#. Year
+#: src/easytag.c:676
+msgid "Year:"
+msgstr "年份:"
+
+#: src/easytag.c:693
+msgid "Tag selected files with this year"
+msgstr "以此發行年份標記所選檔案"
+
+#: src/easytag.c:705
+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:714
+msgid "Track #:"
+msgstr "曲目 #:"
+
+#: src/easytag.c:740
+msgid ""
+"Set the number of files, in the same directory of the displayed file, to the "
+"selected tracks."
+msgstr "設定曲目總數，以相同目錄中顯示的檔案計算。"
+
+#: src/easytag.c:759
+msgid "Tag selected files with this number of tracks"
+msgstr "以此曲目編號標記所選檔案"
+
+#. Genre
+#: src/easytag.c:765
+msgid "Genre:"
+msgstr "曲風:"
+
+#: src/easytag.c:790
+msgid "Tag selected files with this genre"
+msgstr "以此曲風標記所選檔案"
+
+#. Comment
+#: src/easytag.c:796
+msgid "Comment:"
+msgstr "備註:"
+
+#: src/easytag.c:821
+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:830
+msgid "Composer:"
+msgstr "作曲者:"
+
+#: src/easytag.c:842
+msgid "Tag selected files with this composer"
+msgstr "以此作曲者標記所選檔案"
+
+#. Original Artist / Performer
+#: src/easytag.c:849
+msgid "Orig. Artist:"
+msgstr "原唱者:"
+
+#: src/easytag.c:861
+msgid "Tag selected files with this original artist"
+msgstr "以此原唱者記所選檔案"
+
+#. Copyright
+#: src/easytag.c:868
+msgid "Copyright:"
+msgstr "版權所有者:"
+
+#: src/easytag.c:880
+msgid "Tag selected files with this copyright"
+msgstr "以此版權所有者標記所選檔案"
+
+#. URL
+#: src/easytag.c:887
+msgid "URL:"
+msgstr "網址:"
+
+#: src/easytag.c:899
+msgid "Tag selected files with this URL"
+msgstr "以此網址標記所選檔案"
+
+#. Encoded by
+#: src/easytag.c:906
+msgid "Encoded by:"
+msgstr "編碼程式:"
+
+#: src/easytag.c:918
+msgid "Tag selected files with this encoder name"
+msgstr "以此編碼程式標記所選檔案"
+
+#.
+#. * 2 - Page for extra tag fields
+#.
+#: src/easytag.c:978
+msgid "Pictures"
+msgstr "封面"
+
+#. Picture
+#: src/easytag.c:989
+msgid "Pictures:"
+msgstr "封面:"
+
+#: src/easytag.c:1009
+msgid "You can use drag and drop to add picture."
+msgstr "你可以拖放圖片到這裡新增封面。"
+
+#: src/easytag.c:1047
+msgid "Tag selected files with these pictures"
+msgstr "以此封面標記所選檔案"
+
+#: src/easytag.c:1057
+msgid "Add pictures to the tag (drag and drop is also available)."
+msgstr "新增封面圖片 (也可以拖放圖片到這裡)"
+
+#: src/easytag.c:1063
+msgid "Remove selected pictures, else all pictures."
+msgstr "移除所選圖片，不選則全部刪除"
+
+#: src/easytag.c:1073
+msgid "Save the selected pictures on the hard disk."
+msgstr "儲存已選圖片到硬碟。"
+
+#: src/easytag.c:1080
+msgid "Set properties of the selected pictures."
+msgstr "設定已選圖片的屬性。"
+
+#: src/easytag.c:1160
+#, c-format
+msgid "Selected files tagged with title '%s'."
+msgstr "所選的檔案已用曲名「%s」標記。"
+
+#: src/easytag.c:1162
+msgid "Removed title from selected files."
+msgstr "所選的檔案曲名已移除。"
+
+#: src/easytag.c:1179
+#, c-format
+msgid "Selected files tagged with artist '%s'."
+msgstr "所選的檔案已用演唱者「%s」標記。"
+
+#: src/easytag.c:1181
+msgid "Removed artist from selected files."
+msgstr "所選的檔案演唱者已移除。"
+
+#: src/easytag.c:1198
+#, c-format
+msgid "Selected files tagged with album '%s'."
+msgstr "所選的檔案已用專輯「%s」標記。"
+
+#: src/easytag.c:1200
+msgid "Removed album name from selected files."
+msgstr "所選的檔案專輯名稱已移除。"
+
+#: src/easytag.c:1217
+#, c-format
+msgid "Selected files tagged with disc number '%s'."
+msgstr "所選的檔案已用曲目編號「%s」標記。"
+
+#: src/easytag.c:1219
+msgid "Removed disc number from selected files."
+msgstr "所選的檔案曲名編號已移除。"
+
+#: src/easytag.c:1236
+#, c-format
+msgid "Selected files tagged with year '%s'."
+msgstr "所選的檔案已用發行年份「%s」標記。"
+
+#: src/easytag.c:1238
+msgid "Removed year from selected files."
+msgstr "所選的檔案發行年份已移除。"
+
+#: src/easytag.c:1266 src/easytag.c:1362
+#, c-format
+msgid "Selected files tagged with track like 'xx/%s'."
+msgstr "所選的檔案已用曲目編號「xx/%s」的方式標記。"
+
+#: src/easytag.c:1269
+msgid "Selected files tagged with track like 'xx'."
+msgstr "所選的檔案已用曲目編號「xx」的方式標記。"
+
+#: src/easytag.c:1273 src/easytag.c:1365
+msgid "Removed track number from selected files."
+msgstr "所選的檔案曲目編號已移除。"
+
+#. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
+#: src/easytag.c:1331
+msgid "Selected tracks numbered sequentially."
+msgstr "所選的檔案已依序標記曲目編號。"
+
+#: src/easytag.c:1383
+#, c-format
+msgid "Selected files tagged with genre '%s'."
+msgstr "所選的檔案已用曲風「%s」標記。"
+
+#: src/easytag.c:1385
+msgid "Removed genre from selected files."
+msgstr "所選的檔案曲風已移除。"
+
+#: src/easytag.c:1409
+#, c-format
+msgid "Selected files tagged with comment '%s'."
+msgstr "所選的檔案已用備註「%s」標記。"
+
+#: src/easytag.c:1411
+msgid "Removed comment from selected files."
+msgstr "所選的檔案備註已移除。"
+
+#: src/easytag.c:1428
+#, c-format
+msgid "Selected files tagged with composer '%s'."
+msgstr "所選的檔案已用作曲者「%s」標記。"
+
+#: src/easytag.c:1430
+msgid "Removed composer from selected files."
+msgstr "所選的檔案作曲者已移除。"
+
+#: src/easytag.c:1447
+#, c-format
+msgid "Selected files tagged with original artist '%s'."
+msgstr "所選的檔案已用原唱者「%s」標記。"
+
+#: src/easytag.c:1449
+msgid "Removed original artist from selected files."
+msgstr "所選的檔案原唱者已移除。"
+
+#: src/easytag.c:1466
+#, c-format
+msgid "Selected files tagged with copyright '%s'."
+msgstr "所選的檔案已用版權所有者「%s」標記。"
+
+#: src/easytag.c:1468
+msgid "Removed copyright from selected files."
+msgstr "所選的檔案版權所有者已移除。"
+
+#: src/easytag.c:1485
+#, c-format
+msgid "Selected files tagged with URL '%s'."
+msgstr "所選的檔案已用網址「%s」標記。"
+
+#: src/easytag.c:1487
+msgid "Removed URL from selected files."
+msgstr "所選的檔案網址已移除。"
+
+#: src/easytag.c:1504
+#, c-format
+msgid "Selected files tagged with encoder name '%s'."
+msgstr "所選的檔案已用編碼程式「%s」標記。"
+
+#: src/easytag.c:1506
+msgid "Removed encoder name from selected files."
+msgstr "所選的檔案編碼程式已移除。"
+
+#: src/easytag.c:1541
+msgid "Selected files tagged with pictures."
+msgstr "所選的檔案封面已標記。"
+
+#: src/easytag.c:1543
+msgid "Removed pictures from selected files."
+msgstr "所選的檔案封面已移除。"
+
+#: src/easytag.c:1782
+msgid "Select Mode and Mask, and redo the same action"
+msgstr "請選擇模式和遮罩條件後重做相同動作"
+
+#: src/easytag.c:1837
+msgid "All tags have been scanned"
+msgstr "已掃描所有標籤"
+
+#: src/easytag.c:1894
+msgid "All tags have been removed"
+msgstr "已移除所有標籤"
+
+#: src/easytag.c:2189 src/easytag.c:2212
+msgid "All files have been saved..."
+msgstr "所有檔案已儲存..."
+
+#: src/easytag.c:2210
+msgid "Files have been partially saved..."
+msgstr "檔案已部份儲存..."
+
+#: src/easytag.c:2360
+msgid "Files have been partially deleted..."
+msgstr "檔案已部份刪除..."
+
+#: src/easytag.c:2362
+msgid "All files have been deleted..."
+msgstr "已刪除所有檔案..."
+
+#: src/easytag.c:2435
+#, c-format
+msgid ""
+"Do you want to write the tag of file\n"
+"'%s' ?"
+msgstr ""
+"你要寫入檔案標籤\n"
+"「%s」嗎 ?"
+
+#: src/easytag.c:2439 src/easytag.c:2452
+msgid "Write Tag..."
+msgstr "寫入標籤..."
+
+#. Directories and filename changed
+#: src/easytag.c:2516
+msgid "Rename File and Directory..."
+msgstr "檔案及目錄更名..."
+
+#: src/easytag.c:2517
+#, 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:2522
+msgid "Rename Directory..."
+msgstr "目錄更名..."
+
+#: src/easytag.c:2523
+#, 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:2529
+msgid "Rename File..."
+msgstr "檔案更名..."
+
+#: src/easytag.c:2530
+#, 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:2613
+#, c-format
+msgid "Writing tag of '%s'"
+msgstr "寫入「%s」的標籤中"
+
+#: src/easytag.c:2619
+msgid "Tag(s) written"
+msgstr "標籤已寫入"
+
+#. Special for Ogg Vorbis because the error is defined into 'vcedit_error(state)'
+#: src/easytag.c:2628 src/easytag.c:2633
+#, c-format
+msgid ""
+"Can't write tag in file '%s'!\n"
+"(%s)"
+msgstr ""
+"無法寫入標籤到檔案「%s」！\n"
+"(%s)"
+
+#: src/easytag.c:2765
+#, 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:2785 src/easytag.c:2823 src/easytag.c:3031
+#, c-format
+msgid ""
+"Can't rename file '%s'\n"
+" to \n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"無法更名檔案「%s」\n"
+" 為 \n"
+"「%s」！\n"
+"(%s)"
+
+#: src/easytag.c:2799 src/easytag.c:2837 src/easytag.c:2858 src/easytag.c:3045
+msgid "File(s) not renamed..."
+msgstr "檔案未更名..."
+
+#: src/easytag.c:2844
+#, 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:2882
+#, c-format
+msgid ""
+"Can't create target directory\n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"無法建立目的目錄\n"
+"'%s'!\n"
+"(%s)"
+
+#. Renaming file has succeeded
+#: src/easytag.c:2910
+#, c-format
+msgid "Renamed file '%s' to '%s'"
+msgstr "檔案「%s」已更名為「%s」"
+
+#: src/easytag.c:2916
+msgid "File(s) renamed..."
+msgstr "檔案已更名..."
+
+#: src/easytag.c:2926 src/easytag.c:2979
+#, c-format
+msgid ""
+"Can't remove old directory\n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"無法移除舊目錄\n"
+"「%s」！\n"
+"(%s)"
+
+#. Renaming file has succeeded
+#: src/easytag.c:2963
+#, c-format
+msgid "Moved file '%s' to '%s'"
+msgstr "檔案「%s」已移動到「%s」"
+
+#: src/easytag.c:2969
+msgid "File(s) moved..."
+msgstr "檔案已移動..."
+
+#. Moving file has failed
+#: src/easytag.c:3007
+#, c-format
+msgid ""
+"Can't move file '%s'\n"
+" to \n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"無法移動檔案「%s」\n"
+" 到 \n"
+"「%s」！\n"
+"(%s)"
+
+#: src/easytag.c:3021
+msgid "File(s) not moved..."
+msgstr "檔案未移動..."
+
+#: src/easytag.c:3080
+#, c-format
+msgid ""
+"Do you really want to delete definitively the file\n"
+"'%s' ?"
+msgstr ""
+"你確定要永遠刪除檔案\n"
+"「%s」嗎？"
+
+#: src/easytag.c:3083 src/easytag.c:3096
+msgid "Delete File..."
+msgstr "刪除檔案..."
+
+#: src/easytag.c:3124
+#, c-format
+msgid "File '%s' deleted"
+msgstr "檔案「%s」已刪除"
+
+#: src/easytag.c:3259
+#, c-format
+msgid ""
+"Can't read directory :\n"
+"'%s'\n"
+"(%s)"
+msgstr ""
+"無法讀取目錄 :\n"
+"「%s」\n"
+"(%s)"
+
+#. Read the directory recursively
+#: src/easytag.c:3287
+msgid "Search in progress..."
+msgstr "搜尋進行中..."
+
+#: src/easytag.c:3304 src/et_core.c:2621
+#, c-format
+msgid "File: '%s'"
+msgstr "檔案:「%s」"
+
+#: src/easytag.c:3354
+#, c-format
+msgid "Found %d file(s) in this directory and subdirectories."
+msgstr "於此目錄及其子目錄中找到 %d 個檔案。"
+
+#: src/easytag.c:3356
+#, c-format
+msgid "Found %d file(s) in this directory."
+msgstr "於此目錄中找到 %d 個檔案。"
+
+#. And refresh the number of files in this directory
+#: src/easytag.c:3369 src/et_core.c:2705
+#, c-format
+msgid "%u file(s)"
+msgstr "%u 個檔案"
+
+#: src/easytag.c:3375
+msgid "No file found in this directory and subdirectories!"
+msgstr "於此目錄及其子目錄中找不到檔案！"
+
+#: src/easytag.c:3377
+msgid "No file found in this directory!"
+msgstr "於此目錄中找不到檔案！"
+
+#: src/easytag.c:3465
+msgid "Searching..."
+msgstr "搜尋中..."
+
+#. Button to stop...
+#: src/easytag.c:3485
+msgid "  STOP the search...  "
+msgstr "  「停止」搜尋...  "
+
+#. Open the last selected scanner
+#: src/easytag.c:4211
+msgid "Select a directory to browse!"
+msgstr "請選擇要瀏覽的目錄！"
+
+#. Menu items
+#: src/easytag.c:4347
+msgid "Tag selected files with this field"
+msgstr "所選的檔案已用此欄位標記。"
+
+#: src/easytag.c:4358
+msgid "Convert '_' and '%20' to spaces"
+msgstr "轉換「_」及「%20」為空格"
+
+#: src/easytag.c:4365 src/scan.c:2314
+msgid "Convert ' ' to '_'"
+msgstr "轉換「 」為「_」"
+
+#. Group: capitalize, ...
+#: src/easytag.c:4376 src/scan.c:2363
+msgid "All uppercase"
+msgstr "全部大寫"
+
+#: src/easytag.c:4383 src/scan.c:2364
+msgid "All downcase"
+msgstr "全部小寫"
+
+#: src/easytag.c:4390 src/scan.c:2365
+msgid "First letter uppercase"
+msgstr "第一個字母大寫"
+
+#: src/easytag.c:4397 src/scan.c:2366
+msgid "First letter uppercase of each word"
+msgstr "每個字的第一個字母大寫"
+
+#. Group: insert/remove spaces
+#: src/easytag.c:4408 src/scan.c:2405
+msgid "Remove spaces"
+msgstr "移除空格"
+
+#: src/easytag.c:4415
+msgid "Insert space before uppercase letter"
+msgstr "在大寫字母前插入空格"
+
+#: src/easytag.c:4422
+msgid "Remove duplicate spaces or underscores"
+msgstr "移除重複的空格或底線"
+
+#. gchar commmand[256];
+#. To send messages to the console...
+#: src/easytag.c:4442 src/easytag.c:4450
+#, c-format
+msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
+msgstr "EasyTAG %s: 異常結束！ (PId: %d)。"
+
+#: src/easytag.c:4443 src/easytag.c:4452
+#, c-format
+msgid "Received signal %s (%d)\a"
+msgstr "已接收信號 %s (%d)\a"
+
+#: src/easytag.c:4445 src/easytag.c:4454
+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:4581
+msgid "Unknown signal"
+msgstr "未知的信號"
+
+#: src/easytag.c:4597
+#, 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 [option] \n"
+"   或: easytag [directory]\n"
+"\n"
+"選項:\n"
+"-------\n"
+"-h, --help        顯示本說明後離開。\n"
+"-v, --version     列出基本資訊後離開。\n"
+"\n"
+"目錄:\n"
+"----------\n"
+"c:/path_to/files  使用絕對路徑載入或，\n"
+"/path_to/files    使用絕對路徑載入或，\n"
+"path_to/files     使用相對路徑。\n"
+"\n"
+
+#: src/easytag.c:4625
+msgid "EasyTAG: Normal exit."
+msgstr "EasyTAG: 正常結束。"
+
+#: src/easytag.c:4672 src/easytag.c:4723
+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:4698
+msgid " Do you really want to exit the program? "
+msgstr "你確定要結束本程式嗎？"
+
+#: src/et_core.c:2518
+msgid "ID3 Tag"
+msgstr "ID3 標籤"
+
+#: src/et_core.c:2524
+msgid "Ogg Vorbis Tag"
+msgstr "Ogg Vorbis 標籤"
+
+#: src/et_core.c:2530
+msgid "FLAC Vorbis Tag"
+msgstr "FLAC Vorbis 標籤"
+
+#: src/et_core.c:2535
+msgid "APE Tag"
+msgstr "APE 標籤"
+
+#: src/et_core.c:2540
+msgid "MP4/M4A/AAC Tag"
+msgstr "MP4/M4A/AAC 標籤"
+
+#: src/et_core.c:2546
+msgid "Wavpack Tag"
+msgstr "Wavpack 標籤"
+
+#: src/et_core.c:2566
+msgid "MP3 File"
+msgstr "MP3 檔案"
+
+#: src/et_core.c:2570
+msgid "MP2 File"
+msgstr "MP2 檔案"
+
+#: src/et_core.c:2576
+msgid "Ogg Vorbis File"
+msgstr "Ogg Vorbis 檔案"
+
+#: src/et_core.c:2582
+msgid "Speex File"
+msgstr "Speex 檔案"
+
+#: src/et_core.c:2588
+msgid "FLAC File"
+msgstr "FLAC 檔案"
+
+#: src/et_core.c:2593
+msgid "MusePack File"
+msgstr "MusePack 檔案"
+
+#: src/et_core.c:2597
+msgid "Monkey's Audio File"
+msgstr "Monkey's Audio 檔案"
+
+#: src/et_core.c:2602
+msgid "MP4/AAC File"
+msgstr "MP4/AAC 檔案"
+
+#: src/et_core.c:2608
+msgid "Wavpack File"
+msgstr "Wavpack 檔案"
+
+#: src/et_core.c:2882
+#, c-format
+msgid "Pictures (%d)"
+msgstr "圖片 (%d)"
+
+#. Bitrate
+#: src/et_core.c:2921 src/flac_header.c:302 src/monkeyaudio_header.c:86
+#: src/mp4_header.c:275 src/mpeg_header.c:367 src/musepack_header.c:88
+#: src/ogg_header.c:257 src/wavpack_header.c:78
+#, c-format
+msgid "%d kb/s"
+msgstr "%d kb/秒"
+
+#. Samplerate
+#: src/et_core.c:2926 src/flac_header.c:307 src/monkeyaudio_header.c:91
+#: src/mp4_header.c:280 src/mpeg_header.c:372 src/musepack_header.c:93
+#: src/ogg_header.c:262 src/wavpack_header.c:83
+#, c-format
+msgid "%d Hz"
+msgstr "%d Hz"
+
+#: src/et_core.c:3066
+#, 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:3069 src/scan.c:668
+msgid "Filename translation"
+msgstr "檔名翻譯"
+
+#: src/et_core.c:4551 src/et_core.c:4559
+#, 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:298 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:312 src/mp4_header.c:286 src/ogg_header.c:267
+#: src/wavpack_header.c:88
+msgid "Channels:"
+msgstr "聲道:"
+
+#: src/flac_tag.c:135 src/flac_tag.c:780 src/flac_tag.c:790
+#, c-format
+msgid "ERROR while opening file: '%s' as FLAC (%s)."
+msgstr "開啟檔案時錯誤: 「%s」為 FLAC (%s)。"
+
+#: src/flac_tag.c:1091
+#, c-format
+msgid "Picture block isn't valid: '%s'"
+msgstr ""
+
+#: src/flac_tag.c:1126 src/ogg_tag.c:853
+#, c-format
+msgid "ERROR: Failed to write comments to file '%s' (%s)."
+msgstr "錯誤: 寫入備註到檔案「%s」(%s) 失敗。"
+
+#: src/flac_tag.c:1131 src/ogg_tag.c:860
+#, c-format
+msgid "Written tag of '%s'"
+msgstr "「%s」標籤已寫入"
+
+#: src/id3_tag.c:488
+#, c-format
+msgid "Removed tag of '%s'"
+msgstr "「%s」標籤已移除"
+
+#: src/id3_tag.c:492 src/id3_tag.c:595
+#, c-format
+msgid "Error while removing ID3v1 tag of '%s' (%s)"
+msgstr "移除「%s」(%s) 的 ID3v1 標籤時錯誤"
+
+#: src/id3_tag.c:494 src/id3_tag.c:567
+#, c-format
+msgid "Error while removing ID3v2 tag of '%s' (%s)"
+msgstr "移除「%s」(%s) 的 ID3v2 標籤時錯誤"
+
+#: src/id3_tag.c:513
+#, c-format
+msgid "Error while updating ID3v2 tag of '%s' (%s)"
+msgstr "更新「%s」(%s) 的 ID3v2 標籤時錯誤"
+
+#: src/id3_tag.c:535
+#, 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 ""
+"你正嘗試將標籤以 Unicode 儲存，但是系統中的 id3lib 是有問題的版本。\n"
+"若你儲存後重新載入此檔案，標籤的某些字元可能無法正確顯示...\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"
+
+#: src/id3_tag.c:587
+#, c-format
+msgid "Error while updating ID3v1 tag of '%s' (%s)"
+msgstr "更新「%s」(%s) 的 ID3v1 標籤時錯誤"
+
+#: src/id3_tag.c:601
+#, c-format
+msgid "Updated tag of '%s'"
+msgstr "「%s」 標籤已更新"
+
+#: src/id3_tag.c:620
+msgid "No error reported"
+msgstr "無錯誤被回報"
+
+#: src/id3_tag.c:622
+msgid "No available memory"
+msgstr "記憶體不足"
+
+#: src/id3_tag.c:624
+msgid "No data to parse"
+msgstr "無資料可供解析"
+
+#: src/id3_tag.c:626
+msgid "Improperly formatted data"
+msgstr "不正確的格式化資料"
+
+#: src/id3_tag.c:628
+msgid "No buffer to write to"
+msgstr "無緩衝區以寫入到"
+
+#: src/id3_tag.c:630
+msgid "Buffer is too small"
+msgstr "緩衝區太小"
+
+#: src/id3_tag.c:632
+msgid "Invalid frame ID"
+msgstr "frame ID 無效"
+
+#: src/id3_tag.c:634
+msgid "Requested field not found"
+msgstr "找不到要求的欄位"
+
+#: src/id3_tag.c:636
+msgid "Unknown field type"
+msgstr "未知的檔案類型"
+
+#: src/id3_tag.c:638
+msgid "Tag is already attached to a file"
+msgstr "標籤已附加到檔案中"
+
+#: src/id3_tag.c:640
+msgid "Invalid tag version"
+msgstr "標籤版本無校"
+
+#: src/id3_tag.c:642
+msgid "No file to parse"
+msgstr "無檔案可供解析"
+
+#: src/id3_tag.c:644
+msgid "Attempting to write to a read-only file"
+msgstr "試圖寫入唯讀檔案"
+
+#: src/id3_tag.c:646
+msgid "Error in compression/uncompression"
+msgstr "壓縮╱解壓縮時錯誤"
+
+#: src/id3_tag.c:648
+msgid "Unknown error message!"
+msgstr "未知的錯誤訊息！"
+
+#: src/id3_tag.c:1222
+#, 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:1224
+msgid "Corrupted file..."
+msgstr "檔案已毀損..."
+
+#: src/log.c:95
+msgid "Log"
+msgstr "記錄"
+
+#: src/misc.c:773
+msgid "Select file..."
+msgstr "選擇檔案..."
+
+#: src/misc.c:778
+msgid "Select directory..."
+msgstr "選擇目錄..."
+
+#: src/misc.c:852
+msgid "Warning..."
+msgstr "警告..."
+
+#: src/misc.c:856
+msgid "No audio player defined!"
+msgstr "未指定播放程式！"
+
+#: src/misc.c:959
+#, c-format
+msgid "Can't execute %s (%s)!\n"
+msgstr "無法執行 %s (%s)！\n"
+
+#. Units Tab of file size (bytes,kilobytes,...)
+#: src/misc.c:1124 src/misc.c:1143
+msgid "B"
+msgstr "B"
+
+#: src/misc.c:1124 src/misc.c:1143
+msgid "KB"
+msgstr "KB"
+
+#: src/misc.c:1124 src/misc.c:1143
+msgid "MB"
+msgstr "MB"
+
+#: src/misc.c:1124 src/misc.c:1143
+msgid "GB"
+msgstr "GB"
+
+#: src/misc.c:1124 src/misc.c:1143
+msgid "TB"
+msgstr "TB"
+
+#: src/misc.c:1238
+msgid "Generate a playlist"
+msgstr "產生播放清單"
+
+#: src/misc.c:1262
+msgid "M3U Playlist Name"
+msgstr "M3U 播放清單名稱"
+
+#: src/misc.c:1275
+msgid "Use directory name"
+msgstr "使用目錄名稱"
+
+#: src/misc.c:1299 src/misc.c:1396
+msgid "Edit Masks"
+msgstr "編輯遮罩條件"
+
+#. Playlist options
+#: src/misc.c:1307
+msgid "Playlist Options"
+msgstr "播放清單選項"
+
+#: src/misc.c:1313
+msgid "Include only the selected files"
+msgstr "只含選擇的檔案"
+
+#: src/misc.c:1316
+msgid ""
+"If activated, only the selected files will be written in the playlist file. "
+"Else, all the files will be written."
+msgstr ""
+"啟用此選項只會產生所選檔案的播放清單檔案。如不取用則會產生所有檔案的播放清"
+"單。"
+
+#: src/misc.c:1323
+msgid "Use full path for files in playlist"
+msgstr "使用完整路徑產生播放清單"
+
+#: src/misc.c:1326
+msgid "Use relative path for files in playlist"
+msgstr "使用相對路徑產生播放清單"
+
+#. Create playlist in parent directory
+#: src/misc.c:1336
+msgid "Create playlist in the parent directory"
+msgstr "建立播放清單於上層目錄"
+
+#: src/misc.c:1339
+msgid "If activated, the playlist will be created in the parent directory."
+msgstr "啟用此選項則播放清單會產生於父目錄 (上層目錄)"
+
+#. DOS Separator
+#: src/misc.c:1343
+msgid "Use DOS directory separator"
+msgstr "使用 DOS 目錄分隔字元"
+
+#: src/misc.c:1348
+msgid ""
+"This option replaces the UNIX directory separator '/' into DOS separator "
+"'\\'."
+msgstr "此選項會用 DOS 格式的「\\」分隔字元取代 UNIX 格式的「/」分隔字元。"
+
+#: src/misc.c:1357
+msgid "Playlist Content"
+msgstr "播放清單內容"
+
+#: src/misc.c:1363
+msgid "Write only list of files"
+msgstr "只列出檔案清單"
+
+#: src/misc.c:1367
+msgid "Write info using filename"
+msgstr "用檔名寫入資訊"
+
+#: src/misc.c:1370
+msgid "Write info using :"
+msgstr "寫入資訊以 :"
+
+#: src/misc.c:1631
+#, c-format
+msgid ""
+"Playlist file '%s' already exists!\n"
+"Overwrite?"
+msgstr ""
+"播放清單檔案「%s」已存在！\n"
+"要覆蓋嗎？"
+
+#: src/misc.c:1632
+msgid "Write Playlist..."
+msgstr "寫入播放清單..."
+
+#. Writing fails...
+#: src/misc.c:1654
+#, c-format
+msgid ""
+"Can't write playlist file '%s'!\n"
+"(%s)"
+msgstr ""
+"無法寫入播放清單檔案「%s」！\n"
+"(%s)"
+
+#: src/misc.c:1667
+#, c-format
+msgid "Written playlist file '%s'"
+msgstr "播放清單檔案「%s」已寫入"
+
+#: src/misc.c:1913
+msgid "CD"
+msgstr "CD"
+
+#: src/misc.c:1922
+msgid "Encoded by"
+msgstr "編碼程式"
+
+#: src/misc.c:1933
+msgid "Search a file"
+msgstr "搜尋檔案"
+
+#: src/misc.c:1973
+msgid ""
+"Type the word to search into files. Or type nothing to display all files."
+msgstr "請輸入要搜尋的文字，不輸入任何文字則會顯示所有檔案。"
+
+#. Where...
+#: src/misc.c:1979
+msgid "In :"
+msgstr "於 :"
+
+#: src/misc.c:1982
+msgid "the File Name"
+msgstr "檔名"
+
+#. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
+#: src/misc.c:1984
+msgid "the Tag"
+msgstr "標籤"
+
+#. Property of the search
+#: src/misc.c:1994 src/prefs.c:323
+msgid "Case sensitive"
+msgstr "大小寫相異"
+
+#: src/misc.c:2427
+#, c-format
+msgid "Found : %d file(s)"
+msgstr "找到 : %d 個檔案"
+
+#: src/misc.c:2690
+msgid "Load the filenames from a TXT file"
+msgstr "從 TXT 檔載入檔名"
+
+#: src/misc.c:2720
+msgid "File :"
+msgstr "檔案 :"
+
+#. Button 'load'
+#. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
+#: src/misc.c:2738
+msgid " Load "
+msgstr " 讀取 "
+
+#: src/misc.c:2761
+#, fuzzy
+msgid "Content of TXT file"
+msgstr "檔案更名確認"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2782 src/misc.c:2876
+#, fuzzy
+msgid "Insert a blank line before the selected line"
+msgstr "於大寫字母前插入空格"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2791 src/misc.c:2885
+#, fuzzy
+msgid "Delete the selected line"
+msgstr "刪除此項目"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2800 src/misc.c:2894 src/misc.c:3367
+msgid "Delete all blank lines"
+msgstr "刪除所有空白項目"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2812 src/misc.c:2906
+#, fuzzy
+msgid "Move up the selected line"
+msgstr "只含選擇的檔案"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2821 src/misc.c:2915
+#, fuzzy
+msgid "Move down the selected line"
+msgstr "只含選擇的檔案"
+
+#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
+#: src/misc.c:2833 src/misc.c:2927 src/misc.c:3391
+msgid "Reload"
+msgstr "重新載入"
+
+#: src/misc.c:2854
+#, fuzzy
+msgid "List of files"
+msgstr "只列出檔案清單"
+
+#: src/misc.c:2949
+#, fuzzy
+msgid "Selected line:"
+msgstr "選擇所有項目"
+
+#: src/misc.c:2967
+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:3355
+msgid "Insert a blank line"
+msgstr "插入空白項目"
+
+#: src/misc.c:3361
+msgid "Delete this line"
+msgstr "刪除此項目"
+
+#: src/misc.c:3376
+#, fuzzy
+msgid "Move up this line"
+msgstr "此遮罩向上移"
+
+#: src/misc.c:3382
+#, 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:106 src/mp4_tag.c:255
+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/秒"
+
+#: src/mpeg_header.c:78
+msgid "Stereo"
+msgstr "立體聲"
+
+#: 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 "單聲道"
+
+#: src/msgbox.c:101
+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: 指定的 Bitstream 不存在或檔案初始化不正確 (檔案:「%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: Bitstream 不是 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 Bitstream 標頭無效 (檔案:「%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: 內部邏輯錯誤，可能是程式錯誤或 Heap/Stack 損壞 (檔案:「%s」)。"
+
+#: src/ogg_header.c:195 src/ogg_tag.c:184 src/ogg_tag.c:632
+#, c-format
+msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
+msgstr "錯誤: 開啟檔案時錯誤:「%s」為 vorbis (%s)。"
+
+#: src/ogg_tag.c:166
+#, c-format
+msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
+msgstr "警告 : Ogg Vorbis 檔案「%s」包含 ID3v2 標籤。"
+
+#: src/picture.c:295
+msgid "Add pictures"
+msgstr "新增封面"
+
+#: src/picture.c:305 src/picture.c:646
+msgid "All Files"
+msgstr "所有檔案"
+
+#: src/picture.c:311 src/picture.c:652
+msgid "PNG and JPEG"
+msgstr "PNG 及 JPEG"
+
+#: src/picture.c:428
+#, c-format
+msgid "Picture Properties %d/%d"
+msgstr "圖片屬性 %d/%d"
+
+#: src/picture.c:458
+msgid "Picture Type"
+msgstr "圖片類型"
+
+#. Description of the picture
+#: src/picture.c:515
+msgid "Picture Description:"
+msgstr "圖片敘述:"
+
+#: src/picture.c:634
+#, c-format
+msgid "Save picture %d/%d"
+msgstr "儲存圖片 %d/%d"
+
+#: src/picture.c:717
+#, c-format
+msgid ""
+"The following file already exists :\n"
+"'%s'\n"
+"Do you want to overwrite?"
+msgstr ""
+"下列檔案已存在 :\n"
+"「%s」\n"
+"你要覆蓋嗎？"
+
+#: src/picture.c:719
+msgid "Save file..."
+msgstr "儲存檔案..."
+
+#: src/picture.c:803
+msgid "JPEG image"
+msgstr "JPEG 圖片"
+
+#: src/picture.c:805
+msgid "PNG image"
+msgstr "PNG 圖片"
+
+#: src/picture.c:807
+msgid "Unknown image"
+msgstr "未知圖片"
+
+#: src/picture.c:818
+msgid "32x32 pixel PNG file icon"
+msgstr "32x32 像素 PNG 圖示"
+
+#: src/picture.c:820
+msgid "Other file icon"
+msgstr "其他圖示"
+
+#: src/picture.c:822
+msgid "Cover (front)"
+msgstr "封面 (前)"
+
+#: src/picture.c:824
+msgid "Cover (back)"
+msgstr "封面 (後)"
+
+#: src/picture.c:826
+msgid "Leaflet page"
+msgstr "小冊子"
+
+#: src/picture.c:828
+msgid "Media (e.g. label side of CD)"
+msgstr "媒體標籤 (例: CD 側邊的標籤)"
+
+#: src/picture.c:830
+msgid "Lead artist/lead performer/soloist"
+msgstr "領銜演唱╱領銜演奏╱獨唱人"
+
+#: src/picture.c:832
+msgid "Artist/performer"
+msgstr "演唱人╱演奏人"
+
+#: src/picture.c:834
+msgid "Conductor"
+msgstr "指揮"
+
+#: src/picture.c:836
+msgid "Band/Orchestra"
+msgstr "樂團╱樂隊"
+
+#: src/picture.c:840
+msgid "Lyricist/text writer"
+msgstr "作詞人╱文字寫作"
+
+#: src/picture.c:842
+msgid "Recording location"
+msgstr "錄音地點"
+
+#: src/picture.c:844
+msgid "During recording"
+msgstr "錄音中"
+
+#: src/picture.c:846
+msgid "During performance"
+msgstr "演奏中"
+
+#: src/picture.c:848
+msgid "Movie/video screen capture"
+msgstr "電影╱影片抓圖"
+
+#: src/picture.c:850
+msgid "A bright coloured fish"
+msgstr "明亮高彩魚"
+
+#: src/picture.c:852
+msgid "Illustration"
+msgstr "插圖"
+
+#: src/picture.c:854
+msgid "Band/Artist logotype"
+msgstr "樂團╱演唱者標誌"
+
+#: src/picture.c:856
+msgid "Publisher/studio logotype"
+msgstr "出版商╱錄音室標誌"
+
+#: src/picture.c:860
+msgid "Unknown picture type"
+msgstr "未知圖片類型"
+
+#: src/picture.c:888 src/picture.c:899
+msgid "pixels"
+msgstr "像素"
+
+#: src/picture.c:889 src/picture.c:900
+msgid "Type"
+msgstr "類型"
+
+#: src/picture.c:901
+msgid "Description"
+msgstr "敘述"
+
+#: src/picture.c:957
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: src/picture.c:1015
+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:1018
+msgid "Loading Picture File..."
+msgstr "圖片載入中..."
+
+#: src/picture.c:1032
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: src/picture.c:1120
+#, c-format
+msgid ""
+"Can't open file :\n"
+"'%s'!\n"
+"(%s)"
+msgstr ""
+"無法開啟檔案 :\n"
+"「%s」！\n"
+"(%s)"
+
+#: src/picture.c:1134
+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 /path_to/mp3_files)。"
+
+#. 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 及 CD-Rom)"
+
+#: 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:834 src/prefs.c:903
+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:843 src/prefs.c:912
+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」填滿剩餘的位數 (例: 設為兩位數: '05', "
+"'09', '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 "於 ID3v2 標籤設定 CRC32"
+
+#. 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 "啟用此選項則會新增或更新 MP3 檔案開頭的 ID3v2.4 標籤，不選則會刪除。"
+
+#. 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:871
+msgid "Charset:"
+msgstr "字元集:"
+
+#. Unicode
+#: src/prefs.c:777
+msgid "Unicode "
+msgstr "Unicode "
+
+#: src/prefs.c:785
+msgid "Unicode type to use"
+msgstr "要使用的 Unicode 類型"
+
+#: 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:887
+msgid "Additional settings for iconv():"
+msgstr "iconv() 的其他設定: "
+
+#: src/prefs.c:823 src/prefs.c:892
+msgid "No"
+msgstr "無"
+
+#: src/prefs.c:826 src/prefs.c:895
+#, fuzzy
+msgid ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
+msgstr "此選項啟用後，當字元無法以目的編碼表示時，會用相似的字元代替。"
+
+#: src/prefs.c:831 src/prefs.c:900
+msgid "//TRANSLIT"
+msgstr "//TRANSLIT"
+
+#: src/prefs.c:840 src/prefs.c:909
+msgid "//IGNORE"
+msgstr "//IGNORE"
+
+#. ID3v1 tags
+#: src/prefs.c:848
+msgid "ID3v1 tags"
+msgstr "ID3v1 標籤"
+
+#. Write ID3v1 tag
+#: src/prefs.c:862
+msgid "Write ID3v1.x tag"
+msgstr "寫入 ID3v1.x 標籤"
+
+#: src/prefs.c:865
+msgid ""
+"If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
+"files. Else it will be stripped."
+msgstr "啟用此選項則會新增或更新 MP3 檔案尾端的 ID3v1 標籤，不選則會刪除。"
+
+#: src/prefs.c:882
+msgid "Character set used to write ID3v1 tag data in the file."
+msgstr "要寫入 ID3v1 檔案標籤所用的字元集。"
+
+#. Character Set for reading tag
+#: src/prefs.c:917
+msgid "Character Set for reading ID3 tags"
+msgstr "讀取 ID3 標籤所用的字元集"
+
+#: src/prefs.c:931
+msgid "Non-standart:"
+msgstr "非標準: "
+
+#: src/prefs.c:936
+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 之前的版本可以於 ISO-8859-1 欄位中儲存 UTF-8 編碼，但這是不正確"
+"的！轉換這些欄位為 Unicode 編碼的步驟: 啟用本選項並選擇 UTF-8，你還必須同時啟"
+"用「若無法使用 UNICODE 編碼時，嘗試使用 ISO-8859-1 儲存標籤 (建議選用)」或"
+"「總是以 UNICODE 編碼儲存」。\n"
+"  - 如果無法使用 Unicode，俄文使用者可以選擇「Windows-1251」字元集讀取在 "
+"Windows 下寫入的標籤，選擇「KOI8-R」讀取在 Unix 系統下寫入的標籤。"
+
+#: src/prefs.c:954
+msgid "Character set used to read tag data in the file."
+msgstr "要讀取檔案標籤所用的字元集。"
+
+#.
+#. * Scanner
+#.
+#: src/prefs.c:969 src/prefs.c:970
+msgid "Scanner"
+msgstr "掃描"
+
+#. Character conversion for the 'Fill Tag' scanner (=> FTS...)
+#: src/prefs.c:982
+msgid "Fill Tag Scanner - Character Conversion"
+msgstr "標籤填入掃描 - 字元轉換"
+
+#: src/prefs.c:988 src/prefs.c:1014
+msgid "Convert underscore character '_' and string '%20' to space ' '"
+msgstr "轉換底線字元「_」及字串「%20」為空格「 」"
+
+#: src/prefs.c:990 src/prefs.c:1016
+msgid "Convert space ' ' to underscore '_'"
+msgstr "轉換空格「 」為底線「_」"
+
+#: src/prefs.c:1002 src/prefs.c:1004
+msgid ""
+"If activated, this conversion will be used when applying a mask from the "
+"scanner for tags."
+msgstr "啟用此選項，則標籤掃描要以遮罩套用時會使用此轉換規則。"
+
+#. Character conversion for the 'Rename File' scanner (=> RFS...)
+#: src/prefs.c:1008
+msgid "Rename File Scanner - Character Conversion"
+msgstr "檔案更名掃描 - 字元轉換"
+
+#: src/prefs.c:1028 src/prefs.c:1030
+msgid ""
+"If activated, this conversion will be used when applying a mask from the "
+"scanner for filenames."
+msgstr "啟用此選項，則檔名掃描要以遮罩套用時會使用此轉換規則。"
+
+#. Character conversion for the 'Process Fields' scanner (=> PFS...)
+#: src/prefs.c:1034
+msgid "Process Fields Scanner - Character Conversion"
+msgstr "欄位處理掃描 - 字元轉換"
+
+#. Don't convert some words like to, feat. first letter uppercase.
+#: src/prefs.c:1041
+msgid ""
+"Don't uppercase first letter of words for some prepositions and articles."
+msgstr "某些介系詞和冠詞的第一個字母不要轉為大寫"
+
+#: src/prefs.c:1045
+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:1051
+msgid "Scanner Window"
+msgstr "掃描視窗"
+
+#: src/prefs.c:1057
+msgid "Open the Scanner Window on startup"
+msgstr "啟動時開啟掃描視窗"
+
+#: src/prefs.c:1060
+msgid ""
+"Activate this option to open automatically the scanner window when EasyTAG "
+"starts."
+msgstr "啟用此選項後，啟動 EasyTAG 時會自動開啟掃描視窗。"
+
+#: src/prefs.c:1063
+msgid "Scanner window always on top"
+msgstr "掃描視窗永遠在最上層"
+
+#: src/prefs.c:1066
+msgid ""
+"If activated, the window which contains the masks will stay always over the "
+"main window."
+msgstr "啟用此選項後，含遮罩條件的掃描視窗會永遠顯示在主視窗之上。"
+
+#. Other options
+#: src/prefs.c:1071
+msgid "Fields"
+msgstr "欄位"
+
+#. Overwrite text into tag fields
+#: src/prefs.c:1078
+msgid "Overwrite fields when scanning tag"
+msgstr "標籤掃描時覆蓋現有欄位"
+
+#: src/prefs.c:1081
+msgid ""
+"If activated, the scanner will replace existing text in fields by the new "
+"one. If deactivated, only blank fields of the tag will be filled."
+msgstr ""
+"啟用此選項後，標籤掃描會用新資料覆蓋已存在的欄位，若停用此選項，則只有空白欄"
+"位會填入新資料。"
+
+#: src/prefs.c:1092
+msgid "Set this text as default comment :"
+msgstr "設定要寫入備註的預設文字 :"
+
+#: src/prefs.c:1095
+msgid ""
+"Activate this option if you want to put the following string into the "
+"comment field when using the 'Fill Tag' scanner."
+msgstr "啟用此選項，則使用「標籤填入」掃描時會自動於備註欄位寫入下列字串。"
+
+#. CRC32 comment
+#: src/prefs.c:1112
+msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
+msgstr "使用 CRC32 為預設的備註 (只對 ID3 標籤有效)"
+
+#: src/prefs.c:1116
+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:1127 src/prefs.c:1128
+msgid "CD Data Base"
+msgstr "CD 資料庫"
+
+#. CDDB Server Settings (Automatic Search)
+#: src/prefs.c:1137
+msgid "Server Settings for Automatic Search"
+msgstr "自動搜尋的伺服器設定"
+
+#: src/prefs.c:1146 src/prefs.c:1185 src/prefs.c:1219
+msgid "Name :"
+msgstr "名稱 :"
+
+#: src/prefs.c:1165 src/prefs.c:1193 src/prefs.c:1228 src/prefs.c:1316
+msgid "Port :"
+msgstr "埠 :"
+
+#: src/prefs.c:1175 src/prefs.c:1203 src/prefs.c:1238
+msgid "CGI Path :"
+msgstr "CGI 路徑 :"
+
+#. CDDB Server Settings (Manual Search)
+#: src/prefs.c:1211
+msgid "Server Settings for Manual Search"
+msgstr "手動搜尋的伺服器設定"
+
+#. Local access for CDDB (Automatic Search)
+#: src/prefs.c:1246
+msgid "Local CD Data Base"
+msgstr "本機 CD 資料庫"
+
+#: src/prefs.c:1254
+msgid "Path :"
+msgstr "路徑 :"
+
+#: src/prefs.c:1265
+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 ""
+"指定本機 CD 資料庫的路徑。本機資料庫要包含下面七個目錄: 'blues', "
+"'classical', 'country', 'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', "
+"'soundtrack' 及 'misc'。"
+
+#. CDDB Proxy Settings
+#: src/prefs.c:1291
+msgid "Proxy Settings"
+msgstr "Proxy 設定"
+
+#: src/prefs.c:1300
+msgid "Use a proxy"
+msgstr "使用 Proxy"
+
+#: src/prefs.c:1303
+msgid "Set active the settings of the proxy server."
+msgstr "設定有效 Proxy 伺服器的設定。"
+
+#: src/prefs.c:1308
+msgid "Host Name :"
+msgstr "主機名稱 :"
+
+#: src/prefs.c:1315
+msgid "Name of the proxy server."
+msgstr "Proxy 伺服器名稱。"
+
+#: src/prefs.c:1323
+msgid "Port of the proxy server."
+msgstr "Proxy 伺服器埠號。"
+
+#: src/prefs.c:1328
+msgid "User Name :"
+msgstr "使用者名稱 :"
+
+#: src/prefs.c:1335
+msgid "Name of user for the the proxy server."
+msgstr "Proxy 伺服器的使用者名稱。"
+
+#: src/prefs.c:1336
+msgid "User Password :"
+msgstr "使用者密碼 :"
+
+#: src/prefs.c:1344
+msgid "Password of user for the the proxy server."
+msgstr "Proxy 伺服器的使用者密碼。"
+
+#. Track Name list (CDDB results)
+#: src/prefs.c:1349
+msgid "Track Name List"
+msgstr "曲名清單"
+
+#: src/prefs.c:1356
+msgid ""
+"Select corresponding audio file (according position or DLM if activated "
+"below)"
+msgstr "選擇相符的聲音檔案 (根據順序或 DLM)"
+
+#: src/prefs.c:1360
+msgid ""
+"If activated, when selecting a line in the list of tracks name, the "
+"corresponding audio file in the main list will be also selected."
+msgstr ""
+"若啟用此選項，當於曲名欄位中選擇項目時會自動於主清單選擇相符的聲音檔案。"
+
+#. Check box to use DLM (also used in the cddb window)
+#: src/prefs.c:1365
+msgid ""
+"Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
+"files (using filename)"
+msgstr "使用 Levenshtein 演算法 (DLM) 依檔名比對符合的曲名"
+
+#.
+#. * Confirmation
+#.
+#: src/prefs.c:1380 src/prefs.c:1381
+msgid "Confirmation"
+msgstr "確認"
+
+#: src/prefs.c:1389
+msgid "Confirm exit from program"
+msgstr "離開程式確認"
+
+#: src/prefs.c:1392
+msgid ""
+"If activated, opens a dialog box to ask confirmation before exiting the "
+"program."
+msgstr "啟用此選項後在離開程式前會開啟對話方塊再次詢問。"
+
+#: src/prefs.c:1395
+msgid "Confirm writing of file tag"
+msgstr "寫入檔案標籤確認"
+
+#: src/prefs.c:1399
+msgid "Confirm renaming of file"
+msgstr "檔案更名確認"
+
+#: src/prefs.c:1403
+msgid "Confirm deleting of file"
+msgstr "檔案刪除確認"
+
+#: src/prefs.c:1407
+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:1429
+msgid "Apply changes (but don't save) and close this window"
+msgstr "套用變更 (但不儲存) 並關閉視窗"
+
+#: src/prefs.c:1438
+msgid "Close this window without saving"
+msgstr "不儲存關閉視窗"
+
+#: src/prefs.c:1446
+msgid "Save changes and close this window"
+msgstr "儲存變更並關閉視窗"
+
+#. For translators : be aware to NOT translate '%.*d' in this string
+#: src/prefs.c:1479
+#, c-format
+msgid "(Example : %.*d_-_Track_name_1.mp3)"
+msgstr "(例如: %.*d_-_Track_name_1.mp3)"
+
+#: src/prefs.c:1625
+msgid "Changes applied"
+msgstr "變更已套用"
+
+#: src/prefs.c:1644 src/setting.c:867
+msgid "Configuration saved"
+msgstr "設定已儲存"
+
+#: src/prefs.c:1651
+msgid "Configuration unchanged"
+msgstr "設定未變更"
+
+#: src/prefs.c:1743
+#, 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:1745
+msgid "Not a directory"
+msgstr "不是目錄"
+
+#: src/prefs.c:1861
+#, c-format
+msgid "The audio file player '%s' can't be found!"
+msgstr "找不到播放程式「%s」！"
+
+#: src/scan.c:178
+msgid "Fill Tag"
+msgstr "標籤填入"
+
+#: src/scan.c:179
+msgid "Rename File and Directory"
+msgstr "檔案及目錄更名"
+
+#: src/scan.c:180
+msgid "Process Fields"
+msgstr "欄位處理"
+
+#: src/scan.c:357
+msgid "Tag successfully scanned..."
+msgstr "標籤已成功掃描..."
+
+#: src/scan.c:359
+#, c-format
+msgid "Tag successfully scanned...(%s)"
+msgstr "標籤已成功掃描...(%s)"
+
+#: src/scan.c:399
+#, c-format
+msgid ""
+"Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"
+msgstr "標籤掃描: 真奇怪...找不到副檔名「%s」於檔名「%s」！"
+
+#: src/scan.c:481 src/scan.c:510
+#, c-format
+msgid "Scan Error: can't find separator '%s' within '%s'"
+msgstr "掃描錯誤: 找不到分隔字元「%s」於「%s」"
+
+#: src/scan.c:667
+#, c-format
+msgid "Could not convert filename '%s' into system filename encoding."
+msgstr "無法轉換檔名「%s」為系統檔名編碼。"
+
+#: src/scan.c:697
+msgid "New file name successfully scanned..."
+msgstr "新檔名已成功掃描..."
+
+#: src/scan.c:700
+#, 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:1978
+msgid "Tag and File Name scan"
+msgstr "標籤及檔名掃描"
+
+#. Option Menu
+#: src/scan.c:2000
+msgid "Scanner:"
+msgstr "掃描:"
+
+#. Selection of the item made at the end of the function
+#: src/scan.c:2022
+msgid "Select the type of scanner to use"
+msgstr "選擇要掃描的類型"
+
+#: src/scan.c:2031
+msgid "Open scanner window / Scan selected files"
+msgstr "開啟掃描視窗╱掃描所選檔案"
+
+#: src/scan.c:2044
+msgid "Scanner Options"
+msgstr "掃描選項"
+
+#: src/scan.c:2053
+msgid "Show / Hide Masks Editor"
+msgstr "顯示╱隱藏遮罩條件編輯"
+
+#: src/scan.c:2063
+msgid "Show / Hide Legend"
+msgstr "顯示╱隱藏說明"
+
+#: src/scan.c:2073
+msgid "Close this window"
+msgstr "關閉視窗"
+
+#: src/scan.c:2101
+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:2127
+msgid "Fill tag preview..."
+msgstr "標籤填入預覽..."
+
+#: src/scan.c:2154
+msgid "Prefix mask with current path"
+msgstr "目前路徑的前置遮罩"
+
+#: src/scan.c:2167
+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:2194
+msgid "Rename file preview..."
+msgstr "檔案更名預覽..."
+
+#: src/scan.c:2214
+msgid "Select fields:"
+msgstr "選擇欄位:"
+
+#: src/scan.c:2217
+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:2220
+msgid "F"
+msgstr "檔名"
+
+#: src/scan.c:2221
+msgid "Process file name field"
+msgstr "處理檔名欄位"
+
+#. Advice for Translators : set the first letter of title translated
+#: src/scan.c:2223
+msgid "T"
+msgstr "曲名"
+
+#: src/scan.c:2224
+msgid "Process title field"
+msgstr "處理曲名欄位"
+
+#. Advice for Translators : set the first letter of artist translated
+#: src/scan.c:2226
+msgid "Ar"
+msgstr "歌手"
+
+#: src/scan.c:2227
+msgid "Process file artist field"
+msgstr "處理演唱者欄位"
+
+#. Advice for Translators : set the first letter of album translated
+#: src/scan.c:2229
+msgid "Al"
+msgstr "專輯"
+
+#: src/scan.c:2230
+msgid "Process album field"
+msgstr "處理專輯欄位"
+
+#. Advice for Translators : set the first letter of genre translated
+#: src/scan.c:2232
+msgid "G"
+msgstr "曲風"
+
+#: src/scan.c:2233
+msgid "Process genre field"
+msgstr "處理曲風欄位"
+
+#. Advice for Translators : set the first letter of comment translated
+#: src/scan.c:2235
+msgid "Cm"
+msgstr "備註"
+
+#: src/scan.c:2236
+msgid "Process comment field"
+msgstr "處理備註欄位"
+
+#. Advice for Translators : set the first letter of composer translated
+#: src/scan.c:2238
+msgid "Cp"
+msgstr "作曲"
+
+#: src/scan.c:2239
+msgid "Process composer field"
+msgstr "處理作曲者欄位"
+
+#. Advice for Translators : set the first letter of orig artist translated
+#: src/scan.c:2241
+msgid "O"
+msgstr "原唱"
+
+#: src/scan.c:2242
+msgid "Process original artist field"
+msgstr "處理原唱者欄位"
+
+#. Advice for Translators : set the first letter of copyright translated
+#: src/scan.c:2244
+msgid "Cr"
+msgstr "版權"
+
+#: src/scan.c:2245
+msgid "Process copyright field"
+msgstr "處理版權所有者欄位"
+
+#. Advice for Translators : set the first letter of URL translated
+#: src/scan.c:2247
+msgid "U"
+msgstr "網址"
+
+#: src/scan.c:2248
+msgid "Process URL field"
+msgstr "處理網址欄位"
+
+#. Advice for Translators : set the first letter of encoder name translated
+#: src/scan.c:2250
+msgid "E"
+msgstr "程式"
+
+#: src/scan.c:2251
+msgid "Process encoder name field"
+msgstr "處理邊把程式欄位"
+
+#: src/scan.c:2297
+msgid "Invert Selection"
+msgstr "反向選擇"
+
+#: src/scan.c:2306
+msgid "Select/Unselect All."
+msgstr "全選╱全部不選"
+
+#. Group: character conversion
+#: src/scan.c:2313
+msgid "Convert '_' and '%20' to ' '"
+msgstr "轉換「_」及「%20」為「 」"
+
+#: src/scan.c:2319
+msgid "Convert:"
+msgstr "轉換: "
+
+#: src/scan.c:2321
+msgid "to: "
+msgstr "為: "
+
+#: src/scan.c:2350
+msgid ""
+"The underscore character or the string '%20' are replaced by one space. "
+"Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
+msgstr ""
+"將底線或「%20」字串取代成空格，例如:「Text%20In%20An_Entry」會變「Text In An "
+"Entry」。"
+
+#: src/scan.c:2353
+msgid ""
+"The space character is replaced by one underscore character. Example, "
+"before: 'Text In An Entry', after: 'Text_In_An_Entry'."
+msgstr "將空格取代成底線，例如:「Text In An Entry」會變「Text_In_An_Entry」。"
+
+#: src/scan.c:2356
+msgid ""
+"Replace a string by an other one. Note that the search is case sensitive."
+msgstr ""
+
+#: src/scan.c:2388
+msgid ""
+"Convert all words in all fields to upper case. Example, before: 'Text IN AN "
+"entry', after: 'TEXT IN AN ENTRY'."
+msgstr ""
+"轉換所有欄位的文字為大寫，例如:「Text IN AN entry」會變「TEXT IN AN ENTRY」。"
+
+#: src/scan.c:2391
+msgid ""
+"Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
+"entry', after: 'text in an entry'."
+msgstr ""
+"轉換所有欄位的文字為小寫，例如:「TEXT IN an entry」會變「text in an entry」。"
+
+#: src/scan.c:2394
+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 ""
+"轉換所有欄位的第一個字母為大寫，例如:「text IN An ENTRY」會變「Text in an "
+"entry」。"
+
+#: src/scan.c:2397
+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 ""
+"轉換所有欄位每個文字的第一個字母為大寫，例如:「Text in an ENTRY」會變「Text "
+"In An Entry」。"
+
+#: src/scan.c:2406
+msgid "Insert a space before an uppercase letter"
+msgstr "於大寫字母前插入空格"
+
+#: src/scan.c:2407
+msgid "Remove duplicates of space or underscore"
+msgstr "移除重複的空格或底線"
+
+#: src/scan.c:2425
+msgid ""
+"All spaces between words are removed. Example, before: 'Text In An Entry', "
+"after: 'TextInAnEntry'."
+msgstr ""
+"移除所有文字間的空格，例如: 「Text In An Entry」會變「TextInAnEntry」。"
+
+#: src/scan.c:2428
+msgid ""
+"A space is inserted before each upper case letter. Example, before: "
+"'TextInAnEntry', after: 'Text In An Entry'."
+msgstr ""
+"所有大寫字母前都插入空格，例如: 「TextInAnEntry」會變「Text In An Entry」。"
+
+#: src/scan.c:2431
+msgid ""
+"Duplicated spaces or underscores are removed. Example, before: "
+"'Text__In__An   Entry', after: 'Text_In_An Entry'."
+msgstr ""
+"移除重複的空格或底線，例如:「Text__In__An   Entry」會變「Text_In_An Entry」。"
+
+#.
+#. * Frame to display codes legend
+#.
+#: src/scan.c:2437
+msgid "Legend"
+msgstr "說明"
+
+#: src/scan.c:2443
+#, c-format
+msgid "%a : artist"
+msgstr "%a : 演唱者"
+
+#: src/scan.c:2446
+msgid "%b : album"
+msgstr "%b : 專輯"
+
+#: src/scan.c:2449
+#, c-format
+msgid "%c : comment"
+msgstr "%c : 備註"
+
+#: src/scan.c:2452
+#, c-format
+msgid "%p : composer"
+msgstr "%p : 作曲者"
+
+#: src/scan.c:2455
+msgid "%r : copyright"
+msgstr "%r : 版權所有"
+
+#: src/scan.c:2458
+#, c-format
+msgid "%d : disc number"
+msgstr "%d : 光碟編號"
+
+#: src/scan.c:2461
+#, c-format
+msgid "%e : encoded by"
+msgstr "%e : 編碼程式"
+
+#: src/scan.c:2464
+#, c-format
+msgid "%g : genre"
+msgstr "%g : 曲風"
+
+#: src/scan.c:2467
+#, c-format
+msgid "%i : ignored"
+msgstr "%i : 已忽略"
+
+#: src/scan.c:2470
+msgid "%l : number of tracks"
+msgstr "%l : 曲目總數"
+
+#: src/scan.c:2473
+#, c-format
+msgid "%o : orig. artist"
+msgstr "%o : 原唱者"
+
+#: src/scan.c:2476
+#, c-format
+msgid "%n : track"
+msgstr "%n : 曲目編號"
+
+#: src/scan.c:2479
+msgid "%t : title"
+msgstr "%t : 曲名"
+
+#: src/scan.c:2482
+#, c-format
+msgid "%u : URL"
+msgstr "%u : 網址"
+
+#: src/scan.c:2485
+msgid "%y : year"
+msgstr "%y : 發行年份"
+
+#.
+#. * Masks Editor
+#.
+#: src/scan.c:2492
+msgid "Mask Editor"
+msgstr "遮罩條件編輯"
+
+#: src/scan.c:2549
+msgid "Create New Mask"
+msgstr "建立新遮罩"
+
+#: src/scan.c:2559
+msgid "Move Up this Mask"
+msgstr "此遮罩向上移"
+
+#: src/scan.c:2569
+msgid "Move Down this Mask"
+msgstr "此遮罩向下移"
+
+#: src/scan.c:2579
+msgid "Duplicate Mask"
+msgstr "複製遮罩"
+
+#: src/scan.c:2589
+msgid "Add Default Masks"
+msgstr "加入預設遮罩"
+
+#: src/scan.c:2599
+msgid "Remove Mask"
+msgstr "移除遮罩"
+
+#: src/scan.c:2609
+msgid "Save Masks"
+msgstr "儲存遮罩"
+
+#: src/scan.c:3186
+msgid "New_mask"
+msgstr "新遮罩條件"
+
+#: src/scan.c:3224
+msgid "Copy: No row selected!"
+msgstr "複製: 未選擇項目！"
+
+#: src/scan.c:3330
+msgid "Remove: No row selected!"
+msgstr "移除: 未選擇項目！"
+
+#: src/scan.c:3377
+msgid "Move Up: No row selected!"
+msgstr "向上移: 未選擇項目！"
+
+#: src/scan.c:3430
+msgid "Move Down: No row selected!"
+msgstr "向下移: 未選擇項目！"
+
+#: src/setting.c:888
+#, c-format
+msgid "ERROR: Can't write config file: %s (%s)"
+msgstr "錯誤: 無法寫入組態檔案: %s (%s)"
+
+#: src/setting.c:1031 src/setting.c:1068
+#, c-format
+msgid "Can't open configuration file '%s' (%s)"
+msgstr "無法開啟組態檔案「%s」(%s)"
+
+#: src/setting.c:1032
+msgid "Loading default configuration..."
+msgstr "載入預設組態..."
+
+#: src/setting.c:1132 src/setting.c:1139 src/setting.c:1146 src/setting.c:1153
+#: src/setting.c:1160 src/setting.c:1167 src/setting.c:1174 src/setting.c:1181
+#: src/setting.c:1188 src/setting.c:1195 src/setting.c:1202 src/setting.c:1209
+#: src/setting.c:1216 src/setting.c:1223 src/setting.c:1230 src/setting.c:1237
+#: src/setting.c:1244
+#, c-format
+msgid "Can't create or open file '%s' (%s)"
+msgstr "無法建立或開啟檔案「%s」(%s)"
+
+#: src/setting.c:1277
+#, c-format
+msgid "ERROR: Can't write list to file: %s (%s)"
+msgstr "錯誤: 無法寫入檔案清單: %s (%s)"
+
+#. Fall back to defaults
+#: src/setting.c:1359
+msgid "Loading default 'Fill Tag' masks..."
+msgstr "載入預設「標籤填入」遮罩..."
+
+#. Fall back to defaults
+#: src/setting.c:1387
+msgid "Loading default 'Rename File' masks..."
+msgstr "載入預設「檔案更名」遮罩..."
+
+#. Fall back to defaults
+#: src/setting.c:1414
+msgid "Loading default 'Rename Directory' masks..."
+msgstr "載入預設「目錄更名」遮罩..."
+
+#: src/setting.c:1607
+msgid "ERROR: The environment variable HOME is not defined!"
+msgstr "錯誤: 環境變數 HOME 未定義！"
+
+#: src/setting.c:1623
+#, 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 Bitstream."
+
+#: src/vcedit.c:307
+msgid "Error reading first page of Ogg bitstream."
+msgstr "讀取 Ogg Bitstream 第一頁時錯誤。"
+
+#: 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 Bitstream 包含既非 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 標頭結尾前有 EOF。"
+
+#: 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:178
+#, 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:183
+#, 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:194
+#, 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:201
+#, c-format
+msgid "Function '%s' not found in dll '%s'"
+msgstr "找不到函數「%s」於 DLL「%s」中"
+
+#. Log_Print(_("Audio player: '%s'"), player);
+#: src/win32/win32dep.c:302
+#, 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:442
+#, c-format
+msgid "EasyTAG settings dir: '%s'"
+msgstr "EasyTAG 設定目錄:「%s」"
+
+#~ msgid " OK "
+#~ msgstr " 確定 "
+
+#~ msgid " Yes "
+#~ msgstr " 是 "
+
+#~ msgid " No "
+#~ msgstr " 否 "
+
+#~ msgid " Apply "
+#~ msgstr " 套用 "
+
+#~ msgid " Save "
+#~ msgstr " 儲存 "
+
+#~ msgid " Cancel "
+#~ msgstr " 取消 "
+
+#~ msgid " Close "
+#~ msgstr " 關閉 "
+
+#~ msgid " Write "
+#~ msgstr " 寫入 "
+
+#~ msgid " Execute "
+#~ msgstr " 執行 "
+
+#~ msgid " Search "
+#~ msgstr " 搜尋 "
+
+#~ msgid " Browse... "
+#~ 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)"
+
+#~ msgid ""
+#~ "The entered path is invalid!:\n"
+#~ "%s\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "輸入的路徑無效！:\n"
+#~ "%s\n"
+#~ "(%s)"
+
+#~ msgid "Loaded File Content :"
+#~ msgstr "已載入檔案內容 :"
+
+#~ msgid "Files Name List :"
+#~ msgstr "檔名清單 : "
+
+#~ msgid "Replace a character by an other one."
+#~ msgstr "將字元用其他文字取代。"
diff --git a/src/Makefile.am b/src/Makefile.am
index 9383d83..5e9961d 100755..100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,6 +11,8 @@ easytag_SOURCES = \
  ape_tag.h \
  bar.c \
  bar.h \
+ base64.c \
+ base64.h \
  browser.c \
  browser.h \
  cddb.c \
@@ -75,10 +77,15 @@ EXTRA_DIST = \
  win32/resource.h \
  win32/win32dep.c \
  win32/win32dep.h \
- win32/win_easytag.c
+ win32/win_easytag.c \
+ win32/nsis/easytag-header.bmp \
+ win32/nsis/easytag-install.bmp \
+ win32/nsis/easytag-install.ico \
+ win32/nsis/easytag-uninstall.bmp 
 
 easytag_LDADD = $(GTK_LIBS) libmpg123/libmpg123.a libapetag/libapetag.a  id3lib/libid3bugfix.a
 
 localedir = $(datadir)/locale
 PACKAGE_DATA_DIR = $(datadir)/$(PACKAGE)
-INCLUDES = -DLOCALE=\"$(localedir)\" -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\"
+INCLUDES = -DLOCALEDIR=\"$(localedir)\" \
+           -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\"
diff --git a/src/Makefile.in b/src/Makefile.in
index 858e54f..6367466 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -46,11 +46,11 @@ am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_easytag_OBJECTS = about.$(OBJEXT) ape_tag.$(OBJEXT) bar.$(OBJEXT) \
-	browser.$(OBJEXT) cddb.$(OBJEXT) charset.$(OBJEXT) \
-	crc32.$(OBJEXT) dlm.$(OBJEXT) easytag.$(OBJEXT) \
-	et_core.$(OBJEXT) flac_header.$(OBJEXT) flac_tag.$(OBJEXT) \
-	id3_tag.$(OBJEXT) id3v24_tag.$(OBJEXT) log.$(OBJEXT) \
-	misc.$(OBJEXT) monkeyaudio_header.$(OBJEXT) \
+	base64.$(OBJEXT) browser.$(OBJEXT) cddb.$(OBJEXT) \
+	charset.$(OBJEXT) crc32.$(OBJEXT) dlm.$(OBJEXT) \
+	easytag.$(OBJEXT) et_core.$(OBJEXT) flac_header.$(OBJEXT) \
+	flac_tag.$(OBJEXT) id3_tag.$(OBJEXT) id3v24_tag.$(OBJEXT) \
+	log.$(OBJEXT) misc.$(OBJEXT) monkeyaudio_header.$(OBJEXT) \
 	mpeg_header.$(OBJEXT) mp4_header.$(OBJEXT) mp4_tag.$(OBJEXT) \
 	musepack_header.$(OBJEXT) msgbox.$(OBJEXT) \
 	ogg_header.$(OBJEXT) ogg_tag.$(OBJEXT) picture.$(OBJEXT) \
@@ -234,6 +234,8 @@ easytag_SOURCES = \
  ape_tag.h \
  bar.c \
  bar.h \
+ base64.c \
+ base64.h \
  browser.c \
  browser.h \
  cddb.c \
@@ -298,11 +300,17 @@ EXTRA_DIST = \
  win32/resource.h \
  win32/win32dep.c \
  win32/win32dep.h \
- win32/win_easytag.c
+ win32/win_easytag.c \
+ win32/nsis/easytag-header.bmp \
+ win32/nsis/easytag-install.bmp \
+ win32/nsis/easytag-install.ico \
+ win32/nsis/easytag-uninstall.bmp 
 
 easytag_LDADD = $(GTK_LIBS) libmpg123/libmpg123.a libapetag/libapetag.a  id3lib/libid3bugfix.a
 PACKAGE_DATA_DIR = $(datadir)/$(PACKAGE)
-INCLUDES = -DLOCALE=\"$(localedir)\" -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\"
+INCLUDES = -DLOCALEDIR=\"$(localedir)\" \
+           -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\"
+
 all: all-recursive
 
 .SUFFIXES:
@@ -377,6 +385,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/about.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ape_tag.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base64.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/browser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cddb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/charset.Po@am__quote@
diff --git a/src/Makefile.mingw b/src/Makefile.mingw
index aede25d..dd86f83 100755..100644
--- a/src/Makefile.mingw
+++ b/src/Makefile.mingw
@@ -51,6 +51,7 @@ LIB_PATHS =		`pkg-config --libs gtk+-2.0` \
 				-lid3 \
 				-lid3tag \
 				-liconv \
+				-lspeex \
 				-lstdc++ \
 				-lz \
 				-lwavpack \
@@ -66,6 +67,7 @@ RC_SRC = win32/easytag.rc
 DLL_C_SRC = about.c \
     ape_tag.c \
     bar.c \
+    base64.c \
     browser.c \
     charset.c \
     cddb.c \
diff --git a/src/about.c b/src/about.c
index f6efc08..3b19a68 100644
--- a/src/about.c
+++ b/src/about.c
@@ -32,6 +32,9 @@
 #   include <id3.h>
 #   endif
 #endif
+#ifdef ENABLE_FLAC
+#   include <FLAC/metadata.h>
+#endif
 #include <errno.h>
 
 #include "about.h"
@@ -55,10 +58,12 @@
  ****************/
 static GtkWidget *AboutWindow = NULL;
 
+// Columns for features supported...
 enum
 {
     // Columns for titles
-    EXTENSION_NAME = 0,
+    EXTENSION_PIXBUF = 0,
+    EXTENSION_NAME,
     EXTENSION_STATUT,
     EXTENSION_COMMENT,
 
@@ -121,6 +126,7 @@ void Show_About_Window (void)
     GtkTextIter textIter;
     GtkWidget *Button;
     GtkWidget *Logo;
+    //GdkPixbuf *pixbuf = NULL;
     GdkPixmap *pixmap;
     GdkBitmap *mask;
     gchar  temp[MAX_STRING_LEN];
@@ -169,6 +175,7 @@ void Show_About_Window (void)
             {"    - doutor zero ",                  _("(Brazilian Portuguese translation)")},
             {"    - Luchezar P. Petkov ",           _("(Bulgarian translation)")},
             {"    - Yang Jinsong ",                 _("(Chinese translation)")},
+            {"    - Jose Sun ",                     _("(Chinese (Taiwan) translation)")},
             {"    - Yuval Hager ",                  _("(Hebrew translation)")},
             {"    - Miloš Popović ",                _("(Serbian translation)")},
             {NULL,NULL}
@@ -228,6 +235,7 @@ void Show_About_Window (void)
                                       N_("Comment")
                                     };
     GtkTreeIter treeIter;
+    //GError *error = NULL;
     
 
     /* Check if already opened */
@@ -275,7 +283,7 @@ void Show_About_Window (void)
 #else
     pixmap = gdk_pixmap_create_from_xpm_d(AboutWindow->window,&mask,NULL,EasyTAG_logo_xpm);
 #endif
-
+    
     if (pixmap)
     {
         Logo = gtk_image_new_from_pixmap(pixmap, mask);
@@ -284,6 +292,21 @@ void Show_About_Window (void)
         gtk_box_pack_start(GTK_BOX(VBox),Logo,FALSE,TRUE,0);
         gtk_misc_set_padding(GTK_MISC(Logo),2,2);
     }
+/*#ifdef PACKAGE_DATA_DIR
+    pixbuf = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR"/EasyTAG_logo.png",&error);
+#endif
+    
+    if (pixbuf)
+    {
+        Logo = gtk_image_new_from_pixbuf(pixbuf);
+        g_object_unref(pixbuf);
+        gtk_box_pack_start(GTK_BOX(VBox),Logo,FALSE,TRUE,0);
+        gtk_misc_set_padding(GTK_MISC(Logo),2,2);
+    }else
+    {
+        Log_Print(LOG_ERROR,error->message);
+        g_error_free(error);
+    }*/
 
     /* Infos */
     Label = gtk_label_new(NULL);
@@ -329,12 +352,12 @@ void Show_About_Window (void)
     gtk_frame_set_shadow_type(GTK_FRAME(Frame),GTK_SHADOW_IN);
     gtk_box_pack_start(GTK_BOX(VBox),Frame,FALSE,TRUE,0);
     gtk_container_set_border_width(GTK_CONTAINER(Frame), 2);
-
+    
     Label = gtk_label_new(_(description_text));
     gtk_misc_set_padding(GTK_MISC(Label),2,2);
     gtk_label_set_line_wrap(GTK_LABEL(Label),TRUE);
     gtk_container_add(GTK_CONTAINER(Frame),Label);
-    gtk_container_resize_children(GTK_CONTAINER(Frame));
+
 
 
     /*
@@ -352,27 +375,42 @@ void Show_About_Window (void)
                                    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 */
+                                            G_TYPE_STRING,      /* Pixbuf, but we use the Stock ID, so don't use GDK_TYPE_PIXBUF */
+                                            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);
+    /* Pixbuf and Extension name */
+    column = gtk_tree_view_column_new();
+    gtk_tree_view_column_set_title(column, _(ExtensionList_Titles[0]));
+
+    // Cell of the column for the pixbuf
+    renderer = gtk_cell_renderer_pixbuf_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                       "stock-id", EXTENSION_PIXBUF,
+                                        NULL);
+    // Cell of the column for the text
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_attributes(column, 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 */
+    /* Statut */
+    renderer = gtk_cell_renderer_text_new();
     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 */
+    /* Comment */
+    renderer = gtk_cell_renderer_text_new();
     column = gtk_tree_view_column_new_with_attributes(_(ExtensionList_Titles[2]), renderer,
                                                       "text", EXTENSION_COMMENT,
                                                       NULL);
@@ -384,32 +422,37 @@ void Show_About_Window (void)
             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);
+    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_PIXBUF,    GTK_STOCK_APPLY,
                        EXTENSION_STATUT,    _("enabled"),
                        EXTENSION_COMMENT,   temp,
 #else
+                       EXTENSION_PIXBUF,    GTK_STOCK_CANCEL,
                        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);
+    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_PIXBUF,    GTK_STOCK_APPLY,
                        EXTENSION_STATUT,    _("available"), // May not be used
                        EXTENSION_COMMENT,   temp,
 #else
+                       EXTENSION_PIXBUF,    GTK_STOCK_CANCEL,
                        EXTENSION_STATUT,    _("disabled"),
 #endif
                        -1);
@@ -419,8 +462,10 @@ void Show_About_Window (void)
     gtk_list_store_set(ExtensionListModel, &treeIter,
                        EXTENSION_NAME,      _("Ogg Vorbis file support"),
 #ifdef ENABLE_OGG
+                       EXTENSION_PIXBUF,    GTK_STOCK_APPLY,
                        EXTENSION_STATUT,    _("enabled"),
 #else
+                       EXTENSION_PIXBUF,    GTK_STOCK_CANCEL,
                        EXTENSION_STATUT,    _("disabled"),
 #endif
                        -1);
@@ -429,18 +474,27 @@ void Show_About_Window (void)
     gtk_list_store_set(ExtensionListModel, &treeIter,
                        EXTENSION_NAME,      _("Speex file support"),
 #ifdef ENABLE_SPEEX
+                       EXTENSION_PIXBUF,    GTK_STOCK_APPLY,
                        EXTENSION_STATUT,    _("enabled"),
 #else
+                       EXTENSION_PIXBUF,    GTK_STOCK_CANCEL,
                        EXTENSION_STATUT,    _("disabled"),
 #endif
                        -1);
     // FLAC
+#ifdef ENABLE_FLAC
+    sprintf(temp, "flac %s", FLAC__VERSION_STRING);
+#endif
+
     gtk_list_store_append(ExtensionListModel, &treeIter);
     gtk_list_store_set(ExtensionListModel, &treeIter,
                        EXTENSION_NAME,      _("FLAC file support"),
 #ifdef ENABLE_FLAC
+                       EXTENSION_PIXBUF,    GTK_STOCK_APPLY,
                        EXTENSION_STATUT,    _("enabled"),
+                       EXTENSION_COMMENT,   temp,
 #else
+                       EXTENSION_PIXBUF,    GTK_STOCK_CANCEL,
                        EXTENSION_STATUT,    _("disabled"),
 #endif
                        -1);
@@ -449,8 +503,10 @@ void Show_About_Window (void)
     gtk_list_store_set(ExtensionListModel, &treeIter,
                        EXTENSION_NAME,      _("MP4/AAC file support"),
 #ifdef ENABLE_MP4
+                       EXTENSION_PIXBUF,    GTK_STOCK_APPLY,
                        EXTENSION_STATUT,    _("enabled"),
 #else
+                       EXTENSION_PIXBUF,    GTK_STOCK_CANCEL,
                        EXTENSION_STATUT,    _("disabled"),
 #endif
                        -1);
@@ -459,8 +515,10 @@ void Show_About_Window (void)
     gtk_list_store_set(ExtensionListModel, &treeIter,
                        EXTENSION_NAME,      _("WavPack file support"),
 #ifdef ENABLE_WAVPACK
+                       EXTENSION_PIXBUF,    GTK_STOCK_APPLY,
                        EXTENSION_STATUT,    _("enabled"),
 #else
+                       EXTENSION_PIXBUF,    GTK_STOCK_CANCEL,
                        EXTENSION_STATUT,    _("disabled"),
 #endif
                        -1);
@@ -498,18 +556,20 @@ void Show_About_Window (void)
     for (i=0; translations_thanks_text[i][0]!=NULL; i++)
     {
         // Translator name
-        if (!g_utf8_validate(translations_thanks_text[i][0], -1, NULL))
+        /*if (!g_utf8_validate(translations_thanks_text[i][0], -1, NULL))
             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]);
+            temp_str = g_strdup(translations_thanks_text[i][0]);*/
+        temp_str = Try_To_Validate_Utf8_String(translations_thanks_text[i][0]);
         gtk_text_buffer_insert(TextBuffer, &textIter, temp_str, -1);
         g_free(temp_str);
 
         // Translation language
-        if (!g_utf8_validate(translations_thanks_text[i][1], -1, NULL))
+        /*if (!g_utf8_validate(translations_thanks_text[i][1], -1, NULL))
             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]);
+            temp_str = g_strdup(translations_thanks_text[i][1]);*/
+        temp_str = Try_To_Validate_Utf8_String(translations_thanks_text[i][1]);
         gtk_text_buffer_insert_with_tags_by_name(TextBuffer, &textIter, temp_str, -1,
                                                  "italic", NULL);
         g_free(temp_str);
@@ -574,10 +634,11 @@ void Show_About_Window (void)
                 temp[strlen(temp)-1]='\0';
 
             // Convert line to UTF-8
-            if (!g_utf8_validate(temp, -1, NULL))
+            /*if (!g_utf8_validate(temp, -1, NULL))
                 tmp = convert_string(temp, "iso-8859-1", "utf-8",TRUE);
             else
-                tmp = g_strdup(temp);
+                tmp = g_strdup(temp);*/
+            tmp = Try_To_Validate_Utf8_String(tmp);
 
             if (tmp && tmp[0]!=' ') // If first character is a space => 1rst line after title
             {
@@ -625,10 +686,9 @@ void Show_About_Window (void)
     gtk_widget_grab_default(Button);
 
 
-    /* Disable main window */
-    /*gtk_widget_set_sensitive(MainWindow,FALSE);*/
-
     gtk_widget_show_all(AboutWindow);
+    //gtk_container_resize_children(GTK_CONTAINER(AboutNoteBook));
+
 }
 
 
diff --git a/src/ape_tag.c b/src/ape_tag.c
index e15f41e..fa0de5d 100755
--- a/src/ape_tag.c
+++ b/src/ape_tag.c
@@ -71,7 +71,7 @@ gboolean Ape_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     if ((file = fopen(filename, "rb")) == NULL)
     {
         gchar *filename_utf8 = filename_to_display(filename);
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8, g_strerror(errno));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8, g_strerror(errno));
         g_free(filename_utf8);
         return FALSE;
     }
diff --git a/src/bar.c b/src/bar.c
index 6f75403..95cc179 100644..100755
--- a/src/bar.c
+++ b/src/bar.c
@@ -441,11 +441,12 @@ void Statusbar_Message (gchar *message, gint with_timer)
     if (!StatusBar) return;
 
     /* Validate UTF8 */
-    if (!g_utf8_validate(message, -1, NULL))
+    /*if (!g_utf8_validate(message, -1, NULL))
         msg_temp = convert_to_utf8(message);
     else
-        msg_temp = g_strdup(message);
-
+        msg_temp = g_strdup(message);*/
+    msg_temp = Try_To_Validate_Utf8_String(message);
+    
     /* Remove a running timer */
     Statusbar_Remove_Timer();
 
diff --git a/src/base64.c b/src/base64.c
new file mode 100644
index 0000000..496f697
--- /dev/null
+++ b/src/base64.c
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 1995 - 1999 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
+   The following encoding technique is taken from RFC 1521 by Borenstein
+   and Freed.  It is reproduced here in a slightly edited form for
+   convenience.
+
+   A 65-character subset of US-ASCII is used, enabling 6 bits to be
+   represented per printable character. (The extra 65th character, "=",
+   is used to signify a special processing function.)
+
+   The encoding process represents 24-bit groups of input bits as output
+   strings of 4 encoded characters. Proceeding from left to right, a
+   24-bit input group is formed by concatenating 3 8-bit input groups.
+   These 24 bits are then treated as 4 concatenated 6-bit groups, each
+   of which is translated into a single digit in the base64 alphabet.
+
+   Each 6-bit group is used as an index into an array of 64 printable
+   characters. The character referenced by the index is placed in the
+   output string.
+
+                         Table 1: The Base64 Alphabet
+
+      Value Encoding  Value Encoding  Value Encoding  Value Encoding
+          0 A            17 R            34 i            51 z
+          1 B            18 S            35 j            52 0
+          2 C            19 T            36 k            53 1
+          3 D            20 U            37 l            54 2
+          4 E            21 V            38 m            55 3
+          5 F            22 W            39 n            56 4
+          6 G            23 X            40 o            57 5
+          7 H            24 Y            41 p            58 6
+          8 I            25 Z            42 q            59 7
+          9 J            26 a            43 r            60 8
+         10 K            27 b            44 s            61 9
+         11 L            28 c            45 t            62 +
+         12 M            29 d            46 u            63 /
+         13 N            30 e            47 v
+         14 O            31 f            48 w         (pad) =
+         15 P            32 g            49 x
+         16 Q            33 h            50 y
+
+   Special processing is performed if fewer than 24 bits are available
+   at the end of the data being encoded.  A full encoding quantum is
+   always completed at the end of a quantity.  When fewer than 24 input
+   bits are available in an input group, zero bits are added (on the
+   right) to form an integral number of 6-bit groups.  Padding at the
+   end of the data is performed using the '=' character.
+
+   Since all base64 input is an integral number of octets, only the
+         -------------------------------------------------
+   following cases can arise:
+
+       (1) the final quantum of encoding input is an integral
+           multiple of 24 bits; here, the final unit of encoded
+	   output will be an integral multiple of 4 characters
+	   with no "=" padding,
+       (2) the final quantum of encoding input is exactly 8 bits;
+           here, the final unit of encoded output will be two
+	   characters followed by two "=" padding characters, or
+       (3) the final quantum of encoding input is exactly 16 bits;
+           here, the final unit of encoded output will be three
+	   characters followed by one "=" padding character.
+   */
+
+/* $Id: base64.c,v 1.5 2001/05/28 17:33:41 joda Exp $ */
+
+/*
+ * Code taken from Kerberos krb4-1.2.2
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "base64.h"
+
+static char base64_chars[] = 
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+static int 
+pos(char c)
+{
+    char *p;
+    for (p = base64_chars; *p; p++)
+	if (*p == c)
+	    return p - base64_chars;
+    return -1;
+}
+
+int 
+base64_encode(const void *data, int size, char **str)
+{
+    char *s, *p;
+    int i;
+    int c;
+    const unsigned char *q;
+
+    p = s = (char *) malloc(size * 4 / 3 + 4);
+    if (p == NULL)
+        return -1;
+    q = (const unsigned char *) data;
+    i = 0;
+    for (i = 0; i < size;)
+    {
+        c = q[i++];
+        c *= 256;
+        if (i < size)
+            c += q[i];
+        i++;
+        c *= 256;
+        if (i < size)
+            c += q[i];
+        i++;
+        p[0] = base64_chars[(c & 0x00fc0000) >> 18];
+        p[1] = base64_chars[(c & 0x0003f000) >> 12];
+        p[2] = base64_chars[(c & 0x00000fc0) >> 6];
+        p[3] = base64_chars[(c & 0x0000003f) >> 0];
+        if (i > size)
+            p[3] = '=';
+        if (i > size + 1)
+            p[2] = '=';
+        p += 4;
+    }
+    *p = 0;
+    *str = s;
+    return strlen(s);
+}
+
+#define DECODE_ERROR 0xffffffff
+
+static unsigned int
+token_decode(const char *token)
+{
+    int i;
+    unsigned int val = 0;
+    int marker = 0;
+    
+    if (strlen(token) < 4)
+        return DECODE_ERROR;
+    for (i = 0; i < 4; i++)
+    {
+        val *= 64;
+        if (token[i] == '=')
+            marker++;
+        else if (marker > 0)
+            return DECODE_ERROR;
+        else
+            val += pos(token[i]);
+    }
+    if (marker > 2)
+        return DECODE_ERROR;
+    return (marker << 24) | val;
+}
+
+int
+base64_decode(const char *str, void *data)
+{
+    const char *p;
+    unsigned char *q;
+
+    q = data;
+    for (p = str; *p && (*p == '=' || strchr(base64_chars, *p)); p += 4)
+    {
+        unsigned int val = token_decode(p);
+        unsigned int marker = (val >> 24) & 0xff;
+        
+        if (val == DECODE_ERROR)
+            return -1;
+        *q++ = (val >> 16) & 0xff;
+        if (marker < 2)
+            *q++ = (val >> 8) & 0xff;
+        if (marker < 1)
+            *q++ = val & 0xff;
+    }
+    return q - (unsigned char *) data;
+}
diff --git a/src/base64.h b/src/base64.h
new file mode 100644
index 0000000..f0ddea4
--- /dev/null
+++ b/src/base64.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/* $Id: base64.h,v 1.2 1999/12/02 16:58:45 joda Exp $ */
+
+#ifndef _BASE64_H_
+#define _BASE64_H_
+
+int base64_encode(const void *data, int size, char **str);
+int base64_decode(const char *str, void *data);
+
+#endif
diff --git a/src/browser.c b/src/browser.c
index 3261692..7aa56f0 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -84,6 +84,7 @@ GtkWidget    *BrowserList;     // List of files
 GtkListStore *fileListModel;
 GtkWidget    *BrowserLabel;
 GtkWidget    *BrowserButton;
+GtkWidget    *BrowserParentButton;
 GtkWidget    *BrowserNoteBook;
 GtkWidget    *BrowserArtistList;
 GtkListStore *artistListModel;
@@ -152,7 +153,7 @@ void        Browser_Entry_Activated (void);
 void        Browser_Entry_Disable   (void);
 void        Browser_Entry_Enable    (void);
 
-void        Browser_Button_Clicked  (void);
+void        Browser_Parent_Button_Clicked  (void);
 
 void        Browser_Artist_List_Load_Files        (ET_File *etfile_to_select);
 void        Browser_Artist_List_Row_Selected      (GtkTreeSelection *selection, gpointer data);
@@ -222,19 +223,22 @@ void Browser_Load_Home_Directory (void)
  */
 void Browser_Load_Default_Directory (void)
 {
-    gchar *temp;
-    temp = g_strdup(DEFAULT_PATH_TO_MP3);
-
-    if (temp && g_utf8_strlen(temp, -1)>0)
-    {
-        Browser_Tree_Select_Dir(temp);
-    } else
+    gchar *path_utf8;
+    gchar *path;
+    
+    path_utf8 = g_strdup(DEFAULT_PATH_TO_MP3);
+    if (!path_utf8 || strlen(path_utf8)<=0)
     {
-        g_free(temp);
-        temp = g_strdup(HOME_VARIABLE);
-        Browser_Tree_Select_Dir(HOME_VARIABLE);
+        g_free(path_utf8);
+        path_utf8 = g_strdup(HOME_VARIABLE);
     }
-    g_free(temp);
+
+    // 'DEFAULT_PATH_TO_MP3' is stored in UTF-8, we must convert it to the file system encoding before...
+    path = filename_from_display(path_utf8);
+    Browser_Tree_Select_Dir(path);
+    
+    g_free(path);
+    g_free(path_utf8);
 }
 
 
@@ -357,7 +361,7 @@ void Browser_Entry_Set_Text (gchar *text)
 /*
  * Button to go to parent directory
  */
-void Browser_Button_Clicked (void)
+void Browser_Parent_Button_Clicked (void)
 {
     gchar *parent_dir, *path;
 
@@ -531,6 +535,7 @@ gboolean Browser_List_Key_Press (GtkWidget *list, GdkEvent *event, gpointer data
                                    -1);
 
                 /* UTF-8 comparison */
+                //key_string = Try_To_Validate_Utf8_String(key_string);
                 if (g_utf8_validate(key_string, -1, NULL) == FALSE)
                 {
                     temp = convert_to_utf8(key_string);
@@ -708,24 +713,31 @@ gboolean Browser_Tree_Node_Selected (GtkTreeSelection *selection, gpointer user_
     if (ET_Check_If_All_Files_Are_Saved() != TRUE)
     {
         GtkWidget *msgbox = NULL;
-        gint button;
-
-        msgbox = msg_box_new(_("Confirm..."),_("Some files have been modified but not "
-                                               "saved...\nDo you want to save them before changing the directory?"),
-                             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));
+        gint response;
+
+        msgbox = msg_box_new(_("Confirm..."),
+                             GTK_WINDOW(MainWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             _("Some files have been modified but not saved...\nDo you want to save them before "
+                             "changing the directory?"),
+                             GTK_STOCK_DIALOG_QUESTION,
+                             GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                             GTK_STOCK_NO,     GTK_RESPONSE_NO,
+                             GTK_STOCK_YES,    GTK_RESPONSE_YES,
+                             NULL);
+        response = gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
-        switch (button)
+        switch (response)
         {
-            case BUTTON_YES:
+            case GTK_RESPONSE_YES:
                 if (Save_All_Files_With_Answer(FALSE)==-1)
                     return TRUE;
                 break;
-            case BUTTON_NO:
+            case GTK_RESPONSE_NO:
                 break;
-            case BUTTON_CANCEL:
-            case -1:
+            case GTK_RESPONSE_CANCEL:
+            case GTK_RESPONSE_NONE:
                 return TRUE;
         }
     }
@@ -818,6 +830,8 @@ gint Browser_Win32_Get_Drive_Root (gchar *drive, GtkTreeIter *rootNode, GtkTreeP
  * Browser_Tree_Select_Dir: Select the directory corresponding to the 'path' in
  * the tree browser, but it doesn't read it!
  * Check if path is correct before selecting it. And returns 1 on success, else 0.
+ *
+ * - "current_path" is in file system encoding (not UTF-8)
  */
 gint Browser_Tree_Select_Dir (gchar *current_path)
 {
@@ -841,6 +855,7 @@ gint Browser_Tree_Select_Dir (gchar *current_path)
     ET_Win32_Path_Remove_Trailing_Backslash(current_path);
 #endif
 
+
     /* Don't check here if the path is valid. It will be done later when 
      * selecting a node in the tree */
         
@@ -967,7 +982,7 @@ void Browser_List_Row_Selected (GtkTreeSelection *selection, gpointer data)
 void Browser_List_Load_File_List (GList *etfilelist, ET_File *etfile_to_select)
 {
     gboolean activate_bg_color = 0;
-    GtkTreeIter row;
+    GtkTreeIter rowIter;
 
     if (!BrowserList) return;
 
@@ -975,9 +990,11 @@ void Browser_List_Load_File_List (GList *etfilelist, ET_File *etfile_to_select)
     etfilelist = g_list_first(etfilelist);
     while (etfilelist)
     {
-        guint fileKey = ((ET_File *)etfilelist->data)->ETFileKey;
+        guint fileKey                = ((ET_File *)etfilelist->data)->ETFileKey;
         gchar *current_filename_utf8 = ((File_Name *)((ET_File *)etfilelist->data)->FileNameCur->data)->value_utf8;
-        gchar *basename_utf8 = g_path_get_basename(current_filename_utf8);
+        gchar *basename_utf8         = g_path_get_basename(current_filename_utf8);
+        File_Tag *FileTag            = ((File_Tag *)((ET_File *)etfilelist->data)->FileTag->data);
+        gchar *track;
 
         // Change background color when changing directory (the first row must not be changed)
         if (gtk_tree_model_iter_n_children(GTK_TREE_MODEL(fileListModel), NULL) > 0)
@@ -996,24 +1013,39 @@ void Browser_List_Load_File_List (GList *etfilelist, ET_File *etfile_to_select)
             g_free(dir2_utf8);
         }
 
-        // 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,
+        // File list displays the current filename (name on HardDisk) and tag fields
+        gtk_list_store_append(fileListModel, &rowIter);
+        track = g_strconcat(FileTag->track ? FileTag->track : "",FileTag->track_total ? "/" : NULL,FileTag->track_total,NULL);
+
+        gtk_list_store_set(fileListModel, &rowIter,
+                           LIST_FILE_NAME,          basename_utf8,
+                           LIST_FILE_POINTER,       etfilelist->data,
+                           LIST_FILE_KEY,           fileKey,
+                           LIST_FILE_OTHERDIR,      activate_bg_color,
+                           LIST_FILE_TITLE,         FileTag->title,
+                           LIST_FILE_ARTIST,        FileTag->artist,
+                           LIST_FILE_ALBUM,         FileTag->album,
+                           LIST_FILE_YEAR,          FileTag->year,
+                           LIST_FILE_TRACK,         track,
+                           LIST_FILE_GENRE,         FileTag->genre,
+                           LIST_FILE_COMMENT,       FileTag->comment,
+                           LIST_FILE_COMPOSER,      FileTag->composer,
+                           LIST_FILE_ORIG_ARTIST,   FileTag->orig_artist,
+                           LIST_FILE_COPYRIGHT,     FileTag->copyright,
+                           LIST_FILE_URL,           FileTag->url,
+                           LIST_FILE_ENCODED_BY,    FileTag->encoded_by,
                            -1);
         g_free(basename_utf8);
+        g_free(track);
 
         if (etfile_to_select == etfilelist->data)
         {
-            Browser_List_Select_File_By_Iter(&row, TRUE);
+            Browser_List_Select_File_By_Iter(&rowIter, TRUE);
             //ET_Display_File_Data_To_UI(etfilelist->data);
         }
 
         // Set appearance of the row
-        Browser_List_Set_Row_Appearance(&row);
+        Browser_List_Set_Row_Appearance(&rowIter);
 
         etfilelist = g_list_next(etfilelist);
     }
@@ -1022,22 +1054,25 @@ void Browser_List_Load_File_List (GList *etfilelist, ET_File *etfile_to_select)
 
 /*
  * Update state of files in the list after changes (without clearing the list model!)
- *  - Refresh filename is file saved,
- *  - Change color is something change on the file
+ *  - Refresh 'filename' is file saved,
+ *  - Change color is something changed on the file
  */
 void Browser_List_Refresh_Whole_List (void)
 {
-    ET_File *ETFile;
+    ET_File   *ETFile;
+    File_Tag  *FileTag;
+    File_Name *FileName;
     //GtkTreeIter iter;
     GtkTreePath *currentPath = NULL;
     GtkTreeIter iter;
     gint row;
     gchar *current_basename_utf8;
+    gchar *track;
     gboolean valid;
     GtkWidget *TBViewMode;
 
-    if (!ETCore->ETFileDisplayedList || !BrowserList ||
-        gtk_tree_model_iter_n_children(GTK_TREE_MODEL(fileListModel), NULL) == 0)
+    if (!ETCore->ETFileDisplayedList || !BrowserList
+    ||  gtk_tree_model_iter_n_children(GTK_TREE_MODEL(fileListModel), NULL) == 0)
     {
         return;
     }
@@ -1053,12 +1088,33 @@ void Browser_List_Refresh_Whole_List (void)
     valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(fileListModel), &iter, currentPath);
     while (valid)
     {
-        // Refresh filename
+        // Refresh filename and other fields
         gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &iter,
                            LIST_FILE_POINTER, &ETFile, -1);
-        current_basename_utf8 = g_path_get_basename( ((File_Name *)ETFile->FileNameCur->data)->value_utf8 );
-        gtk_list_store_set(fileListModel, &iter, LIST_FILE_NAME, current_basename_utf8, -1);
+        
+        FileName = (File_Name *)ETFile->FileNameCur->data;
+        FileTag  = (File_Tag *)ETFile->FileTag->data;
+
+        current_basename_utf8 = g_path_get_basename(FileName->value_utf8);
+        track = g_strconcat(FileTag->track ? FileTag->track : "",FileTag->track_total ? "/" : NULL,FileTag->track_total,NULL);
+        
+        gtk_list_store_set(fileListModel, &iter, 
+                           LIST_FILE_NAME,          current_basename_utf8,
+                           LIST_FILE_TITLE,         FileTag->title,
+                           LIST_FILE_ARTIST,        FileTag->artist,
+                           LIST_FILE_ALBUM,         FileTag->album,
+                           LIST_FILE_YEAR,          FileTag->year,
+                           LIST_FILE_TRACK,         track,
+                           LIST_FILE_GENRE,         FileTag->genre,
+                           LIST_FILE_COMMENT,       FileTag->comment,
+                           LIST_FILE_COMPOSER,      FileTag->composer,
+                           LIST_FILE_ORIG_ARTIST,   FileTag->orig_artist,
+                           LIST_FILE_COPYRIGHT,     FileTag->copyright,
+                           LIST_FILE_URL,           FileTag->url,
+                           LIST_FILE_ENCODED_BY,    FileTag->encoded_by,
+                           -1);
         g_free(current_basename_utf8);
+        g_free(track);
 
         Browser_List_Set_Row_Appearance(&iter);
 
@@ -1110,9 +1166,12 @@ void Browser_List_Refresh_File_In_List (ET_File *ETFile)
     GtkTreeSelection *selection;
     GtkTreeIter selectedIter;
     GtkTreePath *currentPath = NULL;
-    ET_File *file;
+    ET_File   *etfile;
+    File_Tag  *FileTag;
+    File_Name *FileName;
     gboolean row_found = FALSE;
-    gchar   *current_basename_utf8;
+    gchar *current_basename_utf8;
+    gchar *track;
     gboolean valid;
     gint row;
     gchar *artist, *album;
@@ -1133,8 +1192,8 @@ void Browser_List_Refresh_File_In_List (ET_File *ETFile)
         if (valid)
         {
             gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &selectedIter,
-                           LIST_FILE_POINTER, &file, -1);
-            if (ETFile->ETFileKey == file->ETFileKey)
+                           LIST_FILE_POINTER, &etfile, -1);
+            if (ETFile->ETFileKey == etfile->ETFileKey)
             {
                 row_found = TRUE;
             }
@@ -1153,8 +1212,8 @@ void Browser_List_Refresh_File_In_List (ET_File *ETFile)
             if (valid)
             {
                 gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &selectedIter,
-                                   LIST_FILE_POINTER, &file, -1);
-                if (ETFile->ETFileKey == file->ETFileKey)
+                                   LIST_FILE_POINTER, &etfile, -1);
+                if (ETFile->ETFileKey == etfile->ETFileKey)
                 {
                     row_found = TRUE;
                 }
@@ -1168,13 +1227,14 @@ void Browser_List_Refresh_File_In_List (ET_File *ETFile)
     if (row_found == FALSE)
     {
         valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(fileListModel), &selectedIter);
-        while (valid && !row_found)
+        while (valid)
         {
             gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &selectedIter,
-                               LIST_FILE_POINTER, &file, -1);
-            if (ETFile->ETFileKey == file->ETFileKey)
+                               LIST_FILE_POINTER, &etfile, -1);
+            if (ETFile->ETFileKey == etfile->ETFileKey)
             {
                 row_found = TRUE;
+                break;
             } else
             {
                 valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(fileListModel), &selectedIter);
@@ -1186,10 +1246,30 @@ void Browser_List_Refresh_File_In_List (ET_File *ETFile)
     if (row_found == FALSE)
         return;
 
-    // Displayed the filename
-    current_basename_utf8 = g_path_get_basename( ((File_Name *)file->FileNameCur->data)->value_utf8 );
-    gtk_list_store_set(fileListModel, &selectedIter, LIST_FILE_NAME, current_basename_utf8, -1);
+    // Displayed the filename and refresh other fields
+    FileName = (File_Name *)etfile->FileNameCur->data;
+    FileTag  = (File_Tag *)etfile->FileTag->data;
+    
+    current_basename_utf8 = g_path_get_basename(FileName->value_utf8);
+    track = g_strconcat(FileTag->track ? FileTag->track : "",FileTag->track_total ? "/" : NULL,FileTag->track_total,NULL);
+    
+    gtk_list_store_set(fileListModel, &selectedIter, 
+                       LIST_FILE_NAME,          current_basename_utf8,
+                       LIST_FILE_TITLE,         FileTag->title,
+                       LIST_FILE_ARTIST,        FileTag->artist,
+                       LIST_FILE_ALBUM,         FileTag->album,
+                       LIST_FILE_YEAR,          FileTag->year,
+                       LIST_FILE_TRACK,         track,
+                       LIST_FILE_GENRE,         FileTag->genre,
+                       LIST_FILE_COMMENT,       FileTag->comment,
+                       LIST_FILE_COMPOSER,      FileTag->composer,
+                       LIST_FILE_ORIG_ARTIST,   FileTag->orig_artist,
+                       LIST_FILE_COPYRIGHT,     FileTag->copyright,
+                       LIST_FILE_URL,           FileTag->url,
+                       LIST_FILE_ENCODED_BY,    FileTag->encoded_by,
+                       -1);
     g_free(current_basename_utf8);
+    g_free(track);
 
     // Change appearance (line to red) if filename changed
     Browser_List_Set_Row_Appearance(&selectedIter);
@@ -1262,53 +1342,80 @@ void Browser_List_Refresh_File_In_List (ET_File *ETFile)
 
 /*
  * Set the appearance of the row
+ *  - change background according LIST_FILE_OTHERDIR
+ *  - change foreground according file status (saved or not)
  */
 void Browser_List_Set_Row_Appearance (GtkTreeIter *iter)
 {
-    ET_File *rowETFile;
+    ET_File *rowETFile = NULL;
     gboolean otherdir = FALSE;
     GdkColor *backgroundcolor;
-    gchar *temp;
+    //gchar *temp = NULL;
 
     if (iter == NULL)
         return;
 
     // Get the ETFile reference
     gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), iter, 
-                       LIST_FILE_POINTER, &rowETFile, 
-                       LIST_FILE_OTHERDIR, &otherdir, 
-                       LIST_FILE_NAME, &temp, -1);
+                       LIST_FILE_POINTER,   &rowETFile, 
+                       LIST_FILE_OTHERDIR,  &otherdir, 
+                       //LIST_FILE_NAME,      &temp, 
+                       -1);
 
+    // Must change background color?
     if (otherdir)
         backgroundcolor = &LIGHT_BLUE;
     else
         backgroundcolor = NULL;
 
-    // Set text to bold/red if filename or tag changed
+    // Set text to bold/red if 'filename' or 'tag' changed
     if ( ET_Check_If_File_Is_Saved(rowETFile) == FALSE )
     {
         if (CHANGED_FILES_DISPLAYED_TO_BOLD)
         {
             gtk_list_store_set(fileListModel, iter, 
-                               LIST_FONT_WEIGHT, PANGO_WEIGHT_BOLD, 
+                               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_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_FONT_WEIGHT,    PANGO_WEIGHT_NORMAL, 
                            LIST_ROW_BACKGROUND, backgroundcolor, 
                            LIST_ROW_FOREGROUND, NULL ,-1);
     }
+
+    // Update text fields
+    // Don't do it here
+    /*if (rowETFile)
+    {
+        File_Tag *FileTag = ((File_Tag *)((ET_File *)rowETFile)->FileTag->data);
+        
+        gtk_list_store_set(fileListModel, iter, 
+                           LIST_FILE_TITLE,         FileTag->title,
+                           LIST_FILE_ARTIST,        FileTag->artist,
+                           LIST_FILE_ALBUM,         FileTag->album,
+                           LIST_FILE_YEAR,          FileTag->year,
+                           LIST_FILE_TRACK,         FileTag->track,
+                           LIST_FILE_GENRE,         FileTag->genre,
+                           LIST_FILE_COMMENT,       FileTag->comment,
+                           LIST_FILE_COMPOSER,      FileTag->composer,
+                           LIST_FILE_ORIG_ARTIST,   FileTag->orig_artist,
+                           LIST_FILE_COPYRIGHT,     FileTag->copyright,
+                           LIST_FILE_URL,           FileTag->url,
+                           LIST_FILE_ENCODED_BY,    FileTag->encoded_by,
+                           -1);
+    }*/
+    
     // Frees allocated item from gtk_tree_model_get...
-    g_free(temp);
+    //g_free(temp);
 }
 
 
@@ -1518,7 +1625,7 @@ ET_File *Browser_List_Select_File_By_DLM (const gchar* string, gboolean select_i
         do
         {
             gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &iter,
-                               LIST_FILE_NAME, &current_filename,
+                               LIST_FILE_NAME,    &current_filename,
                                LIST_FILE_POINTER, &current_etfile, -1);
             current_title = ((File_Tag *)current_etfile->FileTag->data)->title;
 
@@ -1903,6 +2010,7 @@ void Browser_Artist_List_Load_Files (ET_File *etfile_to_select)
         // Add the new row
         gtk_list_store_append(artistListModel, &iter);
         gtk_list_store_set(artistListModel, &iter,
+                           ARTIST_PIXBUF,             "easytag-artist",
                            ARTIST_NAME,               artistname,
                            ARTIST_NUM_ALBUMS,         g_list_length(g_list_first(AlbumList)),
                            ARTIST_NUM_FILES,          nbr_files,
@@ -1961,7 +2069,8 @@ void Browser_Artist_List_Row_Selected(GtkTreeSelection* selection, gpointer data
     // Save the current displayed data
     ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
 
-    gtk_tree_model_get(GTK_TREE_MODEL(artistListModel), &iter, ARTIST_ALBUM_LIST_POINTER, &AlbumList, -1);
+    gtk_tree_model_get(GTK_TREE_MODEL(artistListModel), &iter, 
+                       ARTIST_ALBUM_LIST_POINTER, &AlbumList, -1);
     Browser_Album_List_Load_Files(AlbumList, NULL);
 }
 
@@ -1972,10 +2081,12 @@ void Browser_Artist_List_Set_Row_Appearance (GtkTreeIter *iter)
 {
     GList *AlbumList;
     GList *etfilelist;
+    gboolean not_all_saved = FALSE;
 
-    gtk_tree_model_get(GTK_TREE_MODEL(artistListModel), iter, ARTIST_ALBUM_LIST_POINTER, &AlbumList, -1);
+    gtk_tree_model_get(GTK_TREE_MODEL(artistListModel), iter, 
+                       ARTIST_ALBUM_LIST_POINTER, &AlbumList, -1);
 
-    // Reset the style of the row if one of the files was changed
+    // Change the style (red/bold) of the row if one of the files was changed
     while (AlbumList)
     {
         etfilelist = (GList *)AlbumList->data;
@@ -1986,18 +2097,31 @@ void Browser_Artist_List_Set_Row_Appearance (GtkTreeIter *iter)
                 if (CHANGED_FILES_DISPLAYED_TO_BOLD)
                 {
                     // Set the font-style to "bold"
-                    gtk_list_store_set(artistListModel, iter, ARTIST_FONT_WEIGHT, PANGO_WEIGHT_BOLD, -1);
+                    gtk_list_store_set(artistListModel, iter, 
+                                       ARTIST_FONT_WEIGHT, PANGO_WEIGHT_BOLD, -1);
                 } else
                 {
                     // Set the background-color to "red"
-                    gtk_list_store_set(artistListModel, iter, ARTIST_FONT_WEIGHT, PANGO_WEIGHT_NORMAL, ARTIST_ROW_FOREGROUND, &RED, -1);
+                    gtk_list_store_set(artistListModel, iter, 
+                                       ARTIST_FONT_WEIGHT,    PANGO_WEIGHT_NORMAL, 
+                                       ARTIST_ROW_FOREGROUND, &RED, -1);
                 }
+                not_all_saved = TRUE;
                 break;
             }
             etfilelist = etfilelist->next;
         }
         AlbumList = AlbumList->next;
     }
+    
+    // Reset style if all files saved
+    if (not_all_saved == FALSE)
+    {
+        gtk_list_store_set(artistListModel, iter, 
+                           ARTIST_FONT_WEIGHT,    PANGO_WEIGHT_NORMAL, 
+                           ARTIST_ROW_FOREGROUND, NULL, -1);
+    }
+    
 }
 
 
@@ -2037,8 +2161,8 @@ void Browser_Album_List_Load_Files (GList *albumlist, ET_File *etfile_to_select)
     }
     gtk_list_store_append(albumListModel, &iter);
     gtk_list_store_set(albumListModel, &iter,
-                       ALBUM_NAME, _("<All albums>"),
-                       ALBUM_NUM_FILES, g_list_length(g_list_first(etfilelist)),
+                       ALBUM_NAME,                _("<All albums>"),
+                       ALBUM_NUM_FILES,           g_list_length(g_list_first(etfilelist)),
                        ALBUM_ETFILE_LIST_POINTER, etfilelist,
                        -1);
 
@@ -2054,8 +2178,9 @@ void Browser_Album_List_Load_Files (GList *albumlist, ET_File *etfile_to_select)
         // Add the new row
         gtk_list_store_append(albumListModel, &iter);
         gtk_list_store_set(albumListModel, &iter,
-                           ALBUM_NAME, albumname,
-                           ALBUM_NUM_FILES, g_list_length(g_list_first(etfilelist)),
+                           ALBUM_PIXBUF,              "easytag-album",
+                           ALBUM_NAME,                albumname,
+                           ALBUM_NUM_FILES,           g_list_length(g_list_first(etfilelist)),
                            ALBUM_ETFILE_LIST_POINTER, etfilelist,
                            -1);
 
@@ -2114,7 +2239,8 @@ void Browser_Album_List_Row_Selected (GtkTreeSelection *selection, gpointer data
     if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
         return;
 
-    gtk_tree_model_get(GTK_TREE_MODEL(albumListModel), &iter, ALBUM_ETFILE_LIST_POINTER, &etfilelist, -1);
+    gtk_tree_model_get(GTK_TREE_MODEL(albumListModel), &iter, 
+                       ALBUM_ETFILE_LIST_POINTER, &etfilelist, -1);
 
     // Save the current displayed data
     ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
@@ -2135,10 +2261,12 @@ void Browser_Album_List_Row_Selected (GtkTreeSelection *selection, gpointer data
 void Browser_Album_List_Set_Row_Appearance (GtkTreeIter *iter)
 {
     GList *etfilelist;
+    gboolean not_all_saved = FALSE;
 
-    gtk_tree_model_get(GTK_TREE_MODEL(albumListModel), iter, ALBUM_ETFILE_LIST_POINTER, &etfilelist, -1);
+    gtk_tree_model_get(GTK_TREE_MODEL(albumListModel), iter, 
+                       ALBUM_ETFILE_LIST_POINTER, &etfilelist, -1);
 
-    // Reset the style of the row if one of the files was changed
+    // Change the style (red/bold) of the row if one of the files was changed
     while (etfilelist)
     {
         if ( ET_Check_If_File_Is_Saved((ET_File *)etfilelist->data) == FALSE )
@@ -2146,16 +2274,28 @@ void Browser_Album_List_Set_Row_Appearance (GtkTreeIter *iter)
             if (CHANGED_FILES_DISPLAYED_TO_BOLD)
             {
                 // Set the font-style to "bold"
-                gtk_list_store_set(albumListModel, iter, ALBUM_FONT_WEIGHT, PANGO_WEIGHT_BOLD, -1);
+                gtk_list_store_set(albumListModel, iter, 
+                                   ALBUM_FONT_WEIGHT, PANGO_WEIGHT_BOLD, -1);
             } else
             {
                 // Set the background-color to "red"
-                gtk_list_store_set(albumListModel, iter, ALBUM_ROW_FOREGROUND, &RED, -1);
+                gtk_list_store_set(albumListModel, iter, 
+                                   ALBUM_FONT_WEIGHT,    PANGO_WEIGHT_NORMAL,
+                                   ALBUM_ROW_FOREGROUND, &RED, -1);
             }
+            not_all_saved = TRUE;
             break;
         }
         etfilelist = etfilelist->next;
     }
+    
+    // Reset style if all files saved
+    if (not_all_saved == FALSE)
+    {
+        gtk_list_store_set(albumListModel, iter, 
+                           ALBUM_FONT_WEIGHT,    PANGO_WEIGHT_NORMAL,
+                           ALBUM_ROW_FOREGROUND, NULL, -1);
+    }
 }
 
 void Browser_Display_Tree_Or_Artist_Album_List (void)
@@ -2306,13 +2446,13 @@ void Browser_Tree_Initialize (void)
             drive_dir_name = g_strconcat("(", drive_slashless, ") ", drive_label, NULL);
 
             gtk_tree_store_append(directoryTreeModel, &parent_iter, NULL);
-            gtk_tree_store_set(directoryTreeModel, &parent_iter,
-                       TREE_COLUMN_DIR_NAME, drive_dir_name,
-                       TREE_COLUMN_FULL_PATH, drive_backslashed,
-                       TREE_COLUMN_HAS_SUBDIR, TRUE,
-                       TREE_COLUMN_SCANNED, FALSE,
-                       TREE_COLUMN_PIXBUF, drive_pixmap,
-                       -1);
+            gtk_tree_store_set(directoryTreeModel,      &parent_iter,
+                               TREE_COLUMN_DIR_NAME,    drive_dir_name,
+                               TREE_COLUMN_FULL_PATH,   drive_backslashed,
+                               TREE_COLUMN_HAS_SUBDIR,  TRUE,
+                               TREE_COLUMN_SCANNED,     FALSE,
+                               TREE_COLUMN_PIXBUF,      drive_pixmap,
+                               -1);
             // Insert dummy node
             gtk_tree_store_append(directoryTreeModel, &dummy_iter, &parent_iter);
 
@@ -2328,11 +2468,11 @@ void Browser_Tree_Initialize (void)
 
     gtk_tree_store_append(directoryTreeModel, &parent_iter, NULL);
     gtk_tree_store_set(directoryTreeModel, &parent_iter,
-                       TREE_COLUMN_DIR_NAME, G_DIR_SEPARATOR_S,
-                       TREE_COLUMN_FULL_PATH, G_DIR_SEPARATOR_S,
-                       TREE_COLUMN_HAS_SUBDIR, TRUE,
-                       TREE_COLUMN_SCANNED, FALSE,
-                       TREE_COLUMN_PIXBUF, closed_folder_pixmap,
+                       TREE_COLUMN_DIR_NAME,    G_DIR_SEPARATOR_S,
+                       TREE_COLUMN_FULL_PATH,   G_DIR_SEPARATOR_S,
+                       TREE_COLUMN_HAS_SUBDIR,  TRUE,
+                       TREE_COLUMN_SCANNED,     FALSE,
+                       TREE_COLUMN_PIXBUF,      closed_folder_pixmap,
                        -1);
     // insert dummy node
     gtk_tree_store_append(directoryTreeModel, &dummy_iter, &parent_iter);
@@ -2431,7 +2571,7 @@ void Browser_Tree_Rename_Directory (gchar *last_path, gchar *new_path)
         {
             // ERROR! Could not find it!
             gchar *text_utf8 = filename_to_display(textsplit[i]);
-            Log_Print(_("Error: Searching for %s, could not find node %s in tree."), last_path, text_utf8);
+            Log_Print(LOG_ERROR,_("Error: Searching for %s, could not find node %s in tree."), last_path, text_utf8);
             g_strfreev(textsplit);
             g_free(text_utf8);
             return;
@@ -2447,7 +2587,7 @@ void Browser_Tree_Rename_Directory (gchar *last_path, gchar *new_path)
     new_basename = g_path_get_basename(new_path);
     new_basename_utf8 = filename_to_display(new_basename);
     gtk_tree_store_set(directoryTreeModel, &iter,
-                       TREE_COLUMN_DIR_NAME, new_basename_utf8,
+                       TREE_COLUMN_DIR_NAME,  new_basename_utf8,
                        TREE_COLUMN_FULL_PATH, new_path,
                        -1);
 
@@ -2475,7 +2615,7 @@ void Browser_Tree_Handle_Rename (GtkTreeIter *parentnode, gchar *old_path, gchar
     gchar *path_new;
 
     // If there are no children then nothing needs to be done!
-    if(!gtk_tree_model_iter_children(GTK_TREE_MODEL(directoryTreeModel), &iter, parentnode))
+    if (!gtk_tree_model_iter_children(GTK_TREE_MODEL(directoryTreeModel), &iter, parentnode))
         return;
 
     do
@@ -2498,7 +2638,7 @@ void Browser_Tree_Handle_Rename (GtkTreeIter *parentnode, gchar *old_path, gchar
         if(gtk_tree_model_iter_has_child(GTK_TREE_MODEL(directoryTreeModel), &iter))
             Browser_Tree_Handle_Rename(&iter, old_path, new_path);
 
-    } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(directoryTreeModel), &iter));
+    } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(directoryTreeModel), &iter));
 
 }
 
@@ -2657,7 +2797,7 @@ static void expand_cb (GtkWidget *tree, GtkTreeIter *iter, GtkTreePath *gtreePat
 
     gtk_tree_model_get(GTK_TREE_MODEL(directoryTreeModel), iter,
                        TREE_COLUMN_FULL_PATH, &parentPath,
-                       TREE_COLUMN_SCANNED, &treeScanned, -1);
+                       TREE_COLUMN_SCANNED,   &treeScanned, -1);
 
     if (treeScanned)
         return;
@@ -2681,6 +2821,7 @@ static void expand_cb (GtkWidget *tree, GtkTreeIter *iter, GtkTreePath *gtreePat
                     fullpath_file = g_strdup(path);
 
                 dirname_utf8 = filename_to_display(dirent->d_name);
+                
                 //if (!dirname_utf8)
                 //{
                 //    gchar *escaped_temp = g_strescape(dirent->d_name, NULL);
@@ -2786,7 +2927,7 @@ static void collapse_cb (GtkWidget *tree, GtkTreeIter *iter, GtkTreePath *treePa
  */
 GtkWidget *Create_Browser_Items (GtkWidget *parent)
 {
-    GtkWidget *VerticalBox;
+	GtkWidget *VerticalBox;
     GtkWidget *HBox;
     GtkWidget *ScrollWindowDirectoryTree;
     GtkWidget *ScrollWindowFileList;
@@ -2798,8 +2939,13 @@ GtkWidget *Create_Browser_Items (GtkWidget *parent)
     GtkTreeViewColumn *column;
     GtkTooltips *Tips;
     GtkWidget *PopupMenu;
-    gchar *ArtistList_Titles[] = {N_("Artist"),N_("# Albums"),N_("# Files")};
-    gchar *AlbumList_Titles[]  = {N_("Album"),N_("# Files")};
+    gchar *BrowserTree_Titles[] = {N_("Tree")};
+    gchar *BrowserList_Titles[] = {N_("File Name"),N_("Title"),N_("Artist"),N_("Album"),
+                                   N_("Year"),N_("Track"),N_("Genre"),N_("Comment"),
+                                   N_("Composer"),N_("Orig. Artist"),N_("Copyright"),
+                                   N_("URL"),N_("Encoded By")};
+    gchar *ArtistList_Titles[]  = {N_("Artist"),N_("# Albums"),N_("# Files")};
+    gchar *AlbumList_Titles[]   = {N_("Album"),N_("# Files")};
 
     Tips = gtk_tooltips_new();
     VerticalBox = gtk_vbox_new(FALSE,2);
@@ -2813,13 +2959,13 @@ GtkWidget *Create_Browser_Items (GtkWidget *parent)
     /*
      * The button to go to the parent directory
      */
-    BrowserButton = gtk_button_new();
+    BrowserParentButton = gtk_button_new();
     Icon = gtk_image_new_from_stock("easytag-parent-folder", GTK_ICON_SIZE_SMALL_TOOLBAR); // On Win32, GTK_ICON_SIZE_BUTTON enlarge the combobox...
-    gtk_container_add(GTK_CONTAINER(BrowserButton),Icon);
-    gtk_box_pack_start(GTK_BOX(HBox),BrowserButton,FALSE,FALSE,0);
-    gtk_button_set_relief(GTK_BUTTON(BrowserButton),GTK_RELIEF_NONE);
-    g_signal_connect(G_OBJECT(BrowserButton),"clicked",G_CALLBACK(Browser_Button_Clicked),NULL);
-    gtk_tooltips_set_tip(Tips,BrowserButton,_("Go to parent directory"),NULL);
+    gtk_container_add(GTK_CONTAINER(BrowserParentButton),Icon);
+    gtk_box_pack_start(GTK_BOX(HBox),BrowserParentButton,FALSE,FALSE,0);
+    gtk_button_set_relief(GTK_BUTTON(BrowserParentButton),GTK_RELIEF_NONE);
+    g_signal_connect(G_OBJECT(BrowserParentButton),"clicked",G_CALLBACK(Browser_Parent_Button_Clicked),NULL);
+    gtk_tooltips_set_tip(Tips,BrowserParentButton,_("Go to parent directory"),NULL);
 
     /*
      * The entry box for displaying path
@@ -2838,6 +2984,15 @@ GtkWidget *Create_Browser_Items (GtkWidget *parent)
     gtk_box_pack_start(GTK_BOX(HBox),BrowserEntryCombo,TRUE,TRUE,1);
     gtk_tooltips_set_tip(Tips,GTK_WIDGET(GTK_ENTRY(GTK_BIN(BrowserEntryCombo)->child)),_("Enter a directory to browse."),NULL);
 
+    /*
+     * The button to select a directory to browse
+     */
+    BrowserButton = gtk_button_new_from_stock(GTK_STOCK_OPEN);
+    gtk_box_pack_start(GTK_BOX(HBox),BrowserButton,FALSE,FALSE,1);
+    g_signal_connect_swapped(G_OBJECT(BrowserButton),"clicked",
+                             G_CALLBACK(File_Selection_Window_For_Directory),G_OBJECT(GTK_BIN(BrowserEntryCombo)->child));
+    gtk_tooltips_set_tip(Tips,BrowserButton,_("Select a directory to browse."),NULL);
+
 
     /*
      * The label for displaying number of files in path (without subdirs)
@@ -2857,28 +3012,28 @@ GtkWidget *Create_Browser_Items (GtkWidget *parent)
         /* get GTK's theme harddrive and removable icons and render it in a pixbuf */
         harddrive_pixmap =  gtk_icon_set_render_icon(gtk_style_lookup_icon_set(parent->style, GTK_STOCK_HARDDISK),
                                                      parent->style,
-                                                     gtk_widget_get_direction (parent),
+                                                     gtk_widget_get_direction(parent),
                                                      GTK_STATE_NORMAL,
                                                      GTK_ICON_SIZE_BUTTON,
                                                      parent, NULL);
 
         removable_pixmap =  gtk_icon_set_render_icon(gtk_style_lookup_icon_set(parent->style, GTK_STOCK_FLOPPY),
                                                      parent->style,
-                                                     gtk_widget_get_direction (parent),
+                                                     gtk_widget_get_direction(parent),
                                                      GTK_STATE_NORMAL,
                                                      GTK_ICON_SIZE_BUTTON,
                                                      parent, NULL);
 
         cdrom_pixmap =  gtk_icon_set_render_icon(gtk_style_lookup_icon_set(parent->style, GTK_STOCK_CDROM),
                                                  parent->style,
-                                                 gtk_widget_get_direction (parent),
+                                                 gtk_widget_get_direction(parent),
                                                  GTK_STATE_NORMAL,
                                                  GTK_ICON_SIZE_BUTTON,
                                                  parent, NULL);
 
         network_pixmap =  gtk_icon_set_render_icon(gtk_style_lookup_icon_set(parent->style, GTK_STOCK_NETWORK),
                                                    parent->style,
-                                                   gtk_widget_get_direction (parent),
+                                                   gtk_widget_get_direction(parent),
                                                    GTK_STATE_NORMAL,
                                                    GTK_ICON_SIZE_BUTTON,
                                                    parent, NULL);
@@ -2916,19 +3071,27 @@ GtkWidget *Create_Browser_Items (GtkWidget *parent)
 
     /* The tree view */
     BrowserTree = gtk_tree_view_new_with_model(GTK_TREE_MODEL(directoryTreeModel));
-    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(BrowserTree), FALSE);
-    renderer = gtk_cell_renderer_pixbuf_new();
+    gtk_container_add(GTK_CONTAINER(ScrollWindowDirectoryTree),BrowserTree);
+    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(BrowserTree), TRUE);
+    
+    // Column for the pixbuf + text
     column = gtk_tree_view_column_new();
+    gtk_tree_view_column_set_title(column, _(BrowserTree_Titles[0]));
+
+    // Cell of the column for the pixbuf
+    renderer = gtk_cell_renderer_pixbuf_new();
     gtk_tree_view_column_pack_start(column, renderer, FALSE);
     gtk_tree_view_column_set_attributes(column, renderer,
-                                       "pixbuf", TREE_COLUMN_PIXBUF, NULL);
+                                       "pixbuf", TREE_COLUMN_PIXBUF, 
+                                        NULL);
+    // Cell of the column for the text
     renderer = gtk_cell_renderer_text_new();
     gtk_tree_view_column_pack_start(column, renderer, FALSE);
     gtk_tree_view_column_set_attributes(column, renderer,
-                                       "text", TREE_COLUMN_DIR_NAME, NULL);
+                                       "text", TREE_COLUMN_DIR_NAME, 
+                                        NULL);
     gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserTree), column);
     gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-    gtk_container_add(GTK_CONTAINER(ScrollWindowDirectoryTree),BrowserTree);
 
     Browser_Tree_Initialize();
 
@@ -2962,47 +3125,71 @@ GtkWidget *Create_Browser_Items (GtkWidget *parent)
                                    GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
 
     artistListModel = gtk_list_store_new(ARTIST_COLUMN_COUNT,
-                                        G_TYPE_STRING,
-                                        G_TYPE_UINT,
-                                        G_TYPE_UINT,
-                                        G_TYPE_POINTER,
-                                        PANGO_TYPE_STYLE,
-                                        G_TYPE_INT,
-                                        GDK_TYPE_COLOR);
+                                         G_TYPE_STRING, // Stock-id
+                                         G_TYPE_STRING,
+                                         G_TYPE_UINT,
+                                         G_TYPE_UINT,
+                                         G_TYPE_POINTER,
+                                         PANGO_TYPE_STYLE,
+                                         G_TYPE_INT,
+                                         GDK_TYPE_COLOR);
 
     BrowserArtistList = gtk_tree_view_new_with_model(GTK_TREE_MODEL(artistListModel));
     gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(BrowserArtistList), TRUE);
-    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_set_reorderable(GTK_TREE_VIEW(BrowserArtistList), FALSE);
+    gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(BrowserArtistList)),GTK_SELECTION_SINGLE);
+
 
-    column = gtk_tree_view_column_new_with_attributes(_(ArtistList_Titles[0]), renderer,
-                                                      "text",           ARTIST_NAME,
-                                                      "weight",         ARTIST_FONT_WEIGHT,
-                                                      "style",          ARTIST_FONT_STYLE,
-                                                      "foreground-gdk", ARTIST_ROW_FOREGROUND,
-                                                      NULL);
+    // Artist column
+    column = gtk_tree_view_column_new();
+    gtk_tree_view_column_set_title(column, _(ArtistList_Titles[0]));
+
+    renderer = gtk_cell_renderer_pixbuf_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                       "stock-id",        ARTIST_PIXBUF,
+                                        NULL);
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           ARTIST_NAME,
+                                        "weight",         ARTIST_FONT_WEIGHT,
+                                        "style",          ARTIST_FONT_STYLE,
+                                        "foreground-gdk", ARTIST_ROW_FOREGROUND,
+                                        NULL);
     gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserArtistList), column);
     gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 
-    column = gtk_tree_view_column_new_with_attributes(_(ArtistList_Titles[1]), renderer,
-                                                      "text",           ARTIST_NUM_ALBUMS,
-                                                      "weight",         ARTIST_FONT_WEIGHT,
-                                                      "style",          ARTIST_FONT_STYLE,
-                                                      "foreground-gdk", ARTIST_ROW_FOREGROUND,
-                                                      NULL);
+    // # Albums of Artist column
+    column = gtk_tree_view_column_new();
+    gtk_tree_view_column_set_title(column, _(ArtistList_Titles[1]));
+
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           ARTIST_NUM_ALBUMS,
+                                        "weight",         ARTIST_FONT_WEIGHT,
+                                        "style",          ARTIST_FONT_STYLE,
+                                        "foreground-gdk", ARTIST_ROW_FOREGROUND,
+                                        NULL);
     gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserArtistList), column);
     gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 
-    column = gtk_tree_view_column_new_with_attributes(_(ArtistList_Titles[2]), renderer,
-                                                      "text",           ARTIST_NUM_FILES,
-                                                      "weight",         ARTIST_FONT_WEIGHT,
-                                                      "style",          ARTIST_FONT_STYLE,
-                                                      "foreground-gdk", ARTIST_ROW_FOREGROUND,
-                                                      NULL);
+    // # Files of Artist column
+    column = gtk_tree_view_column_new();
+    gtk_tree_view_column_set_title(column, _(ArtistList_Titles[2]));
+
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           ARTIST_NUM_FILES,
+                                        "weight",         ARTIST_FONT_WEIGHT,
+                                        "style",          ARTIST_FONT_STYLE,
+                                        "foreground-gdk", ARTIST_ROW_FOREGROUND,
+                                        NULL);
     gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserArtistList), column);
     gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 
-    gtk_tree_view_set_reorderable(GTK_TREE_VIEW(BrowserArtistList), FALSE);
-    gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(BrowserArtistList)),GTK_SELECTION_SINGLE);
     g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(BrowserArtistList))),"changed",G_CALLBACK(Browser_Artist_List_Row_Selected),NULL);
 
     gtk_container_add(GTK_CONTAINER(ScrollWindowArtistList),BrowserArtistList);
@@ -3019,6 +3206,7 @@ GtkWidget *Create_Browser_Items (GtkWidget *parent)
                                    GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
 
     albumListModel = gtk_list_store_new(ALBUM_COLUMN_COUNT,
+                                        G_TYPE_STRING, // Stock-id
                                         G_TYPE_STRING,
                                         G_TYPE_UINT,
                                         G_TYPE_POINTER,
@@ -3028,28 +3216,43 @@ GtkWidget *Create_Browser_Items (GtkWidget *parent)
 
     BrowserAlbumList = gtk_tree_view_new_with_model(GTK_TREE_MODEL(albumListModel));
     gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(BrowserAlbumList), TRUE);
-    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_set_reorderable(GTK_TREE_VIEW(BrowserAlbumList), FALSE);
+    gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(BrowserAlbumList)), GTK_SELECTION_SINGLE);
 
-    column = gtk_tree_view_column_new_with_attributes(_(AlbumList_Titles[0]), renderer,
-                                                      "text",           ALBUM_NAME,
-                                                      "weight",         ALBUM_FONT_WEIGHT,
-                                                      "style",          ALBUM_FONT_STYLE,
-                                                      "foreground-gdk", ALBUM_ROW_FOREGROUND,
-                                                      NULL);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserAlbumList), column);
+    // Album column
+    column = gtk_tree_view_column_new();
+    gtk_tree_view_column_set_title(column, _(AlbumList_Titles[0]));
 
-    column = gtk_tree_view_column_new_with_attributes(_(AlbumList_Titles[1]), renderer,
-                                                      "text",           ALBUM_NUM_FILES,
-                                                      "weight",         ALBUM_FONT_WEIGHT,
-                                                      "style",          ALBUM_FONT_STYLE,
-                                                      "foreground-gdk", ALBUM_ROW_FOREGROUND,
-                                                      NULL);
+    renderer = gtk_cell_renderer_pixbuf_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                       "stock-id",        ALBUM_PIXBUF,
+                                        NULL);
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           ALBUM_NAME,
+                                        "weight",         ALBUM_FONT_WEIGHT,
+                                        "style",          ALBUM_FONT_STYLE,
+                                        "foreground-gdk", ALBUM_ROW_FOREGROUND,
+                                        NULL);
     gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserAlbumList), column);
     gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 
-    gtk_tree_view_set_reorderable(GTK_TREE_VIEW(BrowserAlbumList), FALSE);
-    gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(BrowserAlbumList)), GTK_SELECTION_SINGLE);
+    // # files column
+    column = gtk_tree_view_column_new();
+    gtk_tree_view_column_set_title(column, _(AlbumList_Titles[1]));
+
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           ALBUM_NUM_FILES,
+                                        "weight",         ALBUM_FONT_WEIGHT,
+                                        "style",          ALBUM_FONT_STYLE,
+                                        "foreground-gdk", ALBUM_ROW_FOREGROUND,
+                                        NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserAlbumList), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 
     g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(BrowserAlbumList))),"changed",G_CALLBACK(Browser_Album_List_Row_Selected),NULL);
     gtk_container_add(GTK_CONTAINER(ScrollWindowAlbumList),BrowserAlbumList);
@@ -3082,17 +3285,32 @@ GtkWidget *Create_Browser_Items (GtkWidget *parent)
                                        G_TYPE_BOOLEAN,
                                        G_TYPE_INT,
                                        GDK_TYPE_COLOR,
-                                       GDK_TYPE_COLOR);
+                                       GDK_TYPE_COLOR,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING,
+                                       G_TYPE_STRING);
 
     BrowserList = gtk_tree_view_new_with_model(GTK_TREE_MODEL(fileListModel));
-    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(BrowserList), FALSE);
     gtk_container_add(GTK_CONTAINER(ScrollWindowFileList), BrowserList);
+    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(BrowserList), TRUE);
     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();
+    renderer = gtk_cell_renderer_text_new();
     gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    gtk_tree_view_column_set_title(column, _(BrowserList_Titles[0]));
     gtk_tree_view_column_set_attributes(column, renderer,
                                         "text",           LIST_FILE_NAME,
                                         "weight",         LIST_FONT_WEIGHT,
@@ -3100,8 +3318,176 @@ GtkWidget *Create_Browser_Items (GtkWidget *parent)
                                         "foreground-gdk", LIST_ROW_FOREGROUND,
                                         NULL);
     gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserList), column);
+    
+    // Column for Title
+    column = gtk_tree_view_column_new();
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    gtk_tree_view_column_set_title(column, _(BrowserList_Titles[1]));
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           LIST_FILE_TITLE,
+                                        "weight",         LIST_FONT_WEIGHT,
+                                        "background-gdk", LIST_ROW_BACKGROUND,
+                                        "foreground-gdk", LIST_ROW_FOREGROUND,
+                                        NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserList), column);
+    
+    // Column for Artist
+    column = gtk_tree_view_column_new();
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    gtk_tree_view_column_set_title(column, _(BrowserList_Titles[2]));
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           LIST_FILE_ARTIST,
+                                        "weight",         LIST_FONT_WEIGHT,
+                                        "background-gdk", LIST_ROW_BACKGROUND,
+                                        "foreground-gdk", LIST_ROW_FOREGROUND,
+                                        NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserList), column);
+    
+    // Column for Album
+    column = gtk_tree_view_column_new();
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    gtk_tree_view_column_set_title(column, _(BrowserList_Titles[3]));
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           LIST_FILE_ALBUM,
+                                        "weight",         LIST_FONT_WEIGHT,
+                                        "background-gdk", LIST_ROW_BACKGROUND,
+                                        "foreground-gdk", LIST_ROW_FOREGROUND,
+                                        NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserList), column);
+    
+    // Column for Year
+    column = gtk_tree_view_column_new();
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    gtk_tree_view_column_set_title(column, _(BrowserList_Titles[4]));
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           LIST_FILE_YEAR,
+                                        "weight",         LIST_FONT_WEIGHT,
+                                        "background-gdk", LIST_ROW_BACKGROUND,
+                                        "foreground-gdk", LIST_ROW_FOREGROUND,
+                                        NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserList), column);
+    
+    // Column for Track
+    column = gtk_tree_view_column_new();
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    gtk_tree_view_column_set_title(column, _(BrowserList_Titles[5]));
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           LIST_FILE_TRACK,
+                                        "weight",         LIST_FONT_WEIGHT,
+                                        "background-gdk", LIST_ROW_BACKGROUND,
+                                        "foreground-gdk", LIST_ROW_FOREGROUND,
+                                        NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserList), column);
+    
+    // Column for Genre
+    column = gtk_tree_view_column_new();
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    gtk_tree_view_column_set_title(column, _(BrowserList_Titles[6]));
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           LIST_FILE_GENRE,
+                                        "weight",         LIST_FONT_WEIGHT,
+                                        "background-gdk", LIST_ROW_BACKGROUND,
+                                        "foreground-gdk", LIST_ROW_FOREGROUND,
+                                        NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserList), column);
+    
+    // Column for Comment
+    column = gtk_tree_view_column_new();
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    gtk_tree_view_column_set_title(column, _(BrowserList_Titles[7]));
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           LIST_FILE_COMMENT,
+                                        "weight",         LIST_FONT_WEIGHT,
+                                        "background-gdk", LIST_ROW_BACKGROUND,
+                                        "foreground-gdk", LIST_ROW_FOREGROUND,
+                                        NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserList), column);
+    
+    // Column for Composer
+    column = gtk_tree_view_column_new();
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    gtk_tree_view_column_set_title(column, _(BrowserList_Titles[8]));
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           LIST_FILE_COMPOSER,
+                                        "weight",         LIST_FONT_WEIGHT,
+                                        "background-gdk", LIST_ROW_BACKGROUND,
+                                        "foreground-gdk", LIST_ROW_FOREGROUND,
+                                        NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserList), column);
+    
+    // Column for Original Artist
+    column = gtk_tree_view_column_new();
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    gtk_tree_view_column_set_title(column, _(BrowserList_Titles[9]));
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           LIST_FILE_ORIG_ARTIST,
+                                        "weight",         LIST_FONT_WEIGHT,
+                                        "background-gdk", LIST_ROW_BACKGROUND,
+                                        "foreground-gdk", LIST_ROW_FOREGROUND,
+                                        NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserList), column);
+    
+    // Column for Copyright
+    column = gtk_tree_view_column_new();
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    gtk_tree_view_column_set_title(column, _(BrowserList_Titles[10]));
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           LIST_FILE_COPYRIGHT,
+                                        "weight",         LIST_FONT_WEIGHT,
+                                        "background-gdk", LIST_ROW_BACKGROUND,
+                                        "foreground-gdk", LIST_ROW_FOREGROUND,
+                                        NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserList), column);
+    
+    // Column for Url
+    column = gtk_tree_view_column_new();
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
     gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    gtk_tree_view_column_set_title(column, _(BrowserList_Titles[11]));
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           LIST_FILE_URL,
+                                        "weight",         LIST_FONT_WEIGHT,
+                                        "background-gdk", LIST_ROW_BACKGROUND,
+                                        "foreground-gdk", LIST_ROW_FOREGROUND,
+                                        NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserList), column);
     
+    // Column for Encoded By
+    column = gtk_tree_view_column_new();
+    renderer = gtk_cell_renderer_text_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+    gtk_tree_view_column_set_title(column, _(BrowserList_Titles[12]));
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                        "text",           LIST_FILE_ENCODED_BY,
+                                        "weight",         LIST_FONT_WEIGHT,
+                                        "background-gdk", LIST_ROW_BACKGROUND,
+                                        "foreground-gdk", LIST_ROW_FOREGROUND,
+                                        NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(BrowserList), column);
+
+
     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
@@ -3402,10 +3788,15 @@ void Rename_Directory (void)
     {
         GtkWidget *msgbox;
 
-        msgbox = msg_box_new(_("Error..."),_("You must type a directory name!"),
-            GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
-        msg_box_hide_check_button(MSG_BOX(msgbox));
-        msg_box_run(MSG_BOX(msgbox));
+        msgbox = msg_box_new(_("Error..."),
+                             GTK_WINDOW(MainWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             _("You must type a directory name!"),
+                             GTK_STOCK_DIALOG_ERROR,
+                             GTK_STOCK_OK, GTK_RESPONSE_OK,
+                             NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
         g_free(directory_new_name);
         return;
@@ -3417,9 +3808,15 @@ void Rename_Directory (void)
     {
         GtkWidget *msgbox;
 
-        msgbox = msg_box_new(_("Error..."),_("Could not convert '%s' into filename encoding. Please use another name."),GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
-        msg_box_hide_check_button(MSG_BOX(msgbox));
-        msg_box_run(MSG_BOX(msgbox));
+        msgbox = msg_box_new(_("Error..."),
+                             GTK_WINDOW(MainWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL  | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             _("Could not convert '%s' into filename encoding. Please use another name."),
+                             GTK_STOCK_DIALOG_ERROR,
+                             GTK_STOCK_OK, GTK_RESPONSE_OK,
+                             NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
         g_free(directory_new_name);
         g_free(directory_new_name_file);
@@ -3447,7 +3844,7 @@ void Rename_Directory (void)
     {
         gchar *msg;
         GtkWidget *msgbox;
-        //gint button;
+        //gint response;
 
         closedir(dir);
         if (strcasecmp(last_path,new_path) != 0)
@@ -3456,16 +3853,22 @@ void Rename_Directory (void)
     //        // 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);
+    //        msgbox = msg_box_new(_("Confirm..."),
+    //                             GTK_WINDOW(MainWindow),
+    //                             NULL,
+    //                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+    //                             msg,
+    //                             GTK_STOCK_DIALOG_QUESTION,
+    //                             GTK_STOCK_NO,  GTK_RESPONSE_NO,
+	//                             GTK_STOCK_YES, GTK_RESPONSE_YES,
+    //                             NULL);
     //        g_free(msg);
-    //        msg_box_hide_check_button(MSG_BOX(msgbox));
-    //        button = msg_box_run(MSG_BOX(msgbox));
+    //        response = gtk_dialog_run(GTK_DIALOG(msgbox));
     //        gtk_widget_destroy(msgbox);
     //
-    //        switch (button)
+    //        switch (response)
     //        {
-    //            case BUTTON_YES:
+    //            case GTK_STOCK_YES:
     //                // Here we must rename all files with the new location, and remove the directory
     //
     //                Rename_File ()
@@ -3477,11 +3880,17 @@ void Rename_Directory (void)
 
             msg = g_strdup_printf(_("Can't rename because this directory name "
                                     "already exists!\n(%s)"),new_path_utf8);
-            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));
+            msgbox = msg_box_new(_("Error..."),
+                                 GTK_WINDOW(MainWindow),
+                                 NULL,
+                                 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                 msg,
+                                 GTK_STOCK_DIALOG_ERROR,
+                                 GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                 NULL);
+            gtk_dialog_run(GTK_DIALOG(msgbox));
             gtk_widget_destroy(msgbox);
+            g_free(msg);
 
             g_free(directory_new_name);
             g_free(directory_new_name_file);
@@ -3512,11 +3921,17 @@ void Rename_Directory (void)
 
         msg = g_strdup_printf(_("Can't rename directory \n'%s'\n to \n'%s'!\n(%s)"),
                     last_path_utf8,tmp_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));
+        msgbox = msg_box_new(_("Error..."),
+                             GTK_WINDOW(MainWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             msg,
+                             GTK_STOCK_DIALOG_ERROR,
+                             GTK_STOCK_OK, GTK_RESPONSE_OK,
+                             NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
+        g_free(msg);
 
         g_free(directory_new_name);
         g_free(directory_new_name_file);
@@ -3538,11 +3953,17 @@ void Rename_Directory (void)
 
         msg = g_strdup_printf(_("Can't rename directory \n'%s'\n to \n'%s'!\n(%s)"),
                               tmp_path_utf8,new_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));
+        msgbox = msg_box_new(_("Error..."),
+                             GTK_WINDOW(MainWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             msg,
+                             GTK_STOCK_DIALOG_ERROR,
+                             GTK_STOCK_OK, GTK_RESPONSE_OK,
+                             NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
+        g_free(msg);
 
         g_free(directory_new_name);
         g_free(directory_new_name_file);
@@ -3679,7 +4100,7 @@ void Browser_Open_Run_Program_Tree_Window (void)
         G_CALLBACK(Run_Program_With_Directory),G_OBJECT(RunProgramComboBox));
 
     /* The button to Browse */
-    Button = Create_Button_With_Pixmap(BUTTON_BROWSE);
+    Button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
     gtk_box_pack_start(GTK_BOX(HBox),Button,FALSE,FALSE,0);
     g_signal_connect_swapped(G_OBJECT(Button),"clicked",
                              G_CALLBACK(File_Selection_Window_For_File),G_OBJECT(GTK_BIN(RunProgramComboBox)->child));
@@ -3839,7 +4260,7 @@ void Browser_Open_Run_Program_List_Window (void)
         G_CALLBACK(Run_Program_With_Selected_Files),G_OBJECT(RunProgramComboBox));
 
     /* The button to Browse */
-    Button = Create_Button_With_Pixmap(BUTTON_BROWSE);
+    Button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
     gtk_box_pack_start(GTK_BOX(HBox),Button,FALSE,FALSE,0);
     g_signal_connect_swapped(G_OBJECT(Button),"clicked",
                              G_CALLBACK(File_Selection_Window_For_File),G_OBJECT(GTK_BIN(RunProgramComboBox)->child));
@@ -3982,10 +4403,15 @@ 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);
-        msg_box_hide_check_button(MSG_BOX(msgbox));
-        msg_box_run(MSG_BOX(msgbox));
+        msgbox = msg_box_new(_("Error..."),
+                             GTK_WINDOW(MainWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             _("You must type a program name!"),
+                             GTK_STOCK_DIALOG_ERROR,
+                             GTK_STOCK_OK, GTK_RESPONSE_OK,
+                             NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
         return FALSE;
     }
@@ -3996,9 +4422,15 @@ gboolean Run_Program (gchar *program_name, GList *args_list)
         gchar *msg;
 
         msg = g_strdup_printf(_("The program '%s' can't be found!"),program_name);
-        msgbox = msg_box_new(_("Error..."),msg,GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
-        msg_box_hide_check_button(MSG_BOX(msgbox));
-        msg_box_run(MSG_BOX(msgbox));
+        msgbox = msg_box_new(_("Error..."),
+                             GTK_WINDOW(MainWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             msg,
+                             GTK_STOCK_DIALOG_ERROR,
+                             GTK_STOCK_OK, GTK_RESPONSE_OK,
+                             NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
         g_free(msg);
         return FALSE;
@@ -4044,7 +4476,7 @@ gboolean Run_Program (gchar *program_name, GList *args_list)
                       &siStartupInfo,
                       &piProcessInfo) == FALSE)
     {
-        Log_Print(_("Can't execute %s (error %d)!\n"), program_name, GetLastError());
+        Log_Print(LOG_ERROR,_("Can't execute %s (error %d)!\n"), program_name, GetLastError());
     }
 
     // Free allocated parameters (for each filename)
@@ -4063,7 +4495,7 @@ gboolean Run_Program (gchar *program_name, GList *args_list)
     switch (pid)
     {
         case -1:
-            Log_Print(_("Can't fork another process!\n"));
+            Log_Print(LOG_ERROR,_("Can't fork another process!\n"));
             //exit(-1);
             break;
         case 0:
diff --git a/src/browser.h b/src/browser.h
index fb02029..098b1b3 100644..100755
--- a/src/browser.h
+++ b/src/browser.h
@@ -76,27 +76,29 @@ enum
     LIST_FILE_NAME,
     LIST_FILE_POINTER,
     LIST_FILE_KEY,
-    LIST_FILE_OTHERDIR,
+    LIST_FILE_OTHERDIR, // To change color for other directories
     LIST_FONT_WEIGHT,
     LIST_ROW_BACKGROUND,
     LIST_ROW_FOREGROUND,
     // Tag fields
-    /*LIST_FILE_TITLE,
+    LIST_FILE_TITLE,
     LIST_FILE_ARTIST,
     LIST_FILE_ALBUM,
     LIST_FILE_YEAR,
+    LIST_FILE_TRACK,
     LIST_FILE_GENRE,
     LIST_FILE_COMMENT,
     LIST_FILE_COMPOSER,
     LIST_FILE_ORIG_ARTIST,
     LIST_FILE_COPYRIGHT,
     LIST_FILE_URL,
-    LIST_FILE_ENCODED_BY,*/
+    LIST_FILE_ENCODED_BY,
     LIST_COLUMN_COUNT
 };
 
 enum
 {
+    ARTIST_PIXBUF,
     ARTIST_NAME,
     ARTIST_NUM_ALBUMS,
     ARTIST_NUM_FILES,
@@ -109,6 +111,7 @@ enum
 
 enum
 {
+    ALBUM_PIXBUF,
     ALBUM_NAME,
     ALBUM_NUM_FILES,
     ALBUM_ETFILE_LIST_POINTER,
diff --git a/src/cddb.c b/src/cddb.c
index e8cf147..8d4cf7f 100644
--- a/src/cddb.c
+++ b/src/cddb.c
@@ -44,6 +44,7 @@
 #include "easytag.h"
 #include "et_core.h"
 #include "browser.h"
+#include "base64.h"
 #include "scan.h"
 #include "log.h"
 #include "misc.h"
@@ -55,7 +56,7 @@
 
 enum
 {
-    CDDB_ALBUM_LIST_BITMAP,
+    CDDB_ALBUM_LIST_PIXBUF,
     CDDB_ALBUM_LIST_ALBUM,
     CDDB_ALBUM_LIST_CATEGORY,
     CDDB_ALBUM_LIST_DATA,
@@ -196,7 +197,7 @@ gint Cddb_Track_List_Sort_Func (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter
 void Cddb_Track_List_Sort_By_Ascending_Track_Number (void);
 void Cddb_Track_List_Sort_By_Ascending_Track_Name   (void);
 
-char  *base64_encode (char *str);
+//char  *base64_encode (char *str);
 gchar *Cddb_Format_Proxy_Authentification (void);
 
 
@@ -614,7 +615,7 @@ void Open_Cddb_Window (void)
 
     renderer = gtk_cell_renderer_pixbuf_new();
     column = gtk_tree_view_column_new_with_attributes(_(CddbAlbumList_Titles[0]), renderer,
-                                                      "pixbuf", CDDB_ALBUM_LIST_BITMAP,
+                                                      "pixbuf",         CDDB_ALBUM_LIST_PIXBUF,
                                                       NULL);
     gtk_tree_view_column_set_resizable(column, FALSE);
     gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
@@ -622,9 +623,9 @@ void Open_Cddb_Window (void)
 
     renderer = gtk_cell_renderer_text_new();
     column = gtk_tree_view_column_new_with_attributes(_(CddbAlbumList_Titles[1]), renderer,
-                                                      "text", CDDB_ALBUM_LIST_ALBUM,
-                                                      "weight", CDDB_ALBUM_LIST_FONT_WEIGHT,
-                                                      "style", CDDB_ALBUM_LIST_FONT_STYLE,
+                                                      "text",           CDDB_ALBUM_LIST_ALBUM,
+                                                      "weight",         CDDB_ALBUM_LIST_FONT_WEIGHT,
+                                                      "style",          CDDB_ALBUM_LIST_FONT_STYLE,
                                                       "foreground-gdk", CDDB_ALBUM_LIST_FOREGROUND_COLOR,
                                                       NULL);
     gtk_tree_view_column_set_resizable(column, TRUE);
@@ -633,9 +634,9 @@ void Open_Cddb_Window (void)
 
     renderer = gtk_cell_renderer_text_new();
     column = gtk_tree_view_column_new_with_attributes(_(CddbAlbumList_Titles[2]), renderer,
-                                                      "text", CDDB_ALBUM_LIST_CATEGORY,
-                                                      "weight", CDDB_ALBUM_LIST_FONT_WEIGHT,
-                                                      "style", CDDB_ALBUM_LIST_FONT_STYLE,
+                                                      "text",           CDDB_ALBUM_LIST_CATEGORY,
+                                                      "weight",         CDDB_ALBUM_LIST_FONT_WEIGHT,
+                                                      "style",          CDDB_ALBUM_LIST_FONT_STYLE,
                                                       "foreground-gdk", CDDB_ALBUM_LIST_FOREGROUND_COLOR,
                                                       NULL);
     gtk_tree_view_column_set_resizable(column, TRUE);
@@ -1626,7 +1627,7 @@ gint Cddb_Open_Connection (gchar *host, gint port)
     {
         msg = g_strdup_printf(_("Can't resolve host '%s' (%s)!"),host,g_strerror(errno));
         gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
-        Log_Print("%s",msg);
+        Log_Print(LOG_ERROR,"%s",msg);
         g_free(msg);
         return 0;
     }
@@ -1641,7 +1642,7 @@ gint Cddb_Open_Connection (gchar *host, gint port)
     {
         msg = g_strdup_printf(_("Can't create a new socket (%s)!"),g_strerror(errno));
         gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
-        Log_Print("%s",msg);
+        Log_Print(LOG_ERROR,"%s",msg);
         g_free(msg);
         return 0;
     }
@@ -1649,7 +1650,7 @@ gint Cddb_Open_Connection (gchar *host, gint port)
     // FIX ME : must catch SIGPIPE?
     if ( setsockopt(socket_id,SOL_SOCKET,SO_KEEPALIVE,(gchar *)&optval,sizeof(optval)) < 0 )
     {
-        Log_Print("Can't set option of the new created socket!");
+        Log_Print(LOG_ERROR,"Can't set option of the new created socket!");
     }
 
     // Open connection to the server
@@ -1662,7 +1663,7 @@ gint Cddb_Open_Connection (gchar *host, gint port)
     {
         msg = g_strdup_printf(_("Can't connect to host '%s' (%s)!"),host,g_strerror(errno));
         gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
-        Log_Print("%s",msg);
+        Log_Print(LOG_ERROR,"%s",msg);
         g_free(msg);
         return 0;
     }
@@ -1761,13 +1762,13 @@ gint Cddb_Write_Result_To_File (gint socket_id, gulong *bytes_read_total)
 
         if (bytes_read < 0)
         {
-            Log_Print(_("Error when reading cddb response (%s)!"),g_strerror(errno));
+            Log_Print(LOG_ERROR,_("Error when reading cddb response (%s)!"),g_strerror(errno));
             return -1; // Error!
         }
 
     } else
     {
-        Log_Print(_("Can't create file '%s' (%s)"),file_path,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create file '%s' (%s)"),file_path,g_strerror(errno));
     }
     g_free(file_path);
     g_free(home_path);
@@ -1810,7 +1811,7 @@ gint Cddb_Read_Line (FILE **file, gchar **cddb_out)
 
         if ( (*file=fopen(file_path,"r"))==0 )
         {
-            Log_Print(_("Can't open file '%s' (%s)"),file_path,g_strerror(errno));
+            Log_Print(LOG_ERROR,_("Can't open file '%s' (%s)"),file_path,g_strerror(errno));
             g_free(file_path);
             return -1; // Error!
         }
@@ -1996,7 +1997,8 @@ void Cddb_Load_Album_List (gboolean only_red_lines)
         if (selectedRows)
         {
             if (gtk_tree_model_get_iter(GTK_TREE_MODEL(CddbAlbumListModel), &currentIter, (GtkTreePath*)selectedRows->data))
-                gtk_tree_model_get(GTK_TREE_MODEL(CddbAlbumListModel), &currentIter, CDDB_ALBUM_LIST_DATA, &cddbalbumSelected, -1);
+                gtk_tree_model_get(GTK_TREE_MODEL(CddbAlbumListModel), &currentIter, 
+                                   CDDB_ALBUM_LIST_DATA, &cddbalbumSelected, -1);
         }
 
         // Remove lines
@@ -2013,7 +2015,7 @@ void Cddb_Load_Album_List (gboolean only_red_lines)
                 // Load the row in the list
                 gtk_list_store_append(CddbAlbumListModel, &iter);
                 gtk_list_store_set(CddbAlbumListModel, &iter,
-                                   CDDB_ALBUM_LIST_BITMAP,   cddbalbum->bitmap,
+                                   CDDB_ALBUM_LIST_PIXBUF,   cddbalbum->bitmap,
                                    CDDB_ALBUM_LIST_ALBUM,    cddbalbum->artist_album,
                                    CDDB_ALBUM_LIST_CATEGORY, cddbalbum->category,
                                    CDDB_ALBUM_LIST_DATA,     cddbalbum, -1);
@@ -2220,7 +2222,7 @@ gboolean Cddb_Search_Album_List_From_String_Freedb (void)
 
     /* Build request */
     //cddb_in = g_strdup_printf("GET http://www.freedb.org/freedb_search.php?" // In this case, problem with squid cache...
-    cddb_in = g_strdup_printf("GET /freedb_search.php?"
+    cddb_in = g_strdup_printf("GET %s%s/freedb_search.php?"
                               "words=%s"
                               "%s"
                               "&grouping=none"
@@ -2230,6 +2232,7 @@ gboolean Cddb_Search_Album_List_From_String_Freedb (void)
                               "%s"
                               "Connection: close\r\n"
                               "\r\n",
+                              CDDB_USE_PROXY?"http://":"", CDDB_USE_PROXY?cddb_server_name:"",  // Needed when using proxy
                               string,
                               (tmp=Cddb_Generate_Request_String_With_Fields_And_Categories_Options()),
                               cddb_server_name,cddb_server_port,
@@ -2247,7 +2250,7 @@ gboolean Cddb_Search_Album_List_From_String_Freedb (void)
     while (gtk_events_pending()) gtk_main_iteration();
     if ( (bytes_written=send(socket_id,cddb_in,strlen(cddb_in)+1,0)) < 0)
     {
-        Log_Print(_("Can't send the request (%s)!"),g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't send the request (%s)!"),g_strerror(errno));
         Cddb_Close_Connection(socket_id);
         g_free(cddb_in);
         g_free(string);
@@ -2278,7 +2281,7 @@ gboolean Cddb_Search_Album_List_From_String_Freedb (void)
     {
         msg = g_strdup(_("The server returned a wrong answer!"));
         gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
-        Log_Print("%s",msg);
+        Log_Print(LOG_ERROR,"%s",msg);
         g_free(msg);
         g_free(cddb_server_name);
         g_free(cddb_server_cgi_path);
@@ -2292,7 +2295,7 @@ gboolean Cddb_Search_Album_List_From_String_Freedb (void)
     {
         msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
         gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
-        Log_Print("%s",msg);
+        Log_Print(LOG_ERROR,"%s",msg);
         g_free(msg);
         g_free(cddb_out);
         g_free(cddb_server_name);
@@ -2541,7 +2544,7 @@ gboolean Cddb_Search_Album_List_From_String_Gnudb (void)
 
 
         /* Build request */
-        cddb_in = g_strdup_printf("GET /search/"
+        cddb_in = g_strdup_printf("GET %s%s/search/"
                                   "%s"
                                   "?page=%d"
                                   " HTTP/1.1\r\n"
@@ -2550,6 +2553,7 @@ gboolean Cddb_Search_Album_List_From_String_Gnudb (void)
                                   "%s"
                                   "Connection: close\r\n"
                                   "\r\n",
+                                  CDDB_USE_PROXY?"http://":"", CDDB_USE_PROXY?cddb_server_name:"",  // Needed when using proxy
                                   string,
                                   next_page_cpt,
                                   cddb_server_name,cddb_server_port,
@@ -2565,7 +2569,7 @@ gboolean Cddb_Search_Album_List_From_String_Gnudb (void)
         while (gtk_events_pending()) gtk_main_iteration();
         if ( (bytes_written=send(socket_id,cddb_in,strlen(cddb_in)+1,0)) < 0)
         {
-            Log_Print(_("Can't send the request (%s)!"),g_strerror(errno));
+            Log_Print(LOG_ERROR,_("Can't send the request (%s)!"),g_strerror(errno));
             Cddb_Close_Connection(socket_id);
             g_free(cddb_in);
             g_free(string);
@@ -2596,7 +2600,7 @@ gboolean Cddb_Search_Album_List_From_String_Gnudb (void)
         {
             msg = g_strdup(_("The server returned a wrong answer!"));
             gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
-            Log_Print("%s",msg);
+            Log_Print(LOG_ERROR,"%s",msg);
             g_free(msg);
             g_free(string);
             g_free(cddb_server_name);
@@ -2612,7 +2616,7 @@ gboolean Cddb_Search_Album_List_From_String_Gnudb (void)
         {
             msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
             gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
-            Log_Print("%s",msg);
+            Log_Print(LOG_ERROR,"%s",msg);
             g_free(msg);
             g_free(cddb_out);
             g_free(string);
@@ -2968,11 +2972,15 @@ gboolean Cddb_Search_Album_From_Selected_Files (void)
                 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);
-                msg_box_hide_check_button(MSG_BOX(msgbox));
-                msg_box_run(MSG_BOX(msgbox));
+									 GTK_WINDOW(CddbWindow),
+                                     NULL,
+                                     GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+									 _("The path for 'Local CD Data Base' wasn't defined!\nFill it in the preferences "
+                                     "window before to use this search."),
+                                     GTK_STOCK_DIALOG_ERROR,
+                                     GTK_STOCK_YES, GTK_RESPONSE_YES,
+                                     NULL);
+                gtk_dialog_run(GTK_DIALOG(msgbox));
                 gtk_widget_destroy(msgbox);
                 break;
             }
@@ -3122,7 +3130,7 @@ gboolean Cddb_Search_Album_From_Selected_Files (void)
 
             if ( (bytes_written=send(socket_id,cddb_in,strlen(cddb_in)+1,0)) < 0)
             {
-                Log_Print(_("Can't send the request (%s)!"),g_strerror(errno));
+                Log_Print(LOG_ERROR,_("Can't send the request (%s)!"),g_strerror(errno));
                 Cddb_Close_Connection(socket_id);
                 g_free(cddb_in);
                 g_free(cddb_server_name);
@@ -3144,7 +3152,7 @@ gboolean Cddb_Search_Album_From_Selected_Files (void)
             {
                 msg = g_strdup(_("The server returned a wrong answer!"));
                 gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
-                Log_Print("%s",msg);
+                Log_Print(LOG_ERROR,"%s",msg);
                 g_free(msg);
                 g_free(cddb_server_name);
                 g_free(cddb_server_cgi_path);
@@ -3159,7 +3167,7 @@ gboolean Cddb_Search_Album_From_Selected_Files (void)
             {
                 msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
                 gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
-                Log_Print("%s",msg);
+                Log_Print(LOG_ERROR,"%s",msg);
                 g_free(msg);
                 g_free(cddb_out);
                 g_free(cddb_server_name);
@@ -3361,7 +3369,7 @@ gboolean Cddb_Get_Album_Tracks_List (GtkTreeSelection* selection)
         // Local access
         if ( (file=fopen(cddb_server_cgi_path,"r"))==0 )
         {
-            Log_Print(_("Can't load file: '%s' (%s)!"),cddb_server_cgi_path,g_strerror(errno));
+            Log_Print(LOG_ERROR,_("Can't load file: '%s' (%s)!"),cddb_server_cgi_path,g_strerror(errno));
             return FALSE;
         }
         
@@ -3398,7 +3406,7 @@ gboolean Cddb_Get_Album_Tracks_List (GtkTreeSelection* selection)
         while (gtk_events_pending()) gtk_main_iteration();
         if ( (bytes_written=send(socket_id,cddb_in,strlen(cddb_in)+1,0)) < 0)
         {
-            Log_Print(_("Can't send the request (%s)!"),g_strerror(errno));
+            Log_Print(LOG_ERROR,_("Can't send the request (%s)!"),g_strerror(errno));
             Cddb_Close_Connection(socket_id);
             g_free(cddb_in);
             return FALSE;
@@ -3416,7 +3424,7 @@ gboolean Cddb_Get_Album_Tracks_List (GtkTreeSelection* selection)
         {
             msg = g_strdup(_("The server returned a wrong answer!"));
             gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
-            Log_Print("%s",msg);
+            Log_Print(LOG_ERROR,"%s",msg);
             g_free(msg);
             gtk_widget_set_sensitive(GTK_WIDGET(CddbStopSearchButton),FALSE);
             gtk_widget_set_sensitive(GTK_WIDGET(CddbStopSearchAutoButton),FALSE);
@@ -3431,7 +3439,7 @@ gboolean Cddb_Get_Album_Tracks_List (GtkTreeSelection* selection)
         {
             gchar *msg = g_strdup_printf(_("The server returned a wrong answer! (%s)"),cddb_out);
             gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,msg);
-            Log_Print("%s",msg);
+            Log_Print(LOG_ERROR,"%s",msg);
             g_free(msg);
             g_free(cddb_out);
             if (file)
@@ -3640,41 +3648,63 @@ gboolean Cddb_Get_Album_Tracks_List (GtkTreeSelection* selection)
 
 /*
  * Set the row apperance depending if we have cached info or not
- * Bold/Red = Info is cached
+ * Bold/Red = Info are already loaded, but not displayed
  * Italic/Light Red = Duplicate CDDB entry
  */
 void Cddb_Album_List_Set_Row_Appearance (GtkTreeIter *row)
 {
     CddbAlbum *cddbalbum = NULL;
 
-    gtk_tree_model_get(GTK_TREE_MODEL(CddbAlbumListModel), row, CDDB_ALBUM_LIST_DATA, &cddbalbum, -1);
+    gtk_tree_model_get(GTK_TREE_MODEL(CddbAlbumListModel), row, 
+                       CDDB_ALBUM_LIST_DATA, &cddbalbum, -1);
 
     if (cddbalbum->track_list != NULL)
     {
         if (CHANGED_FILES_DISPLAYED_TO_BOLD)
         {
-            gtk_list_store_set(CddbAlbumListModel, row, CDDB_ALBUM_LIST_FONT_WEIGHT, PANGO_WEIGHT_BOLD, -1);
+            gtk_list_store_set(CddbAlbumListModel, row,
+                               CDDB_ALBUM_LIST_FONT_STYLE,       PANGO_STYLE_NORMAL,
+                               CDDB_ALBUM_LIST_FONT_WEIGHT,      PANGO_WEIGHT_BOLD,
+                               CDDB_ALBUM_LIST_FOREGROUND_COLOR, NULL,-1);
         } else
         {
-            if(cddbalbum->other_version == TRUE)
+            if (cddbalbum->other_version == TRUE)
             {
-                gtk_list_store_set(CddbAlbumListModel, row, CDDB_ALBUM_LIST_FOREGROUND_COLOR, &LIGHT_RED, -1);
+                gtk_list_store_set(CddbAlbumListModel, row, 
+                                   CDDB_ALBUM_LIST_FONT_STYLE,       PANGO_STYLE_NORMAL,
+                                   CDDB_ALBUM_LIST_FONT_WEIGHT,      PANGO_WEIGHT_NORMAL,
+                                   CDDB_ALBUM_LIST_FOREGROUND_COLOR, &LIGHT_RED, -1);
             } else
             {
-                gtk_list_store_set(CddbAlbumListModel, row, CDDB_ALBUM_LIST_FOREGROUND_COLOR, &RED, -1);
+                gtk_list_store_set(CddbAlbumListModel, row, 
+                                   CDDB_ALBUM_LIST_FONT_STYLE,       PANGO_STYLE_NORMAL,
+                                   CDDB_ALBUM_LIST_FONT_WEIGHT,      PANGO_WEIGHT_NORMAL,
+                                   CDDB_ALBUM_LIST_FOREGROUND_COLOR, &RED, -1);
             }
         }
     } else
     {
-        if(cddbalbum->other_version == TRUE)
+        if (cddbalbum->other_version == TRUE)
         {
             if (CHANGED_FILES_DISPLAYED_TO_BOLD)
             {
-                gtk_list_store_set(CddbAlbumListModel, row, CDDB_ALBUM_LIST_FONT_STYLE, PANGO_STYLE_ITALIC, -1);
+                gtk_list_store_set(CddbAlbumListModel, row, 
+                                   CDDB_ALBUM_LIST_FONT_STYLE,       PANGO_STYLE_ITALIC,
+                                   CDDB_ALBUM_LIST_FONT_WEIGHT,      PANGO_WEIGHT_NORMAL,
+                                   CDDB_ALBUM_LIST_FOREGROUND_COLOR, NULL,-1);
             } else
             {
-                gtk_list_store_set(CddbAlbumListModel, row, CDDB_ALBUM_LIST_FOREGROUND_COLOR, &GREY, -1);
+                gtk_list_store_set(CddbAlbumListModel, row, 
+                                   CDDB_ALBUM_LIST_FONT_STYLE,       PANGO_STYLE_NORMAL,
+                                   CDDB_ALBUM_LIST_FONT_WEIGHT,      PANGO_WEIGHT_NORMAL,
+                                   CDDB_ALBUM_LIST_FOREGROUND_COLOR, &GREY, -1);
             }
+        } else
+        {
+            gtk_list_store_set(CddbAlbumListModel, row, 
+                               CDDB_ALBUM_LIST_FONT_STYLE,       PANGO_STYLE_NORMAL,
+                               CDDB_ALBUM_LIST_FONT_WEIGHT,      PANGO_WEIGHT_NORMAL,
+                               CDDB_ALBUM_LIST_FOREGROUND_COLOR, NULL, -1);
         }
     }
 }
@@ -3792,18 +3822,24 @@ gboolean Cddb_Set_Track_Infos_To_File_List (void)
     {
         GtkWidget *msgbox;
         gchar *msg;
-        gint button;
+        gint response;
 
         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);
-        msg_box_hide_check_button(MSG_BOX(msgbox));
-        button = msg_box_run(MSG_BOX(msgbox));
+        msgbox = msg_box_new(_("Write Tag from CDDB..."),
+							 GTK_WINDOW(CddbWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL  | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             msg,
+                             GTK_STOCK_DIALOG_QUESTION,
+                             GTK_STOCK_NO,  GTK_RESPONSE_NO,
+							 GTK_STOCK_YES, GTK_RESPONSE_YES,
+                             NULL);
+        response = gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
 
-        if (button != BUTTON_YES)
+        if (response != GTK_RESPONSE_YES)
         {
             g_list_foreach(file_iterlist, (GFunc)g_free, NULL);
             g_list_free(file_iterlist);
@@ -4089,12 +4125,14 @@ GdkPixbuf *Cddb_Get_Pixbuf_From_Server_Name (gchar *server_name)
  * Function taken from gFTP.
  * The standard to Base64 encoding can be found in RFC2045
  */
+/*
 char *base64_encode (char *str)
 {
     char *newstr, *newpos, *fillpos, *pos;
     unsigned char table[64], encode[3];
     int i, num;
 
+    // Build table
     for (i = 0; i < 26; i++)
     {
         table[i] = 'A' + i;
@@ -4107,6 +4145,7 @@ char *base64_encode (char *str)
     table[62] = '+';
     table[63] = '/';
 
+    
     num = strlen (str) / 3;
     if (strlen (str) % 3 > 0)
         num++;
@@ -4131,20 +4170,25 @@ char *base64_encode (char *str)
     }
     return (newstr);
 }
+*/
 
 gchar *Cddb_Format_Proxy_Authentification (void)
 {
-    gchar *tempstr;
-    gchar *str;
     gchar *ret;
 
     if (CDDB_USE_PROXY &&  CDDB_PROXY_USER_NAME != NULL && *CDDB_PROXY_USER_NAME != '\0')
     {
+        
+        gchar *tempstr;
+        gchar *str_encoded;
+        gint size;
+
         tempstr = g_strconcat(CDDB_PROXY_USER_NAME, ":", CDDB_PROXY_USER_PASSWORD, NULL);
-        str = base64_encode(tempstr);
+        //str_encoded = base64_encode(tempstr);
+        size = base64_encode(tempstr, strlen(tempstr), &str_encoded);
 
-        ret = g_strdup_printf("Proxy-authorization: Basic %s\r\n", str);
-        g_free (str);
+        ret = g_strdup_printf("Proxy-authorization: Basic %s\r\n", str_encoded);
+        g_free (str_encoded);
     }else
     {
         ret = g_strdup("");
diff --git a/src/cddb.h b/src/cddb.h
index 9bcfd69..9bcfd69 100644..100755
--- a/src/cddb.h
+++ b/src/cddb.h
diff --git a/src/charset.c b/src/charset.c
index 74ecd9d..6684540 100755
--- a/src/charset.c
+++ b/src/charset.c
@@ -166,7 +166,8 @@ insert_locales (GHashTable *encodings, char *enc, ...)
     char *s;
 
     va_start (args, enc);
-    for (;;) {
+    for (;;)
+    {
         s = va_arg (args, char *);
         if (s == NULL)
             break;
@@ -201,7 +202,7 @@ Charset_Insert_Locales_Init (void)
     insert_locales (encodings, "EUC-KR", "ko", NULL);
     /*insert_locales (encodings, "GEORGIAN-ACADEMY", NULL);*/
     insert_locales (encodings, "GEORGIAN-PS", "ka", NULL);
-    insert_locales (encodings, "ISO-8859-1", "br", "ca", "da", "de", "en", "es", "eu", "fi", "fr", "gl", "it", "nl", "wa", "no", "pt", "pt", "sv", NULL);
+    insert_locales (encodings, "ISO-8859-1", "br", "ca", "da", "de", "en", "es", "eu", "fi", "fr", "gl", "it", "nl", "wa", "nb", "nn", "pt", "pt", "sv", NULL);
 #if WIN32
     insert_locales (encodings, "windows-1250", "cs", "hr", "hu", "pl", "ro", "sk", "sl", "sq", "sr", NULL);
 #else
@@ -399,8 +400,8 @@ gchar *convert_string_1 (const gchar *string, gssize length, const gchar *from_c
         gchar *escaped_str = g_strescape(string, NULL);
         if (display_error)
         {
-            Log_Print("convert_string(): Failed conversion from charset '%s' to '%s'. "
-                      "String '%s'. Errcode %d (%s).\n",
+            Log_Print(LOG_ERROR,"convert_string(): Failed conversion from charset '%s' to '%s'. "
+                      "String '%s'. Errcode %d (%s).",
                       from_codeset, to_codeset, escaped_str, error->code, error->message);
         }
         g_free(escaped_str);
@@ -448,15 +449,15 @@ gchar *convert_to_utf8 (const gchar *string)
         const gchar *usercharset;
         gchar *escaped_str = g_strescape(string, NULL);
         g_get_charset(&usercharset);
-        Log_Print("convert_to_utf8(): Failed conversion from charset '%s'. "
-                  "String '%s'. Errcode %d (%s).\n",
+        Log_Print(LOG_ERROR,"convert_to_utf8(): Failed conversion from charset '%s'. "
+                  "String '%s'. Errcode %d (%s).",
                   usercharset, escaped_str, error->code, error->message);
         g_free(escaped_str);
 
         if (g_utf8_validate(string, -1, NULL))
-            Log_Print("convert_to_utf8(): String was valid UTF-8.\n");
+            Log_Print(LOG_ERROR,"convert_to_utf8(): String was valid UTF-8.");
         else
-            Log_Print("convert_to_utf8(): String was INVALID UTF-8.\n");
+            Log_Print(LOG_ERROR,"convert_to_utf8(): String was INVALID UTF-8.");
 
         g_error_free(error);
         return g_strdup(string);
@@ -480,15 +481,15 @@ gchar *convert_from_utf8 (const char *string)
         const gchar *usercharset;
         gchar *escaped_str = g_strescape(string, NULL);
         g_get_charset(&usercharset);
-        Log_Print("convert_from_utf8(): Failed conversion to charset '%s'. "
-                  "String '%s'. Errcode %d (%s).\n",
+        Log_Print(LOG_ERROR,"convert_from_utf8(): Failed conversion to charset '%s'. "
+                  "String '%s'. Errcode %d (%s).",
                   usercharset, escaped_str, error->code, error->message);
         g_free(escaped_str);
 
         if (g_utf8_validate(string, -1, NULL))
-            Log_Print("convert_from_utf8(): String was valid UTF-8.\n");
+            Log_Print(LOG_ERROR,"convert_from_utf8(): String was valid UTF-8.");
         else
-            Log_Print("convert_from_utf8(): String was INVALID UTF-8.\n");
+            Log_Print(LOG_ERROR,"convert_from_utf8(): String was INVALID UTF-8.");
 
         g_error_free(error);
         return g_strdup(string);
@@ -539,7 +540,7 @@ gchar *filename_to_display (const gchar *string)
         if (!ret)
         {
             gchar *escaped_str = g_strescape(string, NULL);
-            Log_Print(_("The filename '%s' couldn't be converted into UTF-8 (%s).\n"),
+            Log_Print(LOG_ERROR,_("The filename '%s' couldn't be converted into UTF-8 (%s)."),
                         escaped_str, error && error->message ? error->message : _("Invalid UTF-8"));
             g_clear_error(&error);
 
@@ -638,7 +639,7 @@ gchar *filename_from_display (const gchar *string)
     {
         // Conversion KO!
         gchar *escaped_str = g_strescape(string, NULL);
-        Log_Print(_("The UTF-8 string '%s' couldn't be converted into filename encoding (%s)\n"),
+        Log_Print(LOG_ERROR,_("The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."),
                     escaped_str, error && error->message ? error->message : _("Invalid UTF-8"));
         g_clear_error(&error);
 
@@ -702,7 +703,7 @@ gchar *Try_To_Validate_Utf8_String (const gchar *string)
         if (!ret)
         {
             gchar *escaped_str = g_strescape(string, NULL);
-            Log_Print(_("The string '%s' couldn't be converted into UTF-8 (%s).\n"),
+            Log_Print(LOG_ERROR,_("The string '%s' couldn't be converted into UTF-8 (%s)."),
                         escaped_str, error && error->message ? error->message : _("Invalid UTF-8"));
             g_clear_error(&error);
 
@@ -789,25 +790,25 @@ gboolean test_conversion_charset (const gchar *from, const gchar *to)
         /*// Error in conversion
         if (error && error->code == G_CONVERT_ERROR_NO_CONVERSION)
         {
-            Log_Print("Conversion error from '%s' to '%s' (G_CONVERT_ERROR_NO_CONVERSION)",from,to);
+            Log_Print(LOG_ERROR,"Conversion error from '%s' to '%s' (G_CONVERT_ERROR_NO_CONVERSION)",from,to);
         } else if (error && error->code == G_CONVERT_ERROR_ILLEGAL_SEQUENCE)
         {
-            Log_Print("Conversion error from '%s' to '%s' (G_CONVERT_ERROR_ILLEGAL_SEQUENCE)",from,to);
+            Log_Print(LOG_ERROR,"Conversion error from '%s' to '%s' (G_CONVERT_ERROR_ILLEGAL_SEQUENCE)",from,to);
         } else if (error && error->code == G_CONVERT_ERROR_FAILED)
         {
-            Log_Print("Conversion error from '%s' to '%s' (G_CONVERT_ERROR_FAILED)",from,to);
+            Log_Print(LOG_ERROR,"Conversion error from '%s' to '%s' (G_CONVERT_ERROR_FAILED)",from,to);
         } else if (error && error->code == G_CONVERT_ERROR_PARTIAL_INPUT)
         {
-            Log_Print("Conversion error from '%s' to '%s' (G_CONVERT_ERROR_PARTIAL_INPUT)",from,to);
+            Log_Print(LOG_ERROR,"Conversion error from '%s' to '%s' (G_CONVERT_ERROR_PARTIAL_INPUT)",from,to);
         } else if (error && error->code == G_CONVERT_ERROR_BAD_URI)
         {
-            Log_Print("Conversion error from '%s' to '%s' (G_CONVERT_ERROR_BAD_URI)",from,to);
+            Log_Print(LOG_ERROR,"Conversion error from '%s' to '%s' (G_CONVERT_ERROR_BAD_URI)",from,to);
         } else if (error && error->code == G_CONVERT_ERROR_NOT_ABSOLUTE_PATH)
         {
-            Log_Print("Conversion error from '%s' to '%s' (G_CONVERT_ERROR_NOT_ABSOLUTE_PATH)",from,to);
+            Log_Print(LOG_ERROR,"Conversion error from '%s' to '%s' (G_CONVERT_ERROR_NOT_ABSOLUTE_PATH)",from,to);
         } else
         {
-            Log_Print("Conversion error from '%s' to '%s' (unknown : %d)",from,to,error->code);
+            Log_Print(LOG_ERROR,"Conversion error from '%s' to '%s' (unknown : %d)",from,to,error->code);
         }
 
         if (error)
diff --git a/src/easytag.c b/src/easytag.c
index 6a3bd4e..6d8bd62 100644..100755
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -142,6 +142,8 @@ int main (int argc, char *argv[])
     GtkWidget *HBox, *VBox;
     gboolean created_settings;
     struct stat statbuf;
+    //GError *error = NULL;
+    //GdkPixbuf *pixbuf;
     GdkPixmap *pixmap;
     GdkBitmap *mask;
 
@@ -158,7 +160,7 @@ int main (int argc, char *argv[])
 #endif
 
 #ifdef ENABLE_NLS
-    bindtextdomain(GETTEXT_PACKAGE, LOCALE);
+    bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
     bind_textdomain_codeset(PACKAGE, "UTF-8");
     textdomain(GETTEXT_PACKAGE);
     /* Initialize i18n support */
@@ -174,25 +176,25 @@ int main (int argc, char *argv[])
     INIT_DIRECTORY = NULL;
 
     /* Starting messages */
-    Log_Print(_("Starting EasyTAG %s (PId: %d) ..."),VERSION,getpid());
+    Log_Print(LOG_OK,_("Starting EasyTAG %s (PId: %d) ..."),VERSION,getpid());
 #ifdef ENABLE_MP3
-    Log_Print(_("Currently using libid3tag version %s ..."), ID3_VERSION);
+    Log_Print(LOG_OK,_("Currently using libid3tag version %s ..."), ID3_VERSION);
 #endif
 #if defined ENABLE_MP3 && defined ENABLE_ID3LIB
-    Log_Print(_("Currently using id3lib version %d.%d.%d ..."),ID3LIB_MAJOR_VERSION,
+    Log_Print(LOG_OK,_("Currently using id3lib version %d.%d.%d ..."),ID3LIB_MAJOR_VERSION,
                                                                ID3LIB_MINOR_VERSION,
                                                                ID3LIB_PATCH_VERSION);
 #endif
 
 #ifdef WIN32
     if (g_getenv("EASYTAGLANG"))
-        Log_Print(_("Variable EASYTAGLANG defined. Setting locale : '%s'"),g_getenv("EASYTAGLANG"));
+        Log_Print(LOG_OK,_("Variable EASYTAGLANG defined. Setting locale : '%s'"),g_getenv("EASYTAGLANG"));
     else
-        Log_Print(_("Setting locale : '%s'"),g_getenv("LANG"));
+        Log_Print(LOG_OK,_("Setting locale : '%s'"),g_getenv("LANG"));
 #endif
 
     if (get_locale())
-        Log_Print(_("Currently using locale '%s' (and eventually '%s')..."),
+        Log_Print(LOG_OK,_("Currently using locale '%s' (and eventually '%s')..."),
                 get_locale(),get_encoding_from_locale(get_locale()));
 
 
@@ -316,10 +318,20 @@ 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_icon_xpm);
     gdk_window_set_icon(MainWindow->window,(GdkWindow *)NULL,pixmap,mask);
-
-
+    /*pixbuf = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR"/EasyTAG_icon.png",&error);
+    if (pixbuf)
+    {
+        gtk_window_set_icon(GTK_WINDOW(MainWindow),pixbuf);
+        g_object_unref(G_OBJECT(pixbuf));
+    }else
+    {
+        Log_Print(LOG_ERROR,error->message);
+        g_error_free(error);
+    }*/
+    
     /* MainVBox for Menu bar + Tool bar + "Browser Area & FileArea & TagArea" + Log Area + "Status bar & Progress bar" */
     MainVBox = gtk_vbox_new(FALSE,0);
     gtk_container_add (GTK_CONTAINER(MainWindow),MainVBox);
@@ -1542,7 +1554,7 @@ void Mini_Button_Clicked (GObject *object)
 
     if (msg)
     {
-        Log_Print("%s",msg);
+        Log_Print(LOG_OK,"%s",msg);
         Statusbar_Message(msg,TRUE);
         g_free(msg);
     }
@@ -2134,7 +2146,7 @@ gint Save_List_Of_Files (GList *etfilelist, gboolean force_saving_files)
     Tag_Area_Set_Sensitive(FALSE);
     File_Area_Set_Sensitive(FALSE);
 
-    /* Show msgbox (if needed) to ask confirmation */
+    /* Show msgbox (if needed) to ask confirmation ('SF' for Save File) */
     SF_HideMsgbox_Write_Tag = 0;
     SF_HideMsgbox_Rename_File = 0;
 
@@ -2413,7 +2425,8 @@ gint Save_File (ET_File *ETFile, gboolean multiple_files, gboolean force_saving_
     || FileTag->saved == FALSE ) // This tag had been already saved ?
     {
         GtkWidget *msgbox = NULL;
-        gint button;
+        GtkWidget *msgbox_check_button = NULL;
+        gint response;
 
         if (CONFIRM_WRITE_TAG && !SF_HideMsgbox_Write_Tag)
         {
@@ -2423,39 +2436,53 @@ gint Save_File (ET_File *ETFile, gboolean multiple_files, gboolean force_saving_
 
             if (multiple_files)
             {
-                msgbox = msg_box_new(_("Write Tag..."),msg,GTK_STOCK_DIALOG_QUESTION,
-                    BUTTON_CANCEL,BUTTON_NO,BUTTON_YES,0);
-                msg_box_check_button_set_active(MSG_BOX(msgbox),TRUE); // Checked by default
+                msgbox = msg_box_new(_("Write Tag..."),
+                                     GTK_WINDOW(MainWindow),
+                                     &msgbox_check_button,
+                                     GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                     msg,
+                                     GTK_STOCK_DIALOG_QUESTION,
+                                     GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,
+                                     GTK_STOCK_NO,    GTK_RESPONSE_NO,
+									 GTK_STOCK_YES,   GTK_RESPONSE_YES,
+                                     NULL);
+                GTK_TOGGLE_BUTTON(msgbox_check_button)->active = TRUE; // Checked by default
             }else
             {
-                msgbox = msg_box_new(_("Write Tag..."),msg,GTK_STOCK_DIALOG_QUESTION,
-                    BUTTON_NO,BUTTON_YES,0);
-                msg_box_hide_check_button(MSG_BOX(msgbox));
+                msgbox = msg_box_new(_("Write Tag..."),
+                                     GTK_WINDOW(MainWindow),
+                                     NULL,
+                                     GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                     msg,
+                                     GTK_STOCK_DIALOG_QUESTION,
+                                     GTK_STOCK_NO,  GTK_RESPONSE_NO,
+									 GTK_STOCK_YES, GTK_RESPONSE_YES,
+                                     NULL);
             }
             g_free(msg);
 
-            SF_ButtonPressed_Write_Tag = button = msg_box_run(MSG_BOX(msgbox));
-            /* When check button in msgbox was activated : do not display the message again */
-            if (msg_box_check_button_get_active(MSG_BOX(msgbox)))
-                SF_HideMsgbox_Write_Tag = MSG_BOX(msgbox)->check_button_state;
+            SF_ButtonPressed_Write_Tag = response = gtk_dialog_run(GTK_DIALOG(msgbox));
+            // When check button in msgbox was activated : do not display the message again 
+            if (msgbox_check_button && GTK_TOGGLE_BUTTON(msgbox_check_button)->active)
+                SF_HideMsgbox_Write_Tag = GTK_TOGGLE_BUTTON(msgbox_check_button)->active;
             gtk_widget_destroy(msgbox);
         }else
         {
             if (SF_HideMsgbox_Write_Tag)
-                button = SF_ButtonPressed_Write_Tag;
+                response = SF_ButtonPressed_Write_Tag;
             else
-                button = BUTTON_YES;
+                response = GTK_RESPONSE_YES;
         }
 
-        switch (button)
+        switch (response)
         {
-            case BUTTON_YES:
+            case GTK_RESPONSE_YES:
                 Write_File_Tag(ETFile);
                 break;
-            case BUTTON_NO:
+            case GTK_RESPONSE_NO:
                 break;
-            case BUTTON_CANCEL:
-            case -1:
+            case GTK_RESPONSE_CANCEL:
+            case GTK_RESPONSE_NONE:
                 stop_loop = -1;
                 return stop_loop;
                 break;
@@ -2470,7 +2497,8 @@ gint Save_File (ET_File *ETFile, gboolean multiple_files, gboolean force_saving_
     if ( FileNameNew->saved == FALSE ) // This filename had been already saved ?
     {
         GtkWidget *msgbox = NULL;
-        gint button;
+        GtkWidget *msgbox_check_button = NULL;
+        gint response;
 
         if (CONFIRM_RENAME_FILE && !SF_HideMsgbox_Rename_File)
         {
@@ -2509,38 +2537,52 @@ gint Save_File (ET_File *ETFile, gboolean multiple_files, gboolean force_saving_
             if (multiple_files)
             {
                 // Allow to cancel for all other files
-                msgbox = msg_box_new(msg_title,msg,GTK_STOCK_DIALOG_QUESTION,
-                    BUTTON_CANCEL,BUTTON_NO,BUTTON_YES,0);
-                msg_box_check_button_set_active(MSG_BOX(msgbox),TRUE); // Checked by default
+                msgbox = msg_box_new(msg_title,
+                                     GTK_WINDOW(MainWindow),
+                                     &msgbox_check_button,
+                                     GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                     msg,
+                                     GTK_STOCK_DIALOG_QUESTION,
+                                     GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,
+                                     GTK_STOCK_NO,    GTK_RESPONSE_NO,
+									 GTK_STOCK_YES,   GTK_RESPONSE_YES,
+                                     NULL);
+                GTK_TOGGLE_BUTTON(msgbox_check_button)->active = TRUE; // Checked by default
             }else
             {
-                msgbox = msg_box_new(msg_title,msg,GTK_STOCK_DIALOG_QUESTION,
-                    BUTTON_NO,BUTTON_YES,0);
-                msg_box_hide_check_button(MSG_BOX(msgbox));
+                msgbox = msg_box_new(msg_title,
+                                     GTK_WINDOW(MainWindow),
+                                     NULL,
+                                     GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                     msg,
+                                     GTK_STOCK_DIALOG_QUESTION,
+                                     GTK_STOCK_NO,  GTK_RESPONSE_NO,
+									 GTK_STOCK_YES, GTK_RESPONSE_YES,
+                                     NULL);
             }
             g_free(msg);
             g_free(msg_title);
-            SF_ButtonPressed_Rename_File = button = msg_box_run(MSG_BOX(msgbox));
-            if (msg_box_check_button_get_active(MSG_BOX(msgbox)))
-                SF_HideMsgbox_Rename_File = msg_box_check_button_get_active(MSG_BOX(msgbox));
+            SF_ButtonPressed_Rename_File = response = gtk_dialog_run(GTK_DIALOG(msgbox));
+            if (msgbox_check_button && GTK_TOGGLE_BUTTON(msgbox_check_button)->active)
+                SF_HideMsgbox_Rename_File = GTK_TOGGLE_BUTTON(msgbox_check_button)->active;
             gtk_widget_destroy(msgbox);
         }else
         {
             if (SF_HideMsgbox_Rename_File)
-                button = SF_ButtonPressed_Rename_File;
+                response = SF_ButtonPressed_Rename_File;
             else
-                button = BUTTON_YES;
+                response = GTK_RESPONSE_YES;
         }
 
-        switch(button)
+        switch(response)
         {
-            case BUTTON_YES:
+            case GTK_RESPONSE_YES:
                 Rename_File(ETFile);
                 break;
-            case BUTTON_NO:
+            case GTK_RESPONSE_NO:
                 break;
-            case BUTTON_CANCEL:
-            case -1:
+            case GTK_RESPONSE_CANCEL:
+            case GTK_RESPONSE_NONE:
                 stop_loop = -1;
                 return stop_loop;
                 break;
@@ -2592,12 +2634,18 @@ void Write_File_Tag (ET_File *ETFile)
                                   basename_utf8,g_strerror(errno));
     }
 
-    msgbox = msg_box_new(_("Error..."),msg,GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
+    msgbox = msg_box_new(_("Error..."),
+                         GTK_WINDOW(MainWindow),
+                         NULL,
+                         GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                         msg,
+                         GTK_STOCK_DIALOG_ERROR,
+                         GTK_STOCK_OK, GTK_RESPONSE_OK,
+                         NULL);
+    gtk_dialog_run(GTK_DIALOG(msgbox));
+    gtk_widget_destroy(msgbox);
     g_free(msg);
     g_free(basename_utf8);
-    msg_box_hide_check_button(MSG_BOX(msgbox));
-    msg_box_run(MSG_BOX(msgbox));
-    gtk_widget_destroy(msgbox);
 }
 
 
@@ -2736,11 +2784,17 @@ void Rename_File (ET_File *ETFile)
         /* Renaming file to the temporary filename has failed */
         msg = g_strdup_printf(_("Can't rename file '%s'\n to \n'%s'!\n(%s)"),
                                 cur_basename_utf8,new_basename_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));
+        msgbox = msg_box_new(_("Error..."),
+                             GTK_WINDOW(MainWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             msg,
+                             GTK_STOCK_DIALOG_ERROR,
+                             GTK_STOCK_OK, GTK_RESPONSE_OK,
+                             NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
+        g_free(msg);
 
         Statusbar_Message(_("File(s) not renamed..."),TRUE);
         g_free(tmp_filename);
@@ -2768,11 +2822,17 @@ void Rename_File (ET_File *ETFile)
             /* Renaming file from the temporary filename has failed */
             msg = g_strdup_printf(_("Can't rename file '%s'\n to \n'%s'!\n(%s)"),
                                     new_basename_utf8,cur_basename_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));
+            msgbox = msg_box_new(_("Error..."),
+                                 GTK_WINDOW(MainWindow),
+                                 NULL,
+                                 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                 msg,
+                                 GTK_STOCK_DIALOG_ERROR,
+                                 GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                 NULL);
+            gtk_dialog_run(GTK_DIALOG(msgbox));
             gtk_widget_destroy(msgbox);
+            g_free(msg);
 
             Statusbar_Message(_("File(s) not renamed..."),TRUE);
             g_free(tmp_filename);
@@ -2783,11 +2843,17 @@ void Rename_File (ET_File *ETFile)
 
         msg = g_strdup_printf(_("Can't rename file \n'%s'\nbecause the following "
                     "file already exists:\n'%s'"),cur_basename_utf8,new_basename_utf8);
-        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);
+        msgbox = msg_box_new(_("Error..."),
+                             GTK_WINDOW(MainWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             msg,
+                             GTK_STOCK_DIALOG_ERROR,
+                             GTK_STOCK_OK, GTK_RESPONSE_OK,
+                             NULL);
+            gtk_dialog_run(GTK_DIALOG(msgbox));
+            gtk_widget_destroy(msgbox);
+            g_free(msg);
 
         Statusbar_Message(_("File(s) not renamed..."),TRUE);
 
@@ -2815,12 +2881,18 @@ void Rename_File (ET_File *ETFile)
             dirname_new_utf8 = filename_to_display(dirname_new);
             msg = g_strdup_printf(_("Can't create target directory\n'%s'!\n(%s)"),
                                   dirname_new_utf8,g_strerror(errno));
-            msgbox = msg_box_new(_("Error..."),msg,GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
+            msgbox = msg_box_new(_("Error..."),
+                                 GTK_WINDOW(MainWindow),
+                                 NULL,
+                                 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                 msg,
+                                 GTK_STOCK_DIALOG_ERROR,
+                                 GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                 NULL);
+            gtk_dialog_run(GTK_DIALOG(msgbox));
+            gtk_widget_destroy(msgbox);
             g_free(msg);
             g_free(dirname_new_utf8);
-            msg_box_hide_check_button(MSG_BOX(msgbox));
-            msg_box_run(MSG_BOX(msgbox));
-            gtk_widget_destroy(msgbox);
 
             g_free(tmp_filename);
             g_free(cur_basename_utf8);
@@ -2835,7 +2907,7 @@ void Rename_File (ET_File *ETFile)
     if ( rename(tmp_filename,new_filename)==0 )
     {
         /* Renaming file has succeeded */
-        Log_Print(_("Renamed file '%s' to '%s'"),cur_basename_utf8,new_basename_utf8);
+        Log_Print(LOG_OK,_("Renamed file '%s' to '%s'"),cur_basename_utf8,new_basename_utf8);
 
         ETFile->FileNameCur = ETFile->FileNameNew;
         /* Now the file was renamed, so mark his state */
@@ -2853,12 +2925,18 @@ void Rename_File (ET_File *ETFile)
             dirname_cur_utf8 = filename_to_display(dirname_cur);
             msg = g_strdup_printf(_("Can't remove old directory\n'%s'!\n(%s)"),
                                   dirname_cur_utf8,g_strerror(errno));
-            msgbox = msg_box_new(_("Error..."),msg,GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
+            msgbox = msg_box_new(_("Error..."),
+                                 GTK_WINDOW(MainWindow),
+                                 NULL,
+                                 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                 msg,
+                                 GTK_STOCK_DIALOG_ERROR,
+                                 GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                 NULL);
+            gtk_dialog_run(GTK_DIALOG(msgbox));
+            gtk_widget_destroy(msgbox);
             g_free(msg);
             g_free(dirname_cur_utf8);
-            msg_box_hide_check_button(MSG_BOX(msgbox));
-            msg_box_run(MSG_BOX(msgbox));
-            gtk_widget_destroy(msgbox);
 
             g_free(tmp_filename);
             g_free(cur_basename_utf8);
@@ -2882,7 +2960,7 @@ void Rename_File (ET_File *ETFile)
             unlink(tmp_filename);
             
             /* Renaming file has succeeded */
-            Log_Print(_("Moved file '%s' to '%s'"),cur_basename_utf8,new_basename_utf8);
+            Log_Print(LOG_OK,_("Moved file '%s' to '%s'"),cur_basename_utf8,new_basename_utf8);
 
             ETFile->FileNameCur = ETFile->FileNameNew;
             /* Now the file was renamed, so mark his state */
@@ -2900,12 +2978,18 @@ void Rename_File (ET_File *ETFile)
                 dirname_cur_utf8 = filename_to_display(dirname_cur);
                 msg = g_strdup_printf(_("Can't remove old directory\n'%s'!\n(%s)"),
                                       dirname_cur_utf8,g_strerror(errno));
-                msgbox = msg_box_new(_("Error..."),msg,GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
+                msgbox = msg_box_new(_("Error..."),
+                                     GTK_WINDOW(MainWindow),
+                                     NULL,
+                                     GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                     msg,
+                                     GTK_STOCK_DIALOG_ERROR,
+                                     GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                     NULL);
+                gtk_dialog_run(GTK_DIALOG(msgbox));
+                gtk_widget_destroy(msgbox);
                 g_free(msg);
                 g_free(dirname_cur_utf8);
-                msg_box_hide_check_button(MSG_BOX(msgbox));
-                msg_box_run(MSG_BOX(msgbox));
-                gtk_widget_destroy(msgbox);
     
                 g_free(tmp_filename);
                 g_free(cur_basename_utf8);
@@ -2922,12 +3006,18 @@ void Rename_File (ET_File *ETFile)
             /* Moving file has failed */
             msg = g_strdup_printf(_("Can't move file '%s'\n to \n'%s'!\n(%s)"),
                                   cur_basename_utf8,new_basename_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));
+            msgbox = msg_box_new(_("Error..."),
+                                 GTK_WINDOW(MainWindow),
+                                 NULL,
+                                 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                 msg,
+                                 GTK_STOCK_DIALOG_ERROR,
+                                 GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                 NULL);
+            gtk_dialog_run(GTK_DIALOG(msgbox));
             gtk_widget_destroy(msgbox);
-    
+            g_free(msg);
+
             Statusbar_Message(_("File(s) not moved..."),TRUE);
         }
     }else
@@ -2940,11 +3030,17 @@ void Rename_File (ET_File *ETFile)
 
         msg = g_strdup_printf(_("Can't rename file '%s'\n to \n'%s'!\n(%s)"),
                               cur_basename_utf8,new_basename_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));
+        msgbox = msg_box_new(_("Error..."),
+                             GTK_WINDOW(MainWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             msg,
+                             GTK_STOCK_DIALOG_ERROR,
+                             GTK_STOCK_OK, GTK_RESPONSE_OK,
+                             NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
+        g_free(msg);
 
         Statusbar_Message(_("File(s) not renamed..."),TRUE);
     }
@@ -2961,11 +3057,12 @@ void Rename_File (ET_File *ETFile)
 gint Delete_File (ET_File *ETFile, gboolean multiple_files)
 {
     GtkWidget *msgbox = NULL;
+    GtkWidget *msgbox_check_button = NULL;
     gchar *cur_filename;
     gchar *cur_filename_utf8;
     gchar *basename_utf8;
     gchar *msg;
-    gint button;
+    gint response;
     gint stop_loop;
 
     if (!ETFile) return FALSE;
@@ -2983,30 +3080,45 @@ gint Delete_File (ET_File *ETFile, gboolean multiple_files)
         msg = g_strdup_printf(_("Do you really want to delete definitively the file\n'%s' ?"),basename_utf8);
         if (multiple_files)
         {
-            msgbox = msg_box_new(_("Delete File..."),msg,GTK_STOCK_DIALOG_QUESTION,
-                BUTTON_CANCEL,BUTTON_NO,BUTTON_YES,0);
+            msgbox = msg_box_new(_("Delete File..."),
+                                 GTK_WINDOW(MainWindow),
+                                 &msgbox_check_button,
+                                 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                 msg,
+                                 GTK_STOCK_DIALOG_QUESTION,
+                                 GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,
+                                 GTK_STOCK_NO,    GTK_RESPONSE_NO,
+								 GTK_STOCK_YES,   GTK_RESPONSE_YES,
+                                 NULL);
+            //GTK_TOGGLE_BUTTON(msgbox_check_button)->active = TRUE; // Checked by default
         }else
         {
-            msgbox = msg_box_new(_("Delete File..."),msg,GTK_STOCK_DIALOG_QUESTION,
-                BUTTON_NO,BUTTON_YES,0);
-            msg_box_hide_check_button(MSG_BOX(msgbox));
+            msgbox = msg_box_new(_("Delete File..."),
+                                 GTK_WINDOW(MainWindow),
+                                 NULL,
+                                 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                 msg,
+                                 GTK_STOCK_DIALOG_QUESTION,
+                                 GTK_STOCK_NO,    GTK_RESPONSE_NO,
+								 GTK_STOCK_YES,   GTK_RESPONSE_YES,
+                                 NULL);
         }
         g_free(msg);
-        SF_ButtonPressed_Delete_File = button = msg_box_run(MSG_BOX(msgbox));
-        if (msg_box_check_button_get_active(MSG_BOX(msgbox)))
-            SF_HideMsgbox_Delete_File = MSG_BOX(msgbox)->check_button_state;
+        SF_ButtonPressed_Delete_File = response = gtk_dialog_run(GTK_DIALOG(msgbox));
+        if (msgbox_check_button && GTK_TOGGLE_BUTTON(msgbox_check_button)->active)
+            SF_HideMsgbox_Delete_File = GTK_TOGGLE_BUTTON(msgbox_check_button)->active;
         gtk_widget_destroy(msgbox);
     }else
     {
         if (SF_HideMsgbox_Delete_File)
-            button = SF_ButtonPressed_Delete_File;
+            response = SF_ButtonPressed_Delete_File;
         else
-            button = BUTTON_YES;
+            response = GTK_RESPONSE_YES;
     }
 
-    switch(button)
+    switch (response)
     {
-        case BUTTON_YES:
+        case GTK_RESPONSE_YES:
             if (remove(cur_filename)==0)
             {
                 msg = g_strdup_printf(_("File '%s' deleted"), basename_utf8);
@@ -3016,10 +3128,10 @@ gint Delete_File (ET_File *ETFile, gboolean multiple_files)
                 return 1;
             }
             break;
-        case BUTTON_NO:
+        case GTK_RESPONSE_NO:
             break;
-        case BUTTON_CANCEL:
-        case -1:
+        case GTK_RESPONSE_CANCEL:
+        case GTK_RESPONSE_NONE:
             stop_loop = -1;
             g_free(basename_utf8);
             return stop_loop;
@@ -3145,14 +3257,19 @@ gboolean Read_Directory (gchar *path_real)
         gchar *msg;
 
         msg = g_strdup_printf(_("Can't read directory :\n'%s'\n(%s)"),path_utf8,g_strerror(errno));
-        msgbox = msg_box_new(_("Error..."),msg,GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
+        msgbox = msg_box_new(_("Error..."),
+                             GTK_WINDOW(MainWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             msg,
+                             GTK_STOCK_DIALOG_ERROR,
+                             GTK_STOCK_OK, GTK_RESPONSE_OK,
+                             NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
+        gtk_widget_destroy(msgbox);
         g_free(msg);
         g_free(path_utf8);
 
-        msg_box_hide_check_button(MSG_BOX(msgbox));
-        msg_box_run(MSG_BOX(msgbox));
-        gtk_widget_destroy(msgbox);
-        
         ReadingDirectory = FALSE; //Allow a new reading
         Browser_Area_Set_Sensitive(TRUE);
         return FALSE;
@@ -3843,13 +3960,13 @@ void Tag_Area_Display_Controls (ET_File *ETFile)
             gtk_widget_show(GTK_WIDGET(EncodedByLabel));
             gtk_widget_show(GTK_WIDGET(EncodedByEntry));
             gtk_widget_show(GTK_WIDGET(EncodedByMButton));
-            gtk_widget_hide(GTK_WIDGET(PictureLabel));
-            gtk_widget_hide(GTK_WIDGET(PictureScrollWindow));
-            gtk_widget_hide(GTK_WIDGET(PictureMButton));
-            gtk_widget_hide(GTK_WIDGET(PictureClearButton));
-            gtk_widget_hide(GTK_WIDGET(PictureAddButton));
-            gtk_widget_hide(GTK_WIDGET(PictureSaveButton));
-            gtk_widget_hide(GTK_WIDGET(PicturePropertiesButton));
+            gtk_widget_show(GTK_WIDGET(PictureLabel));
+            gtk_widget_show(GTK_WIDGET(PictureScrollWindow));
+            gtk_widget_show(GTK_WIDGET(PictureMButton));
+            gtk_widget_show(GTK_WIDGET(PictureClearButton));
+            gtk_widget_show(GTK_WIDGET(PictureAddButton));
+            gtk_widget_show(GTK_WIDGET(PictureSaveButton));
+            gtk_widget_show(GTK_WIDGET(PicturePropertiesButton));
             break;
 #endif
 
@@ -3873,8 +3990,9 @@ void Tag_Area_Display_Controls (ET_File *ETFile)
             gtk_widget_show(GTK_WIDGET(EncodedByLabel));
             gtk_widget_show(GTK_WIDGET(EncodedByEntry));
             gtk_widget_show(GTK_WIDGET(EncodedByMButton));
-            if (WRITE_ID3_TAGS_IN_FLAC_FILE)
-            {
+            // Picture always supported now...
+            /*if (WRITE_ID3_TAGS_IN_FLAC_FILE)
+            {*/
                 gtk_widget_show(GTK_WIDGET(PictureLabel));
                 gtk_widget_show(GTK_WIDGET(PictureScrollWindow));
                 gtk_widget_show(GTK_WIDGET(PictureMButton));
@@ -3882,7 +4000,7 @@ void Tag_Area_Display_Controls (ET_File *ETFile)
                 gtk_widget_show(GTK_WIDGET(PictureAddButton));
                 gtk_widget_show(GTK_WIDGET(PictureSaveButton));
                 gtk_widget_show(GTK_WIDGET(PicturePropertiesButton));
-            }else
+            /*}else
             {
                 gtk_widget_hide(GTK_WIDGET(PictureLabel));
                 gtk_widget_hide(GTK_WIDGET(PictureScrollWindow));
@@ -3891,7 +4009,7 @@ void Tag_Area_Display_Controls (ET_File *ETFile)
                 gtk_widget_hide(GTK_WIDGET(PictureAddButton));
                 gtk_widget_hide(GTK_WIDGET(PictureSaveButton));
                 gtk_widget_hide(GTK_WIDGET(PicturePropertiesButton));
-            }
+            }*/
             break;
 #endif
 
@@ -4321,10 +4439,10 @@ void Handle_Crash (gint signal_id)
 {
     //gchar commmand[256];
 
-    Log_Print(_("EasyTAG %s: Abnormal exit! (PId: %d)."),VERSION,getpid());
-    Log_Print(_("Received signal %s (%d)\a"),signal_to_string(signal_id),signal_id);
+    Log_Print(LOG_ERROR,_("EasyTAG %s: Abnormal exit! (PId: %d)."),VERSION,getpid());
+    Log_Print(LOG_ERROR,_("Received signal %s (%d)\a"),signal_to_string(signal_id),signal_id);
 
-    Log_Print(_("You have probably found a bug in EasyTAG. Please, send a bug "
+    Log_Print(LOG_ERROR,_("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"));
 
@@ -4504,7 +4622,7 @@ void EasyTAG_Exit (void)
 {
     ET_Core_Destroy();
     Charset_Insert_Locales_Destroy();
-    Log_Print(_("EasyTAG: Normal exit."));
+    Log_Print(LOG_OK,_("EasyTAG: Normal exit."));
     gtk_main_quit();
 #ifdef WIN32
     ET_Win32_Cleanup();
@@ -4532,7 +4650,7 @@ void Quit_MainWindow_Save_And_Quit (void)
 void Quit_MainWindow (void)
 {
     GtkWidget *msgbox;
-    gint button;
+    gint response;
 
     /* If you change the displayed data and quit immediately */
     if (ETCore->ETFileList)
@@ -4547,38 +4665,50 @@ 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?"),
-                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));
+            msgbox = msg_box_new(_("Confirm..."),
+                                 GTK_WINDOW(MainWindow),
+                                 NULL,
+                                 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                 _("Some files have been modified but not saved...\nDo you want to save them before exiting the program?"),
+                                 GTK_STOCK_DIALOG_QUESTION,
+                                 GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,
+                                 GTK_STOCK_NO,    GTK_RESPONSE_NO,
+								 GTK_STOCK_YES,   GTK_RESPONSE_YES,
+                                 NULL);
+            response = gtk_dialog_run(GTK_DIALOG(msgbox));
             gtk_widget_destroy(msgbox);
-            switch(button)
+            switch (response)
             {
-                case BUTTON_YES:
+                case GTK_RESPONSE_YES:
                     Quit_MainWindow_Save_And_Quit();
                     break;
-                case BUTTON_NO:
+                case GTK_RESPONSE_NO:
                     Quit_MainWindow_Confirmed();
                     break;
-                case BUTTON_CANCEL:
-                case -1:
+                case GTK_RESPONSE_CANCEL:
+                case GTK_RESPONSE_NONE:
                     return;
             }
         } else
         {
-            msgbox = msg_box_new(_("Confirm..."),_(" Do you really want to exit the program? "),
-                GTK_STOCK_DIALOG_QUESTION,BUTTON_NO,BUTTON_YES,0);
-            msg_box_hide_check_button(MSG_BOX(msgbox));
-            button = msg_box_run(MSG_BOX(msgbox));
+            msgbox = msg_box_new(_("Confirm..."),
+                                 GTK_WINDOW(MainWindow),
+                                 NULL,
+                                 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                 _(" Do you really want to exit the program? "),
+                                 GTK_STOCK_DIALOG_QUESTION,
+                                 GTK_STOCK_NO,    GTK_RESPONSE_NO,
+								 GTK_STOCK_YES,   GTK_RESPONSE_YES,
+                                 NULL);
+            response = gtk_dialog_run(GTK_DIALOG(msgbox));
             gtk_widget_destroy(msgbox);
-            switch(button)
+            switch (response)
             {
-                case BUTTON_YES:
+                case GTK_RESPONSE_YES:
                     Quit_MainWindow_Confirmed();
                     break;
-                case BUTTON_NO:
-                case -1:
+                case GTK_RESPONSE_NO:
+                case GTK_RESPONSE_NONE:
                     return;
                     break;
             }
@@ -4586,22 +4716,28 @@ void Quit_MainWindow (void)
     }else if (ET_Check_If_All_Files_Are_Saved() != TRUE)
     {
         /* Some files aren't saved */
-        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));
+        msgbox = msg_box_new(_("Confirm..."),
+                             GTK_WINDOW(MainWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             _("Some files have been modified but not saved...\nDo you want to save them before exiting the program?"),
+                             GTK_STOCK_DIALOG_QUESTION,
+                             GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,
+                             GTK_STOCK_NO,    GTK_RESPONSE_NO,
+							 GTK_STOCK_YES,   GTK_RESPONSE_YES,
+                             NULL);
+        response = gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
-        switch(button)
+        switch (response)
         {
-            case BUTTON_YES:
+            case GTK_RESPONSE_YES:
                 Quit_MainWindow_Save_And_Quit();
                 break;
-            case BUTTON_NO:
+            case GTK_RESPONSE_NO:
                 Quit_MainWindow_Confirmed();
                 break;
-            case BUTTON_CANCEL:
-            case -1:
+            case GTK_RESPONSE_CANCEL:
+            case GTK_RESPONSE_NONE:
                 return;
         }
     }else
diff --git a/src/easytag.h b/src/easytag.h
index 9823c75..9823c75 100644..100755
--- a/src/easytag.h
+++ b/src/easytag.h
diff --git a/src/et_core.c b/src/et_core.c
index 3240088..35280ab 100644
--- a/src/et_core.c
+++ b/src/et_core.c
@@ -459,7 +459,8 @@ GList *ET_Add_File_To_File_List (gchar *filename)
     guint         ETFileKey;
     guint         undo_key;
     gchar        *filename_utf8 = filename_to_display(filename);
-
+    const gchar  *locale_lc_ctype = getenv("LC_CTYPE");
+    
     if (!filename)
         return ETCore->ETFileList;
 
@@ -483,6 +484,11 @@ GList *ET_Add_File_To_File_List (gchar *filename)
     FileTag = ET_File_Tag_Item_New();
     FileTag->saved = TRUE;    /* The file hasn't been changed, so it's saved */
 
+    /* Patch from Doruk Fisek : avoid upper/lower conversion bugs (like I->i conversion in 
+     * some locales) in tag parsing. The problem occurs for example with Turkish language
+     * where it can't read 'TITLE=' field if it is written as 'Title=' in the file */
+    setlocale(LC_CTYPE, "C");
+
     switch (ETFileDescription->TagType)
     {
 #ifdef ENABLE_MP3
@@ -515,7 +521,7 @@ GList *ET_Add_File_To_File_List (gchar *filename)
 #endif
         case UNKNOWN_TAG:
         default:
-            Log_Print("FileTag: Undefined tag type (%d) for file %s",ETFileDescription->TagType,filename_utf8);
+            Log_Print(LOG_ERROR,"FileTag: Undefined tag type (%d) for file %s",ETFileDescription->TagType,filename_utf8);
             break;
     }
 
@@ -563,11 +569,14 @@ GList *ET_Add_File_To_File_List (gchar *filename)
 #endif
         case UNKNOWN_FILE:
         default:
-            Log_Print("ETFileInfo: Undefined file type (%d) for file %s",ETFileDescription->FileType,filename_utf8);
+            Log_Print(LOG_ERROR,"ETFileInfo: Undefined file type (%d) for file %s",ETFileDescription->FileType,filename_utf8);
             ET_Read_File_Info(filename,ETFileInfo); // To get at least the file size
             break;
     }
 
+    /* Restore previous value */
+    setlocale(LC_CTYPE, locale_lc_ctype ? locale_lc_ctype : "");
+    
     /* Attach all data defined above to this ETFile item */
     ETFile = ET_File_Item_New();
     ETFile->IndexKey          = 0; // Will be renumered after...
@@ -2542,7 +2551,7 @@ void ET_Display_File_Data_To_UI (ET_File *ETFile)
         default:
             gtk_frame_set_label(GTK_FRAME(TagFrame),_("Tag"));
             ET_Display_File_Tag_To_UI(ETFile); // To reinit screen
-            Log_Print("FileTag: Undefined tag type %d for file %s.",ETFileDescription->TagType,cur_filename_utf8);
+            Log_Print(LOG_ERROR,"FileTag: Undefined tag type %d for file %s.",ETFileDescription->TagType,cur_filename_utf8);
             break;
     }
 
@@ -2605,7 +2614,7 @@ void ET_Display_File_Data_To_UI (ET_File *ETFile)
             gtk_frame_set_label(GTK_FRAME(FileFrame),_("File"));
             // Default displaying
             ET_Display_File_Info_To_UI(ETFile->ETFileInfo);
-            Log_Print("ETFileInfo: Undefined file type %d for file %s.",ETFileDescription->FileType,cur_filename_utf8);
+            Log_Print(LOG_ERROR,"ETFileInfo: Undefined file type %d for file %s.",ETFileDescription->FileType,cur_filename_utf8);
             break;
     }
 
@@ -2680,7 +2689,7 @@ void ET_Display_Filename_To_UI (ET_File *ETFile)
     if ((pos=g_utf8_strrchr(basename_utf8, -1, '.'))!=NULL)
         *pos = 0;
     gtk_entry_set_text(GTK_ENTRY(FileEntry),basename_utf8);
-    /*FIX ME : gchar *tmp =     ET_Utf8_Validate_Full_String(basename_utf8);
+    /*FIX ME : gchar *tmp = Try_To_Validate_Utf8_String(basename_utf8);
     g_free(tmp);*/
     g_free(basename_utf8);
     // Justify to the left text into FileEntry
@@ -2724,7 +2733,7 @@ gboolean ET_Display_File_Tag_To_UI (ET_File *ETFile)
     /* Show title */
     if (FileTag && FileTag->title)
     {
-        gchar *tmp = ET_Utf8_Validate_Full_String(FileTag->title);
+        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->title);
         gtk_entry_set_text(GTK_ENTRY(TitleEntry), tmp);
         g_free(tmp);
     }else
@@ -2733,7 +2742,7 @@ gboolean ET_Display_File_Tag_To_UI (ET_File *ETFile)
     /* Show artist */
     if (FileTag && FileTag->artist)
     {
-        gchar *tmp = ET_Utf8_Validate_Full_String(FileTag->artist);
+        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->artist);
         gtk_entry_set_text(GTK_ENTRY(ArtistEntry), tmp);
         g_free(tmp);
     }else
@@ -2742,7 +2751,7 @@ gboolean ET_Display_File_Tag_To_UI (ET_File *ETFile)
     /* Show album */
     if (FileTag && FileTag->album)
     {
-        gchar *tmp = ET_Utf8_Validate_Full_String(FileTag->album);
+        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->album);
         gtk_entry_set_text(GTK_ENTRY(AlbumEntry), tmp);
         g_free(tmp);
     }else
@@ -2751,7 +2760,7 @@ gboolean ET_Display_File_Tag_To_UI (ET_File *ETFile)
     /* Show disc_number */
     if (FileTag && FileTag->disc_number)
     {
-        gchar *tmp = ET_Utf8_Validate_Full_String(FileTag->disc_number);
+        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->disc_number);
         gtk_entry_set_text(GTK_ENTRY(DiscNumberEntry), tmp);
         g_free(tmp);
     }else
@@ -2760,7 +2769,7 @@ gboolean ET_Display_File_Tag_To_UI (ET_File *ETFile)
     /* Show year */
     if (FileTag && FileTag->year)
     {
-        gchar *tmp = ET_Utf8_Validate_Full_String(FileTag->year);
+        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->year);
         gtk_entry_set_text(GTK_ENTRY(YearEntry),tmp);
         g_free(tmp);
     }else
@@ -2769,7 +2778,7 @@ gboolean ET_Display_File_Tag_To_UI (ET_File *ETFile)
     /* Show track */
     if (FileTag && FileTag->track)
     {
-        gchar *tmp = ET_Utf8_Validate_Full_String(FileTag->track);
+        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->track);
         gtk_entry_set_text(GTK_ENTRY(GTK_BIN(TrackEntryCombo)->child),tmp);
         g_free(tmp);
     }else
@@ -2778,7 +2787,7 @@ gboolean ET_Display_File_Tag_To_UI (ET_File *ETFile)
     /* Show number of tracks on the album */
     if (FileTag && FileTag->track_total)
     {
-        gchar *tmp = ET_Utf8_Validate_Full_String(FileTag->track_total);
+        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->track_total);
         gtk_entry_set_text(GTK_ENTRY(TrackTotalEntry),tmp);
         g_free(tmp);
     }else
@@ -2787,7 +2796,7 @@ gboolean ET_Display_File_Tag_To_UI (ET_File *ETFile)
     /* Show genre */
     if (FileTag && FileTag->genre)
     {
-        gchar *tmp = ET_Utf8_Validate_Full_String(FileTag->genre);
+        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->genre);
         gtk_entry_set_text(GTK_ENTRY(GTK_BIN(GenreCombo)->child), tmp);
         g_free(tmp);
     }else
@@ -2797,7 +2806,7 @@ gboolean ET_Display_File_Tag_To_UI (ET_File *ETFile)
     //textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(CommentView));
     if (FileTag && FileTag->comment)
     {
-        gchar *tmp = ET_Utf8_Validate_Full_String(FileTag->comment);
+        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->comment);
         //gtk_text_buffer_set_text(GTK_TEXT_BUFFER(textbuffer), FileTag->comment, -1);
         gtk_entry_set_text(GTK_ENTRY(CommentEntry), tmp);
         g_free(tmp);
@@ -2808,7 +2817,7 @@ gboolean ET_Display_File_Tag_To_UI (ET_File *ETFile)
     /* Show composer */
     if (FileTag && FileTag->composer)
     {
-        gchar *tmp = ET_Utf8_Validate_Full_String(FileTag->composer);
+        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->composer);
         gtk_entry_set_text(GTK_ENTRY(ComposerEntry), tmp);
         g_free(tmp);
     }else
@@ -2817,7 +2826,7 @@ gboolean ET_Display_File_Tag_To_UI (ET_File *ETFile)
     /* Show original artist */
     if (FileTag && FileTag->orig_artist)
     {
-        gchar *tmp = ET_Utf8_Validate_Full_String(FileTag->orig_artist);
+        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->orig_artist);
         gtk_entry_set_text(GTK_ENTRY(OrigArtistEntry), tmp);
         g_free(tmp);
     }else
@@ -2826,7 +2835,7 @@ gboolean ET_Display_File_Tag_To_UI (ET_File *ETFile)
     /* Show copyright */
     if (FileTag && FileTag->copyright)
     {
-        gchar *tmp = ET_Utf8_Validate_Full_String(FileTag->copyright);
+        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->copyright);
         gtk_entry_set_text(GTK_ENTRY(CopyrightEntry), tmp);
         g_free(tmp);
     }else
@@ -2835,7 +2844,7 @@ gboolean ET_Display_File_Tag_To_UI (ET_File *ETFile)
     /* Show URL */
     if (FileTag && FileTag->url)
     {
-        gchar *tmp = ET_Utf8_Validate_Full_String(FileTag->url);
+        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->url);
         gtk_entry_set_text(GTK_ENTRY(URLEntry), tmp);
         g_free(tmp);
     }else
@@ -2844,7 +2853,7 @@ gboolean ET_Display_File_Tag_To_UI (ET_File *ETFile)
     /* Show Encoded by */
     if (FileTag && FileTag->encoded_by)
     {
-        gchar *tmp = ET_Utf8_Validate_Full_String(FileTag->encoded_by);
+        gchar *tmp = Try_To_Validate_Utf8_String(FileTag->encoded_by);
         gtk_entry_set_text(GTK_ENTRY(EncodedByEntry), tmp);
         g_free(tmp);
     }else
@@ -2859,7 +2868,7 @@ gboolean ET_Display_File_Tag_To_UI (ET_File *ETFile)
         GtkWidget *page;
         gchar *string;
 
-        PictureEntry_Update(FileTag->picture, 0);
+        PictureEntry_Update(FileTag->picture, FALSE);
 
         // Count the number of items
         while (pic)
@@ -3012,7 +3021,7 @@ void ET_Save_File_Data_From_UI (ET_File *ETFile)
             break;
         case UNKNOWN_TAG:
         default:
-            Log_Print("FileTag: Undefined tag type %d for file %s.",ETFileDescription->TagType,cur_filename_utf8);
+            Log_Print(LOG_ERROR,"FileTag: Undefined tag type %d for file %s.",ETFileDescription->TagType,cur_filename_utf8);
             break;
     }
 
@@ -3057,9 +3066,15 @@ gboolean ET_Save_File_Name_From_UI (ET_File *ETFile, File_Name *FileName)
         msg = g_strdup_printf(_("Could not convert filename : '%s'\n"
                                 "into system filename encoding\n"
                                 "(Try setting the environment variable G_FILENAME_ENCODING)."), filename_escaped_utf8);
-        msgbox = msg_box_new(_("Filename translation"),msg,GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
-        msg_box_hide_check_button(MSG_BOX(msgbox));
-        msg_box_run(MSG_BOX(msgbox));
+        msgbox = msg_box_new(_("Filename translation"),
+                             GTK_WINDOW(MainWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             msg,
+                             GTK_STOCK_DIALOG_ERROR,
+                             GTK_STOCK_OK, GTK_RESPONSE_OK,
+                             NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
         g_free(msg);
         g_free(filename);
@@ -3662,7 +3677,7 @@ gboolean ET_Save_File_Tag_To_HD (ET_File *ETFile)
 #endif
         case UNKNOWN_TAG:
         default:
-            Log_Print("Saving to HD: Undefined function for tag type '%d' (file %s).",
+            Log_Print(LOG_ERROR,"Saving to HD: Undefined function for tag type '%d' (file %s).",
                 ETFileDescription->TagType,cur_filename_utf8);
             state = FALSE;
             break;
@@ -4382,7 +4397,7 @@ gboolean ET_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
     if ( (file=fopen(filename,"r"))==NULL )
     {
         gchar *filename_utf8 = filename_to_display(filename);
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
         g_free(filename_utf8);
         return FALSE;
     }
@@ -4533,7 +4548,7 @@ void ET_File_Name_Check_Length (ET_File *ETFile, gchar *filename_utf8)
         case OGG_FILE:
             if ( (exceed_size = (strlen(basename) - 245)) > 0 ) // 255 - 4 (extension) - 6 (mkstemp)
             {
-                Log_Print(_("The filename '%s' exceeds %d characters and will be truncated!\n"), filename_utf8, 245);
+                Log_Print(LOG_ERROR,_("The filename '%s' exceeds %d characters and will be truncated!\n"), filename_utf8, 245);
                 filename_utf8[strlen(filename_utf8) - exceed_size] = '\0';
             }
             break;
@@ -4541,7 +4556,7 @@ void ET_File_Name_Check_Length (ET_File *ETFile, gchar *filename_utf8)
         default:
             if ( (exceed_size = (strlen(basename) - 251)) > 0 ) // 255 - 4 (extension)
             {
-                Log_Print(_("The filename '%s' exceeds %d characters and will be truncated!\n"), filename_utf8, 251);
+                Log_Print(LOG_ERROR,_("The filename '%s' exceeds %d characters and will be truncated!\n"), filename_utf8, 251);
                 filename_utf8[strlen(filename_utf8) - exceed_size] = '\0';
             }
             break;
@@ -4630,43 +4645,6 @@ guint ET_Get_Number_Of_Files_In_Directory (gchar *path_utf8)
     return count;
 }
 
-/*
- * Try to valide a full string : if some characters are invalid, we skip them to
- * return a string with only the valid characters.
- */
-gchar *ET_Utf8_Validate_Full_String (gchar *string_to_validate)
-{
-    gchar *stv;
-    gchar *stv_end;
-    gchar *tmp, *tmp1;
-
-    if (!string_to_validate)
-        return NULL;
-
-    stv = g_strdup(string_to_validate);
-    // Remove all invalid character
-    while ( !g_utf8_validate(stv,-1,(const gchar **)&stv_end) )
-    {
-        // Not UTF-8 validated
-        tmp = tmp1 = stv_end;
-        tmp++;
-        while (*tmp)
-        {
-            if (*tmp)
-                *(tmp1++) = *(tmp++);
-        }
-        *tmp1 = '\0';
-    }
-    /*
-    // Truncate at first invalid character
-    if ( !g_utf8_validate(stv,-1,(const gchar **)&stv_end) )
-    {
-        // Not UTF-8 validated
-        *stv_end = '\0';
-    }*/
-
-    return stv;
-}
 
 /***********************
  * Debugging functions *
diff --git a/src/et_core.h b/src/et_core.h
index 6836656..8f275c8 100644
--- a/src/et_core.h
+++ b/src/et_core.h
@@ -164,7 +164,7 @@ struct _Picture
     gchar   *description;
     gint     width;         /* Original width of the picture */
     gint     height;        /* Original height of the picture */
-    gulong   size;          /* Picture size in bits */
+    gulong   size;          /* Picture size in bytes (like lstat) */
     guchar  *data;
     Picture *next;
 };
@@ -412,7 +412,6 @@ gboolean ET_File_Name_Convert_Character          (gchar *filename_utf8);
 gchar   *ET_File_Name_Format_Extension           (ET_File *ETFile);
 gchar   *ET_File_Name_Generate                   (ET_File *ETFile, gchar *new_file_name);
 guint    ET_Get_Number_Of_Files_In_Directory     (gchar *path_utf8);
-gchar   *ET_Utf8_Validate_Full_String            (gchar *string_to_validate);
 
 gboolean ET_Detect_Changes_Of_File_Tag          (File_Tag  *FileTag1,  File_Tag  *FileTag2);
 
diff --git a/src/flac_header.c b/src/flac_header.c
index 408b73b..acdf628 100755..100644
--- a/src/flac_header.c
+++ b/src/flac_header.c
@@ -123,7 +123,7 @@ gboolean Flac_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
     if ( (file=fopen(filename,"r"))==NULL )
     {
         gchar *filename_utf8 = filename_to_display(filename);
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
         g_free(filename_utf8);
         return FALSE;
     }
@@ -245,24 +245,27 @@ void metadata_callback_(const FLAC__StreamDecoder *decoder, const FLAC__StreamMe
 {
     file_info_struct *file_info = (file_info_struct *)client_data;
     (void)decoder;
-    if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
+    if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO)
+    {
         FLAC__ASSERT(metadata->data.stream_info.total_samples < 0x100000000); /* this plugin can only handle < 4 gigasamples */
         file_info->total_samples = (unsigned)(metadata->data.stream_info.total_samples&0xffffffff);
         file_info->bits_per_sample = metadata->data.stream_info.bits_per_sample;
         file_info->channels = metadata->data.stream_info.channels;
         file_info->sample_rate = metadata->data.stream_info.sample_rate;
 
-        if (file_info->bits_per_sample == 8) {
+        if (file_info->bits_per_sample == 8)
+        {
             file_info->sample_format = FMT_S8;
-        }
-        else if (file_info->bits_per_sample == 16) {
+        } else if (file_info->bits_per_sample == 16)
+        {
             file_info->sample_format = FMT_S16_NE;
-        }
-        else {
+        } else
+        {
             file_info->abort_flag = true;
             return;
         }
-        file_info->length_in_msec = file_info->total_samples * 10 / (file_info->sample_rate / 100);
+        if (file_info->sample_rate != 0 && (file_info->sample_rate / 100) != 0) // To prevent crash...
+            file_info->length_in_msec = file_info->total_samples * 10 / (file_info->sample_rate / 100);
     }
 }
 
diff --git a/src/flac_tag.c b/src/flac_tag.c
index a76e1cc..9d3be65 100755..100644
--- a/src/flac_tag.c
+++ b/src/flac_tag.c
@@ -96,538 +96,578 @@ gboolean Flac_Tag_Write_File (FILE *file_in, gchar *filename_in, vcedit_state *s
  *************/
 
 /*
- * Read tag data from a FLAC file.
+ * Read tag data from a FLAC file using the level 1 flac interface,
  * Note:
  *  - if field is found but contains no info (strlen(str)==0), we don't read it
  */
 gboolean Flac_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
 {
-    FLAC__Metadata_SimpleIterator               *iter;
-    FLAC__StreamMetadata                        *vc_block;
-    FLAC__StreamMetadata_VorbisComment          *vc;
-    FLAC__StreamMetadata_VorbisComment_Entry    *field;
-    gchar                                       *field_value;
-    gchar                                       *field_value_tmp;
-    gchar                                       *string = NULL;
-    gint                                        field_num;
-    gint                                        field_len;
-    guint                                       i;
-
+    FLAC__Metadata_SimpleIterator *iter;
+    gchar *string = NULL;
+    guint i;
+    Picture *prev_pic = NULL;
+    //gint j = 1;
 
+    
     if (!filename || !FileTag)
         return FALSE;
 
     flac_error_msg = NULL;
 
+    // Initialize the iterator for the blocks
     iter = FLAC__metadata_simple_iterator_new();
     if ( iter == NULL || !FLAC__metadata_simple_iterator_init(iter, filename, true, false) )
     {
         gchar *filename_utf8 = filename_to_display(filename);
         if ( iter == NULL )
         {
-#ifdef WIN32
-            const char ** const iter = FLAC__Metadata_SimpleIteratorStatusString; /* this is for win32 auto-import of this external symbol works */
-            flac_error_msg = iter[FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR];
-#else
+            // Error with "FLAC__metadata_simple_iterator_new"
             flac_error_msg = FLAC__Metadata_SimpleIteratorStatusString[FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR];
-#endif
         }else
         {
-            flac_error_msg = FLAC__Metadata_SimpleIteratorStatusString[FLAC__metadata_simple_iterator_status(iter)];
+            // Error with "FLAC__metadata_simple_iterator_init"
+            FLAC__Metadata_SimpleIteratorStatus status = FLAC__metadata_simple_iterator_status(iter);
+            flac_error_msg = FLAC__Metadata_SimpleIteratorStatusString[status];
+            
             FLAC__metadata_simple_iterator_delete(iter);
         }
 
-        Log_Print(_("ERROR while opening file: '%s' as FLAC (%s)."),filename_utf8,flac_error_msg);
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' as FLAC (%s)."),filename_utf8,flac_error_msg);
         g_free(filename_utf8);
         return FALSE;
     }
+    
 
     /* libFLAC is able to detect (and skip) ID3v2 tags by itself */
 
-    /* Find the VORBIS_COMMENT block */
-    while ( FLAC__metadata_simple_iterator_get_block_type(iter) != FLAC__METADATA_TYPE_VORBIS_COMMENT )
-    {
-        if ( !FLAC__metadata_simple_iterator_next(iter) )
-        {
-            /* End of metadata: comment block not found, nothing to read */
-            FLAC__metadata_simple_iterator_delete(iter);
-            return TRUE;
-        }
-    }
-
-    /* Get comments from block */
-    vc_block = FLAC__metadata_simple_iterator_get_block(iter);
-    vc = &vc_block->data.vorbis_comment;
-
-    /* Get vendor string */
-    /*{
-        FLAC__StreamMetadata_VorbisComment_Entry vce;
-        vce = vc->vendor_string;
-        g_print("File %s : \n",filename);
-        g_print(" - FLAC File vendor string : '%s'\n",g_strndup(vce.entry,vce.length));
-        g_print(" - FLAC Lib vendor string  : '%s'\n",FLAC__VENDOR_STRING);
-    }*/
-
-
-    /*********
-     * Title *
-     *********/
-    field_num = 0;
-    while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(vc_block,field_num,"TITLE")) >= 0 )
+    while (FLAC__metadata_simple_iterator_next(iter))
     {
-        /* Extract field value */
-        field = &vc->comments[field_num++];
-        field_value = memchr(field->entry, '=', field->length);
-
-        if (field_value)
+        // Get block data
+        FLAC__StreamMetadata *block = FLAC__metadata_simple_iterator_get_block(iter);
+        //g_print("Read: %d %s -> block type: %d\n",j++,g_path_get_basename(filename),FLAC__metadata_simple_iterator_get_block_type(iter));
+        
+        // Action to do according the type
+        switch ( FLAC__metadata_simple_iterator_get_block_type(iter) )
         {
-            field_value++;
-            if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+            //
+            // Read the VORBIS_COMMENT block (only one should exist)
+            //
+            case FLAC__METADATA_TYPE_VORBIS_COMMENT:
             {
-                field_len = field->length - (field_value - (gchar*) field->entry);
-                field_value_tmp = g_strndup(field_value, field_len);
-                field_value = Try_To_Validate_Utf8_String(field_value_tmp);
-                g_free(field_value_tmp);
-                if (FileTag->title==NULL)
-                    FileTag->title = g_strdup(field_value);
-                else
-                    FileTag->title = g_strconcat(FileTag->title,MULTIFIELD_SEPARATOR,field_value,NULL);
-                g_free(field_value);
-            }
-        }
-    }
+                FLAC__StreamMetadata_VorbisComment       *vc;
+                FLAC__StreamMetadata_VorbisComment_Entry *field;
+                gint   field_num;
+                gint   field_len;
+                gchar *field_value;
+                gchar *field_value_tmp;
+                
+                // Get comments from block
+                vc = &block->data.vorbis_comment;
+
+                /*********
+                 * Title *
+                 *********/
+                field_num = 0;
+                while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(block,field_num,"TITLE")) >= 0 )
+                {
+                    /* Extract field value */
+                    field = &vc->comments[field_num++];
+                    field_value = memchr(field->entry, '=', field->length);
 
-    /**********
-     * Artist *
-     **********/
-    field_num = 0;
-    while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(vc_block,field_num,"ARTIST")) >= 0 )
-    {
-        /* Extract field value */
-        field = &vc->comments[field_num++];
-        field_value = memchr(field->entry, '=', field->length);
+                    if (field_value)
+                    {
+                        field_value++;
+                        if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+                        {
+                            field_len = field->length - (field_value - (gchar*) field->entry);
+                            field_value_tmp = g_strndup(field_value, field_len);
+                            field_value = Try_To_Validate_Utf8_String(field_value_tmp);
+                            g_free(field_value_tmp);
+                            if (FileTag->title==NULL)
+                                FileTag->title = g_strdup(field_value);
+                            else
+                                FileTag->title = g_strconcat(FileTag->title,MULTIFIELD_SEPARATOR,field_value,NULL);
+                            g_free(field_value);
+                        }
+                    }
+                }
 
-        if (field_value)
-        {
-            field_value++;
-            if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
-            {
-                field_len = field->length - (field_value - (gchar*) field->entry);
-                field_value_tmp = g_strndup(field_value, field_len);
-                field_value = Try_To_Validate_Utf8_String(field_value_tmp);
-                g_free(field_value_tmp);
-                if (FileTag->artist==NULL)
-                    FileTag->artist = g_strdup(field_value);
-                else
-                    FileTag->artist = g_strconcat(FileTag->artist,MULTIFIELD_SEPARATOR,field_value,NULL);
-                g_free(field_value);
-            }
-        }
-    }
+                /**********
+                 * Artist *
+                 **********/
+                field_num = 0;
+                while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(block,field_num,"ARTIST")) >= 0 )
+                {
+                    /* Extract field value */
+                    field = &vc->comments[field_num++];
+                    field_value = memchr(field->entry, '=', field->length);
 
-    /*********
-     * Album *
-     *********/
-    field_num = 0;
-    while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(vc_block,field_num,"ALBUM")) >= 0 )
-    {
-        /* Extract field value */
-        field = &vc->comments[field_num++];
-        field_value = memchr(field->entry, '=', field->length);
+                    if (field_value)
+                    {
+                        field_value++;
+                        if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+                        {
+                            field_len = field->length - (field_value - (gchar*) field->entry);
+                            field_value_tmp = g_strndup(field_value, field_len);
+                            field_value = Try_To_Validate_Utf8_String(field_value_tmp);
+                            g_free(field_value_tmp);
+                            if (FileTag->artist==NULL)
+                                FileTag->artist = g_strdup(field_value);
+                            else
+                                FileTag->artist = g_strconcat(FileTag->artist,MULTIFIELD_SEPARATOR,field_value,NULL);
+                            g_free(field_value);
+                        }
+                    }
+                }
 
-        if (field_value)
-        {
-            field_value++;
-            if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
-            {
-                field_len = field->length - (field_value - (gchar*) field->entry);
-                field_value_tmp = g_strndup(field_value, field_len);
-                field_value = Try_To_Validate_Utf8_String(field_value_tmp);
-                g_free(field_value_tmp);
-                if (FileTag->album==NULL)
-                    FileTag->album = g_strdup(field_value);
-                else
-                    FileTag->album = g_strconcat(FileTag->album,MULTIFIELD_SEPARATOR,field_value,NULL);
-                g_free(field_value);
-            }
-        }
-    }
+                /*********
+                 * Album *
+                 *********/
+                field_num = 0;
+                while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(block,field_num,"ALBUM")) >= 0 )
+                {
+                    /* Extract field value */
+                    field = &vc->comments[field_num++];
+                    field_value = memchr(field->entry, '=', field->length);
 
-    /***************
-     * Disc Number *
-     ***************/
-    if ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(vc_block,0,"DISCNUMBER")) >= 0 )
-    {
-        /* Extract field value */
-        field = &vc->comments[field_num];
-        field_value = memchr(field->entry, '=', field->length);
+                    if (field_value)
+                    {
+                        field_value++;
+                        if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+                        {
+                            field_len = field->length - (field_value - (gchar*) field->entry);
+                            field_value_tmp = g_strndup(field_value, field_len);
+                            field_value = Try_To_Validate_Utf8_String(field_value_tmp);
+                            g_free(field_value_tmp);
+                            if (FileTag->album==NULL)
+                                FileTag->album = g_strdup(field_value);
+                            else
+                                FileTag->album = g_strconcat(FileTag->album,MULTIFIELD_SEPARATOR,field_value,NULL);
+                            g_free(field_value);
+                        }
+                    }
+                }
 
-        if (field_value)
-        {
-            field_value++;
-            if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
-            {
-                field_len = field->length - (field_value - (gchar*) field->entry);
-                field_value_tmp = g_strndup(field_value, field_len);
-                field_value = Try_To_Validate_Utf8_String(field_value_tmp);
-                g_free(field_value_tmp);
-                FileTag->disc_number = field_value;
-            }
-        }
-    }
+                /***************
+                 * Disc Number *
+                 ***************/
+                if ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(block,0,"DISCNUMBER")) >= 0 )
+                {
+                    /* Extract field value */
+                    field = &vc->comments[field_num];
+                    field_value = memchr(field->entry, '=', field->length);
 
-    /********
-     * Year *
-     ********/
-    if ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(vc_block,0,"DATE")) >= 0 )
-    {
-        /* Extract field value */
-        field = &vc->comments[field_num];
-        field_value = memchr(field->entry, '=', field->length);
+                    if (field_value)
+                    {
+                        field_value++;
+                        if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+                        {
+                            field_len = field->length - (field_value - (gchar*) field->entry);
+                            field_value_tmp = g_strndup(field_value, field_len);
+                            field_value = Try_To_Validate_Utf8_String(field_value_tmp);
+                            g_free(field_value_tmp);
+                            FileTag->disc_number = field_value;
+                        }
+                    }
+                }
 
-        if (field_value)
-        {
-            field_value++;
-            if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
-            {
-                field_len = field->length - (field_value - (gchar*) field->entry);
-                field_value_tmp = g_strndup(field_value, field_len);
-                field_value = Try_To_Validate_Utf8_String(field_value_tmp);
-                g_free(field_value_tmp);
-                FileTag->year = field_value;
-            }
-        }
-    }
+                /********
+                 * Year *
+                 ********/
+                if ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(block,0,"DATE")) >= 0 )
+                {
+                    /* Extract field value */
+                    field = &vc->comments[field_num];
+                    field_value = memchr(field->entry, '=', field->length);
 
-    /*************************
-     * Track and Total Track *
-     *************************/
-    if ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(vc_block,0,"TRACKTOTAL")) >= 0 )
-    {
-        /* Extract field value */
-        field = &vc->comments[field_num];
-        field_value = memchr(field->entry, '=', field->length);
+                    if (field_value)
+                    {
+                        field_value++;
+                        if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+                        {
+                            field_len = field->length - (field_value - (gchar*) field->entry);
+                            field_value_tmp = g_strndup(field_value, field_len);
+                            field_value = Try_To_Validate_Utf8_String(field_value_tmp);
+                            g_free(field_value_tmp);
+                            FileTag->year = field_value;
+                        }
+                    }
+                }
 
-        if (field_value)
-        {
-            field_value++;
-            if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
-            {
-                field_len = field->length - (field_value - (gchar*) field->entry);
-                field_value_tmp = g_strndup(field_value, field_len);
-                field_value = Try_To_Validate_Utf8_String(field_value_tmp);
-                g_free(field_value_tmp);
-                if (NUMBER_TRACK_FORMATED)
-                {
-                    FileTag->track_total = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,atoi(field_value));
-                }else
+                /*************************
+                 * Track and Total Track *
+                 *************************/
+                if ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(block,0,"TRACKTOTAL")) >= 0 )
                 {
-                    FileTag->track_total = g_strdup(field_value);
+                    /* Extract field value */
+                    field = &vc->comments[field_num];
+                    field_value = memchr(field->entry, '=', field->length);
+
+                    if (field_value)
+                    {
+                        field_value++;
+                        if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+                        {
+                            field_len = field->length - (field_value - (gchar*) field->entry);
+                            field_value_tmp = g_strndup(field_value, field_len);
+                            field_value = Try_To_Validate_Utf8_String(field_value_tmp);
+                            g_free(field_value_tmp);
+                            if (NUMBER_TRACK_FORMATED)
+                            {
+                                FileTag->track_total = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,atoi(field_value));
+                            }else
+                            {
+                                FileTag->track_total = g_strdup(field_value);
+                            }
+                            g_free(field_value);
+                        }
+                    }
+                    // Below is also filled track_total if not done here
                 }
-                g_free(field_value);
-            }
-        }
-        // Below is also filled track_total if not done here
-    }
 
-    if ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(vc_block,0,"TRACKNUMBER")) >= 0 )
-    {
-        /* Extract field value */
-        field = &vc->comments[field_num];
-        field_value = memchr(field->entry, '=', field->length);
+                if ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(block,0,"TRACKNUMBER")) >= 0 )
+                {
+                    /* Extract field value */
+                    field = &vc->comments[field_num];
+                    field_value = memchr(field->entry, '=', field->length);
 
-        if (field_value)
-        {
-            field_value++;
-            if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
-            {
-                field_len = field->length - (field_value - (gchar*) field->entry);
-                field_value_tmp = g_strndup(field_value, field_len);
-                field_value = Try_To_Validate_Utf8_String(field_value_tmp);
-                g_free(field_value_tmp);
-                string = g_utf8_strchr(field_value, -1, '/');
-                if (NUMBER_TRACK_FORMATED)
+                    if (field_value)
+                    {
+                        field_value++;
+                        if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+                        {
+                            field_len = field->length - (field_value - (gchar*) field->entry);
+                            field_value_tmp = g_strndup(field_value, field_len);
+                            field_value = Try_To_Validate_Utf8_String(field_value_tmp);
+                            g_free(field_value_tmp);
+                            string = g_utf8_strchr(field_value, -1, '/');
+                            if (NUMBER_TRACK_FORMATED)
+                            {
+                                // If track_total not filled before, try now...
+                                if (string && !FileTag->track_total)
+                                {
+                                    FileTag->track_total = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,atoi(string+1));
+                                    *string = '\0';
+                                }
+                                FileTag->track = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,atoi(field_value));
+                            }else
+                            {
+                                if (string && !FileTag->track_total)
+                                {
+                                    FileTag->track_total = g_strdup(string+1);
+                                    *string = '\0';
+                                }
+                                FileTag->track = g_strdup(field_value);
+                            }
+                            g_free(field_value);
+                        }
+                    }
+                }
+
+                /*********
+                 * Genre *
+                 *********/
+                field_num = 0;
+                while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(block,field_num,"GENRE")) >= 0 )
                 {
-                    // If track_total not filled before, try now...
-                    if (string && !FileTag->track_total)
+                    /* Extract field value */
+                    field = &vc->comments[field_num++];
+                    field_value = memchr(field->entry, '=', field->length);
+
+                    if (field_value)
                     {
-                        FileTag->track_total = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,atoi(string+1));
-                        *string = '\0';
+                        field_value++;
+                        if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+                        {
+                            field_len = field->length - (field_value - (gchar*) field->entry);
+                            field_value_tmp = g_strndup(field_value, field_len);
+                            field_value = Try_To_Validate_Utf8_String(field_value_tmp);
+                            g_free(field_value_tmp);
+                            if (FileTag->genre==NULL)
+                                FileTag->genre = g_strdup(field_value);
+                            else
+                                FileTag->genre = g_strconcat(FileTag->genre,MULTIFIELD_SEPARATOR,field_value,NULL);
+                            g_free(field_value);
+                        }
                     }
-                    FileTag->track = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,atoi(field_value));
-                }else
+                }
+
+                /***********
+                 * Comment *
+                 ***********/
+                field_num = 0;
+                while ( 1 )
                 {
-                    if (string && !FileTag->track_total)
+                    gint field_num1, field_num2;
+
+                    // The comment field can take two forms...
+                    field_num1 = FLAC__metadata_object_vorbiscomment_find_entry_from(block,field_num,"DESCRIPTION");
+                    field_num2 = FLAC__metadata_object_vorbiscomment_find_entry_from(block,field_num,"COMMENT");
+
+                    if (field_num1 >= 0 && field_num2 >= 0)
+                        // Note : We set field_num to the last "comment" field to avoid to concatenate 
+                        // the DESCRIPTION and COMMENT field if there are both present (EasyTAG writes the both...)
+                        if (field_num1 < field_num2)
+                            field_num = field_num2;
+                        else
+                            field_num = field_num1;
+                    else if (field_num1 >= 0)
+                        field_num = field_num1;
+                    else if (field_num2 >= 0)
+                        field_num = field_num2;
+                    else
+                        break;
+
+                    /* Extract field value */
+                    field = &vc->comments[field_num++];
+                    field_value = memchr(field->entry, '=', field->length);
+
+                    if (field_value)
                     {
-                        FileTag->track_total = g_strdup(string+1);
-                        *string = '\0';
+                        field_value++;
+                        if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+                        {
+                            field_len = field->length - (field_value - (gchar*) field->entry);
+                            field_value_tmp = g_strndup(field_value, field_len);
+                            field_value = Try_To_Validate_Utf8_String(field_value_tmp);
+                            g_free(field_value_tmp);
+                            if (FileTag->comment==NULL)
+                                FileTag->comment = g_strdup(field_value);
+                            else
+                                FileTag->comment = g_strconcat(FileTag->comment,MULTIFIELD_SEPARATOR,field_value,NULL);
+                            g_free(field_value);
+                        }
                     }
-                    FileTag->track = g_strdup(field_value);
                 }
-                g_free(field_value);
-            }
-        }
-    }
 
-    /*********
-     * Genre *
-     *********/
-    field_num = 0;
-    while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(vc_block,field_num,"GENRE")) >= 0 )
-    {
-        /* Extract field value */
-        field = &vc->comments[field_num++];
-        field_value = memchr(field->entry, '=', field->length);
+                /************
+                 * Composer *
+                 ************/
+                field_num = 0;
+                while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(block,field_num,"COMPOSER")) >= 0 )
+                {
+                    /* Extract field value */
+                    field = &vc->comments[field_num++];
+                    field_value = memchr(field->entry, '=', field->length);
 
-        if (field_value)
-        {
-            field_value++;
-            if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
-            {
-                field_len = field->length - (field_value - (gchar*) field->entry);
-                field_value_tmp = g_strndup(field_value, field_len);
-                field_value = Try_To_Validate_Utf8_String(field_value_tmp);
-                g_free(field_value_tmp);
-                if (FileTag->genre==NULL)
-                    FileTag->genre = g_strdup(field_value);
-                else
-                    FileTag->genre = g_strconcat(FileTag->genre,MULTIFIELD_SEPARATOR,field_value,NULL);
-                g_free(field_value);
-            }
-        }
-    }
+                    if (field_value)
+                    {
+                        field_value++;
+                        if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+                        {
+                            field_len = field->length - (field_value - (gchar*) field->entry);
+                            field_value_tmp = g_strndup(field_value, field_len);
+                            field_value = Try_To_Validate_Utf8_String(field_value_tmp);
+                            g_free(field_value_tmp);
+                            if (FileTag->composer==NULL)
+                                FileTag->composer = g_strdup(field_value);
+                            else
+                                FileTag->composer = g_strconcat(FileTag->composer,MULTIFIELD_SEPARATOR,field_value,NULL);
+                            g_free(field_value);
+                        }
+                    }
+                }
 
-    /***********
-     * Comment *
-     ***********/
-    field_num = 0;
-    while ( 1 )
-    {
-        gint field_num1, field_num2;
-
-        // The comment field can take two forms...
-        field_num1 = FLAC__metadata_object_vorbiscomment_find_entry_from(vc_block,field_num,"DESCRIPTION");
-        field_num2 = FLAC__metadata_object_vorbiscomment_find_entry_from(vc_block,field_num,"COMMENT");
-
-        if (field_num1 >= 0 && field_num2 >= 0)
-            // Note : We set field_num to the last "comment" field to avoid to concatenate 
-            // the DESCRIPTION and COMMENT field if there are both present (EasyTAG writes the both...)
-            if (field_num1 < field_num2)
-                field_num = field_num2;
-            else
-                field_num = field_num1;
-        else if (field_num1 >= 0)
-            field_num = field_num1;
-        else if (field_num2 >= 0)
-            field_num = field_num2;
-        else
-            break;
-
-        /* Extract field value */
-        field = &vc->comments[field_num++];
-        field_value = memchr(field->entry, '=', field->length);
-
-        if (field_value)
-        {
-            field_value++;
-            if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
-            {
-                field_len = field->length - (field_value - (gchar*) field->entry);
-                field_value_tmp = g_strndup(field_value, field_len);
-                field_value = Try_To_Validate_Utf8_String(field_value_tmp);
-                g_free(field_value_tmp);
-                if (FileTag->comment==NULL)
-                    FileTag->comment = g_strdup(field_value);
-                else
-                    FileTag->comment = g_strconcat(FileTag->comment,MULTIFIELD_SEPARATOR,field_value,NULL);
-                g_free(field_value);
-            }
-        }
-    }
+                /*******************
+                 * Original artist *
+                 *******************/
+                field_num = 0;
+                while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(block,field_num,"PERFORMER")) >= 0 )
+                {
+                    /* Extract field value */
+                    field = &vc->comments[field_num++];
+                    field_value = memchr(field->entry, '=', field->length);
 
-    /************
-     * Composer *
-     ************/
-    field_num = 0;
-    while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(vc_block,field_num,"COMPOSER")) >= 0 )
-    {
-        /* Extract field value */
-        field = &vc->comments[field_num++];
-        field_value = memchr(field->entry, '=', field->length);
+                    if (field_value)
+                    {
+                        field_value++;
+                        if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+                        {
+                            field_len = field->length - (field_value - (gchar*) field->entry);
+                            field_value_tmp = g_strndup(field_value, field_len);
+                            field_value = Try_To_Validate_Utf8_String(field_value_tmp);
+                            g_free(field_value_tmp);
+                            if (FileTag->orig_artist==NULL)
+                                FileTag->orig_artist = g_strdup(field_value);
+                            else
+                                FileTag->orig_artist = g_strconcat(FileTag->orig_artist,MULTIFIELD_SEPARATOR,field_value,NULL);
+                            g_free(field_value);
+                        }
+                    }
+                }
 
-        if (field_value)
-        {
-            field_value++;
-            if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
-            {
-                field_len = field->length - (field_value - (gchar*) field->entry);
-                field_value_tmp = g_strndup(field_value, field_len);
-                field_value = Try_To_Validate_Utf8_String(field_value_tmp);
-                g_free(field_value_tmp);
-                if (FileTag->composer==NULL)
-                    FileTag->composer = g_strdup(field_value);
-                else
-                    FileTag->composer = g_strconcat(FileTag->composer,MULTIFIELD_SEPARATOR,field_value,NULL);
-                g_free(field_value);
-            }
-        }
-    }
+                /*************
+                 * Copyright *
+                 *************/
+                field_num = 0;
+                while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(block,field_num,"COPYRIGHT")) >= 0 )
+                {
+                    /* Extract field value */
+                    field = &vc->comments[field_num++];
+                    field_value = memchr(field->entry, '=', field->length);
 
-    /*******************
-     * Original artist *
-     *******************/
-    field_num = 0;
-    while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(vc_block,field_num,"PERFORMER")) >= 0 )
-    {
-        /* Extract field value */
-        field = &vc->comments[field_num++];
-        field_value = memchr(field->entry, '=', field->length);
+                    if (field_value)
+                    {
+                        field_value++;
+                        if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+                        {
+                            field_len = field->length - (field_value - (gchar*) field->entry);
+                            field_value_tmp = g_strndup(field_value, field_len);
+                            field_value = Try_To_Validate_Utf8_String(field_value_tmp);
+                            g_free(field_value_tmp);
+                            if (FileTag->copyright==NULL)
+                                FileTag->copyright = g_strdup(field_value);
+                            else
+                                FileTag->copyright = g_strconcat(FileTag->copyright,MULTIFIELD_SEPARATOR,field_value,NULL);
+                            g_free(field_value);
+                        }
+                    }
+                }
 
-        if (field_value)
-        {
-            field_value++;
-            if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
-            {
-                field_len = field->length - (field_value - (gchar*) field->entry);
-                field_value_tmp = g_strndup(field_value, field_len);
-                field_value = Try_To_Validate_Utf8_String(field_value_tmp);
-                g_free(field_value_tmp);
-                if (FileTag->orig_artist==NULL)
-                    FileTag->orig_artist = g_strdup(field_value);
-                else
-                    FileTag->orig_artist = g_strconcat(FileTag->orig_artist,MULTIFIELD_SEPARATOR,field_value,NULL);
-                g_free(field_value);
-            }
-        }
-    }
+                /*******
+                 * URL *
+                 *******/
+                field_num = 0;
+                while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(block,field_num,"LICENSE")) >= 0 )
+                {
+                    /* Extract field value */
+                    field = &vc->comments[field_num++];
+                    field_value = memchr(field->entry, '=', field->length);
 
-    /*************
-     * Copyright *
-     *************/
-    field_num = 0;
-    while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(vc_block,field_num,"COPYRIGHT")) >= 0 )
-    {
-        /* Extract field value */
-        field = &vc->comments[field_num++];
-        field_value = memchr(field->entry, '=', field->length);
+                    if (field_value)
+                    {
+                        field_value++;
+                        if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+                        {
+                            field_len = field->length - (field_value - (gchar*) field->entry);
+                            field_value_tmp = g_strndup(field_value, field_len);
+                            field_value = Try_To_Validate_Utf8_String(field_value_tmp);
+                            g_free(field_value_tmp);
+                            if (FileTag->url==NULL)
+                                FileTag->url = g_strdup(field_value);
+                            else
+                                FileTag->url = g_strconcat(FileTag->url,MULTIFIELD_SEPARATOR,field_value,NULL);
+                            g_free(field_value);
+                        }
+                    }
+                }
 
-        if (field_value)
-        {
-            field_value++;
-            if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
-            {
-                field_len = field->length - (field_value - (gchar*) field->entry);
-                field_value_tmp = g_strndup(field_value, field_len);
-                field_value = Try_To_Validate_Utf8_String(field_value_tmp);
-                g_free(field_value_tmp);
-                if (FileTag->copyright==NULL)
-                    FileTag->copyright = g_strdup(field_value);
-                else
-                    FileTag->copyright = g_strconcat(FileTag->copyright,MULTIFIELD_SEPARATOR,field_value,NULL);
-                g_free(field_value);
-            }
-        }
-    }
+                /**************
+                 * Encoded by *
+                 **************/
+                field_num = 0;
+                while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(block,field_num,"ENCODED-BY")) >= 0 )
+                {
+                    /* Extract field value */
+                    field = &vc->comments[field_num++];
+                    field_value = memchr(field->entry, '=', field->length);
 
-    /*******
-     * URL *
-     *******/
-    field_num = 0;
-    while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(vc_block,field_num,"LICENSE")) >= 0 )
-    {
-        /* Extract field value */
-        field = &vc->comments[field_num++];
-        field_value = memchr(field->entry, '=', field->length);
+                    if (field_value)
+                    {
+                        field_value++;
+                        if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+                        {
+                            field_len = field->length - (field_value - (gchar*) field->entry);
+                            field_value_tmp = g_strndup(field_value, field_len);
+                            field_value = Try_To_Validate_Utf8_String(field_value_tmp);
+                            g_free(field_value_tmp);
+                            if (FileTag->encoded_by==NULL)
+                                FileTag->encoded_by = g_strdup(field_value);
+                            else
+                                FileTag->encoded_by = g_strconcat(FileTag->encoded_by,MULTIFIELD_SEPARATOR,field_value,NULL);
+                            g_free(field_value);
+                        }
+                    }
+                }
 
-        if (field_value)
-        {
-            field_value++;
-            if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
-            {
-                field_len = field->length - (field_value - (gchar*) field->entry);
-                field_value_tmp = g_strndup(field_value, field_len);
-                field_value = Try_To_Validate_Utf8_String(field_value_tmp);
-                g_free(field_value_tmp);
-                if (FileTag->url==NULL)
-                    FileTag->url = g_strdup(field_value);
-                else
-                    FileTag->url = g_strconcat(FileTag->url,MULTIFIELD_SEPARATOR,field_value,NULL);
-                g_free(field_value);
-            }
-        }
-    }
+                /***************************
+                 * Save unsupported fields *
+                 ***************************/
+                for (i=0;i<(guint)vc->num_comments;i++)
+                {
+                    field = &vc->comments[i];
+                    if ( strncasecmp((gchar *)field->entry,"TITLE=",       MIN(6,  field->length)) != 0
+                      && strncasecmp((gchar *)field->entry,"ARTIST=",      MIN(7,  field->length)) != 0
+                      && strncasecmp((gchar *)field->entry,"ALBUM=",       MIN(6,  field->length)) != 0
+                      && strncasecmp((gchar *)field->entry,"DISCNUMBER=",  MIN(11, field->length)) != 0
+                      && strncasecmp((gchar *)field->entry,"DATE=",        MIN(5,  field->length)) != 0
+                      && strncasecmp((gchar *)field->entry,"TRACKNUMBER=", MIN(12, field->length)) != 0
+                      && strncasecmp((gchar *)field->entry,"TRACKTOTAL=",  MIN(11, field->length)) != 0
+                      && strncasecmp((gchar *)field->entry,"GENRE=",       MIN(6,  field->length)) != 0
+                      && strncasecmp((gchar *)field->entry,"DESCRIPTION=", MIN(12, field->length)) != 0
+                      && strncasecmp((gchar *)field->entry,"COMMENT=",     MIN(8,  field->length)) != 0
+                      && strncasecmp((gchar *)field->entry,"COMPOSER=",    MIN(9,  field->length)) != 0
+                      && strncasecmp((gchar *)field->entry,"PERFORMER=",   MIN(10, field->length)) != 0
+                      && strncasecmp((gchar *)field->entry,"COPYRIGHT=",   MIN(10, field->length)) != 0
+                      && strncasecmp((gchar *)field->entry,"LICENSE=",     MIN(8,  field->length)) != 0
+                      && strncasecmp((gchar *)field->entry,"ENCODED-BY=",  MIN(11, field->length)) != 0 )
+                    {
+                        //g_print("custom %*s\n", field->length, field->entry);
+                        FileTag->other = g_list_append(FileTag->other,g_strndup((const gchar *)field->entry, field->length));
+                    }
+                }
 
-    /**************
-     * Encoded by *
-     **************/
-    field_num = 0;
-    while ( (field_num = FLAC__metadata_object_vorbiscomment_find_entry_from(vc_block,field_num,"ENCODED-BY")) >= 0 )
-    {
-        /* Extract field value */
-        field = &vc->comments[field_num++];
-        field_value = memchr(field->entry, '=', field->length);
+                
+                break;
+            }
 
-        if (field_value)
-        {
-            field_value++;
-            if ( field_value && g_utf8_strlen(field_value, -1) > 0 )
+            
+            //
+            // Read the PICTURE block (severals can exist)
+            //
+            case FLAC__METADATA_TYPE_PICTURE: 
             {
-                field_len = field->length - (field_value - (gchar*) field->entry);
-                field_value_tmp = g_strndup(field_value, field_len);
-                field_value = Try_To_Validate_Utf8_String(field_value_tmp);
-                g_free(field_value_tmp);
-                if (FileTag->encoded_by==NULL)
-                    FileTag->encoded_by = g_strdup(field_value);
-                else
-                    FileTag->encoded_by = g_strconcat(FileTag->encoded_by,MULTIFIELD_SEPARATOR,field_value,NULL);
-                g_free(field_value);
+                
+                /***********
+                 * Picture *
+                 ***********/
+                // For FLAC >= 1.1.3
+                #ifndef LEGACY_FLAC
+                    FLAC__StreamMetadata_Picture *p;
+                    Picture *pic;
+                
+                    // Get picture data from block
+                    p = &block->data.picture;
+                
+                    pic = Picture_Allocate();
+                    if (!prev_pic)
+                        FileTag->picture = pic;
+                    else
+                        prev_pic->next = pic;
+                    prev_pic = pic;
+
+                    pic->size = p->data_length;
+                    pic->data = g_memdup(p->data,pic->size);
+                    pic->type = p->type;
+                    pic->description = g_strdup((gchar *)p->description);
+                    // Not necessary: will be calculated later
+                    //pic->height = p->height;
+                    //pic->width  = p->width;
+
+                    //g_print("Picture type : %s\n",FLAC__StreamMetadata_Picture_TypeString[p->type]);
+                    //g_print("Mime    type : %s\n",p->mime_type);
+
+                #endif
+                
+                break;
             }
+            
+            default:
+                break;
         }
+        
+        // Free block data
+        ////FLAC__metadata_object_delete(block);
     }
-
-
-    /***********
-     * Picture *
-     ***********/
-    // For FLAC > 1.1.3
-    #ifndef LEGACY_FLAC
     
-    #endif
+    // Free iter
+    FLAC__metadata_simple_iterator_delete(iter);
 
 
-    /***************************
-     * Save unsupported fields *
-     ***************************/
-    for (i=0;i<(guint)vc->num_comments;i++)
-    {
-        field = &vc->comments[i];
-        if ( strncasecmp((gchar *)field->entry,"TITLE=",       MIN(6,  field->length)) != 0
-          && strncasecmp((gchar *)field->entry,"ARTIST=",      MIN(7,  field->length)) != 0
-          && strncasecmp((gchar *)field->entry,"ALBUM=",       MIN(6,  field->length)) != 0
-          && strncasecmp((gchar *)field->entry,"DISCNUMBER=",  MIN(11, field->length)) != 0
-          && strncasecmp((gchar *)field->entry,"DATE=",        MIN(5,  field->length)) != 0
-          && strncasecmp((gchar *)field->entry,"TRACKNUMBER=", MIN(12, field->length)) != 0
-          && strncasecmp((gchar *)field->entry,"TRACKTOTAL=",  MIN(11, field->length)) != 0
-          && strncasecmp((gchar *)field->entry,"GENRE=",       MIN(6,  field->length)) != 0
-          && strncasecmp((gchar *)field->entry,"DESCRIPTION=", MIN(12, field->length)) != 0
-          && strncasecmp((gchar *)field->entry,"COMMENT=",     MIN(8,  field->length)) != 0
-          && strncasecmp((gchar *)field->entry,"COMPOSER=",    MIN(9,  field->length)) != 0
-          && strncasecmp((gchar *)field->entry,"PERFORMER=",   MIN(10, field->length)) != 0
-          && strncasecmp((gchar *)field->entry,"COPYRIGHT=",   MIN(10, field->length)) != 0
-          && strncasecmp((gchar *)field->entry,"LICENSE=",     MIN(8,  field->length)) != 0
-          && strncasecmp((gchar *)field->entry,"ENCODED-BY=",  MIN(11, field->length)) != 0 )
-        {
-            //g_print("custom %*s\n", field->length, field->entry);
-            FileTag->other = g_list_append(FileTag->other,g_strndup((const gchar *)field->entry, field->length));
-        }
-    }
-
-    FLAC__metadata_object_delete(vc_block);
-    FLAC__metadata_simple_iterator_delete(iter);
 
 #ifdef ENABLE_MP3
     /* If no FLAC vorbis tag found : we try to get the ID3 tag if it exists
-     * (will be deleted when writing the tag */
+     * (but it will be deleted when rewriting the tag) */
     if ( FileTag->title       == NULL
       && FileTag->artist      == NULL
       && FileTag->album       == NULL
@@ -641,12 +681,13 @@ gboolean Flac_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
       && FileTag->orig_artist == NULL
       && FileTag->copyright   == NULL
       && FileTag->url         == NULL
-      && FileTag->encoded_by  == NULL)
+      && FileTag->encoded_by  == NULL
+      && FileTag->picture     == NULL)
     {
         gint rc = Id3tag_Read_File_Tag(filename,FileTag);
 
         // If an ID3 tag has been found (and no FLAC tag), we mark the file as
-        // unsaved to rewrite a flac tag
+        // unsaved to rewrite a flac tag.
         if ( FileTag->title       != NULL
           || FileTag->artist      != NULL
           || FileTag->album       != NULL
@@ -660,7 +701,8 @@ gboolean Flac_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
           || FileTag->orig_artist != NULL
           || FileTag->copyright   != NULL
           || FileTag->url         != NULL
-          || FileTag->encoded_by  != NULL)
+          || FileTag->encoded_by  != NULL
+          || FileTag->picture     != NULL)
         {
             FileTag->saved = FALSE;
         }
@@ -670,10 +712,10 @@ gboolean Flac_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
 
     /* Part to get cover artist :
      * If we have read the ID3 tag previously we don't arrive here (and we have
-     * the picture if it exists)
+     * the picture if it exists).
      * Else the ID3 tag wasn't read (as there was data in FLAC tag) so we try
-     * to read it only to get the picture (not supported by the FLAC tag) */
-    if (WRITE_ID3_TAGS_IN_FLAC_FILE && FileTag->picture == NULL)
+     * to read it only to get the picture (not supported by the FLAC tag). */
+    /***if (WRITE_ID3_TAGS_IN_FLAC_FILE && FileTag->picture == NULL)
     {
         File_Tag *FileTag_tmp = ET_File_Tag_Item_New();
         gint rc = Id3tag_Read_File_Tag(filename,FileTag_tmp);
@@ -686,31 +728,28 @@ gboolean Flac_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
         ET_Free_File_Tag_Item(FileTag_tmp);
 
         return rc;
-    }
+    }***/
 #endif
 
     return TRUE;
 }
 
 
+
+/*
+ * Write Flac tag, using the level 2 flac interface
+ */
 gboolean Flac_Tag_Write_File_Tag (ET_File *ETFile)
 {
-    File_Tag                                 *FileTag;
-    gchar                                    *filename_utf8, *filename;
-    gchar                                    *basename_utf8;
-    FLAC__Metadata_SimpleIterator            *iter;
-    FLAC__StreamMetadata                     *vc_block;
-    FLAC__StreamMetadata_VorbisComment_Entry field;
-    FLAC__bool                               write_ok;
-    gchar                                    *string;
-    GList                                    *list;
-    // To get original vendor string
-    FLAC__StreamMetadata                     *vc_block_svg = NULL;
-    FLAC__StreamMetadata_VorbisComment       *vc_svg;
-    FLAC__StreamMetadata_VorbisComment_Entry field_svg;
-    gboolean                                 vc_found_svg = TRUE;
-
+    File_Tag *FileTag;
+    gchar *filename_utf8, *filename;
+    gchar *basename_utf8;
+    FLAC__Metadata_Chain *chain;
+    FLAC__Metadata_Iterator *iter;
+    FLAC__StreamMetadata_VorbisComment_Entry vce_field_vendor_string; // To save vendor string
+    gboolean vce_field_vendor_string_found = FALSE;
 
+    
     if (!ETFile || !ETFile->FileTag)
         return FALSE;
 
@@ -720,282 +759,382 @@ gboolean Flac_Tag_Write_File_Tag (ET_File *ETFile)
     flac_error_msg = NULL;
 
     /* libFLAC is able to detect (and skip) ID3v2 tags by itself */
-
-    iter = FLAC__metadata_simple_iterator_new();
-    if ( iter == NULL || !FLAC__metadata_simple_iterator_init(iter,filename,false,false) )
+    
+    // Create a new chain instance to get all blocks in one time
+    chain = FLAC__metadata_chain_new();
+    if (chain == NULL || !FLAC__metadata_chain_read(chain,filename))
     {
-        if ( iter == NULL )
+        if (chain == NULL)
         {
-#ifdef WIN32
-            const char **iter = FLAC__Metadata_SimpleIteratorStatusString;  /* this is for win32 auto-import of this external symbol works */
-            flac_error_msg = iter[FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR];
-#else
-            flac_error_msg = FLAC__Metadata_SimpleIteratorStatusString[FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR];
-#endif
+            // Error with "FLAC__metadata_chain_new"
+            flac_error_msg = FLAC__Metadata_ChainStatusString[FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR];
         }else
         {
-            flac_error_msg = FLAC__Metadata_SimpleIteratorStatusString[FLAC__metadata_simple_iterator_status(iter)];
-            FLAC__metadata_simple_iterator_delete(iter);
+            // Error with "FLAC__metadata_chain_read"
+            FLAC__Metadata_ChainStatus status = FLAC__metadata_chain_status(chain);
+            flac_error_msg = FLAC__Metadata_ChainStatusString[status];
+            
+            FLAC__metadata_chain_delete(chain);
         }
-
-        Log_Print(_("ERROR while opening file: '%s' as FLAC (%s)."),filename_utf8,flac_error_msg);
+        
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' as FLAC (%s)."),filename_utf8,flac_error_msg);
         return FALSE;
     }
-
-    /* Find the VORBIS_COMMENT block to get original vendor string */
-    while ( FLAC__metadata_simple_iterator_get_block_type(iter) != FLAC__METADATA_TYPE_VORBIS_COMMENT )
+    
+    // Create a new iterator instance for the chain
+    iter = FLAC__metadata_iterator_new();
+    if (iter == NULL)
     {
-        if ( !FLAC__metadata_simple_iterator_next(iter) )
-        {
-            /* End of metadata: comment block not found, nothing to read */
-            vc_found_svg = FALSE;
-            break;
-        }
+        flac_error_msg = FLAC__Metadata_ChainStatusString[FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR];
+
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' as FLAC (%s)."),filename_utf8,flac_error_msg);
+        return FALSE;
     }
-    if (vc_found_svg)
+    
+    // Initialize the iterator to point to the first metadata block in the given chain.
+    FLAC__metadata_iterator_init(iter,chain);
+    
+    while (FLAC__metadata_iterator_next(iter))
     {
-        /* Get comments from block */
-        vc_block_svg = FLAC__metadata_simple_iterator_get_block(iter);
-        vc_svg = &vc_block_svg->data.vorbis_comment;
-        /* Get original vendor string */
-        field_svg = vc_svg->vendor_string;
-    }
-
-
-    vc_block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT);
-
-    /* Set the original vendor string else it is version of library */
-    if (vc_found_svg)
-        FLAC__metadata_object_vorbiscomment_set_vendor_string(vc_block, field_svg, true);
-
+        //g_print("Write: %d %s -> block type: %d\n",j++,g_path_get_basename(filename),FLAC__metadata_iterator_get_block_type(iter));
+        
+        // Action to do according the type
+        switch ( FLAC__metadata_iterator_get_block_type(iter) )
+        {
+            //
+            // Delete the VORBIS_COMMENT block and convert to padding. But before, save the original vendor string.
+            //
+            case FLAC__METADATA_TYPE_VORBIS_COMMENT:
+            {
+                // Get block data
+                FLAC__StreamMetadata *block = FLAC__metadata_iterator_get_block(iter);
+                FLAC__StreamMetadata_VorbisComment *vc = &block->data.vorbis_comment;
+                
+                // Get initial vendor string, to don't alterate it by FLAC__VENDOR_STRING when saving file
+                vce_field_vendor_string = vc->vendor_string;
+                vce_field_vendor_string_found = TRUE;
+                
+                // Free block data
+                FLAC__metadata_iterator_delete_block(iter,true);
+                break;
+            }
+            
+            //
+            // Delete all the PICTURE blocks, and convert to padding
+            //
+            case FLAC__METADATA_TYPE_PICTURE: 
+            {
+                FLAC__metadata_iterator_delete_block(iter,true);
+                break;
+            }
 
-    /*********
-     * Title *
-     *********/
-    if ( FileTag->title )
-    {
-        string  = g_strconcat("TITLE=",FileTag->title,NULL);
-        field.entry = (FLAC__byte *)string;
-        field.length = strlen(string); // Warning : g_utf8_strlen doesn't count the multibyte characters. Here we need the allocated size.
-        FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
-        g_free(string);
+            default:
+                break;
+        }
     }
-
-    /**********
-     * Artist *
-     **********/
-    if ( FileTag->artist )
+    
+    
+    //
+    // Create and insert a new VORBISCOMMENT block
+    //
     {
-        string  = g_strconcat("ARTIST=",FileTag->artist,NULL);
-        field.entry = (FLAC__byte *)string;
-        field.length = strlen(string);
-        FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
-        g_free(string);
-    }
+        FLAC__StreamMetadata *vc_block; // For vorbis comments
+        FLAC__StreamMetadata_VorbisComment_Entry field;
+        gchar *string;
+        GList *list;
+        
+        // Allocate a block for Vorbis comments
+        vc_block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT);
+
+        // Set the original vendor string, else will be use the version of library
+        if (vce_field_vendor_string_found)
+            FLAC__metadata_object_vorbiscomment_set_vendor_string(vc_block, vce_field_vendor_string, true);
+
+
+        /*********
+         * Title *
+         *********/
+        if ( FileTag->title )
+        {
+            string = g_strconcat("TITLE=",FileTag->title,NULL);
+            field.entry = (FLAC__byte *)string;
+            field.length = strlen(string); // Warning : g_utf8_strlen doesn't count the multibyte characters. Here we need the allocated size.
+            FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
+            g_free(string);
+        }
 
-    /*********
-     * Album *
-     *********/
-    if ( FileTag->album )
-    {
-        string  = g_strconcat("ALBUM=",FileTag->album,NULL);
-        field.entry = (FLAC__byte *)string;
-        field.length = strlen(string);
-        FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
-        g_free(string);
-    }
+        /**********
+         * Artist *
+         **********/
+        if ( FileTag->artist )
+        {
+            string = g_strconcat("ARTIST=",FileTag->artist,NULL);
+            field.entry = (FLAC__byte *)string;
+            field.length = strlen(string);
+            FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
+            g_free(string);
+        }
 
-    /***************
-     * Disc Number *
-     ***************/
-    if ( FileTag->disc_number )
-    {
-        string  = g_strconcat("DISCNUMBER=",FileTag->disc_number,NULL);
-        field.entry = (FLAC__byte *)string;
-        field.length = strlen(string);
-        FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
-        g_free(string);
-    }
+        /*********
+         * Album *
+         *********/
+        if ( FileTag->album )
+        {
+            string = g_strconcat("ALBUM=",FileTag->album,NULL);
+            field.entry = (FLAC__byte *)string;
+            field.length = strlen(string);
+            FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
+            g_free(string);
+        }
 
-    /********
-     * Year *
-     ********/
-    if ( FileTag->year )
-    {
-        string  = g_strconcat("DATE=",FileTag->year,NULL);
-        field.entry = (FLAC__byte *)string;
-        field.length = strlen(string);
-        FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
-        g_free(string);
-    }
+        /***************
+         * Disc Number *
+         ***************/
+        if ( FileTag->disc_number )
+        {
+            string = g_strconcat("DISCNUMBER=",FileTag->disc_number,NULL);
+            field.entry = (FLAC__byte *)string;
+            field.length = strlen(string);
+            FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
+            g_free(string);
+        }
 
-    /*************************
-     * Track and Total Track *
-     *************************/
-    if ( FileTag->track )
-    {
-        string = g_strconcat("TRACKNUMBER=",FileTag->track,NULL);
-        field.entry = (FLAC__byte *)string;
-        field.length = strlen(string);
-        FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
-        g_free(string);
-    }
-    if ( FileTag->track_total /*&& strlen(FileTag->track_total)>0*/ )
-    {
-        string = g_strconcat("TRACKTOTAL=",FileTag->track_total,NULL);
-        field.entry = (FLAC__byte *)string;
-        field.length = strlen(string);
-        FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
-        g_free(string);
-    }
+        /********
+         * Year *
+         ********/
+        if ( FileTag->year )
+        {
+            string = g_strconcat("DATE=",FileTag->year,NULL);
+            field.entry = (FLAC__byte *)string;
+            field.length = strlen(string);
+            FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
+            g_free(string);
+        }
 
-    /*********
-     * Genre *
-     *********/
-    if ( FileTag->genre )
-    {
-        string  = g_strconcat("GENRE=",FileTag->genre,NULL);
-        field.entry = (FLAC__byte *)string;
-        field.length = strlen(string);
-        FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
-        g_free(string);
-    }
+        /*************************
+         * Track and Total Track *
+         *************************/
+        if ( FileTag->track )
+        {
+            string = g_strconcat("TRACKNUMBER=",FileTag->track,NULL);
+            field.entry = (FLAC__byte *)string;
+            field.length = strlen(string);
+            FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
+            g_free(string);
+        }
+        if ( FileTag->track_total /*&& strlen(FileTag->track_total)>0*/ )
+        {
+            string = g_strconcat("TRACKTOTAL=",FileTag->track_total,NULL);
+            field.entry = (FLAC__byte *)string;
+            field.length = strlen(string);
+            FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
+            g_free(string);
+        }
 
-    /***********
-     * Comment *
-     ***********/
-    // We write the comment using the "both" format
-    if ( FileTag->comment )
-    {
-        string = g_strconcat("DESCRIPTION=",FileTag->comment,NULL);
-        field.entry = (FLAC__byte *)string;
-        field.length = strlen(string);
-        FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
-        g_free(string);
-
-        string = g_strconcat("COMMENT=",FileTag->comment,NULL);
-        field.entry = (FLAC__byte *)string;
-        field.length = strlen(string);
-        FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
-        g_free(string);
-    }
+        /*********
+         * Genre *
+         *********/
+        if ( FileTag->genre )
+        {
+            string = g_strconcat("GENRE=",FileTag->genre,NULL);
+            field.entry = (FLAC__byte *)string;
+            field.length = strlen(string);
+            FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
+            g_free(string);
+        }
 
-    /************
-     * Composer *
-     ************/
-    if ( FileTag->composer )
-    {
-        string  = g_strconcat("COMPOSER=",FileTag->composer,NULL);
-        field.entry = (FLAC__byte *)string;
-        field.length = strlen(string);
-        FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
-        g_free(string);
-    }
+        /***********
+         * Comment *
+         ***********/
+        // We write the comment using the "both" format
+        if ( FileTag->comment )
+        {
+            string = g_strconcat("DESCRIPTION=",FileTag->comment,NULL);
+            field.entry = (FLAC__byte *)string;
+            field.length = strlen(string);
+            FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
+            g_free(string);
 
-    /*******************
-     * Original artist *
-     *******************/
-    if ( FileTag->orig_artist )
-    {
-        string  = g_strconcat("PERFORMER=",FileTag->orig_artist,NULL);
-        field.entry = (FLAC__byte *)string;
-        field.length = strlen(string);
-        FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
-        g_free(string);
-    }
+            string = g_strconcat("COMMENT=",FileTag->comment,NULL);
+            field.entry = (FLAC__byte *)string;
+            field.length = strlen(string);
+            FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
+            g_free(string);
+        }
 
-    /*************
-     * Copyright *
-     *************/
-    if ( FileTag->copyright )
-    {
-        string  = g_strconcat("COPYRIGHT=",FileTag->copyright,NULL);
-        field.entry = (FLAC__byte *)string;
-        field.length = strlen(string);
-        FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
-        g_free(string);
-    }
+        /************
+         * Composer *
+         ************/
+        if ( FileTag->composer )
+        {
+            string = g_strconcat("COMPOSER=",FileTag->composer,NULL);
+            field.entry = (FLAC__byte *)string;
+            field.length = strlen(string);
+            FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
+            g_free(string);
+        }
 
-    /*******
-     * URL *
-     *******/
-    if ( FileTag->url )
-    {
-        string  = g_strconcat("LICENSE=",FileTag->url,NULL);
-        field.entry = (FLAC__byte *)string;
-        field.length = strlen(string);
-        FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
-        g_free(string);
-    }
+        /*******************
+         * Original artist *
+         *******************/
+        if ( FileTag->orig_artist )
+        {
+            string = g_strconcat("PERFORMER=",FileTag->orig_artist,NULL);
+            field.entry = (FLAC__byte *)string;
+            field.length = strlen(string);
+            FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
+            g_free(string);
+        }
 
-    /**************
-     * Encoded by *
-     **************/
-    if ( FileTag->encoded_by )
-    {
-        string  = g_strconcat("ENCODED-BY=",FileTag->encoded_by,NULL);
-        field.entry = (FLAC__byte *)string;
-        field.length = strlen(string);
-        FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
-        g_free(string);
-    }
+        /*************
+         * Copyright *
+         *************/
+        if ( FileTag->copyright )
+        {
+            string  = g_strconcat("COPYRIGHT=",FileTag->copyright,NULL);
+            field.entry = (FLAC__byte *)string;
+            field.length = strlen(string);
+            FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
+            g_free(string);
+        }
 
+        /*******
+         * URL *
+         *******/
+        if ( FileTag->url )
+        {
+            string = g_strconcat("LICENSE=",FileTag->url,NULL);
+            field.entry = (FLAC__byte *)string;
+            field.length = strlen(string);
+            FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
+            g_free(string);
+        }
 
-    /**************************
-     * Set unsupported fields *
-     **************************/
-    list = FileTag->other;
-    while (list)
-    {
-        if (list->data)
+        /**************
+         * Encoded by *
+         **************/
+        if ( FileTag->encoded_by )
         {
-            string = (gchar*)list->data;
+            string = g_strconcat("ENCODED-BY=",FileTag->encoded_by,NULL);
             field.entry = (FLAC__byte *)string;
             field.length = strlen(string);
             FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
+            g_free(string);
         }
-        list = list->next;
-    }
 
-    /* Find the VORBIS_COMMENT block */
-    while ( FLAC__metadata_simple_iterator_get_block_type(iter) != FLAC__METADATA_TYPE_VORBIS_COMMENT )
-    {
-        if ( !FLAC__metadata_simple_iterator_next(iter) )
-            break;
-    }
 
+        /**************************
+         * Set unsupported fields *
+         **************************/
+        list = FileTag->other;
+        while (list)
+        {
+            if (list->data)
+            {
+                string = (gchar*)list->data;
+                field.entry = (FLAC__byte *)string;
+                field.length = strlen(string);
+                FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,vc_block->data.vorbis_comment.num_comments,field,true);
+            }
+            list = list->next;
+        }
 
-    /*
-     * Write FLAC tag (as Vorbis comment)
-     */
-    if ( FLAC__metadata_simple_iterator_get_block_type(iter) != FLAC__METADATA_TYPE_VORBIS_COMMENT )
-    {
-        /* End of metadata: no comment block, so insert one */
-        write_ok = FLAC__metadata_simple_iterator_insert_block_after(iter,vc_block,true);
-    }else
+        // Add the block to the the chain
+        FLAC__metadata_iterator_insert_block_after(iter, vc_block);
+        ////FLAC__metadata_object_delete(vc_block);
+    }
+    
+    
+    
+    //
+    // Create and insert PICTURE blocks
+    //
+    
+    /***********
+     * Picture *
+     ***********/
+    // For FLAC >= 1.1.3
+    #ifndef LEGACY_FLAC
     {
-        write_ok = FLAC__metadata_simple_iterator_set_block(iter,vc_block,true);
+        Picture *pic = FileTag->picture;
+        while (pic)
+        {
+            if (pic->data)
+            {
+                const gchar *violation;
+                FLAC__StreamMetadata *picture_block; // For picture data
+                Picture_Format format;
+                
+                // Allocate block for picture data
+                picture_block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_PICTURE);
+                
+                // Type
+                picture_block->data.picture.type = pic->type;
+                
+                // Mime type
+                format = Picture_Format_From_Data(pic);
+                FLAC__metadata_object_picture_set_mime_type(picture_block, (gchar *)Picture_Mime_Type_String(format), TRUE);
+
+                // Description
+                FLAC__metadata_object_picture_set_description(picture_block, (FLAC__byte *)pic->description, TRUE);
+                
+                // Resolution
+                picture_block->data.picture.width  = pic->width;
+                picture_block->data.picture.height = pic->height;
+                picture_block->data.picture.depth  = 0;
+
+                // Picture data
+                FLAC__metadata_object_picture_set_data(picture_block, (FLAC__byte *)pic->data, (FLAC__uint32) pic->size, TRUE);
+                
+                if (!FLAC__metadata_object_picture_is_legal(picture_block, &violation))
+                {
+                    Log_Print(LOG_ERROR,_("Picture block isn't valid: '%s'"),violation);
+                    FLAC__metadata_object_delete(picture_block);
+                }else
+                {
+                    // Add the block to the the chain
+                    FLAC__metadata_iterator_insert_block_after(iter, picture_block);
+                    ////FLAC__metadata_object_delete(picture_block);
+                }
+            }
+            
+            pic = pic->next;
+        }
     }
-
-    if ( !write_ok )
+    #endif
+    
+    // Free iter
+    FLAC__metadata_iterator_delete(iter);
+    
+    
+    //
+    // Prepare for writing tag
+    //
+    
+    // Move all PADDING blocks to the end on the metadata, and merge them into a single block.
+    FLAC__metadata_chain_sort_padding(chain);
+ 
+    // Write tag
+    if ( !FLAC__metadata_chain_write(chain, /*padding*/TRUE, /*preserve_file_stats*/TRUE) )
     {
-        flac_error_msg = FLAC__Metadata_SimpleIteratorStatusString[FLAC__metadata_simple_iterator_status(iter)];
-        Log_Print(_("ERROR: Failed to write comments to file '%s' (%s)."),filename_utf8,flac_error_msg);
-        FLAC__metadata_simple_iterator_delete(iter);
-        FLAC__metadata_object_delete(vc_block);
+        // Error with "FLAC__metadata_chain_write"
+        FLAC__Metadata_ChainStatus status = FLAC__metadata_chain_status(chain);
+        flac_error_msg = FLAC__Metadata_ChainStatusString[status];
+
+        FLAC__metadata_chain_delete(chain);
+        
+        Log_Print(LOG_ERROR,_("ERROR: Failed to write comments to file '%s' (%s)."),filename_utf8,flac_error_msg);
         return FALSE;
     }else
     {
         basename_utf8 = g_path_get_basename(filename_utf8);
-        Log_Print(_("Written tag of '%s'"),basename_utf8);
+        Log_Print(LOG_OK,_("Written tag of '%s'"),basename_utf8);
         g_free(basename_utf8);
     }
+    
+    FLAC__metadata_chain_delete(chain);
 
-    FLAC__metadata_simple_iterator_delete(iter);
-    FLAC__metadata_object_delete(vc_block);
-    if (vc_found_svg)
-        FLAC__metadata_object_delete(vc_block_svg);
-
+    
 #ifdef ENABLE_MP3
     /*
      * Write also the ID3 tags (ID3v1 and/or ID3v2) if wanted (as needed by some players)
@@ -1021,7 +1160,7 @@ gboolean Flac_Tag_Write_File_Tag (ET_File *ETFile)
         ET_Free_File_List_Item(ETFile_tmp);
     }
 #endif
-
+    
     return TRUE;
 }
 
diff --git a/src/id3_tag.c b/src/id3_tag.c
index 9092fee..8a21abf 100644
--- a/src/id3_tag.c
+++ b/src/id3_tag.c
@@ -142,7 +142,7 @@ gboolean Id3tag_Write_File_v23Tag (ET_File *ETFile)
     /* Test to know if we can write into the file */
     if ( (file=fopen(filename,"r+"))==NULL )
     {
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
         return FALSE;
     }
     fclose(file);
@@ -386,24 +386,28 @@ gboolean Id3tag_Write_File_v23Tag (ET_File *ETFile)
         has_picture = 0;
     while (pic)
     {
+        Picture_Format format = Picture_Format_From_Data(pic);
+
         id3_frame = ID3Frame_NewID(ID3FID_PICTURE);
         ID3Tag_AttachFrame(id3_tag,id3_frame);
 
-        switch (Picture_Format(pic))
+        switch (format)
         {
             case PICTURE_FORMAT_JPEG:
                 if ((id3_field = ID3Frame_GetField(id3_frame,ID3FN_MIMETYPE)))
-                    ID3Field_SetASCII(id3_field, "image/jpeg");
+                    ID3Field_SetASCII(id3_field, Picture_Mime_Type_String(format));
                 if ((id3_field = ID3Frame_GetField(id3_frame,ID3FN_IMAGEFORMAT)))
                     ID3Field_SetASCII(id3_field, "JPG");
                 break;
 
             case PICTURE_FORMAT_PNG:
                 if ((id3_field = ID3Frame_GetField(id3_frame,ID3FN_MIMETYPE)))
-                    ID3Field_SetASCII(id3_field, "image/png");
+                    ID3Field_SetASCII(id3_field, Picture_Mime_Type_String(format));
                 if ((id3_field = ID3Frame_GetField(id3_frame,ID3FN_IMAGEFORMAT)))
                     ID3Field_SetASCII(id3_field, "PNG");
                 break;
+            default:
+                break;
         }
 
         if ((id3_field = ID3Frame_GetField(id3_frame, ID3FN_PICTURETYPE)))
@@ -481,13 +485,13 @@ gboolean Id3tag_Write_File_v23Tag (ET_File *ETFile)
         /* Check error messages */
         if (error_strip_id3v1 == ID3E_NoError && error_strip_id3v2 == ID3E_NoError)
         {
-            Log_Print(_("Removed tag of '%s'"),basename_utf8);
+            Log_Print(LOG_OK,_("Removed tag of '%s'"),basename_utf8);
         }else
         {
             if (error_strip_id3v1 != ID3E_NoError)
-                Log_Print(_("Error while removing ID3v1 tag of '%s' (%s)"),basename_utf8,Id3tag_Get_Error_Message(error_strip_id3v1));
+                Log_Print(LOG_ERROR,_("Error while removing ID3v1 tag of '%s' (%s)"),basename_utf8,Id3tag_Get_Error_Message(error_strip_id3v1));
             if (error_strip_id3v2 != ID3E_NoError)
-                Log_Print(_("Error while removing ID3v2 tag of '%s' (%s)"),basename_utf8,Id3tag_Get_Error_Message(error_strip_id3v2));
+                Log_Print(LOG_ERROR,_("Error while removing ID3v2 tag of '%s' (%s)"),basename_utf8,Id3tag_Get_Error_Message(error_strip_id3v2));
             error++;
         }
 
@@ -506,7 +510,7 @@ gboolean Id3tag_Write_File_v23Tag (ET_File *ETFile)
             error_update_id3v2 = ID3Tag_UpdateByTagType(id3_tag,ID3TT_ID3V2);
             if (error_update_id3v2 != ID3E_NoError)
             {
-                Log_Print(_("Error while updating ID3v2 tag of '%s' (%s)"),basename_utf8,Id3tag_Get_Error_Message(error_update_id3v2));
+                Log_Print(LOG_ERROR,_("Error while updating ID3v2 tag of '%s' (%s)"),basename_utf8,Id3tag_Get_Error_Message(error_update_id3v2));
                 error++;
             }else
             {
@@ -536,13 +540,19 @@ gboolean Id3tag_Write_File_v23Tag (ET_File *ETFile)
                             "available in EasyTAG package sources.\n"
                             "Note that this message will appear only one time.\n\n"
                             "File : %s"),filename_utf8);
-                        //Log_Print(msg);
-
-                        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));
+                        //Log_Print(LOG_ERROR,msg);
+
+                        msgbox = msg_box_new(_("Error..."),
+                                             GTK_WINDOW(MainWindow),
+                                             NULL,
+                                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                             msg,
+                                             GTK_STOCK_DIALOG_ERROR,
+                                             GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                             NULL);
+                        gtk_dialog_run(GTK_DIALOG(msgbox));
                         gtk_widget_destroy(msgbox);
+                        g_free(msg);
                         flag_id3lib_bugged = FALSE; // To display the message only one time
                     }
                     ET_Free_File_Tag_Item(FileTag_tmp);
@@ -554,7 +564,7 @@ gboolean Id3tag_Write_File_v23Tag (ET_File *ETFile)
             error_strip_id3v2 = ID3Tag_Strip(id3_tag,ID3TT_ID3V2);
             if (error_strip_id3v2 != ID3E_NoError)
             {
-                Log_Print(_("Error while removing ID3v2 tag of '%s' (%s)"),basename_utf8,Id3tag_Get_Error_Message(error_strip_id3v2));
+                Log_Print(LOG_ERROR,_("Error while removing ID3v2 tag of '%s' (%s)"),basename_utf8,Id3tag_Get_Error_Message(error_strip_id3v2));
                 error++;
             }
         }
@@ -574,7 +584,7 @@ gboolean Id3tag_Write_File_v23Tag (ET_File *ETFile)
             error_update_id3v1 = ID3Tag_UpdateByTagType(id3_tag,ID3TT_ID3V1);
             if (error_update_id3v1 != ID3E_NoError)
             {
-                Log_Print(_("Error while updating ID3v1 tag of '%s' (%s)"),basename_utf8,Id3tag_Get_Error_Message(error_update_id3v1));
+                Log_Print(LOG_ERROR,_("Error while updating ID3v1 tag of '%s' (%s)"),basename_utf8,Id3tag_Get_Error_Message(error_update_id3v1));
                 error++;
             }
         }else
@@ -582,13 +592,13 @@ gboolean Id3tag_Write_File_v23Tag (ET_File *ETFile)
             error_strip_id3v1 = ID3Tag_Strip(id3_tag,ID3TT_ID3V1);
             if (error_strip_id3v1 != ID3E_NoError)
             {
-                Log_Print(_("Error while removing ID3v1 tag of '%s' (%s)"),basename_utf8,Id3tag_Get_Error_Message(error_strip_id3v1));
+                Log_Print(LOG_ERROR,_("Error while removing ID3v1 tag of '%s' (%s)"),basename_utf8,Id3tag_Get_Error_Message(error_strip_id3v1));
                 error++;
             }
         }
 
         if (error == 0)
-            Log_Print(_("Updated tag of '%s'"),basename_utf8);
+            Log_Print(LOG_OK,_("Updated tag of '%s'"),basename_utf8);
 
     }
 
@@ -794,7 +804,7 @@ gchar *Id3tag_Get_Field (const ID3Frame *id3_frame, ID3_FieldID id3_fieldid)
         // Data of the field must be a TEXT (ID3FTY_TEXTSTRING)
         if (ID3Field_GetType(id3_field) != ID3FTY_TEXTSTRING)
         {
-            Log_Print("Id3tag_Get_Field() must be used only for fields containing text.\n");
+            Log_Print(LOG_ERROR,"Id3tag_Get_Field() must be used only for fields containing text.\n");
             return NULL;
         }
 
@@ -883,15 +893,15 @@ gchar *Id3tag_Get_Field (const ID3Frame *id3_frame, ID3_FieldID id3_fieldid)
     if (num_chars && !string1)
     {
         gchar *escaped_str = g_strescape(string, NULL);
-        Log_Print("Id3tag_Get_Field: Trying to fix string '%s' ...",escaped_str);
+        Log_Print(LOG_OK,"Id3tag_Get_Field: Trying to fix string '%s' ...",escaped_str);
         g_free(escaped_str);
 
         string1 = filename_to_display(string);
 
         if (string1)
-            Log_Print("OK");
+            Log_Print(LOG_OK,"OK");
         else
-            Log_Print("KO");
+            Log_Print(LOG_ERROR,"KO");
     }
     g_free(string);
 
@@ -933,7 +943,7 @@ ID3_TextEnc Id3tag_Set_Field (const ID3Frame *id3_frame, ID3_FieldID id3_fieldid
         // Data of the field must be a TEXT (ID3FTY_TEXTSTRING)
         if (ID3Field_GetType(id3_field) != ID3FTY_TEXTSTRING)
         {
-            Log_Print("Id3tag_Set_Field() must be used only for fields containing text.");
+            Log_Print(LOG_ERROR,"Id3tag_Set_Field() must be used only for fields containing text.");
             return ID3TE_NONE;
         }
 
@@ -1182,7 +1192,7 @@ gboolean Id3tag_Check_If_File_Is_Corrupted (gchar *filename)
     if ( (file=fopen(filename,"rb"))==NULL )
     {
         gchar *filename_utf8 = filename_to_display(filename);
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
         g_free(filename_utf8);
         return FALSE;
     }
@@ -1211,9 +1221,15 @@ gboolean Id3tag_Check_If_File_Is_Corrupted (gchar *filename)
 
         msg = g_strdup_printf(_("As the following corrupted file: '%s'\nwill cause "
             "an error in id3lib, it will not be processed by the program."),basename_utf8);
-        msgbox = msg_box_new(_("Corrupted file..."),msg,GTK_STOCK_DIALOG_ERROR,BUTTON_CLOSE,0);
-        msg_box_hide_check_button(MSG_BOX(msgbox));
-        msg_box_run(MSG_BOX(msgbox));
+        msgbox = msg_box_new(_("Corrupted file..."),
+                             GTK_WINDOW(MainWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL  | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             msg,
+                             GTK_STOCK_DIALOG_ERROR,
+                             GTK_STOCK_OK, GTK_RESPONSE_OK,
+                             NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
         g_free(msg);
         g_free(basename);
@@ -1252,7 +1268,7 @@ gboolean Id3tag_Check_If_Id3lib_Is_Bugged (void)
     if ( (file=fopen(filename,"w+"))==NULL )
     {
         gchar *filename_utf8 = filename_to_display(filename);
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
         g_free(filename_utf8);
         return FALSE;
     }
diff --git a/src/id3v24_tag.c b/src/id3v24_tag.c
index d1302ca..04da4a8 100644
--- a/src/id3v24_tag.c
+++ b/src/id3v24_tag.c
@@ -143,6 +143,7 @@ gboolean Id3tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
         /* ID3v2 tag found */
         if (FILE_WRITING_ID3V2_WRITE_TAG == 0)
         {
+            // To delete the tag
             update = 1;
         }else
         {
@@ -414,7 +415,7 @@ gboolean Id3tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
                         data = id3_field_getbinarydata(field, &size);
                         if (pic->data)
                             g_free(pic->data);
-                        if ( (pic->data = g_memdup(data, size)) )
+                        if ( data && (pic->data = g_memdup(data, size)) )
                             pic->size = size;
                     }
                     break;
@@ -767,7 +768,6 @@ gboolean Id3tag_Write_File_v24Tag (ET_File *ETFile)
     union id3_field  *field;
     gchar            *string1;
     Picture          *pic;
-    unsigned          i;
     gint error = 0;
     gboolean strip_tags = TRUE;
     guchar genre_value = ID3_INVALID_GENRE;
@@ -786,7 +786,7 @@ gboolean Id3tag_Write_File_v24Tag (ET_File *ETFile)
     {
         struct id3_file *file;
         struct id3_tag *tmptag;
-        unsigned i;
+        unsigned tagsize;
         id3_byte_t *tmpbuf = NULL;
 
         /* Read old v2 tag */
@@ -806,12 +806,12 @@ gboolean Id3tag_Write_File_v24Tag (ET_File *ETFile)
             ID3_TAG_OPTION_UNSYNCHRONISATION);
 
         /* XXX Create new tag and copy all frames*/
-        i = id3_tag_render(tmptag, NULL);
-        if ((i > 10)
-        && (tmpbuf = g_try_malloc(i))
+        tagsize = id3_tag_render(tmptag, NULL);
+        if ((tagsize > 10)
+        && (tmpbuf = g_try_malloc(tagsize))
         && (id3_tag_render(tmptag, tmpbuf) != 0)
         )
-            v2tag = id3_tag_parse(tmpbuf, i);
+            v2tag = id3_tag_parse(tmpbuf, tagsize);
         g_free(tmpbuf);
 
         if (v2tag == NULL)
@@ -827,7 +827,7 @@ gboolean Id3tag_Write_File_v24Tag (ET_File *ETFile)
 
         /* Set padding  XXX */
         if ((v2tag->paddedsize < 1024)
-        || ((v2tag->paddedsize > 4096) && (i < 1024))
+        || ((v2tag->paddedsize > 4096) && (tagsize < 1024))
         )
             v2tag->paddedsize = 1024;
 
@@ -963,26 +963,21 @@ gboolean Id3tag_Write_File_v24Tag (ET_File *ETFile)
     {
         while (pic)
         {
+            gint i;
+
             if ((frame = id3_frame_new("APIC")) == NULL)
                 continue;
 
             id3_tag_attachframe(v2tag, frame);
             for (i = 0; (field = id3_frame_field(frame, i)); i++)
             {
+                Picture_Format format;
+                
                 switch (id3_field_type(field))
                 {
                     case ID3_FIELD_TYPE_LATIN1:
-                        switch (Picture_Format(pic))
-                        {
-                            case PICTURE_FORMAT_JPEG:
-                                id3_field_setlatin1(field, (id3_latin1_t const *)"image/jpeg");
-                                break;
-                            case PICTURE_FORMAT_PNG:
-                                id3_field_setlatin1(field, (id3_latin1_t const *)"image/png");
-                                break;
-                            default:
-                                break;
-                        }
+                        format = Picture_Format_From_Data(pic);
+                        id3_field_setlatin1(field, (id3_latin1_t const *)Picture_Mime_Type_String(format));
                         break;
                     case ID3_FIELD_TYPE_INT8:
                         id3_field_setint(field, pic->type);
@@ -1012,6 +1007,7 @@ gboolean Id3tag_Write_File_v24Tag (ET_File *ETFile)
      *********************************/
     error |= etag_write_tags(filename, v1tag, v2tag, strip_tags);
 
+    // Free data
     if (v1tag)
         id3_tag_delete(v1tag);
     if (v2tag)
@@ -1020,7 +1016,7 @@ gboolean Id3tag_Write_File_v24Tag (ET_File *ETFile)
     if (error == 0)
     {
         basename_utf8 = g_path_get_basename(filename_utf8);
-        Log_Print(_("Updated tag of '%s'"),basename_utf8);
+        Log_Print(LOG_OK,_("Updated tag of '%s'"),basename_utf8);
         g_free(basename_utf8);
     }
 
@@ -1108,7 +1104,7 @@ Id3tag_find_and_create_frame (struct id3_tag *tag, const gchar *name)
  * create new if not found
  */
 static struct id3_frame *
-Id3tag_find_and_create_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;
@@ -1144,9 +1140,10 @@ 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)
+id3taglib_set_field(struct id3_frame *frame,
+                    const gchar *str,
+                    enum id3_field_type type,
+                    int num, int clear, int id3v1)
 {
     union id3_field    *field;
     enum id3_field_type    curtype;
@@ -1311,12 +1308,12 @@ id3taglib_set_field(struct id3_frame *frame, const gchar *str,
 
 
 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)
+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)
 {
     struct id3_frame *ftmp;
 
@@ -1338,7 +1335,10 @@ etag_set_tags(const gchar *str,
 }
 
 static int
-etag_write_tags(const gchar *filename, const struct id3_tag *v1tag, const struct id3_tag *v2tag, gboolean strip_tags)
+etag_write_tags (const gchar *filename, 
+                 const struct id3_tag *v1tag, 
+                 const struct id3_tag *v2tag, 
+                 gboolean strip_tags)
 {
     id3_byte_t *v1buf, *v2buf;
     id3_length_t v1size = 0, v2size = 0;
@@ -1400,38 +1400,42 @@ etag_write_tags(const gchar *filename, const struct id3_tag *v1tag, const struct
     err = 1;
 
     /* Handle Id3v1 tag */
-    if (lseek(fd, -128, SEEK_END) < 0)
+    if ((curpos = lseek(fd, -128, SEEK_END)) < 0)
         goto out;
     if (read(fd, tmp, ID3_TAG_QUERYSIZE) != ID3_TAG_QUERYSIZE)
         goto out;
 
     if ( (tmp[0] == 'T')
-    && (tmp[1] == 'A')
-    && (tmp[2] == 'G')
+    &&   (tmp[1] == 'A')
+    &&   (tmp[2] == 'G')
        )
     {
-        if (lseek(fd, -128, SEEK_END) < 0)
+        if ((curpos = lseek(fd, -128, SEEK_END)) < 0)
+        {
             goto out;
+        }
     }else
-        if (lseek(fd, 0, SEEK_END) < 0)
+        if ((curpos = lseek(fd, 0, SEEK_END)) < 0)
+        {
             goto out;
+        }
 
     /* Search id3v2 tags at the end of the file (before any ID3v1 tag) */
     /* XXX: Unsafe */
-    if (lseek(fd, -ID3_TAG_QUERYSIZE, SEEK_CUR) >= 0)
+    if ((curpos = lseek(fd, -ID3_TAG_QUERYSIZE, SEEK_CUR)) >= 0)
     {
         if (read(fd, tmp, ID3_TAG_QUERYSIZE) != ID3_TAG_QUERYSIZE)
             goto out;
         filev2size = id3_tag_query((id3_byte_t const *)tmp, ID3_TAG_QUERYSIZE);
-        if ((filev2size > 10)
-        && lseek(fd, -filev2size, SEEK_CUR))
+        if ( (filev2size > 10)
+        &&   (curpos = lseek(fd, -filev2size, SEEK_CUR)) )
         {
             if (read(fd, tmp, ID3_TAG_QUERYSIZE) != ID3_TAG_QUERYSIZE)
                 goto out;
             if (id3_tag_query((id3_byte_t const *)tmp, ID3_TAG_QUERYSIZE) != filev2size)
-                lseek(fd, -ID3_TAG_QUERYSIZE - filev2size, SEEK_CUR);
+                curpos = lseek(fd, -ID3_TAG_QUERYSIZE - filev2size, SEEK_CUR);
             else
-                lseek(fd, -ID3_TAG_QUERYSIZE, SEEK_CUR);
+                curpos = lseek(fd, -ID3_TAG_QUERYSIZE, SEEK_CUR);
         }
     }
 
@@ -1447,7 +1451,7 @@ etag_write_tags(const gchar *filename, const struct id3_tag *v1tag, const struct
         goto out;
 
     /* Handle Id3v2 tag */
-    if (lseek(fd, 0, SEEK_SET) < 0)
+    if ((curpos = lseek(fd, 0, SEEK_SET)) < 0)
         goto out;
 
     if (read(fd, tmp, ID3_TAG_QUERYSIZE) != ID3_TAG_QUERYSIZE)
@@ -1461,35 +1465,35 @@ etag_write_tags(const gchar *filename, const struct id3_tag *v1tag, const struct
 
     if (filev2size == v2size)
     {
-        if (lseek(fd, 0, SEEK_SET) < 0)
+        if ((curpos = lseek(fd, 0, SEEK_SET)) < 0)
             goto out;
         if (write(fd, v2buf, v2size) != v2size)
             goto out;
     }else
     {
-    /* XXX */
-    ctxsize = lseek(fd, 0, SEEK_END) - filev2size;
-    if ((ctx = g_try_malloc(ctxsize)) == NULL)
-        goto out;
-    if (lseek(fd, filev2size, SEEK_SET) < 0)
-        goto out;
-    if (read(fd, ctx, ctxsize) != ctxsize)
-        goto out;
-    if (lseek(fd, 0, SEEK_SET) < 0)
-        goto out;
-    if (v2buf)
-        write(fd, v2buf, v2size);
+        /* XXX */
+        ctxsize = lseek(fd, 0, SEEK_END) - filev2size;
+        if ((ctx = g_try_malloc(ctxsize)) == NULL)
+            goto out;
+        if (lseek(fd, filev2size, SEEK_SET) < 0)
+            goto out;
+        if (read(fd, ctx, ctxsize) != ctxsize)
+            goto out;
+        if (lseek(fd, 0, SEEK_SET) < 0)
+            goto out;
+        if (v2buf)
+            write(fd, v2buf, v2size);
 
-    if (write(fd, ctx, ctxsize) != ctxsize)
-    {
-        g_print("OOPS\n");
-        goto out;
-    }
+        if (write(fd, ctx, ctxsize) != ctxsize)
+        {
+            g_print("OOPS\n");
+            goto out;
+        }
 
-    if ((curpos = lseek(fd, 0, SEEK_CUR)) <= 0 )
-        goto out;
-    if ((err = ftruncate(fd, curpos)))
-        goto out;
+        if ((curpos = lseek(fd, 0, SEEK_CUR)) <= 0 )
+            goto out;
+        if ((err = ftruncate(fd, curpos)))
+            goto out;
     }
 
     err = 0;
diff --git a/src/libapetag/apetaglib.c b/src/libapetag/apetaglib.c
index 1f5012e..52fc971 100755..100644
--- a/src/libapetag/apetaglib.c
+++ b/src/libapetag/apetaglib.c
@@ -757,11 +757,11 @@ apetag_read_fp(apetag *mem_cnt, FILE * fp, char *filename, int flag)
             unsigned long flag = ape2long(p + 4);
             unsigned long sizeValue = ape2long(p);
             unsigned long sizeName;
-            char *name = p + 8;
+            char *name = (char *)p + 8;
             char *value;
             
-            sizeName = strlen(p + 8);
-            value = p + sizeName + 8 + 1;
+            sizeName = strlen((char *)p + 8);
+            value = (char *)p + sizeName + 8 + 1;
             if (apeTag2 == 1000 && value[sizeValue - 1] == '\0') {
                 libapetag_maloc_cont(mem_cnt, flag,
                              sizeName, name,
diff --git a/src/libmpg123/README b/src/libmpg123/README
index 1a66a66..1a66a66 100644..100755
--- a/src/libmpg123/README
+++ b/src/libmpg123/README
diff --git a/src/libmpg123/mpg123.c b/src/libmpg123/mpg123.c
index 1def17e..dae9327 100755..100644
--- a/src/libmpg123/mpg123.c
+++ b/src/libmpg123/mpg123.c
@@ -163,7 +163,7 @@ guint mpg123_get_song_time(FILE * file)
 		len = ftell(file) - id3v2size;
 		fseek(file, -128, SEEK_END);
 		fread(tmp, 1, 3, file);
-		if (!strncmp(tmp, "TAG", 3))
+		if (!strncmp((gchar *)tmp, "TAG", 3))
 			len -= 128;
 		return ((guint) ((guint)(len / bpf) * tpf * 1000));
 	}
diff --git a/src/log.c b/src/log.c
index 155d753..1218a30 100644..100755
--- a/src/log.c
+++ b/src/log.c
@@ -29,6 +29,7 @@
 #include "easytag.h"
 #include "bar.h"
 #include "setting.h"
+#include "charset.h"
 
 #ifdef WIN32
 #   include "win32/win32dep.h"
@@ -46,6 +47,7 @@ gint          LogListNbrRows;
 
 enum
 {
+    LOG_PIXBUF,
     LOG_TIME_TEXT,
     LOG_TEXT,
     LOG_ROW_BACKGROUND,
@@ -60,8 +62,9 @@ gchar *LOG_FILE = ".easytag/easytag.log";
 typedef struct _Log_Data Log_Data;
 struct _Log_Data
 {
-    gchar *time;    /* The time of this line of log */
-    gchar *string;  /* The string of the line of log to display */
+    gchar         *time;    /* The time of this line of log */
+    Log_Error_Type error_type;  
+    gchar         *string;  /* The string of the line of log to display */
 };
 
 
@@ -72,6 +75,7 @@ gboolean Log_Popup_Menu_Handler (GtkMenu *menu, GdkEventButton *event);
 void     Log_List_Set_Row_Visible (GtkTreeModel *treeModel, GtkTreeIter *rowIter);
 void     Log_Print_Tmp_List (void);
 gchar   *Log_Format_Date (void);
+gchar   *Log_Get_Stock_Id_From_Error_Type (Log_Error_Type error_type);
 
 
 
@@ -103,6 +107,7 @@ GtkWidget *Create_Log_Area (void)
     logListModel = gtk_list_store_new(LOG_COLUMN_COUNT,
                                       G_TYPE_STRING,
                                       G_TYPE_STRING,
+                                      G_TYPE_STRING,
                                       GDK_TYPE_COLOR,
                                       GDK_TYPE_COLOR);
 
@@ -114,27 +119,31 @@ GtkWidget *Create_Log_Area (void)
     gtk_tree_view_set_reorderable(GTK_TREE_VIEW(LogList), FALSE);
     gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(LogList)),GTK_SELECTION_MULTIPLE);
 
-    renderer = gtk_cell_renderer_text_new();
     column = gtk_tree_view_column_new();
+    gtk_tree_view_append_column(GTK_TREE_VIEW(LogList), column);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+    renderer = gtk_cell_renderer_pixbuf_new();
+    gtk_tree_view_column_pack_start(column, renderer, FALSE);
+    gtk_tree_view_column_set_attributes(column, renderer,
+                                       "stock-id", LOG_PIXBUF,
+                                        NULL);
+
+    renderer = gtk_cell_renderer_text_new();
     gtk_tree_view_column_pack_start(column, renderer, FALSE);
     gtk_tree_view_column_set_attributes(column, renderer,
                                         "text",           LOG_TIME_TEXT,
                                         "background-gdk", LOG_ROW_BACKGROUND,
                                         "foreground-gdk", LOG_ROW_FOREGROUND,
                                         NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(LogList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 
     renderer = gtk_cell_renderer_text_new();
-    column = gtk_tree_view_column_new();
     gtk_tree_view_column_pack_start(column, renderer, FALSE);
     gtk_tree_view_column_set_attributes(column, renderer,
                                         "text",           LOG_TEXT,
                                         "background-gdk", LOG_ROW_BACKGROUND,
                                         "foreground-gdk", LOG_ROW_FOREGROUND,
                                         NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(LogList), column);
-    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 
     // Create Popup Menu on browser album list
     PopupMenu = gtk_ui_manager_get_widget(UIManager, "/LogPopup");
@@ -207,13 +216,15 @@ gchar *Log_Format_Date (void)
 {
     struct tm *tms;
     time_t nowtime;
-    gchar *current_date = g_malloc0(21);
+    gchar *current_date, *current_work = g_malloc0(21);
 
     // Get current time and date
     nowtime = time(NULL);
     tms = localtime(&nowtime);
-    strftime(current_date,20,"%X",tms); // Time without date in current locale
-    //strftime(current_date,20,"%x",ptr); // Date without time in current locale
+    strftime(current_work,20,"%X",tms); // Time without date in current locale
+    //strftime(current_work,20,"%x",ptr); // Date without time in current locale
+    current_date = Try_To_Validate_Utf8_String(current_work);
+    g_free(current_work);
 
     return current_date;
 }
@@ -222,7 +233,7 @@ gchar *Log_Format_Date (void)
 /*
  * Function to use anywhere in the application to send a message to the LogList
  */
-void Log_Print (gchar const *format, ...)
+void Log_Print (Log_Error_Type error_type, gchar const *format, ...)
 {
     va_list args;
     gchar *string;
@@ -253,8 +264,9 @@ void Log_Print (gchar const *format, ...)
         LogListNbrRows++;
         gtk_list_store_append(logListModel, &iter);
         gtk_list_store_set(logListModel, &iter,
-                           LOG_TIME_TEXT, time,
-                           LOG_TEXT, string,
+                           LOG_PIXBUF,         Log_Get_Stock_Id_From_Error_Type(error_type),
+                           LOG_TIME_TEXT,      time,
+                           LOG_TEXT,           string,
                            LOG_ROW_BACKGROUND, NULL,
                            LOG_ROW_FOREGROUND, NULL,
                            -1);
@@ -263,8 +275,9 @@ void Log_Print (gchar const *format, ...)
     }else
     {
         Log_Data *LogData = g_malloc0(sizeof(Log_Data));
-        LogData->time   = Log_Format_Date();
-        LogData->string = string;
+        LogData->time       = Log_Format_Date();
+        LogData->error_type = error_type;
+        LogData->string     = string;
 
         LogPrintTmpList = g_list_append(LogPrintTmpList,LogData);
         //g_print("%s",string);
@@ -314,6 +327,7 @@ void Log_Print_Tmp_List (void)
             LogListNbrRows++;
             gtk_list_store_append(logListModel, &iter);
             gtk_list_store_set(logListModel, &iter,
+                               LOG_PIXBUF,    Log_Get_Stock_Id_From_Error_Type( ((Log_Data *)LogPrintTmpList->data)->error_type ),
                                LOG_TIME_TEXT, ((Log_Data *)LogPrintTmpList->data)->time,
                                LOG_TEXT,      ((Log_Data *)LogPrintTmpList->data)->string,
                                LOG_ROW_BACKGROUND, NULL,
@@ -345,3 +359,26 @@ void Log_Print_Tmp_List (void)
 
 }
 
+
+gchar *Log_Get_Stock_Id_From_Error_Type (Log_Error_Type error_type)
+{
+    gchar *stock_id;
+    
+    switch (error_type)
+    {
+        case LOG_OK:
+            stock_id = GTK_STOCK_APPLY;
+            break;
+        
+        case LOG_ERROR:
+            stock_id = GTK_STOCK_CANCEL;
+            break;
+        
+        case LOG_UNKNOWN:
+        default:
+            stock_id = NULL;
+            break;
+    }
+    
+    return stock_id;
+}
diff --git a/src/log.h b/src/log.h
index 2ec4408..d1bb8db 100644..100755
--- a/src/log.h
+++ b/src/log.h
@@ -27,6 +27,16 @@
 //#include "et_core.h"
 
 
+/*
+ * Types of errors
+ */
+typedef enum
+{                  
+    LOG_UNKNOWN = 0,
+    LOG_OK,
+    LOG_ERROR
+} Log_Error_Type;
+
 
 /**************
  * Prototypes *
@@ -36,7 +46,7 @@ GtkWidget *Create_Log_Area      (void);
 
 void       Log_Clean_Log_List   (void);
 
-void       Log_Print            (gchar const *format, ...);
+void       Log_Print            (Log_Error_Type error_type, gchar const *format, ...);
 
 
 #endif /* __LOG_H__ */
diff --git a/src/misc.c b/src/misc.c
index 9346abe..baf8f04 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -196,93 +196,6 @@ void        File_Selection_Window_For_Directory (GtkWidget *entry);
 /******************************
  * Functions managing pixmaps *
  ******************************/
-/*
- * Buttons creation with pixmap
- */
-
-GtkWidget *Create_Button_With_Pixmap(guint button_type)
-{
-    GtkWidget *Button;
-    GtkWidget *HBox;
-    GtkWidget *Label;
-    GtkWidget *Pixmap;
-
-    gtk_widget_realize(MainWindow);
-    switch (button_type)
-    {
-        case BUTTON_OK:
-            Label = gtk_label_new(_(" OK "));
-            Pixmap = gtk_image_new_from_stock(GTK_STOCK_OK, GTK_ICON_SIZE_BUTTON);
-            break;
-
-        case BUTTON_YES:
-            Label = gtk_label_new(_(" Yes "));
-            Pixmap = gtk_image_new_from_stock(GTK_STOCK_YES, GTK_ICON_SIZE_BUTTON);
-            break;
-
-        case BUTTON_NO:
-            Label = gtk_label_new(_(" No "));
-            Pixmap = gtk_image_new_from_stock(GTK_STOCK_NO, GTK_ICON_SIZE_BUTTON);
-            break;
-
-        case BUTTON_APPLY:
-            Label = gtk_label_new(_(" Apply "));
-            Pixmap = gtk_image_new_from_stock(GTK_STOCK_APPLY, GTK_ICON_SIZE_BUTTON);
-            break;
-
-        case BUTTON_SAVE:
-            Label = gtk_label_new(_(" Save "));
-            Pixmap = gtk_image_new_from_stock(GTK_STOCK_SAVE, GTK_ICON_SIZE_BUTTON);
-            break;
-
-        case BUTTON_CANCEL:
-            Label = gtk_label_new(_(" Cancel "));
-            Pixmap = gtk_image_new_from_stock(GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON);
-            break;
-
-        case BUTTON_CLOSE:
-            Label = gtk_label_new(_(" Close "));
-            Pixmap = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON);
-            break;
-
-       case BUTTON_WRITE:
-            Label = gtk_label_new(_(" Write "));
-            Pixmap = gtk_image_new_from_stock(GTK_STOCK_SAVE_AS, GTK_ICON_SIZE_BUTTON);
-            break;
-
-        case BUTTON_EXECUTE:
-            Label = gtk_label_new(_(" Execute "));
-            Pixmap = gtk_image_new_from_stock(GTK_STOCK_EXECUTE, GTK_ICON_SIZE_BUTTON);
-            break;
-
-        case BUTTON_SEARCH:
-            Label = gtk_label_new(_(" Search "));
-            Pixmap = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_BUTTON);
-            break;
-
-        case BUTTON_BROWSE:
-            Label = gtk_label_new(_(" Browse... "));
-            Pixmap = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
-            break;
-
-        default:
-            Button = gtk_button_new_with_label("Unknown button");
-            return Button;
-            break;
-    }
-
-    Button = gtk_button_new();
-    HBox = gtk_hbox_new(FALSE,0);
-    gtk_container_add(GTK_CONTAINER(Button),HBox);
-    /* Add items in button */
-    gtk_container_add(GTK_CONTAINER(HBox),Pixmap);
-    gtk_container_add(GTK_CONTAINER(HBox),Label);
-    /* Alignment of items */
-    gtk_misc_set_alignment(GTK_MISC(Pixmap),1,0.5);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-
-    return Button;
-}
 
 /*
  * Create an icon into an event box to allow some events (as to display tooltips).
@@ -676,50 +589,52 @@ void Set_Unbusy_Cursor (void)
 /*
  * Add easytag specific icons to GTK stock set
  */
-#include "../pixmaps/scan.xpm"
-#include "../pixmaps/select_all.xpm"
-#include "../pixmaps/invert_selection.xpm"
-#include "../pixmaps/add.xpm"
-#include "../pixmaps/unselect_all.xpm"
-#include "../pixmaps/grab.xpm"
-#include "../pixmaps/mask.xpm"
-//#include "../pixmaps/blackwhite.xpm"
-#include "../pixmaps/forbidden.xpm"
-#include "../pixmaps/read_only.xpm"
-//#include "../pixmaps/sequence_track.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"
+#include "../pixmaps/album.xpm"
 #include "../pixmaps/all_uppercase.xpm"
 #include "../pixmaps/all_downcase.xpm"
+#include "../pixmaps/artist.xpm"
+#include "../pixmaps/artist_album.xpm"
+//#include "../pixmaps/blackwhite.xpm"
 #include "../pixmaps/first_letter_uppercase.xpm"
 #include "../pixmaps/first_letter_uppercase_word.xpm"
+#include "../pixmaps/forbidden.xpm"
+#include "../pixmaps/grab.xpm"
+#include "../pixmaps/invert_selection.xpm"
+#include "../pixmaps/mask.xpm"
+#include "../pixmaps/parent_folder.xpm"
+#include "../pixmaps/read_only.xpm"
+#include "../pixmaps/red_lines.xpm"
+#include "../pixmaps/scan.xpm"
+#include "../pixmaps/select_all.xpm"
+//#include "../pixmaps/sequence_track.xpm"
+#include "../pixmaps/sound.xpm"
+#include "../pixmaps/unselect_all.xpm"
 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");
-    Create_Xpm_Icon_Factory((const char**)grab_xpm, "easytag-grab");
-    Create_Xpm_Icon_Factory((const char**)mask_xpm, "easytag-mask");
-    //Create_Xpm_Icon_Factory((const char**)blackwhite_xpm, "easytag-blackwhite");
-    Create_Xpm_Icon_Factory((const char**)forbidden_xpm, "easytag-forbidden");
-    Create_Xpm_Icon_Factory((const char**)read_only_xpm, "easytag-read-only");
-    //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");
-    Create_Xpm_Icon_Factory((const char**)all_uppercase_xpm, "easytag-all-uppercase");
-    Create_Xpm_Icon_Factory((const char**)all_downcase_xpm, "easytag-all-downcase");
-    Create_Xpm_Icon_Factory((const char**)first_letter_uppercase_xpm, "easytag-first-letter-uppercase");
-    Create_Xpm_Icon_Factory((const char**)first_letter_uppercase_word_xpm, "easytag-first-letter-uppercase-word");
+    Create_Xpm_Icon_Factory((const char**)artist_xpm,               "easytag-artist");
+    Create_Xpm_Icon_Factory((const char**)album_xpm,                "easytag-album");
+    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**)unselect_all_xpm,         "easytag-unselect-all");
+    Create_Xpm_Icon_Factory((const char**)grab_xpm,                 "easytag-grab");
+    Create_Xpm_Icon_Factory((const char**)mask_xpm,                 "easytag-mask");
+    //Create_Xpm_Icon_Factory((const char**)blackwhite_xpm,         "easytag-blackwhite");
+    Create_Xpm_Icon_Factory((const char**)forbidden_xpm,            "easytag-forbidden");
+    Create_Xpm_Icon_Factory((const char**)read_only_xpm,            "easytag-read-only");
+    //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");
+    Create_Xpm_Icon_Factory((const char**)all_uppercase_xpm,        "easytag-all-uppercase");
+    Create_Xpm_Icon_Factory((const char**)all_downcase_xpm,         "easytag-all-downcase");
+    Create_Xpm_Icon_Factory((const char**)first_letter_uppercase_xpm,       "easytag-first-letter-uppercase");
+    Create_Xpm_Icon_Factory((const char**)first_letter_uppercase_word_xpm,  "easytag-first-letter-uppercase-word");
 }
 
 
@@ -754,6 +669,7 @@ void Create_Xpm_Icon_Factory (const char **xpm_data, const char *name_in_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;
@@ -780,10 +696,11 @@ void Create_Png_Icon_Factory (const char *png_file, const char *name_in_factory)
         gtk_icon_factory_add_default(factory);
     }else
     {
-        Log_Print(error->message);
+        Log_Print(LOG_ERROR,error->message);
         g_error_free(error);
     }
 }
+*/
 
 /*
  * Return a widget with a pixmap
@@ -853,12 +770,12 @@ gint Combo_Alphabetic_Sort (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b,
  *************************/
 void File_Selection_Window_For_File (GtkWidget *entry)
 {
-    Open_File_Selection_Window(entry, _("Select directory..."), GTK_FILE_CHOOSER_ACTION_OPEN);
+    Open_File_Selection_Window(entry, _("Select file..."), GTK_FILE_CHOOSER_ACTION_OPEN);
 }
 
 void File_Selection_Window_For_Directory (GtkWidget *entry)
 {
-    Open_File_Selection_Window(entry, _("Select file..."), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+    Open_File_Selection_Window(entry, _("Select directory..."), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
 }
 
 /*
@@ -870,6 +787,7 @@ static void Open_File_Selection_Window (GtkWidget *entry, gchar *title, GtkFileC
     gchar *filename, *filename_utf8;
     GtkWidget *FileSelectionWindow;
     GtkWindow *parent_window = NULL;
+    gint response;
 
     parent_window = (GtkWindow*) gtk_widget_get_toplevel(entry);
     if (!GTK_WIDGET_TOPLEVEL(parent_window))
@@ -880,7 +798,7 @@ static void Open_File_Selection_Window (GtkWidget *entry, gchar *title, GtkFileC
 
     FileSelectionWindow = gtk_file_chooser_dialog_new(title, parent_window, action,
                                                       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                                      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                                      GTK_STOCK_OPEN,   GTK_RESPONSE_ACCEPT,
                                                       NULL);
     // Set initial directory
     tmp = (gchar*) gtk_entry_get_text(GTK_ENTRY(entry));
@@ -890,15 +808,18 @@ static void Open_File_Selection_Window (GtkWidget *entry, gchar *title, GtkFileC
             gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow),tmp);
     }
 
-
-    if (gtk_dialog_run(GTK_DIALOG(FileSelectionWindow)) == GTK_RESPONSE_ACCEPT)
+    response = gtk_dialog_run(GTK_DIALOG(FileSelectionWindow));
+    if (response == GTK_RESPONSE_ACCEPT)
     {
         filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(FileSelectionWindow));
         filename_utf8 = filename_to_display(filename);
         gtk_entry_set_text(GTK_ENTRY(entry),filename_utf8);
-        g_free(filename);
+		g_free(filename);
         g_free(filename_utf8);
+		// Gives the focus to the entry (useful for the button on the main window)
+		gtk_widget_grab_focus(GTK_WIDGET(entry));
     }
+	
     gtk_widget_destroy(FileSelectionWindow);
 }
 
@@ -928,10 +849,15 @@ void Run_Audio_Player_Using_File_List (GList *etfilelist_init)
     // Exit if no program selected...
     if (!AUDIO_FILE_PLAYER || strlen(g_strstrip(AUDIO_FILE_PLAYER))<1)
     {
-        GtkWidget *msgbox = msg_box_new(_("Warning..."),_("No audio player defined!"),GTK_STOCK_DIALOG_WARNING,BUTTON_OK,0);
-        msg_box_hide_check_button(MSG_BOX(msgbox));
-        //gtk_window_set_transient_for(GTK_WINDOW(msgbox),GTK_WINDOW(OptionsWindow));
-        msg_box_run(MSG_BOX(msgbox));
+        GtkWidget *msgbox = msg_box_new(_("Warning..."),
+										GTK_WINDOW(MainWindow),
+                                        NULL,
+			                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+							 			_("No audio player defined!"),
+										GTK_STOCK_DIALOG_WARNING,
+                                        GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                        NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
         
         return;
@@ -940,7 +866,7 @@ void Run_Audio_Player_Using_File_List (GList *etfilelist_init)
     if ( !(program_path = Check_If_Executable_Exists(AUDIO_FILE_PLAYER)) )
     {
         gchar *msg = g_strdup_printf(_("The program '%s' can't be found!"),AUDIO_FILE_PLAYER);
-        Log_Print(msg);
+        Log_Print(LOG_ERROR,msg);
         g_free(msg);
         return;
     }
@@ -985,7 +911,7 @@ void Run_Audio_Player_Using_File_List (GList *etfilelist_init)
                       &siStartupInfo,
                       &piProcessInfo) == FALSE)
     {
-        Log_Print(_("Can't execute %s (error %d)!\n"), AUDIO_FILE_PLAYER, GetLastError());
+        Log_Print(LOG_ERROR,_("Can't execute %s (error %d)!\n"), AUDIO_FILE_PLAYER, GetLastError());
     }
 
     // Free allocated parameters (for each filename)
@@ -1024,13 +950,13 @@ void Run_Audio_Player_Using_File_List (GList *etfilelist_init)
     switch (pid)
     {
         case -1:
-            Log_Print(_("Can't fork another process!\n"));
+            Log_Print(LOG_ERROR,_("Can't fork another process!\n"));
             break;
         case 0:
         {
             if (execvp(argv[0],argv) == -1)
             {
-                Log_Print(_("Can't execute %s (%s)!\n"),argv[0],g_strerror(errno));
+                Log_Print(LOG_ERROR,_("Can't execute %s (%s)!\n"),argv[0],g_strerror(errno));
             }
             g_strfreev(argv_user);
             _exit(1);
@@ -1495,7 +1421,7 @@ void Open_Write_Playlist_Window (void)
     g_signal_connect(G_OBJECT(Button),"clicked", G_CALLBACK(Destroy_Write_Playlist_Window),NULL);
 
     /* Button to Write the playlist */
-    Button = Create_Button_With_Pixmap(BUTTON_WRITE);
+    Button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
     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(Playlist_Write_Button_Pressed),NULL);
@@ -1593,7 +1519,7 @@ void Playlist_Write_Button_Pressed (void)
     FILE  *file;
     gchar *msg;
     GtkWidget *msgbox;
-    gint msgbox_button = 0;
+    gint response = 0;
 
 
     // Check if playlist name was filled
@@ -1694,6 +1620,7 @@ void Playlist_Write_Button_Pressed (void)
     g_free(playlist_basename_utf8);
 
     playlist_name = filename_from_display(playlist_name_utf8);
+    playlist_basename_utf8 = g_path_get_basename(playlist_name_utf8);
 
     // Check if file exists
     if (CONFIRM_WRITE_PLAYLIST)
@@ -1701,35 +1628,59 @@ void Playlist_Write_Button_Pressed (void)
         if ( (file=fopen(playlist_name,"r")) != NULL )
         {
             fclose(file);
-            msg = g_strdup_printf(_("Playlist file '%s' already exists!\nOverwrite?"),playlist_name_utf8);
-            msgbox = msg_box_new(_("Write Playlist..."),msg,GTK_STOCK_DIALOG_QUESTION,BUTTON_NO,BUTTON_YES,0);
-            msg_box_hide_check_button(MSG_BOX(msgbox));
-            msgbox_button = msg_box_run(MSG_BOX(msgbox));
+            msg = g_strdup_printf(_("Playlist file '%s' already exists!\nOverwrite?"),playlist_basename_utf8);
+            msgbox = msg_box_new(_("Write Playlist..."),
+								 GTK_WINDOW(WritePlaylistWindow),
+                                 NULL,
+                             	 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+							 	 msg,
+								 GTK_STOCK_DIALOG_QUESTION,
+                                 GTK_STOCK_NO,    GTK_RESPONSE_NO,
+								 GTK_STOCK_YES,   GTK_RESPONSE_YES,
+                                 NULL);
+            response = gtk_dialog_run(GTK_DIALOG(msgbox));
             gtk_widget_destroy(msgbox);
             g_free(msg);
         }
     }
 
     // Writing playlist if ok
-    if (msgbox_button==0 || msgbox_button==BUTTON_YES )
+    if (response == 0
+    ||  response == GTK_RESPONSE_YES )
     {
         if ( Write_Playlist(playlist_name) == FALSE )
         {
             // Writing fails...
             msg = g_strdup_printf(_("Can't write playlist file '%s'!\n(%s)"),playlist_name_utf8,g_strerror(errno));
-            msgbox = msg_box_new(_("Error..."),msg,GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
-            msg_box_hide_check_button(MSG_BOX(msgbox));
-            msg_box_run(MSG_BOX(msgbox));
+            msgbox = msg_box_new(_("Error..."),
+								 GTK_WINDOW(WritePlaylistWindow),
+                                 NULL,
+	                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+							 	 msg,
+								 GTK_STOCK_DIALOG_ERROR,
+                                 GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                 NULL);
+            gtk_dialog_run(GTK_DIALOG(msgbox));
             gtk_widget_destroy(msgbox);
         }else
         {
             msg = g_strdup_printf(_("Written playlist file '%s'"),playlist_name_utf8);
-            //msgbox = msg_box_new(_("Information..."),msg,GTK_STOCK_DIALOG_INFO,BUTTON_OK,0);
+            /*msgbox = msg_box_new(_("Information..."),
+                                   GTK_WINDOW(WritePlaylistWindow),
+                                   NULL,
+                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+								   msg,
+								   GTK_STOCK_DIALOG_INFO,
+                                   GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                   NULL);
+            gtk_dialog_run(GTK_DIALOG(msgbox));
+            gtk_widget_destroy(msgbox);*/
             Statusbar_Message(msg,TRUE);
         }
         g_free(msg);
     }
     g_free(playlist_name_utf8);
+    g_free(playlist_basename_utf8);
     g_free(playlist_name);
 }
 
@@ -1806,7 +1757,7 @@ gboolean Write_Playlist (gchar *playlist_name)
 
     if ((file = fopen(playlist_name,"wb")) == NULL)
     {
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),playlist_name_utf8,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),playlist_name_utf8,g_strerror(errno));
         g_free(playlist_name_utf8);
         return FALSE;
     }
@@ -2779,12 +2730,12 @@ void Open_Load_Filename_Window (void)
         gtk_entry_set_text(GTK_ENTRY(GTK_BIN(FileToLoadCombo)->child),path);
     // the 'changed' signal is attached below to enable/disable the button to load
     // Button 'browse'
-    Button = Create_Button_With_Pixmap(BUTTON_BROWSE);
+    Button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
     gtk_box_pack_start(GTK_BOX(hbox),Button,FALSE,FALSE,0);
     g_signal_connect_swapped(G_OBJECT(Button),"clicked", G_CALLBACK(File_Selection_Window_For_File), G_OBJECT(GTK_BIN(FileToLoadCombo)->child));
     // Button 'load'
     // the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-    ButtonLoad = Create_Button_With_Icon_And_Label("easytag-add",_(" Load "));
+    ButtonLoad = Create_Button_With_Icon_And_Label(GTK_STOCK_REVERT_TO_SAVED,_(" Load "));
     //ButtonLoad = gtk_button_new_with_label(_(" Load "));
     gtk_box_pack_start(GTK_BOX(hbox),ButtonLoad,FALSE,FALSE,0);
     g_signal_connect_swapped(G_OBJECT(GTK_BIN(FileToLoadCombo)->child),"changed", G_CALLBACK(Button_Load_Set_Sensivity), G_OBJECT(ButtonLoad));
@@ -3165,7 +3116,7 @@ void Load_File_Content (GtkWidget *entry)
 
     if ( (file=fopen(filename,"r"))==0 )
     {
-        Log_Print(_("Can't open file '%s' (%s)"),filename_utf8,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't open file '%s' (%s)"),filename_utf8,g_strerror(errno));
         g_free(filename);
         return;
     }
@@ -3179,13 +3130,14 @@ void Load_File_Content (GtkWidget *entry)
             buffer[strlen(buffer)-1]='\0';
         text = &buffer[0];
 
-        if (g_utf8_validate(text, -1, NULL))
+        /*if (g_utf8_validate(text, -1, NULL))
         {
             valid = g_strdup(buffer);
         } else
         {
             valid = convert_to_utf8(text);
-        }
+        }*/
+        valid = Try_To_Validate_Utf8_String(text);
 
         gtk_list_store_append(LoadFileContentListModel, &iter);
         gtk_list_store_set(LoadFileContentListModel, &iter,
diff --git a/src/misc.h b/src/misc.h
index 2fbadde..2b0c582 100755
--- a/src/misc.h
+++ b/src/misc.h
@@ -56,7 +56,6 @@ GtkWidget *LoadFileRunScanner;
 /*
  * Create Pixmaps, buttons...
  */
-GtkWidget *Create_Button_With_Pixmap         (guint button_type);
 GtkWidget *Create_Pixmap_Icon_With_Event_Box (const gchar *pixmap_name);
 GtkWidget *Create_Button_With_Icon_And_Label (const gchar *pixmap_name, gchar *label);
 GtkWidget *Create_Xpm_Image                  (const char **xpm_name);
diff --git a/src/mp4_header.c b/src/mp4_header.c
index 0ba1449..2648093 100755
--- a/src/mp4_header.c
+++ b/src/mp4_header.c
@@ -208,7 +208,7 @@ gboolean Mp4_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
     {
         gchar *filename_utf8 = filename_to_display(filename);
         //g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,_("MP4 format invalid"));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,_("MP4 format invalid"));
         g_free(filename_utf8);
         return FALSE;
     }
@@ -217,7 +217,7 @@ gboolean Mp4_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
     if( MP4GetNumberOfTracks(file,MP4_AUDIO_TRACK_TYPE,0) < 1 )
     {
         gchar *filename_utf8 = filename_to_display(filename);
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,("Contains no audio track"));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,("Contains no audio track"));
         MP4Close(file);
         g_free(filename_utf8);
         return FALSE;
diff --git a/src/mp4_tag.c b/src/mp4_tag.c
index 86b4cff..ab2bdde 100755..100644
--- a/src/mp4_tag.c
+++ b/src/mp4_tag.c
@@ -84,6 +84,7 @@ gboolean Mp4tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     uint16_t disk, disktotal;
     u_int8_t *coverArt;
     u_int32_t coverSize;
+    Picture *prev_pic = NULL;
 
     if (!filename || !FileTag)
         return FALSE;
@@ -91,7 +92,7 @@ gboolean Mp4tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     if ( (file=fopen(filename,"r"))==NULL )
     {
         gchar *filename_utf8 = filename_to_display(filename);
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
         g_free(filename_utf8);
         return FALSE;
     }
@@ -102,7 +103,7 @@ gboolean Mp4tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     if (mp4file == MP4_INVALID_FILE_HANDLE)
     {
         gchar *filename_utf8 = filename_to_display(filename);
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,_("MP4 format invalid"));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,_("MP4 format invalid"));
         g_free(filename_utf8);
         return FALSE;
     }
@@ -176,7 +177,6 @@ gboolean Mp4tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     MP4GetMetadataTool(mp4file, &FileTag->encoded_by);
 
     /* Unimplemented
-
     Tempo / BPM
     MP4GetMetadataTempo(file, &string)
     */
@@ -184,16 +184,28 @@ gboolean Mp4tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     /***********
      * Picture *
      ***********/
-    // There is only one picture!
+#ifdef NEWMP4
+    // There version can handle multiple pictures!
+    // Version 1.6 of libmp4v2 introduces an index argument for MP4GetMetadataCoverart
+    for (i = 0; (MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize,i )); i++)
+#else
+    // There version handle only one picture!
     if ( MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize ) )
+#endif
     {
-        Picture *pic = Picture_Allocate();
+        Picture *pic;
+        
+        pic = Picture_Allocate();
+        if (!prev_pic)
+            FileTag->picture = pic;
+        else
+            prev_pic->next = pic;
+        prev_pic = pic;
+
         pic->size = coverSize;
         pic->data = coverArt;
         pic->type = PICTURE_TYPE_FRONT_COVER;
         pic->description = NULL;
-
-        FileTag->picture = pic;
     }
 
 
@@ -231,7 +243,7 @@ gboolean Mp4tag_Write_File_Tag (ET_File *ETFile)
     /* Test to know if we can write into the file */
     if ( (file=fopen(filename,"r+"))==NULL )
     {
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
         return FALSE;
     }
     fclose(file);
@@ -240,7 +252,7 @@ gboolean Mp4tag_Write_File_Tag (ET_File *ETFile)
     mp4file = MP4Modify(filename,0,0);
     if (mp4file == MP4_INVALID_FILE_HANDLE)
     {
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,_("MP4 format invalid"));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,_("MP4 format invalid"));
         return FALSE;
     }
 
@@ -405,6 +417,7 @@ gboolean Mp4tag_Write_File_Tag (ET_File *ETFile)
      * Picture *
      ***********/
     {
+        // Can handle only one picture...
         Picture *pic;
 
         //MP4DeleteMetadataCoverArt(mp4file);
diff --git a/src/mpeg_header.c b/src/mpeg_header.c
index 1c9400d..82edd99 100755
--- a/src/mpeg_header.c
+++ b/src/mpeg_header.c
@@ -206,7 +206,7 @@ gboolean Mpeg_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
     }else
     {
         gchar *filename_utf8 = filename_to_display(filename);
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
         g_free(filename_utf8);
         return FALSE;
     }
diff --git a/src/msgbox.c b/src/msgbox.c
index f9a8cb7..82953f9 100644..100755
--- a/src/msgbox.c
+++ b/src/msgbox.c
@@ -32,281 +32,101 @@
 #include "setting.h"
 
 
-static void msg_box_class_init (MsgBoxClass *class);
-static void msg_box_init (MsgBox *mb);
+GtkWidget *msg_box_new (gchar *title, GtkWindow *parent, GtkWidget **check_button, GtkDialogFlags flags, gchar *message, const gchar *icon, ...);
 
-static void msg_box_show (GtkWidget *widget);
-static gint msg_box_delete_event (GtkWidget *widget, GdkEventAny *event);
-static void msg_box_button_clicked (GtkButton *button, gpointer data);
-void        check_button_toggled (GtkCheckButton *checkbutton, gpointer data);
-
-
-static GtkDialogClass *parent_klass = NULL;
-
-
-GType msg_box_get_type(void)
-{
-    static GType mb_type = 0;
-
-    if (!mb_type)
-    {
-        GTypeInfo mb_info =
-        {
-            sizeof(MsgBoxClass),
-            NULL,
-            NULL,
-            (GClassInitFunc) msg_box_class_init,
-            NULL,
-            NULL,
-            sizeof(MsgBox),
-            0,
-            (GInstanceInitFunc) msg_box_init
-        };
-        mb_type = g_type_register_static(GTK_TYPE_DIALOG, "MsgBox", &mb_info, 0);
-    }
-    return mb_type;
-}
-
-
-static void msg_box_button_clicked (GtkButton *button, gpointer data)
-{
-    MsgBox *mb;
-
-    g_return_if_fail( (mb = MSG_BOX(data)) );
-
-    mb->button_clicked = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button),"button_value"));
-
-    if (gtk_main_level()>1)
-        gtk_main_quit();
-}
-
-
-static void msg_box_class_init (MsgBoxClass *class)
-{
-    GtkObjectClass *object_class;
-    GtkWidgetClass *widget_class;
-    GtkDialogClass *dialog_class;
-
-    object_class = (GtkObjectClass*) class;
-    widget_class = (GtkWidgetClass*) class;
-    dialog_class = (GtkDialogClass*) class;
-
-    parent_klass = gtk_type_class(gtk_dialog_get_type());
-
-    object_class->destroy      = msg_box_destroy;
-    widget_class->delete_event = msg_box_delete_event;
-    widget_class->show         = msg_box_show;
-}
-
-
-static void msg_box_init (MsgBox *mb)
-{
-    g_return_if_fail(mb != NULL);
-    g_return_if_fail(IS_MSG_BOX(mb));
-
-    mb->icon                = -1;
-    mb->check_button        = NULL;
-    mb->check_button_state  = 0;
-
-}
 
 
 /*
- * Create a new message box
+ * Create a new message box to display a message and a check button (for some actions).
+ * The first button passed as parameter will have the focus
  */
-GtkWidget *msg_box_new (gchar *title, gchar *message, const gchar *stock_id,
-            /* Put all the buttons to display, and terminate by 0 */
-            ...)
+GtkWidget *msg_box_new (gchar *title, 
+                        GtkWindow *parent,
+                        GtkWidget **check_button, 
+                        GtkDialogFlags flags,
+                        gchar *message,
+                        const gchar *stock_id,
+                        /* Put all the buttons to display, and terminate by 0 */
+                        ...)
 {
-    MsgBox *mb;
+    GtkWidget *dialog;
     GtkWidget *Table;
     GtkWidget *Pixmap;
     GtkWidget *Label;
-    GtkWidget *ButtonBox;
-    GtkWidget *Button = NULL;
-    va_list cursor;
-    gint cursor_value;
-
+    GtkWidget *Button;
+    gboolean first_button = TRUE;
+    va_list args;
+    
 
     g_return_val_if_fail(message!=NULL, NULL);
+    
+    //dialog = GTK_DIALOG(gtk_dialog_new_empty (title, parent, flags));
+    dialog = gtk_dialog_new_with_buttons(title,parent,flags,NULL);
 
-    mb = MSG_BOX(g_object_new(TYPE_MSG_BOX, NULL));
-    //mb->icon = icon;
-    mb->check_button = gtk_check_button_new_with_label(_("Repeat action for the rest of the files")); /* Can save or cancel all files */
-
-    /* Window configuration */
-    gtk_window_set_title(GTK_WINDOW(mb),title);
-    gtk_window_set_transient_for(GTK_WINDOW(mb),GTK_WINDOW(MainWindow));
-    gtk_window_set_modal(GTK_WINDOW(mb),TRUE);
-
+    // Position of the dialog window
     if (MESSAGE_BOX_POSITION_NONE)
-        gtk_window_set_position(GTK_WINDOW(mb),GTK_WIN_POS_NONE);
+        gtk_window_set_position(GTK_WINDOW(dialog),GTK_WIN_POS_NONE);
     else if (MESSAGE_BOX_POSITION_CENTER)
-        gtk_window_set_position(GTK_WINDOW(mb),GTK_WIN_POS_CENTER);
+        gtk_window_set_position(GTK_WINDOW(dialog),GTK_WIN_POS_CENTER);
     else if (MESSAGE_BOX_POSITION_MOUSE)
-        gtk_window_set_position(GTK_WINDOW(mb),GTK_WIN_POS_MOUSE);
+        gtk_window_set_position(GTK_WINDOW(dialog),GTK_WIN_POS_MOUSE);
     else if (MESSAGE_BOX_POSITION_CENTER_ON_PARENT)
-        gtk_window_set_position(GTK_WINDOW(mb),GTK_WIN_POS_CENTER_ON_PARENT);
+        gtk_window_set_position(GTK_WINDOW(dialog),GTK_WIN_POS_CENTER_ON_PARENT);
+    
 
-
-    /* Table to put: the pixmap, the message and the check button */
+    // Table to insert: the pixmap, the message and the check button
     Table = gtk_table_new(2,2,FALSE);
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(mb)->vbox),Table,TRUE,TRUE,0);
+    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),Table,TRUE,TRUE,0);
     gtk_container_set_border_width(GTK_CONTAINER(Table),4);
     gtk_widget_show(Table);
 
-    /* The Pixmap */
+    // The pixmap
     Pixmap = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_DIALOG);
     gtk_table_attach_defaults(GTK_TABLE(Table),Pixmap,0,1,0,1);
     //gtk_table_attach(GTK_TABLE(Table),Pixmap,0,1,0,1,GTK_FILL,GTK_FILL,0,0);
     gtk_misc_set_padding(GTK_MISC(Pixmap),6,6);
     gtk_widget_show(Pixmap);
 
-    /* The Message */
-    Label = gtk_label_new (message);
+    // The message
+    Label = gtk_label_new(message);
     gtk_table_attach_defaults(GTK_TABLE(Table),Label,1,2,0,1);
     gtk_misc_set_padding(GTK_MISC(Label),6,6);
     gtk_label_set_justify(GTK_LABEL(Label),GTK_JUSTIFY_CENTER);
     //gtk_label_set_line_wrap(GTK_LABEL(Label),TRUE);
     gtk_widget_show(Label);
 
-    /* The Check Button */
-    gtk_table_attach_defaults(GTK_TABLE(Table),mb->check_button,0,2,1,2);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mb->check_button),mb->check_button_state);
-    g_signal_connect(G_OBJECT(mb->check_button),"toggled",G_CALLBACK(check_button_toggled),mb);
-    gtk_widget_show(mb->check_button);
-
-
-    /* Buttons */
-    ButtonBox = gtk_hbutton_box_new();
-    gtk_box_set_spacing(GTK_BOX(ButtonBox), 15);
-    gtk_button_box_set_layout(GTK_BUTTON_BOX(ButtonBox), GTK_BUTTONBOX_END);
-    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(mb)->action_area),ButtonBox);
+    // The check button
+    if (check_button)
+    {
+        *check_button = gtk_check_button_new_with_label(_("Repeat action for the rest of the files")); // Can save or cancel all files
+        gtk_table_attach_defaults(GTK_TABLE(Table),*check_button,0,2,1,2);
+    }
 
-    /* Read buttons from variable arguments */
-    va_start(cursor,stock_id);
-    while ( (cursor_value = va_arg(cursor,gint)) != 0 )
+    // Read buttons from variable arguments
+    va_start(args, stock_id);
+    for (;;)
     {
-        Button = Create_Button_With_Pixmap(cursor_value);
-        gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
+        const gchar *button_text = NULL;
+        gint response_id = 0;
+        
+        button_text = va_arg (args, const gchar *);
+        if (button_text == NULL)
+            break;
+        response_id = va_arg (args, gint);
+        if (response_id == 0)
+            break;
+        
+        Button = gtk_dialog_add_button(GTK_DIALOG(dialog),button_text,response_id);
         GTK_WIDGET_SET_FLAGS(Button,GTK_CAN_DEFAULT);
-        g_signal_connect(G_OBJECT(Button),"destroy", G_CALLBACK(gtk_widget_destroyed),&Button);
-        g_signal_connect(G_OBJECT(Button),"clicked", G_CALLBACK(msg_box_button_clicked),mb);
-        g_object_set_data(G_OBJECT(Button),"button_value", GINT_TO_POINTER(cursor_value));
+        
+        // To focus to the first button
+        if (first_button)
+            gtk_widget_grab_default(Button);
+        first_button = FALSE;
     }
-    va_end(cursor);
-    gtk_widget_grab_default(Button);
-    gtk_widget_show_all(ButtonBox);
-
-    return GTK_WIDGET(mb);
-}
-
-
-void msg_box_destroy (GtkObject *object)
-{
-    MsgBox *mb;
-
-    g_return_if_fail( (mb = MSG_BOX(object)) );
-
-    if (mb->check_button)
-        gtk_widget_destroy(mb->check_button);
-
-/* FIXME: causes segfault in some cases (when callin gtk_widget_destroy(msgbox) ) */
-/*    if (GTK_OBJECT_CLASS(parent_klass)->destroy)
- *        (* GTK_OBJECT_CLASS(parent_klass)->destroy) (object);
- */
-}
-
-
-static gint msg_box_delete_event (GtkWidget *widget, GdkEventAny *event)
-{
-    MsgBox *mb;
-
-    g_return_val_if_fail((mb = MSG_BOX(widget)), FALSE);
-
-    /* If the window is closed whitout pressing a button, we return -1 */
-    mb->button_clicked = -1;
-
-    if (gtk_main_level()>1)
-        gtk_main_quit();
-
-    return TRUE;
-}
-
-
-/*
- * "Run" and show the msgbox, and send which button was pressed (or not a button)
- */
-gint msg_box_run (MsgBox *msgbox)
-{
-    MsgBox *mb;
-
-    g_return_val_if_fail((mb = MSG_BOX(msgbox)),0);
-
-    gtk_widget_show(GTK_WIDGET(mb));
-    gtk_main();
-    gtk_widget_hide(GTK_WIDGET(mb));
-    gtk_window_set_modal(GTK_WINDOW(mb),FALSE);
-
-    return (MSG_BOX(mb)->button_clicked);
-}
-
-
-static void msg_box_show (GtkWidget *widget)
-{
-    if (GTK_WIDGET_CLASS(parent_klass)->show)
-        (* (GTK_WIDGET_CLASS(parent_klass)->show))(widget);
-}
-
-
-/*
- * Callback when the check_button is pressed
- */
-void check_button_toggled (GtkCheckButton *checkbutton, gpointer data)
-{
-    MsgBox *mb;
-
-    g_return_if_fail((mb = MSG_BOX(data)));
-
-    mb->check_button_state = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbutton));
-}
-
-
-/*
- * Set the check_button to the 'is_active' state
- */
-void msg_box_check_button_set_active (MsgBox *msgbox, gboolean is_active)
-{
-    MsgBox *mb;
-
-    g_return_if_fail((mb = MSG_BOX(msgbox)));
-
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mb->check_button),is_active);
-    mb->check_button_state = is_active;
-}
-
-
-/*
- * Get state of the check_button
- */
-gboolean msg_box_check_button_get_active (MsgBox *msgbox)
-{
-    MsgBox *mb;
-
-    g_return_val_if_fail((mb = MSG_BOX(msgbox)),FALSE);
-
-    return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mb->check_button));
-}
-
-
-/*
- * Hide the check_button.
- */
-void msg_box_hide_check_button (MsgBox *msgbox)
-{
-    MsgBox *mb;
-
-    g_return_if_fail((mb = MSG_BOX(msgbox)));
-
-    gtk_widget_hide(mb->check_button);
+    va_end(args);
+    
+    gtk_widget_show_all(dialog);
+    
+    return GTK_WIDGET(dialog);
 }
diff --git a/src/msgbox.h b/src/msgbox.h
index 6b5d663..b3dfaf2 100644..100755
--- a/src/msgbox.h
+++ b/src/msgbox.h
@@ -23,44 +23,10 @@
 #define __MSGBOX_H__
 
 
-#include <gtk/gtkdialog.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define TYPE_MSG_BOX            (msg_box_get_type())
-#define MSG_BOX(obj)            (GTK_CHECK_CAST((obj), TYPE_MSG_BOX, MsgBox))
-#define MSG_BOX_CLASS(klass)    (GTK_CHECK_CLASS_CAST((klass), TYPE_MSG_BOX, MsgBoxClass))
-#define IS_MSG_BOX(obj)         (GTK_CHECK_TYPE((obj), TYPE_MSG_BOX))
-#define IS_MSG_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE((klass), TYPE_MSG_BOX))
-
-
-typedef struct _MsgBox      MsgBox;
-typedef struct _MsgBoxClass MsgBoxClass;
-
-struct _MsgBox
-{
-    GtkDialog dialog;
-
-    gint icon;
-
-    /* Check button */
-    GtkWidget *check_button;
-    gint       check_button_state;
-
-    /* To know which button have been pressed */
-    gint button_clicked;
-};
-
-struct _MsgBoxClass
-{
-    GtkDialogClass parent_class;
-};
+#include <gtk/gtk.h>
 
 
+/*
 enum Button_Type 
 {     
     BUTTON_OK       = 1<<0 ,
@@ -83,21 +49,11 @@ enum Message_Type
     MSG_QUESTION    = 1<<2,
     MSG_WARNING     = 1<<3
 };
+*/
 
 
-GType msg_box_get_type(void);
-
-GtkWidget *msg_box_new (gchar *title, gchar *message, const gchar *icon, ...);
-gint       msg_box_run (MsgBox *msgbox);
-void       msg_box_destroy (GtkObject *object);
-void       msg_box_check_button_set_active (MsgBox *msgbox, gboolean is_active);
-gboolean   msg_box_check_button_get_active (MsgBox *msgbox);
-void       msg_box_hide_check_button (MsgBox *msgbox);
+GtkWidget *msg_box_new (gchar *title, GtkWindow *parent, GtkWidget **check_button, GtkDialogFlags flags, gchar *message, const gchar *icon, ...);
 
 
-#ifdef __cplusplus
-};
-#endif /* __cplusplus */
-
 
 #endif /* __MSGBOX_H__ */
diff --git a/src/ogg_header.c b/src/ogg_header.c
index 61d7a76..69634f7 100755
--- a/src/ogg_header.c
+++ b/src/ogg_header.c
@@ -79,7 +79,7 @@ gboolean Ogg_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
 
     if ( (file=fopen(filename,"rb"))==NULL ) // Warning : it is important to open the file in binary mode! (to get header informations under Win32)
     {
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
         g_free(filename_utf8);
         return FALSE;
     }
@@ -97,7 +97,7 @@ gboolean Ogg_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
             bitrate_lower   = vi->bitrate_nominal; // (b/s) Specifies the lower limit in a VBR bitstream.
         }else
         {
-            Log_Print(_("Ogg Vorbis: The specified bitstream does not exist or the "
+            Log_Print(LOG_ERROR,_("Ogg Vorbis: The specified bitstream does not exist or the "
                         "file has been initialized improperly (file: '%s')."),filename_utf8);
         }
 
@@ -109,12 +109,12 @@ gboolean Ogg_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
         /***{
             // Test for displaying comments
             vorbis_comment *vc = ov_comment(&vf,-1);
-            Log_Print(">>> %s",filename_utf8);

-            Log_Print("Nbr comments : %d",vc->comments);

-            Log_Print("Vendor : %s",vc->vendor);

+            Log_Print(LOG_OK,">>> %s",filename_utf8);
+            Log_Print(LOG_OK,"Nbr comments : %d",vc->comments);
+            Log_Print(LOG_OK,"Vendor : %s",vc->vendor);
             char **ptr = vc->user_comments;
-            while(*ptr){

-              Log_Print("> %s",*ptr);

+            while(*ptr){
+              Log_Print(LOG_OK,"> %s",*ptr);
               ++ptr;
             }
         }***/
@@ -128,19 +128,19 @@ gboolean Ogg_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
         switch (ret)
         {
             case OV_EREAD:
-                Log_Print(_("Ogg Vorbis: Read from media returned an error (file: '%s')."),filename_utf8);
+                Log_Print(LOG_ERROR,_("Ogg Vorbis: Read from media returned an error (file: '%s')."),filename_utf8);
                 break;
             case OV_ENOTVORBIS:
-                Log_Print(_("Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."),filename_utf8);
+                Log_Print(LOG_ERROR,_("Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."),filename_utf8);
                 break;
             case OV_EVERSION:
-                Log_Print(_("Ogg Vorbis: Vorbis version mismatch (file: '%s')."),filename_utf8);
+                Log_Print(LOG_ERROR,_("Ogg Vorbis: Vorbis version mismatch (file: '%s')."),filename_utf8);
                 break;
             case OV_EBADHEADER:
-                Log_Print(_("Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."),filename_utf8);
+                Log_Print(LOG_ERROR,_("Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."),filename_utf8);
                 break;
             case OV_EFAULT:
-                Log_Print(_("Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack corruption (file: '%s')."),filename_utf8);
+                Log_Print(LOG_ERROR,_("Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack corruption (file: '%s')."),filename_utf8);
                 break;
             default:
                 break;
@@ -183,7 +183,7 @@ gboolean Speex_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
 
     if ( (file=fopen(filename,"rb"))==NULL ) // Warning : it is important to open the file in binary mode! (to get header informations under Win32)
     {
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
         g_free(filename_utf8);
         return FALSE;
     }
@@ -192,7 +192,7 @@ gboolean Speex_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
     state = vcedit_new_state();    // Allocate memory for 'state'
     if ( vcedit_open(state,file) < 0 )
     {
-        Log_Print(_("ERROR: Failed to open file: '%s' as vorbis (%s)."),filename_utf8,vcedit_error(state));
+        Log_Print(LOG_ERROR,_("ERROR: Failed to open file: '%s' as vorbis (%s)."),filename_utf8,vcedit_error(state));
         fclose(file);
         g_free(filename_utf8);
         vcedit_clear(state);
diff --git a/src/ogg_tag.c b/src/ogg_tag.c
index ce13c48..bf6e365 100755..100644
--- a/src/ogg_tag.c
+++ b/src/ogg_tag.c
@@ -38,6 +38,8 @@
 #include "et_core.h"
 #include "log.h"
 #include "misc.h"
+#include "base64.h"
+#include "picture.h"
 #include "setting.h"
 #include "charset.h"
 
@@ -127,6 +129,7 @@ gboolean Ogg_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     gchar          *string2 = NULL;
     gchar          *filename_utf8 = filename_to_display(filename);
     guint           field_num, i;
+    Picture        *prev_pic = NULL;
 
 
     if (!filename || !FileTag)
@@ -136,7 +139,7 @@ gboolean Ogg_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
 
     if ( (file=fopen(filename,"rb")) == NULL )
     {
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
         g_free(filename_utf8);
         return FALSE;
     }
@@ -160,7 +163,7 @@ gboolean Ogg_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
                 id3v2size = 10 + ( (long)(tmp_id3[3])        | ((long)(tmp_id3[2]) << 7)
                                 | ((long)(tmp_id3[1]) << 14) | ((long)(tmp_id3[0]) << 21) );
                 fseek(file, id3v2size, SEEK_SET);
-                Log_Print(_("Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."),filename_utf8);
+                Log_Print(LOG_ERROR,_("Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."),filename_utf8);
             }else
             {
                 fseek(file, 0L, SEEK_SET);
@@ -178,7 +181,7 @@ gboolean Ogg_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     state = vcedit_new_state();    // Allocate memory for 'state'
     if ( vcedit_open(state,file) < 0 )
     {
-        Log_Print(_("ERROR: Failed to open file: '%s' as vorbis (%s)."),filename_utf8,vcedit_error(state));
+        Log_Print(LOG_ERROR,_("ERROR: Failed to open file: '%s' as vorbis (%s)."),filename_utf8,vcedit_error(state));
         ogg_error_msg = vcedit_error(state);
         fclose(file);
         g_free(filename_utf8);
@@ -471,27 +474,82 @@ gboolean Ogg_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     }
 
 
+    /**************
+     * Picture    *
+     **************/
+    /* Non officials tags used for picture informations:
+     *  - COVERART            : contains the picture data
+     *  - COVERARTTYPE        : cover front, ...
+     *  - COVERARTDESCRIPTION : information set by user
+     *  - COVERARTMIME        : image/jpeg or image/png (written only)
+     */
+    field_num = 0;
+    while ( (string = vorbis_comment_query(vc,"COVERART",field_num++)) != NULL )
+    {
+        gchar *data;
+        gint size;
+        Picture *pic;
+            
+        pic = Picture_Allocate();
+        if (!prev_pic)
+            FileTag->picture = pic;
+        else
+            prev_pic->next = pic;
+        prev_pic = pic;
+
+        pic->data = NULL;
+        
+        // Decode picture data
+        data = g_strdup(string);
+        size = base64_decode(string, data);
+        if ( data && (pic->data = g_memdup(data, size)) )
+            pic->size = size;
+        g_free(data);
+
+        if ( (string = vorbis_comment_query(vc,"COVERARTTYPE",field_num-1)) != NULL )
+        {
+            pic->type = atoi(string);
+        }
+
+        if ( (string = vorbis_comment_query(vc,"COVERARTDESCRIPTION",field_num-1)) != NULL )
+        {
+            pic->description = g_strdup(string);
+        }
+
+        //if ((string = vorbis_comment_query(vc,"COVERTARTMIME",field_num-1)) != NULL )
+        //{
+        //    pic->description = g_strdup(string);
+        //}
+
+    }
+
+
     /***************************
      * Save unsupported fields *
      ***************************/
     for (i=0;i<(guint)vc->comments;i++)
     {
-        if ( strncasecmp(vc->user_comments[i],"TITLE=",       6) != 0
-          && strncasecmp(vc->user_comments[i],"ARTIST=",      7) != 0
-          && strncasecmp(vc->user_comments[i],"ALBUM=",       6) != 0
-          && strncasecmp(vc->user_comments[i],"DISCNUMBER=", 11) != 0
-          && strncasecmp(vc->user_comments[i],"DATE=",        5) != 0
-          && strncasecmp(vc->user_comments[i],"TRACKNUMBER=",12) != 0
-          && strncasecmp(vc->user_comments[i],"TRACKTOTAL=", 11) != 0
-          && strncasecmp(vc->user_comments[i],"GENRE=",       6) != 0
-          && strncasecmp(vc->user_comments[i],"DESCRIPTION=",12) != 0
-          && strncasecmp(vc->user_comments[i],"COMMENT=",     8) != 0
-          && strncasecmp(vc->user_comments[i],"=",            1) != 0
-          && strncasecmp(vc->user_comments[i],"COMPOSER=",    9) != 0
-          && strncasecmp(vc->user_comments[i],"PERFORMER=",  10) != 0
-          && strncasecmp(vc->user_comments[i],"COPYRIGHT=",  10) != 0
-          && strncasecmp(vc->user_comments[i],"LICENSE=",     8) != 0
-          && strncasecmp(vc->user_comments[i],"ENCODED-BY=", 11) != 0 )
+        if ( strncasecmp(vc->user_comments[i],"TITLE=",            6) != 0
+          && strncasecmp(vc->user_comments[i],"ARTIST=",           7) != 0
+          && strncasecmp(vc->user_comments[i],"ALBUM=",            6) != 0
+          && strncasecmp(vc->user_comments[i],"DISCNUMBER=",      11) != 0
+          && strncasecmp(vc->user_comments[i],"DATE=",             5) != 0
+          && strncasecmp(vc->user_comments[i],"TRACKNUMBER=",     12) != 0
+          && strncasecmp(vc->user_comments[i],"TRACKTOTAL=",      11) != 0
+          && strncasecmp(vc->user_comments[i],"GENRE=",            6) != 0
+          && strncasecmp(vc->user_comments[i],"DESCRIPTION=",     12) != 0
+          && strncasecmp(vc->user_comments[i],"COMMENT=",          8) != 0
+          && strncasecmp(vc->user_comments[i],"=",                 1) != 0
+          && strncasecmp(vc->user_comments[i],"COMPOSER=",         9) != 0
+          && strncasecmp(vc->user_comments[i],"PERFORMER=",       10) != 0
+          && strncasecmp(vc->user_comments[i],"COPYRIGHT=",       10) != 0
+          && strncasecmp(vc->user_comments[i],"LICENSE=",          8) != 0
+          && strncasecmp(vc->user_comments[i],"ENCODED-BY=",      11) != 0
+          && strncasecmp(vc->user_comments[i],"COVERART=",         9) != 0
+          && strncasecmp(vc->user_comments[i],"COVERARTTYPE=",       13) != 0
+          && strncasecmp(vc->user_comments[i],"COVERARTMIME=",       13) != 0
+          && strncasecmp(vc->user_comments[i],"COVERARTDESCRIPTION=",20) != 0
+           )
         {
             FileTag->other = g_list_append(FileTag->other,
                                            Try_To_Validate_Utf8_String(vc->user_comments[i]));
@@ -518,6 +576,7 @@ gboolean Ogg_Tag_Write_File_Tag (ET_File *ETFile)
     vorbis_comment *vc;
     gchar          *string;
     GList          *list;
+    Picture        *pic;
 
     if (!ETFile || !ETFile->FileTag)
         return FALSE;
@@ -530,7 +589,7 @@ gboolean Ogg_Tag_Write_File_Tag (ET_File *ETFile)
     /* Test to know if we can write into the file */
     if ( (file_in=fopen(filename,"rb"))==NULL )
     {
-        Log_Print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
         return FALSE;
     }
 
@@ -570,7 +629,7 @@ gboolean Ogg_Tag_Write_File_Tag (ET_File *ETFile)
     state = vcedit_new_state();    // Allocate memory for 'state'
     if ( vcedit_open(state,file_in) < 0 )
     {
-        Log_Print(_("ERROR: Failed to open file: '%s' as vorbis (%s)."),filename_utf8,vcedit_error(state));
+        Log_Print(LOG_ERROR,_("ERROR: Failed to open file: '%s' as vorbis (%s)."),filename_utf8,vcedit_error(state));
         ogg_error_msg = vcedit_error(state);
         fclose(file_in);
         vcedit_clear(state);
@@ -732,6 +791,48 @@ gboolean Ogg_Tag_Write_File_Tag (ET_File *ETFile)
         vorbis_comment_add(vc,string);
         g_free(string);
     }
+    
+    
+    /***********
+     * Picture *
+     ***********/
+    pic = FileTag->picture;
+    while (pic)
+    {
+        if (pic->data)
+        {
+            gchar *data_encoded = NULL;
+            gint size;
+            Picture_Format format = Picture_Format_From_Data(pic);
+
+            string = g_strdup_printf("COVERARTMIME=%s",Picture_Mime_Type_String(format));
+            vorbis_comment_add(vc,string);
+            g_free(string);
+        
+            if (pic->type)
+            {
+                string = g_strdup_printf("COVERARTTYPE=%d",pic->type);
+                vorbis_comment_add(vc,string);
+                g_free(string);
+            }
+
+            if (pic->description)
+            {
+                string = g_strdup_printf("COVERARTDESCRIPTION=%s",pic->description);
+                vorbis_comment_add(vc,string);
+                g_free(string);
+            }
+
+            size = base64_encode(pic->data, pic->size, &data_encoded);
+            string = g_strdup_printf("COVERART=%s",data_encoded);
+            vorbis_comment_add(vc,string);
+            g_free(data_encoded);
+            g_free(string);
+        }
+
+        pic = pic->next;
+    }
+
 
 
     /**************************
@@ -749,14 +850,14 @@ gboolean Ogg_Tag_Write_File_Tag (ET_File *ETFile)
     if ( Ogg_Tag_Write_File(file_in,filename,state) == FALSE )
     {
         ogg_error_msg = vcedit_error(state);
-        Log_Print(_("ERROR: Failed to write comments to file '%s' (%s)."),filename_utf8,ogg_error_msg == NULL ? "" : ogg_error_msg);
+        Log_Print(LOG_ERROR,_("ERROR: Failed to write comments to file '%s' (%s)."),filename_utf8,ogg_error_msg == NULL ? "" : ogg_error_msg);
 
         vcedit_clear(state);
         return FALSE;
     }else
     {
         basename_utf8 = g_path_get_basename(filename_utf8);
-        Log_Print(_("Written tag of '%s'"),basename_utf8);
+        Log_Print(LOG_OK,_("Written tag of '%s'"),basename_utf8);
 
         vcedit_clear(state);
     }
diff --git a/src/picture.c b/src/picture.c
index 4f9edae..6ccfd14 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -66,12 +66,12 @@ void Picture_Properties_Button_Clicked  (GObject *object);
 void Picture_Save_Button_Clicked        (GObject *object);
 void Picture_Clear_Button_Clicked       (GObject *object);
 
-gint Picture_Format (Picture *pic);
-const gchar *Picture_Format_String (gint format);
-const gchar *Picture_Type_String   (gint type);
-gchar *Picture_Info (Picture *pic);
-void PictureEntry_Clear  (void);
-void PictureEntry_Update (Picture *pic, gint select);
+Picture_Format Picture_Format_From_Data (Picture *pic);
+const gchar   *Picture_Format_String    (Picture_Format format);
+const gchar   *Picture_Type_String      (Picture_Type type);
+gchar         *Picture_Info             (Picture *pic);
+void           PictureEntry_Clear       (void);
+void           PictureEntry_Update      (Picture *pic, gboolean select_it);
 
 Picture *Picture_Allocate (void);
 Picture *Picture_Copy_One (const Picture *pic);
@@ -126,7 +126,7 @@ void Tag_Area_Picture_Drag_Data (GtkWidget *widget, GdkDragContext *dc,
             /*pic = Picture_Load_File_Data(filename);
             g_free(filename);
             if (pic)
-                PictureEntry_Update(pic, 1);*/
+                PictureEntry_Update(pic, TRUE);*/
         }
         uri++;
     }
@@ -221,6 +221,7 @@ void Picture_Load_Filename (gchar *filename, gpointer user_data)
         // Behaviour following the tag type...
         switch (ETCore->ETFileDisplayed->ETFileDescription->TagType)
         {
+            // Only one picture supported
             case MP4_TAG:
             {
                 pic->type = PICTURE_TYPE_FRONT_COVER;
@@ -255,7 +256,7 @@ void Picture_Load_Filename (gchar *filename, gpointer user_data)
             }
         }
 
-        PictureEntry_Update(pic, 1);
+        PictureEntry_Update(pic, TRUE);
 
         // FIXME: Call Picture_Free(pic) here? It seems PictureEntry_Update makes copies of pic.
         //Picture_Free(pic);
@@ -271,7 +272,7 @@ void Picture_Load_Filename (gchar *filename, gpointer user_data)
 }
 
 /*
- * To add an image in the list -> call a FileSelectionWindow
+ * To add a picture in the list -> call a FileSelectionWindow
  */
 void Picture_Add_Button_Clicked (GObject *object)
 {
@@ -279,6 +280,7 @@ void Picture_Add_Button_Clicked (GObject *object)
     GtkFileFilter *filter;
     GtkWindow *parent_window = NULL;
     static gchar *init_dir = NULL;
+    gint response;
 
     if (!PictureEntryView) return;
 
@@ -294,7 +296,7 @@ void Picture_Add_Button_Clicked (GObject *object)
                                                       parent_window,
                                                       GTK_FILE_CHOOSER_ACTION_OPEN,
                                                       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                                      GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+                                                      GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
                                                       NULL);
 
     // Add files filters
@@ -355,7 +357,8 @@ void Picture_Add_Button_Clicked (GObject *object)
     if (init_dir)
         gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow),init_dir);
 
-    if (gtk_dialog_run(GTK_DIALOG(FileSelectionWindow)) == GTK_RESPONSE_OK)
+    response = gtk_dialog_run(GTK_DIALOG(FileSelectionWindow));
+    if (response == GTK_RESPONSE_OK)
     {
         GtkTreeSelection *selection;
         GSList *list;
@@ -375,6 +378,9 @@ void Picture_Add_Button_Clicked (GObject *object)
 }
 
 
+/*
+ * Open the window to select and type the picture properties
+ */
 void Picture_Properties_Button_Clicked (GObject *object)
 {
     GtkWidget *ScrollWindowPictureTypes, *PictureTypesWindow;
@@ -387,32 +393,9 @@ void Picture_Properties_Button_Clicked (GObject *object)
     GtkTreeModel *model;
     GtkWindow *parent_window = NULL;
     GList *selection_list = NULL;
-    guint i;
     gint selection_nbr, selection_i = 1;
-    gint picture_types[] =
-        {
-            PICTURE_TYPE_OTHER,
-            PICTURE_TYPE_FILE_ICON,
-            PICTURE_TYPE_OTHER_FILE_ICON,
-            PICTURE_TYPE_FRONT_COVER,
-            PICTURE_TYPE_BACK_COVER,
-            PICTURE_TYPE_LEAFLET_PAGE,
-            PICTURE_TYPE_MEDIA,
-            PICTURE_TYPE_LEAD_ARTIST_LEAD_PERFORMER_SOLOIST,
-            PICTURE_TYPE_ARTIST_PERFORMER,
-            PICTURE_TYPE_CONDUCTOR,
-            PICTURE_TYPE_BAND_ORCHESTRA,
-            PICTURE_TYPE_COMPOSER,
-            PICTURE_TYPE_LYRICIST_TEXT_WRITER,
-            PICTURE_TYPE_RECORDING_LOCATION,
-            PICTURE_TYPE_DURING_RECORDING,
-            PICTURE_TYPE_DURING_PERFORMANCE,
-            PICTURE_TYPE_MOVIDE_VIDEO_SCREEN_CAPTURE,
-            PICTURE_TYPE_A_BRIGHT_COLOURED_FISH,
-            PICTURE_TYPE_ILLUSTRATION,
-            PICTURE_TYPE_BAND_ARTIST_LOGOTYPE,
-            PICTURE_TYPE_PUBLISHER_STUDIO_LOGOTYPE
-        };
+    gint response;
+    Picture_Type pic_type;
 
 
     if (!PictureEntryView) return;
@@ -447,7 +430,7 @@ void Picture_Properties_Button_Clicked (GObject *object)
                                                          parent_window,
                                                          GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                                          GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-                                                         GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                                         GTK_STOCK_OK,     GTK_RESPONSE_OK,
                                                          NULL);
         g_free(title);
 
@@ -502,17 +485,17 @@ void Picture_Properties_Button_Clicked (GObject *object)
             default:
             {
                 // Load pictures types
-                for (i = 0; i < sizeof(picture_types)/sizeof(picture_types[0]); i++)
+                for (pic_type = PICTURE_TYPE_OTHER; pic_type < PICTURE_TYPE_UNDEFINED; pic_type++)
                 {
                     GtkTreeIter itertype;
 
                     gtk_list_store_append(store, &itertype);
                     gtk_list_store_set(store, &itertype,
-                                       PICTURE_TYPE_COLUMN_TEXT, _(Picture_Type_String(picture_types[i])),
-                                       PICTURE_TYPE_COLUMN_TYPE_CODE, picture_types[i],
+                                       PICTURE_TYPE_COLUMN_TEXT,      _(Picture_Type_String(pic_type)),
+                                       PICTURE_TYPE_COLUMN_TYPE_CODE, pic_type,
                                        -1);
                     // Line to select by default
-                    if (pic->type == picture_types[i])
+                    if (pic->type == pic_type)
                         type_iter_to_select = itertype;
                 }
                 break;
@@ -528,7 +511,7 @@ void Picture_Properties_Button_Clicked (GObject *object)
         gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(type), rowPath, NULL, FALSE, 0, 0);
         gtk_tree_path_free(rowPath);
 
-        // Description
+        // Description of the picture
         label = gtk_label_new(_("Picture Description:"));
         gtk_box_pack_start(GTK_BOX(GTK_DIALOG(PictureTypesWindow)->vbox),label,FALSE,FALSE,4);
 
@@ -537,7 +520,7 @@ void Picture_Properties_Button_Clicked (GObject *object)
         gtk_box_pack_start(GTK_BOX(GTK_DIALOG(PictureTypesWindow)->vbox),desc,FALSE,FALSE,0);
         if (pic->description)
         {
-            gchar *tmp = ET_Utf8_Validate_Full_String(pic->description);
+            gchar *tmp = Try_To_Validate_Utf8_String(pic->description);
             gtk_entry_set_text(GTK_ENTRY(desc), tmp);
             g_free(tmp);
         }
@@ -561,7 +544,8 @@ void Picture_Properties_Button_Clicked (GObject *object)
 
         gtk_widget_show_all(PictureTypesWindow);
 
-        if (gtk_dialog_run(GTK_DIALOG(PictureTypesWindow)) == GTK_RESPONSE_OK)
+        response = gtk_dialog_run(GTK_DIALOG(PictureTypesWindow));
+        if (response == GTK_RESPONSE_OK)
         {
             GtkTreeModel *modeltype;
             GtkTreeIter itertype;
@@ -640,6 +624,7 @@ void Picture_Save_Button_Clicked (GObject *object)
         Picture *pic;
         gchar *title;
         gboolean valid;
+        gint response;
 
         // Get corresponding picture
         valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &iter, path);
@@ -651,7 +636,7 @@ void Picture_Save_Button_Clicked (GObject *object)
                                                           parent_window,
                                                           GTK_FILE_CHOOSER_ACTION_SAVE,
                                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                                          GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+                                                          GTK_STOCK_SAVE,   GTK_RESPONSE_OK,
                                                           NULL);
         g_free(title);
 
@@ -692,7 +677,7 @@ void Picture_Save_Button_Clicked (GObject *object)
         }else
         {
             gchar *image_name = NULL;
-            switch (Picture_Format(pic))
+            switch (Picture_Format_From_Data(pic))
             {
                 case PICTURE_FORMAT_JPEG :
                     image_name = g_strdup("image_name.jpg");
@@ -708,7 +693,8 @@ void Picture_Save_Button_Clicked (GObject *object)
             g_free(image_name);
         }
 
-        if (gtk_dialog_run(GTK_DIALOG(FileSelectionWindow)) == GTK_RESPONSE_OK)
+        response = gtk_dialog_run(GTK_DIALOG(FileSelectionWindow));
+        if (response == GTK_RESPONSE_OK)
         {
             FILE *file;
             gchar *filename, *filename_utf8;
@@ -725,20 +711,25 @@ void Picture_Save_Button_Clicked (GObject *object)
             {
                 gchar *msg;
                 GtkWidget *msgbox;
-                gint button;
 
                 fclose(file);
 
                 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..."),
+                                     GTK_WINDOW(MainWindow),
+                                     NULL,
+                                     GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                     msg,
+                                     GTK_STOCK_DIALOG_QUESTION,
+                                     GTK_STOCK_NO,  GTK_RESPONSE_NO,
+									 GTK_STOCK_YES, GTK_RESPONSE_YES,
+                                     NULL);
                 g_free(msg);
-                msg_box_hide_check_button(MSG_BOX(msgbox));
-                button = msg_box_run(MSG_BOX(msgbox));
+                response = gtk_dialog_run(GTK_DIALOG(msgbox));
                 gtk_widget_destroy(msgbox);
 
-                if (button == BUTTON_YES)
+                if (response == GTK_RESPONSE_YES)
                 {
                     Picture_Save_File_Data(pic, filename_utf8);
                 }
@@ -757,13 +748,15 @@ void Picture_Save_Button_Clicked (GObject *object)
 
 
 /* FIXME: Possibly use gnome_vfs_get_mime_type_for_buffer. */
-gint Picture_Format (Picture *pic)
+Picture_Format Picture_Format_From_Data (Picture *pic)
 {
+    // JPEG : "\xff\xd8"
     if (pic->data && pic->size > 2
     &&  pic->data[0] == 0xff
     &&  pic->data[1] == 0xd8)
         return PICTURE_FORMAT_JPEG;
 
+    // PNG : "\x89PNG\x0d\x0a\x1a\x0a"
     if (pic->data && pic->size > 8
     &&  pic->data[0] == 0x89
     &&  pic->data[1] == 0x50
@@ -774,11 +767,35 @@ gint Picture_Format (Picture *pic)
     &&  pic->data[6] == 0x1a
     &&  pic->data[7] == 0x0a)
         return PICTURE_FORMAT_PNG;
-
+    
+    /*// GIF : "GIF87a"
+    if (pic->data && pic->size > 6
+    &&  pic->data[0] == 0x47
+    &&  pic->data[1] == 0x49
+    &&  pic->data[2] == 0x46
+    &&  pic->data[3] == 0x38
+    &&  pic->data[4] == 0x37
+    &&  pic->data[5] == 0x61)
+        return PICTURE_FORMAT_GIF;*/
+    
     return PICTURE_FORMAT_UNKNOWN;
 }
 
-const gchar *Picture_Format_String (gint format)
+const gchar *Picture_Mime_Type_String (Picture_Format format)
+{
+    switch (format)
+    {
+        case PICTURE_FORMAT_JPEG:
+            return "image/jpeg";
+        case PICTURE_FORMAT_PNG:
+            return "image/png";
+        default:
+            return NULL;
+    }
+}
+
+
+const gchar *Picture_Format_String (Picture_Format format)
 {
     switch (format)
     {
@@ -791,7 +808,7 @@ const gchar *Picture_Format_String (gint format)
     }
 }
 
-const gchar *Picture_Type_String (gint type)
+const gchar *Picture_Type_String (Picture_Type type)
 {
     switch (type)
     {
@@ -837,6 +854,8 @@ const gchar *Picture_Type_String (gint type)
             return _("Band/Artist logotype");
         case PICTURE_TYPE_PUBLISHER_STUDIO_LOGOTYPE:
             return _("Publisher/studio logotype");
+        
+        case PICTURE_TYPE_UNDEFINED:
         default:
             return _("Unknown picture type");
     }
@@ -847,7 +866,7 @@ gchar *Picture_Info (Picture *pic)
     gchar *format, *desc, *type, *r, *size_str;
     GString *s;
 
-    format = (gchar *)Picture_Format_String(Picture_Format(pic));
+    format = (gchar *)Picture_Format_String(Picture_Format_From_Data(pic));
 
     if (pic->description)
         desc = pic->description;
@@ -883,7 +902,7 @@ gchar *Picture_Info (Picture *pic)
             break;
         }
     }
-    r = ET_Utf8_Validate_Full_String(s->str);
+    r = Try_To_Validate_Utf8_String(s->str);
     g_string_free(s, TRUE); // TRUE to free also 's->str'!
     g_free(size_str);
 
@@ -912,10 +931,11 @@ void PictureEntry_Clear (void)
         gtk_list_store_clear(picture_store);
 }
 
-void PictureEntry_Update (Picture *pic, gint select)
+void PictureEntry_Update (Picture *pic, gboolean select_it)
 {
     GdkPixbufLoader *loader = 0;
-
+    GError *error = NULL;
+    
     if (!pic || !PictureEntryView) return;
 
     if (!pic->data)
@@ -927,11 +947,17 @@ void PictureEntry_Update (Picture *pic, gint select)
     loader = gdk_pixbuf_loader_new();
     if (loader)
     {
-        if (gdk_pixbuf_loader_write(loader, pic->data, pic->size, 0))
+        if (gdk_pixbuf_loader_write(loader, pic->data, pic->size, &error))
         {
             GtkTreeSelection *selection;
             GdkPixbuf *pixbuf;
 
+            if (!gdk_pixbuf_loader_close(loader, &error))
+            {
+                Log_Print(LOG_ERROR,_("Error with 'loader_close': %s"), error->message);
+                g_error_free(error);
+            }
+
             selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(PictureEntryView));
 
             pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
@@ -944,9 +970,12 @@ void PictureEntry_Update (Picture *pic, gint select)
                 gint scaled_pixbuf_height;
                 gchar *pic_info;
 
+                g_object_ref(pixbuf);
+                g_object_unref(loader);
+                
                 // Keep aspect ratio of the picture
-                pic->width  = gdk_pixbuf_get_width (pixbuf);
-                pic->height = gdk_pixbuf_get_height (pixbuf);
+                pic->width  = gdk_pixbuf_get_width(pixbuf);
+                pic->height = gdk_pixbuf_get_height(pixbuf);
                 if (pic->width > pic->height)
                 {
                     scaled_pixbuf_width  = 96;
@@ -967,37 +996,47 @@ void PictureEntry_Update (Picture *pic, gint select)
                 gtk_list_store_append(picture_store, &iter1);
                 pic_info = Picture_Info(pic);
                 gtk_list_store_set(picture_store, &iter1,
-                                   PICTURE_COLUMN_PIC, scaled_pixbuf,
+                                   PICTURE_COLUMN_PIC,  scaled_pixbuf,
                                    PICTURE_COLUMN_TEXT, pic_info,
                                    PICTURE_COLUMN_DATA, Picture_Copy_One(pic),
                                    -1);
                 g_free(pic_info);
 
-                if (select)
+                if (select_it)
                     gtk_tree_selection_select_iter(selection, &iter1);
                 gdk_pixbuf_unref(scaled_pixbuf);
             }else
             {
                 GtkWidget *msgbox = NULL;
                 gchar *msg = NULL;
-
+                
+                g_object_unref(loader);
+                
                 msg = g_strdup(_("Can't display the picture, as not enough data "
                     "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);
-                msg_box_hide_check_button(MSG_BOX(msgbox));
+                Log_Print(LOG_ERROR,"%s",msg);
+                msgbox = msg_box_new(_("Loading Picture File..."),
+                                     GTK_WINDOW(MainWindow),
+                                     NULL,
+                                     GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                     msg,
+                                     GTK_STOCK_DIALOG_ERROR,
+                                     GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                     NULL);
                 g_free(msg);
-                msg_box_run(MSG_BOX(msgbox));
+                gtk_dialog_run(GTK_DIALOG(msgbox));
                 gtk_widget_destroy(msgbox);
             }
+        }else
+        {
+            Log_Print(LOG_ERROR,_("Error with 'loader_write': %s"), error->message);
+            g_error_free(error);
         }
     }
-    gdk_pixbuf_loader_close(loader, 0);
 
     // Do also for next picture
     if (pic->next)
-        PictureEntry_Update(pic->next, select);
+        PictureEntry_Update(pic->next, select_it);
 
     return;
 }
@@ -1080,10 +1119,16 @@ Picture *Picture_Load_File_Data (const gchar *filename)
         filename_utf8 = filename_to_display(filename);
         msg = g_strdup_printf(_("Can't open file :\n'%s'!\n(%s)"),
                                 filename_utf8,g_strerror(errno));
-        msgbox = msg_box_new(_("Error..."),msg,GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
+        msgbox = msg_box_new(_("Error..."),
+                             GTK_WINDOW(MainWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             msg,
+                             GTK_STOCK_DIALOG_ERROR,
+                             GTK_STOCK_OK, GTK_RESPONSE_OK,
+                             NULL);
         g_free(msg);
-        msg_box_hide_check_button(MSG_BOX(msgbox));
-        msg_box_run(MSG_BOX(msgbox));
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
 
         Statusbar_Message(_("Picture file not loaded..."),TRUE);
diff --git a/src/picture.h b/src/picture.h
index eda3af4..cc8ee2e 100755..100644
--- a/src/picture.h
+++ b/src/picture.h
@@ -42,9 +42,10 @@ struct _Picture
     Picture *next;
 };*/
 
-enum // Picture types
+typedef enum // Picture types
 {
-    PICTURE_TYPE_OTHER,
+    // Same values for FLAC, see: http://flac.sourceforge.net/api/group__flac__format.html#ga113
+    PICTURE_TYPE_OTHER = 0,
     PICTURE_TYPE_FILE_ICON,
     PICTURE_TYPE_OTHER_FILE_ICON,
     PICTURE_TYPE_FRONT_COVER,
@@ -64,15 +65,17 @@ enum // Picture types
     PICTURE_TYPE_A_BRIGHT_COLOURED_FISH,
     PICTURE_TYPE_ILLUSTRATION,
     PICTURE_TYPE_BAND_ARTIST_LOGOTYPE,
-    PICTURE_TYPE_PUBLISHER_STUDIO_LOGOTYPE
-};
+    PICTURE_TYPE_PUBLISHER_STUDIO_LOGOTYPE,
+    
+    PICTURE_TYPE_UNDEFINED
+} Picture_Type;
 
-enum
+typedef enum
 {
     PICTURE_FORMAT_JPEG,
     PICTURE_FORMAT_PNG,
     PICTURE_FORMAT_UNKNOWN
-};
+} Picture_Format;
 
 enum // Columns for PictureEntryView
 {
@@ -110,13 +113,14 @@ void Picture_Save_Button_Clicked        (GObject *object);
 void Picture_Clear_Button_Clicked       (GObject *object);
 
 void PictureEntry_Clear  (void);
-void PictureEntry_Update (Picture *pic, gint select);
-
-Picture *Picture_Allocate (void);
-Picture *Picture_Copy_One (const Picture *pic);
-Picture *Picture_Copy (const Picture *pic);
-void     Picture_Free (Picture *pic);
-gint     Picture_Format (Picture *pic);
+void PictureEntry_Update (Picture *pic, gboolean select_it);
+
+Picture       *Picture_Allocate         (void);
+Picture       *Picture_Copy_One         (const Picture *pic);
+Picture       *Picture_Copy             (const Picture *pic);
+void           Picture_Free             (Picture *pic);
+Picture_Format Picture_Format_From_Data (Picture *pic);
+const gchar   *Picture_Mime_Type_String (Picture_Format format);
 
 gboolean Picture_Entry_View_Button_Pressed (GtkTreeView *treeview, GdkEventButton *event, gpointer data);
 gboolean Picture_Entry_View_Key_Pressed    (GtkTreeView *treeview, GdkEvent *event, gpointer data);
diff --git a/src/prefs.c b/src/prefs.c
index 7e862d9..8ca00fb 100644..100755
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -191,7 +191,7 @@ void Open_OptionsWindow (void)
     g_free(path_utf8);
 
     // Button browse
-    Button = Create_Button_With_Pixmap(BUTTON_BROWSE);
+    Button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
     gtk_box_pack_start(GTK_BOX(HBox),Button,FALSE,FALSE,0);
     g_signal_connect_swapped(G_OBJECT(Button),"clicked",
                              G_CALLBACK(File_Selection_Window_For_Directory),G_OBJECT(GTK_BIN(DefaultPathToMp3)->child));
@@ -402,7 +402,7 @@ void Open_OptionsWindow (void)
     g_free(program_path);
 
     // Button browse
-    Button = Create_Button_With_Pixmap(BUTTON_BROWSE);
+    Button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
     gtk_box_pack_start(GTK_BOX(hbox),Button,FALSE,FALSE,0);
     g_signal_connect_swapped(G_OBJECT(Button),"clicked",
         G_CALLBACK(File_Selection_Window_For_File), G_OBJECT(GTK_BIN(FilePlayerCombo)->child));
@@ -819,9 +819,13 @@ void Open_OptionsWindow (void)
     gtk_table_attach(GTK_TABLE(Table),LabelAdditionalId3v2IconvOptions,2,5,5,6,GTK_FILL,GTK_FILL,0,0);
     gtk_misc_set_alignment(GTK_MISC(LabelAdditionalId3v2IconvOptions),0,0.5);
 
-    FileWritingId3v2IconvOptionsNo = gtk_radio_button_new_with_label(NULL, _("No"));
+    FileWritingId3v2IconvOptionsNo = gtk_radio_button_new_with_label(NULL,
+        _("No"));
     gtk_table_attach(GTK_TABLE(Table),FileWritingId3v2IconvOptionsNo,2,3,6,7,GTK_FILL,GTK_FILL,0,0);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(FileWritingId3v2IconvOptionsNo),FILE_WRITING_ID3V2_ICONV_OPTIONS_NO);
+    gtk_tooltips_set_tip(Tips,FileWritingId3v2IconvOptionsNo,_("With this option, when "
+        "a character cannot be represented in the target character set, it isn't changed. "
+        "But note that an error message will be displayed for information."),NULL);
     FileWritingId3v2IconvOptionsTranslit = gtk_radio_button_new_with_label(
         gtk_radio_button_get_group(GTK_RADIO_BUTTON(FileWritingId3v2IconvOptionsNo)),
         _("//TRANSLIT"));
@@ -888,6 +892,9 @@ void Open_OptionsWindow (void)
         _("No"));
     gtk_table_attach(GTK_TABLE(Table),FileWritingId3v1IconvOptionsNo,1,2,4,5,GTK_FILL,GTK_FILL,0,0);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(FileWritingId3v1IconvOptionsNo),FILE_WRITING_ID3V1_ICONV_OPTIONS_NO);
+    gtk_tooltips_set_tip(Tips,FileWritingId3v1IconvOptionsNo,_("With this option, when "
+        "a character cannot be represented in the target character set, it isn't changed. "
+        "But note that an error message will be displayed for information."),NULL);
     FileWritingId3v1IconvOptionsTranslit = gtk_radio_button_new_with_label(
         gtk_radio_button_get_group(GTK_RADIO_BUTTON(FileWritingId3v1IconvOptionsNo)),
         _("//TRANSLIT"));
@@ -1275,7 +1282,7 @@ void Open_OptionsWindow (void)
         g_free(path_utf8);
     }
 
-    Button = Create_Button_With_Pixmap(BUTTON_BROWSE);
+    Button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
     gtk_box_pack_start(GTK_BOX(hbox),Button,FALSE,FALSE,0);
     g_signal_connect_swapped(G_OBJECT(Button),"clicked",
                              G_CALLBACK(File_Selection_Window_For_Directory),G_OBJECT(GTK_BIN(CddbLocalPath)->child));
@@ -1736,10 +1743,15 @@ gint Check_DefaultPathToMp3 (void)
         gchar *msg = g_strdup_printf(_(" The selected path for 'Default path to "
             "files' isn't valid!\n'%s'\n(%s) "),path_utf8,
             (stat(path_real,&stbuf)==0)?_("Not a directory"):g_strerror(errno) );
-        GtkWidget *msgbox = msg_box_new(_("Error..."),msg,GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
-        msg_box_hide_check_button(MSG_BOX(msgbox));
-        gtk_window_set_transient_for(GTK_WINDOW(msgbox),GTK_WINDOW(OptionsWindow));
-        msg_box_run(MSG_BOX(msgbox));
+        GtkWidget *msgbox = msg_box_new(_("Error..."),
+                                        GTK_WINDOW(OptionsWindow),
+                                        NULL,
+                                        GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        msg,
+                                        GTK_STOCK_DIALOG_ERROR,
+                                        GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                        NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
         g_free(msg);
         g_free(path_real);
@@ -1774,10 +1786,15 @@ gint Check_CharacterSetTranslation (void)
     {
         gchar *msg = g_strdup_printf(_("The character set translation from '%s'\n"
                                        "to '%s' isn't supported!"),reading_character,"UTF-8");
-        GtkWidget *msgbox = msg_box_new(_("Error..."),msg,GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
-        msg_box_hide_check_button(MSG_BOX(msgbox));
-        gtk_window_set_transient_for(GTK_WINDOW(msgbox),GTK_WINDOW(OptionsWindow));
-        msg_box_run(MSG_BOX(msgbox));
+        GtkWidget *msgbox = msg_box_new(_("Error..."),
+                                        GTK_WINDOW(OptionsWindow),
+                                        NULL,
+                                        GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        msg,
+                                        GTK_STOCK_DIALOG_ERROR,
+                                        GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                        NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
         g_free(msg);
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(UseNonStandardId3ReadingCharacterSet),FALSE);
@@ -1789,10 +1806,15 @@ gint Check_CharacterSetTranslation (void)
     {
         gchar *msg = g_strdup_printf(_("The character set translation from '%s'\n"
                                        "to '%s' isn't supported!"),"UTF-8",writing_character);
-        GtkWidget *msgbox = msg_box_new(_("Error..."),msg,GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
-        msg_box_hide_check_button(MSG_BOX(msgbox));
-        gtk_window_set_transient_for(GTK_WINDOW(msgbox),GTK_WINDOW(OptionsWindow));
-        msg_box_run(MSG_BOX(msgbox));
+        GtkWidget *msgbox = msg_box_new(_("Error..."),
+                                        GTK_WINDOW(OptionsWindow),
+                                        NULL,
+                                        GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        msg,
+                                        GTK_STOCK_DIALOG_ERROR,
+                                        GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                        NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
         g_free(msg);
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(UseNonStandardId3WritingCharacterSet),FALSE);
@@ -1838,10 +1860,15 @@ gint Check_FilePlayerCombo (void)
     {
         gchar *msg = g_strdup_printf(_("The audio file player '%s' can't be found!"),
             gtk_entry_get_text(GTK_ENTRY(GTK_BIN(FilePlayerCombo)->child)));
-        GtkWidget *msgbox = msg_box_new(_("Error..."),msg,GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
-        msg_box_hide_check_button(MSG_BOX(msgbox));
-        gtk_window_set_transient_for(GTK_WINDOW(msgbox),GTK_WINDOW(OptionsWindow));
-        msg_box_run(MSG_BOX(msgbox));
+        GtkWidget *msgbox = msg_box_new(_("Error..."),
+                                        GTK_WINDOW(OptionsWindow),
+                                        NULL,
+                                        GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        msg,
+                                        GTK_STOCK_DIALOG_ERROR,
+                                        GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                        NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
         g_free(msg);
 
diff --git a/src/prefs.h b/src/prefs.h
index 5c1e122..5c1e122 100644..100755
--- a/src/prefs.h
+++ b/src/prefs.h
diff --git a/src/scan.c b/src/scan.c
index a16adf9..476fbe9 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -141,6 +141,10 @@ gchar *Rename_File_Masks [] =
     "%n_-_%a_-_%t",
     "%n. %a - %t",
     "%n._%a_-_%t",
+    "%a - %b"G_DIR_SEPARATOR_S"%n - %t",
+    "%a_-_%b"G_DIR_SEPARATOR_S"%n_-_%t",
+    "%a - %b (%y) - %g"G_DIR_SEPARATOR_S"%n - %t",
+    "%a_-_%b_(%y)_-_%g"G_DIR_SEPARATOR_S"%n_-_%t",
     "%n - %t",
     "%n_-_%t",
     "%n. %t",
@@ -352,7 +356,7 @@ void Scan_Tag_With_Mask (ET_File *ETFile)
     g_free(mask);
     Statusbar_Message(_("Tag successfully scanned..."),TRUE);
     filename_utf8 = g_path_get_basename( ((File_Name *)ETFile->FileNameNew->data)->value_utf8 );
-    Log_Print(_("Tag successfully scanned...(%s)"),filename_utf8);
+    Log_Print(LOG_OK,_("Tag successfully scanned...(%s)"),filename_utf8);
     g_free(filename_utf8);
 }
 
@@ -392,7 +396,7 @@ GList *Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask)
     if (i==ET_FILE_DESCRIPTION_SIZE)
     {
         gchar *tmp1 = g_path_get_basename(filename_utf8);
-        Log_Print(_("Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"),tmp,tmp1);
+        Log_Print(LOG_ERROR,_("Tag scanner: strange..., the extension '%s' was not found into filename '%s'!"),tmp,tmp1);
         g_free(tmp1);
     }
 
@@ -474,7 +478,7 @@ GList *Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask)
                     file_seq = file_seq + len; // We remove it
                 }else
                 {
-                    Log_Print(_("Scan Error: can't find separator '%s' within '%s'"),buf,file_seq_utf8);
+                    Log_Print(LOG_ERROR,_("Scan Error: can't find separator '%s' within '%s'"),buf,file_seq_utf8);
                 }
                 g_free(buf);
             }
@@ -503,7 +507,7 @@ GList *Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask)
                 // Try to find the separator in 'file_seq'
                 if ( (tmp=strstr(file_seq,separator)) == NULL )
                 {
-                    Log_Print(_("Scan Error: can't find separator '%s' within '%s'"),separator,file_seq_utf8);
+                    Log_Print(LOG_ERROR,_("Scan Error: can't find separator '%s' within '%s'"),separator,file_seq_utf8);
                     separator[0] = 0; // Needed to avoid error when calculting 'len' below
                 }
 
@@ -661,8 +665,15 @@ void Scan_Rename_File_With_Mask (ET_File *ETFile)
     {
         GtkWidget *msgbox;
         gchar *msg = g_strdup_printf(_("Could not convert filename '%s' into system filename encoding."), filename_generated_utf8);
-        msgbox = msg_box_new(_("Filename translation"),msg,GTK_STOCK_DIALOG_ERROR,BUTTON_OK,0);
-        msg_box_run(MSG_BOX(msgbox));
+        msgbox = msg_box_new(_("Filename translation"),
+                             GTK_WINDOW(ScannerWindow),
+                             NULL,
+                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                             msg,
+                             GTK_STOCK_DIALOG_ERROR,
+                             GTK_STOCK_OK, GTK_RESPONSE_OK,
+                             NULL);
+        gtk_dialog_run(GTK_DIALOG(msgbox));
         gtk_widget_destroy(msgbox);
         g_free(msg);
         g_free(filename_generated_utf8);
@@ -686,7 +697,7 @@ void Scan_Rename_File_With_Mask (ET_File *ETFile)
     Statusbar_Message(_("New file name successfully scanned..."),TRUE);
 
     filename_new_utf8 = g_path_get_basename(((File_Name *)ETFile->FileNameNew->data)->value_utf8);
-    Log_Print(_("New file name successfully scanned...(%s)"),filename_new_utf8);
+    Log_Print(LOG_OK,_("New file name successfully scanned...(%s)"),filename_new_utf8);
     g_free(filename_new_utf8);
 
     return;
@@ -984,13 +995,14 @@ void Scan_Rename_File_Prefix_Path (void)
 
     // The current text in the combobox
     combo_text = (gchar *)gtk_entry_get_text(GTK_ENTRY(GTK_BIN(RenameFileMaskCombo)->child));
-    if (!g_utf8_validate(combo_text, -1, NULL))
+    /*if (!g_utf8_validate(combo_text, -1, NULL))
     {
         combo_tmp = convert_to_utf8(combo_text);
     }else
     {
         combo_tmp = g_strdup(combo_text);
-    }
+    }*/
+    combo_tmp = Try_To_Validate_Utf8_String(combo_text);
 
     // If the path already exists we don't add it again
     // Use g_utf8_collate_key instead of strncmp
@@ -1077,7 +1089,7 @@ void Scan_Process_Fields (ET_File *ETFile)
 
     st_filename = (File_Name *)ETFile->FileNameNew->data;
     st_filetag  = (File_Tag  *)ETFile->FileTag->data;
-    
+
     /* Process the filename */
     if (st_filename != NULL)
     {
@@ -1135,7 +1147,7 @@ void Scan_Process_Fields (ET_File *ETFile)
             }
 
             string = g_strdup(st_filetag->artist);
-            
+
             Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->artist,string);
@@ -1153,7 +1165,7 @@ void Scan_Process_Fields (ET_File *ETFile)
             }
 
             string = g_strdup(st_filetag->album);
-            
+
             Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->album,string);
@@ -1171,7 +1183,7 @@ void Scan_Process_Fields (ET_File *ETFile)
             }
 
             string = g_strdup(st_filetag->genre);
-            
+
             Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->genre,string);
@@ -1189,7 +1201,7 @@ void Scan_Process_Fields (ET_File *ETFile)
             }
 
             string = g_strdup(st_filetag->comment);
-            
+
             Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->comment,string);
@@ -1207,7 +1219,7 @@ void Scan_Process_Fields (ET_File *ETFile)
             }
 
             string = g_strdup(st_filetag->composer);
-            
+
             Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->composer,string);
@@ -1225,7 +1237,7 @@ void Scan_Process_Fields (ET_File *ETFile)
             }
 
             string = g_strdup(st_filetag->orig_artist);
-            
+
             Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->orig_artist,string);
@@ -1243,7 +1255,7 @@ void Scan_Process_Fields (ET_File *ETFile)
             }
 
             string = g_strdup(st_filetag->copyright);
-            
+
             Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->copyright,string);
@@ -1261,7 +1273,7 @@ void Scan_Process_Fields (ET_File *ETFile)
             }
 
             string = g_strdup(st_filetag->url);
-            
+
             Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->url,string);
@@ -1279,7 +1291,7 @@ void Scan_Process_Fields (ET_File *ETFile)
             }
 
             string = g_strdup(st_filetag->encoded_by);
-            
+
             Scan_Process_Fields_Functions(&string);
 
             ET_Set_Field_File_Tag_Item(&FileTag->encoded_by,string);
@@ -1418,7 +1430,7 @@ void Scan_Process_Fields_Letter_Uppercase (gchar *string)
 }
 
 /*
- * Function to set the first letter of each word to uppercase, according the "Chicago Manual of Style"
+ * Function to set the first letter of each word to uppercase, according the "Chicago Manual of Style" (http://www.docstyles.com/cmscrib.htm#Note2)
  * No needed to reallocate
  */
 void Scan_Process_Fields_First_Letters_Uppercase (gchar *string)
@@ -1485,7 +1497,7 @@ void Scan_Process_Fields_First_Letters_Uppercase (gchar *string)
 
     if (!g_utf8_validate(string,-1,NULL))
     {
-        Log_Print("Scan_Process_Fields_First_Letters_Uppercase: Not a valid utf8! quiting");
+        Log_Print(LOG_ERROR,"Scan_Process_Fields_First_Letters_Uppercase: Not a valid utf8! quiting");
         return;
     }
     // Removes trailing whitespace
@@ -1582,7 +1594,7 @@ void Scan_Process_Fields_First_Letters_Uppercase (gchar *string)
 void Scan_Process_Fields_Remove_Space (gchar *string)
 {
     gchar *tmp, *tmp1;
-    
+
     tmp = tmp1 = string;
 
     while (*tmp)
@@ -1606,7 +1618,7 @@ void Scan_Process_Fields_Insert_Space (gchar **string)
     gint j;
     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);
@@ -1615,7 +1627,7 @@ void Scan_Process_Fields_Insert_Space (gchar **string)
     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);
@@ -1637,7 +1649,7 @@ void Scan_Process_Fields_Insert_Space (gchar **string)
 void Scan_Process_Fields_Keep_One_Space (gchar *string)
 {
     gchar *tmp, *tmp1;
-    
+
     tmp = tmp1 = string;
 
     // Remove multiple consecutive underscores and spaces.
@@ -1649,7 +1661,7 @@ void Scan_Process_Fields_Keep_One_Space (gchar *string)
             break;
         *(tmp++) = *(tmp1++);
         while (*tmp1 == ' ' || *tmp1 == '_')
-            *tmp1++;
+            *(tmp1++);
     }
     *tmp = '\0';
 }
@@ -1710,16 +1722,16 @@ void Scan_Convert_Character (gchar **string)
     gchar  *token;
     gint    n_tokens;
     gchar **result;
-   
-    
+
+
     tokens_list = NULL;
     n_tokens = 0;
     s = current = *string;
-    
+
     // Find tokens
     if (strlen(from) > 0)
     {
-        while (s 
+        while (s
         &&    *s != '\0'
         &&    (s = g_strstr_len(current,strlen(current),from)) )
         {
@@ -1738,7 +1750,7 @@ void Scan_Convert_Character (gchar **string)
     }else
     {
         // We search an empty string... we suppose it exists between each UTF-8 character
-        while (s 
+        while (s
         &&    *s != '\0'
         &&    (s = g_utf8_find_next_char(current,NULL)) )
         {
@@ -1748,16 +1760,16 @@ void Scan_Convert_Character (gchar **string)
             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);
 
@@ -1786,18 +1798,24 @@ gint Scan_Word_Is_Roman_Numeral (gchar *text)
 
     while (*tmp)
     {
-        if (*tmp == (gunichar)'i' || 
-            *tmp == (gunichar)'v' || 
-            *tmp == (gunichar)'x' || 
-            *tmp == (gunichar)'l' ||
-            *tmp == (gunichar)'c' ||
-            *tmp == (gunichar)'d' ||
-            *tmp == (gunichar)'m')
+        if (*tmp == (gunichar)'i'
+        ||  *tmp == (gunichar)'v'
+        ||  *tmp == (gunichar)'x'
+        ||  *tmp == (gunichar)'l'
+        ||  *tmp == (gunichar)'c'
+        ||  *tmp == (gunichar)'d'
+        ||  *tmp == (gunichar)'m')
         {
+            // Found a roman numeral => continue
             tmp++;
             len++;
-        } else if (*tmp == ' ' || *tmp == '_')
+        } else if (*tmp == ' '
+               ||  *tmp == '_'
+               ||  *tmp == '.'
+               ||  *tmp == ','
+               ||  *tmp == '-')
         {
+            // Found separator => stop
             return len;
         } else
         {
@@ -1810,6 +1828,57 @@ gint Scan_Word_Is_Roman_Numeral (gchar *text)
 
 
 /*
+**  roman2long() - Converts a roman numeral string into a long integer
+**  public domain by Bob Stout
+**  Arguments: 1 - Roman numeral string
+**
+**  Returns: Long value if valid, else -1L
+*/
+/*
+long roman2long(const char *str)
+{
+    struct numeral {
+      long val;
+      int  ch;
+    };
+    
+    static struct numeral numerals[] = {
+          {    1L, 'I' },
+          {    5L, 'V' },
+          {   10L, 'X' },
+          {   50L, 'L' },
+          {  100L, 'C' },
+          {  500L, 'D' },
+          { 1000L, 'M' }
+    };
+      int i, j, k;
+      long retval = 0L;
+
+      if (!str)
+            return -1L;
+      for (i = 0, k = -1; str[i]; ++i)
+      {
+            for (j = 0; j < 7; ++j)
+            {
+                  if (numerals[j].ch == toupper(str[i]))
+                        break;
+            }
+            if (7 == j)
+                  return -1L;
+            if (k >= 0 && k < j)
+            {
+                  retval -= numerals[k].val * 2;
+                  retval += numerals[j].val;
+            }
+            else  retval += numerals[j].val;
+            k = j;
+      }
+      return retval;
+}*/
+
+
+
+/*
  * Return the field of a 'File_Tag' structure corresponding to the mask code
  */
 gchar **Scan_Return_File_Tag_Field_From_Mask_Code (File_Tag *FileTag, gchar code)
@@ -1847,7 +1916,7 @@ gchar **Scan_Return_File_Tag_Field_From_Mask_Code (File_Tag *FileTag, gchar code
         case 'i':    /* Ignored */
             return NULL;
         default:
-            Log_Print("Scanner: Invalid code '%%%c' found!",code);
+            Log_Print(LOG_ERROR,"Scanner: Invalid code '%%%c' found!",code);
             return NULL;
     }
 }
@@ -1938,15 +2007,15 @@ 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), 
+    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), 
+    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), 
+    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
@@ -2677,7 +2746,7 @@ void ScannerWindow_Apply_Changes (void)
 
         // The scanner selected
         SCANNER_TYPE = gtk_combo_box_get_active(GTK_COMBO_BOX(ScannerOptionCombo));
-        
+
         SCAN_MASK_EDITOR_BUTTON   = GTK_TOGGLE_BUTTON(MaskEditorButton)->active;
         SCAN_LEGEND_BUTTON        = GTK_TOGGLE_BUTTON(LegendButton)->active;
 
@@ -2693,7 +2762,7 @@ 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);
@@ -3152,14 +3221,14 @@ void Mask_Editor_List_Duplicate (void)
 
     if (g_list_length(selectedRows) == 0)
     {
-        Log_Print(_("Copy: No row selected!"));
+        Log_Print(LOG_ERROR,_("Copy: No row selected!"));
         g_list_foreach(selectedRows, (GFunc) gtk_tree_path_free, NULL);
         g_list_free(selectedRows);
         return;
     }
 
     /* Loop through selected rows, duplicating them into a GList
-     * We cannot directly insert because the paths in selectedRows 
+     * We cannot directly insert because the paths in selectedRows
      * get out of date after an insertion */
     while (selectedRows)
     {
@@ -3174,7 +3243,7 @@ void Mask_Editor_List_Duplicate (void)
         if (!selectedRows) break;
     }
 
-    /* Duplicate the relevant entries, by looping through the list backwards 
+    /* Duplicate the relevant entries, by looping through the list backwards
      * (to preserve original order) */
     toInsert = g_list_last(toInsert);
     while (toInsert)
@@ -3189,7 +3258,7 @@ void Mask_Editor_List_Duplicate (void)
     // 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);
@@ -3212,10 +3281,11 @@ void Mask_Editor_List_Add (void)
     {
         while(Scan_Masks[i])
         {
-            if (!g_utf8_validate(Scan_Masks[i], -1, NULL))
+            /*if (!g_utf8_validate(Scan_Masks[i], -1, NULL))
                 temp = convert_to_utf8(Scan_Masks[i]);
             else
-                temp = g_strdup(Scan_Masks[i]);
+                temp = g_strdup(Scan_Masks[i]);*/
+            temp = Try_To_Validate_Utf8_String(Scan_Masks[i]);
 
             gtk_list_store_append(GTK_LIST_STORE(treemodel), &iter);
             gtk_list_store_set(GTK_LIST_STORE(treemodel), &iter,
@@ -3227,10 +3297,11 @@ void Mask_Editor_List_Add (void)
     {
         while(Rename_File_Masks[i])
         {
-            if (!g_utf8_validate(Rename_File_Masks[i], -1, NULL))
+            /*if (!g_utf8_validate(Rename_File_Masks[i], -1, NULL))
                 temp = convert_to_utf8(Rename_File_Masks[i]);
             else
-                temp = g_strdup(Scan_Masks[i]);
+                temp = g_strdup(Rename_File_Masks[i]);*/
+            temp = Try_To_Validate_Utf8_String(Rename_File_Masks[i]);
 
             gtk_list_store_append(GTK_LIST_STORE(treemodel), &iter);
             gtk_list_store_set(GTK_LIST_STORE(treemodel), &iter,
@@ -3256,7 +3327,7 @@ void Mask_Editor_List_Remove (void)
     treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(MaskEditorList));
 
     if (gtk_tree_selection_count_selected_rows(selection) == 0) {
-        Log_Print(_("Remove: No row selected!"));
+        Log_Print(LOG_ERROR,_("Remove: No row selected!"));
         return;
     }
 
@@ -3303,7 +3374,7 @@ void Mask_Editor_List_Move_Up (void)
 
     if (g_list_length(selectedRows) == 0)
     {
-        Log_Print(_("Move Up: No row selected!"));
+        Log_Print(LOG_ERROR,_("Move Up: No row selected!"));
         g_list_foreach(selectedRows, (GFunc)gtk_tree_path_free, NULL);
         g_list_free(selectedRows);
         return;
@@ -3356,7 +3427,7 @@ void Mask_Editor_List_Move_Down (void)
 
     if (g_list_length(selectedRows) == 0)
     {
-        Log_Print(_("Move Down: No row selected!"));
+        Log_Print(LOG_ERROR,_("Move Down: No row selected!"));
         g_list_foreach(selectedRows, (GFunc)gtk_tree_path_free, NULL);
         g_list_free(selectedRows);
         return;
diff --git a/src/scan.h b/src/scan.h
index de151a2..de151a2 100644..100755
--- a/src/scan.h
+++ b/src/scan.h
diff --git a/src/setting.c b/src/setting.c
index 9b00a32..217ab2d 100644..100755
--- a/src/setting.c
+++ b/src/setting.c
@@ -59,42 +59,41 @@
  */
 
 // Base directory created into home dir
-gchar *EASYTAG_DIR                                 = ".easytag";
+#define EASYTAG_DIR                                 ".easytag"
 // File for configuration
-gchar *CONFIG_FILE                                 = ".easytag/easytagrc";
+#define CONFIG_FILE                                 EASYTAG_DIR "/easytagrc"
 // File of masks for tag scanner
-gchar *SCAN_TAG_MASKS_FILE                         = ".easytag/scan_tag.mask";
+#define SCAN_TAG_MASKS_FILE                         EASYTAG_DIR "/scan_tag.mask"
 // File of masks for rename file scanner
-gchar *RENAME_FILE_MASKS_FILE                      = ".easytag/rename_file.mask";
+#define RENAME_FILE_MASKS_FILE                      EASYTAG_DIR "/rename_file.mask"
 // File for history of RenameDirectoryMaskCombo combobox
-gchar *RENAME_DIRECTORY_MASKS_FILE                 = ".easytag/rename_directory.mask";
+#define RENAME_DIRECTORY_MASKS_FILE                 EASYTAG_DIR "/rename_directory.mask"
 // File for history of PlayListNameCombo combobox
-gchar *PLAY_LIST_NAME_MASKS_FILE                   = ".easytag/play_list_name.mask";
+#define PLAY_LIST_NAME_MASKS_FILE                   EASYTAG_DIR "/play_list_name.mask"
 // File for history of PlayListContentMaskEntry combobox
-gchar *PLAYLIST_CONTENT_MASKS_FILE                 = ".easytag/playlist_content.mask";
+#define PLAYLIST_CONTENT_MASKS_FILE                 EASYTAG_DIR "/playlist_content.mask"
 // File for history of DefaultPathToMp3 combobox
-gchar *DEFAULT_PATH_TO_MP3_HISTORY_FILE            = ".easytag/default_path_to_mp3.history";
+#define DEFAULT_PATH_TO_MP3_HISTORY_FILE            EASYTAG_DIR "/default_path_to_mp3.history"
 // File for history of DefaultComment combobox
-gchar *DEFAULT_TAG_COMMENT_HISTORY_FILE            = ".easytag/default_tag_comment.history";
+#define DEFAULT_TAG_COMMENT_HISTORY_FILE            EASYTAG_DIR "/default_tag_comment.history"
 // File for history of BrowserEntry combobox
-gchar *PATH_ENTRY_HISTORY_FILE                     = ".easytag/browser_path.history";
+#define PATH_ENTRY_HISTORY_FILE                     EASYTAG_DIR "/browser_path.history"
 // File for history of run program combobox for directories
-gchar *RUN_PROGRAM_WITH_DIRECTORY_HISTORY_FILE     = ".easytag/run_program_with_directory.history";
+#define RUN_PROGRAM_WITH_DIRECTORY_HISTORY_FILE     EASYTAG_DIR "/run_program_with_directory.history"
 // File for history of run program combobox for files
-gchar *RUN_PROGRAM_WITH_FILE_HISTORY_FILE          = ".easytag/run_program_with_file.history";
+#define RUN_PROGRAM_WITH_FILE_HISTORY_FILE          EASYTAG_DIR "/run_program_with_file.history"
 // File for history of run player combobox
-gchar *AUDIO_FILE_PLAYER_HISTORY_FILE              = ".easytag/audio_file_player.history";
+#define AUDIO_FILE_PLAYER_HISTORY_FILE              EASYTAG_DIR "/audio_file_player.history"
 // File for history of search string combobox
-gchar *SEARCH_FILE_HISTORY_FILE                    = ".easytag/search_file.history";
+#define SEARCH_FILE_HISTORY_FILE                    EASYTAG_DIR "/search_file.history"
 // File for history of FileToLoad combobox
-gchar *FILE_TO_LOAD_HISTORY_FILE                   = ".easytag/file_to_load.history";
+#define FILE_TO_LOAD_HISTORY_FILE                   EASYTAG_DIR "/file_to_load.history"
 // File for history of CddbSearchStringEntry combobox
-gchar *CDDB_SEARCH_STRING_HISTORY_FILE             = ".easytag/cddb_search_string.history";
+#define CDDB_SEARCH_STRING_HISTORY_FILE             EASYTAG_DIR "/cddb_search_string.history"
 // File for history of CddbSearchStringInResultEntry combobox
-gchar *CDDB_SEARCH_STRING_IN_RESULT_HISTORY_FILE   = ".easytag/cddb_search_string_in_result.history";
+#define CDDB_SEARCH_STRING_IN_RESULT_HISTORY_FILE   EASYTAG_DIR "/cddb_search_string_in_result.history"
 // File for history of CddbLocalPath combobox
-gchar *CDDB_LOCAL_PATH_HISTORY_FILE                = ".easytag/cddb_local_path.history";
-
+#define CDDB_LOCAL_PATH_HISTORY_FILE                EASYTAG_DIR "/cddb_local_path.history"
 
 
 
@@ -429,8 +428,8 @@ void Init_Config_Variables (void)
     FILE_WRITING_ID3V2_ICONV_OPTIONS_IGNORE         = 0;
     FILE_WRITING_ID3V1_WRITE_TAG                    = 1;
     FILE_WRITING_ID3V1_CHARACTER_SET                = g_strdup("ISO-8859-1");
-    FILE_WRITING_ID3V1_ICONV_OPTIONS_NO             = 1;
-    FILE_WRITING_ID3V1_ICONV_OPTIONS_TRANSLIT       = 0;
+    FILE_WRITING_ID3V1_ICONV_OPTIONS_NO             = 0;
+    FILE_WRITING_ID3V1_ICONV_OPTIONS_TRANSLIT       = 1;
     FILE_WRITING_ID3V1_ICONV_OPTIONS_IGNORE         = 0;
 
     /*
@@ -886,7 +885,7 @@ void Save_Config_To_File (void)
 
     if ( Create_Easytag_Directory()==0 || (file=fopen(file_path,"w+"))==0 )
     {
-        Log_Print(_("ERROR: Can't write config file: %s (%s)"),file_path,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("ERROR: Can't write config file: %s (%s)"),file_path,g_strerror(errno));
     }else
     {
         gint ConfigVarListLen = sizeof(Config_Variables)/sizeof(tConfigVariable);
@@ -929,7 +928,7 @@ void Save_Config_To_File (void)
                 }
                 default:
                 {
-                    Log_Print("ERROR: Can't save: type of config variable not supported "
+                    Log_Print(LOG_ERROR,"ERROR: Can't save: type of config variable not supported "
                               "for '%s'!",Config_Variables[i].name);
                     break;
                 }
@@ -1002,7 +1001,7 @@ void Set_Config (gchar *line)
 
                 default:
                 {
-                    Log_Print("ERROR: Can't read: type of config variable not supported "
+                    Log_Print(LOG_ERROR,"ERROR: Can't read: type of config variable not supported "
                               "for '%s'!",Config_Variables[i].name);
                     break;
                 }
@@ -1029,8 +1028,8 @@ void Read_Config (void)
 
     if ( (file=fopen(file_path,"r"))==0 )
     {
-        Log_Print(_("Can't open configuration file '%s' (%s)"),file_path,g_strerror(errno));
-        Log_Print(_("Loading default configuration..."));
+        Log_Print(LOG_ERROR,_("Can't open configuration file '%s' (%s)"),file_path,g_strerror(errno));
+        Log_Print(LOG_OK,_("Loading default configuration..."));
     }else
     {
         while (fgets(buffer,sizeof(buffer),file))
@@ -1130,119 +1129,119 @@ gboolean Setting_Create_Files (void)
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),CONFIG_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),CONFIG_FILE,g_strerror(errno));
     g_free(file_path);
 
     file_path = g_strconcat(home_path,SCAN_TAG_MASKS_FILE,NULL);
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),SCAN_TAG_MASKS_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),SCAN_TAG_MASKS_FILE,g_strerror(errno));
     g_free(file_path);
 
     file_path = g_strconcat(home_path,RENAME_FILE_MASKS_FILE,NULL);
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),RENAME_FILE_MASKS_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),RENAME_FILE_MASKS_FILE,g_strerror(errno));
     g_free(file_path);
 
     file_path = g_strconcat(home_path,RENAME_DIRECTORY_MASKS_FILE,NULL);
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),RENAME_DIRECTORY_MASKS_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),RENAME_DIRECTORY_MASKS_FILE,g_strerror(errno));
     g_free(file_path);
 
     file_path = g_strconcat(home_path,DEFAULT_PATH_TO_MP3_HISTORY_FILE,NULL);
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),DEFAULT_PATH_TO_MP3_HISTORY_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),DEFAULT_PATH_TO_MP3_HISTORY_FILE,g_strerror(errno));
     g_free(file_path);
 
     file_path = g_strconcat(home_path,DEFAULT_TAG_COMMENT_HISTORY_FILE,NULL);
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),DEFAULT_TAG_COMMENT_HISTORY_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),DEFAULT_TAG_COMMENT_HISTORY_FILE,g_strerror(errno));
     g_free(file_path);
 
     file_path = g_strconcat(home_path,PATH_ENTRY_HISTORY_FILE,NULL);
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),PATH_ENTRY_HISTORY_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),PATH_ENTRY_HISTORY_FILE,g_strerror(errno));
     g_free(file_path);
 
     file_path = g_strconcat(home_path,PLAY_LIST_NAME_MASKS_FILE,NULL);
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),PLAY_LIST_NAME_MASKS_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),PLAY_LIST_NAME_MASKS_FILE,g_strerror(errno));
     g_free(file_path);
 
     file_path = g_strconcat(home_path,RUN_PROGRAM_WITH_DIRECTORY_HISTORY_FILE,NULL);
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),RUN_PROGRAM_WITH_DIRECTORY_HISTORY_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),RUN_PROGRAM_WITH_DIRECTORY_HISTORY_FILE,g_strerror(errno));
     g_free(file_path);
 
     file_path = g_strconcat(home_path,RUN_PROGRAM_WITH_FILE_HISTORY_FILE,NULL);
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),RUN_PROGRAM_WITH_FILE_HISTORY_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),RUN_PROGRAM_WITH_FILE_HISTORY_FILE,g_strerror(errno));
     g_free(file_path);
 
     file_path = g_strconcat(home_path,AUDIO_FILE_PLAYER_HISTORY_FILE,NULL);
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),AUDIO_FILE_PLAYER_HISTORY_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),AUDIO_FILE_PLAYER_HISTORY_FILE,g_strerror(errno));
     g_free(file_path);
 
     file_path = g_strconcat(home_path,SEARCH_FILE_HISTORY_FILE,NULL);
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),SEARCH_FILE_HISTORY_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),SEARCH_FILE_HISTORY_FILE,g_strerror(errno));
     g_free(file_path);
 
     file_path = g_strconcat(home_path,FILE_TO_LOAD_HISTORY_FILE,NULL);
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),FILE_TO_LOAD_HISTORY_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),FILE_TO_LOAD_HISTORY_FILE,g_strerror(errno));
     g_free(file_path);
 
     file_path = g_strconcat(home_path,PLAYLIST_CONTENT_MASKS_FILE,NULL);
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),PLAYLIST_CONTENT_MASKS_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),PLAYLIST_CONTENT_MASKS_FILE,g_strerror(errno));
     g_free(file_path);
 
     file_path = g_strconcat(home_path,CDDB_SEARCH_STRING_HISTORY_FILE,NULL);
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),CDDB_SEARCH_STRING_HISTORY_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),CDDB_SEARCH_STRING_HISTORY_FILE,g_strerror(errno));
     g_free(file_path);
 
     file_path = g_strconcat(home_path,CDDB_SEARCH_STRING_IN_RESULT_HISTORY_FILE,NULL);
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),CDDB_SEARCH_STRING_IN_RESULT_HISTORY_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),CDDB_SEARCH_STRING_IN_RESULT_HISTORY_FILE,g_strerror(errno));
     g_free(file_path);
 
     file_path = g_strconcat(home_path,CDDB_LOCAL_PATH_HISTORY_FILE,NULL);
     if ( (file=fopen(file_path,"a+")) != NULL )
         fclose(file);
     else
-        Log_Print(_("Can't create or open file '%s' (%s)"),CDDB_LOCAL_PATH_HISTORY_FILE,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't create or open file '%s' (%s)"),CDDB_LOCAL_PATH_HISTORY_FILE,g_strerror(errno));
     g_free(file_path);
 
 
@@ -1275,7 +1274,7 @@ void Save_List_Store_To_File (gchar *filename, GtkListStore *liststore, gint col
 
     if ( Create_Easytag_Directory()==0 || (file=fopen(file_path,"w+"))==NULL )
     {
-        Log_Print(_("ERROR: Can't write list to file: %s (%s)"),file_path,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("ERROR: Can't write list to file: %s (%s)"),file_path,g_strerror(errno));
     }else
     {
         do
@@ -1315,7 +1314,7 @@ gboolean Populate_List_Store_From_File (gchar *filename, GtkListStore *liststore
 
     if ( (file=fopen(file_path,"r"))==NULL )
     {
-        Log_Print(_("Can't open file '%s' (%s)"),file_path,g_strerror(errno));
+        Log_Print(LOG_ERROR,_("Can't open file '%s' (%s)"),file_path,g_strerror(errno));
     }else
     {
         gchar *data = NULL;
@@ -1324,10 +1323,12 @@ gboolean Populate_List_Store_From_File (gchar *filename, GtkListStore *liststore
         {
             if (buffer[strlen(buffer)-1]=='\n')
                 buffer[strlen(buffer)-1]='\0';
-            if (g_utf8_validate(buffer, -1, NULL))
+            
+            /*if (g_utf8_validate(buffer, -1, NULL))
                 data = g_strdup(buffer);
             else
-                data = convert_to_utf8(buffer);
+                data = convert_to_utf8(buffer);*/
+            data = Try_To_Validate_Utf8_String(buffer);
 
             if (data && g_utf8_strlen(data, -1) > 0)
             {
@@ -1355,7 +1356,7 @@ void Load_Scan_Tag_Masks_List (GtkListStore *liststore, gint colnum, gchar **fal
     if (!Populate_List_Store_From_File(SCAN_TAG_MASKS_FILE, liststore, colnum))
     {
         // Fall back to defaults
-        Log_Print(_("Loading default 'Fill Tag' masks..."));
+        Log_Print(LOG_OK,_("Loading default 'Fill Tag' masks..."));
 
         while(fallback[i])
         {
@@ -1383,7 +1384,7 @@ void Load_Rename_File_Masks_List (GtkListStore *liststore, gint colnum, gchar **
     if (!Populate_List_Store_From_File(RENAME_FILE_MASKS_FILE, liststore, colnum))
     {
         // Fall back to defaults
-        Log_Print(_("Loading default 'Rename File' masks..."));
+        Log_Print(LOG_OK,_("Loading default 'Rename File' masks..."));
 
         while(fallback[i])
         {
@@ -1410,7 +1411,7 @@ void Load_Rename_Directory_Masks_List (GtkListStore *liststore, gint colnum, gch
     if (!Populate_List_Store_From_File(RENAME_DIRECTORY_MASKS_FILE, liststore, colnum))
     {
         // Fall back to defaults
-        Log_Print(_("Loading default 'Rename Directory' masks..."));
+        Log_Print(LOG_OK,_("Loading default 'Rename Directory' masks..."));
 
         while(fallback[i])
         {
@@ -1603,7 +1604,7 @@ gboolean Create_Easytag_Directory (void)
 
     if (!HOME_VARIABLE)
     {
-        Log_Print(_("ERROR: The environment variable HOME is not defined!"));
+        Log_Print(LOG_ERROR,_("ERROR: The environment variable HOME is not defined!"));
         return FALSE;
     }
 
@@ -1614,12 +1615,12 @@ gboolean Create_Easytag_Directory (void)
                                EASYTAG_DIR,
                                //EASYTAG_DIR[strlen(EASYTAG_DIR)-1]!=G_DIR_SEPARATOR?G_DIR_SEPARATOR_S:"",
                                NULL);
-
+        
     if ( (dir=opendir(easytag_path)) == NULL )
     {
         if ( (mkdir(easytag_path,S_IRWXU|S_IXGRP|S_IRGRP)) == -1)
         {
-            Log_Print(_("ERROR: Can't create directory '%s' (%s)!"),easytag_path,g_strerror(errno));
+            Log_Print(LOG_ERROR,_("ERROR: Can't create directory '%s' (%s)!"),easytag_path,g_strerror(errno));
             return FALSE;
         }
     }else
diff --git a/src/setting.h b/src/setting.h
index a2b3042..a2b3042 100644..100755
--- a/src/setting.h
+++ b/src/setting.h
diff --git a/src/win32/nsis/easytag-header.bmp b/src/win32/nsis/easytag-header.bmp
new file mode 100755
index 0000000..85aaeb1
--- /dev/null
+++ b/src/win32/nsis/easytag-header.bmp
diff --git a/src/win32/nsis/easytag-install.bmp b/src/win32/nsis/easytag-install.bmp
new file mode 100755
index 0000000..5bfd99b
--- /dev/null
+++ b/src/win32/nsis/easytag-install.bmp
diff --git a/src/win32/nsis/easytag-install.ico b/src/win32/nsis/easytag-install.ico
new file mode 100755
index 0000000..0e8673e
--- /dev/null
+++ b/src/win32/nsis/easytag-install.ico
diff --git a/src/win32/nsis/easytag-uninstall.bmp b/src/win32/nsis/easytag-uninstall.bmp
new file mode 100755
index 0000000..5cf16db
--- /dev/null
+++ b/src/win32/nsis/easytag-uninstall.bmp
diff --git a/src/win32/win32dep.c b/src/win32/win32dep.c
index 9e400af..cccde13 100644..100755
--- a/src/win32/win32dep.c
+++ b/src/win32/win32dep.c
@@ -76,6 +76,7 @@ typedef enum
  */
 static char app_data_dir[MAX_PATH + 1] = "C:";
 static char install_dir[MAXPATHLEN];
+static char lib_dir[MAXPATHLEN];
 static char locale_dir[MAXPATHLEN];
 
 static void str_replace_char (gchar *str, gchar in_char, gchar out_char);
@@ -109,30 +110,30 @@ HINSTANCE ET_Win32_Hinstance (void)
    and on being read back have their '\' chars used as an escape char.
    Returns an allocated string which needs to be freed.
 */
-char* ET_Win32_Escape_Dirsep (char* filename )
+char *ET_Win32_Escape_Dirsep (const char *filename)
 {
-    int sepcount=0;
-    char* ret=NULL;
-    int cnt=0;
-
-    ret = filename;
-    while(*ret)
-    {
-        if(*ret == '\\')
-            sepcount++;
-        ret++;
-    }
-    ret = g_malloc0(strlen(filename) + sepcount + 1);
-    while(*filename)
-    {
-        ret[cnt] = *filename;
-        if(*filename == '\\')
-            ret[++cnt] = '\\';
-        filename++;
-        cnt++;
-    }
-    ret[cnt] = '\0';
-    return ret;
+	int sepcount = 0;
+	const char *tmp = filename;
+	char *ret;
+	int cnt = 0;
+
+	g_return_val_if_fail(filename != NULL, NULL);
+
+	while(*tmp) {
+		if(*tmp == '\\')
+			sepcount++;
+		tmp++;
+	}
+	ret = g_malloc0(strlen(filename) + sepcount + 1);
+	while(*filename) {
+		ret[cnt] = *filename;
+		if(*filename == '\\')
+			ret[++cnt] = '\\';
+		filename++;
+		cnt++;
+	}
+	ret[cnt] = '\0';
+	return ret;
 }
 
 /* this is used by libmp4v2 : what is it doing here you think ? well...search! */
@@ -165,10 +166,10 @@ int mkstemp (char *template)
 
 /* Determine whether the specified dll contains the specified procedure.
    If so, load it (if not already loaded). */
-FARPROC ET_Win32_Find_And_Loadproc ( char* dllname, char* procedure )
+FARPROC ET_Win32_Find_And_Loadproc (char *dllname, char *procedure)
 {
     HMODULE hmod;
-    int did_load=0;
+	BOOL did_load = FALSE;
     FARPROC proc = 0;
 
     if(!(hmod=GetModuleHandle(dllname)))
@@ -240,14 +241,21 @@ char* ET_Win32_Install_Dir (void)
 }
 
 
-char* ET_Win32_Locale_Dir (void)
+char *ET_Win32_Lib_Dir (void)
+{
+	strcpy(lib_dir, ET_Win32_Install_Dir());
+	g_strlcat(lib_dir, G_DIR_SEPARATOR_S "library", sizeof(lib_dir));
+	return (char*)&lib_dir;
+}
+
+char *ET_Win32_Locale_Dir (void)
 {
     strcpy(locale_dir, ET_Win32_Install_Dir());
     g_strlcat(locale_dir, G_DIR_SEPARATOR_S "locale", sizeof(locale_dir));
     return (char*)&locale_dir;
 }
 
-char* ET_Win32_Data_Dir (void)
+char *ET_Win32_Data_Dir (void)
 {
     return (char*)&app_data_dir;
 }
@@ -448,6 +456,8 @@ void ET_Win32_Cleanup (void)
 {
     /* winsock cleanup */
     WSACleanup();
+
+	ET_dll_hInstance = NULL;
 }
 
 /* DLL initializer */
diff --git a/src/win32/win32dep.h b/src/win32/win32dep.h
index 9107852..302ba0a 100644..100755
--- a/src/win32/win32dep.h
+++ b/src/win32/win32dep.h
@@ -49,10 +49,11 @@ extern int       mkstemp(char *template);
 
 extern HINSTANCE ET_Win32_Hinstance       (void);
 extern gboolean  ET_Win32_Read_Reg_String (HKEY key, char* sub_key, char* val_name, LPBYTE data, LPDWORD data_len);
-extern char*     ET_Win32_Escape_Dirsep   (char*);
+extern char     *ET_Win32_Escape_Dirsep   (const char *filename);
 
 /* Determine ET paths */
 extern char*     ET_Win32_Install_Dir (void);
+extern char*     ET_Win32_Lib_Dir (void);
 extern char*     ET_Win32_Locale_Dir  (void);
 extern char*     ET_Win32_Data_Dir    (void);
 
@@ -76,7 +77,9 @@ extern void      ET_Win32_Path_Replace_Slashes           (gchar *path);
 /*
  *  ET specific
  */
-#define DATADIR ET_Win32_Install_Dir()
-#define LOCALE ET_Win32_Locale_Dir()
+#define DATADIR   ET_Win32_Install_Dir()
+#define LIBDIR    ET_Win32_Lib_Dir()
+#define LOCALEDIR ET_Win32_Locale_Dir()
+//#define PACKAGE_DATA_DIR DATADIR
 
 #endif /* _WIN32DEP_H_ */
diff --git a/src/win32/win_easytag.c b/src/win32/win_easytag.c
index cd6628d..21f4bac 100755
--- a/src/win32/win_easytag.c
+++ b/src/win32/win_easytag.c
@@ -360,7 +360,7 @@ static char* lcid_to_posix(LCID lcid) {
 */
 static const char *get_locale() {
 	const char *locale = NULL;
-	LCID lcid;
+	LCID lcid = 0;
 	char data[10];
 	DWORD datalen = 10;
 
@@ -377,6 +377,7 @@ static const char *get_locale() {
 			return locale;
 	}
 
+    // List of LCID : http://www.microsoft.com/globaldev/reference/lcid-all.mspx
 	lcid = GetUserDefaultLCID();
 	if ((locale = lcid_to_posix(lcid)))
 		return locale;
@@ -546,7 +547,7 @@ WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
 		snprintf(errbuf, 512, "Error loading 'easytag.dll'. Error: (%u) %s%s%s",
 			(UINT) dw, err_msg,
 			mod_not_found ? "\n" : "",
-			mod_not_found ? "This probably means that GTK+ can't be found." : "");
+			mod_not_found ? "This probably means that a dependency (like GTK+, libogg or libvorbis) can't be found." : "");
 		printf(errbuf);
 		MessageBox(NULL, errbuf, TEXT("Error"), MB_OK | MB_TOPMOST);