[SCM] easytag/upstream: Imported Upstream version 2.2.1

amigadave-guest at users.alioth.debian.org amigadave-guest at users.alioth.debian.org
Wed Apr 23 08:03:58 UTC 2014


The following commit has been merged in the upstream branch:
commit 291f178d0ad6f95bd6a1c0639bc0c6574ed2e687
Author: David King <amigadave at amigadave.com>
Date:   Wed Apr 23 08:23:29 2014 +0100

    Imported Upstream version 2.2.1

diff --git a/ChangeLog b/ChangeLog
index ffdc61a..76c900e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,242 @@
+commit 7c9270ab792b87ee4327b3863fa045d345e4e894
+Author: David King <amigadave at amigadave.com>
+Date:   Tue Apr 22 21:59:22 2014 +0100
+
+    Update NEWS for 2.2.1 release
+
+M	NEWS
+M	SOURCES
+M	configure.ac
+
+commit 32c8f8c4a59fbd4be4e0a963fab94feb7e3847d0
+Author: David King <amigadave at amigadave.com>
+Date:	Tue Apr 22 19:36:37 2014 +0100
+
+    Revert "Refactor Scan_Convert_P20_Into_Space()"
+
+    This reverts commit 553ba87d0311e4e4c64f2321b5aa654df0c4ae29.
+
+    The above commit added a call to strcpy(), with arguments that
+    overlapped. The behaviour of such a call is undefined, and can lead to
+    test failures.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=728743
+
+M	src/scan.c
+
+commit b09518f1b26fdbc5be69f5c9bd8d1642846b45a5
+Author: David King <amigadave at amigadave.com>
+Date:	Tue Apr 22 17:03:10 2014 +0100
+
+    Add Opus and Speex MIME types to desktop file
+
+M	data/easytag.desktop.in
+
+commit 5a09f61e5f9e783cc106a4d636320a465a57830c
+Author: David King <amigadave at amigadave.com>
+Date:	Tue Apr 22 15:49:21 2014 +0100
+
+    Remove a problematic debug string
+
+M	src/gio_wrapper.cc
+
+commit 09ed88358afcee1fc7b1d57e471ac434b66837bb
+Author: David King <amigadave at amigadave.com>
+Date:	Tue Apr 22 15:37:13 2014 +0100
+
+    Fix conversion specifier in debug string
+
+M	src/gio_wrapper.cc
+
+commit 49778c9145031a6421dd526fcf378535fc61c2b8
+Author: Ekaterina Gerasimova <kittykat3756 at gmail.com>
+Date:	Mon Apr 21 23:44:48 2014 +0100
+
+    Add HELP_LINGUAS to the help Makefile
+
+M	help/Makefile.am
+
+commit 3d5c161960d19f9c9668e43d31b0fe131ead4a9c
+Author: David King <amigadave at amigadave.com>
+Date:	Mon Apr 21 17:14:05 2014 +0100
+
+    Remove a useless debugging message
+
+M	src/picture.c
+
+commit 52531351eb2e33a750a25f0625f12991874e9896
+Author: David King <amigadave at amigadave.com>
+Date:	Mon Apr 21 16:18:12 2014 +0100
+
+    Fix compilation if Ogg support is not available
+
+    Add some ifdefs to check whether ENABLE_OGG is defined. Remove
+    leftover
+    prototype in WavPack tag code.
+
+M	src/ogg_tag.h
+M	src/vcedit.h
+M	src/wavpack_tag.c
+
+commit 270ef70bcb113ac05a1f80dccb466cba399f724e
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Apr 20 23:10:35 2014 +0100
+
+    Handle images with a reported size of zero
+
+    If a zero-byte file was encountered, such as when reading from a HTTP
+    server which does not report file sizes, a zero-byte buffer was
+    allocated and passed to g_input_stream_read_all(), triggering
+    an assert
+    in the image loading code.
+
+    Avoid the problem by treating a non-zero file size as an optimisation,
+    allocating a buffer for the input file if the size is available, and
+    splicing the file input stream to a GMemoryOutputStream.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=728602
+    https://retrace.fedoraproject.org/faf/problems/1662964/
+
+M	src/picture.c
+
+commit 5062c2f8ecdd731a07c0a3276d2ad1bc8c840c0a
+Author: David King <amigadave at amigadave.com>
+Date:	Sat Apr 19 10:29:44 2014 +0100
+
+    Fix automatic numbering of last track in view
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=728548
+
+M	src/easytag.c
+
+commit e61aca954e27620692872f548389d46d19d082a6
+Author: David King <amigadave at amigadave.com>
+Date:	Sat Apr 19 10:16:08 2014 +0100
+
+    Avoid a use-after-free when capitalizing words
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=728533
+
+M	src/easytag.c
+M	src/scan_dialog.c
+M	src/scan_dialog.h
+
+commit 79040333844d000f958bb666e1358ec0b7376a17
+Author: David King <amigadave at amigadave.com>
+Date:	Tue Apr 15 14:43:40 2014 +0100
+
+    Document libid3tag requirement in README
+
+M	README
+
+commit b48fcc236376c613c60be4bd01f5609b4a764a05
+Author: Rafael Ferreira <rafael.f.f1 at gmail.com>
+Date:	Mon Apr 14 23:05:58 2014 +0000
+
+    Updated Brazilian Portuguese translation
+
+M	po/pt_BR.po
+
+commit 47a36e75e0feef181bea5dc167bfe2351c158117
+Author: Roman Bogorodskiy <bogorodskiy at gmail.com>
+Date:	Mon Apr 14 12:00:24 2014 +0100
+
+    Fix C++ ID3 wrapper compilation
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=728113
+
+M	src/id3lib/c_wrapper.cpp
+
+commit ca31fae7477847348b2d0ece31cbe40024011969
+Author: Santtu Lakkala <inz at inz.fi>
+Date:	Mon Apr 14 11:17:59 2014 +0300
+
+    Drop sizeof when using G_N_ELEMENTS
+
+    The refactorization left extraneous sizeof when changing to
+    G_N_ELEMENTS.
+
+M	src/gio_wrapper.cc
+
+commit a528cc486d87f6f723faf444125cfc2edc604e30
+Author: Aurimas Černius <aurisc4 at gmail.com>
+Date:	Sun Apr 13 22:56:29 2014 +0300
+
+    Updated Lithuanian translation
+
+M	po/lt.po
+
+commit 29b05f841d8a21f429b3123c522f80783ab4e91f
+Author: Balázs Úr <urbalazs at src.gnome.org>
+Date:	Sun Apr 13 15:48:59 2014 +0200
+
+    Updated Hungarian translation
+
+M	po/hu.po
+
+commit 200f074a6d5a785e041024bba62271e3803f1702
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Apr 13 09:09:58 2014 +0100
+
+    Correct buffer type in C++ GIO wrapper
+
+M	src/gio_wrapper.cc
+
+commit fae43185e5d6beb78167c7c9ad7bfc4acf2451cb
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Apr 13 08:58:09 2014 +0100
+
+    Fix compilation if TagLib is not available
+
+    Thanks to Abhinav for the report.
+
+M	src/gio_wrapper.cc
+M	src/gio_wrapper.h
+
+commit e7ba89bd4110a1f42fde31cdf0cbaaccb349862c
+Author: Abhinav <abhijangda at hotmail.com>
+Date:	Sun Apr 13 11:05:17 2014 +0530
+
+    Add only numeric characters to TPOS in ID3 Tags
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=726467
+
+M	src/id3_tag.c
+M	src/id3_tag.h
+M	src/id3v24_tag.c
+
+commit 46aa58b0d722bb8f7b2aeb5da1f1617ca18e71d7
+Author: Matej Urbančič <mateju at svn.gnome.org>
+Date:	Sat Apr 12 18:59:41 2014 +0200
+
+    Updated Slovenian translation
+
+M	po/sl.po
+
+commit 98f092caf16e10aa0296de7e6d33da585f73abb3
+Author: David King <amigadave at amigadave.com>
+Date:	Sat Apr 12 14:05:20 2014 +0100
+
+    Bump TagLib dependency to 1.9.1 for MP4 codec enum
+
+M	configure.ac
+
+commit 5a73d051b844e8c8e01f0f8d51e8839e4de3bf1a
+Author: David King <amigadave at amigadave.com>
+Date:	Sat Apr 12 13:14:38 2014 +0100
+
+    Use CXXFLAGS from environment
+
+    Fix a typo when checking for warning options to pass to the C++
+    compiler, and ensure that CXXFLAGS set in the environment are
+    passed to
+    the compiler.
+
+M	configure.ac
+
 commit 049a6bef4fda3edb3701f11ec6adb438bbb4dac9
 Author: David King <amigadave at amigadave.com>
-Date:   Fri Apr 11 23:48:39 2014 +0100
+Date:	Fri Apr 11 23:48:39 2014 +0100
 
     Update NEWS for 2.2.0 release
 
diff --git a/INSTALL b/INSTALL
index 007e939..2099840 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,8 +12,8 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
diff --git a/Makefile.in b/Makefile.in
index 46c7b3c..43333d3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -948,8 +948,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -2461,10 +2461,16 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
@@ -2506,9 +2512,10 @@ distcheck: dist
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
diff --git a/NEWS b/NEWS
index 6882b57..aadb682 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+2.2.1 - 2014-04-22 :
+====================
+
+    * Fix image loading with HTTP URLs and empty images
+    * Fix bogus track numbers when automatically numbering files
+    * Add Opus and Speex MIME types to desktop file
+    * Abhinav Jangda’s fix for numeric characters in ID3 TPOS fields
+    * Roman Bogorodskiy’s ID3 wrapper compilation fix
+    * Improvements to MP4 GIO wrapper
+    * Fix a scanner bug when converting "%20" to " "
+    * Fix compilation if TagLib or libogg is unavailable
+    * Depend on TagLib 1.9.1 for MP4 support
+    * Use CXXFLAGS from the environment
+    * Rafael Ferrera’s Brazilian Portuguese translation update
+    * Aurimas Černius’s Lithuanian translation update
+    * Balázs Úr’s Hungarian translation update
+    * Matej Urbančič’s Slovenian translation update
+
 2.2.0 - 2014-04-11 :
 ====================
 
diff --git a/README b/README
index 0e16fe7..d345ae2 100644
--- a/README
+++ b/README
@@ -56,7 +56,8 @@ Installation
 
 * GLib version greater than 2.30.0 (http://www.gtk.org)
 * GTK+ version greater than 2.24.0 (http://www.gtk.org)
-* id3lib version greater than 3.7.12 (http://id3lib.sourceforge.net) (Recommended: id3lib-3.8.3)
+* libid3tag (http://www.underbit.com/products/mad) (if not deactivated by './configure --disable-mp3')
+* id3lib version greater than 3.7.12 (http://id3lib.sourceforge.net) (Recommended: id3lib-3.8.3) (if not deactivated by './configure --disable-id3v23')
 * flac (http://flac.sourceforge.net) (if not deactivated by './configure --disable-flac')
 * libogg and libvorbis (http://www.vorbis.com) (if not deactivated by './configure --disable-ogg')
 * opus and opusfile (http://www.opus-codec.org/) (if not deactivated by './configure --disable-opus')
diff --git a/aclocal.m4 b/aclocal.m4
index a8ddde0..74a0a95 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
@@ -581,10 +581,10 @@ m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])])
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.13'
+[am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.13.4], [],
+m4_if([$1], [1.14.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -600,7 +600,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.13.4])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -967,6 +967,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -1075,7 +1081,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake at gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -1083,7 +1130,6 @@ dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -1231,38 +1277,6 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
 # Copyright (C) 1997-2013 Free Software Foundation, Inc.
@@ -1333,6 +1347,70 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 1804e9f..9afd676 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,10 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012, 2013 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-12-29'
+timestamp='2013-11-29'
 
 # 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
@@ -26,7 +24,7 @@ timestamp='2012-12-29'
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner. 
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
@@ -52,9 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-2012, 2013 Free Software Foundation, Inc.
+Copyright 1992-2013 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."
@@ -136,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -857,21 +874,21 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -884,59 +901,54 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -955,54 +967,63 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1235,19 +1256,31 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 52f04bc..ece8142 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,10 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012, 2013 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-12-29'
+timestamp='2013-10-01'
 
 # 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
@@ -70,9 +68,7 @@ Report bugs and patches to <config-patches at gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-2012, 2013 Free Software Foundation, Inc.
+Copyright 1992-2013 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."
@@ -256,12 +252,12 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc \
+	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
 	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
 	| fido | fr30 | frv \
@@ -269,6 +265,7 @@ case $basic_machine in
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -290,16 +287,17 @@ case $basic_machine in
 	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 \
-	| or32 \
+	| or1k | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
@@ -327,7 +325,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -369,13 +367,13 @@ case $basic_machine in
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -384,6 +382,7 @@ case $basic_machine in
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
@@ -407,12 +406,13 @@ case $basic_machine in
 	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
 	| orion-* \
@@ -796,7 +796,7 @@ case $basic_machine in
 		os=-mingw64
 		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -832,7 +832,7 @@ case $basic_machine in
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
@@ -1354,7 +1354,7 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1500,9 +1500,6 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1551,6 +1548,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
 	hexagon-*)
 		os=-elf
 		;;
@@ -1594,6 +1594,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or1k-*)
+		os=-elf
+		;;
 	or32-*)
 		os=-coff
 		;;
diff --git a/build-aux/missing b/build-aux/missing
index cdea514..db98974 100755
--- a/build-aux/missing
+++ b/build-aux/missing
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
@@ -160,7 +160,7 @@ give_advice ()
       ;;
    autom4te*)
       echo "You might have modified some maintainer files that require"
-      echo "the 'automa4te' program to be rebuilt."
+      echo "the 'autom4te' program to be rebuilt."
       program_details 'autom4te'
       ;;
     bison*|yacc*)
diff --git a/build-aux/test-driver b/build-aux/test-driver
index 32bf39e..d306056 100755
--- a/build-aux/test-driver
+++ b/build-aux/test-driver
@@ -1,7 +1,7 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2012-06-27.10; # UTC
+scriptversion=2013-07-13.22; # UTC
 
 # Copyright (C) 2011-2013 Free Software Foundation, Inc.
 #
@@ -44,13 +44,12 @@ print_usage ()
 Usage:
   test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
               [--expect-failure={yes|no}] [--color-tests={yes|no}]
-              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+              [--enable-hard-errors={yes|no}] [--]
+              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
 The '--test-name', '--log-file' and '--trs-file' options are mandatory.
 END
 }
 
-# TODO: better error handling in option parsing (in particular, ensure
-# TODO: $log_file, $trs_file and $test_name are defined).
 test_name= # Used for reporting.
 log_file=  # Where to save the output of the test script.
 trs_file=  # Where to save the metadata of the test run.
@@ -69,10 +68,23 @@ while test $# -gt 0; do
   --enable-hard-errors) enable_hard_errors=$2; shift;;
   --) shift; break;;
   -*) usage_error "invalid option: '$1'";;
+   *) break;;
   esac
   shift
 done
 
+missing_opts=
+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
+test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
+test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
+if test x"$missing_opts" != x; then
+  usage_error "the following mandatory options are missing:$missing_opts"
+fi
+
+if test $# -eq 0; then
+  usage_error "missing argument"
+fi
+
 if test $color_tests = yes; then
   # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
   red='' # Red.
diff --git a/config.h.in b/config.h.in
index 148b0c0..80594fb 100644
--- a/config.h.in
+++ b/config.h.in
@@ -93,9 +93,6 @@
 /* id3lib patch level */
 #undef ID3LIB_PATCH
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
diff --git a/configure b/configure
index 97f0618..fea453f 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.69 for EasyTAG 2.2.0.
+# Generated by GNU Autoconf 2.69 for EasyTAG 2.2.1.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=easytag>.
 #
@@ -581,8 +581,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='EasyTAG'
 PACKAGE_TARNAME='easytag'
-PACKAGE_VERSION='2.2.0'
-PACKAGE_STRING='EasyTAG 2.2.0'
+PACKAGE_VERSION='2.2.1'
+PACKAGE_STRING='EasyTAG 2.2.1'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=easytag'
 PACKAGE_URL='https://wiki.gnome.org/Apps/EasyTAG'
 
@@ -1386,7 +1386,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.2.0 to adapt to many kinds of systems.
+\`configure' configures EasyTAG 2.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1456,7 +1456,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of EasyTAG 2.2.0:";;
+     short | recursive ) echo "Configuration of EasyTAG 2.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1591,7 +1591,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-EasyTAG configure 2.2.0
+EasyTAG configure 2.2.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1998,7 +1998,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.2.0, which was
+It was created by EasyTAG $as_me 2.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2381,7 +2381,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 
-am__api_version='1.13'
+am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2867,7 +2867,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='easytag'
- VERSION='2.2.0'
+ VERSION='2.2.1'
 
 
 # Some tools Automake needs.
@@ -2909,6 +2909,47 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake at gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
@@ -3838,6 +3879,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -5197,6 +5297,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -5325,131 +5484,6 @@ else
 fi
 
 
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -7501,7 +7535,7 @@ fi
 
 
 
-TAGLIB_DEPS="taglib >= 1.6.0"
+TAGLIB_DEPS="taglib >= 1.9.1"
 if test "x$enable_mp4" != "xno"; then :
   if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$TAGLIB_DEPS\""; } >&5
@@ -7775,9 +7809,9 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-realsave_CFLAGS="$CXXFLAGS"
+realsave_CXXFLAGS="$CXXFLAGS"
 for option in $warning_flags; do
-    save_CFLAGS="$CXXFLAGS"
+    save_CXXFLAGS="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -Werror $option"
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the c++ compiler understands $option" >&5
 $as_echo_n "checking whether the c++ compiler understands $option... " >&6; }
@@ -7806,7 +7840,7 @@ $as_echo "$has_option" >&6; }
   tested_cxx_warning_flags="$tested_cxx_warning_flags $option"
 fi
 	unset has_option
-	unset save_CFLAGS
+	unset save_CXXFLAGS
 done
 unset option
 CXXFLAGS="$realsave_CXXFLAGS"
@@ -8967,7 +9001,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.2.0, which was
+This file was extended by EasyTAG $as_me 2.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9034,7 +9068,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-EasyTAG config.status 2.2.0
+EasyTAG config.status 2.2.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index ae11d83..b484d09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ([2.64])
 
 dnl To set also in config.h.mingw
 dnl defines ($PACKAGE_NAME, $PACKAGE_VERSION, etc.)
-AC_INIT([EasyTAG], [2.2.0], [https://bugzilla.gnome.org/enter_bug.cgi?product=easytag], [easytag], [https://wiki.gnome.org/Apps/EasyTAG])
+AC_INIT([EasyTAG], [2.2.1], [https://bugzilla.gnome.org/enter_bug.cgi?product=easytag], [easytag], [https://wiki.gnome.org/Apps/EasyTAG])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
@@ -283,7 +283,7 @@ dnl ################################################
 dnl # taglib library
 dnl ################################################
 
-TAGLIB_DEPS="taglib >= 1.6.0"
+TAGLIB_DEPS="taglib >= 1.9.1"
 AS_IF([test "x$enable_mp4" != "xno"],
       [PKG_CHECK_EXISTS([$TAGLIB_DEPS], [have_taglib=yes], [have_taglib=no])],
       [have_taglib=no])
@@ -344,9 +344,9 @@ CFLAGS="$realsave_CFLAGS"
 AC_SUBST([WARN_CFLAGS], ["$tested_warning_flags"])
 AC_LANG_PUSH([C++])
 
-realsave_CFLAGS="$CXXFLAGS"
+realsave_CXXFLAGS="$CXXFLAGS"
 for option in $warning_flags; do
-    save_CFLAGS="$CXXFLAGS"
+    save_CXXFLAGS="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -Werror $option"
 	AC_MSG_CHECKING([whether the c++ compiler understands $option])
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM], [has_option=yes], [has_option=no])
@@ -355,7 +355,7 @@ for option in $warning_flags; do
 	AS_IF([test $has_option = yes],
 	      [tested_cxx_warning_flags="$tested_cxx_warning_flags $option"])
 	unset has_option
-	unset save_CFLAGS
+	unset save_CXXFLAGS
 done
 unset option
 CXXFLAGS="$realsave_CXXFLAGS"
diff --git a/data/easytag.desktop.in b/data/easytag.desktop.in
index 4c08ea6..4e8a4ef 100644
--- a/data/easytag.desktop.in
+++ b/data/easytag.desktop.in
@@ -7,7 +7,7 @@ _Keywords=mp3;tag;audio;
 Type=Application
 Icon=easytag
 Categories=GTK;AudioVideo;AudioVideoEditing;Audio;
-MimeType=inode/directory;audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape;
+MimeType=inode/directory;audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape;audio/x-speex+ogg;audio/x-opus+ogg;
 Exec=easytag %F
 Terminal=false
 StartupNotify=true
diff --git a/help/Makefile.am b/help/Makefile.am
index 470fba4..ee3c778 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -24,3 +24,5 @@ HELP_FILES = \
 
 HELP_MEDIA = \
 	media/icon.png
+
+HELP_LINGUAS =
diff --git a/help/Makefile.in b/help/Makefile.in
index 5c6d0e6..9feb8b4 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -280,6 +280,7 @@ HELP_FILES = \
 HELP_MEDIA = \
 	media/icon.png
 
+HELP_LINGUAS = 
 all: all-am
 
 .SUFFIXES:
diff --git a/po/hu.po b/po/hu.po
index 9ec7b72..e0ba4b3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,29 +6,33 @@
 # Nagy Boldizsar <boldi01 at freemail.hu>, 2002, 2003, 2004.
 # Mészáros Csaba <csablak at freemail.hu>, 2005, 2006, 2007.
 # Balázs Úr <urbalazs at gmail dot com>, 2013, 2014.
+# Balázs Úr <urbalazs at gmail.com>, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: 914hu\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=easytag&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-07 22:43+0000\n"
-"PO-Revision-Date: 2014-03-08 07:07+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2014-04-12 18:50+0000\n"
+"PO-Revision-Date: 2014-04-13 15:48+0200\n"
+"Last-Translator: Balázs Úr <urbalazs at gmail.com>\n"
 "Language-Team: Hungarian <kde-i18n-doc at kde.org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/easytag.appdata.xml.in.h:1
+#| msgid ""
+#| "View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Vorbis, MusePack, "
+#| "Monkey's Audio and WavPack files."
 msgid ""
-"View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Vorbis, MusePack, "
-"Monkey's Audio and WavPack files."
+"View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg "
+"Vorbis, MusePack, Monkey's Audio and WavPack files."
 msgstr ""
-"Címkék megtekintése és szerkesztése MP3, MP2, MP4/AAC, FLAC, Ogg Vorbis, "
-"MusePack, Monkey hang és WavPack fájlokhoz."
+"Címkék megtekintése és szerkesztése MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg "
+"Speex, Ogg Vorbis, MusePack, Monkey hang és WavPack fájlokhoz."
 
 #: ../data/easytag.appdata.xml.in.h:2
 msgid ""
@@ -59,35 +63,8 @@ msgstr "Hangfájl metaadatok szerkesztése"
 msgid "mp3;tag;audio;"
 msgstr "mp3;címke;hang;"
 
-#: ../src/about.c:91
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
-"Ez a program szabad szoftver, terjesztheti és/vagy módosíthatja a Free "
-"Software Foundation által kiadott GNU General Public License második (vagy "
-"bármely későbbi) változatában foglaltak alapján.\n"
-"\n"
-"Ezt a programot abban a reményben terjesztjük, hogy hasznos lesz, de nem "
-"vállalunk SEMMIFÉLE GARANCIÁT, még olyan értelemben sem, hogy a program "
-"alkalmas-e a KÖZREADÁSRA vagy EGY BIZONYOS FELADAT ELVÉGZÉSÉRE. További "
-"részletekért tanulmányozza a GNU GPL licencet.\n"
-"\n"
-"A programhoz a GNU General Public License egy példánya is jár, ha nem kapta "
-"meg, látogassa meg a <http://www.gnu.org/licenses/> oldalt."
-
 #. Translators: put your own name here to appear in the about dialog.
-#: ../src/about.c:108
+#: ../src/about.c:89
 msgid "translator-credits"
 msgstr ""
 "Mészáros Csaba <csablak at freemail.hu>\n"
@@ -95,13 +72,14 @@ msgstr ""
 "Szél Miklós <mukka at freemail.hu>\n"
 "Úr Balázs <urbalazs at gmail.com>"
 
-#: ../src/about.c:118
+#: ../src/about.c:99
 msgid "View and edit tags in audio files"
 msgstr "Hangfájlokban lévő címkék megtekintése és szerkesztése"
 
-#. g_print(_("Error while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: ../src/ape_tag.c:61 ../src/id3v24_tag.c:112 ../src/mp4_header.c:63
-#: ../src/mp4_tag.c:65 ../src/mp4_tag.c:186
+#: ../src/ape_tag.c:61 ../src/id3v24_tag.c:112 ../src/mp4_header.cc:46
+#: ../src/mp4_header.cc:59 ../src/mp4_tag.cc:69 ../src/mp4_tag.cc:85
+#: ../src/mp4_tag.cc:90 ../src/mp4_tag.cc:262 ../src/mp4_tag.cc:278
+#: ../src/mp4_tag.cc:283
 #, c-format
 msgid "Error while opening file: '%s' (%s)."
 msgstr "Hiba a(z) „%s” fájl megnyitása közben (%s)."
@@ -123,686 +101,686 @@ msgstr "- Hangfájlok címkézése és átnevezése"
 #.
 #. * Main Menu Actions
 #.
-#: ../src/bar.c:154
+#: ../src/bar.c:155
 msgid "_File"
 msgstr "_Fájl"
 
 # Fájl menü
-#: ../src/bar.c:155
+#: ../src/bar.c:156
 msgid "Sort List by Tag"
 msgstr "Lista rendezése címke szerint"
 
 # Fájl menü
-#: ../src/bar.c:158
+#: ../src/bar.c:159
 msgid "Sort List by Property"
 msgstr "Lista rendezése tulajdonság szerint"
 
-#: ../src/bar.c:159
+#: ../src/bar.c:160
 msgid "Ascending by filename"
 msgstr "Fájlnév szerint növekvően"
 
-#: ../src/bar.c:160
+#: ../src/bar.c:161
 msgid "Descending by filename"
 msgstr "Fájlnév szerint csökkenően"
 
-#: ../src/bar.c:161
+#: ../src/bar.c:162
 msgid "Ascending by creation date"
 msgstr "Létrehozás időpontja szerint növekvően"
 
-#: ../src/bar.c:162
+#: ../src/bar.c:163
 msgid "Descending by creation date"
 msgstr "Létrehozás időpontja szerint csökkenően"
 
-#: ../src/bar.c:163
+#: ../src/bar.c:164
 msgid "Ascending by track number"
 msgstr "Sorszám szerint növekvően"
 
-#: ../src/bar.c:164
+#: ../src/bar.c:165
 msgid "Descending by track number"
 msgstr "Sorszám szerint csökkenően"
 
-#: ../src/bar.c:165
+#: ../src/bar.c:166
 msgid "Ascending by title"
 msgstr "Cím szerint növekvően"
 
-#: ../src/bar.c:166
+#: ../src/bar.c:167
 msgid "Descending by title"
 msgstr "Cím szerint csökkenően"
 
-#: ../src/bar.c:167
+#: ../src/bar.c:168
 msgid "Ascending by artist"
 msgstr "Előadó szerint növekvően"
 
-#: ../src/bar.c:168
+#: ../src/bar.c:169
 msgid "Descending by artist"
 msgstr "Előadó szerint csökkenően"
 
-#: ../src/bar.c:169
+#: ../src/bar.c:170
 msgid "Ascending by album artist"
 msgstr "Album előadó szerint növekvően"
 
-#: ../src/bar.c:170
+#: ../src/bar.c:171
 msgid "Descending by album artist"
 msgstr "Album előadó szerint csökkenően"
 
-#: ../src/bar.c:171
+#: ../src/bar.c:172
 msgid "Ascending by album"
 msgstr "Album szerint növekvően"
 
-#: ../src/bar.c:172
+#: ../src/bar.c:173
 msgid "Descending by album"
 msgstr "Album szerint csökkenően"
 
-#: ../src/bar.c:173
+#: ../src/bar.c:174
 msgid "Ascending by year"
 msgstr "Év szerint növekvően"
 
-#: ../src/bar.c:174
+#: ../src/bar.c:175
 msgid "Descending by year"
 msgstr "Év szerint csökkenően"
 
-#: ../src/bar.c:175
+#: ../src/bar.c:176
 msgid "Ascending by genre"
 msgstr "Műfaj szerint növekvően"
 
-#: ../src/bar.c:176
+#: ../src/bar.c:177
 msgid "Descending by genre"
 msgstr "Műfaj szerint csökkenően"
 
-#: ../src/bar.c:177
+#: ../src/bar.c:178
 msgid "Ascending by comment"
 msgstr "Megjegyzés szerint növekvően"
 
-#: ../src/bar.c:178
+#: ../src/bar.c:179
 msgid "Descending by comment"
 msgstr "Megjegyzés szerint csökkenően"
 
-#: ../src/bar.c:179
+#: ../src/bar.c:180
 msgid "Ascending by composer"
 msgstr "Zeneszerző szerint növekvően"
 
-#: ../src/bar.c:180
+#: ../src/bar.c:181
 msgid "Descending by composer"
 msgstr "Zeneszerző szerint csökkenően"
 
-#: ../src/bar.c:181
+#: ../src/bar.c:182
 msgid "Ascending by original artist"
 msgstr "Eredeti előadó szerint növekvően"
 
-#: ../src/bar.c:182
+#: ../src/bar.c:183
 msgid "Descending by original artist"
 msgstr "Eredeti előadó szerint csökkenően"
 
-#: ../src/bar.c:183
+#: ../src/bar.c:184
 msgid "Ascending by copyright"
 msgstr "Szerzői jog szerint növekvően"
 
-#: ../src/bar.c:184
+#: ../src/bar.c:185
 msgid "Descending by copyright"
 msgstr "Szerzői jog szerint csökkenően"
 
-#: ../src/bar.c:185
+#: ../src/bar.c:186
 msgid "Ascending by URL"
 msgstr "URL szerint növekvően"
 
-#: ../src/bar.c:186
+#: ../src/bar.c:187
 msgid "Descending by URL"
 msgstr "URL szerint csökkenően"
 
 #. Translators: the encoder name is supposed to be the name of a person
 #. * or organisation, but can sometimes be the name of an application.
-#: ../src/bar.c:189
+#: ../src/bar.c:190
 msgid "Ascending by encoder name"
 msgstr "Kódoló neve szerint növekvően"
 
 #. Translators: the encoder name is supposed to be the name of a person
 #. * or organisation, but can sometimes be the name of an application.
-#: ../src/bar.c:192
+#: ../src/bar.c:193
 msgid "Descending by encoder name"
 msgstr "Kódoló neve szerint csökkenően"
 
-#: ../src/bar.c:193
+#: ../src/bar.c:194
 msgid "Ascending by file type"
 msgstr "Fájltípus szerint növekvően"
 
-#: ../src/bar.c:194
+#: ../src/bar.c:195
 msgid "Descending by file type"
 msgstr "Fájltípus szerint csökkenően"
 
-#: ../src/bar.c:195
+#: ../src/bar.c:196
 msgid "Ascending by file size"
 msgstr "Fájlméret szerint növekvően"
 
-#: ../src/bar.c:196
+#: ../src/bar.c:197
 msgid "Descending by file size"
 msgstr "Fájlméret szerint csökkenően"
 
-#: ../src/bar.c:197
+#: ../src/bar.c:198
 msgid "Ascending by duration"
 msgstr "Időtartam szerint növekvően"
 
-#: ../src/bar.c:198
+#: ../src/bar.c:199
 msgid "Descending by duration"
 msgstr "Időtartam szerint csökkenően"
 
-#: ../src/bar.c:199
+#: ../src/bar.c:200
 msgid "Ascending by bitrate"
 msgstr "Bitráta szerint növekvően"
 
-#: ../src/bar.c:200
+#: ../src/bar.c:201
 msgid "Descending by bitrate"
 msgstr "Bitráta szerint csökkenően"
 
-#: ../src/bar.c:201
+#: ../src/bar.c:202
 msgid "Ascending by samplerate"
 msgstr "Minőség szerint növekvően"
 
-#: ../src/bar.c:202
+#: ../src/bar.c:203
 msgid "Descending by samplerate"
 msgstr "Minőség szerint csökkenően"
 
-#: ../src/bar.c:204
+#: ../src/bar.c:205
 msgid "Open Files With…"
 msgstr "Fájlok megnyitás ezzel…"
 
-#: ../src/bar.c:205
+#: ../src/bar.c:206
 msgid "Run a command on the selected files"
 msgstr "Parancs futtatása a kijelölt fájlokon"
 
-#: ../src/bar.c:208
+#: ../src/bar.c:209
 msgid "Select all"
 msgstr "Összes kijelölése"
 
 # Fájl menü és bubble help egyben
-#: ../src/bar.c:209
+#: ../src/bar.c:210
 msgid "Unselect All"
 msgstr "Kijelölés megszüntetése"
 
-#: ../src/bar.c:210
+#: ../src/bar.c:211
 msgid "Clear the current selection"
 msgstr "A jelenlegi kijelölés törlése"
 
 # Fájl menü
-#: ../src/bar.c:213
+#: ../src/bar.c:214
 msgid "Invert File Selection"
 msgstr "Fájlkijelölés megfordítása"
 
-#: ../src/bar.c:214
+#: ../src/bar.c:215
 msgid "Invert file selection"
 msgstr "Fájlkijelölés megfordítása"
 
 # Fájl menü
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete Files"
 msgstr "Fájlok törlése"
 
 # Fájl menü
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete files"
 msgstr "Fájlok törlése"
 
 # Fájl menü
-#: ../src/bar.c:217
+#: ../src/bar.c:218
 msgid "_First File"
 msgstr "_Első fájl"
 
 # ikon megjegyzés
-#: ../src/bar.c:218
+#: ../src/bar.c:219
 msgid "First file"
 msgstr "Első fájl"
 
 # Fájl menü
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "_Previous File"
 msgstr "Elő_ző fájl"
 
 # ikon megjegyzés
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "Previous file"
 msgstr "Előző fájl"
 
 # Fájl menü
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "_Next File"
 msgstr "_Következő fájl"
 
 # ikon megjegyzés
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "Next file"
 msgstr "Következő fájl"
 
 # Fájl menü
-#: ../src/bar.c:221
+#: ../src/bar.c:222
 msgid "_Last File"
 msgstr "_Utolsó fájl"
 
 # ikon megjegyzés
-#: ../src/bar.c:222
+#: ../src/bar.c:223
 msgid "Last file"
 msgstr "Utolsó fájl"
 
 # Fájl menü
-#: ../src/bar.c:223
+#: ../src/bar.c:224
 msgid "S_can Files"
 msgstr "Fájlok _vizsgálata"
 
 # Fájl menü
-#: ../src/bar.c:224 ../src/scan.c:2344
+#: ../src/bar.c:225 ../src/scan_dialog.c:1814
 msgid "Scan selected files"
 msgstr "A kijelölt fájlok vizsgálata"
 
 # Fájl menü
-#: ../src/bar.c:225
+#: ../src/bar.c:226
 msgid "_Remove Tags"
 msgstr "Címkék _eltávolítása"
 
 # ikon megjegyzés
-#: ../src/bar.c:226
+#: ../src/bar.c:227
 msgid "Remove tags"
 msgstr "Címkék eltávolítása"
 
 # Fájl menü
-#: ../src/bar.c:227
+#: ../src/bar.c:228
 msgid "_Undo Last Files Changes"
 msgstr "_Utolsó fájlmódosítások visszavonása"
 
 # Fájl menü
-#: ../src/bar.c:228
+#: ../src/bar.c:229
 msgid "Undo last files changes"
 msgstr "Utolsó fájlmódosítások visszavonása"
 
 # Fő menü
-#: ../src/bar.c:230
+#: ../src/bar.c:231
 msgid "R_edo Last Files Changes"
 msgstr "U_tolsó fájlmódosítások ismétlése"
 
 # ikon megjegyzés
-#: ../src/bar.c:231
+#: ../src/bar.c:232
 msgid "Redo last files changes"
 msgstr "Utolsó fájlmódosítások ismétlése"
 
 # Fő menü
-#: ../src/bar.c:233
+#: ../src/bar.c:234
 msgid "_Save Files"
 msgstr "Fájlok _mentése"
 
-#: ../src/bar.c:234
+#: ../src/bar.c:235
 msgid "Save changes to selected files"
 msgstr "Változtatások mentése a kijelölt fájlokba"
 
 # Fájl menü
-#: ../src/bar.c:236
+#: ../src/bar.c:237
 msgid "_Force Save Files"
 msgstr "Fájlok ké_nyszerített mentése"
 
 # ikon megjegyzés
-#: ../src/bar.c:237
+#: ../src/bar.c:238
 msgid "Force saving files"
 msgstr "Fájlok kényszerített mentése"
 
 # Fájl menü
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo Last Changes"
 msgstr "Utolsó változtatások visszavonása"
 
 # Fájl menü
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo last changes"
 msgstr "Utolsó változtatások visszavonása"
 
 # ikon megjegyzés
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo Last Changes"
 msgstr "Utolsó változtatások ismétlése"
 
 # ikon megjegyzés
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo last changes"
 msgstr "Utolsó változtatások ismétlése"
 
 # Fő menü
-#: ../src/bar.c:241
+#: ../src/bar.c:242
 msgid "_Quit"
 msgstr "_Kilépés"
 
 # ikon megjegyzés
-#: ../src/bar.c:241 ../src/easytag.c:2430 ../src/easytag.c:4531
-#: ../src/easytag.c:4563
+#: ../src/bar.c:242 ../src/easytag.c:2430 ../src/easytag.c:4565
+#: ../src/easytag.c:4597
 msgid "Quit"
 msgstr "Kilépés"
 
 # Menüsor
-#: ../src/bar.c:244
+#: ../src/bar.c:245
 msgid "_Browser"
 msgstr "_Böngésző"
 
 # Böngésző menü
-#: ../src/bar.c:245
+#: ../src/bar.c:246
 msgid "_Home Directory"
 msgstr "_Saját könyvtár"
 
 # ikon megjegyzés
-#: ../src/bar.c:246
+#: ../src/bar.c:247
 msgid "Go to home directory"
 msgstr "Ugrás a kezdő könyvtárra"
 
 # Ikon megjegyzés
-#: ../src/bar.c:248
+#: ../src/bar.c:249
 msgid "Desktop Directory"
 msgstr "Asztal könyvtár"
 
 # Ikon megjegyzés
-#: ../src/bar.c:249
+#: ../src/bar.c:250
 msgid "Go to desktop directory"
 msgstr "Ugrás az asztal könyvtárra"
 
 # ikon megjegyzés
-#: ../src/bar.c:251
+#: ../src/bar.c:252
 msgid "Documents Directory"
 msgstr "Dokumentumok könyvtár"
 
 # ikon megjegyzés
-#: ../src/bar.c:252
+#: ../src/bar.c:253
 msgid "Go to documents directory"
 msgstr "Ugrás a dokumentumok könyvtárra"
 
 # ikon megjegyzés
-#: ../src/bar.c:254
+#: ../src/bar.c:255
 msgid "Downloads Directory"
 msgstr "Letöltések könyvtár"
 
 # ikon megjegyzés
-#: ../src/bar.c:255
+#: ../src/bar.c:256
 msgid "Go to downloads directory"
 msgstr "Ugrás a letöltések könyvtárra"
 
 # ikon megjegyzés
-#: ../src/bar.c:257
+#: ../src/bar.c:258
 msgid "Music Directory"
 msgstr "Zene könyvtár"
 
 # ikon megjegyzés
-#: ../src/bar.c:258
+#: ../src/bar.c:259
 msgid "Go to music directory"
 msgstr "Ugrás a zene könyvtárra"
 
-#: ../src/bar.c:260
+#: ../src/bar.c:261
 msgid "_Parent Directory"
 msgstr "S_zülő könyvtár"
 
-#: ../src/bar.c:261
+#: ../src/bar.c:262
 msgid "Go to parent directory"
 msgstr "Ugrás a szülő könyvtárba"
 
 # Ikon megjegyzés
-#: ../src/bar.c:263
+#: ../src/bar.c:264
 msgid "_Default Directory"
 msgstr "_Alapértelmezett könyvtár"
 
 # Ikon megjegyzés
-#: ../src/bar.c:264
+#: ../src/bar.c:265
 msgid "Go to default directory"
 msgstr "Ugrás az alapértelmezett könyvtárra"
 
 # Böngésző menü
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set _Current Path as Default"
 msgstr "_Jelenlegi útvonal alapértelmezetté tétele"
 
 # ikon megjegyzés
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set current path as default"
 msgstr "Jelenlegi útvonal alapértelmezetté tétele"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename Directory…"
 msgstr "Könyvtár átnevezése…"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename directory"
 msgstr "Könyvtár átnevezése"
 
 # böngésző menü
-#: ../src/bar.c:268
+#: ../src/bar.c:269
 msgid "Reload Directory"
 msgstr "Könyvtár újratöltése"
 
 # böngésző menü
-#: ../src/bar.c:269
+#: ../src/bar.c:270
 msgid "Reload directory"
 msgstr "Könyvtár újratöltése"
 
 # böngésző menü
-#: ../src/bar.c:272
+#: ../src/bar.c:273
 msgid "Browse Directory With…"
 msgstr "Könyvtár böngészése ezzel…"
 
-#: ../src/bar.c:273
+#: ../src/bar.c:274
 msgid "Run a command on the directory"
 msgstr "Parancs futtatása a könyvtáron"
 
 # böngésző menü
-#: ../src/bar.c:275
+#: ../src/bar.c:276
 msgid "_Collapse Tree"
 msgstr "Fa össze_csukása"
 
 # böngésző menü
-#: ../src/bar.c:276
+#: ../src/bar.c:277
 msgid "Collapse directory tree"
 msgstr "Könyvtárfa összecsukása"
 
-#: ../src/bar.c:277
+#: ../src/bar.c:278
 msgid "_Reload Tree"
 msgstr "Fa új_ratöltése"
 
 # böngésző menü
-#: ../src/bar.c:278
+#: ../src/bar.c:279
 msgid "Reload directory tree"
 msgstr "Könyvtárfa újratöltése"
 
 # Menüsor
-#: ../src/bar.c:281
+#: ../src/bar.c:282
 msgid "S_canner Mode"
 msgstr "Fel_dolgozó mód"
 
-#: ../src/bar.c:283
+#: ../src/bar.c:284
 msgid "_Miscellaneous"
 msgstr "_Egyebek"
 
-#: ../src/bar.c:284
+#: ../src/bar.c:285
 msgid "_Find…"
 msgstr "_Keresés…"
 
-#: ../src/bar.c:285
+#: ../src/bar.c:286
 msgid "Search filenames and tags"
 msgstr "Fájlnevek és címkék keresése"
 
-#: ../src/bar.c:287
+#: ../src/bar.c:288
 msgid "CDD_B Search…"
 msgstr "CD-adat_bázis keresés…"
 
 # ikon megjegyzés
-#: ../src/bar.c:288
+#: ../src/bar.c:289
 msgid "CDDB search"
 msgstr "CD-adatbázis keresés"
 
 # egyéb menü
-#: ../src/bar.c:290
+#: ../src/bar.c:291
 msgid "Load Filenames From a Text File…"
 msgstr "Fájlnevek betöltése szövegfájlból…"
 
-#: ../src/bar.c:291
+#: ../src/bar.c:292
 msgid "Load filenames from a text file"
 msgstr "Fájlnevek betöltése szövegfájlból"
 
-#: ../src/bar.c:293
+#: ../src/bar.c:294
 msgid "Generate Playlist…"
 msgstr "Lejátszólista előállítása…"
 
-#: ../src/bar.c:294
+#: ../src/bar.c:295
 msgid "Generate a playlist"
 msgstr "Lejátszólista előállítása"
 
 # egyéb menü
-#: ../src/bar.c:296 ../src/bar.c:327 ../src/bar.c:328 ../src/bar.c:329
+#: ../src/bar.c:297 ../src/bar.c:328 ../src/bar.c:329 ../src/bar.c:330
 msgid "Run Audio Player"
 msgstr "Zenelejátszó futtatása"
 
 # egyéb menü
-#: ../src/bar.c:297 ../src/bar.c:327 ../src/bar.c:328 ../src/bar.c:329
+#: ../src/bar.c:298 ../src/bar.c:328 ../src/bar.c:329 ../src/bar.c:330
 msgid "Run audio player"
 msgstr "Zenelejátszó futtatása"
 
-#: ../src/bar.c:300
+#: ../src/bar.c:301
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
 # beállítások menü
-#: ../src/bar.c:301
+#: ../src/bar.c:302
 msgid "_Preferences"
 msgstr "_Beállítások"
 
 #. The window
-#: ../src/bar.c:302 ../src/prefs.c:110
+#: ../src/bar.c:303 ../src/prefs.c:110
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../src/bar.c:304
+#: ../src/bar.c:305
 msgid "_View"
 msgstr "_Nézet"
 
-#: ../src/bar.c:305
+#: ../src/bar.c:306
 msgid "_Go"
 msgstr "_Ugrás"
 
 # Menüsor
-#: ../src/bar.c:307
+#: ../src/bar.c:308
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ../src/bar.c:310
+#: ../src/bar.c:311
 msgid "_Contents"
 msgstr "_Tartalom"
 
-#: ../src/bar.c:311
+#: ../src/bar.c:312
 msgid "Show help"
 msgstr "Súgó megjelenítése"
 
-#: ../src/bar.c:313
+#: ../src/bar.c:314
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../src/bar.c:313
+#: ../src/bar.c:314
 msgid "About"
 msgstr "Névjegy"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: ../src/bar.c:319
+#: ../src/bar.c:320
 msgid "Stop the current action"
 msgstr "Jelenlegi művelet leállítása"
 
 #.
 #. * Popup menu's Actions
 #.
-#: ../src/bar.c:325
+#: ../src/bar.c:326
 msgid "_File Operations"
 msgstr "_Fájlműveletek"
 
 # Menüsor
-#: ../src/bar.c:326
+#: ../src/bar.c:327
 msgid "S_canner"
 msgstr "Fel_dolgozó"
 
-#: ../src/bar.c:330
+#: ../src/bar.c:331
 msgid "CDDB Search Files…"
 msgstr "Fájl keresése CD-adatbázisban…"
 
-#: ../src/bar.c:330
+#: ../src/bar.c:331
 msgid "CDDB search files…"
 msgstr "Fájl keresése CD-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:334
+#: ../src/bar.c:335
 msgid "Clear log"
 msgstr "Napló törlése"
 
 # böngésző menü
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Subdirectories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: ../src/bar.c:341
+#: ../src/bar.c:342
 msgid "Browse _Subdirectories"
 msgstr "_Alkönyvtárak böngészése"
 
 # böngésző menü
-#: ../src/bar.c:341
+#: ../src/bar.c:342
 msgid "Browse subdirectories"
 msgstr "Alkönyvtárak böngészése"
 
-#: ../src/bar.c:345
+#: ../src/bar.c:346
 msgid "Show Hidden Directories"
 msgstr "Rejtett könyvtárak megjelenítése"
 
-#: ../src/bar.c:345
+#: ../src/bar.c:346
 msgid "Show hidden directories"
 msgstr "Rejtett könyvtárak megjelenítése"
 
-#: ../src/bar.c:347
+#: ../src/bar.c:348
 msgid "_Show Scanner"
 msgstr "Feldolgozó _megjelenítése"
 
-#: ../src/bar.c:348
+#: ../src/bar.c:349
 msgid "Show scanner"
 msgstr "Feldolgozó megjelenítése"
 
-#: ../src/bar.c:354
+#: ../src/bar.c:355
 msgid "Tree Browser"
 msgstr "Fa böngésző"
 
-#: ../src/bar.c:355
+#: ../src/bar.c:356
 msgid "View by directory tree"
 msgstr "Könyvtárfa szerinti nézet"
 
-#: ../src/bar.c:357
+#: ../src/bar.c:358
 msgid "Artist and Album"
 msgstr "Előadó és album"
 
-#: ../src/bar.c:358
+#: ../src/bar.c:359
 msgid "View by artist and album"
 msgstr "Előadó és album szerinti nézet"
 
 # feldolgozó menü
-#: ../src/bar.c:363
+#: ../src/bar.c:364
 msgid "_Fill Tags…"
 msgstr "Címkék _kitöltése…"
 
-#: ../src/bar.c:364
+#: ../src/bar.c:365
 msgid "Fill tags"
 msgstr "Címkék kitöltése"
 
-#: ../src/bar.c:366
+#: ../src/bar.c:367
 msgid "_Rename Files and Directories…"
 msgstr "Fájlok és könyvtárak át_nevezése…"
 
-#: ../src/bar.c:367
+#: ../src/bar.c:368
 msgid "Rename files and directories"
 msgstr "Fájlok és könyvtárak átnevezése"
 
-#: ../src/bar.c:369
+#: ../src/bar.c:370
 msgid "_Process Fields…"
 msgstr "Mezök fel_dolgozása…"
 
-#: ../src/bar.c:369 ../src/scan.c:182
+#: ../src/bar.c:370 ../src/scan_dialog.c:184
 msgid "Process Fields"
 msgstr "Mezök feldolgozása"
 
-#: ../src/bar.c:427
+#: ../src/bar.c:428
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Az UI egyesítése nem lehetséges, a hiba: %s\n"
 
-#: ../src/bar.c:532
+#: ../src/bar.c:533
 msgid "Ready to start"
 msgstr "Indításra kész"
 
@@ -810,7 +788,7 @@ msgstr "Indításra kész"
 msgid "New default path for files selected"
 msgstr "Új alapértelmezett útvonal kiválasztva a fájlokhoz"
 
-#: ../src/browser.c:678 ../src/easytag.c:4527
+#: ../src/browser.c:678 ../src/easytag.c:4561
 msgid "Some files have been modified but not saved"
 msgstr "Néhány fájl módosult de nincs elmentve"
 
@@ -822,101 +800,101 @@ msgstr "El szeretné menteni azokat, mielőtt könyvtárat vált?"
 msgid "Confirm Directory Change"
 msgstr "Könyvtárváltás megerősítése"
 
-#: ../src/browser.c:2141
+#: ../src/browser.c:2146
 msgid "<All albums>"
 msgstr "<Minden album>"
 
-#: ../src/browser.c:2602
+#: ../src/browser.c:2607
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Hiba: %s kereséskor nem található %s csomópont a fában."
 
-#: ../src/browser.c:3096 ../src/browser.c:3174
+#: ../src/browser.c:3101 ../src/browser.c:3179
 msgid "Tree"
 msgstr "Fa"
 
-#: ../src/browser.c:3097 ../src/cddb.c:803 ../src/misc.c:1902
+#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1899
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: ../src/browser.c:3097 ../src/cddb.c:804 ../src/misc.c:1903
+#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1900
 #: ../src/prefs.c:643
 msgid "Title"
 msgstr "Cím"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Artist".
-#: ../src/browser.c:3098 ../src/browser.c:3105 ../src/cddb.c:483
-#: ../src/cddb.c:805 ../src/misc.c:1904 ../src/prefs.c:644
+#: ../src/browser.c:3103 ../src/browser.c:3110 ../src/cddb.c:483
+#: ../src/cddb.c:805 ../src/misc.c:1901 ../src/prefs.c:644
 msgid "Artist"
 msgstr "Előadó"
 
-#: ../src/browser.c:3098 ../src/misc.c:1905
+#: ../src/browser.c:3103 ../src/misc.c:1902
 msgid "Album Artist"
 msgstr "Album előadója"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Album".
-#: ../src/browser.c:3099 ../src/browser.c:3107 ../src/cddb.c:486
-#: ../src/cddb.c:806 ../src/misc.c:1906 ../src/prefs.c:645
+#: ../src/browser.c:3104 ../src/browser.c:3112 ../src/cddb.c:486
+#: ../src/cddb.c:806 ../src/misc.c:1903 ../src/prefs.c:645
 msgid "Album"
 msgstr "Album"
 
-#: ../src/browser.c:3099 ../src/cddb.c:807 ../src/misc.c:1908
+#: ../src/browser.c:3104 ../src/cddb.c:807 ../src/misc.c:1905
 msgid "Year"
 msgstr "Év"
 
-#: ../src/browser.c:3099
+#: ../src/browser.c:3104
 msgid "Disc"
 msgstr "Lemez"
 
-#: ../src/browser.c:3100 ../src/misc.c:1909
+#: ../src/browser.c:3105 ../src/misc.c:1906
 msgid "Track"
 msgstr "Szám"
 
-#: ../src/browser.c:3100 ../src/cddb.c:810 ../src/misc.c:1910
+#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1907
 #: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Műfaj"
 
-#: ../src/browser.c:3101 ../src/misc.c:1911 ../src/prefs.c:647
+#: ../src/browser.c:3106 ../src/misc.c:1908 ../src/prefs.c:647
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: ../src/browser.c:3101 ../src/misc.c:1912 ../src/picture.c:1058
+#: ../src/browser.c:3106 ../src/misc.c:1909 ../src/picture.c:1060
 #: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Zeneszerző"
 
-#: ../src/browser.c:3102 ../src/misc.c:1913
+#: ../src/browser.c:3107 ../src/misc.c:1910
 msgid "Original Artist"
 msgstr "Eredeti előadó"
 
-#: ../src/browser.c:3103 ../src/misc.c:1914
+#: ../src/browser.c:3108 ../src/misc.c:1911
 msgid "Copyright"
 msgstr "Szerzői jog"
 
-#: ../src/browser.c:3103 ../src/misc.c:1915
+#: ../src/browser.c:3108 ../src/misc.c:1912
 msgid "URL"
 msgstr "URL"
 
-#: ../src/browser.c:3104 ../src/misc.c:1916
+#: ../src/browser.c:3109 ../src/misc.c:1913
 msgid "Encoded By"
 msgstr "Kódolta"
 
-#: ../src/browser.c:3105
+#: ../src/browser.c:3110
 msgid "# Albums"
 msgstr "# Albumok"
 
-#: ../src/browser.c:3106 ../src/browser.c:3107
+#: ../src/browser.c:3111 ../src/browser.c:3112
 msgid "# Files"
 msgstr "# Fájlok"
 
-#: ../src/browser.c:3132
+#: ../src/browser.c:3137
 msgid "Enter a directory to browse."
 msgstr "Adja meg az átvizsgálandó könyvtárat."
 
-#: ../src/browser.c:3141
+#: ../src/browser.c:3146
 msgid "Select a directory to browse."
 msgstr "Válassza ki az átvizsgálandó könyvtárat."
 
@@ -924,35 +902,35 @@ msgstr "Válassza ki az átvizsgálandó könyvtárat."
 #. * The label for displaying number of files in path (without subdirs)
 #.
 #. Translators: No files, as in "0 files".
-#: ../src/browser.c:3148 ../src/easytag.c:3469
+#: ../src/browser.c:3153 ../src/easytag.c:3469
 msgid "No files"
 msgstr "Nincsenek fájlok"
 
-#: ../src/browser.c:3226
+#: ../src/browser.c:3231
 msgid "Artist & Album"
 msgstr "Előadó és album"
 
 #. Only directories changed
-#: ../src/browser.c:3590 ../src/easytag.c:2881
+#: ../src/browser.c:3595 ../src/easytag.c:2881
 msgid "Rename Directory"
 msgstr "Könyvtár átnevezése"
 
-#: ../src/browser.c:3612
+#: ../src/browser.c:3617
 #, c-format
 msgid "Rename the directory '%s' to:"
 msgstr "A(z) „%s” könyvtár átnevezése erre:"
 
-#: ../src/browser.c:3631 ../src/misc.c:1171
+#: ../src/browser.c:3636 ../src/misc.c:1168
 msgid "Use mask:"
 msgstr "Használandó maszk:"
 
 # bubblehelp
-#: ../src/browser.c:3634
+#: ../src/browser.c:3639
 msgid "If activated, it will use masks to rename directory."
 msgstr "Ha aktivált, maszkokat fog használni a könyvtár átnevezéséhez."
 
 # bubblehelp
-#: ../src/browser.c:3652
+#: ../src/browser.c:3657
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -962,67 +940,67 @@ msgstr ""
 "címkemezőkből."
 
 #. Preview label
-#: ../src/browser.c:3676
+#: ../src/browser.c:3681
 msgid "Rename directory preview"
 msgstr "Könyvtár átnevezés előnézet"
 
-#: ../src/browser.c:3768
+#: ../src/browser.c:3773
 msgid "You must type a directory name"
 msgstr "Meg kell adnia egy könyvtárnevet"
 
-#: ../src/browser.c:3769 ../src/browser.c:3790
+#: ../src/browser.c:3774 ../src/browser.c:3795
 msgid "Directory Name Error"
 msgstr "Könyvtárnév hiba"
 
-#: ../src/browser.c:3787
+#: ../src/browser.c:3792
 #, c-format
 msgid "Could not convert '%s' into filename encoding."
 msgstr "„%s” nem alakítható át fájlnév kódolássá."
 
-#: ../src/browser.c:3789
+#: ../src/browser.c:3794
 msgid "Please use another name"
 msgstr "Kérem használjon egy másik nevet"
 
-#: ../src/browser.c:3859
+#: ../src/browser.c:3864
 #, c-format
 msgid "The directory name '%s' already exists"
 msgstr "Már létezik „%s” nevű könyvtár"
 
-#: ../src/browser.c:3860 ../src/easytag.c:2964
+#: ../src/browser.c:3865 ../src/easytag.c:2964
 msgid "Rename File Error"
 msgstr "Fájl átnevezési hiba"
 
 # böngésző menü
-#: ../src/browser.c:3898 ../src/browser.c:3927
+#: ../src/browser.c:3903 ../src/browser.c:3932
 msgid "Rename Directory Error"
 msgstr "Könyvtár átnevezési hiba"
 
-#: ../src/browser.c:3965
+#: ../src/browser.c:3970
 msgid "Directory renamed"
 msgstr "Könyvtár átnevezve"
 
 # böngésző menü
-#: ../src/browser.c:4001
+#: ../src/browser.c:4006
 msgid "Browse Directory With"
 msgstr "Könyvtár böngészése ezzel"
 
-#: ../src/browser.c:4017 ../src/browser.c:4143
+#: ../src/browser.c:4022 ../src/browser.c:4148
 msgid "Program to run:"
 msgstr "Futtatandó program:"
 
 # bubble help?
-#: ../src/browser.c:4029
+#: ../src/browser.c:4034
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Adja meg a futtatandó programot. Az aktuális könyvtárat fogja megkapni "
 "paraméterként."
 
-#: ../src/browser.c:4123
+#: ../src/browser.c:4128
 msgid "Open Files With"
 msgstr "Fájlok megnyitás ezzel"
 
-#: ../src/browser.c:4155
+#: ../src/browser.c:4160
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
@@ -1122,7 +1100,7 @@ msgstr "Minden mezőben"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Other".
-#: ../src/cddb.c:492 ../src/picture.c:1036 ../src/prefs.c:807
+#: ../src/cddb.c:492 ../src/picture.c:1038 ../src/prefs.c:807
 msgid "Other"
 msgstr "Egyéb"
 
@@ -1216,7 +1194,7 @@ msgstr "Kategóriák"
 msgid "Results:"
 msgstr "Eredmények:"
 
-#: ../src/cddb.c:606 ../src/misc.c:1950
+#: ../src/cddb.c:606 ../src/misc.c:1947
 msgid "Search:"
 msgstr "Keresés:"
 
@@ -1283,7 +1261,7 @@ msgid "# Tracks"
 msgstr "# Számok"
 
 #. Check box to run the scanner
-#: ../src/cddb.c:847 ../src/misc.c:2991
+#: ../src/cddb.c:847 ../src/misc.c:2988
 msgid "Run the current scanner for each file"
 msgstr "Az jelenlegi feldolgozó futtatása minden fájlra"
 
@@ -1295,7 +1273,7 @@ msgstr "Sorok megfeleltetése a Levenshtein algoritmussal"
 #. 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:859 ../src/prefs.c:1362
+#: ../src/cddb.c:859 ../src/prefs.c:1363
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM: Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every "
@@ -1757,42 +1735,42 @@ msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "A karatterlánc („%s”) nem alakítható át UTF-8 kódolásra (%s)."
 
 #. Starting messages
-#: ../src/easytag.c:184
+#: ../src/easytag.c:185
 #, c-format
 msgid "Starting EasyTAG version %s (PID: %d)…"
 msgstr "Az EasyTAG %s verziójának indítása (PID: %d)…"
 
-#: ../src/easytag.c:186
+#: ../src/easytag.c:187
 #, c-format
 msgid "Using libid3tag version %s"
 msgstr "A(z) %s verziójú libid3tag használata"
 
-#: ../src/easytag.c:189
+#: ../src/easytag.c:190
 #, c-format
 msgid "Using id3lib version %d.%d.%d"
 msgstr "A(z) %d.%d.%d verziójú id3lib használata"
 
-#: ../src/easytag.c:195
+#: ../src/easytag.c:196
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
 msgstr ""
 "Az EASYTAGLANG változó meghatározva. Területi beállítás beállítása: „%s”"
 
-#: ../src/easytag.c:197
+#: ../src/easytag.c:198
 #, c-format
 msgid "Setting locale: '%s'"
 msgstr "Területi beállítás beállítása: „%s”"
 
-#: ../src/easytag.c:202
+#: ../src/easytag.c:203
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')"
 msgstr "A jelenleg használt területi beállítások: „%s” (és végül „%s”)"
 
-#: ../src/easytag.c:209
+#: ../src/easytag.c:210
 msgid "Unable to create setting directories"
 msgstr "Nem lehet létrehozni a beállítás könyvtárakat"
 
-#: ../src/easytag.c:426 ../src/et_core.c:582
+#: ../src/easytag.c:427 ../src/et_core.c:637 ../src/et_core.c:649
 #, c-format
 msgid "Error while querying information for file: '%s' (%s)"
 msgstr "Hiba a fájl információinak lekérése közben: „%s” (%s)"
@@ -1809,7 +1787,7 @@ msgstr "Nem nyitható meg az útvonal: „%s”"
 msgid "Browser"
 msgstr "Böngésző"
 
-#: ../src/easytag.c:604 ../src/et_core.c:2774
+#: ../src/easytag.c:604 ../src/et_core.c:2857
 msgid "File"
 msgstr "Fájl"
 
@@ -1819,9 +1797,9 @@ msgstr "Fájl"
 #. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
 #. Version changed to encoder version
 #. Encoder version
-#: ../src/easytag.c:636 ../src/easytag.c:4197 ../src/flac_header.c:201
+#: ../src/easytag.c:636 ../src/easytag.c:4232 ../src/flac_header.c:201
 #: ../src/monkeyaudio_header.c:96 ../src/musepack_header.c:98
-#: ../src/ogg_header.c:389 ../src/wavpack_header.c:72
+#: ../src/ogg_header.c:389 ../src/opus_header.c:221 ../src/wavpack_header.c:72
 #, c-format
 msgid "Encoder:"
 msgstr "Kódoló:"
@@ -1837,7 +1815,7 @@ msgid "Frequency:"
 msgstr "Frekvencia:"
 
 #. Mode
-#: ../src/easytag.c:665 ../src/easytag.c:4201 ../src/mpeg_header.c:216
+#: ../src/easytag.c:665 ../src/easytag.c:4236 ../src/mpeg_header.c:216
 msgid "Mode:"
 msgstr "Mód:"
 
@@ -1850,7 +1828,7 @@ msgid "Duration:"
 msgstr "Időtartam:"
 
 #. Main Frame
-#: ../src/easytag.c:726 ../src/et_core.c:2712
+#: ../src/easytag.c:726 ../src/et_core.c:2787
 msgid "Tag"
 msgstr "Címke"
 
@@ -2009,7 +1987,7 @@ msgstr "A kijelölt fájlok címkézése a kódoló nevével"
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1147 ../src/et_core.c:3146 ../src/et_core.c:3149
+#: ../src/easytag.c:1147 ../src/et_core.c:3229 ../src/et_core.c:3232
 msgid "Images"
 msgstr "Képek"
 
@@ -2245,7 +2223,7 @@ msgid "Repeat action for the remaining files"
 msgstr "Művelet ismétlése a hátralevő fájlokra"
 
 #. Directories and filename changed
-#: ../src/easytag.c:2874 ../src/scan.c:181
+#: ../src/easytag.c:2874 ../src/scan_dialog.c:183
 msgid "Rename File and Directory"
 msgstr "Fájl és könyvtár átnevezése"
 
@@ -2348,7 +2326,7 @@ msgstr "Könyvtárolvasási hiba"
 msgid "Search in progress…"
 msgstr "Keresés folyamatban…"
 
-#: ../src/easytag.c:3394 ../src/et_core.c:2781
+#: ../src/easytag.c:3394 ../src/et_core.c:2864
 #, c-format
 msgid "File: '%s'"
 msgstr "Fájl: „%s”"
@@ -2393,196 +2371,211 @@ msgstr "Hangfájlok keresése…"
 msgid "Searching"
 msgstr "Keresés"
 
-#: ../src/easytag.c:4231
+#: ../src/easytag.c:4266
 msgid "Select a directory to browse"
 msgstr "Válassza ki az átvizsgálandó könyvtárat"
 
 #. Menu items
-#: ../src/easytag.c:4378
+#: ../src/easytag.c:4412
 msgid "Tag selected files with this field"
 msgstr "A kijelölt fájlok címkézése ezzel a mezővel"
 
-#: ../src/easytag.c:4390 ../src/scan.c:2654
+#: ../src/easytag.c:4424 ../src/scan_dialog.c:2124
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Az „_” és a „%20” átalakítása szóközre"
 
-#: ../src/easytag.c:4397 ../src/scan.c:2656
+#: ../src/easytag.c:4431 ../src/scan_dialog.c:2126
 msgid "Convert ' ' to '_'"
 msgstr "A „ ” átalakítása erre: „_”"
 
-#: ../src/easytag.c:4408
+#: ../src/easytag.c:4442
 msgid "All uppercase"
 msgstr "MINDENT NAGYBETŰSRE"
 
-#: ../src/easytag.c:4415
+#: ../src/easytag.c:4449
 msgid "All lowercase"
 msgstr "mindent kisbetűsre"
 
-#: ../src/easytag.c:4422
+#: ../src/easytag.c:4456
 msgid "First letter uppercase"
 msgstr "Első betű legyen nagybetű"
 
-#: ../src/easytag.c:4429
+#: ../src/easytag.c:4463
 msgid "First letter uppercase of each word"
 msgstr "Minden Szó Első Betűje Legyen Nagybetű"
 
-#: ../src/easytag.c:4440 ../src/prefs.c:1023 ../src/scan.c:2754
+#: ../src/easytag.c:4474 ../src/prefs.c:1023 ../src/scan_dialog.c:2224
 msgid "Remove spaces"
 msgstr "Szóközök eltávolítása"
 
-#: ../src/easytag.c:4447
+#: ../src/easytag.c:4481
 msgid "Insert space before uppercase letter"
 msgstr "Szóköz beszúrása minden nagybetű elé"
 
-#: ../src/easytag.c:4454
+#: ../src/easytag.c:4488
 msgid "Remove duplicate spaces or underscores"
 msgstr "Dupla szóközök vagy alsóvonások eltávolítása"
 
-#: ../src/easytag.c:4461
+#: ../src/easytag.c:4495
 msgid "Remove all text"
 msgstr "Minden szöveg eltávolítása"
 
-#: ../src/easytag.c:4480
+#: ../src/easytag.c:4514
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normális kilépés."
 
-#: ../src/easytag.c:4532
+#: ../src/easytag.c:4566
 msgid "Do you want to save them before quitting?"
 msgstr "El szeretné menteni azokat kilépés előtt?"
 
-#: ../src/easytag.c:4559
+#: ../src/easytag.c:4593
 msgid "Do you really want to quit?"
 msgstr "Biztosan ki szeretne lépni?"
 
-#: ../src/et_core.c:504
+#: ../src/et_core.c:550
 #, c-format
 msgid "Error reading tag from ogg file (%s)"
 msgstr "Hiba a címkék olvasása közben az ogg fájlból (%s)"
 
-#: ../src/et_core.c:656
+#: ../src/et_core.c:579
+#, c-format
+#| msgid "Error reading tag from ogg file (%s)"
+msgid "Error reading tag from Opus file (%s)"
+msgstr "Hiba a címkék olvasása közben az Opus fájlból (%s)"
+
+#: ../src/et_core.c:722
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr "Automatikus javítások alkalmazva a(z) „%s” fájlhoz."
 
-#: ../src/et_core.c:2678
+#: ../src/et_core.c:2747
 msgid "ID3 Tag"
 msgstr "ID3 címke"
 
-#: ../src/et_core.c:2684
+#: ../src/et_core.c:2753
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis címke"
 
-#: ../src/et_core.c:2690
+#: ../src/et_core.c:2759
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis címke"
 
-#: ../src/et_core.c:2695
+#: ../src/et_core.c:2764
 msgid "APE Tag"
 msgstr "APE címke"
 
-#: ../src/et_core.c:2700
+#: ../src/et_core.c:2769
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC címke"
 
-#: ../src/et_core.c:2706
+#: ../src/et_core.c:2775
 msgid "Wavpack Tag"
 msgstr "Wavpack címke"
 
-#: ../src/et_core.c:2726
+#: ../src/et_core.c:2781
+msgid "Opus Tag"
+msgstr "Opus címke"
+
+#: ../src/et_core.c:2801
 msgid "MP3 File"
 msgstr "MP3 fájl"
 
-#: ../src/et_core.c:2730
+#: ../src/et_core.c:2805
 msgid "MP2 File"
 msgstr "MP2 fájl"
 
-#: ../src/et_core.c:2736
+#: ../src/et_core.c:2811
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis fájl"
 
 # ikon megjegyzés
-#: ../src/et_core.c:2742
+#: ../src/et_core.c:2817
 msgid "Speex File"
 msgstr "Speex fájl"
 
-#: ../src/et_core.c:2748
+#: ../src/et_core.c:2823
 msgid "FLAC File"
 msgstr "FLAC fájl"
 
-#: ../src/et_core.c:2753
+#: ../src/et_core.c:2828
 msgid "MusePack File"
 msgstr "MusePack fájl"
 
-#: ../src/et_core.c:2757
+#: ../src/et_core.c:2832
 msgid "Monkey's Audio File"
 msgstr "Monkey's hangfájl"
 
-#: ../src/et_core.c:2762
+#: ../src/et_core.c:2837
 msgid "MP4/AAC File"
 msgstr "MP4/AAC fájl"
 
-#: ../src/et_core.c:2768
+#: ../src/et_core.c:2843
 msgid "Wavpack File"
 msgstr "Wavpack fájl"
 
-#: ../src/et_core.c:2825 ../src/et_core.c:2880
+#: ../src/et_core.c:2849
+#| msgid "MusePack File"
+msgid "Opus File"
+msgstr "Opus fájl"
+
+#: ../src/et_core.c:2908 ../src/et_core.c:2963
 msgid "File not found"
 msgstr "A fájl nem található"
 
-#: ../src/et_core.c:2830
+#: ../src/et_core.c:2913
 #, c-format
 msgid "Cannot query file information (%s)"
 msgstr "Nem kérdezhetők le a fájlinformációk (%s)"
 
-#: ../src/et_core.c:2864
+#: ../src/et_core.c:2947
 msgid "Read-only file"
 msgstr "Csak olvasható fájl"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2928
+#: ../src/et_core.c:3011
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
 msgstr[0] "Egy fájl"
 msgstr[1] "%u fájl"
 
-#: ../src/et_core.c:3132
+#: ../src/et_core.c:3215
 #, c-format
 msgid "Images (%d)"
 msgstr "Képek (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3174 ../src/flac_header.c:205
-#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
+#: ../src/et_core.c:3257 ../src/flac_header.c:205
+#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.cc:142
 #: ../src/mpeg_header.c:206 ../src/musepack_header.c:88
-#: ../src/ogg_header.c:401 ../src/wavpack_header.c:78
+#: ../src/ogg_header.c:401 ../src/opus_header.c:227 ../src/wavpack_header.c:78
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: ../src/et_core.c:3179 ../src/flac_header.c:210
-#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
+#: ../src/et_core.c:3262 ../src/flac_header.c:210
+#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.cc:147
 #: ../src/mpeg_header.c:211 ../src/musepack_header.c:93
-#: ../src/ogg_header.c:406 ../src/wavpack_header.c:83
+#: ../src/ogg_header.c:406 ../src/opus_header.c:232 ../src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/et_core.c:3322 ../src/scan.c:690
+#: ../src/et_core.c:3408 ../src/scan_dialog.c:688
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding"
 msgstr "Nem alakítható át a(z) „%s” fájlnév rendszer fájlnév kodolássá"
 
-#: ../src/et_core.c:3324
+#: ../src/et_core.c:3410
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Próbálja meg beállítani a G_FILENAME_ENCODING környezeti változót."
 
-#: ../src/et_core.c:3325 ../src/scan.c:692
+#: ../src/et_core.c:3411 ../src/scan_dialog.c:690
 msgid "Filename translation"
 msgstr "Fájlnév fordítások"
 
-#: ../src/et_core.c:4025
+#: ../src/et_core.c:4116
 #, c-format
 msgid "Error writing tag type %d to file %s (%s)"
 msgstr "Hiba a(z) %d. címketípus fájlba írása közben: „%s” (%s)"
@@ -2591,8 +2584,8 @@ msgstr "Hiba a(z) %d. címketípus fájlba írása közben: „%s” (%s)"
 #. Mode
 #. mpeg4ip library seems to always return -1
 #. Mode
-#: ../src/flac_header.c:215 ../src/mp4_header.c:145 ../src/ogg_header.c:411
-#: ../src/wavpack_header.c:88
+#: ../src/flac_header.c:215 ../src/mp4_header.cc:153 ../src/ogg_header.c:411
+#: ../src/opus_header.c:237 ../src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Csatornák:"
 
@@ -2601,7 +2594,7 @@ msgstr "Csatornák:"
 msgid "Error while opening file: '%s' as FLAC (%s)."
 msgstr "Hiba történt a(z) „%s” fájl mint FLAC megnyitása közben (%s)."
 
-#: ../src/flac_tag.c:352 ../src/ogg_tag.c:411
+#: ../src/flac_tag.c:352 ../src/ogg_tag.c:310
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
@@ -2620,7 +2613,7 @@ msgstr "A képblokk nem érvényes: „%s”"
 msgid "Error: Failed to write comments to file '%s' (%s)."
 msgstr "Hiba: Nem sikerült a megjegyzések írása a(z) „%s” fájlba (%s)."
 
-#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1151
+#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1166
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "A(z) „%s” címkéje kiírva"
@@ -2804,55 +2797,55 @@ msgstr "Mérethiba a(z) „%s” címkéjének mentése közben"
 msgid "Log"
 msgstr "Napló"
 
-#: ../src/misc.c:719
+#: ../src/misc.c:716
 msgid "You must type a program name"
 msgstr "Meg kell adnia egy programnevet"
 
-#: ../src/misc.c:720
+#: ../src/misc.c:717
 msgid "Program Name Error"
 msgstr "Programnév hiba"
 
-#: ../src/misc.c:799
+#: ../src/misc.c:796
 #, c-format
 msgid "Executed command: %s"
 msgstr "Végrehajtott parancs: %s"
 
-#: ../src/misc.c:806
+#: ../src/misc.c:803
 #, c-format
 msgid "Failed to launch program: %s"
 msgstr "Nem sikerült indítani a programot: %s"
 
 # Fájl menü
-#: ../src/misc.c:823
+#: ../src/misc.c:820
 msgid "Select File"
 msgstr "Fájl kiválasztása"
 
-#: ../src/misc.c:829
+#: ../src/misc.c:826
 msgid "Select Directory"
 msgstr "Könyvtár kiválasztása"
 
-#: ../src/misc.c:1141
+#: ../src/misc.c:1138
 msgid "Generate Playlist"
 msgstr "Lejátszólista előállítása"
 
-#: ../src/misc.c:1165
+#: ../src/misc.c:1162
 msgid "M3U Playlist Name"
 msgstr "M3U lejátszólista neve"
 
-#: ../src/misc.c:1180
+#: ../src/misc.c:1177
 msgid "Use directory name"
 msgstr "Könyvtár nevének használata"
 
 #. Playlist options
-#: ../src/misc.c:1197
+#: ../src/misc.c:1194
 msgid "Playlist Options"
 msgstr "Lejátszólista beállításai"
 
-#: ../src/misc.c:1203
+#: ../src/misc.c:1200
 msgid "Include only the selected files"
 msgstr "Csak a kijelölt fájlokat tartalmazza"
 
-#: ../src/misc.c:1206
+#: ../src/misc.c:1203
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2860,29 +2853,29 @@ msgstr ""
 "Ha aktivált, csak a kijelölt fájlok lesznek a lejátszólistába írva. "
 "Egyébként minden fájl írásra kerül."
 
-#: ../src/misc.c:1209
+#: ../src/misc.c:1206
 msgid "Use full path for files in playlist"
 msgstr "Teljes elérési út használata a lejátszólistában"
 
-#: ../src/misc.c:1212
+#: ../src/misc.c:1209
 msgid "Use relative path for files in playlist"
 msgstr "Relatív elérési út használata a lejátszólistában"
 
 #. Create playlist in parent directory
-#: ../src/misc.c:1218
+#: ../src/misc.c:1215
 msgid "Create playlist in the parent directory"
 msgstr "Lejátszólista létrehozása a szülő könyvtárban"
 
-#: ../src/misc.c:1221
+#: ../src/misc.c:1218
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "Ha aktivált, a lejátszólista a szülő könyvtárban kerül létrehozásra."
 
 #. DOS Separator
-#: ../src/misc.c:1225
+#: ../src/misc.c:1222
 msgid "Use DOS directory separator"
 msgstr "DOS könyvtárelválasztó használata"
 
-#: ../src/misc.c:1231
+#: ../src/misc.c:1228
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2890,49 +2883,49 @@ msgstr ""
 "Ez a beállítás lecseréli a „/” UNIX könyvtárválasztót a „\\” DOS "
 "elválasztóra."
 
-#: ../src/misc.c:1240
+#: ../src/misc.c:1237
 msgid "Playlist Content"
 msgstr "Lejátszólista tartalma"
 
-#: ../src/misc.c:1246
+#: ../src/misc.c:1243
 msgid "Write only list of files"
 msgstr "Csak fájlok listájának írása"
 
-#: ../src/misc.c:1250
+#: ../src/misc.c:1247
 msgid "Write info using filename"
 msgstr "Információk írása a fájlnév használatával"
 
-#: ../src/misc.c:1253
+#: ../src/misc.c:1250
 msgid "Write info using:"
 msgstr "Információk írása ezek használatával:"
 
-#: ../src/misc.c:1467
+#: ../src/misc.c:1464
 #, c-format
 msgid "Cannot write playlist file '%s'"
 msgstr "A(z) „%s” lejátszólista fájl nem írható"
 
-#: ../src/misc.c:1471
+#: ../src/misc.c:1468
 msgid "Playlist File Error"
 msgstr "Lejátszólista fájl hiba"
 
-#: ../src/misc.c:1479
+#: ../src/misc.c:1476
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "A(z) „%s” lejátszólista fájl kiírva"
 
-#: ../src/misc.c:1543 ../src/scan.c:3239 ../src/scan.c:3301
+#: ../src/misc.c:1540 ../src/scan_dialog.c:2709 ../src/scan_dialog.c:2771
 msgid "Invalid scanner mask"
 msgstr "Érvénytelen feldolgozómaszk"
 
-#: ../src/misc.c:1907
+#: ../src/misc.c:1904
 msgid "CD"
 msgstr "CD"
 
-#: ../src/misc.c:1929
+#: ../src/misc.c:1926
 msgid "Find Files"
 msgstr "Fájlok keresése"
 
-#: ../src/misc.c:1961
+#: ../src/misc.c:1958
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2940,13 +2933,13 @@ msgstr ""
 "megjelenítéséhez."
 
 #. Where...
-#: ../src/misc.c:1967
+#: ../src/misc.c:1964
 msgid "In:"
 msgstr "Ebben:"
 
 #. Translators: This option is for the previous 'in' option. For instance,
 #. * translate this as "Search" "In:" "the Filename".
-#: ../src/misc.c:1972
+#: ../src/misc.c:1969
 msgid "the Filename"
 msgstr "a fájlnévben"
 
@@ -2955,20 +2948,20 @@ msgstr "a 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:1978
+#: ../src/misc.c:1975
 msgid "the Tag"
 msgstr "a címkében"
 
 #. Property of the search
-#: ../src/misc.c:1989 ../src/prefs.c:335
+#: ../src/misc.c:1986 ../src/prefs.c:335
 msgid "Case sensitive"
 msgstr "Kis- és nagybetűs"
 
-#: ../src/misc.c:2216
+#: ../src/misc.c:2213
 msgid "Ready to search…"
 msgstr "Keresésre kész…"
 
-#: ../src/misc.c:2436
+#: ../src/misc.c:2433
 #, c-format
 msgid "Found one file"
 msgid_plural "Found %d files"
@@ -2976,65 +2969,65 @@ msgstr[0] "Egy fájl található"
 msgstr[1] "%d fájl található"
 
 # egyéb menü
-#: ../src/misc.c:2721
+#: ../src/misc.c:2718
 msgid "Load Filenames From a Text File"
 msgstr "Fájlnevek betöltése szövegfájlból"
 
-#: ../src/misc.c:2750
+#: ../src/misc.c:2747
 msgid "File:"
 msgstr "Fájl:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: ../src/misc.c:2769
+#: ../src/misc.c:2766
 msgid " Load "
 msgstr " Betöltés "
 
-#: ../src/misc.c:2787
+#: ../src/misc.c:2784
 msgid "Content of Text File"
 msgstr "A szövegfájl tartalma"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2808 ../src/misc.c:2903
+#: ../src/misc.c:2805 ../src/misc.c:2900
 msgid "Insert a blank line before the selected line"
 msgstr "Üres sor beszúrása a kijelölt sor elé"
 
 # Sor törlése - volt régen.
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2817 ../src/misc.c:2912
+#: ../src/misc.c:2814 ../src/misc.c:2909
 msgid "Delete the selected line"
 msgstr "A kijelölt sor törlése"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2826 ../src/misc.c:2921 ../src/misc.c:3407
+#: ../src/misc.c:2823 ../src/misc.c:2918 ../src/misc.c:3404
 msgid "Delete all blank lines"
 msgstr "Minden üres sor törlése"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2838 ../src/misc.c:2933
+#: ../src/misc.c:2835 ../src/misc.c:2930
 msgid "Move up the selected line"
 msgstr "Kijelölt sor mozgatása fel"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2847 ../src/misc.c:2942
+#: ../src/misc.c:2844 ../src/misc.c:2939
 msgid "Move down the selected line"
 msgstr "Kijelölt sor mozgatása le"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2859 ../src/misc.c:2954 ../src/misc.c:3431
+#: ../src/misc.c:2856 ../src/misc.c:2951 ../src/misc.c:3428
 msgid "Reload"
 msgstr "Újratöltés"
 
-#: ../src/misc.c:2881
+#: ../src/misc.c:2878
 msgid "List of Files"
 msgstr "Fájlok listája"
 
-#: ../src/misc.c:2976
+#: ../src/misc.c:2973
 msgid "Selected line:"
 msgstr "Kijelölt sor:"
 
 # bubble help
-#: ../src/misc.c:2994
+#: ../src/misc.c:2991
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3043,34 +3036,34 @@ msgstr ""
 "kiválasztott feldolgozó lesz futtatva (a feldolgozóablaknak nyitva kell "
 "lennie)."
 
-#: ../src/misc.c:3081
+#: ../src/misc.c:3078
 #, c-format
 msgid "Cannot retrieve file info (%s)"
 msgstr "Nem fogadhatók a fájlinformációk (%s)"
 
-#: ../src/misc.c:3143
+#: ../src/misc.c:3140
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Nem nyitható meg a(z) „%s” fájl (%s)"
 
-#: ../src/misc.c:3179
+#: ../src/misc.c:3176
 #, c-format
 msgid "Error reading file (%s)"
 msgstr "Hiba a fájl olvasása közben (%s)"
 
-#: ../src/misc.c:3395
+#: ../src/misc.c:3392
 msgid "Insert a blank line"
 msgstr "Üres sor beszúrása"
 
-#: ../src/misc.c:3401
+#: ../src/misc.c:3398
 msgid "Delete this line"
 msgstr "Aktuális sor törlése"
 
-#: ../src/misc.c:3416
+#: ../src/misc.c:3413
 msgid "Move up this line"
 msgstr "Aktuális sor mozgatása fel"
 
-#: ../src/misc.c:3422
+#: ../src/misc.c:3419
 msgid "Move down this line"
 msgstr "Aktuális sor mozgatása le"
 
@@ -3080,26 +3073,26 @@ msgstr "Aktuális sor mozgatása le"
 msgid "Profile:"
 msgstr "Profil:"
 
-#: ../src/mp4_header.c:63 ../src/mp4_tag.c:65 ../src/mp4_tag.c:186
+#: ../src/mp4_header.cc:60 ../src/mp4_tag.cc:91 ../src/mp4_tag.cc:284
 msgid "MP4 format invalid"
 msgstr "Érvénytelen MP4 formátum"
 
-#: ../src/mp4_header.c:72 ../src/mp4_tag.c:74
+#: ../src/mp4_header.cc:68
 #, c-format
 msgid "File contains no audio track: '%s'"
 msgstr "A fájl nem tartalmaz hangszámot: „%s”"
 
-#: ../src/mp4_header.c:82
+#: ../src/mp4_header.cc:79
 #, c-format
 msgid "Error reading properties from file: '%s'"
 msgstr "Hiba a tulajdonságok fájlból olvasása közben: „%s”"
 
-#: ../src/mp4_header.c:132 ../src/mpeg_header.c:204
+#: ../src/mp4_header.cc:140 ../src/mpeg_header.c:204
 #, c-format
 msgid "~%d kb/s"
 msgstr "~%d kb/s"
 
-#: ../src/mp4_tag.c:85 ../src/mp4_tag.c:194
+#: ../src/mp4_tag.cc:101 ../src/mp4_tag.cc:293
 #, c-format
 msgid "Error reading tags from file: '%s'"
 msgstr "Hiba a címkék fájlból olvasása közben: „%s”"
@@ -3174,17 +3167,17 @@ msgstr ""
 msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
 msgstr "Hiba: Nem sikerült a(z) „%s” fájl Vorbisként való megnyitása (%s)."
 
-#: ../src/ogg_tag.c:249 ../src/ogg_tag.c:872
+#: ../src/ogg_tag.c:712 ../src/ogg_tag.c:887
 #, 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."
 
-#: ../src/ogg_tag.c:1020 ../src/picture.c:1256
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1258
 #, c-format
 msgid "Error with 'loader_write': %s"
 msgstr "Hiba a „loader_write” közben: %s"
 
-#: ../src/ogg_tag.c:1035 ../src/picture.c:1179
+#: ../src/ogg_tag.c:1050 ../src/picture.c:1181
 #, c-format
 msgid "Error with 'loader_close': %s"
 msgstr "Hiba a „loader_close” közben: %s"
@@ -3212,147 +3205,146 @@ msgstr "A képfájl nincs betöltve: %s"
 msgid "Image file loaded"
 msgstr "A képfájl betöltve"
 
-#: ../src/picture.c:503
+#: ../src/picture.c:504
 msgid "Add Images"
 msgstr "Képek hozzáadása"
 
-#: ../src/picture.c:513 ../src/picture.c:873
+#: ../src/picture.c:514 ../src/picture.c:875
 msgid "All Files"
 msgstr "Minden fájl"
 
-#: ../src/picture.c:519 ../src/picture.c:879
+#: ../src/picture.c:520 ../src/picture.c:881
 msgid "PNG and JPEG"
 msgstr "PNG és JPEG"
 
-#: ../src/picture.c:650
+#: ../src/picture.c:651
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Képtulajdonságok %d/%d"
 
-#: ../src/picture.c:674
+#: ../src/picture.c:677
 msgid "Image Type"
 msgstr "Képtípus"
 
 #. Description of the picture
-#: ../src/picture.c:733
+#: ../src/picture.c:735
 msgid "Image Description:"
 msgstr "Kép leírása:"
 
-#: ../src/picture.c:860
+#: ../src/picture.c:862
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Kép mentése %d/%d"
 
-#: ../src/picture.c:1020
+#: ../src/picture.c:1022
 msgid "JPEG image"
 msgstr "JPEG-kép"
 
-#: ../src/picture.c:1022
+#: ../src/picture.c:1024
 msgid "PNG image"
 msgstr "PNG-kép"
 
-#: ../src/picture.c:1024
-#| msgid "PNG image"
+#: ../src/picture.c:1026
 msgid "GIF image"
 msgstr "GIF-kép"
 
-#: ../src/picture.c:1026
+#: ../src/picture.c:1028
 msgid "Unknown image"
 msgstr "Ismeretlen kép"
 
-#: ../src/picture.c:1038
+#: ../src/picture.c:1040
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32 képpontos PNG fájl ikon"
 
-#: ../src/picture.c:1040
+#: ../src/picture.c:1042
 msgid "Other file icon"
 msgstr "Egyéb fájl ikon"
 
-#: ../src/picture.c:1042
+#: ../src/picture.c:1044
 msgid "Cover (front)"
 msgstr "Borító (első)"
 
-#: ../src/picture.c:1044
+#: ../src/picture.c:1046
 msgid "Cover (back)"
 msgstr "Borító (hátsó)"
 
-#: ../src/picture.c:1046
+#: ../src/picture.c:1048
 msgid "Leaflet page"
 msgstr "Szórólap oldal"
 
-#: ../src/picture.c:1048
+#: ../src/picture.c:1050
 msgid "Media (e.g. label side of CD)"
 msgstr "Média (például a CD címke oldala)"
 
-#: ../src/picture.c:1050
+#: ../src/picture.c:1052
 msgid "Lead artist/lead performer/soloist"
 msgstr "Vezető szerző / vezető előadó / szólista"
 
-#: ../src/picture.c:1052
+#: ../src/picture.c:1054
 msgid "Artist/performer"
 msgstr "Szerző / előadó"
 
-#: ../src/picture.c:1054
+#: ../src/picture.c:1056
 msgid "Conductor"
 msgstr "Karmester"
 
-#: ../src/picture.c:1056
+#: ../src/picture.c:1058
 msgid "Band/Orchestra"
 msgstr "Banda / Zenekar"
 
-#: ../src/picture.c:1060
+#: ../src/picture.c:1062
 msgid "Lyricist/text writer"
 msgstr "Dalszövegíró / szövegíró"
 
-#: ../src/picture.c:1062
+#: ../src/picture.c:1064
 msgid "Recording location"
 msgstr "Felvétel helyszíne"
 
-#: ../src/picture.c:1064
+#: ../src/picture.c:1066
 msgid "During recording"
 msgstr "Felvétel közben"
 
-#: ../src/picture.c:1066
+#: ../src/picture.c:1068
 msgid "During performance"
 msgstr "Előadás közben"
 
-#: ../src/picture.c:1068
+#: ../src/picture.c:1070
 msgid "Movie/video screen capture"
 msgstr "Film / videófelvétel"
 
-#: ../src/picture.c:1070
+#: ../src/picture.c:1072
 msgid "A bright colored fish"
 msgstr "Egy világos színes hal"
 
-#: ../src/picture.c:1072
+#: ../src/picture.c:1074
 msgid "Illustration"
 msgstr "Illusztráció"
 
-#: ../src/picture.c:1074
+#: ../src/picture.c:1076
 msgid "Band/Artist logotype"
 msgstr "Banda / Előadó logója"
 
-#: ../src/picture.c:1076
+#: ../src/picture.c:1078
 msgid "Publisher/studio logotype"
 msgstr "Kiadó / stúdió logója"
 
-#: ../src/picture.c:1080
+#: ../src/picture.c:1082
 msgid "Unknown image type"
 msgstr "Ismeretlen képtípus"
 
-#: ../src/picture.c:1110 ../src/picture.c:1121
+#: ../src/picture.c:1112 ../src/picture.c:1123
 msgid "pixels"
 msgstr "képpont"
 
-#: ../src/picture.c:1111 ../src/picture.c:1122
+#: ../src/picture.c:1113 ../src/picture.c:1124
 msgid "Type"
 msgstr "Típus"
 
-#: ../src/picture.c:1123
+#: ../src/picture.c:1125
 msgid "Description"
 msgstr "Leírás"
 
-#: ../src/picture.c:1239
+#: ../src/picture.c:1241
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
@@ -3360,18 +3352,18 @@ msgstr ""
 "Nem jeleníthető meg a kép, mert nem lett elegendő adat beolvasva annak "
 "meghatározásához, hogy hogyan jöjjön létre a képpuffer."
 
-#: ../src/picture.c:1246
+#: ../src/picture.c:1248
 msgid "Cannot display the image"
 msgstr "Nem jeleníthető meg a kép"
 
-#: ../src/picture.c:1248
+#: ../src/picture.c:1250
 msgid ""
 "Not enough data has been read to determine how to create the image buffer."
 msgstr ""
 "Nem lett elegendő adat beolvasva annak meghatározásához, hogy hogyan jöjjön "
 "létre a képpuffer."
 
-#: ../src/picture.c:1250
+#: ../src/picture.c:1252
 msgid "Load Image File"
 msgstr "Képfájl betöltése"
 
@@ -4378,16 +4370,17 @@ msgid "User Password:"
 msgstr "Felhasználói jelszó:"
 
 # bubble help
-#: ../src/prefs.c:1337
-msgid "Password of user for the the proxy server."
+#: ../src/prefs.c:1338
+#| msgid "Password of user for the the proxy server."
+msgid "Password of user for the proxy server."
 msgstr "A felhasználó jelszava a proxy-kiszolgálóhoz."
 
 #. Track Name list (CDDB results)
-#: ../src/prefs.c:1342
+#: ../src/prefs.c:1343
 msgid "Track Name List"
 msgstr "Számnév lista"
 
-#: ../src/prefs.c:1349
+#: ../src/prefs.c:1350
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4395,7 +4388,7 @@ msgstr ""
 "A megfelelő hangfájl kiválasztása (pozíció vagy DLM szerint, ha lent "
 "aktiválva van)"
 
-#: ../src/prefs.c:1353
+#: ../src/prefs.c:1354
 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."
@@ -4404,7 +4397,7 @@ msgstr ""
 "megfelelő hangfájl is kiválasztásra kerül."
 
 #. Check box to use DLM (also used in the cddb window)
-#: ../src/prefs.c:1358
+#: ../src/prefs.c:1359
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4415,16 +4408,16 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: ../src/prefs.c:1373
+#: ../src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Megerősítés"
 
-#: ../src/prefs.c:1378
+#: ../src/prefs.c:1379
 msgid "Confirm exit from program"
 msgstr "Programból való kilépés megerősítése"
 
 # bubble help
-#: ../src/prefs.c:1381
+#: ../src/prefs.c:1382
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4432,55 +4425,55 @@ msgstr ""
 "Ha aktivált, megnyit egy párbeszéddobozt a programból való kilépés "
 "megerősítéséhez."
 
-#: ../src/prefs.c:1384
+#: ../src/prefs.c:1385
 msgid "Confirm writing of file tag"
 msgstr "Fájlcímke írásának megerősítése"
 
-#: ../src/prefs.c:1388
+#: ../src/prefs.c:1389
 msgid "Confirm renaming of file"
 msgstr "Fájl átnevezésének megerősítése"
 
-#: ../src/prefs.c:1392
+#: ../src/prefs.c:1393
 msgid "Confirm deleting of file"
 msgstr "Fájl törlésének megerősítése"
 
-#: ../src/prefs.c:1396
+#: ../src/prefs.c:1397
 msgid "Confirm writing of playlist"
 msgstr "Lejátszólista írásának megerősítése"
 
-#: ../src/prefs.c:1400
+#: ../src/prefs.c:1401
 msgid "Confirm changing directory when there are unsaved changes"
 msgstr "Könyvtár váltásának megerősítése, ha el nem mentett módosítások vannak"
 
 # not necessary hungarian. I do not understand.
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: ../src/prefs.c:1438
+#: ../src/prefs.c:1439
 #, c-format
 msgid "(Example: %.*d_-_Track_name_1.mp3)"
 msgstr "(Például: %.*d_-_Szam_neve_1.mp3)"
 
 # not necessary hungarian. I do not understand.
 #. Translators: please do NOT translate '%.*d' in this string.
-#: ../src/prefs.c:1471
+#: ../src/prefs.c:1472
 #, c-format
 msgid "(Example: disc_%.*d_of_10/Track_name_1.mp3)"
 msgstr "(Például: lemez_%.*d_of_10/Szam_neve_1.mp3)"
 
-#: ../src/prefs.c:1613 ../src/setting.c:904
+#: ../src/prefs.c:1614 ../src/setting.c:904
 msgid "Configuration saved"
 msgstr "A beállítások elmentve"
 
-#: ../src/prefs.c:1621
+#: ../src/prefs.c:1622
 msgid "Configuration unchanged"
 msgstr "A beállítások nem változtak"
 
-#: ../src/prefs.c:1712
+#: ../src/prefs.c:1713
 msgid "The selected path for 'Default path to files' is invalid"
 msgstr ""
 "A kiválasztott útvonal az „Alapértelmezett útvonal a fájlokhoz” esetén "
 "érvénytelen"
 
-#: ../src/prefs.c:1714
+#: ../src/prefs.c:1715
 #, c-format
 msgid ""
 "Path: '%s'\n"
@@ -4489,97 +4482,97 @@ msgstr ""
 "Útvonal: „%s”\n"
 "Hiba: %s"
 
-#: ../src/prefs.c:1716
+#: ../src/prefs.c:1717
 msgid "Invalid Path Error"
 msgstr "Érvénytelen útvonal hiba"
 
-#: ../src/prefs.c:1830
+#: ../src/prefs.c:1831
 #, c-format
 msgid "The audio file player '%s' cannot be found"
 msgstr "A(z) „%s” zenelejátszó nem található"
 
 # egyéb menü
-#: ../src/prefs.c:1832
+#: ../src/prefs.c:1833
 msgid "Audio Player Error"
 msgstr "Zenelejátszó hiba"
 
-#: ../src/scan.c:180
+#: ../src/scan_dialog.c:182
 msgid "Fill Tag"
 msgstr "Címke kitöltése"
 
-#: ../src/scan.c:358
+#: ../src/scan_dialog.c:356
 #, c-format
 msgid "Cannot calculate CRC value of file (%s)"
 msgstr "Nem lehet kiszámítani a fájl CRC értékét (%s)"
 
-#: ../src/scan.c:373
+#: ../src/scan_dialog.c:371
 msgid "Tag successfully scanned"
 msgstr "A címke sikeresen feldolgozva"
 
-#: ../src/scan.c:375
+#: ../src/scan_dialog.c:373
 #, c-format
 msgid "Tag successfully scanned: %s"
 msgstr "A címke sikeresen feldolgozva: %s"
 
-#: ../src/scan.c:416
+#: ../src/scan_dialog.c:414
 #, c-format
 msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
 msgstr ""
 "Címke feldolgozó: különös… a(z) „%s” kiterjesztés nem található a(z) „%s” "
 "fájlnévben"
 
-#: ../src/scan.c:498 ../src/scan.c:527
+#: ../src/scan_dialog.c:496 ../src/scan_dialog.c:525
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Feldolgozási hiba: nem található a(z) „%s” elválasztó ebben: „%s”"
 
-#: ../src/scan.c:714
+#: ../src/scan_dialog.c:712
 msgid "New filename successfully scanned"
 msgstr "Az új fájlnév sikeresen feldolgozva"
 
-#: ../src/scan.c:717
+#: ../src/scan_dialog.c:715
 #, c-format
 msgid "New filename successfully scanned: %s"
 msgstr "Az új fájlnév sikeresen feldolgozva: %s"
 
-#: ../src/scan.c:1821
+#: ../src/scan_dialog.c:1628
 #, c-format
 msgid "Error while processing fields: %s"
 msgstr "Hiba a mezők feldolgozása közben: %s"
 
 #. The window
-#: ../src/scan.c:2328
+#: ../src/scan_dialog.c:1798
 msgid "Tag and Filename Scan"
 msgstr "Címke és fájlnév feldolgozás"
 
 # ikon megjegyzés
 #. TODO: Set related action to match AM_SCAN_FILES.
-#: ../src/scan.c:2337
+#: ../src/scan_dialog.c:1807
 msgid "Scan Files"
 msgstr "Fájlok vizsgálata"
 
 #. Option Menu
-#: ../src/scan.c:2365
+#: ../src/scan_dialog.c:1835
 msgid "Scanner:"
 msgstr "Feldolgozó: "
 
-#: ../src/scan.c:2386
+#: ../src/scan_dialog.c:1856
 msgid "Select the type of scanner to use"
 msgstr "A használandó feldolgozó típusának kiválasztása"
 
-#: ../src/scan.c:2395
+#: ../src/scan_dialog.c:1865
 msgid "Scanner Preferences"
 msgstr "Feldolgozó beállítások"
 
-#: ../src/scan.c:2404
+#: ../src/scan_dialog.c:1874
 msgid "Show / Hide Masks Editor"
 msgstr "Maszkszerkesztő megjelenítése / elrejtése"
 
-#: ../src/scan.c:2414
+#: ../src/scan_dialog.c:1884
 msgid "Show / Hide Legend"
 msgstr "Jelmagyarázat megjelenítése / elrejtése"
 
-#: ../src/scan.c:2444
+#: ../src/scan_dialog.c:1914
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse filename and "
 "path. Used to fill in tag fields"
@@ -4589,16 +4582,16 @@ msgstr ""
 "a címkemezők kitöltéséhez."
 
 #. Preview label
-#: ../src/scan.c:2468
+#: ../src/scan_dialog.c:1938
 msgid "Fill tag preview"
 msgstr "Címke kitöltése előnézet"
 
 # bubble help
-#: ../src/scan.c:2498
+#: ../src/scan_dialog.c:1968
 msgid "Prefix mask with current path"
 msgstr "Előtag maszk a jelenlegi útvonallal"
 
-#: ../src/scan.c:2512
+#: ../src/scan_dialog.c:1982
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4612,16 +4605,16 @@ msgstr ""
 "akkor ez egy abszolút elérési út, egyébként relatív a régi útvonalhoz."
 
 #. Preview label
-#: ../src/scan.c:2537
+#: ../src/scan_dialog.c:2007
 msgid "Rename file preview"
 msgstr "Fájl átnevezése előnézet"
 
-#: ../src/scan.c:2556
+#: ../src/scan_dialog.c:2026
 msgid "Select fields:"
 msgstr "Mezők kijelölése:"
 
 # bubble help
-#: ../src/scan.c:2559
+#: ../src/scan_dialog.c:2029
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those which interest you"
@@ -4630,147 +4623,147 @@ msgstr ""
 "dolgozni. Válassza ki azokat, amelyek érdeklik."
 
 #. Advice for Translators: set the first letter of filename translated
-#: ../src/scan.c:2563
+#: ../src/scan_dialog.c:2033
 msgid "F"
 msgstr "F"
 
 # bubble help
-#: ../src/scan.c:2565
+#: ../src/scan_dialog.c:2035
 msgid "Process filename field"
 msgstr "Fájlnév mező feldolgozása"
 
 #. Advice for Translators: set the first letter of title translated
-#: ../src/scan.c:2567
+#: ../src/scan_dialog.c:2037
 msgid "T"
 msgstr "C"
 
 # bubble help
-#: ../src/scan.c:2568
+#: ../src/scan_dialog.c:2038
 msgid "Process title field"
 msgstr "A cím mező feldolgozása"
 
 #. Advice for Translators: set the first letter of artist translated
-#: ../src/scan.c:2570
+#: ../src/scan_dialog.c:2040
 msgid "Ar"
 msgstr "E"
 
 # bubble help
-#: ../src/scan.c:2571
+#: ../src/scan_dialog.c:2041
 msgid "Process file artist field"
 msgstr "Az előadó mező feldolgozása"
 
 #. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan.c:2573
+#: ../src/scan_dialog.c:2043
 msgid "AA"
 msgstr "AE"
 
 # bubble help
-#: ../src/scan.c:2574
+#: ../src/scan_dialog.c:2044
 msgid "Process album artist field"
 msgstr "Az album előadója mező feldolgozása"
 
 #. Advice for Translators: set the first letter of album translated
-#: ../src/scan.c:2576
+#: ../src/scan_dialog.c:2046
 msgid "Al"
 msgstr "A"
 
 # bubble help
-#: ../src/scan.c:2577
+#: ../src/scan_dialog.c:2047
 msgid "Process album field"
 msgstr "Az album mező feldolgozása"
 
 #. Advice for Translators: set the first letter of genre translated
-#: ../src/scan.c:2579
+#: ../src/scan_dialog.c:2049
 msgid "G"
 msgstr "M"
 
 # bubble help
-#: ../src/scan.c:2580
+#: ../src/scan_dialog.c:2050
 msgid "Process genre field"
 msgstr "A műfaj mező feldolgozása"
 
 #. Advice for Translators: set the first letter of comment translated
-#: ../src/scan.c:2582
+#: ../src/scan_dialog.c:2052
 msgid "Cm"
 msgstr "MJ"
 
 # bubble help
-#: ../src/scan.c:2583
+#: ../src/scan_dialog.c:2053
 msgid "Process comment field"
 msgstr "A megjegyzés mező feldolgozása"
 
 #. Advice for Translators: set the first letter of composer translated
-#: ../src/scan.c:2585
+#: ../src/scan_dialog.c:2055
 msgid "Cp"
 msgstr "Z"
 
 # bubble help
-#: ../src/scan.c:2586
+#: ../src/scan_dialog.c:2056
 msgid "Process composer field"
 msgstr "A zeneszerző mező feldolgozása"
 
 #. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan.c:2588
+#: ../src/scan_dialog.c:2058
 msgid "O"
 msgstr "EE"
 
 # bubble help
-#: ../src/scan.c:2589
+#: ../src/scan_dialog.c:2059
 msgid "Process original artist field"
 msgstr "Az eredeti előadó mező feldolgozása"
 
 #. Advice for Translators: set the first letter of copyright translated
-#: ../src/scan.c:2591
+#: ../src/scan_dialog.c:2061
 msgid "Cr"
 msgstr "Sz"
 
 # bubble help
-#: ../src/scan.c:2592
+#: ../src/scan_dialog.c:2062
 msgid "Process copyright field"
 msgstr "A szerzői jog mező feldolgozása"
 
 #. Advice for Translators: set the first letter of URL translated
-#: ../src/scan.c:2594
+#: ../src/scan_dialog.c:2064
 msgid "U"
 msgstr "U"
 
 # bubble help
-#: ../src/scan.c:2595
+#: ../src/scan_dialog.c:2065
 msgid "Process URL field"
 msgstr "Az URL mező feldolgozása"
 
 #. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan.c:2597
+#: ../src/scan_dialog.c:2067
 msgid "E"
 msgstr "K"
 
 # bubble help
-#: ../src/scan.c:2598
+#: ../src/scan_dialog.c:2068
 msgid "Process encoder name field"
 msgstr "A kódoló neve mező feldolgozása"
 
-#: ../src/scan.c:2642
+#: ../src/scan_dialog.c:2112
 msgid "Invert selection"
 msgstr "Kijelölés megfordítása"
 
-#: ../src/scan.c:2649
+#: ../src/scan_dialog.c:2119
 msgid "Select/Unselect all"
 msgstr "Összes kijelölése / Kijelölés megszüntetése"
 
-#: ../src/scan.c:2664
+#: ../src/scan_dialog.c:2134
 msgid "Convert:"
 msgstr "Átalakítás:"
 
-#: ../src/scan.c:2666
+#: ../src/scan_dialog.c:2136
 msgid "to: "
 msgstr "ebbe: "
 
-#: ../src/scan.c:2673
+#: ../src/scan_dialog.c:2143
 msgid "Do not convert"
 msgstr "Ne alakítsa át"
 
 # bubble help
-#: ../src/scan.c:2692
+#: ../src/scan_dialog.c:2162
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4780,7 +4773,7 @@ msgstr ""
 "bejegyzés tartalmában”."
 
 # bubble help
-#: ../src/scan.c:2695
+#: ../src/scan_dialog.c:2165
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4788,39 +4781,39 @@ msgstr ""
 "A szóköz karakter cserélve lesz egy alsóvonás karakterre. Például előtte: "
 "„Szöveg egy bejegyzésben”, utána: „Szöveg_egy_bejegyzésben”."
 
-#: ../src/scan.c:2698
+#: ../src/scan_dialog.c:2168
 msgid ""
 "Replace a string by another one. Note that the search is case sensitive."
 msgstr ""
 "Egy karakterlánc cseréje egy másikkal. Figyeljen arra, hogy a keresés kis- "
 "és nagybetű érzékeny."
 
-#: ../src/scan.c:2705
+#: ../src/scan_dialog.c:2175
 msgid "Capitalize all"
 msgstr "Összes nagy kezdőbetűsre"
 
-#: ../src/scan.c:2707
+#: ../src/scan_dialog.c:2177
 msgid "Lowercase all"
 msgstr "Összes kisbetűsre"
 
-#: ../src/scan.c:2709
+#: ../src/scan_dialog.c:2179
 msgid "Capitalize first letter"
 msgstr "Első betű nagybetűsre"
 
-#: ../src/scan.c:2711
+#: ../src/scan_dialog.c:2181
 msgid "Capitalize the first letter of each word"
 msgstr "Minden szó első betűje legyen nagybetű"
 
-#: ../src/scan.c:2712
+#: ../src/scan_dialog.c:2182
 msgid "Detect Roman numerals"
 msgstr "Római számok felismerése"
 
-#: ../src/scan.c:2714
+#: ../src/scan_dialog.c:2184
 msgid "Do not change capitalization"
 msgstr "Ne változtassa meg a kis- és nagybetűket"
 
 # bubble help
-#: ../src/scan.c:2736
+#: ../src/scan_dialog.c:2206
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4829,7 +4822,7 @@ msgstr ""
 "EGY bejegyzésben”, utána: „SZÖVEG EGY BEJEGYZÉSBEN”."
 
 # bubble help
-#: ../src/scan.c:2739
+#: ../src/scan_dialog.c:2209
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4838,7 +4831,7 @@ msgstr ""
 "EGY bejegyzésben”, utána: „szöveg egy bejegyzésben”."
 
 # bubble help
-#: ../src/scan.c:2742
+#: ../src/scan_dialog.c:2212
 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'."
@@ -4847,7 +4840,7 @@ msgstr ""
 "„Szöveg EGY Bejegyzésben”, utána: „Szöveg egy bejegyzésben”."
 
 # bubble help
-#: ../src/scan.c:2745
+#: ../src/scan_dialog.c:2215
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4856,7 +4849,7 @@ msgstr ""
 "előtte: „Szöveg egy BEJEGYZÉSBEN”, utána: „Szöveg Egy Bejegyzésben”."
 
 # bubble help
-#: ../src/scan.c:2748
+#: ../src/scan_dialog.c:2218
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -4864,20 +4857,20 @@ msgstr ""
 "A római számok nagybetűsre alakításának erőltetése. Például előtte: „ix. "
 "szöveg egy bejegyzésben, utána: „IX. Szöveg Egy Bejegyzésben”."
 
-#: ../src/scan.c:2756
+#: ../src/scan_dialog.c:2226
 msgid "Insert a space before uppercase letters"
 msgstr "Szóköz beszúrása minden nagybetű elé"
 
-#: ../src/scan.c:2758
+#: ../src/scan_dialog.c:2228
 msgid "Remove duplicate spaces and underscores"
 msgstr "Dupla szóközök és alsóvonások eltávolítása"
 
-#: ../src/scan.c:2760
+#: ../src/scan_dialog.c:2230
 msgid "Do not change word separators"
 msgstr "Ne változtassa meg a szóelválasztókat"
 
 # bubble help
-#: ../src/scan.c:2774
+#: ../src/scan_dialog.c:2244
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4886,7 +4879,7 @@ msgstr ""
 "Bejegyzésben”, utána: „SzövegEgyBejegyzésben”."
 
 # bubble help
-#: ../src/scan.c:2777
+#: ../src/scan_dialog.c:2247
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4895,7 +4888,7 @@ msgstr ""
 "„SzövegEgyBejegyzésben”, utána: „Szöveg Egy Bejegyzésben”."
 
 # bubble help
-#: ../src/scan.c:2780
+#: ../src/scan_dialog.c:2250
 msgid ""
 "Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4906,141 +4899,141 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2787
+#: ../src/scan_dialog.c:2257
 msgid "Legend"
 msgstr "Jelmagyarázat"
 
-#: ../src/scan.c:2793
+#: ../src/scan_dialog.c:2263
 #, c-format
 msgid "%a: artist"
 msgstr "%a: előadó"
 
-#: ../src/scan.c:2796
+#: ../src/scan_dialog.c:2266
 msgid "%z: album artist"
 msgstr "%z: album előadó"
 
-#: ../src/scan.c:2799
+#: ../src/scan_dialog.c:2269
 msgid "%b: album"
 msgstr "%b: album"
 
-#: ../src/scan.c:2802
+#: ../src/scan_dialog.c:2272
 #, c-format
 msgid "%c: comment"
 msgstr "%c: megjegyzés"
 
-#: ../src/scan.c:2805
+#: ../src/scan_dialog.c:2275
 #, c-format
 msgid "%p: composer"
 msgstr "%p: zeneszerző"
 
-#: ../src/scan.c:2808
+#: ../src/scan_dialog.c:2278
 msgid "%r: copyright"
 msgstr "%r: szerzői jog"
 
-#: ../src/scan.c:2811
+#: ../src/scan_dialog.c:2281
 #, c-format
 msgid "%d: disc number"
 msgstr "%d: lemez száma"
 
-#: ../src/scan.c:2814
+#: ../src/scan_dialog.c:2284
 #, c-format
 msgid "%e: encoded by"
 msgstr "%e: kódoló neve"
 
-#: ../src/scan.c:2817
+#: ../src/scan_dialog.c:2287
 #, c-format
 msgid "%g: genre"
 msgstr "%g: műfaj"
 
-#: ../src/scan.c:2820
+#: ../src/scan_dialog.c:2290
 #, c-format
 msgid "%i: ignored"
 msgstr "%i: mellőzött"
 
-#: ../src/scan.c:2823
+#: ../src/scan_dialog.c:2293
 msgid "%l: number of tracks"
 msgstr "%l: sávok száma"
 
-#: ../src/scan.c:2826
+#: ../src/scan_dialog.c:2296
 #, c-format
 msgid "%o: orig. artist"
 msgstr "%o: eredeti előadó"
 
-#: ../src/scan.c:2829
+#: ../src/scan_dialog.c:2299
 #, c-format
 msgid "%n: track"
 msgstr "%n: szám"
 
-#: ../src/scan.c:2832
+#: ../src/scan_dialog.c:2302
 msgid "%t: title"
 msgstr "%t: cím"
 
-#: ../src/scan.c:2835
+#: ../src/scan_dialog.c:2305
 #, c-format
 msgid "%u: URL"
 msgstr "%u: URL"
 
-#: ../src/scan.c:2838
+#: ../src/scan_dialog.c:2308
 #, c-format
 msgid "%x: number of discs"
 msgstr "%x: lemezek száma"
 
-#: ../src/scan.c:2841
+#: ../src/scan_dialog.c:2311
 msgid "%y: year"
 msgstr "%y: év"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2848
+#: ../src/scan_dialog.c:2318
 msgid "Mask Editor"
 msgstr "Maszkszerkesztő"
 
-#: ../src/scan.c:2902
+#: ../src/scan_dialog.c:2372
 msgid "Create New Mask"
 msgstr "Új maszk létrehozása"
 
-#: ../src/scan.c:2912
+#: ../src/scan_dialog.c:2382
 msgid "Move Up this Mask"
 msgstr "Maszk felfelé mozgatása"
 
-#: ../src/scan.c:2922
+#: ../src/scan_dialog.c:2392
 msgid "Move Down this Mask"
 msgstr "Maszk lefelé mozgatása"
 
-#: ../src/scan.c:2932
+#: ../src/scan_dialog.c:2402
 msgid "Duplicate Mask"
 msgstr "Maszk kettőzése"
 
-#: ../src/scan.c:2942
+#: ../src/scan_dialog.c:2412
 msgid "Add Default Masks"
 msgstr "Alapértelmezett maszkok hozzáadása"
 
-#: ../src/scan.c:2952
+#: ../src/scan_dialog.c:2422
 msgid "Remove Mask"
 msgstr "Maszk eltávolítása"
 
-#: ../src/scan.c:2962
+#: ../src/scan_dialog.c:2432
 msgid "Save Masks"
 msgstr "Maszkok mentése"
 
-#: ../src/scan.c:3542
+#: ../src/scan_dialog.c:3012
 msgid "New_mask"
 msgstr "Új_maszk"
 
-#: ../src/scan.c:3581
+#: ../src/scan_dialog.c:3051
 msgid "Copy: No row selected"
 msgstr "Másolás: Nincs kijelölt sor"
 
-#: ../src/scan.c:3674
+#: ../src/scan_dialog.c:3144
 msgid "Remove: No row selected"
 msgstr "Eltávolítás: Nincs kijelölt sor"
 
-#: ../src/scan.c:3721
+#: ../src/scan_dialog.c:3191
 msgid "Move Up: No row selected"
 msgstr "Felfelé mozgatás: Nincs kijelölt sor"
 
-#: ../src/scan.c:3765
+#: ../src/scan_dialog.c:3235
 msgid "Move Down: No row selected"
 msgstr "Lefelé mozgatás: Nincs kijelölt sor"
 
@@ -5108,6 +5101,32 @@ msgstr "A(z) „%s” beállítófájl költöztetése nem sikerült"
 msgid "Error: Cannot create directory '%s' (%s)"
 msgstr "Hiba: Nem lehet létrehozni a könyvtárat: „%s” (%s)"
 
+#~ msgid ""
+#~ "This program is free software; you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License as published by the "
+#~ "Free Software Foundation; either version 2 of the License, or (at your "
+#~ "option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful, but "
+#~ "WITHOUT ANY WARRANTY; without even the implied warranty of "
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General "
+#~ "Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with this program. If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "Ez a program szabad szoftver, terjesztheti és/vagy módosíthatja a Free "
+#~ "Software Foundation által kiadott GNU General Public License második "
+#~ "(vagy bármely későbbi) változatában foglaltak alapján.\n"
+#~ "\n"
+#~ "Ezt a programot abban a reményben terjesztjük, hogy hasznos lesz, de nem "
+#~ "vállalunk SEMMIFÉLE GARANCIÁT, még olyan értelemben sem, hogy a program "
+#~ "alkalmas-e a KÖZREADÁSRA vagy EGY BIZONYOS FELADAT ELVÉGZÉSÉRE. További "
+#~ "részletekért tanulmányozza a GNU GPL licencet.\n"
+#~ "\n"
+#~ "A programhoz a GNU General Public License egy példánya is jár, ha nem "
+#~ "kapta meg, látogassa meg a <http://www.gnu.org/licenses/> oldalt."
+
 #~ msgid "DLL '%s' not already loaded. Try loading it..."
 #~ msgstr "A(z) „%s” DLL még nincs betöltve. Betöltés megpróbálása…"
 
diff --git a/po/lt.po b/po/lt.po
index c330836..f0a7b54 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: EasyTAG 2.1.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=easytag&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-07 22:43+0000\n"
-"PO-Revision-Date: 2014-03-11 16:25+0200\n"
+"POT-Creation-Date: 2014-04-12 13:25+0000\n"
+"PO-Revision-Date: 2014-04-13 22:55+0300\n"
 "Last-Translator: Aurimas Černius <aurisc4 at gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt at lists.akl.lt>\n"
 "Language: lt\n"
@@ -22,12 +22,15 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.6\n"
 
 #: ../data/easytag.appdata.xml.in.h:1
+#| msgid ""
+#| "View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Vorbis, MusePack, "
+#| "Monkey's Audio and WavPack files."
 msgid ""
-"View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Vorbis, MusePack, "
-"Monkey's Audio and WavPack files."
+"View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg "
+"Vorbis, MusePack, Monkey's Audio and WavPack files."
 msgstr ""
-"Žiūrėkite ir keiskite žymas MP3, MP2, MP4/AAC, FLAC, Ogg Vorbis, MusePack, "
-"Monkey's Audio bei WavPack failuose."
+"Žiūrėkite ir keiskite žymas MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, "
+"Ogg Vorbis, MusePack, Monkey's Audio bei WavPack failuose."
 
 #: ../data/easytag.appdata.xml.in.h:2
 msgid ""
@@ -58,7 +61,7 @@ msgstr "Keiskite garso failo metaduomenis"
 msgid "mp3;tag;audio;"
 msgstr "mp3;žymos;garsas;"
 
-#: ../src/about.c:91
+#: ../src/about.c:89
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -86,19 +89,20 @@ msgstr ""
 "programa. Jei negavote, ją rasite <http://www.gnu.org/licenses/>."
 
 #. Translators: put your own name here to appear in the about dialog.
-#: ../src/about.c:108
+#: ../src/about.c:106
 msgid "translator-credits"
 msgstr ""
 "Išvertė:\n"
 "Aurimas Černius <aurisc4 at gmail.com>"
 
-#: ../src/about.c:118
+#: ../src/about.c:116
 msgid "View and edit tags in audio files"
 msgstr "Žiūrėti ir keisti žymas garso failuose"
 
-#. g_print(_("Error while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: ../src/ape_tag.c:61 ../src/id3v24_tag.c:112 ../src/mp4_header.c:63
-#: ../src/mp4_tag.c:65 ../src/mp4_tag.c:186
+#: ../src/ape_tag.c:61 ../src/id3v24_tag.c:112 ../src/mp4_header.cc:46
+#: ../src/mp4_header.cc:59 ../src/mp4_tag.cc:69 ../src/mp4_tag.cc:85
+#: ../src/mp4_tag.cc:90 ../src/mp4_tag.cc:262 ../src/mp4_tag.cc:278
+#: ../src/mp4_tag.cc:283
 #, c-format
 msgid "Error while opening file: '%s' (%s)."
 msgstr "Klaida atveriant failą: „%s“ (%s)."
@@ -119,623 +123,623 @@ msgstr "- žymėkite ir keiskite garso failus"
 #.
 #. * Main Menu Actions
 #.
-#: ../src/bar.c:154
+#: ../src/bar.c:155
 msgid "_File"
 msgstr "_Failas"
 
-#: ../src/bar.c:155
+#: ../src/bar.c:156
 msgid "Sort List by Tag"
 msgstr "Rikiuoti sąrašą pagal žymę"
 
-#: ../src/bar.c:158
+#: ../src/bar.c:159
 msgid "Sort List by Property"
 msgstr "Rikiuoti sąrašą pagal savybę"
 
-#: ../src/bar.c:159
+#: ../src/bar.c:160
 msgid "Ascending by filename"
 msgstr "Pagal failo vardą didėjimo tvarka"
 
-#: ../src/bar.c:160
+#: ../src/bar.c:161
 msgid "Descending by filename"
 msgstr "Pagal failo vardą mažėjimo tvarka"
 
-#: ../src/bar.c:161
+#: ../src/bar.c:162
 msgid "Ascending by creation date"
 msgstr "Pagal sukūrimo datą didėjimo tvarka"
 
-#: ../src/bar.c:162
+#: ../src/bar.c:163
 msgid "Descending by creation date"
 msgstr "Pagal sukūrimo datą mažėjimo tvarka"
 
-#: ../src/bar.c:163
+#: ../src/bar.c:164
 msgid "Ascending by track number"
 msgstr "Pagal takelio numerį didėjimo tvarka"
 
-#: ../src/bar.c:164
+#: ../src/bar.c:165
 msgid "Descending by track number"
 msgstr "Pagal takelio numerį mažėjimo tvarka"
 
-#: ../src/bar.c:165
+#: ../src/bar.c:166
 msgid "Ascending by title"
 msgstr "Pagal pavadinimą didėjimo tvarka"
 
-#: ../src/bar.c:166
+#: ../src/bar.c:167
 msgid "Descending by title"
 msgstr "Pagal pavadinimą mažėjimo tvarka"
 
-#: ../src/bar.c:167
+#: ../src/bar.c:168
 msgid "Ascending by artist"
 msgstr "Pagal atlikėją didėjimo tvarka"
 
-#: ../src/bar.c:168
+#: ../src/bar.c:169
 msgid "Descending by artist"
 msgstr "Pagal atlikėją mažėjimo tvarka"
 
-#: ../src/bar.c:169
+#: ../src/bar.c:170
 msgid "Ascending by album artist"
 msgstr "Pagal albumo atlikėją didėjimo tvarka"
 
-#: ../src/bar.c:170
+#: ../src/bar.c:171
 msgid "Descending by album artist"
 msgstr "Pagal albumo atlikėją mažėjimo tvarka"
 
-#: ../src/bar.c:171
+#: ../src/bar.c:172
 msgid "Ascending by album"
 msgstr "Pagal albumą didėjimo tvarka"
 
-#: ../src/bar.c:172
+#: ../src/bar.c:173
 msgid "Descending by album"
 msgstr "Pagal albumą mažėjimo tvarka"
 
-#: ../src/bar.c:173
+#: ../src/bar.c:174
 msgid "Ascending by year"
 msgstr "Pagal metus didėjimo tvarka"
 
-#: ../src/bar.c:174
+#: ../src/bar.c:175
 msgid "Descending by year"
 msgstr "Pagal metus mažėjimo tvarka"
 
-#: ../src/bar.c:175
+#: ../src/bar.c:176
 msgid "Ascending by genre"
 msgstr "Pagal žanrą didėjimo tvarka"
 
-#: ../src/bar.c:176
+#: ../src/bar.c:177
 msgid "Descending by genre"
 msgstr "Pagal žanrą mažėjimo tvarka"
 
-#: ../src/bar.c:177
+#: ../src/bar.c:178
 msgid "Ascending by comment"
 msgstr "Pagal komentarą didėjimo tvarka"
 
-#: ../src/bar.c:178
+#: ../src/bar.c:179
 msgid "Descending by comment"
 msgstr "Pagal komentarą mažėjimo tvarka"
 
-#: ../src/bar.c:179
+#: ../src/bar.c:180
 msgid "Ascending by composer"
 msgstr "Pagal kompozitorių didėjimo tvarka"
 
-#: ../src/bar.c:180
+#: ../src/bar.c:181
 msgid "Descending by composer"
 msgstr "Pagal kompozitorių mažėjimo tvarka"
 
-#: ../src/bar.c:181
+#: ../src/bar.c:182
 msgid "Ascending by original artist"
 msgstr "Pagal originalų atlikėją didėjimo tvarka"
 
-#: ../src/bar.c:182
+#: ../src/bar.c:183
 msgid "Descending by original artist"
 msgstr "Pagal originalų atlikėją mažėjimo tvarka"
 
-#: ../src/bar.c:183
+#: ../src/bar.c:184
 msgid "Ascending by copyright"
 msgstr "Pagal autorines teises didėjimo tvarka"
 
-#: ../src/bar.c:184
+#: ../src/bar.c:185
 msgid "Descending by copyright"
 msgstr "Pagal autorines teises mažėjimo tvarka"
 
-#: ../src/bar.c:185
+#: ../src/bar.c:186
 msgid "Ascending by URL"
 msgstr "Pagal URL didėjimo tvarka"
 
-#: ../src/bar.c:186
+#: ../src/bar.c:187
 msgid "Descending by URL"
 msgstr "Pagal URL mažėjimo tvarka"
 
 #. Translators: the encoder name is supposed to be the name of a person
 #. * or organisation, but can sometimes be the name of an application.
-#: ../src/bar.c:189
+#: ../src/bar.c:190
 msgid "Ascending by encoder name"
 msgstr "Pagal kodavimą didėjimo tvarka"
 
 #. Translators: the encoder name is supposed to be the name of a person
 #. * or organisation, but can sometimes be the name of an application.
-#: ../src/bar.c:192
+#: ../src/bar.c:193
 msgid "Descending by encoder name"
 msgstr "Pagal kodavimą mažėjimo tvarka"
 
-#: ../src/bar.c:193
+#: ../src/bar.c:194
 msgid "Ascending by file type"
 msgstr "Pagal failo tipą didėjimo tvarka"
 
-#: ../src/bar.c:194
+#: ../src/bar.c:195
 msgid "Descending by file type"
 msgstr "Pagal failo tipą mažėjimo tvarka"
 
-#: ../src/bar.c:195
+#: ../src/bar.c:196
 msgid "Ascending by file size"
 msgstr "Pagal failo dydį didėjimo tvarka"
 
-#: ../src/bar.c:196
+#: ../src/bar.c:197
 msgid "Descending by file size"
 msgstr "Pagal failo dydį mažėjimo tvarka"
 
-#: ../src/bar.c:197
+#: ../src/bar.c:198
 msgid "Ascending by duration"
 msgstr "Pagal trukmę didėjimo tvarka"
 
-#: ../src/bar.c:198
+#: ../src/bar.c:199
 msgid "Descending by duration"
 msgstr "Pagal trukmę mažėjimo tvarka"
 
-#: ../src/bar.c:199
+#: ../src/bar.c:200
 msgid "Ascending by bitrate"
 msgstr "Pagal bitų dažnį didėjimo tvarka"
 
-#: ../src/bar.c:200
+#: ../src/bar.c:201
 msgid "Descending by bitrate"
 msgstr "Pagal bitų dažnį mažėjimo tvarka"
 
-#: ../src/bar.c:201
+#: ../src/bar.c:202
 msgid "Ascending by samplerate"
 msgstr "Pagal diskretizacijos dažnį didėjimo tvarka"
 
-#: ../src/bar.c:202
+#: ../src/bar.c:203
 msgid "Descending by samplerate"
 msgstr "Pagal diskretizacijos dažnį mažėjimo tvarka"
 
-#: ../src/bar.c:204
+#: ../src/bar.c:205
 msgid "Open Files With…"
 msgstr "Atverti failus su…"
 
-#: ../src/bar.c:205
+#: ../src/bar.c:206
 msgid "Run a command on the selected files"
 msgstr "Vykdyti komandą su pasirinktais failais"
 
-#: ../src/bar.c:208
+#: ../src/bar.c:209
 msgid "Select all"
 msgstr "Pasirinkti visus"
 
-#: ../src/bar.c:209
+#: ../src/bar.c:210
 msgid "Unselect All"
 msgstr "Nepasirinkti nieko"
 
-#: ../src/bar.c:210
+#: ../src/bar.c:211
 msgid "Clear the current selection"
 msgstr "Išvalyti dabartinį žymėjimą"
 
-#: ../src/bar.c:213
+#: ../src/bar.c:214
 msgid "Invert File Selection"
 msgstr "Invertuoti failų pasirinkimą"
 
-#: ../src/bar.c:214
+#: ../src/bar.c:215
 msgid "Invert file selection"
 msgstr "Invertuoti failų pasirinkimą"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete Files"
 msgstr "Ištrinti failus"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete files"
 msgstr "Ištrinti failus"
 
-#: ../src/bar.c:217
+#: ../src/bar.c:218
 msgid "_First File"
 msgstr "_Pirmas failas"
 
-#: ../src/bar.c:218
+#: ../src/bar.c:219
 msgid "First file"
 msgstr "Pirmas failas"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "_Previous File"
 msgstr "_Ankstesnis failas"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "Previous file"
 msgstr "Ankstesnis failas"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "_Next File"
 msgstr "_Sekantis failas"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "Next file"
 msgstr "Kitas failas"
 
-#: ../src/bar.c:221
+#: ../src/bar.c:222
 msgid "_Last File"
 msgstr "_Paskutinis failas"
 
-#: ../src/bar.c:222
+#: ../src/bar.c:223
 msgid "Last file"
 msgstr "Paskutinis failas"
 
-#: ../src/bar.c:223
+#: ../src/bar.c:224
 msgid "S_can Files"
 msgstr "S_kaityti failus"
 
-#: ../src/bar.c:224 ../src/scan.c:2344
+#: ../src/bar.c:225 ../src/scan_dialog.c:1814
 msgid "Scan selected files"
 msgstr "Skaityti pasirinktus failus"
 
-#: ../src/bar.c:225
+#: ../src/bar.c:226
 msgid "_Remove Tags"
 msgstr "_Pašalinti žymas"
 
-#: ../src/bar.c:226
+#: ../src/bar.c:227
 msgid "Remove tags"
 msgstr "Pašalinti žymas"
 
-#: ../src/bar.c:227
+#: ../src/bar.c:228
 msgid "_Undo Last Files Changes"
 msgstr "_Atšaukti paskutinius failų pakeitimus"
 
-#: ../src/bar.c:228
+#: ../src/bar.c:229
 msgid "Undo last files changes"
 msgstr "Atšaukti paskutinius failų pakeitimus"
 
-#: ../src/bar.c:230
+#: ../src/bar.c:231
 msgid "R_edo Last Files Changes"
 msgstr "_Pakartoti paskutinius failų pakeitimus"
 
-#: ../src/bar.c:231
+#: ../src/bar.c:232
 msgid "Redo last files changes"
 msgstr "Pakartoti paskutinius failų pakeitimus"
 
-#: ../src/bar.c:233
+#: ../src/bar.c:234
 msgid "_Save Files"
 msgstr "_Įrašyti failus"
 
-#: ../src/bar.c:234
+#: ../src/bar.c:235
 msgid "Save changes to selected files"
 msgstr "Įrašyti pasirinktų failų pakeitimus"
 
-#: ../src/bar.c:236
+#: ../src/bar.c:237
 msgid "_Force Save Files"
 msgstr "_Priverstinai įrašyti failus"
 
-#: ../src/bar.c:237
+#: ../src/bar.c:238
 msgid "Force saving files"
 msgstr "Priverstinai įrašyti failus"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo Last Changes"
 msgstr "Atšaukti paskutinius keitimus"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo last changes"
 msgstr "Atšaukti paskutinius pakeitimus"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo Last Changes"
 msgstr "Pakartoti paskutinius keitimus"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo last changes"
 msgstr "Pakartoti paskutinius pakeitimus"
 
-#: ../src/bar.c:241
+#: ../src/bar.c:242
 msgid "_Quit"
 msgstr "I_šeiti"
 
-#: ../src/bar.c:241 ../src/easytag.c:2430 ../src/easytag.c:4531
-#: ../src/easytag.c:4563
+#: ../src/bar.c:242 ../src/easytag.c:2430 ../src/easytag.c:4565
+#: ../src/easytag.c:4597
 msgid "Quit"
 msgstr "Išeiti"
 
-#: ../src/bar.c:244
+#: ../src/bar.c:245
 msgid "_Browser"
 msgstr "Naršyklė"
 
-#: ../src/bar.c:245
+#: ../src/bar.c:246
 msgid "_Home Directory"
 msgstr "_Namų aplankas"
 
-#: ../src/bar.c:246
+#: ../src/bar.c:247
 msgid "Go to home directory"
 msgstr "Eiti į namų aplanką"
 
-#: ../src/bar.c:248
+#: ../src/bar.c:249
 msgid "Desktop Directory"
 msgstr "Darbastalio aplankas"
 
-#: ../src/bar.c:249
+#: ../src/bar.c:250
 msgid "Go to desktop directory"
 msgstr "Eiti į darbastalio aplanką"
 
-#: ../src/bar.c:251
+#: ../src/bar.c:252
 msgid "Documents Directory"
 msgstr "Dokumentų aplankas"
 
-#: ../src/bar.c:252
+#: ../src/bar.c:253
 msgid "Go to documents directory"
 msgstr "Eiti į dokumentų aplanką"
 
-#: ../src/bar.c:254
+#: ../src/bar.c:255
 msgid "Downloads Directory"
 msgstr "Parsiuntimų aplankas"
 
-#: ../src/bar.c:255
+#: ../src/bar.c:256
 msgid "Go to downloads directory"
 msgstr "Eiti į parsiuntimų aplanką"
 
-#: ../src/bar.c:257
+#: ../src/bar.c:258
 msgid "Music Directory"
 msgstr "Muzikos aplankas"
 
-#: ../src/bar.c:258
+#: ../src/bar.c:259
 msgid "Go to music directory"
 msgstr "Eiti į muzikos aplanką"
 
-#: ../src/bar.c:260
+#: ../src/bar.c:261
 msgid "_Parent Directory"
 msgstr "_Tėvinis aplankas"
 
-#: ../src/bar.c:261
+#: ../src/bar.c:262
 msgid "Go to parent directory"
 msgstr "Eiti į aukštesnį aplanką"
 
-#: ../src/bar.c:263
+#: ../src/bar.c:264
 msgid "_Default Directory"
 msgstr "_Numatytasis aplankas"
 
-#: ../src/bar.c:264
+#: ../src/bar.c:265
 msgid "Go to default directory"
 msgstr "Eiti į numatytąjį aplanką"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set _Current Path as Default"
 msgstr "Nustatyti _dabartinį kelią numatytuoju"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set current path as default"
 msgstr "Nustatyti dabartinį kelią numatytuoju"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename Directory…"
 msgstr "Pervadinti aplanką…"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename directory"
 msgstr "Pervadinti aplanką"
 
-#: ../src/bar.c:268
+#: ../src/bar.c:269
 msgid "Reload Directory"
 msgstr "Įkelti aplanką iš naujo"
 
-#: ../src/bar.c:269
+#: ../src/bar.c:270
 msgid "Reload directory"
 msgstr "Įkelti aplanką iš naujo"
 
-#: ../src/bar.c:272
+#: ../src/bar.c:273
 msgid "Browse Directory With…"
 msgstr "Naršyti aplanką su…"
 
-#: ../src/bar.c:273
+#: ../src/bar.c:274
 msgid "Run a command on the directory"
 msgstr "Įvykdyti komandą aplankui"
 
-#: ../src/bar.c:275
+#: ../src/bar.c:276
 msgid "_Collapse Tree"
 msgstr "_Suskleisti medį"
 
-#: ../src/bar.c:276
+#: ../src/bar.c:277
 msgid "Collapse directory tree"
 msgstr "Sutraukti aplankų medį"
 
-#: ../src/bar.c:277
+#: ../src/bar.c:278
 msgid "_Reload Tree"
 msgstr "Į_kelti medį iš naujo"
 
-#: ../src/bar.c:278
+#: ../src/bar.c:279
 msgid "Reload directory tree"
 msgstr "Įkelti aplankų medį iš naujo"
 
-#: ../src/bar.c:281
+#: ../src/bar.c:282
 msgid "S_canner Mode"
 msgstr "_Skenerio veiksena"
 
-#: ../src/bar.c:283
+#: ../src/bar.c:284
 msgid "_Miscellaneous"
 msgstr "Į_vairūs"
 
-#: ../src/bar.c:284
+#: ../src/bar.c:285
 msgid "_Find…"
 msgstr "_Rasti…"
 
-#: ../src/bar.c:285
+#: ../src/bar.c:286
 msgid "Search filenames and tags"
 msgstr "Ieškoti failų pavadinimų ir žymų"
 
-#: ../src/bar.c:287
+#: ../src/bar.c:288
 msgid "CDD_B Search…"
 msgstr "CDD_B paieška…"
 
-#: ../src/bar.c:288
+#: ../src/bar.c:289
 msgid "CDDB search"
 msgstr "CDDB paieška"
 
-#: ../src/bar.c:290
+#: ../src/bar.c:291
 msgid "Load Filenames From a Text File…"
 msgstr "Įkelti failų pavadinimus iš tekstinio failo…"
 
-#: ../src/bar.c:291
+#: ../src/bar.c:292
 msgid "Load filenames from a text file"
 msgstr "Įkelti failų pavadinimus iš tekstinio failo"
 
-#: ../src/bar.c:293
+#: ../src/bar.c:294
 msgid "Generate Playlist…"
 msgstr "Generuoti grojaraštį…"
 
-#: ../src/bar.c:294
+#: ../src/bar.c:295
 msgid "Generate a playlist"
 msgstr "Generuoti grojaraštį"
 
-#: ../src/bar.c:296 ../src/bar.c:327 ../src/bar.c:328 ../src/bar.c:329
+#: ../src/bar.c:297 ../src/bar.c:328 ../src/bar.c:329 ../src/bar.c:330
 msgid "Run Audio Player"
 msgstr "Paleisti audio grotuvą"
 
-#: ../src/bar.c:297 ../src/bar.c:327 ../src/bar.c:328 ../src/bar.c:329
+#: ../src/bar.c:298 ../src/bar.c:328 ../src/bar.c:329 ../src/bar.c:330
 msgid "Run audio player"
 msgstr "Paleisti muzikos grotuvą"
 
-#: ../src/bar.c:300
+#: ../src/bar.c:301
 msgid "_Edit"
 msgstr "_Keisti"
 
-#: ../src/bar.c:301
+#: ../src/bar.c:302
 msgid "_Preferences"
 msgstr "_Nustatymai"
 
 #. The window
-#: ../src/bar.c:302 ../src/prefs.c:110
+#: ../src/bar.c:303 ../src/prefs.c:110
 msgid "Preferences"
 msgstr "Nustatymai"
 
-#: ../src/bar.c:304
+#: ../src/bar.c:305
 msgid "_View"
 msgstr "_Rodymas"
 
-#: ../src/bar.c:305
+#: ../src/bar.c:306
 msgid "_Go"
 msgstr "_Eiti"
 
-#: ../src/bar.c:307
+#: ../src/bar.c:308
 msgid "_Help"
 msgstr "Ž_inynas"
 
-#: ../src/bar.c:310
+#: ../src/bar.c:311
 msgid "_Contents"
 msgstr "_Turinys"
 
-#: ../src/bar.c:311
+#: ../src/bar.c:312
 msgid "Show help"
 msgstr "Rodyti žinyną"
 
-#: ../src/bar.c:313
+#: ../src/bar.c:314
 msgid "_About"
 msgstr "_Apie"
 
-#: ../src/bar.c:313
+#: ../src/bar.c:314
 msgid "About"
 msgstr "Apie"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: ../src/bar.c:319
+#: ../src/bar.c:320
 msgid "Stop the current action"
 msgstr "Sustabdyti dabartinį veiksmą"
 
 #.
 #. * Popup menu's Actions
 #.
-#: ../src/bar.c:325
+#: ../src/bar.c:326
 msgid "_File Operations"
 msgstr "_Failų operacijos"
 
-#: ../src/bar.c:326
+#: ../src/bar.c:327
 msgid "S_canner"
 msgstr "_Skeneris"
 
-#: ../src/bar.c:330
+#: ../src/bar.c:331
 msgid "CDDB Search Files…"
 msgstr "CDDB failų paieška…"
 
-#: ../src/bar.c:330
+#: ../src/bar.c:331
 msgid "CDDB search files…"
 msgstr "CDDB failų paieška…"
 
 #. { 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:334
+#: ../src/bar.c:335
 msgid "Clear log"
 msgstr "Išvalyti žurnalą"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Subdirectories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: ../src/bar.c:341
+#: ../src/bar.c:342
 msgid "Browse _Subdirectories"
 msgstr "Naršyti _poaplankius"
 
-#: ../src/bar.c:341
+#: ../src/bar.c:342
 msgid "Browse subdirectories"
 msgstr "Naršyti poaplankius"
 
-#: ../src/bar.c:345
+#: ../src/bar.c:346
 msgid "Show Hidden Directories"
 msgstr "Rodyti paslėptus aplankus"
 
-#: ../src/bar.c:345
+#: ../src/bar.c:346
 msgid "Show hidden directories"
 msgstr "Rodyti paslėptus aplankus"
 
-#: ../src/bar.c:347
+#: ../src/bar.c:348
 msgid "_Show Scanner"
 msgstr "_Rodyti skenerį"
 
-#: ../src/bar.c:348
+#: ../src/bar.c:349
 msgid "Show scanner"
 msgstr "Rodyti skenerį"
 
-#: ../src/bar.c:354
+#: ../src/bar.c:355
 msgid "Tree Browser"
 msgstr "Medžio naršyklė"
 
-#: ../src/bar.c:355
+#: ../src/bar.c:356
 msgid "View by directory tree"
 msgstr "Rodyti katalogų medį"
 
-#: ../src/bar.c:357
+#: ../src/bar.c:358
 msgid "Artist and Album"
 msgstr "Atlikėjas ir albumas"
 
-#: ../src/bar.c:358
+#: ../src/bar.c:359
 msgid "View by artist and album"
 msgstr "Rodyti pagal atlikėją ir albumą"
 
-#: ../src/bar.c:363
+#: ../src/bar.c:364
 msgid "_Fill Tags…"
 msgstr "_Užpildyti žymas…"
 
-#: ../src/bar.c:364
+#: ../src/bar.c:365
 msgid "Fill tags"
 msgstr "Užpildyti žymas"
 
-#: ../src/bar.c:366
+#: ../src/bar.c:367
 msgid "_Rename Files and Directories…"
 msgstr "_Pervadinti failus ir aplankus…"
 
-#: ../src/bar.c:367
+#: ../src/bar.c:368
 msgid "Rename files and directories"
 msgstr "Pervadinti failus ir aplankus"
 
-#: ../src/bar.c:369
+#: ../src/bar.c:370
 msgid "_Process Fields…"
 msgstr "_Apdoroti laukus…"
 
-#: ../src/bar.c:369 ../src/scan.c:182
+#: ../src/bar.c:370 ../src/scan_dialog.c:184
 msgid "Process Fields"
 msgstr "Apdoroti laukelius"
 
-#: ../src/bar.c:427
+#: ../src/bar.c:428
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Sulieti UI nepavyko, įvyko klaida: %s\n"
 
-#: ../src/bar.c:532
+#: ../src/bar.c:533
 msgid "Ready to start"
 msgstr "Pasiruošęs paleidimui"
 
@@ -743,7 +747,7 @@ msgstr "Pasiruošęs paleidimui"
 msgid "New default path for files selected"
 msgstr "Naujas numatytasis kelias pasirinktiems failams"
 
-#: ../src/browser.c:678 ../src/easytag.c:4527
+#: ../src/browser.c:678 ../src/easytag.c:4561
 msgid "Some files have been modified but not saved"
 msgstr "Kai kurie failai buvo pakeisti bet neįrašyti"
 
@@ -755,101 +759,101 @@ msgstr "Ar norite juos įrašyti prieš pakeisdami aplanką?"
 msgid "Confirm Directory Change"
 msgstr "Patvirtinkite aplanko pakeitimą"
 
-#: ../src/browser.c:2141
+#: ../src/browser.c:2146
 msgid "<All albums>"
 msgstr "<Visi albumai>"
 
-#: ../src/browser.c:2602
+#: ../src/browser.c:2607
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Klaida: ieškant „%s“ medyje nerastas %s"
 
-#: ../src/browser.c:3096 ../src/browser.c:3174
+#: ../src/browser.c:3101 ../src/browser.c:3179
 msgid "Tree"
 msgstr "Medis"
 
-#: ../src/browser.c:3097 ../src/cddb.c:803 ../src/misc.c:1902
+#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1903
 msgid "Filename"
 msgstr "Failo pavadinimas"
 
-#: ../src/browser.c:3097 ../src/cddb.c:804 ../src/misc.c:1903
+#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1904
 #: ../src/prefs.c:643
 msgid "Title"
 msgstr "Pavadinimas"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Artist".
-#: ../src/browser.c:3098 ../src/browser.c:3105 ../src/cddb.c:483
-#: ../src/cddb.c:805 ../src/misc.c:1904 ../src/prefs.c:644
+#: ../src/browser.c:3103 ../src/browser.c:3110 ../src/cddb.c:483
+#: ../src/cddb.c:805 ../src/misc.c:1905 ../src/prefs.c:644
 msgid "Artist"
 msgstr "Atlikėjas"
 
-#: ../src/browser.c:3098 ../src/misc.c:1905
+#: ../src/browser.c:3103 ../src/misc.c:1906
 msgid "Album Artist"
 msgstr "Albumo atlikėjas"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Album".
-#: ../src/browser.c:3099 ../src/browser.c:3107 ../src/cddb.c:486
-#: ../src/cddb.c:806 ../src/misc.c:1906 ../src/prefs.c:645
+#: ../src/browser.c:3104 ../src/browser.c:3112 ../src/cddb.c:486
+#: ../src/cddb.c:806 ../src/misc.c:1907 ../src/prefs.c:645
 msgid "Album"
 msgstr "Albumas"
 
-#: ../src/browser.c:3099 ../src/cddb.c:807 ../src/misc.c:1908
+#: ../src/browser.c:3104 ../src/cddb.c:807 ../src/misc.c:1909
 msgid "Year"
 msgstr "Metai"
 
-#: ../src/browser.c:3099
+#: ../src/browser.c:3104
 msgid "Disc"
 msgstr "Diskas"
 
-#: ../src/browser.c:3100 ../src/misc.c:1909
+#: ../src/browser.c:3105 ../src/misc.c:1910
 msgid "Track"
 msgstr "Takelis"
 
-#: ../src/browser.c:3100 ../src/cddb.c:810 ../src/misc.c:1910
+#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1911
 #: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Žanras"
 
-#: ../src/browser.c:3101 ../src/misc.c:1911 ../src/prefs.c:647
+#: ../src/browser.c:3106 ../src/misc.c:1912 ../src/prefs.c:647
 msgid "Comment"
 msgstr "Komentaras"
 
-#: ../src/browser.c:3101 ../src/misc.c:1912 ../src/picture.c:1058
+#: ../src/browser.c:3106 ../src/misc.c:1913 ../src/picture.c:1060
 #: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Kompozitorius"
 
-#: ../src/browser.c:3102 ../src/misc.c:1913
+#: ../src/browser.c:3107 ../src/misc.c:1914
 msgid "Original Artist"
 msgstr "Originalus atlikėjas"
 
-#: ../src/browser.c:3103 ../src/misc.c:1914
+#: ../src/browser.c:3108 ../src/misc.c:1915
 msgid "Copyright"
 msgstr "Autorinės teisės"
 
-#: ../src/browser.c:3103 ../src/misc.c:1915
+#: ../src/browser.c:3108 ../src/misc.c:1916
 msgid "URL"
 msgstr "URL"
 
-#: ../src/browser.c:3104 ../src/misc.c:1916
+#: ../src/browser.c:3109 ../src/misc.c:1917
 msgid "Encoded By"
 msgstr "Kodavo"
 
-#: ../src/browser.c:3105
+#: ../src/browser.c:3110
 msgid "# Albums"
 msgstr "# Albumai"
 
-#: ../src/browser.c:3106 ../src/browser.c:3107
+#: ../src/browser.c:3111 ../src/browser.c:3112
 msgid "# Files"
 msgstr "# Failai"
 
-#: ../src/browser.c:3132
+#: ../src/browser.c:3137
 msgid "Enter a directory to browse."
 msgstr "Įveskite kurį aplanką naršyti."
 
-#: ../src/browser.c:3141
+#: ../src/browser.c:3146
 msgid "Select a directory to browse."
 msgstr "Pasirinkite kurį aplanką naršyti."
 
@@ -857,33 +861,33 @@ msgstr "Pasirinkite kurį aplanką naršyti."
 #. * The label for displaying number of files in path (without subdirs)
 #.
 #. Translators: No files, as in "0 files".
-#: ../src/browser.c:3148 ../src/easytag.c:3469
+#: ../src/browser.c:3153 ../src/easytag.c:3469
 msgid "No files"
 msgstr "Nėra failų"
 
-#: ../src/browser.c:3226
+#: ../src/browser.c:3231
 msgid "Artist & Album"
 msgstr "Atlikėjas ir albumas"
 
 #. Only directories changed
-#: ../src/browser.c:3590 ../src/easytag.c:2881
+#: ../src/browser.c:3595 ../src/easytag.c:2881
 msgid "Rename Directory"
 msgstr "Pervadinti aplanką"
 
-#: ../src/browser.c:3612
+#: ../src/browser.c:3617
 #, c-format
 msgid "Rename the directory '%s' to:"
 msgstr "Pervadinti aplanką „%s“ į:"
 
-#: ../src/browser.c:3631 ../src/misc.c:1171
+#: ../src/browser.c:3636 ../src/misc.c:1172
 msgid "Use mask:"
 msgstr "Naudoti kaukę:"
 
-#: ../src/browser.c:3634
+#: ../src/browser.c:3639
 msgid "If activated, it will use masks to rename directory."
 msgstr "Jei aktyvuota, aplanko pervadinimui bus naudojami šablonai...."
 
-#: ../src/browser.c:3652
+#: ../src/browser.c:3657
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -892,63 +896,63 @@ msgstr ""
 "pasirinkite arba įveskite šablono kodą (žiūrėkite legendą skenerio lange)."
 
 #. Preview label
-#: ../src/browser.c:3676
+#: ../src/browser.c:3681
 msgid "Rename directory preview"
 msgstr "Pervadinamo aplanko peržiūra"
 
-#: ../src/browser.c:3768
+#: ../src/browser.c:3773
 msgid "You must type a directory name"
 msgstr "Turite nurodyti aplanko pavadinimą"
 
-#: ../src/browser.c:3769 ../src/browser.c:3790
+#: ../src/browser.c:3774 ../src/browser.c:3795
 msgid "Directory Name Error"
 msgstr "Aplanko pavadinimo klaida"
 
-#: ../src/browser.c:3787
+#: ../src/browser.c:3792
 #, c-format
 msgid "Could not convert '%s' into filename encoding."
 msgstr "Nepavyko konvertuoti „%s“ į failo pavadinimo koduotę."
 
-#: ../src/browser.c:3789
+#: ../src/browser.c:3794
 msgid "Please use another name"
 msgstr "Naudokite kitą pavadinimą"
 
-#: ../src/browser.c:3859
+#: ../src/browser.c:3864
 #, c-format
 msgid "The directory name '%s' already exists"
 msgstr "Aplankas „%s“ jau yra"
 
-#: ../src/browser.c:3860 ../src/easytag.c:2964
+#: ../src/browser.c:3865 ../src/easytag.c:2964
 msgid "Rename File Error"
 msgstr "Failo pervadinimo klaida"
 
-#: ../src/browser.c:3898 ../src/browser.c:3927
+#: ../src/browser.c:3903 ../src/browser.c:3932
 msgid "Rename Directory Error"
 msgstr "Aplanko pervadinimo klaida"
 
-#: ../src/browser.c:3965
+#: ../src/browser.c:3970
 msgid "Directory renamed"
 msgstr "Aplankas pervadintas"
 
-#: ../src/browser.c:4001
+#: ../src/browser.c:4006
 msgid "Browse Directory With"
 msgstr "Naršyti aplanką su"
 
-#: ../src/browser.c:4017 ../src/browser.c:4143
+#: ../src/browser.c:4022 ../src/browser.c:4148
 msgid "Program to run:"
 msgstr "Paleisti programą:"
 
-#: ../src/browser.c:4029
+#: ../src/browser.c:4034
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Pasirinkite kurią programą vykdyti. JI kaip parametrą gaus esamą aplanką."
 
-#: ../src/browser.c:4123
+#: ../src/browser.c:4128
 msgid "Open Files With"
 msgstr "Atverti failus su"
 
-#: ../src/browser.c:4155
+#: ../src/browser.c:4160
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
@@ -1043,7 +1047,7 @@ msgstr "Visi laukai"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Other".
-#: ../src/cddb.c:492 ../src/picture.c:1036 ../src/prefs.c:807
+#: ../src/cddb.c:492 ../src/picture.c:1038 ../src/prefs.c:807
 msgid "Other"
 msgstr "Kita"
 
@@ -1137,7 +1141,7 @@ msgstr "Kategorijos"
 msgid "Results:"
 msgstr "Rezultatai:"
 
-#: ../src/cddb.c:606 ../src/misc.c:1950
+#: ../src/cddb.c:606 ../src/misc.c:1951
 msgid "Search:"
 msgstr "Ieškoti:"
 
@@ -1201,7 +1205,7 @@ msgid "# Tracks"
 msgstr "Takelių nr."
 
 #. Check box to run the scanner
-#: ../src/cddb.c:847 ../src/misc.c:2991
+#: ../src/cddb.c:847 ../src/misc.c:2992
 msgid "Run the current scanner for each file"
 msgstr "Dabartinį skenerį vykdyti kiekvienam failui"
 
@@ -1213,7 +1217,7 @@ msgstr "Atitikti eilutes su Levenšteino(Levenshtein) algoritmu"
 #. 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:859 ../src/prefs.c:1362
+#: ../src/cddb.c:859 ../src/prefs.c:1363
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM: Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every "
@@ -1634,41 +1638,41 @@ msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Eilutės „%s“ konvertuoti į UTF-8 nepavyko (%s)."
 
 #. Starting messages
-#: ../src/easytag.c:184
+#: ../src/easytag.c:185
 #, c-format
 msgid "Starting EasyTAG version %s (PID: %d)…"
 msgstr "Paleidžiama EasyTAG versija %s (Pid: %d)…"
 
-#: ../src/easytag.c:186
+#: ../src/easytag.c:187
 #, c-format
 msgid "Using libid3tag version %s"
 msgstr "Naudojama libid3tag versija %s"
 
-#: ../src/easytag.c:189
+#: ../src/easytag.c:190
 #, c-format
 msgid "Using id3lib version %d.%d.%d"
 msgstr "Naudojama id3lib versija %d.%d.%d"
 
-#: ../src/easytag.c:195
+#: ../src/easytag.c:196
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
 msgstr "Kintamasis EASYTAGLANG nustatytas. Nustatoma kalba: „%s“"
 
-#: ../src/easytag.c:197
+#: ../src/easytag.c:198
 #, c-format
 msgid "Setting locale: '%s'"
 msgstr "Nustatoma lokalė: „%s“"
 
-#: ../src/easytag.c:202
+#: ../src/easytag.c:203
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')"
 msgstr "Naudojama lokalė „%s“ (ir galiausiai „%s“)"
 
-#: ../src/easytag.c:209
+#: ../src/easytag.c:210
 msgid "Unable to create setting directories"
 msgstr "Nepavyko paskirties aplankų sukurti"
 
-#: ../src/easytag.c:426 ../src/et_core.c:582
+#: ../src/easytag.c:427 ../src/et_core.c:637 ../src/et_core.c:649
 #, c-format
 msgid "Error while querying information for file: '%s' (%s)"
 msgstr "Klaida užklausiant failo informacijos: „%s“ (%s)"
@@ -1685,7 +1689,7 @@ msgstr "Nepavyko atverti kelio „%s“"
 msgid "Browser"
 msgstr "Naršyklė"
 
-#: ../src/easytag.c:604 ../src/et_core.c:2774
+#: ../src/easytag.c:604 ../src/et_core.c:2857
 msgid "File"
 msgstr "Failas"
 
@@ -1695,9 +1699,9 @@ msgstr "Failas"
 #. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
 #. Version changed to encoder version
 #. Encoder version
-#: ../src/easytag.c:636 ../src/easytag.c:4197 ../src/flac_header.c:201
+#: ../src/easytag.c:636 ../src/easytag.c:4232 ../src/flac_header.c:201
 #: ../src/monkeyaudio_header.c:96 ../src/musepack_header.c:98
-#: ../src/ogg_header.c:389 ../src/wavpack_header.c:72
+#: ../src/ogg_header.c:389 ../src/opus_header.c:221 ../src/wavpack_header.c:72
 #, c-format
 msgid "Encoder:"
 msgstr "Kodavimas:"
@@ -1713,7 +1717,7 @@ msgid "Frequency:"
 msgstr "Dažnis:"
 
 #. Mode
-#: ../src/easytag.c:665 ../src/easytag.c:4201 ../src/mpeg_header.c:216
+#: ../src/easytag.c:665 ../src/easytag.c:4236 ../src/mpeg_header.c:216
 msgid "Mode:"
 msgstr "Režimas:"
 
@@ -1726,7 +1730,7 @@ msgid "Duration:"
 msgstr "Trukmė:"
 
 #. Main Frame
-#: ../src/easytag.c:726 ../src/et_core.c:2712
+#: ../src/easytag.c:726 ../src/et_core.c:2787
 msgid "Tag"
 msgstr "Žyma"
 
@@ -1879,7 +1883,7 @@ msgstr "Žymėti pasirinktus failus su šiuo kodavimu"
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1147 ../src/et_core.c:3146 ../src/et_core.c:3149
+#: ../src/easytag.c:1147 ../src/et_core.c:3229 ../src/et_core.c:3232
 msgid "Images"
 msgstr "Paveikslėliai"
 
@@ -2116,7 +2120,7 @@ msgid "Repeat action for the remaining files"
 msgstr "Kartoti veiksmą ir likusiems failams"
 
 #. Directories and filename changed
-#: ../src/easytag.c:2874 ../src/scan.c:181
+#: ../src/easytag.c:2874 ../src/scan_dialog.c:183
 msgid "Rename File and Directory"
 msgstr "Pervadinti failą ir aplanką"
 
@@ -2218,7 +2222,7 @@ msgstr "Aplanko skaitymo klaida"
 msgid "Search in progress…"
 msgstr "Ieškoma…"
 
-#: ../src/easytag.c:3394 ../src/et_core.c:2781
+#: ../src/easytag.c:3394 ../src/et_core.c:2864
 #, c-format
 msgid "File: '%s'"
 msgstr "Failas: „%s“"
@@ -2265,152 +2269,167 @@ msgstr "Ieškoma garso failų…"
 msgid "Searching"
 msgstr "Ieškoma"
 
-#: ../src/easytag.c:4231
+#: ../src/easytag.c:4266
 msgid "Select a directory to browse"
 msgstr "Pasirinkite, kurį aplanką naršyti"
 
 #. Menu items
-#: ../src/easytag.c:4378
+#: ../src/easytag.c:4412
 msgid "Tag selected files with this field"
 msgstr "Pažymėti pasirinktus failus su šiuo laukeliu"
 
-#: ../src/easytag.c:4390 ../src/scan.c:2654
+#: ../src/easytag.c:4424 ../src/scan_dialog.c:2124
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Konvertuoti „_“ ir „%20“ į tarpus"
 
-#: ../src/easytag.c:4397 ../src/scan.c:2656
+#: ../src/easytag.c:4431 ../src/scan_dialog.c:2126
 msgid "Convert ' ' to '_'"
 msgstr "Konvertuoti „ “ į „_“"
 
-#: ../src/easytag.c:4408
+#: ../src/easytag.c:4442
 msgid "All uppercase"
 msgstr "Visos didžiosios"
 
-#: ../src/easytag.c:4415
+#: ../src/easytag.c:4449
 msgid "All lowercase"
 msgstr "Visos mažosios"
 
-#: ../src/easytag.c:4422
+#: ../src/easytag.c:4456
 msgid "First letter uppercase"
 msgstr "Pirma raidė – didžioji"
 
-#: ../src/easytag.c:4429
+#: ../src/easytag.c:4463
 msgid "First letter uppercase of each word"
 msgstr "Kiekvieno žodžio pirma raidė – didžioji"
 
-#: ../src/easytag.c:4440 ../src/prefs.c:1023 ../src/scan.c:2754
+#: ../src/easytag.c:4474 ../src/prefs.c:1023 ../src/scan_dialog.c:2224
 msgid "Remove spaces"
 msgstr "Pašalinti tarpus"
 
-#: ../src/easytag.c:4447
+#: ../src/easytag.c:4481
 msgid "Insert space before uppercase letter"
 msgstr "Prieš didžiąją raidę įterpti tarpą"
 
-#: ../src/easytag.c:4454
+#: ../src/easytag.c:4488
 msgid "Remove duplicate spaces or underscores"
 msgstr "Pašalinti dvigubus tarpus ar pabraukimo simbolius"
 
-#: ../src/easytag.c:4461
+#: ../src/easytag.c:4495
 msgid "Remove all text"
 msgstr "Pašalinti visą tekstą"
 
-#: ../src/easytag.c:4480
+#: ../src/easytag.c:4514
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normalus išėjimas."
 
-#: ../src/easytag.c:4532
+#: ../src/easytag.c:4566
 msgid "Do you want to save them before quitting?"
 msgstr "Ar norite juos įrašyti prieš išeidami?"
 
-#: ../src/easytag.c:4559
+#: ../src/easytag.c:4593
 msgid "Do you really want to quit?"
 msgstr "Ar tikrai norite palikti programą?"
 
-#: ../src/et_core.c:504
+#: ../src/et_core.c:550
 #, c-format
 msgid "Error reading tag from ogg file (%s)"
 msgstr "Klaida skaitant žymą iš ogg failo (%s)"
 
-#: ../src/et_core.c:656
+#: ../src/et_core.c:579
+#, c-format
+#| msgid "Error reading tag from ogg file (%s)"
+msgid "Error reading tag from Opus file (%s)"
+msgstr "Klaida skaitant žymą iš Opus failo (%s)"
+
+#: ../src/et_core.c:722
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr "Failui „%s“ pritaikyti automatiniai pataisymai."
 
-#: ../src/et_core.c:2678
+#: ../src/et_core.c:2747
 msgid "ID3 Tag"
 msgstr "ID3 žyma"
 
-#: ../src/et_core.c:2684
+#: ../src/et_core.c:2753
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis žyma"
 
-#: ../src/et_core.c:2690
+#: ../src/et_core.c:2759
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis žyma"
 
-#: ../src/et_core.c:2695
+#: ../src/et_core.c:2764
 msgid "APE Tag"
 msgstr "APE žyma"
 
-#: ../src/et_core.c:2700
+#: ../src/et_core.c:2769
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC žyma"
 
-#: ../src/et_core.c:2706
+#: ../src/et_core.c:2775
 msgid "Wavpack Tag"
 msgstr "Wavpack žyma"
 
-#: ../src/et_core.c:2726
+#: ../src/et_core.c:2781
+msgid "Opus Tag"
+msgstr "Opus žyma"
+
+#: ../src/et_core.c:2801
 msgid "MP3 File"
 msgstr "MP3 failas"
 
-#: ../src/et_core.c:2730
+#: ../src/et_core.c:2805
 msgid "MP2 File"
 msgstr "MP2 failas"
 
-#: ../src/et_core.c:2736
+#: ../src/et_core.c:2811
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis failas"
 
-#: ../src/et_core.c:2742
+#: ../src/et_core.c:2817
 msgid "Speex File"
 msgstr "Speex failas"
 
-#: ../src/et_core.c:2748
+#: ../src/et_core.c:2823
 msgid "FLAC File"
 msgstr "FLAC failas"
 
-#: ../src/et_core.c:2753
+#: ../src/et_core.c:2828
 msgid "MusePack File"
 msgstr "MusePack failas"
 
-#: ../src/et_core.c:2757
+#: ../src/et_core.c:2832
 msgid "Monkey's Audio File"
 msgstr "Monkey's Audio failas"
 
-#: ../src/et_core.c:2762
+#: ../src/et_core.c:2837
 msgid "MP4/AAC File"
 msgstr "MP4/AAC failas"
 
-#: ../src/et_core.c:2768
+#: ../src/et_core.c:2843
 msgid "Wavpack File"
 msgstr "Wavpack failas"
 
-#: ../src/et_core.c:2825 ../src/et_core.c:2880
+#: ../src/et_core.c:2849
+#| msgid "MusePack File"
+msgid "Opus File"
+msgstr "Opus failas"
+
+#: ../src/et_core.c:2908 ../src/et_core.c:2963
 msgid "File not found"
 msgstr "Failas nerastas"
 
-#: ../src/et_core.c:2830
+#: ../src/et_core.c:2913
 #, c-format
 msgid "Cannot query file information (%s)"
 msgstr "Nepavyko užklausti failo informacijos (%s)"
 
-#: ../src/et_core.c:2864
+#: ../src/et_core.c:2947
 msgid "Read-only file"
 msgstr "Failas tik skaitymui"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2928
+#: ../src/et_core.c:3011
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
@@ -2418,45 +2437,45 @@ msgstr[0] "%u failas"
 msgstr[1] "%u failai"
 msgstr[2] "%u failų"
 
-#: ../src/et_core.c:3132
+#: ../src/et_core.c:3215
 #, c-format
 msgid "Images (%d)"
 msgstr "Paveikslėliai (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3174 ../src/flac_header.c:205
-#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
+#: ../src/et_core.c:3257 ../src/flac_header.c:205
+#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.cc:142
 #: ../src/mpeg_header.c:206 ../src/musepack_header.c:88
-#: ../src/ogg_header.c:401 ../src/wavpack_header.c:78
+#: ../src/ogg_header.c:401 ../src/opus_header.c:227 ../src/wavpack_header.c:78
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: ../src/et_core.c:3179 ../src/flac_header.c:210
-#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
+#: ../src/et_core.c:3262 ../src/flac_header.c:210
+#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.cc:147
 #: ../src/mpeg_header.c:211 ../src/musepack_header.c:93
-#: ../src/ogg_header.c:406 ../src/wavpack_header.c:83
+#: ../src/ogg_header.c:406 ../src/opus_header.c:232 ../src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/et_core.c:3322 ../src/scan.c:690
+#: ../src/et_core.c:3408 ../src/scan_dialog.c:688
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding"
 msgstr ""
 "Nepavyko konvertuoti failo pavadinimo „%s“ į sistemos failų pavadinimų "
 "koduotę"
 
-#: ../src/et_core.c:3324
+#: ../src/et_core.c:3410
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Pabandykite nustatyti aplinkos kintamąjį G_FILENAME_ENCODING."
 
-#: ../src/et_core.c:3325 ../src/scan.c:692
+#: ../src/et_core.c:3411 ../src/scan_dialog.c:690
 msgid "Filename translation"
 msgstr "Failo vardo vertimas"
 
-#: ../src/et_core.c:4025
+#: ../src/et_core.c:4116
 #, c-format
 msgid "Error writing tag type %d to file %s (%s)"
 msgstr "Klaida rašant %d tipo žymą į failą %s (%s)"
@@ -2465,8 +2484,8 @@ msgstr "Klaida rašant %d tipo žymą į failą %s (%s)"
 #. Mode
 #. mpeg4ip library seems to always return -1
 #. Mode
-#: ../src/flac_header.c:215 ../src/mp4_header.c:145 ../src/ogg_header.c:411
-#: ../src/wavpack_header.c:88
+#: ../src/flac_header.c:215 ../src/mp4_header.cc:153 ../src/ogg_header.c:411
+#: ../src/opus_header.c:237 ../src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Kanalai:"
 
@@ -2475,7 +2494,7 @@ msgstr "Kanalai:"
 msgid "Error while opening file: '%s' as FLAC (%s)."
 msgstr "Klaida atveriant failą: „%s“ kaip FLAC (%s)."
 
-#: ../src/flac_tag.c:352 ../src/ogg_tag.c:411
+#: ../src/flac_tag.c:352 ../src/ogg_tag.c:310
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
@@ -2494,7 +2513,7 @@ msgstr "Paveikslėlio blokas netinkamas: „%s“"
 msgid "Error: Failed to write comments to file '%s' (%s)."
 msgstr "Klaida: į failą „%s“ nepavyko įrašyti komentarų(%s)."
 
-#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1151
+#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1166
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Žyma „%s“ įrašyta"
@@ -2679,54 +2698,54 @@ msgstr "Dydžio klaida įrašant „%s“ žymą"
 msgid "Log"
 msgstr "Žurnalas"
 
-#: ../src/misc.c:719
+#: ../src/misc.c:720
 msgid "You must type a program name"
 msgstr "Turite nurodyti programą"
 
-#: ../src/misc.c:720
+#: ../src/misc.c:721
 msgid "Program Name Error"
 msgstr "Programos pavadinimo klaida"
 
-#: ../src/misc.c:799
+#: ../src/misc.c:800
 #, c-format
 msgid "Executed command: %s"
 msgstr "Vykdyta komanda: %s"
 
-#: ../src/misc.c:806
+#: ../src/misc.c:807
 #, c-format
 msgid "Failed to launch program: %s"
 msgstr "Nepavyko paleisti programos: %s"
 
-#: ../src/misc.c:823
+#: ../src/misc.c:824
 msgid "Select File"
 msgstr "Pasirinkite failą"
 
-#: ../src/misc.c:829
+#: ../src/misc.c:830
 msgid "Select Directory"
 msgstr "Parinkite aplanką"
 
-#: ../src/misc.c:1141
+#: ../src/misc.c:1142
 msgid "Generate Playlist"
 msgstr "Generuoti grojaraštį"
 
-#: ../src/misc.c:1165
+#: ../src/misc.c:1166
 msgid "M3U Playlist Name"
 msgstr "M3U grojaraščio vardas"
 
-#: ../src/misc.c:1180
+#: ../src/misc.c:1181
 msgid "Use directory name"
 msgstr "Naudoti aplanko vardą"
 
 #. Playlist options
-#: ../src/misc.c:1197
+#: ../src/misc.c:1198
 msgid "Playlist Options"
 msgstr "Grojaraščio nustatymai"
 
-#: ../src/misc.c:1203
+#: ../src/misc.c:1204
 msgid "Include only the selected files"
 msgstr "Įtraukti tik pasirinktus failus"
 
-#: ../src/misc.c:1206
+#: ../src/misc.c:1207
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2734,77 +2753,77 @@ msgstr ""
 "Jei aktyvuota, į grojaraščio failą bus įrašyti tik pasirinkti failai. Kitu "
 "atveju bus įrašyti visi failai."
 
-#: ../src/misc.c:1209
+#: ../src/misc.c:1210
 msgid "Use full path for files in playlist"
 msgstr "Grojaraštyje naudoti pilnus kelius"
 
-#: ../src/misc.c:1212
+#: ../src/misc.c:1213
 msgid "Use relative path for files in playlist"
 msgstr "Grojaraštyje naudoti reliatyvius kelius"
 
 #. Create playlist in parent directory
-#: ../src/misc.c:1218
+#: ../src/misc.c:1219
 msgid "Create playlist in the parent directory"
 msgstr "Grojraštį sukurti esamame aplanke"
 
-#: ../src/misc.c:1221
+#: ../src/misc.c:1222
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "Jei aktyvuota, grojaraštis bus sukurtas aukštesniame aplanke."
 
 #. DOS Separator
-#: ../src/misc.c:1225
+#: ../src/misc.c:1226
 msgid "Use DOS directory separator"
 msgstr "Naudoti DOS aplankų skirtuką"
 
-#: ../src/misc.c:1231
+#: ../src/misc.c:1232
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr "Ši parinktis pakeičia UNIX aplanko skirtuką „/“ į DOS skirtuką „\\“."
 
-#: ../src/misc.c:1240
+#: ../src/misc.c:1241
 msgid "Playlist Content"
 msgstr "Grojaraščio turinys"
 
-#: ../src/misc.c:1246
+#: ../src/misc.c:1247
 msgid "Write only list of files"
 msgstr "Rašyti tik failų sąrašą"
 
-#: ../src/misc.c:1250
+#: ../src/misc.c:1251
 msgid "Write info using filename"
 msgstr "Informaciją rašyti naudojant failo vardą"
 
-#: ../src/misc.c:1253
+#: ../src/misc.c:1254
 msgid "Write info using:"
 msgstr "Rašyti informaciją naudojant:"
 
-#: ../src/misc.c:1467
+#: ../src/misc.c:1468
 #, c-format
 msgid "Cannot write playlist file '%s'"
 msgstr "Įrašyti grojaraščio failo „%s“ nepavyko"
 
-#: ../src/misc.c:1471
+#: ../src/misc.c:1472
 msgid "Playlist File Error"
 msgstr "Grojaraščio failo klaida"
 
-#: ../src/misc.c:1479
+#: ../src/misc.c:1480
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Grojaraščio failas „%s“ įrašytas"
 
-#: ../src/misc.c:1543 ../src/scan.c:3239 ../src/scan.c:3301
+#: ../src/misc.c:1544 ../src/scan_dialog.c:2709 ../src/scan_dialog.c:2771
 msgid "Invalid scanner mask"
 msgstr "Netinkama skenerio kaukė"
 
-#: ../src/misc.c:1907
+#: ../src/misc.c:1908
 msgid "CD"
 msgstr "CD"
 
-#: ../src/misc.c:1929
+#: ../src/misc.c:1930
 msgid "Find Files"
 msgstr "Rasti failus"
 
-#: ../src/misc.c:1961
+#: ../src/misc.c:1962
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2812,13 +2831,13 @@ msgstr ""
 "rodomi visi failai."
 
 #. Where...
-#: ../src/misc.c:1967
+#: ../src/misc.c:1968
 msgid "In:"
 msgstr "Kur:"
 
 #. Translators: This option is for the previous 'in' option. For instance,
 #. * translate this as "Search" "In:" "the Filename".
-#: ../src/misc.c:1972
+#: ../src/misc.c:1973
 msgid "the Filename"
 msgstr "failo pavadinime"
 
@@ -2827,20 +2846,20 @@ msgstr "failo pavadinime"
 #. * 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:1978
+#: ../src/misc.c:1979
 msgid "the Tag"
 msgstr "žymoje"
 
 #. Property of the search
-#: ../src/misc.c:1989 ../src/prefs.c:335
+#: ../src/misc.c:1990 ../src/prefs.c:335
 msgid "Case sensitive"
 msgstr "Skirti mažąsias ir didžiąsias raides"
 
-#: ../src/misc.c:2216
+#: ../src/misc.c:2217
 msgid "Ready to search…"
 msgstr "Paieškai pasirengta…"
 
-#: ../src/misc.c:2436
+#: ../src/misc.c:2437
 #, c-format
 msgid "Found one file"
 msgid_plural "Found %d files"
@@ -2848,63 +2867,63 @@ msgstr[0] "Rastas %d failas"
 msgstr[1] "Rasti %d failai"
 msgstr[2] "Rasta %d failų"
 
-#: ../src/misc.c:2721
+#: ../src/misc.c:2722
 msgid "Load Filenames From a Text File"
 msgstr "Įkelti failų pavadinimus iš tekstinio failo"
 
-#: ../src/misc.c:2750
+#: ../src/misc.c:2751
 msgid "File:"
 msgstr "Failas:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: ../src/misc.c:2769
+#: ../src/misc.c:2770
 msgid " Load "
 msgstr " Įkelti "
 
-#: ../src/misc.c:2787
+#: ../src/misc.c:2788
 msgid "Content of Text File"
 msgstr "Tekstinio failo turinys"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2808 ../src/misc.c:2903
+#: ../src/misc.c:2809 ../src/misc.c:2904
 msgid "Insert a blank line before the selected line"
 msgstr "Prieš pasirinktą eilutę įterpti tuščią eilutę"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2817 ../src/misc.c:2912
+#: ../src/misc.c:2818 ../src/misc.c:2913
 msgid "Delete the selected line"
 msgstr "Pašalinti pasirinktą eilutę"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2826 ../src/misc.c:2921 ../src/misc.c:3407
+#: ../src/misc.c:2827 ../src/misc.c:2922 ../src/misc.c:3408
 msgid "Delete all blank lines"
 msgstr "Pašalinti visas tuščias eilutes"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2838 ../src/misc.c:2933
+#: ../src/misc.c:2839 ../src/misc.c:2934
 msgid "Move up the selected line"
 msgstr "Pasirinktą eilutę perkelti aukštyn"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2847 ../src/misc.c:2942
+#: ../src/misc.c:2848 ../src/misc.c:2943
 msgid "Move down the selected line"
 msgstr "Pasirinktą eilutę perkelti žemyn"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2859 ../src/misc.c:2954 ../src/misc.c:3431
+#: ../src/misc.c:2860 ../src/misc.c:2955 ../src/misc.c:3432
 msgid "Reload"
 msgstr "Įkelti iš naujo"
 
-#: ../src/misc.c:2881
+#: ../src/misc.c:2882
 msgid "List of Files"
 msgstr "Failų sąrašas"
 
-#: ../src/misc.c:2976
+#: ../src/misc.c:2977
 msgid "Selected line:"
 msgstr "Pasirinkta eilutė:"
 
-#: ../src/misc.c:2994
+#: ../src/misc.c:2995
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2912,34 +2931,34 @@ msgstr ""
 "Aktyvavus šią parinkty, įkėlus failus, bus paleistas pasirinktas skeneris "
 "(skenerio langas turi būt atvertas)."
 
-#: ../src/misc.c:3081
+#: ../src/misc.c:3082
 #, c-format
 msgid "Cannot retrieve file info (%s)"
 msgstr "Nepavyko gauti failo informacijos (%s)"
 
-#: ../src/misc.c:3143
+#: ../src/misc.c:3144
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Atverti failo „%s“ nepavyko (%s)"
 
-#: ../src/misc.c:3179
+#: ../src/misc.c:3180
 #, c-format
 msgid "Error reading file (%s)"
 msgstr "Klaida skaitant failą (%s)"
 
-#: ../src/misc.c:3395
+#: ../src/misc.c:3396
 msgid "Insert a blank line"
 msgstr "Įterpti tuščią eilutę"
 
-#: ../src/misc.c:3401
+#: ../src/misc.c:3402
 msgid "Delete this line"
 msgstr "Pašalinti šią eilutę"
 
-#: ../src/misc.c:3416
+#: ../src/misc.c:3417
 msgid "Move up this line"
 msgstr "Perkelti eilutę aukštyn"
 
-#: ../src/misc.c:3422
+#: ../src/misc.c:3423
 msgid "Move down this line"
 msgstr "Perkelti eilutę žemyn"
 
@@ -2949,26 +2968,26 @@ msgstr "Perkelti eilutę žemyn"
 msgid "Profile:"
 msgstr "Profilis:"
 
-#: ../src/mp4_header.c:63 ../src/mp4_tag.c:65 ../src/mp4_tag.c:186
+#: ../src/mp4_header.cc:60 ../src/mp4_tag.cc:91 ../src/mp4_tag.cc:284
 msgid "MP4 format invalid"
 msgstr "Netinkamas MP4 formatas"
 
-#: ../src/mp4_header.c:72 ../src/mp4_tag.c:74
+#: ../src/mp4_header.cc:68
 #, c-format
 msgid "File contains no audio track: '%s'"
 msgstr "Failas neturi garso takelio: „%s“"
 
-#: ../src/mp4_header.c:82
+#: ../src/mp4_header.cc:79
 #, c-format
 msgid "Error reading properties from file: '%s'"
 msgstr "Klaida skaitant savybes iš failo: „%s“"
 
-#: ../src/mp4_header.c:132 ../src/mpeg_header.c:204
+#: ../src/mp4_header.cc:140 ../src/mpeg_header.c:204
 #, c-format
 msgid "~%d kb/s"
 msgstr "~%d kb/s"
 
-#: ../src/mp4_tag.c:85 ../src/mp4_tag.c:194
+#: ../src/mp4_tag.cc:101 ../src/mp4_tag.cc:293
 #, c-format
 msgid "Error reading tags from file: '%s'"
 msgstr "Klaida skaitant žymas iš failo: „%s“"
@@ -3043,17 +3062,17 @@ msgstr ""
 msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
 msgstr "Klaida: nepavyko atverti failo: „%s“ kaip vorbis (%s)."
 
-#: ../src/ogg_tag.c:249 ../src/ogg_tag.c:872
+#: ../src/ogg_tag.c:712 ../src/ogg_tag.c:887
 #, c-format
 msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Įspėjimas: Ogg Vorbis failas „%s“ turi ID3v2 žymę."
 
-#: ../src/ogg_tag.c:1020 ../src/picture.c:1256
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1258
 #, c-format
 msgid "Error with 'loader_write': %s"
 msgstr "Klaida su „loader_write“: %s"
 
-#: ../src/ogg_tag.c:1035 ../src/picture.c:1179
+#: ../src/ogg_tag.c:1050 ../src/picture.c:1181
 #, c-format
 msgid "Error with 'loader_close': %s"
 msgstr "Klaida su „loader_close“: %s"
@@ -3081,147 +3100,146 @@ msgstr "Paveikslėlio failas neįkeltas: %s"
 msgid "Image file loaded"
 msgstr "Paveikslėlio failas įkeltas"
 
-#: ../src/picture.c:503
+#: ../src/picture.c:504
 msgid "Add Images"
 msgstr "Pridėti paveikslėlius"
 
-#: ../src/picture.c:513 ../src/picture.c:873
+#: ../src/picture.c:514 ../src/picture.c:875
 msgid "All Files"
 msgstr "Visi failai"
 
-#: ../src/picture.c:519 ../src/picture.c:879
+#: ../src/picture.c:520 ../src/picture.c:881
 msgid "PNG and JPEG"
 msgstr "PNG ir JPEG"
 
-#: ../src/picture.c:650
+#: ../src/picture.c:651
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Paveikslėlio savybės %d/%d"
 
-#: ../src/picture.c:674
+#: ../src/picture.c:677
 msgid "Image Type"
 msgstr "Paveikslėlio tipas"
 
 #. Description of the picture
-#: ../src/picture.c:733
+#: ../src/picture.c:735
 msgid "Image Description:"
 msgstr "Paveikslėlio aprašymas:"
 
-#: ../src/picture.c:860
+#: ../src/picture.c:862
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Įrašyti paveikslėlį %d/%d"
 
-#: ../src/picture.c:1020
+#: ../src/picture.c:1022
 msgid "JPEG image"
 msgstr "JPEG paveikslėlis"
 
-#: ../src/picture.c:1022
+#: ../src/picture.c:1024
 msgid "PNG image"
 msgstr "PNG paveikslėlis"
 
-#: ../src/picture.c:1024
-#| msgid "PNG image"
+#: ../src/picture.c:1026
 msgid "GIF image"
 msgstr "GIF paveikslėlis"
 
-#: ../src/picture.c:1026
+#: ../src/picture.c:1028
 msgid "Unknown image"
 msgstr "Nežinomas paveikslėlis"
 
-#: ../src/picture.c:1038
+#: ../src/picture.c:1040
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32 pikselių PNG failo piktograma"
 
-#: ../src/picture.c:1040
+#: ../src/picture.c:1042
 msgid "Other file icon"
 msgstr "Kita failo piktograma"
 
-#: ../src/picture.c:1042
+#: ../src/picture.c:1044
 msgid "Cover (front)"
 msgstr "Viršelis (priekis)"
 
-#: ../src/picture.c:1044
+#: ../src/picture.c:1046
 msgid "Cover (back)"
 msgstr "Viršelis (galas)"
 
-#: ../src/picture.c:1046
+#: ../src/picture.c:1048
 msgid "Leaflet page"
 msgstr "Leaflet puslapis"
 
-#: ../src/picture.c:1048
+#: ../src/picture.c:1050
 msgid "Media (e.g. label side of CD)"
 msgstr "Laikmena (pvz. CD užrašo pusė)"
 
-#: ../src/picture.c:1050
+#: ../src/picture.c:1052
 msgid "Lead artist/lead performer/soloist"
 msgstr "Pagrindinis atlikėjas/solistas"
 
-#: ../src/picture.c:1052
+#: ../src/picture.c:1054
 msgid "Artist/performer"
 msgstr "Atlikėjas"
 
-#: ../src/picture.c:1054
+#: ../src/picture.c:1056
 msgid "Conductor"
 msgstr "Dirigentas"
 
-#: ../src/picture.c:1056
+#: ../src/picture.c:1058
 msgid "Band/Orchestra"
 msgstr "Grupė/orkestras"
 
-#: ../src/picture.c:1060
+#: ../src/picture.c:1062
 msgid "Lyricist/text writer"
 msgstr "Žodžių autorius"
 
-#: ../src/picture.c:1062
+#: ../src/picture.c:1064
 msgid "Recording location"
 msgstr "Įrašo vieta"
 
-#: ../src/picture.c:1064
+#: ../src/picture.c:1066
 msgid "During recording"
 msgstr "Įrašymo metu"
 
-#: ../src/picture.c:1066
+#: ../src/picture.c:1068
 msgid "During performance"
 msgstr "Atlikimo metu"
 
-#: ../src/picture.c:1068
+#: ../src/picture.c:1070
 msgid "Movie/video screen capture"
 msgstr "Filmo/video ekrano įrašas"
 
-#: ../src/picture.c:1070
+#: ../src/picture.c:1072
 msgid "A bright colored fish"
 msgstr "Ryški spalvota žuvis"
 
-#: ../src/picture.c:1072
+#: ../src/picture.c:1074
 msgid "Illustration"
 msgstr "Iliustracija"
 
-#: ../src/picture.c:1074
+#: ../src/picture.c:1076
 msgid "Band/Artist logotype"
 msgstr "Grupės/Atlikėjo logotipas"
 
-#: ../src/picture.c:1076
+#: ../src/picture.c:1078
 msgid "Publisher/studio logotype"
 msgstr "Leidėjo/studijos logotipas"
 
-#: ../src/picture.c:1080
+#: ../src/picture.c:1082
 msgid "Unknown image type"
 msgstr "Nežinomas paveikslėlio tipas"
 
-#: ../src/picture.c:1110 ../src/picture.c:1121
+#: ../src/picture.c:1112 ../src/picture.c:1123
 msgid "pixels"
 msgstr "pikseliai"
 
-#: ../src/picture.c:1111 ../src/picture.c:1122
+#: ../src/picture.c:1113 ../src/picture.c:1124
 msgid "Type"
 msgstr "Tipas"
 
-#: ../src/picture.c:1123
+#: ../src/picture.c:1125
 msgid "Description"
 msgstr "Aprašymas"
 
-#: ../src/picture.c:1239
+#: ../src/picture.c:1241
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
@@ -3229,17 +3247,17 @@ msgstr ""
 "Parodyti paveikslėlio neįmanoma, nes nenuskaityta pakankamai duomenų, kad "
 "būtų galima sukurti paveikslėlio buferį."
 
-#: ../src/picture.c:1246
+#: ../src/picture.c:1248
 msgid "Cannot display the image"
 msgstr "Nepavyko parodyti paveikslėlio"
 
-#: ../src/picture.c:1248
+#: ../src/picture.c:1250
 msgid ""
 "Not enough data has been read to determine how to create the image buffer."
 msgstr ""
 "Nenuskaityta pakankamai duomenų, kad būtų galima sukurti paveikslėlio buferį."
 
-#: ../src/picture.c:1250
+#: ../src/picture.c:1252
 msgid "Load Image File"
 msgstr "Įkelti paveikslėlio failą"
 
@@ -4188,23 +4206,24 @@ msgstr "Tarpinio serverio naudotojo vardas."
 msgid "User Password:"
 msgstr "Naudotojo slaptažodis:"
 
-#: ../src/prefs.c:1337
-msgid "Password of user for the the proxy server."
+#: ../src/prefs.c:1338
+#| msgid "Password of user for the the proxy server."
+msgid "Password of user for the proxy server."
 msgstr "Tarpinio serverio naudotojo slaptažodis."
 
 #. Track Name list (CDDB results)
-#: ../src/prefs.c:1342
+#: ../src/prefs.c:1343
 msgid "Track Name List"
 msgstr "Takelių pavadinimų sąrašas"
 
-#: ../src/prefs.c:1349
+#: ../src/prefs.c:1350
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 "Pasirinkite atitinkamą audio failą (pagal poziciją arba DLM, jei aktyvuota)"
 
-#: ../src/prefs.c:1353
+#: ../src/prefs.c:1354
 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."
@@ -4213,7 +4232,7 @@ msgstr ""
 "failas pagrindiniame sąraše."
 
 #. Check box to use DLM (also used in the cddb window)
-#: ../src/prefs.c:1358
+#: ../src/prefs.c:1359
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4224,15 +4243,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: ../src/prefs.c:1373
+#: ../src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Patvirtinimas"
 
-#: ../src/prefs.c:1378
+#: ../src/prefs.c:1379
 msgid "Confirm exit from program"
 msgstr "Patvirtinti išėjimą iš programos"
 
-#: ../src/prefs.c:1381
+#: ../src/prefs.c:1382
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4240,51 +4259,51 @@ msgstr ""
 "Jei aktyvuota, prieš išeinant iš programos bus parodytas dialogas su "
 "patvirtinimu."
 
-#: ../src/prefs.c:1384
+#: ../src/prefs.c:1385
 msgid "Confirm writing of file tag"
 msgstr "Patvirtinti failo žymos rašymą"
 
-#: ../src/prefs.c:1388
+#: ../src/prefs.c:1389
 msgid "Confirm renaming of file"
 msgstr "Patvirtinti failo pervadinimą"
 
-#: ../src/prefs.c:1392
+#: ../src/prefs.c:1393
 msgid "Confirm deleting of file"
 msgstr "Patvirtinti failo šalinimą"
 
-#: ../src/prefs.c:1396
+#: ../src/prefs.c:1397
 msgid "Confirm writing of playlist"
 msgstr "Patvirtinti grojaraščio įrašymą"
 
-#: ../src/prefs.c:1400
+#: ../src/prefs.c:1401
 msgid "Confirm changing directory when there are unsaved changes"
 msgstr "Patvirtinti aplanko keitimą, kai yra neišsaugotų keitimų"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: ../src/prefs.c:1438
+#: ../src/prefs.c:1439
 #, c-format
 msgid "(Example: %.*d_-_Track_name_1.mp3)"
 msgstr "(Pavyzdžiui: %.*d_-_Track_name_1.mp3)"
 
 #. Translators: please do NOT translate '%.*d' in this string.
-#: ../src/prefs.c:1471
+#: ../src/prefs.c:1472
 #, c-format
 msgid "(Example: disc_%.*d_of_10/Track_name_1.mp3)"
 msgstr "(Pavyzdžiui: %.*d_iš_10/Takelio_pavadinimas_1.mp3)"
 
-#: ../src/prefs.c:1613 ../src/setting.c:904
+#: ../src/prefs.c:1614 ../src/setting.c:904
 msgid "Configuration saved"
 msgstr "Konfigūraciją išsaugota"
 
-#: ../src/prefs.c:1621
+#: ../src/prefs.c:1622
 msgid "Configuration unchanged"
 msgstr "Konfigūracija nepakeista"
 
-#: ../src/prefs.c:1712
+#: ../src/prefs.c:1713
 msgid "The selected path for 'Default path to files' is invalid"
 msgstr "Pasirinktas kelias „Numatytasis kelias iki failų“ nėra tinkamas"
 
-#: ../src/prefs.c:1714
+#: ../src/prefs.c:1715
 #, c-format
 msgid ""
 "Path: '%s'\n"
@@ -4293,93 +4312,93 @@ msgstr ""
 "Kelias: „%s“\n"
 "Klaida: %s"
 
-#: ../src/prefs.c:1716
+#: ../src/prefs.c:1717
 msgid "Invalid Path Error"
 msgstr "Netinkamo kelio klaida"
 
-#: ../src/prefs.c:1830
+#: ../src/prefs.c:1831
 #, c-format
 msgid "The audio file player '%s' cannot be found"
 msgstr "Garso failų grotuvas „%s“ nerastas"
 
-#: ../src/prefs.c:1832
+#: ../src/prefs.c:1833
 msgid "Audio Player Error"
 msgstr "Garso grotuvo klaida"
 
-#: ../src/scan.c:180
+#: ../src/scan_dialog.c:182
 msgid "Fill Tag"
 msgstr "Užpildyti žymę"
 
-#: ../src/scan.c:358
+#: ../src/scan_dialog.c:356
 #, c-format
 msgid "Cannot calculate CRC value of file (%s)"
 msgstr "Nepavyko failo CRC vertės (%s)"
 
-#: ../src/scan.c:373
+#: ../src/scan_dialog.c:371
 msgid "Tag successfully scanned"
 msgstr "Žymos sėkmingai nuskaitytos"
 
-#: ../src/scan.c:375
+#: ../src/scan_dialog.c:373
 #, c-format
 msgid "Tag successfully scanned: %s"
 msgstr "Žyma sėkmingai nuskaityta %s"
 
-#: ../src/scan.c:416
+#: ../src/scan_dialog.c:414
 #, c-format
 msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
 msgstr "Žymių skaityklė: keista…, plėtinys „%s“ failo pavadinime „%s“ nerastas"
 
-#: ../src/scan.c:498 ../src/scan.c:527
+#: ../src/scan_dialog.c:496 ../src/scan_dialog.c:525
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Skenavimo klaida: nepavyko rasti skirtuko „%s“ faile „%s“"
 
-#: ../src/scan.c:714
+#: ../src/scan_dialog.c:712
 msgid "New filename successfully scanned"
 msgstr "Naujo failo pavadinimas sėkmingai nuskaitytas"
 
-#: ../src/scan.c:717
+#: ../src/scan_dialog.c:715
 #, c-format
 msgid "New filename successfully scanned: %s"
 msgstr "Naujo failo pavadinimas sėkmingai nuskaitytas: %s"
 
-#: ../src/scan.c:1821
+#: ../src/scan_dialog.c:1628
 #, c-format
 msgid "Error while processing fields: %s"
 msgstr "Klaida apdorojant laukus: %s."
 
 #. The window
-#: ../src/scan.c:2328
+#: ../src/scan_dialog.c:1798
 msgid "Tag and Filename Scan"
 msgstr "Žymos ir failo pavadinimo skaitymas"
 
 #. TODO: Set related action to match AM_SCAN_FILES.
-#: ../src/scan.c:2337
+#: ../src/scan_dialog.c:1807
 msgid "Scan Files"
 msgstr "Skaityti failus"
 
 #. Option Menu
-#: ../src/scan.c:2365
+#: ../src/scan_dialog.c:1835
 msgid "Scanner:"
 msgstr "Skeneris:"
 
-#: ../src/scan.c:2386
+#: ../src/scan_dialog.c:1856
 msgid "Select the type of scanner to use"
 msgstr "Pasirinkite skenerio tipą"
 
-#: ../src/scan.c:2395
+#: ../src/scan_dialog.c:1865
 msgid "Scanner Preferences"
 msgstr "Skaityklės nustatymai"
 
-#: ../src/scan.c:2404
+#: ../src/scan_dialog.c:1874
 msgid "Show / Hide Masks Editor"
 msgstr "Rodyti/Slėpti šablonų redaktorių"
 
-#: ../src/scan.c:2414
+#: ../src/scan_dialog.c:1884
 msgid "Show / Hide Legend"
 msgstr "Rodyti/Slėpti legendą"
 
-#: ../src/scan.c:2444
+#: ../src/scan_dialog.c:1914
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse filename and "
 "path. Used to fill in tag fields"
@@ -4388,15 +4407,15 @@ msgstr ""
 "šabloną naudojant kodus (žiūrėkite legendą). Naudota žymių užpildymui"
 
 #. Preview label
-#: ../src/scan.c:2468
+#: ../src/scan_dialog.c:1938
 msgid "Fill tag preview"
 msgstr "Užpildytų žymų peržiūra"
 
-#: ../src/scan.c:2498
+#: ../src/scan_dialog.c:1968
 msgid "Prefix mask with current path"
 msgstr "Priešdėlio šablonas su esamu keliu"
 
-#: ../src/scan.c:2512
+#: ../src/scan_dialog.c:1982
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4409,15 +4428,15 @@ msgstr ""
 "absoliutus kelias, kitu atveju tai reliatyvus kelias(senam keliui)."
 
 #. Preview label
-#: ../src/scan.c:2537
+#: ../src/scan_dialog.c:2007
 msgid "Rename file preview"
 msgstr "Pervadinto failo peržiūra"
 
-#: ../src/scan.c:2556
+#: ../src/scan_dialog.c:2026
 msgid "Select fields:"
 msgstr "Pasirinkite laukelius:"
 
-#: ../src/scan.c:2559
+#: ../src/scan_dialog.c:2029
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those which interest you"
@@ -4426,134 +4445,134 @@ msgstr ""
 "dominančius."
 
 #. Advice for Translators: set the first letter of filename translated
-#: ../src/scan.c:2563
+#: ../src/scan_dialog.c:2033
 msgid "F"
 msgstr "F"
 
-#: ../src/scan.c:2565
+#: ../src/scan_dialog.c:2035
 msgid "Process filename field"
 msgstr "Apdoroti failo pavadinimo laukelį"
 
 #. Advice for Translators: set the first letter of title translated
-#: ../src/scan.c:2567
+#: ../src/scan_dialog.c:2037
 msgid "T"
 msgstr "P"
 
-#: ../src/scan.c:2568
+#: ../src/scan_dialog.c:2038
 msgid "Process title field"
 msgstr "Apdoroti pavadinimo laukelį"
 
 #. Advice for Translators: set the first letter of artist translated
-#: ../src/scan.c:2570
+#: ../src/scan_dialog.c:2040
 msgid "Ar"
 msgstr "A"
 
-#: ../src/scan.c:2571
+#: ../src/scan_dialog.c:2041
 msgid "Process file artist field"
 msgstr "Apdoroti failo atlikėjo laukelį"
 
 #. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan.c:2573
+#: ../src/scan_dialog.c:2043
 msgid "AA"
 msgstr "AA"
 
-#: ../src/scan.c:2574
+#: ../src/scan_dialog.c:2044
 msgid "Process album artist field"
 msgstr "Apdoroti albumo atlikėjo laukelį"
 
 #. Advice for Translators: set the first letter of album translated
-#: ../src/scan.c:2576
+#: ../src/scan_dialog.c:2046
 msgid "Al"
 msgstr "Al"
 
-#: ../src/scan.c:2577
+#: ../src/scan_dialog.c:2047
 msgid "Process album field"
 msgstr "Apdoroti albumo laukelį"
 
 #. Advice for Translators: set the first letter of genre translated
-#: ../src/scan.c:2579
+#: ../src/scan_dialog.c:2049
 msgid "G"
 msgstr "Ž"
 
-#: ../src/scan.c:2580
+#: ../src/scan_dialog.c:2050
 msgid "Process genre field"
 msgstr "Apdoroti žanro laukelį"
 
 #. Advice for Translators: set the first letter of comment translated
-#: ../src/scan.c:2582
+#: ../src/scan_dialog.c:2052
 msgid "Cm"
 msgstr "K"
 
-#: ../src/scan.c:2583
+#: ../src/scan_dialog.c:2053
 msgid "Process comment field"
 msgstr "Apdoroti komentaro laukelį"
 
 #. Advice for Translators: set the first letter of composer translated
-#: ../src/scan.c:2585
+#: ../src/scan_dialog.c:2055
 msgid "Cp"
 msgstr "Km"
 
-#: ../src/scan.c:2586
+#: ../src/scan_dialog.c:2056
 msgid "Process composer field"
 msgstr "Apdoroti kompozitoriaus laukelį"
 
 #. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan.c:2588
+#: ../src/scan_dialog.c:2058
 msgid "O"
 msgstr "O"
 
-#: ../src/scan.c:2589
+#: ../src/scan_dialog.c:2059
 msgid "Process original artist field"
 msgstr "Apdoroti originalaus atlikėjo laukelį"
 
 #. Advice for Translators: set the first letter of copyright translated
-#: ../src/scan.c:2591
+#: ../src/scan_dialog.c:2061
 msgid "Cr"
 msgstr "At"
 
-#: ../src/scan.c:2592
+#: ../src/scan_dialog.c:2062
 msgid "Process copyright field"
 msgstr "Apdoroti autorinių teisių laukelį"
 
 #. Advice for Translators: set the first letter of URL translated
-#: ../src/scan.c:2594
+#: ../src/scan_dialog.c:2064
 msgid "U"
 msgstr "U"
 
-#: ../src/scan.c:2595
+#: ../src/scan_dialog.c:2065
 msgid "Process URL field"
 msgstr "Apdoroti URL kanalą laukelį"
 
 #. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan.c:2597
+#: ../src/scan_dialog.c:2067
 msgid "E"
 msgstr "Kd"
 
-#: ../src/scan.c:2598
+#: ../src/scan_dialog.c:2068
 msgid "Process encoder name field"
 msgstr "Apdoroti kodavimo pavadinimo laukelį"
 
-#: ../src/scan.c:2642
+#: ../src/scan_dialog.c:2112
 msgid "Invert selection"
 msgstr "Apversti pasirinkimą"
 
-#: ../src/scan.c:2649
+#: ../src/scan_dialog.c:2119
 msgid "Select/Unselect all"
 msgstr "Pasirinkti/Nepasirinkti visus"
 
-#: ../src/scan.c:2664
+#: ../src/scan_dialog.c:2134
 msgid "Convert:"
 msgstr "Konvertuoti:"
 
-#: ../src/scan.c:2666
+#: ../src/scan_dialog.c:2136
 msgid "to: "
 msgstr "į:"
 
-#: ../src/scan.c:2673
+#: ../src/scan_dialog.c:2143
 msgid "Do not convert"
 msgstr "Nekonvertuoti"
 
-#: ../src/scan.c:2692
+#: ../src/scan_dialog.c:2162
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4561,7 +4580,7 @@ msgstr ""
 "Pabraukimo simbolis ar eilutė „%20“ pakeičiami tarpu. Pavyzdžiui, prieš: "
 "„Tekstas%20įraše“, po: „Tekstas įraše“."
 
-#: ../src/scan.c:2695
+#: ../src/scan_dialog.c:2165
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4569,36 +4588,36 @@ msgstr ""
 "Tarpo simbolis pakeičiamas pabraukimo simboliu. Pavyzdžiui, prieš: „Tekstas "
 "įraše“, po: „Tekstas_įraše“."
 
-#: ../src/scan.c:2698
+#: ../src/scan_dialog.c:2168
 msgid ""
 "Replace a string by another one. Note that the search is case sensitive."
 msgstr "Pakeisti eilutę kita. Paieška skiria didžiąsias ir mažąsias raides."
 
-#: ../src/scan.c:2705
+#: ../src/scan_dialog.c:2175
 msgid "Capitalize all"
 msgstr "Viską didžiosiomis"
 
-#: ../src/scan.c:2707
+#: ../src/scan_dialog.c:2177
 msgid "Lowercase all"
 msgstr "Viską mažosiomis"
 
-#: ../src/scan.c:2709
+#: ../src/scan_dialog.c:2179
 msgid "Capitalize first letter"
 msgstr "Pirma raidė didžioji"
 
-#: ../src/scan.c:2711
+#: ../src/scan_dialog.c:2181
 msgid "Capitalize the first letter of each word"
 msgstr "Kiekvieno žodžio pirma raidė – didžioji"
 
-#: ../src/scan.c:2712
+#: ../src/scan_dialog.c:2182
 msgid "Detect Roman numerals"
 msgstr "Aptikti romėniškus skaičius"
 
-#: ../src/scan.c:2714
+#: ../src/scan_dialog.c:2184
 msgid "Do not change capitalization"
 msgstr "Nekeisti raidžių registro"
 
-#: ../src/scan.c:2736
+#: ../src/scan_dialog.c:2206
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4606,7 +4625,7 @@ msgstr ""
 "Konvertuoti visus žodžius laukeliuose į didžiąsias raides. Pavyzdžiui, "
 "prieš: „TekstaS įRašE“, po: „TEKSTAS ĮRAŠE“."
 
-#: ../src/scan.c:2739
+#: ../src/scan_dialog.c:2209
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4614,7 +4633,7 @@ msgstr ""
 "Konvertuoti visus žodžius laukeliuose į mažąsias raides. Pavyzdžiui, prieš: "
 "„TekstaS įRašE“, po: „tekstas įraše“."
 
-#: ../src/scan.c:2742
+#: ../src/scan_dialog.c:2212
 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'."
@@ -4622,7 +4641,7 @@ msgstr ""
 "Konvertuoti pirmo žodžio pirmą raidę visuose laukeliuose į didžiąją raidę. "
 "Pavyzdžiui, prieš: „TekstaS įRašE“, po: „Tekstas įraše“."
 
-#: ../src/scan.c:2745
+#: ../src/scan_dialog.c:2215
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4630,7 +4649,7 @@ msgstr ""
 "Konvertuoti kiekvieno žodžio pirmą raidę visuose laukeliuose į didžiąją "
 "raidę. Pavyzdžiui, prieš: „TekstaS įRašE“, po: „Tekstas Įraše“."
 
-#: ../src/scan.c:2748
+#: ../src/scan_dialog.c:2218
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -4638,19 +4657,19 @@ msgstr ""
 "Romėniškuose skaičiuose priverstinai konvertuoti į didžiąsias raides. "
 "Pavyzdžiui, prieš: „ix. tekstas įraše“, po: „IX. Tekstas Įraše.“"
 
-#: ../src/scan.c:2756
+#: ../src/scan_dialog.c:2226
 msgid "Insert a space before uppercase letters"
 msgstr "Prieš didžiąją raidę įterpti tarpą"
 
-#: ../src/scan.c:2758
+#: ../src/scan_dialog.c:2228
 msgid "Remove duplicate spaces and underscores"
 msgstr "Pašalinti dvigubus tarpus ar pabraukimo simbolius"
 
-#: ../src/scan.c:2760
+#: ../src/scan_dialog.c:2230
 msgid "Do not change word separators"
 msgstr "Nekeisti žodžių skirtukų"
 
-#: ../src/scan.c:2774
+#: ../src/scan_dialog.c:2244
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4658,7 +4677,7 @@ msgstr ""
 "Visi tarpai tarp žodžių pašalinami. Pavyzdžiui, prieš: „Tekstas Įraše“, po: "
 "„TekstasĮraše“."
 
-#: ../src/scan.c:2777
+#: ../src/scan_dialog.c:2247
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4666,7 +4685,7 @@ msgstr ""
 "Prieš kiekvieną didžiąją raidę įterpiamas tarpas. Pavyzdžiui, prieš: "
 "„TekstasĮraše“, po: „Tekstas Įraše“."
 
-#: ../src/scan.c:2780
+#: ../src/scan_dialog.c:2250
 msgid ""
 "Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4677,141 +4696,141 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2787
+#: ../src/scan_dialog.c:2257
 msgid "Legend"
 msgstr "Legenda"
 
-#: ../src/scan.c:2793
+#: ../src/scan_dialog.c:2263
 #, c-format
 msgid "%a: artist"
 msgstr "%a: atlikėjas"
 
-#: ../src/scan.c:2796
+#: ../src/scan_dialog.c:2266
 msgid "%z: album artist"
 msgstr "%z: albumo atlikėjas"
 
-#: ../src/scan.c:2799
+#: ../src/scan_dialog.c:2269
 msgid "%b: album"
 msgstr "%b: albumas"
 
-#: ../src/scan.c:2802
+#: ../src/scan_dialog.c:2272
 #, c-format
 msgid "%c: comment"
 msgstr "%c: komentaras"
 
-#: ../src/scan.c:2805
+#: ../src/scan_dialog.c:2275
 #, c-format
 msgid "%p: composer"
 msgstr "%p: kompozitorius"
 
-#: ../src/scan.c:2808
+#: ../src/scan_dialog.c:2278
 msgid "%r: copyright"
 msgstr "%r: autorinės teisės"
 
-#: ../src/scan.c:2811
+#: ../src/scan_dialog.c:2281
 #, c-format
 msgid "%d: disc number"
 msgstr "%d: disko numeris"
 
-#: ../src/scan.c:2814
+#: ../src/scan_dialog.c:2284
 #, c-format
 msgid "%e: encoded by"
 msgstr "%e: kodavo"
 
-#: ../src/scan.c:2817
+#: ../src/scan_dialog.c:2287
 #, c-format
 msgid "%g: genre"
 msgstr "%g: žanras"
 
-#: ../src/scan.c:2820
+#: ../src/scan_dialog.c:2290
 #, c-format
 msgid "%i: ignored"
 msgstr "%i: nepaisoma"
 
-#: ../src/scan.c:2823
+#: ../src/scan_dialog.c:2293
 msgid "%l: number of tracks"
 msgstr "%l: takelių skaičius"
 
-#: ../src/scan.c:2826
+#: ../src/scan_dialog.c:2296
 #, c-format
 msgid "%o: orig. artist"
 msgstr "%o: orig. atlikėjas"
 
-#: ../src/scan.c:2829
+#: ../src/scan_dialog.c:2299
 #, c-format
 msgid "%n: track"
 msgstr "%n: takelis"
 
-#: ../src/scan.c:2832
+#: ../src/scan_dialog.c:2302
 msgid "%t: title"
 msgstr "%t: pavadinimas"
 
-#: ../src/scan.c:2835
+#: ../src/scan_dialog.c:2305
 #, c-format
 msgid "%u: URL"
 msgstr "%u: URL"
 
-#: ../src/scan.c:2838
+#: ../src/scan_dialog.c:2308
 #, c-format
 msgid "%x: number of discs"
 msgstr "%x: diskų skaičius"
 
-#: ../src/scan.c:2841
+#: ../src/scan_dialog.c:2311
 msgid "%y: year"
 msgstr "%y: metai"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2848
+#: ../src/scan_dialog.c:2318
 msgid "Mask Editor"
 msgstr "Šablonų redaktorius"
 
-#: ../src/scan.c:2902
+#: ../src/scan_dialog.c:2372
 msgid "Create New Mask"
 msgstr "Sukurti naują šabloną"
 
-#: ../src/scan.c:2912
+#: ../src/scan_dialog.c:2382
 msgid "Move Up this Mask"
 msgstr "Šį šabloną perkelti aukštyn"
 
-#: ../src/scan.c:2922
+#: ../src/scan_dialog.c:2392
 msgid "Move Down this Mask"
 msgstr "Šį šabloną perkelti žemyn"
 
-#: ../src/scan.c:2932
+#: ../src/scan_dialog.c:2402
 msgid "Duplicate Mask"
 msgstr "Dubliuoti šabloną"
 
-#: ../src/scan.c:2942
+#: ../src/scan_dialog.c:2412
 msgid "Add Default Masks"
 msgstr "Pridėti numatytąjį šabloną"
 
-#: ../src/scan.c:2952
+#: ../src/scan_dialog.c:2422
 msgid "Remove Mask"
 msgstr "Pašalinti šabloną"
 
-#: ../src/scan.c:2962
+#: ../src/scan_dialog.c:2432
 msgid "Save Masks"
 msgstr "Išsaugoti šablonus"
 
-#: ../src/scan.c:3542
+#: ../src/scan_dialog.c:3012
 msgid "New_mask"
 msgstr "Naujas _šablonas"
 
-#: ../src/scan.c:3581
+#: ../src/scan_dialog.c:3051
 msgid "Copy: No row selected"
 msgstr "Kopijuoti: nepasirinkta eilutė"
 
-#: ../src/scan.c:3674
+#: ../src/scan_dialog.c:3144
 msgid "Remove: No row selected"
 msgstr "Pašalinti: nepasirinkta eilutė"
 
-#: ../src/scan.c:3721
+#: ../src/scan_dialog.c:3191
 msgid "Move Up: No row selected"
 msgstr "Perkelti aukštyn: nepasirinkta eilutė"
 
-#: ../src/scan.c:3765
+#: ../src/scan_dialog.c:3235
 msgid "Move Down: No row selected"
 msgstr "Perkelti žemyn: nepasirinkta eilutė"
 
@@ -4878,4 +4897,3 @@ msgstr "Nepavyko migruoti konfigūracijos failo „%s“"
 #, c-format
 msgid "Error: Cannot create directory '%s' (%s)"
 msgstr "Klaida: Nepavyko sukurti aplanko „%s“ (%s)"
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 948893e..d9b8d45 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: easytag\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=easytag&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-04-03 16:46+0000\n"
-"PO-Revision-Date: 2014-04-03 14:13-0300\n"
+"POT-Creation-Date: 2014-04-12 13:25+0000\n"
+"PO-Revision-Date: 2014-04-14 20:05-0300\n"
 "Last-Translator: Rafael Ferreira <rafael.f.f1 at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list at gnome.org>\n"
 "Language: pt_BR\n"
@@ -58,7 +58,7 @@ msgstr "Edite metadados de arquivo de som"
 msgid "mp3;tag;audio;"
 msgstr "mp3;tag;etiqueta;áudio;audio;som;"
 
-#: ../src/about.c:91
+#: ../src/about.c:89
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -86,20 +86,21 @@ msgstr ""
 "programa; caso contrário, consulte <http://www.gnu.org/licenses/>."
 
 #. Translators: put your own name here to appear in the about dialog.
-#: ../src/about.c:108
+#: ../src/about.c:106
 msgid "translator-credits"
 msgstr ""
 "doutor.zero <doutor.zero at gmail.com>, 2005, 2007, 2008\n"
 "Enrico Nicoletto <liverig at gmail.com>, 2013, 2014\n"
 "Rafael Ferreira <rafael.f.f1 at gmail.com>, 2013"
 
-#: ../src/about.c:118
+#: ../src/about.c:116
 msgid "View and edit tags in audio files"
 msgstr "Veja e edite etiquetas em arquivos de áudio"
 
-#. g_print(_("Error while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: ../src/ape_tag.c:61 ../src/id3v24_tag.c:112 ../src/mp4_header.c:63
-#: ../src/mp4_tag.c:65 ../src/mp4_tag.c:186
+#: ../src/ape_tag.c:61 ../src/id3v24_tag.c:112 ../src/mp4_header.cc:46
+#: ../src/mp4_header.cc:59 ../src/mp4_tag.cc:69 ../src/mp4_tag.cc:85
+#: ../src/mp4_tag.cc:90 ../src/mp4_tag.cc:262 ../src/mp4_tag.cc:278
+#: ../src/mp4_tag.cc:283
 #, c-format
 msgid "Error while opening file: '%s' (%s)."
 msgstr "Erro ao abrir arquivo: \"%s\" (%s)."
@@ -368,7 +369,7 @@ msgstr "Último arquivo"
 msgid "S_can Files"
 msgstr "V_erificar arquivos"
 
-#: ../src/bar.c:225 ../src/scan.c:2344
+#: ../src/bar.c:225 ../src/scan_dialog.c:1814
 msgid "Scan selected files"
 msgstr "Verificar os arquivos selecionados"
 
@@ -432,7 +433,7 @@ msgstr "Refaz as últimas modificações"
 msgid "_Quit"
 msgstr "Sa_ir"
 
-#: ../src/bar.c:242 ../src/easytag.c:2429 ../src/easytag.c:4565
+#: ../src/bar.c:242 ../src/easytag.c:2430 ../src/easytag.c:4565
 #: ../src/easytag.c:4597
 msgid "Quit"
 msgstr "Sair"
@@ -728,7 +729,7 @@ msgstr "Renomeia arquivos e diretórios"
 msgid "_Process Fields…"
 msgstr "_Processar campos…"
 
-#: ../src/bar.c:370 ../src/scan.c:182
+#: ../src/bar.c:370 ../src/scan_dialog.c:184
 msgid "Process Fields"
 msgstr "Processa campos"
 
@@ -771,11 +772,11 @@ msgstr ""
 msgid "Tree"
 msgstr "Árvore"
 
-#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1902
+#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1903
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1903
+#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1904
 #: ../src/prefs.c:643
 msgid "Title"
 msgstr "Título"
@@ -783,22 +784,22 @@ msgstr "Título"
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Artist".
 #: ../src/browser.c:3103 ../src/browser.c:3110 ../src/cddb.c:483
-#: ../src/cddb.c:805 ../src/misc.c:1904 ../src/prefs.c:644
+#: ../src/cddb.c:805 ../src/misc.c:1905 ../src/prefs.c:644
 msgid "Artist"
 msgstr "Artista"
 
-#: ../src/browser.c:3103 ../src/misc.c:1905
+#: ../src/browser.c:3103 ../src/misc.c:1906
 msgid "Album Artist"
 msgstr "Artista do álbum"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Album".
 #: ../src/browser.c:3104 ../src/browser.c:3112 ../src/cddb.c:486
-#: ../src/cddb.c:806 ../src/misc.c:1906 ../src/prefs.c:645
+#: ../src/cddb.c:806 ../src/misc.c:1907 ../src/prefs.c:645
 msgid "Album"
 msgstr "Álbum"
 
-#: ../src/browser.c:3104 ../src/cddb.c:807 ../src/misc.c:1908
+#: ../src/browser.c:3104 ../src/cddb.c:807 ../src/misc.c:1909
 msgid "Year"
 msgstr "Ano"
 
@@ -806,37 +807,37 @@ msgstr "Ano"
 msgid "Disc"
 msgstr "Disco"
 
-#: ../src/browser.c:3105 ../src/misc.c:1909
+#: ../src/browser.c:3105 ../src/misc.c:1910
 msgid "Track"
 msgstr "Faixa"
 
-#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1910
+#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1911
 #: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Gênero"
 
-#: ../src/browser.c:3106 ../src/misc.c:1911 ../src/prefs.c:647
+#: ../src/browser.c:3106 ../src/misc.c:1912 ../src/prefs.c:647
 msgid "Comment"
 msgstr "Comentário"
 
-#: ../src/browser.c:3106 ../src/misc.c:1912 ../src/picture.c:1059
+#: ../src/browser.c:3106 ../src/misc.c:1913 ../src/picture.c:1060
 #: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Compositor"
 
-#: ../src/browser.c:3107 ../src/misc.c:1913
+#: ../src/browser.c:3107 ../src/misc.c:1914
 msgid "Original Artist"
 msgstr "Artista original"
 
-#: ../src/browser.c:3108 ../src/misc.c:1914
+#: ../src/browser.c:3108 ../src/misc.c:1915
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../src/browser.c:3108 ../src/misc.c:1915
+#: ../src/browser.c:3108 ../src/misc.c:1916
 msgid "URL"
 msgstr "URL"
 
-#: ../src/browser.c:3109 ../src/misc.c:1916
+#: ../src/browser.c:3109 ../src/misc.c:1917
 msgid "Encoded By"
 msgstr "Codificado por"
 
@@ -860,7 +861,7 @@ msgstr "Selecione um diretório para navegar."
 #. * The label for displaying number of files in path (without subdirs)
 #.
 #. Translators: No files, as in "0 files".
-#: ../src/browser.c:3153 ../src/easytag.c:3468
+#: ../src/browser.c:3153 ../src/easytag.c:3469
 msgid "No files"
 msgstr "Nenhum arquivo"
 
@@ -869,7 +870,7 @@ msgid "Artist & Album"
 msgstr "Artista & álbum"
 
 #. Only directories changed
-#: ../src/browser.c:3595 ../src/easytag.c:2880
+#: ../src/browser.c:3595 ../src/easytag.c:2881
 msgid "Rename Directory"
 msgstr "Renomear diretório"
 
@@ -878,7 +879,7 @@ msgstr "Renomear diretório"
 msgid "Rename the directory '%s' to:"
 msgstr "Renomear o diretório \"%s\" para:"
 
-#: ../src/browser.c:3636 ../src/misc.c:1171
+#: ../src/browser.c:3636 ../src/misc.c:1172
 msgid "Use mask:"
 msgstr "Usar a máscara:"
 
@@ -921,7 +922,7 @@ msgstr "Por favor, use um outro nome"
 msgid "The directory name '%s' already exists"
 msgstr "O nome do diretório \"%s\" já existe"
 
-#: ../src/browser.c:3865 ../src/easytag.c:2963
+#: ../src/browser.c:3865 ../src/easytag.c:2964
 msgid "Rename File Error"
 msgstr "Erro ao renomear o arquivo"
 
@@ -1048,7 +1049,7 @@ msgstr "Todos os campos"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Other".
-#: ../src/cddb.c:492 ../src/picture.c:1037 ../src/prefs.c:807
+#: ../src/cddb.c:492 ../src/picture.c:1038 ../src/prefs.c:807
 msgid "Other"
 msgstr "Outro"
 
@@ -1143,7 +1144,7 @@ msgstr "Categorias"
 msgid "Results:"
 msgstr "Resultados:"
 
-#: ../src/cddb.c:606 ../src/misc.c:1950
+#: ../src/cddb.c:606 ../src/misc.c:1951
 msgid "Search:"
 msgstr "Pesquisar:"
 
@@ -1208,7 +1209,7 @@ msgid "# Tracks"
 msgstr "# faixas"
 
 #. Check box to run the scanner
-#: ../src/cddb.c:847 ../src/misc.c:2991
+#: ../src/cddb.c:847 ../src/misc.c:2992
 msgid "Run the current scanner for each file"
 msgstr "Executar a verificação atual para cada arquivo"
 
@@ -1220,7 +1221,7 @@ msgstr "Coincidir linhas com o algoritmo Levenshtein"
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: ../src/cddb.c:859 ../src/prefs.c:1362
+#: ../src/cddb.c:859 ../src/prefs.c:1363
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM: Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every "
@@ -1644,46 +1645,46 @@ msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "O texto \"%s\" não pôde ser convertido em UTF-8 (%s)."
 
 #. Starting messages
-#: ../src/easytag.c:184
+#: ../src/easytag.c:185
 #, c-format
 msgid "Starting EasyTAG version %s (PID: %d)…"
 msgstr "Inicializando EasyTAG versão %s (PID: %d)…"
 
-#: ../src/easytag.c:186
+#: ../src/easytag.c:187
 #, c-format
 msgid "Using libid3tag version %s"
 msgstr "Usando libid3tag versão %s"
 
-#: ../src/easytag.c:189
+#: ../src/easytag.c:190
 #, c-format
 msgid "Using id3lib version %d.%d.%d"
 msgstr "Usando id3lib versão %d.%d.%d"
 
-#: ../src/easytag.c:195
+#: ../src/easytag.c:196
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
 msgstr "Variável EASYTAGLANG definida. Configurando a localização: \"%s\""
 
-#: ../src/easytag.c:197
+#: ../src/easytag.c:198
 #, c-format
 msgid "Setting locale: '%s'"
 msgstr "Configurando a localização: \"%s\""
 
-#: ../src/easytag.c:202
+#: ../src/easytag.c:203
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')"
 msgstr "Usando atualmente a localização \"%s\" (e eventualmente \"%s\")"
 
-#: ../src/easytag.c:209
+#: ../src/easytag.c:210
 msgid "Unable to create setting directories"
 msgstr "Não foi possível criar os diretórios de configuração"
 
-#: ../src/easytag.c:426 ../src/et_core.c:597 ../src/et_core.c:609
+#: ../src/easytag.c:427 ../src/et_core.c:637 ../src/et_core.c:649
 #, c-format
 msgid "Error while querying information for file: '%s' (%s)"
 msgstr "Erro ao consultar informação de arquivo: \"%s\" (%s)"
 
-#: ../src/easytag.c:489
+#: ../src/easytag.c:490
 #, c-format
 msgid "Cannot open path '%s'"
 msgstr "Não foi possível abrir o caminho \"%s\""
@@ -1691,11 +1692,11 @@ msgstr "Não foi possível abrir o caminho \"%s\""
 #.
 #. * Browser
 #.
-#: ../src/easytag.c:581 ../src/prefs.c:142
+#: ../src/easytag.c:582 ../src/prefs.c:142
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../src/easytag.c:603 ../src/et_core.c:2817
+#: ../src/easytag.c:604 ../src/et_core.c:2857
 msgid "File"
 msgstr "Arquivo"
 
@@ -1705,103 +1706,103 @@ msgstr "Arquivo"
 #. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
 #. Version changed to encoder version
 #. Encoder version
-#: ../src/easytag.c:635 ../src/easytag.c:4231 ../src/flac_header.c:201
+#: ../src/easytag.c:636 ../src/easytag.c:4232 ../src/flac_header.c:201
 #: ../src/monkeyaudio_header.c:96 ../src/musepack_header.c:98
 #: ../src/ogg_header.c:389 ../src/opus_header.c:221 ../src/wavpack_header.c:72
 #, c-format
 msgid "Encoder:"
 msgstr "Codificador:"
 
-#: ../src/easytag.c:643
+#: ../src/easytag.c:644
 msgid "Bitrate:"
 msgstr "Taxa de bits:"
 
 #. Translators: Please try to keep this string as short as possible as it
 #. * is shown in a narrow column.
-#: ../src/easytag.c:653
+#: ../src/easytag.c:654
 msgid "Frequency:"
 msgstr "Frequência:"
 
 #. Mode
-#: ../src/easytag.c:664 ../src/easytag.c:4235 ../src/mpeg_header.c:216
+#: ../src/easytag.c:665 ../src/easytag.c:4236 ../src/mpeg_header.c:216
 msgid "Mode:"
 msgstr "Modo:"
 
-#: ../src/easytag.c:671
+#: ../src/easytag.c:672
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: ../src/easytag.c:678
+#: ../src/easytag.c:679
 msgid "Duration:"
 msgstr "Duração:"
 
 #. Main Frame
-#: ../src/easytag.c:725 ../src/et_core.c:2747
+#: ../src/easytag.c:726 ../src/et_core.c:2787
 msgid "Tag"
 msgstr "Etiqueta"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: ../src/easytag.c:747
+#: ../src/easytag.c:748
 msgid "Common"
 msgstr "Comuns"
 
 #. Title
-#: ../src/easytag.c:754
+#: ../src/easytag.c:755
 msgid "Title:"
 msgstr "Título:"
 
-#: ../src/easytag.c:768
+#: ../src/easytag.c:769
 msgid "Tag selected files with this title"
 msgstr "Etiqueta arquivos selecionados com esse título"
 
 #. Artist
-#: ../src/easytag.c:773
+#: ../src/easytag.c:774
 msgid "Artist:"
 msgstr "Artista:"
 
-#: ../src/easytag.c:787
+#: ../src/easytag.c:788
 msgid "Tag selected files with this artist"
 msgstr "Etiqueta arquivos selecionados com esse artista"
 
 #. Album Artist
-#: ../src/easytag.c:792
+#: ../src/easytag.c:793
 msgid "Album artist:"
 msgstr "Artista do álbum:"
 
-#: ../src/easytag.c:806
+#: ../src/easytag.c:807
 msgid "Tag selected files with this album artist"
 msgstr "Etiqueta arquivos selecionados com o artista deste álbum"
 
 #. Album
-#: ../src/easytag.c:811
+#: ../src/easytag.c:812
 msgid "Album:"
 msgstr "Álbum:"
 
-#: ../src/easytag.c:825
+#: ../src/easytag.c:826
 msgid "Tag selected files with this album name"
 msgstr "Etiqueta arquivos selecionados com o nome deste álbum"
 
 #. Disc Number
-#: ../src/easytag.c:830
+#: ../src/easytag.c:831
 msgid "CD:"
 msgstr "CD:"
 
-#: ../src/easytag.c:847
+#: ../src/easytag.c:848
 msgid "Tag selected files with this disc number"
 msgstr "Etiqueta arquivos selecionados com o número deste disco"
 
 #. Year
-#: ../src/easytag.c:852
+#: ../src/easytag.c:853
 msgid "Year:"
 msgstr "Ano:"
 
-#: ../src/easytag.c:872
+#: ../src/easytag.c:873
 msgid "Tag selected files with this year"
 msgstr "Etiqueta arquivos selecionados com esse ano"
 
-#: ../src/easytag.c:886
+#: ../src/easytag.c:887
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Numera os arquivos selecionados seqüencialmente. Começar com 01 em cada "
@@ -1809,11 +1810,11 @@ msgstr ""
 
 #. To have enough space to display the icon
 #. To have enough space to display the icon
-#: ../src/easytag.c:895
+#: ../src/easytag.c:896
 msgid "Track #:"
 msgstr "Faixa #:"
 
-#: ../src/easytag.c:926
+#: ../src/easytag.c:927
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1821,462 +1822,462 @@ msgstr ""
 "Define o número de arquivos, no mesmo diretório do arquivo exibido, para as "
 "faixas selecionadas."
 
-#: ../src/easytag.c:946
+#: ../src/easytag.c:947
 msgid "Tag selected files with this number of tracks"
 msgstr "Etiqueta os arquivos selecionados com esse número de faixa"
 
 #. Genre
-#: ../src/easytag.c:950
+#: ../src/easytag.c:951
 msgid "Genre:"
 msgstr "Gênero:"
 
-#: ../src/easytag.c:978
+#: ../src/easytag.c:979
 msgid "Tag selected files with this genre"
 msgstr "Etiqueta os arquivos selecionados com esse gênero"
 
 #. Comment
-#: ../src/easytag.c:983
+#: ../src/easytag.c:984
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: ../src/easytag.c:1010
+#: ../src/easytag.c:1011
 msgid "Tag selected files with this comment"
 msgstr "Etiqueta os arquivos selecionados com esse comentário"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. Composer (name of the composers)
-#: ../src/easytag.c:1017
+#: ../src/easytag.c:1018
 msgid "Composer:"
 msgstr "Compositor:"
 
-#: ../src/easytag.c:1031
+#: ../src/easytag.c:1032
 msgid "Tag selected files with this composer"
 msgstr "Etiqueta os arquivos selecionados com esse compositor"
 
 #. Translators: Original Artist / Performer. Please try to keep this string
 #. * as short as possible, as it must fit into a narrow column.
-#: ../src/easytag.c:1038
+#: ../src/easytag.c:1039
 msgid "Orig. artist:"
 msgstr "Artista orig.:"
 
-#: ../src/easytag.c:1052
+#: ../src/easytag.c:1053
 msgid "Tag selected files with this original artist"
 msgstr "Etiqueta os arquivos selecionados com esse artista original"
 
 #. Copyright
-#: ../src/easytag.c:1058
+#: ../src/easytag.c:1059
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../src/easytag.c:1072
+#: ../src/easytag.c:1073
 msgid "Tag selected files with this copyright"
 msgstr "Etiqueta os arquivos selecionados com esse copyright"
 
 #. URL
-#: ../src/easytag.c:1078
+#: ../src/easytag.c:1079
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/easytag.c:1092
+#: ../src/easytag.c:1093
 msgid "Tag selected files with this URL"
 msgstr "Etiqueta os arquivos selecionados com essa URL"
 
 #. Encoded by
-#: ../src/easytag.c:1098
+#: ../src/easytag.c:1099
 msgid "Encoded by:"
 msgstr "Codificado por:"
 
-#: ../src/easytag.c:1112
+#: ../src/easytag.c:1113
 msgid "Tag selected files with this encoder name"
 msgstr "Etiqueta os arquivos selecionados com esse nome do codificador"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1146 ../src/et_core.c:3189 ../src/et_core.c:3192
+#: ../src/easytag.c:1147 ../src/et_core.c:3229 ../src/et_core.c:3232
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/easytag.c:1170
+#: ../src/easytag.c:1171
 msgid "You can use drag and drop to add an image"
 msgstr "Você pode arrastar e soltar para adicionar uma imagem"
 
-#: ../src/easytag.c:1217
+#: ../src/easytag.c:1218
 msgid "Add images to the tag"
 msgstr "Adiciona imagens à etiqueta"
 
-#: ../src/easytag.c:1235
+#: ../src/easytag.c:1236
 msgid "Remove selected images from the tag"
 msgstr "Remove imagens selecionadas da etiqueta"
 
-#: ../src/easytag.c:1249
+#: ../src/easytag.c:1250
 msgid "Save the selected images to files"
 msgstr "Salva as imagens selecionadas em arquivos"
 
-#: ../src/easytag.c:1260
+#: ../src/easytag.c:1261
 msgid "Edit image properties"
 msgstr "Edita as propriedades da imagem"
 
-#: ../src/easytag.c:1274
+#: ../src/easytag.c:1275
 msgid "Tag selected files with these images"
 msgstr "Etiqueta os arquivos selecionados com essas imagens"
 
-#: ../src/easytag.c:1332
+#: ../src/easytag.c:1333
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Arquivos selecionados etiquetados com o título \"%s\"."
 
-#: ../src/easytag.c:1334
+#: ../src/easytag.c:1335
 msgid "Removed title from selected files."
 msgstr "Título selecionado dos arquivos selecionados."
 
-#: ../src/easytag.c:1349
+#: ../src/easytag.c:1350
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Arquivos selecionados etiquetados com o artista \"%s\"."
 
-#: ../src/easytag.c:1351
+#: ../src/easytag.c:1352
 msgid "Removed artist from selected files."
 msgstr "Artista removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1365
+#: ../src/easytag.c:1366
 #, c-format
 msgid "Selected files tagged with album artist '%s'."
 msgstr "Arquivos selecionados etiquetados com o artista do álbum \"%s\"."
 
-#: ../src/easytag.c:1367
+#: ../src/easytag.c:1368
 msgid "Removed album artist from selected files."
 msgstr "Artista do álbum removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1382
+#: ../src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Arquivos selecionados etiquetados com o álbum \"%s\"."
 
-#: ../src/easytag.c:1384
+#: ../src/easytag.c:1385
 msgid "Removed album name from selected files."
 msgstr "Nome do álbum removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1421
+#: ../src/easytag.c:1422
 #, c-format
 msgid "Selected files tagged with disc number '%s/%s'."
 msgstr "Arquivos selecionados etiquetados com o número do disco \"%s/%s\"."
 
-#: ../src/easytag.c:1426
+#: ../src/easytag.c:1427
 #, c-format
 msgid "Selected files tagged with disc number like 'xx'."
 msgstr "Arquivos selecionados etiquetados com o número do disco como \"xx\"."
 
-#: ../src/easytag.c:1431
+#: ../src/easytag.c:1432
 msgid "Removed disc number from selected files."
 msgstr "Número do disco removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1447
+#: ../src/easytag.c:1448
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Arquivos selecionados etiquetados com o ano \"%s\"."
 
-#: ../src/easytag.c:1449
+#: ../src/easytag.c:1450
 msgid "Removed year from selected files."
 msgstr "Ano removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1475 ../src/easytag.c:1566
+#: ../src/easytag.c:1476 ../src/easytag.c:1567
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Arquivos selecionados etiquetados com a faixa como \"xx/%s\"."
 
-#: ../src/easytag.c:1478
+#: ../src/easytag.c:1479
 #, c-format
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Arquivos selecionados etiquetados com a faixa como \"xx\"."
 
-#: ../src/easytag.c:1482 ../src/easytag.c:1569
+#: ../src/easytag.c:1483 ../src/easytag.c:1570
 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:1539
+#: ../src/easytag.c:1540
 #, c-format
 msgid "Selected tracks numbered sequentially."
 msgstr "Faixas selecionadas numeradas sequencialmente."
 
-#: ../src/easytag.c:1585
+#: ../src/easytag.c:1586
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Arquivos selecionados etiquetados com o gênero \"%s\"."
 
-#: ../src/easytag.c:1587
+#: ../src/easytag.c:1588
 msgid "Removed genre from selected files."
 msgstr "Gênero removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1609
+#: ../src/easytag.c:1610
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Arquivos selecionados etiquetados com o comentário \"%s\"."
 
-#: ../src/easytag.c:1611
+#: ../src/easytag.c:1612
 msgid "Removed comment from selected files."
 msgstr "Comentário removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1625
+#: ../src/easytag.c:1626
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Arquivos selecionados etiquetados com o compositor \"%s\"."
 
-#: ../src/easytag.c:1627
+#: ../src/easytag.c:1628
 msgid "Removed composer from selected files."
 msgstr "Compositor removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1642
+#: ../src/easytag.c:1643
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Arquivos selecionados etiquetados com o artista original \"%s\"."
 
-#: ../src/easytag.c:1644
+#: ../src/easytag.c:1645
 msgid "Removed original artist from selected files."
 msgstr "Artista original removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1659
+#: ../src/easytag.c:1660
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Arquivos selecionados etiquetados com o copyright \"%s\"."
 
-#: ../src/easytag.c:1661
+#: ../src/easytag.c:1662
 msgid "Removed copyright from selected files."
 msgstr "Copyright removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1676
+#: ../src/easytag.c:1677
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Arquivos selecionados etiquetados com a URL \"%s\"."
 
-#: ../src/easytag.c:1678
+#: ../src/easytag.c:1679
 msgid "Removed URL from selected files."
 msgstr "URL removida dos arquivos selecionados."
 
-#: ../src/easytag.c:1693
+#: ../src/easytag.c:1694
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Arquivos selecionados etiquetados com o nome do codificador \"%s\"."
 
-#: ../src/easytag.c:1695
+#: ../src/easytag.c:1696
 msgid "Removed encoder name from selected files."
 msgstr "Nome do codificador removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1727
+#: ../src/easytag.c:1728
 msgid "Selected files tagged with images."
 msgstr "Arquivos selecionados etiquetados com imagens."
 
-#: ../src/easytag.c:1729
+#: ../src/easytag.c:1730
 msgid "Removed images from selected files."
 msgstr "Imagens removidas dos arquivos selecionados."
 
-#: ../src/easytag.c:2010
+#: ../src/easytag.c:2011
 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:2062
+#: ../src/easytag.c:2063
 msgid "All tags have been scanned"
 msgstr "Todas as etiquetas foram verificadas"
 
-#: ../src/easytag.c:2118
+#: ../src/easytag.c:2119
 msgid "All tags have been removed"
 msgstr "Todas as etiquetas foram removidas"
 
-#: ../src/easytag.c:2423
+#: ../src/easytag.c:2424
 #, c-format
 msgid "A file was changed by an external program"
 msgid_plural "%d files were changed by an external program."
 msgstr[0] "Um arquivo foi alterado por um programa externo."
 msgstr[1] "%d arquivos foram alterados por um programa externo."
 
-#: ../src/easytag.c:2428
+#: ../src/easytag.c:2429
 msgid "Do you want to continue saving the file?"
 msgstr "Você deseja continuar salvando o arquivo?"
 
-#: ../src/easytag.c:2486 ../src/easytag.c:2506
+#: ../src/easytag.c:2487 ../src/easytag.c:2507
 msgid "Saving files was stopped"
 msgstr "O salvamento de arquivos foi interrompido"
 
-#: ../src/easytag.c:2508
+#: ../src/easytag.c:2509
 msgid "All files have been saved"
 msgstr "Todas os arquivos foram salvos"
 
-#: ../src/easytag.c:2643
+#: ../src/easytag.c:2644
 #, c-format
 msgid "Cannot delete file (%s)"
 msgstr "Não foi possível excluir o arquivo (%s)"
 
-#: ../src/easytag.c:2664
+#: ../src/easytag.c:2665
 msgid "Files have been partially deleted"
 msgstr "Os arquivos foram parcialmente excluídos"
 
-#: ../src/easytag.c:2666
+#: ../src/easytag.c:2667
 msgid "All files have been deleted"
 msgstr "Todos os arquivos foram excluídos"
 
-#: ../src/easytag.c:2782
+#: ../src/easytag.c:2783
 #, c-format
 msgid "Do you want to write the tag of file '%s'?"
 msgstr "Você deseja gravar a etiqueta do arquivo \"%s\"?"
 
-#: ../src/easytag.c:2784
+#: ../src/easytag.c:2785
 msgid "Confirm Tag Writing"
 msgstr "Confirmar gravação de etiqueta"
 
-#: ../src/easytag.c:2789 ../src/easytag.c:2909 ../src/easytag.c:3172
+#: ../src/easytag.c:2790 ../src/easytag.c:2910 ../src/easytag.c:3173
 msgid "Repeat action for the remaining files"
 msgstr "Repita esta ação para o resto dos arquivos"
 
 #. Directories and filename changed
-#: ../src/easytag.c:2873 ../src/scan.c:181
+#: ../src/easytag.c:2874 ../src/scan_dialog.c:183
 msgid "Rename File and Directory"
 msgstr "Renomear arquivo e diretório"
 
-#: ../src/easytag.c:2874
+#: ../src/easytag.c:2875
 msgid "File and directory rename confirmation required"
 msgstr "É necessário confirmação para renomear arquivo e diretório"
 
-#: ../src/easytag.c:2875
+#: ../src/easytag.c:2876
 #, c-format
 msgid "Do you want to rename the file and directory '%s' to '%s'?"
 msgstr "Você deseja renomear o arquivo e diretório \"%s\" para \"%s\"?"
 
-#: ../src/easytag.c:2881
+#: ../src/easytag.c:2882
 msgid "Directory rename confirmation required"
 msgstr "É necessário confirmação para renomear diretório"
 
-#: ../src/easytag.c:2882
+#: ../src/easytag.c:2883
 #, c-format
 msgid "Do you want to rename the directory '%s' to '%s'?"
 msgstr "Você deseja renomear o diretório \"%s\" para \"%s\"?"
 
 #. Only filename changed
-#: ../src/easytag.c:2888
+#: ../src/easytag.c:2889
 msgid "Rename File"
 msgstr "Renomear arquivo"
 
-#: ../src/easytag.c:2889
+#: ../src/easytag.c:2890
 msgid "File rename confirmation required"
 msgstr "É necessário confirmação para renomear o arquivo"
 
-#: ../src/easytag.c:2890
+#: ../src/easytag.c:2891
 #, c-format
 msgid "Do you want to rename the file '%s' to '%s'?"
 msgstr "Você deseja renomear o arquivo \"%s\" para \"%s\"?"
 
-#: ../src/easytag.c:2956
+#: ../src/easytag.c:2957
 #, c-format
 msgid "Cannot rename file '%s' to '%s'"
 msgstr "Não foi possível renomear o arquivo \"%s\" para \"%s\""
 
-#: ../src/easytag.c:2970
+#: ../src/easytag.c:2971
 #, c-format
 msgid "Cannot rename file '%s' to '%s': %s"
 msgstr "Não foi possível renomear o arquivo \"%s\" para \"%s\": %s"
 
-#: ../src/easytag.c:2974
+#: ../src/easytag.c:2975
 msgid "File(s) not renamed"
 msgstr "Arquivo(s) não renomeado(s)"
 
-#: ../src/easytag.c:3086
+#: ../src/easytag.c:3087
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Gravando etiqueta em \"%s\""
 
-#: ../src/easytag.c:3093
+#: ../src/easytag.c:3094
 msgid "Tag(s) written"
 msgstr "Etiqueta(s) gravada(s)"
 
-#: ../src/easytag.c:3108
+#: ../src/easytag.c:3109
 #, c-format
 msgid "Cannot write tag in file '%s' (%s)"
 msgstr "Não foi possível gravar a etiqueta no arquivo \"%s\" (%s)"
 
-#: ../src/easytag.c:3121
+#: ../src/easytag.c:3122
 #, c-format
 msgid "Cannot write tag in file '%s'"
 msgstr "Não foi possível gravar a etiqueta no arquivo \"%s\""
 
-#: ../src/easytag.c:3124
+#: ../src/easytag.c:3125
 msgid "Tag Write Error"
 msgstr "Erro de gravação de etiqueta"
 
-#: ../src/easytag.c:3169 ../src/easytag.c:3183
+#: ../src/easytag.c:3170 ../src/easytag.c:3184
 #, c-format
 msgid "Do you really want to delete the file '%s'?"
 msgstr "Você deseja mesmo excluir o arquivo \"%s\"?"
 
-#: ../src/easytag.c:3175 ../src/easytag.c:3185
+#: ../src/easytag.c:3176 ../src/easytag.c:3186
 msgid "Delete File"
 msgstr "Excluir arquivo"
 
-#: ../src/easytag.c:3210
+#: ../src/easytag.c:3211
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Arquivo \"%s\" excluído"
 
-#: ../src/easytag.c:3345
+#: ../src/easytag.c:3346
 #, c-format
 msgid "Cannot read directory '%s'"
 msgstr "Não foi possível ler o diretório \"%s\""
 
-#: ../src/easytag.c:3349
+#: ../src/easytag.c:3350
 msgid "Directory Read Error"
 msgstr "Erro de leitura do diretório"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3370
+#: ../src/easytag.c:3371
 #, c-format
 msgid "Search in progress…"
 msgstr "Pesquisa em progresso…"
 
-#: ../src/easytag.c:3393 ../src/et_core.c:2824
+#: ../src/easytag.c:3394 ../src/et_core.c:2864
 #, c-format
 msgid "File: '%s'"
 msgstr "Arquivo: \"%s\""
 
-#: ../src/easytag.c:3443
+#: ../src/easytag.c:3444
 #, c-format
 msgid "Found one file in this directory and subdirectories"
 msgid_plural "Found %d files in this directory and subdirectories"
 msgstr[0] "Encontrado um arquivo neste diretório e subdiretórios"
 msgstr[1] "Encontrados %d arquivos neste diretório e subdiretórios"
 
-#: ../src/easytag.c:3450
+#: ../src/easytag.c:3451
 #, c-format
 msgid "Found one file in this directory"
 msgid_plural "Found %d files in this directory"
 msgstr[0] "Encontrado um arquivo nesse diretório"
 msgstr[1] "Encontrados %d arquivos nesse diretório"
 
-#: ../src/easytag.c:3472
+#: ../src/easytag.c:3473
 msgid "No file found in this directory and subdirectories"
 msgstr "Nenhum arquivo encontrado nesse diretório e subdiretórios"
 
-#: ../src/easytag.c:3474
+#: ../src/easytag.c:3475
 msgid "No file found in this directory"
 msgstr "Nenhum arquivo encontrado neste diretório"
 
-#: ../src/easytag.c:3542
+#: ../src/easytag.c:3543
 #, c-format
 msgid "Error opening directory '%s' (%s)"
 msgstr "Erro ao abrir o diretório \"%s\" (%s)"
 
-#: ../src/easytag.c:3578
+#: ../src/easytag.c:3579
 #, c-format
 msgid "Cannot read directory (%s)"
 msgstr "Não foi possível ler o diretório (%s)"
 
-#: ../src/easytag.c:3598
+#: ../src/easytag.c:3599
 msgid "Searching for audio files…"
 msgstr "Pesquisa por arquivos de áudio…"
 
-#: ../src/easytag.c:3599
+#: ../src/easytag.c:3600
 msgid "Searching"
 msgstr "Pesquisando"
 
-#: ../src/easytag.c:4265
+#: ../src/easytag.c:4266
 msgid "Select a directory to browse"
 msgstr "Seleciona um diretório para navegar"
 
@@ -2285,11 +2286,11 @@ msgstr "Seleciona um diretório para navegar"
 msgid "Tag selected files with this field"
 msgstr "Etiquetar arquivos selecionados com esse campo"
 
-#: ../src/easytag.c:4424 ../src/scan.c:2654
+#: ../src/easytag.c:4424 ../src/scan_dialog.c:2124
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Converter \"_\" e \"%20\" para espaços"
 
-#: ../src/easytag.c:4431 ../src/scan.c:2656
+#: ../src/easytag.c:4431 ../src/scan_dialog.c:2126
 msgid "Convert ' ' to '_'"
 msgstr "Converter \" \" para \"_\""
 
@@ -2309,7 +2310,7 @@ msgstr "Primeira letra maiúscula"
 msgid "First letter uppercase of each word"
 msgstr "Primeira letra de cada palavra maiúscula"
 
-#: ../src/easytag.c:4474 ../src/prefs.c:1023 ../src/scan.c:2754
+#: ../src/easytag.c:4474 ../src/prefs.c:1023 ../src/scan_dialog.c:2224
 msgid "Remove spaces"
 msgstr "Remover espaços"
 
@@ -2337,119 +2338,119 @@ msgstr "Você deseja salvá-los antes de sair?"
 msgid "Do you really want to quit?"
 msgstr "Você realmente deseja sair?"
 
-#: ../src/et_core.c:510
+#: ../src/et_core.c:550
 #, c-format
 msgid "Error reading tag from ogg file (%s)"
 msgstr "Erro ao ler a etiqueta do arquivo off (%s)"
 
-#: ../src/et_core.c:539
+#: ../src/et_core.c:579
 #, c-format
 msgid "Error reading tag from Opus file (%s)"
 msgstr "Erro ao ler a etiqueta do arquivo Opus (%s)"
 
-#: ../src/et_core.c:682
+#: ../src/et_core.c:722
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr "Correções automáticas aplicadas no arquivo \"%s\"."
 
-#: ../src/et_core.c:2707
+#: ../src/et_core.c:2747
 msgid "ID3 Tag"
 msgstr "Etiqueta ID3"
 
-#: ../src/et_core.c:2713
+#: ../src/et_core.c:2753
 msgid "Ogg Vorbis Tag"
 msgstr "Etiqueta Ogg Vorbis"
 
-#: ../src/et_core.c:2719
+#: ../src/et_core.c:2759
 msgid "FLAC Vorbis Tag"
 msgstr "Etiqueta FLAC"
 
-#: ../src/et_core.c:2724
+#: ../src/et_core.c:2764
 msgid "APE Tag"
 msgstr "Etiqueta APE"
 
-#: ../src/et_core.c:2729
+#: ../src/et_core.c:2769
 msgid "MP4/M4A/AAC Tag"
 msgstr "Etiqueta MP4/M4A/AAC"
 
-#: ../src/et_core.c:2735
+#: ../src/et_core.c:2775
 msgid "Wavpack Tag"
 msgstr "Etiqueta Wavpack"
 
-#: ../src/et_core.c:2741
+#: ../src/et_core.c:2781
 msgid "Opus Tag"
 msgstr "Etiqueta Opus"
 
-#: ../src/et_core.c:2761
+#: ../src/et_core.c:2801
 msgid "MP3 File"
 msgstr "Arquivo MP3"
 
-#: ../src/et_core.c:2765
+#: ../src/et_core.c:2805
 msgid "MP2 File"
 msgstr "Arquivo MP2"
 
-#: ../src/et_core.c:2771
+#: ../src/et_core.c:2811
 msgid "Ogg Vorbis File"
 msgstr "Arquivo Ogg Vorbis"
 
-#: ../src/et_core.c:2777
+#: ../src/et_core.c:2817
 msgid "Speex File"
 msgstr "Arquivo Speex"
 
-#: ../src/et_core.c:2783
+#: ../src/et_core.c:2823
 msgid "FLAC File"
 msgstr "Arquivo FLAC"
 
-#: ../src/et_core.c:2788
+#: ../src/et_core.c:2828
 msgid "MusePack File"
 msgstr "Arquivo MusePack"
 
 # http://www.monkeysaudio.com/ (MAC)
-#: ../src/et_core.c:2792
+#: ../src/et_core.c:2832
 msgid "Monkey's Audio File"
 msgstr "Arquivo Monkey's audio"
 
-#: ../src/et_core.c:2797
+#: ../src/et_core.c:2837
 msgid "MP4/AAC File"
 msgstr "Arquivo MP4/AAC"
 
-#: ../src/et_core.c:2803
+#: ../src/et_core.c:2843
 msgid "Wavpack File"
 msgstr "Arquivo Wavpack"
 
-#: ../src/et_core.c:2809
+#: ../src/et_core.c:2849
 msgid "Opus File"
 msgstr "Arquivo Opus"
 
-#: ../src/et_core.c:2868 ../src/et_core.c:2923
+#: ../src/et_core.c:2908 ../src/et_core.c:2963
 msgid "File not found"
 msgstr "Arquivo não localizado"
 
-#: ../src/et_core.c:2873
+#: ../src/et_core.c:2913
 #, c-format
 msgid "Cannot query file information (%s)"
 msgstr "Não foi possível consultar a informação de arquivo (%s)"
 
-#: ../src/et_core.c:2907
+#: ../src/et_core.c:2947
 msgid "Read-only file"
 msgstr "Arquivo somente leitura"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2971
+#: ../src/et_core.c:3011
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
 msgstr[0] "Um arquivo"
 msgstr[1] "%u arquivos"
 
-#: ../src/et_core.c:3175
+#: ../src/et_core.c:3215
 #, c-format
 msgid "Images (%d)"
 msgstr "Imagens (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3217 ../src/flac_header.c:205
-#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
+#: ../src/et_core.c:3257 ../src/flac_header.c:205
+#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.cc:142
 #: ../src/mpeg_header.c:206 ../src/musepack_header.c:88
 #: ../src/ogg_header.c:401 ../src/opus_header.c:227 ../src/wavpack_header.c:78
 #, c-format
@@ -2457,30 +2458,30 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: ../src/et_core.c:3222 ../src/flac_header.c:210
-#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
+#: ../src/et_core.c:3262 ../src/flac_header.c:210
+#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.cc:147
 #: ../src/mpeg_header.c:211 ../src/musepack_header.c:93
 #: ../src/ogg_header.c:406 ../src/opus_header.c:232 ../src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/et_core.c:3368 ../src/scan.c:690
+#: ../src/et_core.c:3408 ../src/scan_dialog.c:688
 #, 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/et_core.c:3370
+#: ../src/et_core.c:3410
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Tente definir a variável de ambiente G_FILENAME_ENCODING."
 
-#: ../src/et_core.c:3371 ../src/scan.c:692
+#: ../src/et_core.c:3411 ../src/scan_dialog.c:690
 msgid "Filename translation"
 msgstr "Tradução do nome do arquivo"
 
-#: ../src/et_core.c:4076
+#: ../src/et_core.c:4116
 #, c-format
 msgid "Error writing tag type %d to file %s (%s)"
 msgstr "Erro ao gravar o tipo da etiqueta %d no arquivo %s (%s)"
@@ -2489,7 +2490,7 @@ msgstr "Erro ao gravar o tipo da etiqueta %d no arquivo %s (%s)"
 #. Mode
 #. mpeg4ip library seems to always return -1
 #. Mode
-#: ../src/flac_header.c:215 ../src/mp4_header.c:145 ../src/ogg_header.c:411
+#: ../src/flac_header.c:215 ../src/mp4_header.cc:153 ../src/ogg_header.c:411
 #: ../src/opus_header.c:237 ../src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Canais:"
@@ -2703,54 +2704,54 @@ msgstr "Erro ao salvar etiqueta de \"%s\""
 msgid "Log"
 msgstr "Log"
 
-#: ../src/misc.c:719
+#: ../src/misc.c:720
 msgid "You must type a program name"
 msgstr "Você deve digitar o nome de um programa"
 
-#: ../src/misc.c:720
+#: ../src/misc.c:721
 msgid "Program Name Error"
 msgstr "Erro no nome do programa"
 
-#: ../src/misc.c:799
+#: ../src/misc.c:800
 #, c-format
 msgid "Executed command: %s"
 msgstr "Comando executado: %s"
 
-#: ../src/misc.c:806
+#: ../src/misc.c:807
 #, c-format
 msgid "Failed to launch program: %s"
 msgstr "Falha ao iniciar programa: %s"
 
-#: ../src/misc.c:823
+#: ../src/misc.c:824
 msgid "Select File"
 msgstr "Selecionar arquivo"
 
-#: ../src/misc.c:829
+#: ../src/misc.c:830
 msgid "Select Directory"
 msgstr "Selecionar diretório"
 
-#: ../src/misc.c:1141
+#: ../src/misc.c:1142
 msgid "Generate Playlist"
 msgstr "Gerar uma lista de reprodução"
 
-#: ../src/misc.c:1165
+#: ../src/misc.c:1166
 msgid "M3U Playlist Name"
 msgstr "Nome da lista de reprodução M3U"
 
-#: ../src/misc.c:1180
+#: ../src/misc.c:1181
 msgid "Use directory name"
 msgstr "Usar o nome do diretório"
 
 #. Playlist options
-#: ../src/misc.c:1197
+#: ../src/misc.c:1198
 msgid "Playlist Options"
 msgstr "Opções da lista de reprodução"
 
-#: ../src/misc.c:1203
+#: ../src/misc.c:1204
 msgid "Include only the selected files"
 msgstr "Incluir apenas os arquivos selecionados"
 
-#: ../src/misc.c:1206
+#: ../src/misc.c:1207
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2758,29 +2759,29 @@ msgstr ""
 "Se ativada, apenas os arquivos selecionados serão gravados no arquivo de "
 "lista de reprodução. Caso contrário, todos os arquivos serão gravados."
 
-#: ../src/misc.c:1209
+#: ../src/misc.c:1210
 msgid "Use full path for files in playlist"
 msgstr "Usar o caminho absoluto para os arquivos na lista de reprodução"
 
-#: ../src/misc.c:1212
+#: ../src/misc.c:1213
 msgid "Use relative path for files in playlist"
 msgstr "Usar o caminho relativo para os arquivos na lista de reprodução"
 
 #. Create playlist in parent directory
-#: ../src/misc.c:1218
+#: ../src/misc.c:1219
 msgid "Create playlist in the parent directory"
 msgstr "Criar uma lista de reprodução no diretório superior"
 
-#: ../src/misc.c:1221
+#: ../src/misc.c:1222
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "Se ativada, a lista de reprodução será criada no diretório superior."
 
 #. DOS Separator
-#: ../src/misc.c:1225
+#: ../src/misc.c:1226
 msgid "Use DOS directory separator"
 msgstr "Usar separador de diretório DOS"
 
-#: ../src/misc.c:1231
+#: ../src/misc.c:1232
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2788,49 +2789,49 @@ msgstr ""
 "Essa opção substitui o separador de diretório UNIX \"/\" por um separador "
 "DOS \"\\\"."
 
-#: ../src/misc.c:1240
+#: ../src/misc.c:1241
 msgid "Playlist Content"
 msgstr "Conteúdo da lista de reprodução"
 
-#: ../src/misc.c:1246
+#: ../src/misc.c:1247
 msgid "Write only list of files"
 msgstr "Gravar somente a lista dos arquivos"
 
-#: ../src/misc.c:1250
+#: ../src/misc.c:1251
 msgid "Write info using filename"
 msgstr "Gravar informações usando o nome do arquivo"
 
-#: ../src/misc.c:1253
+#: ../src/misc.c:1254
 msgid "Write info using:"
 msgstr "Gravar informações usando:"
 
-#: ../src/misc.c:1467
+#: ../src/misc.c:1468
 #, c-format
 msgid "Cannot write playlist file '%s'"
 msgstr "Não foi possível gravar o arquivo de lista de reprodução \"%s\""
 
-#: ../src/misc.c:1471
+#: ../src/misc.c:1472
 msgid "Playlist File Error"
 msgstr "Erro no arquivo de lista de reprodução"
 
-#: ../src/misc.c:1479
+#: ../src/misc.c:1480
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Gravando o arquivo de lista de reprodução \"%s\""
 
-#: ../src/misc.c:1543 ../src/scan.c:3239 ../src/scan.c:3301
+#: ../src/misc.c:1544 ../src/scan_dialog.c:2709 ../src/scan_dialog.c:2771
 msgid "Invalid scanner mask"
 msgstr "Máscara de verificação inválida"
 
-#: ../src/misc.c:1907
+#: ../src/misc.c:1908
 msgid "CD"
 msgstr "CD"
 
-#: ../src/misc.c:1929
+#: ../src/misc.c:1930
 msgid "Find Files"
 msgstr "Localizar arquivos"
 
-#: ../src/misc.c:1961
+#: ../src/misc.c:1962
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2838,13 +2839,13 @@ msgstr ""
 "todos os arquivos."
 
 #. Where...
-#: ../src/misc.c:1967
+#: ../src/misc.c:1968
 msgid "In:"
 msgstr "Em:"
 
 #. Translators: This option is for the previous 'in' option. For instance,
 #. * translate this as "Search" "In:" "the Filename".
-#: ../src/misc.c:1972
+#: ../src/misc.c:1973
 msgid "the Filename"
 msgstr "o nome do arquivo"
 
@@ -2853,83 +2854,83 @@ msgstr "o 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:1978
+#: ../src/misc.c:1979
 msgid "the Tag"
 msgstr "a etiqueta"
 
 #. Property of the search
-#: ../src/misc.c:1989 ../src/prefs.c:335
+#: ../src/misc.c:1990 ../src/prefs.c:335
 msgid "Case sensitive"
 msgstr "Diferenciar maiúsculas de minúsculas"
 
-#: ../src/misc.c:2216
+#: ../src/misc.c:2217
 msgid "Ready to search…"
 msgstr "Pronto para pesquisar…"
 
-#: ../src/misc.c:2436
+#: ../src/misc.c:2437
 #, c-format
 msgid "Found one file"
 msgid_plural "Found %d files"
 msgstr[0] "Encontrou um arquivo"
 msgstr[1] "Encontrou %d arquivos"
 
-#: ../src/misc.c:2721
+#: ../src/misc.c:2722
 msgid "Load Filenames From a Text File"
 msgstr "Carregar os nomes dos arquivos de um arquivo texto"
 
-#: ../src/misc.c:2750
+#: ../src/misc.c:2751
 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:2769
+#: ../src/misc.c:2770
 msgid " Load "
 msgstr " Carregar "
 
-#: ../src/misc.c:2787
+#: ../src/misc.c:2788
 msgid "Content of Text File"
 msgstr "Conteúdo do arquivo texto"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2808 ../src/misc.c:2903
+#: ../src/misc.c:2809 ../src/misc.c:2904
 msgid "Insert a blank line before the selected line"
 msgstr "Inserir uma linha em branco antes da linha selecionada"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2817 ../src/misc.c:2912
+#: ../src/misc.c:2818 ../src/misc.c:2913
 msgid "Delete the selected line"
 msgstr "Excluir a linha selecionada"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2826 ../src/misc.c:2921 ../src/misc.c:3407
+#: ../src/misc.c:2827 ../src/misc.c:2922 ../src/misc.c:3408
 msgid "Delete all blank lines"
 msgstr "Excluir todas as linhas em branco"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2838 ../src/misc.c:2933
+#: ../src/misc.c:2839 ../src/misc.c:2934
 msgid "Move up the selected line"
 msgstr "Mover para cima a linha selecionada"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2847 ../src/misc.c:2942
+#: ../src/misc.c:2848 ../src/misc.c:2943
 msgid "Move down the selected line"
 msgstr "Mover para baixo a linha selecionada"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2859 ../src/misc.c:2954 ../src/misc.c:3431
+#: ../src/misc.c:2860 ../src/misc.c:2955 ../src/misc.c:3432
 msgid "Reload"
 msgstr "Recarregar"
 
-#: ../src/misc.c:2881
+#: ../src/misc.c:2882
 msgid "List of Files"
 msgstr "Lista dos arquivos"
 
-#: ../src/misc.c:2976
+#: ../src/misc.c:2977
 msgid "Selected line:"
 msgstr "Linha selecionada:"
 
-#: ../src/misc.c:2994
+#: ../src/misc.c:2995
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2938,34 +2939,34 @@ msgstr ""
 "selecionado atualmente será executado (a janela do verificador deverá estar "
 "aberta)."
 
-#: ../src/misc.c:3081
+#: ../src/misc.c:3082
 #, c-format
 msgid "Cannot retrieve file info (%s)"
 msgstr "Não foi possível obter informação do arquivo (%s)"
 
-#: ../src/misc.c:3143
+#: ../src/misc.c:3144
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Não foi possível abrir o arquivo \"%s\" (%s)"
 
-#: ../src/misc.c:3179
+#: ../src/misc.c:3180
 #, c-format
 msgid "Error reading file (%s)"
 msgstr "Erro na leitura do arquivo (%s)"
 
-#: ../src/misc.c:3395
+#: ../src/misc.c:3396
 msgid "Insert a blank line"
 msgstr "Inserir uma linha em branco"
 
-#: ../src/misc.c:3401
+#: ../src/misc.c:3402
 msgid "Delete this line"
 msgstr "Excluir esta linha"
 
-#: ../src/misc.c:3416
+#: ../src/misc.c:3417
 msgid "Move up this line"
 msgstr "Mover esta linha para cima"
 
-#: ../src/misc.c:3422
+#: ../src/misc.c:3423
 msgid "Move down this line"
 msgstr "Mover esta linha para baixo"
 
@@ -2975,26 +2976,26 @@ msgstr "Mover esta linha para baixo"
 msgid "Profile:"
 msgstr "Perfil:"
 
-#: ../src/mp4_header.c:63 ../src/mp4_tag.c:65 ../src/mp4_tag.c:186
+#: ../src/mp4_header.cc:60 ../src/mp4_tag.cc:91 ../src/mp4_tag.cc:284
 msgid "MP4 format invalid"
 msgstr "Formato MP4 inválido"
 
-#: ../src/mp4_header.c:72 ../src/mp4_tag.c:74
+#: ../src/mp4_header.cc:68
 #, c-format
 msgid "File contains no audio track: '%s'"
 msgstr "O arquivo contém nenhuma faixa de áudio: \"%s\""
 
-#: ../src/mp4_header.c:82
+#: ../src/mp4_header.cc:79
 #, c-format
 msgid "Error reading properties from file: '%s'"
 msgstr "Erro na leitura das propriedades do arquivo: \"%s\""
 
-#: ../src/mp4_header.c:132 ../src/mpeg_header.c:204
+#: ../src/mp4_header.cc:140 ../src/mpeg_header.c:204
 #, c-format
 msgid "~%d kb/s"
 msgstr "~%d kb/s"
 
-#: ../src/mp4_tag.c:85 ../src/mp4_tag.c:194
+#: ../src/mp4_tag.cc:101 ../src/mp4_tag.cc:293
 #, c-format
 msgid "Error reading tags from file: '%s'"
 msgstr "Erro na leitura das etiquetas o arquivo: \"%s\""
@@ -3074,12 +3075,12 @@ msgstr "Erro: Falha ao abrir o arquivo: \"%s\" como Vorbis (%s)."
 msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Aviso: O arquivo Ogg Vorbis \"%s\" contém uma etiqueta ID3v2."
 
-#: ../src/ogg_tag.c:1035 ../src/picture.c:1257
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1258
 #, c-format
 msgid "Error with 'loader_write': %s"
 msgstr "Erro com \"loader_write\": %s"
 
-#: ../src/ogg_tag.c:1050 ../src/picture.c:1180
+#: ../src/ogg_tag.c:1050 ../src/picture.c:1181
 #, c-format
 msgid "Error with 'loader_close': %s"
 msgstr "Erro com \"loader_close\": %s"
@@ -3111,11 +3112,11 @@ msgstr "Arquivo de imagem carregado"
 msgid "Add Images"
 msgstr "Adicionar imagens"
 
-#: ../src/picture.c:514 ../src/picture.c:874
+#: ../src/picture.c:514 ../src/picture.c:875
 msgid "All Files"
 msgstr "Todos os Arquivos"
 
-#: ../src/picture.c:520 ../src/picture.c:880
+#: ../src/picture.c:520 ../src/picture.c:881
 msgid "PNG and JPEG"
 msgstr "PNG e JPEG"
 
@@ -3124,129 +3125,129 @@ msgstr "PNG e JPEG"
 msgid "Image Properties %d/%d"
 msgstr "Propriedades da imagem %d/%d"
 
-#: ../src/picture.c:675
+#: ../src/picture.c:677
 msgid "Image Type"
 msgstr "Tipo de imagem"
 
 #. Description of the picture
-#: ../src/picture.c:734
+#: ../src/picture.c:735
 msgid "Image Description:"
 msgstr "Descrição de imagem:"
 
-#: ../src/picture.c:861
+#: ../src/picture.c:862
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Salvar imagem %d/%d"
 
-#: ../src/picture.c:1021
+#: ../src/picture.c:1022
 msgid "JPEG image"
 msgstr "Imagem JPEG"
 
-#: ../src/picture.c:1023
+#: ../src/picture.c:1024
 msgid "PNG image"
 msgstr "Imagem PNG"
 
-#: ../src/picture.c:1025
+#: ../src/picture.c:1026
 msgid "GIF image"
 msgstr "Imagem GIF"
 
-#: ../src/picture.c:1027
+#: ../src/picture.c:1028
 msgid "Unknown image"
 msgstr "Imagem desconhecida"
 
-#: ../src/picture.c:1039
+#: ../src/picture.c:1040
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32 pixels: ícone de arquivo PNG"
 
-#: ../src/picture.c:1041
+#: ../src/picture.c:1042
 msgid "Other file icon"
 msgstr "Outro ícone de arquivo"
 
-#: ../src/picture.c:1043
+#: ../src/picture.c:1044
 msgid "Cover (front)"
 msgstr "Capa (frente)"
 
-#: ../src/picture.c:1045
+#: ../src/picture.c:1046
 msgid "Cover (back)"
 msgstr "Capa (atrás)"
 
-#: ../src/picture.c:1047
+#: ../src/picture.c:1048
 msgid "Leaflet page"
 msgstr "Página do folheto"
 
-#: ../src/picture.c:1049
+#: ../src/picture.c:1050
 msgid "Media (e.g. label side of CD)"
 msgstr "Mídia (ex.: lado do rótulo do CD)"
 
-#: ../src/picture.c:1051
+#: ../src/picture.c:1052
 msgid "Lead artist/lead performer/soloist"
 msgstr "Artista principal/músico principal/solista"
 
-#: ../src/picture.c:1053
+#: ../src/picture.c:1054
 msgid "Artist/performer"
 msgstr "Artista/músico"
 
-#: ../src/picture.c:1055
+#: ../src/picture.c:1056
 msgid "Conductor"
 msgstr "Maestro"
 
-#: ../src/picture.c:1057
+#: ../src/picture.c:1058
 msgid "Band/Orchestra"
 msgstr "Banda/orquestra"
 
-#: ../src/picture.c:1061
+#: ../src/picture.c:1062
 msgid "Lyricist/text writer"
 msgstr "Letrista/escritor"
 
-#: ../src/picture.c:1063
+#: ../src/picture.c:1064
 msgid "Recording location"
 msgstr "Local da gravação"
 
-#: ../src/picture.c:1065
+#: ../src/picture.c:1066
 msgid "During recording"
 msgstr "Duração da gravação"
 
-#: ../src/picture.c:1067
+#: ../src/picture.c:1068
 msgid "During performance"
 msgstr "Duração da performance"
 
-#: ../src/picture.c:1069
+#: ../src/picture.c:1070
 msgid "Movie/video screen capture"
 msgstr "Captura de tela de filme/vídeo"
 
-#: ../src/picture.c:1071
+#: ../src/picture.c:1072
 msgid "A bright colored fish"
 msgstr "Um peixe de cores fortes"
 
-#: ../src/picture.c:1073
+#: ../src/picture.c:1074
 msgid "Illustration"
 msgstr "Ilustração"
 
-#: ../src/picture.c:1075
+#: ../src/picture.c:1076
 msgid "Band/Artist logotype"
 msgstr "Logotipo da banda/artista"
 
-#: ../src/picture.c:1077
+#: ../src/picture.c:1078
 msgid "Publisher/studio logotype"
 msgstr "Logotipo do distribuidor/estúdio"
 
-#: ../src/picture.c:1081
+#: ../src/picture.c:1082
 msgid "Unknown image type"
 msgstr "Tipo de imagem desconhecida"
 
-#: ../src/picture.c:1111 ../src/picture.c:1122
+#: ../src/picture.c:1112 ../src/picture.c:1123
 msgid "pixels"
 msgstr "pixels"
 
-#: ../src/picture.c:1112 ../src/picture.c:1123
+#: ../src/picture.c:1113 ../src/picture.c:1124
 msgid "Type"
 msgstr "Tipo"
 
-#: ../src/picture.c:1124
+#: ../src/picture.c:1125
 msgid "Description"
 msgstr "Descrição"
 
-#: ../src/picture.c:1240
+#: ../src/picture.c:1241
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
@@ -3254,17 +3255,17 @@ 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:1247
+#: ../src/picture.c:1248
 msgid "Cannot display the image"
 msgstr "Não foi possível exibir a imagem"
 
-#: ../src/picture.c:1249
+#: ../src/picture.c:1250
 msgid ""
 "Not enough data has been read to determine how to create the image buffer."
 msgstr ""
 "Dados lidos insuficientes para determinar como criar o buffer de imagem."
 
-#: ../src/picture.c:1251
+#: ../src/picture.c:1252
 msgid "Load Image File"
 msgstr "Carregar arquivo de imagem"
 
@@ -4246,16 +4247,17 @@ msgstr "Nome do usuário do servidor proxy."
 msgid "User Password:"
 msgstr "Senha do usuário:"
 
-#: ../src/prefs.c:1337
-msgid "Password of user for the the proxy server."
-msgstr "Senha do usuário para o servidor proxy."
+#: ../src/prefs.c:1338
+#| msgid "Password of user for the the proxy server."
+msgid "Password of user for the proxy server."
+msgstr "A senha do usuário para o servidor proxy."
 
 #. Track Name list (CDDB results)
-#: ../src/prefs.c:1342
+#: ../src/prefs.c:1343
 msgid "Track Name List"
 msgstr "Lista do nome da faixa"
 
-#: ../src/prefs.c:1349
+#: ../src/prefs.c:1350
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4263,7 +4265,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:1354
 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."
@@ -4272,7 +4274,7 @@ msgstr ""
 "de áudio 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:1359
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4283,15 +4285,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: ../src/prefs.c:1373
+#: ../src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Confirmação"
 
-#: ../src/prefs.c:1378
+#: ../src/prefs.c:1379
 msgid "Confirm exit from program"
 msgstr "Confirmar ao sair do programa"
 
-#: ../src/prefs.c:1381
+#: ../src/prefs.c:1382
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4299,51 +4301,51 @@ msgstr ""
 "Se ativada, abre uma caixa de diálogo para pedir confirmação antes de fechar "
 "o programa."
 
-#: ../src/prefs.c:1384
+#: ../src/prefs.c:1385
 msgid "Confirm writing of file tag"
 msgstr "Confirmar a gravação da etiqueta no arquivo"
 
-#: ../src/prefs.c:1388
+#: ../src/prefs.c:1389
 msgid "Confirm renaming of file"
 msgstr "Confirmar a renomeação do arquivo"
 
-#: ../src/prefs.c:1392
+#: ../src/prefs.c:1393
 msgid "Confirm deleting of file"
 msgstr "Confirmar a exclusão do arquivo"
 
-#: ../src/prefs.c:1396
+#: ../src/prefs.c:1397
 msgid "Confirm writing of playlist"
 msgstr "Confirmar a gravação da lista de reprodução"
 
-#: ../src/prefs.c:1400
+#: ../src/prefs.c:1401
 msgid "Confirm changing directory when there are unsaved changes"
 msgstr "Confirmar a alteração do diretório quando há alterações não salvas"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: ../src/prefs.c:1438
+#: ../src/prefs.c:1439
 #, c-format
 msgid "(Example: %.*d_-_Track_name_1.mp3)"
 msgstr "(Exemplo: %.*d_-_Nome_da_faixa_1.mp3)"
 
 #. Translators: please do NOT translate '%.*d' in this string.
-#: ../src/prefs.c:1471
+#: ../src/prefs.c:1472
 #, c-format
 msgid "(Example: disc_%.*d_of_10/Track_name_1.mp3)"
 msgstr "(Exemplo: disco_%.*d_of_10/Nome_da_faixa_1.mp3)"
 
-#: ../src/prefs.c:1613 ../src/setting.c:904
+#: ../src/prefs.c:1614 ../src/setting.c:904
 msgid "Configuration saved"
 msgstr "Configuração salva"
 
-#: ../src/prefs.c:1621
+#: ../src/prefs.c:1622
 msgid "Configuration unchanged"
 msgstr "Configuração inalterada"
 
-#: ../src/prefs.c:1712
+#: ../src/prefs.c:1713
 msgid "The selected path for 'Default path to files' is invalid"
 msgstr "O caminho selecionado para \"Caminho padrão para arquivos\" é inválido"
 
-#: ../src/prefs.c:1714
+#: ../src/prefs.c:1715
 #, c-format
 msgid ""
 "Path: '%s'\n"
@@ -4352,97 +4354,97 @@ msgstr ""
 "Caminho: \"%s\"\n"
 "Erro: %s"
 
-#: ../src/prefs.c:1716
+#: ../src/prefs.c:1717
 msgid "Invalid Path Error"
 msgstr "Erro de caminho inválido"
 
-#: ../src/prefs.c:1830
+#: ../src/prefs.c:1831
 #, c-format
 msgid "The audio file player '%s' cannot be found"
 msgstr "O reprodutor de arquivo de áudio \"%s\" não pode ser encontrado"
 
-#: ../src/prefs.c:1832
+#: ../src/prefs.c:1833
 msgid "Audio Player Error"
 msgstr "Erro no reprodutor de áudio"
 
-#: ../src/scan.c:180
+#: ../src/scan_dialog.c:182
 msgid "Fill Tag"
 msgstr "Preencher etiqueta"
 
-#: ../src/scan.c:358
+#: ../src/scan_dialog.c:356
 #, c-format
 msgid "Cannot calculate CRC value of file (%s)"
 msgstr "Não foi possível calcular o valor do CRC do arquivo (%s)"
 
-#: ../src/scan.c:373
+#: ../src/scan_dialog.c:371
 msgid "Tag successfully scanned"
 msgstr "Etiqueta verificada com sucesso"
 
-#: ../src/scan.c:375
+#: ../src/scan_dialog.c:373
 #, c-format
 msgid "Tag successfully scanned: %s"
 msgstr "Etiqueta verificada com sucesso: %s"
 
-#: ../src/scan.c:416
+#: ../src/scan_dialog.c:414
 #, c-format
 msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
 msgstr ""
 "Verificador de etiqueta: estranho… a extensão \"%s\" não foi encontrada no "
 "nome de arquivo \"%s\""
 
-#: ../src/scan.c:498 ../src/scan.c:527
+#: ../src/scan_dialog.c:496 ../src/scan_dialog.c:525
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr ""
 "Erro de verificação: não foi possível localizador o separador \"%s\" dentro "
 "de \"%s\""
 
-#: ../src/scan.c:714
+#: ../src/scan_dialog.c:712
 msgid "New filename successfully scanned"
 msgstr "Novo nome do arquivo verificado com sucesso"
 
-#: ../src/scan.c:717
+#: ../src/scan_dialog.c:715
 #, c-format
 msgid "New filename successfully scanned: %s"
 msgstr "Novo nome do arquivo verificado com sucesso: %s"
 
-#: ../src/scan.c:1821
+#: ../src/scan_dialog.c:1628
 #, c-format
 msgid "Error while processing fields: %s"
 msgstr "Erro ao processar os campos: %s"
 
 #. The window
-#: ../src/scan.c:2328
+#: ../src/scan_dialog.c:1798
 msgid "Tag and Filename Scan"
 msgstr "Verificação da etiqueta e do nome do arquivo"
 
 #. TODO: Set related action to match AM_SCAN_FILES.
-#: ../src/scan.c:2337
+#: ../src/scan_dialog.c:1807
 msgid "Scan Files"
 msgstr "Verificar arquivos"
 
 #. Option Menu
-#: ../src/scan.c:2365
+#: ../src/scan_dialog.c:1835
 msgid "Scanner:"
 msgstr "Verificador:"
 
-#: ../src/scan.c:2386
+#: ../src/scan_dialog.c:1856
 msgid "Select the type of scanner to use"
 msgstr "Seleciona o tipo do verificador a ser usado"
 
-#: ../src/scan.c:2395
+#: ../src/scan_dialog.c:1865
 msgid "Scanner Preferences"
 msgstr "Preferências do verificador"
 
-#: ../src/scan.c:2404
+#: ../src/scan_dialog.c:1874
 msgid "Show / Hide Masks Editor"
 msgstr "Mostra / oculta o editor de máscaras"
 
-#: ../src/scan.c:2414
+#: ../src/scan_dialog.c:1884
 msgid "Show / Hide Legend"
 msgstr "Mostra / oculta legendas"
 
-#: ../src/scan.c:2444
+#: ../src/scan_dialog.c:1914
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse filename and "
 "path. Used to fill in tag fields"
@@ -4451,15 +4453,15 @@ msgstr ""
 "o nome do arquivo e o caminho. Usado para preencher campos das etiquetas"
 
 #. Preview label
-#: ../src/scan.c:2468
+#: ../src/scan_dialog.c:1938
 msgid "Fill tag preview"
 msgstr "Visualização do preenchimento da etiqueta"
 
-#: ../src/scan.c:2498
+#: ../src/scan_dialog.c:1968
 msgid "Prefix mask with current path"
 msgstr "Prefixa a máscara no caminho atual"
 
-#: ../src/scan.c:2512
+#: ../src/scan_dialog.c:1982
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4472,15 +4474,15 @@ msgstr ""
 "absoluto, caso contrário é relativo ao caminho anterior."
 
 #. Preview label
-#: ../src/scan.c:2537
+#: ../src/scan_dialog.c:2007
 msgid "Rename file preview"
 msgstr "Visualização da renomeação do arquivo"
 
-#: ../src/scan.c:2556
+#: ../src/scan_dialog.c:2026
 msgid "Select fields:"
 msgstr "Campos selecionados:"
 
-#: ../src/scan.c:2559
+#: ../src/scan_dialog.c:2029
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those which interest you"
@@ -4489,134 +4491,134 @@ msgstr ""
 "Selecione aqueles que lhe interessam."
 
 #. Advice for Translators: set the first letter of filename translated
-#: ../src/scan.c:2563
+#: ../src/scan_dialog.c:2033
 msgid "F"
 msgstr "A"
 
-#: ../src/scan.c:2565
+#: ../src/scan_dialog.c:2035
 msgid "Process filename field"
 msgstr "Processar o campo do nome do arquivo"
 
 #. Advice for Translators: set the first letter of title translated
-#: ../src/scan.c:2567
+#: ../src/scan_dialog.c:2037
 msgid "T"
 msgstr "T"
 
-#: ../src/scan.c:2568
+#: ../src/scan_dialog.c:2038
 msgid "Process title field"
 msgstr "Processar o campo do título"
 
 #. Advice for Translators: set the first letter of artist translated
-#: ../src/scan.c:2570
+#: ../src/scan_dialog.c:2040
 msgid "Ar"
 msgstr "Ar"
 
-#: ../src/scan.c:2571
+#: ../src/scan_dialog.c:2041
 msgid "Process file artist field"
 msgstr "Processar o campo do artista"
 
 #. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan.c:2573
+#: ../src/scan_dialog.c:2043
 msgid "AA"
 msgstr "AA"
 
-#: ../src/scan.c:2574
+#: ../src/scan_dialog.c:2044
 msgid "Process album artist field"
 msgstr "Processar o campo do artista do álbum"
 
 #. Advice for Translators: set the first letter of album translated
-#: ../src/scan.c:2576
+#: ../src/scan_dialog.c:2046
 msgid "Al"
 msgstr "Al"
 
-#: ../src/scan.c:2577
+#: ../src/scan_dialog.c:2047
 msgid "Process album field"
 msgstr "Processar o campo do álbum"
 
 #. Advice for Translators: set the first letter of genre translated
-#: ../src/scan.c:2579
+#: ../src/scan_dialog.c:2049
 msgid "G"
 msgstr "G"
 
-#: ../src/scan.c:2580
+#: ../src/scan_dialog.c:2050
 msgid "Process genre field"
 msgstr "Processar o campo do gênero"
 
 #. Advice for Translators: set the first letter of comment translated
-#: ../src/scan.c:2582
+#: ../src/scan_dialog.c:2052
 msgid "Cm"
 msgstr "Cm"
 
-#: ../src/scan.c:2583
+#: ../src/scan_dialog.c:2053
 msgid "Process comment field"
 msgstr "Processar o campo do comentário"
 
 #. Advice for Translators: set the first letter of composer translated
-#: ../src/scan.c:2585
+#: ../src/scan_dialog.c:2055
 msgid "Cp"
 msgstr "Cp"
 
-#: ../src/scan.c:2586
+#: ../src/scan_dialog.c:2056
 msgid "Process composer field"
 msgstr "Processar o campo do compositor"
 
 #. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan.c:2588
+#: ../src/scan_dialog.c:2058
 msgid "O"
 msgstr "A"
 
-#: ../src/scan.c:2589
+#: ../src/scan_dialog.c:2059
 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:2591
+#: ../src/scan_dialog.c:2061
 msgid "Cr"
 msgstr "Cr"
 
-#: ../src/scan.c:2592
+#: ../src/scan_dialog.c:2062
 msgid "Process copyright field"
 msgstr "Processar o campo de copyright"
 
 #. Advice for Translators: set the first letter of URL translated
-#: ../src/scan.c:2594
+#: ../src/scan_dialog.c:2064
 msgid "U"
 msgstr "U"
 
-#: ../src/scan.c:2595
+#: ../src/scan_dialog.c:2065
 msgid "Process URL field"
 msgstr "Processar o campo da URL"
 
 #. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan.c:2597
+#: ../src/scan_dialog.c:2067
 msgid "E"
 msgstr "C"
 
-#: ../src/scan.c:2598
+#: ../src/scan_dialog.c:2068
 msgid "Process encoder name field"
 msgstr "Processar o campo do nome do codificador"
 
-#: ../src/scan.c:2642
+#: ../src/scan_dialog.c:2112
 msgid "Invert selection"
 msgstr "Inverter seleção"
 
-#: ../src/scan.c:2649
+#: ../src/scan_dialog.c:2119
 msgid "Select/Unselect all"
 msgstr "Selecionar/Desmarcar todos"
 
-#: ../src/scan.c:2664
+#: ../src/scan_dialog.c:2134
 msgid "Convert:"
 msgstr "Converter:"
 
-#: ../src/scan.c:2666
+#: ../src/scan_dialog.c:2136
 msgid "to: "
 msgstr "para: "
 
-#: ../src/scan.c:2673
+#: ../src/scan_dialog.c:2143
 msgid "Do not convert"
 msgstr "Não converter"
 
-#: ../src/scan.c:2692
+#: ../src/scan_dialog.c:2162
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4625,7 +4627,7 @@ msgstr ""
 "Por exemplo, antes: \"Texto%20Em%20Uma_Entrada\", após: \"Texto em uma "
 "entrada\"."
 
-#: ../src/scan.c:2695
+#: ../src/scan_dialog.c:2165
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4633,7 +4635,7 @@ msgstr ""
 "O caractere de espaço é substituído por um caractere de sublinhado. Por "
 "exemplo, antes: \"Texto em uma entrada\", após: \"Texto_Em_Uma_Entrada\"."
 
-#: ../src/scan.c:2698
+#: ../src/scan_dialog.c:2168
 msgid ""
 "Replace a string by another one. Note that the search is case sensitive."
 msgstr ""
@@ -4641,31 +4643,31 @@ msgstr ""
 "minúsculo."
 
 # Caixa alta?
-#: ../src/scan.c:2705
+#: ../src/scan_dialog.c:2175
 msgid "Capitalize all"
 msgstr "Tudo em maiúsculo"
 
-#: ../src/scan.c:2707
+#: ../src/scan_dialog.c:2177
 msgid "Lowercase all"
 msgstr "Tudo em minúsculo"
 
-#: ../src/scan.c:2709
+#: ../src/scan_dialog.c:2179
 msgid "Capitalize first letter"
 msgstr "Primeira letra em maiúsculo"
 
-#: ../src/scan.c:2711
+#: ../src/scan_dialog.c:2181
 msgid "Capitalize the first letter of each word"
 msgstr "Primeira letra de cada palavra em maiúsculo"
 
-#: ../src/scan.c:2712
+#: ../src/scan_dialog.c:2182
 msgid "Detect Roman numerals"
 msgstr "Detectar numerais romano"
 
-#: ../src/scan.c:2714
+#: ../src/scan_dialog.c:2184
 msgid "Do not change capitalization"
 msgstr "Não alterar maiúsculo/minúsculo"
 
-#: ../src/scan.c:2736
+#: ../src/scan_dialog.c:2206
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4673,7 +4675,7 @@ msgstr ""
 "Converte todas as palavras em todos os campos para maiúsculas. Por exemplo, "
 "antes: \"Texto EM UMA entrada\", após: \"TEXTO EM UMA ENTRADA\"."
 
-#: ../src/scan.c:2739
+#: ../src/scan_dialog.c:2209
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4681,7 +4683,7 @@ msgstr ""
 "Converte todas as palavras em todos os campos para minúsculas. Por exemplo, "
 "antes: \"TEXTO EM uma entrada\", após: \"texto em uma entrada\"."
 
-#: ../src/scan.c:2742
+#: ../src/scan_dialog.c:2212
 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 +4692,7 @@ msgstr ""
 "campos. Por exemplo, antes: \"Texto EM Uma ENTRADA\", após: \"Texto em uma "
 "entrada\"."
 
-#: ../src/scan.c:2745
+#: ../src/scan_dialog.c:2215
 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,7 +4700,7 @@ msgstr ""
 "Converte a letra inicial de cada palavra para maiúscula, em todos os campos. "
 "Por exemplo, antes: \"Texto em uma ENTRADA\", após: \"Texto Em Uma Entrada\"."
 
-#: ../src/scan.c:2748
+#: ../src/scan_dialog.c:2218
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -4706,19 +4708,19 @@ msgstr ""
 "Forçar conversão para maiúsculo de numerais romanos. Por exemplo, antes: "
 "\"ix. texto em uma entrada\", após: \"IX. Texto Em Uma Entrada\"."
 
-#: ../src/scan.c:2756
+#: ../src/scan_dialog.c:2226
 msgid "Insert a space before uppercase letters"
 msgstr "Inserir um espaço antes das letras maiúsculas"
 
-#: ../src/scan.c:2758
+#: ../src/scan_dialog.c:2228
 msgid "Remove duplicate spaces and underscores"
 msgstr "Remover sublinhados e espaços duplicados"
 
-#: ../src/scan.c:2760
+#: ../src/scan_dialog.c:2230
 msgid "Do not change word separators"
 msgstr "Não alterar seperadores de palavras"
 
-#: ../src/scan.c:2774
+#: ../src/scan_dialog.c:2244
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4726,7 +4728,7 @@ msgstr ""
 "Todos os espaços entre palavras são removidos. Por exemplo, antes: \"Texto "
 "Em Uma Entrada\", após: \"TextoEmUmaEntrada\"."
 
-#: ../src/scan.c:2777
+#: ../src/scan_dialog.c:2247
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4734,7 +4736,7 @@ msgstr ""
 "Um espaço é inserido antes de cada letra maiúscula. Por exemplo, antes: "
 "'TextoEmUmaEntrada', depois: 'Texto Em Uma Entrada'."
 
-#: ../src/scan.c:2780
+#: ../src/scan_dialog.c:2250
 msgid ""
 "Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4745,141 +4747,141 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2787
+#: ../src/scan_dialog.c:2257
 msgid "Legend"
 msgstr "Legenda"
 
-#: ../src/scan.c:2793
+#: ../src/scan_dialog.c:2263
 #, c-format
 msgid "%a: artist"
 msgstr "%a: artista"
 
-#: ../src/scan.c:2796
+#: ../src/scan_dialog.c:2266
 msgid "%z: album artist"
 msgstr "%z: artista do álbum"
 
-#: ../src/scan.c:2799
+#: ../src/scan_dialog.c:2269
 msgid "%b: album"
 msgstr "%b: álbum"
 
-#: ../src/scan.c:2802
+#: ../src/scan_dialog.c:2272
 #, c-format
 msgid "%c: comment"
 msgstr "%c: comentário"
 
-#: ../src/scan.c:2805
+#: ../src/scan_dialog.c:2275
 #, c-format
 msgid "%p: composer"
 msgstr "%p: compositor"
 
-#: ../src/scan.c:2808
+#: ../src/scan_dialog.c:2278
 msgid "%r: copyright"
 msgstr "%r: copyright"
 
-#: ../src/scan.c:2811
+#: ../src/scan_dialog.c:2281
 #, c-format
 msgid "%d: disc number"
 msgstr "%d: número do disco"
 
-#: ../src/scan.c:2814
+#: ../src/scan_dialog.c:2284
 #, c-format
 msgid "%e: encoded by"
 msgstr "%e: codificado por"
 
-#: ../src/scan.c:2817
+#: ../src/scan_dialog.c:2287
 #, c-format
 msgid "%g: genre"
 msgstr "%g: gênero"
 
-#: ../src/scan.c:2820
+#: ../src/scan_dialog.c:2290
 #, c-format
 msgid "%i: ignored"
 msgstr "%i: ignorado"
 
-#: ../src/scan.c:2823
+#: ../src/scan_dialog.c:2293
 msgid "%l: number of tracks"
 msgstr "%l: número de faixas"
 
-#: ../src/scan.c:2826
+#: ../src/scan_dialog.c:2296
 #, c-format
 msgid "%o: orig. artist"
 msgstr "%o: artista orig."
 
-#: ../src/scan.c:2829
+#: ../src/scan_dialog.c:2299
 #, c-format
 msgid "%n: track"
 msgstr "%n: faixa"
 
-#: ../src/scan.c:2832
+#: ../src/scan_dialog.c:2302
 msgid "%t: title"
 msgstr "%t: título"
 
-#: ../src/scan.c:2835
+#: ../src/scan_dialog.c:2305
 #, c-format
 msgid "%u: URL"
 msgstr "%u: URL"
 
-#: ../src/scan.c:2838
+#: ../src/scan_dialog.c:2308
 #, c-format
 msgid "%x: number of discs"
 msgstr "%x: número de discos"
 
-#: ../src/scan.c:2841
+#: ../src/scan_dialog.c:2311
 msgid "%y: year"
 msgstr "%y: ano"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2848
+#: ../src/scan_dialog.c:2318
 msgid "Mask Editor"
 msgstr "Editor de máscara"
 
-#: ../src/scan.c:2902
+#: ../src/scan_dialog.c:2372
 msgid "Create New Mask"
 msgstr "Criar nova máscara"
 
-#: ../src/scan.c:2912
+#: ../src/scan_dialog.c:2382
 msgid "Move Up this Mask"
 msgstr "Mover essa máscara para cima"
 
-#: ../src/scan.c:2922
+#: ../src/scan_dialog.c:2392
 msgid "Move Down this Mask"
 msgstr "Mover essa máscara para baixo"
 
-#: ../src/scan.c:2932
+#: ../src/scan_dialog.c:2402
 msgid "Duplicate Mask"
 msgstr "Duplicar máscara"
 
-#: ../src/scan.c:2942
+#: ../src/scan_dialog.c:2412
 msgid "Add Default Masks"
 msgstr "Adicionar máscaras padrão"
 
-#: ../src/scan.c:2952
+#: ../src/scan_dialog.c:2422
 msgid "Remove Mask"
 msgstr "Remover máscara"
 
-#: ../src/scan.c:2962
+#: ../src/scan_dialog.c:2432
 msgid "Save Masks"
 msgstr "Salvar máscaras"
 
-#: ../src/scan.c:3542
+#: ../src/scan_dialog.c:3012
 msgid "New_mask"
 msgstr "Nova_máscara"
 
-#: ../src/scan.c:3581
+#: ../src/scan_dialog.c:3051
 msgid "Copy: No row selected"
 msgstr "Copiar: Nenhuma linha selecionada"
 
-#: ../src/scan.c:3674
+#: ../src/scan_dialog.c:3144
 msgid "Remove: No row selected"
 msgstr "Remover: Nenhuma linha selecionada"
 
-#: ../src/scan.c:3721
+#: ../src/scan_dialog.c:3191
 msgid "Move Up: No row selected"
 msgstr "Mover para cima: Nenhuma linha selecionada"
 
-#: ../src/scan.c:3765
+#: ../src/scan_dialog.c:3235
 msgid "Move Down: No row selected"
 msgstr "Mover para baixo: Nenhuma linha selecionada"
 
diff --git a/po/sl.po b/po/sl.po
index 31eb704..d414e15 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: easytag master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=easytag&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-12-18 15:58+0000\n"
-"PO-Revision-Date: 2014-01-03 22:21+0100\n"
+"POT-Creation-Date: 2014-04-12 15:20+0000\n"
+"PO-Revision-Date: 2014-04-12 18:57+0100\n"
 "Last-Translator: Matej Urbančič <mateju at svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si at googlegroups.com>\n"
 "Language: sl_SI\n"
@@ -23,6 +23,24 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Generator: Poedit 1.5.4\n"
 
+#: ../data/easytag.appdata.xml.in.h:1
+msgid ""
+"View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg "
+"Vorbis, MusePack, Monkey's Audio and WavPack files."
+msgstr ""
+
+#: ../data/easytag.appdata.xml.in.h:2
+msgid ""
+"Look up albums in online databases, bulk edit tags, create playlists and "
+"rename a collection of files."
+msgstr ""
+
+#: ../data/easytag.appdata.xml.in.h:3
+msgid ""
+"A simple and nice GTK+ interface makes tagging easier under GNU/Linux and "
+"Windows."
+msgstr "Enostaven in pregleden vmesnik GTK+, ki omogoča enostavno označevanje."
+
 #: ../data/easytag.desktop.in.h:1
 msgid "Sound File Metadata Editor"
 msgstr "Urejevalnik metapodatkov zvočnih datotek"
@@ -36,7 +54,7 @@ msgstr "Urejanje metapodatkov zvočnih datotek"
 msgid "mp3;tag;audio;"
 msgstr "mp3;oznake;tag;zvok;skladbe;"
 
-#: ../src/about.c:91
+#: ../src/about.c:89
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -65,17 +83,18 @@ msgstr ""
 "www.gnu.org/licenses/>."
 
 #. Translators: put your own name here to appear in the about dialog.
-#: ../src/about.c:108
+#: ../src/about.c:106
 msgid "translator-credits"
 msgstr "Matej Urbančič <matej.urban at svn.gnome.org>"
 
-#: ../src/about.c:118
+#: ../src/about.c:116
 msgid "View and edit tags in audio files"
 msgstr "Oglejte si in urejajte oznake zvočnih datotek"
 
-#. g_print(_("Error while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: ../src/ape_tag.c:61 ../src/id3v24_tag.c:112 ../src/mp4_header.c:63
-#: ../src/mp4_tag.c:65 ../src/mp4_tag.c:186
+#: ../src/ape_tag.c:61 ../src/id3v24_tag.c:112 ../src/mp4_header.cc:46
+#: ../src/mp4_header.cc:59 ../src/mp4_tag.cc:69 ../src/mp4_tag.cc:85
+#: ../src/mp4_tag.cc:90 ../src/mp4_tag.cc:262 ../src/mp4_tag.cc:278
+#: ../src/mp4_tag.cc:283
 #, c-format
 msgid "Error while opening file: '%s' (%s)."
 msgstr "Napaka med odpiranjem datoteke: '%s' (%s)."
@@ -96,729 +115,737 @@ msgstr "- označevanje in preimenovanje zvočnih datotek"
 #.
 #. * Main Menu Actions
 #.
-#: ../src/bar.c:154
+#: ../src/bar.c:155
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../src/bar.c:155
+#: ../src/bar.c:156
 msgid "Sort List by Tag"
 msgstr "Razvrsti seznam po oznakah"
 
-#: ../src/bar.c:158
+#: ../src/bar.c:159
 msgid "Sort List by Property"
 msgstr "Razvrsti seznam po lastnostih"
 
-#: ../src/bar.c:159
+#: ../src/bar.c:160
 msgid "Ascending by filename"
 msgstr "Razvrsti po imenu datoteke (naraščajoče)"
 
-#: ../src/bar.c:160
+#: ../src/bar.c:161
 msgid "Descending by filename"
 msgstr "Razvrsti po imenu datoteke (padajoče)"
 
-#: ../src/bar.c:161
+#: ../src/bar.c:162
 msgid "Ascending by creation date"
 msgstr "Razvrsti po datumu ustvarjanja (naraščajoče)"
 
-#: ../src/bar.c:162
+#: ../src/bar.c:163
 msgid "Descending by creation date"
 msgstr "Razvrsti po datumu ustvarjanja (padajoče)"
 
-#: ../src/bar.c:163
+#: ../src/bar.c:164
 msgid "Ascending by track number"
 msgstr "Naraščajoče po vrstnem redu sledi"
 
-#: ../src/bar.c:164
+#: ../src/bar.c:165
 msgid "Descending by track number"
 msgstr "Padajoče po vrstnem redu sledi"
 
-#: ../src/bar.c:165
+#: ../src/bar.c:166
 msgid "Ascending by title"
 msgstr "Naraščajoče po naslovu"
 
-#: ../src/bar.c:166
+#: ../src/bar.c:167
 msgid "Descending by title"
 msgstr "Padajoče po naslovu"
 
-#: ../src/bar.c:167
+#: ../src/bar.c:168
 msgid "Ascending by artist"
 msgstr "Naraščajoče po izvajalcu"
 
-#: ../src/bar.c:168
+#: ../src/bar.c:169
 msgid "Descending by artist"
 msgstr "Padajoče po izvajalcu"
 
-#: ../src/bar.c:169
+#: ../src/bar.c:170
 msgid "Ascending by album artist"
 msgstr "Naraščajoče po izvajalcu albuma"
 
-#: ../src/bar.c:170
+#: ../src/bar.c:171
 msgid "Descending by album artist"
 msgstr "Padajoče po izvajalcu albuma"
 
-#: ../src/bar.c:171
+#: ../src/bar.c:172
 msgid "Ascending by album"
 msgstr "Naraščajoče po albumu"
 
-#: ../src/bar.c:172
+#: ../src/bar.c:173
 msgid "Descending by album"
 msgstr "Padajoče po albumu"
 
-#: ../src/bar.c:173
+#: ../src/bar.c:174
 msgid "Ascending by year"
 msgstr "Naraščajoče po letu izida"
 
-#: ../src/bar.c:174
+#: ../src/bar.c:175
 msgid "Descending by year"
 msgstr "Padajoče po letu izida"
 
-#: ../src/bar.c:175
+#: ../src/bar.c:176
 msgid "Ascending by genre"
 msgstr "Naraščajoče po zvrsti"
 
-#: ../src/bar.c:176
+#: ../src/bar.c:177
 msgid "Descending by genre"
 msgstr "Padajoče po zvrsti"
 
-#: ../src/bar.c:177
+#: ../src/bar.c:178
 msgid "Ascending by comment"
 msgstr "Naraščajoče po opombah"
 
-#: ../src/bar.c:178
+#: ../src/bar.c:179
 msgid "Descending by comment"
 msgstr "Padajoče po opombah"
 
-#: ../src/bar.c:179
+#: ../src/bar.c:180
 msgid "Ascending by composer"
 msgstr "naraščajoče po skladatelju"
 
-#: ../src/bar.c:180
+#: ../src/bar.c:181
 msgid "Descending by composer"
 msgstr "padajoče po skladatelju"
 
-#: ../src/bar.c:181
+#: ../src/bar.c:182
 msgid "Ascending by original artist"
 msgstr "naraščajoče po izvirnem izvajalcu"
 
-#: ../src/bar.c:182
+#: ../src/bar.c:183
 msgid "Descending by original artist"
 msgstr "padajoče po izvirnem izvajalcu"
 
-#: ../src/bar.c:183
+#: ../src/bar.c:184
 msgid "Ascending by copyright"
 msgstr "Naraščajoče po avtorskih pravicah"
 
-#: ../src/bar.c:184
+#: ../src/bar.c:185
 msgid "Descending by copyright"
 msgstr "Padajoče po avtorskih pravicah"
 
-#: ../src/bar.c:185
+#: ../src/bar.c:186
 msgid "Ascending by URL"
 msgstr "Naraščajoče po naslovu URL"
 
-#: ../src/bar.c:186
+#: ../src/bar.c:187
 msgid "Descending by URL"
 msgstr "Padajoče po naslovu URL"
 
 #. Translators: the encoder name is supposed to be the name of a person
 #. * or organisation, but can sometimes be the name of an application.
-#: ../src/bar.c:189
+#: ../src/bar.c:190
 msgid "Ascending by encoder name"
 msgstr "naraščajoče po imenu kodirnika"
 
 #. Translators: the encoder name is supposed to be the name of a person
 #. * or organisation, but can sometimes be the name of an application.
-#: ../src/bar.c:192
+#: ../src/bar.c:193
 msgid "Descending by encoder name"
 msgstr "padajoče po imenu kodirnika"
 
-#: ../src/bar.c:193
+#: ../src/bar.c:194
 msgid "Ascending by file type"
 msgstr "Naraščajoče po vrsti datoteke"
 
-#: ../src/bar.c:194
+#: ../src/bar.c:195
 msgid "Descending by file type"
 msgstr "Padajoče po vrsti datoteke"
 
-#: ../src/bar.c:195
+#: ../src/bar.c:196
 msgid "Ascending by file size"
 msgstr "Naraščajoče po velikosti datoteke"
 
-#: ../src/bar.c:196
+#: ../src/bar.c:197
 msgid "Descending by file size"
 msgstr "Padajoče po velikosti datoteke"
 
-#: ../src/bar.c:197
+#: ../src/bar.c:198
 msgid "Ascending by duration"
 msgstr "Naraščajoče po trajanju"
 
-#: ../src/bar.c:198
+#: ../src/bar.c:199
 msgid "Descending by duration"
 msgstr "Padajoče po trajanju"
 
-#: ../src/bar.c:199
+#: ../src/bar.c:200
 msgid "Ascending by bitrate"
 msgstr "Naraščajoče po bitni hitrosti"
 
-#: ../src/bar.c:200
+#: ../src/bar.c:201
 msgid "Descending by bitrate"
 msgstr "Padajoče po bitni hitrosti"
 
-#: ../src/bar.c:201
+#: ../src/bar.c:202
 msgid "Ascending by samplerate"
 msgstr "naraščajoče po meri vzorčenja"
 
-#: ../src/bar.c:202
+#: ../src/bar.c:203
 msgid "Descending by samplerate"
 msgstr "padajoče po meri vzorčenja"
 
-#: ../src/bar.c:204
+#: ../src/bar.c:205
 msgid "Open Files With…"
 msgstr "Odpri s programom ..."
 
-#: ../src/bar.c:205
+#: ../src/bar.c:206
 msgid "Run a command on the selected files"
 msgstr "Izvedi ukaz na izbranih datotekah"
 
-#: ../src/bar.c:208
+#: ../src/bar.c:209
 msgid "Select all"
 msgstr "Izberi vse"
 
-#: ../src/bar.c:209
+#: ../src/bar.c:210
 msgid "Unselect All"
 msgstr "Prekliči celoten izbor"
 
-#: ../src/bar.c:210
+#: ../src/bar.c:211
 msgid "Clear the current selection"
 msgstr "Počisti trenutni izbor"
 
-#: ../src/bar.c:213
+#: ../src/bar.c:214
 msgid "Invert File Selection"
 msgstr "Preobrni izbor datotek"
 
-#: ../src/bar.c:214
+#: ../src/bar.c:215
 msgid "Invert file selection"
 msgstr "Preobrni izbor datotek"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete Files"
 msgstr "Izbriši datoteke"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete files"
 msgstr "Izbriši datoteke"
 
-#: ../src/bar.c:217
+#: ../src/bar.c:218
 msgid "_First File"
 msgstr "_Prva datoteka"
 
-#: ../src/bar.c:218
+#: ../src/bar.c:219
 msgid "First file"
 msgstr "Prva datoteka"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "_Previous File"
 msgstr "_Predhodna datoteka"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "Previous file"
 msgstr "Predhodna datoteka"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "_Next File"
 msgstr "_Naslednja datoteka"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "Next file"
 msgstr "Naslednja datoteka"
 
-#: ../src/bar.c:221
+#: ../src/bar.c:222
 msgid "_Last File"
 msgstr "_Zadnja datoteka"
 
-#: ../src/bar.c:222
+#: ../src/bar.c:223
 msgid "Last file"
 msgstr "Zadnja datoteka"
 
-#: ../src/bar.c:223
+#: ../src/bar.c:224
 msgid "S_can Files"
 msgstr "_Preišči datoteke"
 
-#: ../src/bar.c:224 ../src/scan.c:2352
+#: ../src/bar.c:225 ../src/scan_dialog.c:1814
 msgid "Scan selected files"
 msgstr "Preišči izbrane datoteke"
 
-#: ../src/bar.c:225
+#: ../src/bar.c:226
 msgid "_Remove Tags"
 msgstr "_Odstrani oznake"
 
-#: ../src/bar.c:226
+#: ../src/bar.c:227
 msgid "Remove tags"
 msgstr "Odstrani oznake"
 
-#: ../src/bar.c:227
+#: ../src/bar.c:228
 msgid "_Undo Last Files Changes"
 msgstr "_Razveljavi zadnje spremembe datotek"
 
-#: ../src/bar.c:228
+#: ../src/bar.c:229
 msgid "Undo last files changes"
 msgstr "Razveljavi zadnje spremembe datotek"
 
-#: ../src/bar.c:230
+#: ../src/bar.c:231
 msgid "R_edo Last Files Changes"
 msgstr "_Ponovi zadnje spremembe datotek"
 
-#: ../src/bar.c:231
+#: ../src/bar.c:232
 msgid "Redo last files changes"
 msgstr "Ponovi zadnje spremembe datotek"
 
-#: ../src/bar.c:233
+#: ../src/bar.c:234
 msgid "_Save Files"
 msgstr "_Shrani datoteke"
 
-#: ../src/bar.c:234
+#: ../src/bar.c:235
 msgid "Save changes to selected files"
 msgstr "Shrani spremembe v izbrane datoteke"
 
-#: ../src/bar.c:236
+#: ../src/bar.c:237
 msgid "_Force Save Files"
 msgstr "_Vsili shranjevanje datotek"
 
-#: ../src/bar.c:237
+#: ../src/bar.c:238
 msgid "Force saving files"
 msgstr "Vsili shranjevanje datotek"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo Last Changes"
 msgstr "Razveljavi zadnje spremembe"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo last changes"
 msgstr "Razveljavi zadnje spremembe"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo Last Changes"
 msgstr "Ponovno uveljavi zadnje spremembe"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo last changes"
 msgstr "Ponovno uveljavi zadnje spremembe"
 
-#: ../src/bar.c:241
+#: ../src/bar.c:242
 msgid "_Quit"
 msgstr "_Končaj"
 
-#: ../src/bar.c:241 ../src/easytag.c:2450 ../src/easytag.c:4572
-#: ../src/easytag.c:4600
+#: ../src/bar.c:242 ../src/easytag.c:2430 ../src/easytag.c:4565
+#: ../src/easytag.c:4597
 msgid "Quit"
 msgstr "Končaj"
 
-#: ../src/bar.c:244
+#: ../src/bar.c:245
 msgid "_Browser"
 msgstr "_Brskalnik"
 
-#: ../src/bar.c:245
+#: ../src/bar.c:246
 msgid "_Home Directory"
 msgstr "_Domača mapa"
 
-#: ../src/bar.c:246
+#: ../src/bar.c:247
 msgid "Go to home directory"
 msgstr "Pojdi v domačo mapo"
 
-#: ../src/bar.c:248
+#: ../src/bar.c:249
 msgid "Desktop Directory"
 msgstr "Mapa Namizje"
 
-#: ../src/bar.c:249
+#: ../src/bar.c:250
 msgid "Go to desktop directory"
 msgstr "Pojdi v mapo namizja"
 
-#: ../src/bar.c:251
+#: ../src/bar.c:252
 msgid "Documents Directory"
 msgstr "Mapa Dokumenti"
 
-#: ../src/bar.c:252
+#: ../src/bar.c:253
 msgid "Go to documents directory"
 msgstr "Pojdi v mapo dokumentov"
 
-#: ../src/bar.c:254
+#: ../src/bar.c:255
 msgid "Downloads Directory"
 msgstr "Mapa Prejemi"
 
-#: ../src/bar.c:255
+#: ../src/bar.c:256
 msgid "Go to downloads directory"
 msgstr "Pojdi v mapo prenosov"
 
-#: ../src/bar.c:257
+#: ../src/bar.c:258
 msgid "Music Directory"
 msgstr "Mapa Glasba"
 
-#: ../src/bar.c:258
+#: ../src/bar.c:259
 msgid "Go to music directory"
 msgstr "Pojdi v mapo z glasbo"
 
-#: ../src/bar.c:260
+#: ../src/bar.c:261
 msgid "_Parent Directory"
 msgstr "_Nadrejena mapa"
 
-#: ../src/bar.c:261
+#: ../src/bar.c:262
 msgid "Go to parent directory"
 msgstr "Pojdi v mapo višje"
 
-#: ../src/bar.c:263
+#: ../src/bar.c:264
 msgid "_Default Directory"
 msgstr "_Privzeta mapa"
 
-#: ../src/bar.c:264
+#: ../src/bar.c:265
 msgid "Go to default directory"
 msgstr "Pojdi v privzeto mapo"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set _Current Path as Default"
 msgstr "Nastavi _trenutno pot kot privzeto"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set current path as default"
 msgstr "Nastavi trenutno pot kot privzeto"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename Directory…"
 msgstr "Preimenuj mapo ..."
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename directory"
 msgstr "Preimenuj mapo"
 
-#: ../src/bar.c:268
+#: ../src/bar.c:269
 msgid "Reload Directory"
 msgstr "Ponovno naloži mapo"
 
-#: ../src/bar.c:269
+#: ../src/bar.c:270
 msgid "Reload directory"
 msgstr "Ponovno naloži mapo"
 
-#: ../src/bar.c:272
+#: ../src/bar.c:273
 msgid "Browse Directory With…"
 msgstr "Prebrskaj mapo z ..."
 
-#: ../src/bar.c:273
+#: ../src/bar.c:274
 msgid "Run a command on the directory"
 msgstr "Izvedi ukaz v mapi"
 
-#: ../src/bar.c:275
+#: ../src/bar.c:276
 msgid "_Collapse Tree"
 msgstr "_Strni drevo"
 
-#: ../src/bar.c:276
+#: ../src/bar.c:277
 msgid "Collapse directory tree"
 msgstr "Strni drevo map"
 
-#: ../src/bar.c:277
+#: ../src/bar.c:278
 msgid "_Reload Tree"
 msgstr "Po_novno naloži drevo"
 
-#: ../src/bar.c:278
+#: ../src/bar.c:279
 msgid "Reload directory tree"
 msgstr "Ponovno naloži drevo map"
 
-#: ../src/bar.c:281
+#: ../src/bar.c:282
 msgid "S_canner Mode"
 msgstr "_Način preiskovanja datotek"
 
-#: ../src/bar.c:283
+#: ../src/bar.c:284
 msgid "_Miscellaneous"
 msgstr "_Razno"
 
-#: ../src/bar.c:284
+#: ../src/bar.c:285
 msgid "_Find…"
 msgstr "_Najdi ..."
 
-#: ../src/bar.c:285
+#: ../src/bar.c:286
 msgid "Search filenames and tags"
 msgstr "Poišči imena datotek in oznake"
 
-#: ../src/bar.c:287
+#: ../src/bar.c:288
 msgid "CDD_B Search…"
 msgstr "Iskanje CDD_B ..."
 
-#: ../src/bar.c:288
+#: ../src/bar.c:289
 msgid "CDDB search"
 msgstr "Iskanje po CDDB"
 
-#: ../src/bar.c:290
+#: ../src/bar.c:291
 msgid "Load Filenames From a Text File…"
 msgstr "Naloži imena datotek iz besedilne datoteke ..."
 
-#: ../src/bar.c:291
+#: ../src/bar.c:292
 msgid "Load filenames from a text file"
 msgstr "Naloži imena datotek iz besedilne datoteke"
 
-#: ../src/bar.c:293
+#: ../src/bar.c:294
 msgid "Generate Playlist…"
 msgstr "Ustvari seznam predvajanja ..."
 
-#: ../src/bar.c:294
+#: ../src/bar.c:295
 msgid "Generate a playlist"
 msgstr "Ustvari seznam predvajanja"
 
-#: ../src/bar.c:296 ../src/bar.c:322 ../src/bar.c:323 ../src/bar.c:324
+#: ../src/bar.c:297 ../src/bar.c:328 ../src/bar.c:329 ../src/bar.c:330
 msgid "Run Audio Player"
 msgstr "Zaženi zvočni predvajalnik"
 
-#: ../src/bar.c:297 ../src/bar.c:322 ../src/bar.c:323 ../src/bar.c:324
+#: ../src/bar.c:298 ../src/bar.c:328 ../src/bar.c:329 ../src/bar.c:330
 msgid "Run audio player"
 msgstr "Zaženi zvočni predvajalnik"
 
-#: ../src/bar.c:300
+#: ../src/bar.c:301
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../src/bar.c:301
+#: ../src/bar.c:302
 msgid "_Preferences"
 msgstr "_Možnosti"
 
 #. The window
-#: ../src/bar.c:302 ../src/prefs.c:110
+#: ../src/bar.c:303 ../src/prefs.c:110
 msgid "Preferences"
 msgstr "Možnosti"
 
-#: ../src/bar.c:304
+#: ../src/bar.c:305
 msgid "_View"
 msgstr "Po_gled"
 
-#: ../src/bar.c:305
+#: ../src/bar.c:306
 msgid "_Go"
 msgstr "_Pojdi"
 
-#: ../src/bar.c:307
+#: ../src/bar.c:308
 msgid "_Help"
 msgstr "Pomo_č"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:311
+msgid "_Contents"
+msgstr "_Vsebina"
+
+#: ../src/bar.c:312
+msgid "Show help"
+msgstr "Pokaži pomoč"
+
+#: ../src/bar.c:314
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:314
 msgid "About"
 msgstr "O programu"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: ../src/bar.c:314
+#: ../src/bar.c:320
 msgid "Stop the current action"
 msgstr "Ustavi trenutno dejanje"
 
 #.
 #. * Popup menu's Actions
 #.
-#: ../src/bar.c:320
+#: ../src/bar.c:326
 msgid "_File Operations"
 msgstr "Opravila _datotek"
 
-#: ../src/bar.c:321
+#: ../src/bar.c:327
 msgid "S_canner"
 msgstr "_Preiskovalnik"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:331
 msgid "CDDB Search Files…"
 msgstr "Datoteke iskanja CDDB ..."
 
-#: ../src/bar.c:325
+#: ../src/bar.c:331
 msgid "CDDB search files…"
 msgstr "Datoteke iskanja CDDB ...Odstranjevanje namestitvenih datotek ..."
 
 #. { 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:329
+#: ../src/bar.c:335
 msgid "Clear log"
 msgstr "Počisti dnevnik"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Subdirectories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: ../src/bar.c:336
+#: ../src/bar.c:342
 msgid "Browse _Subdirectories"
 msgstr "Prebrskaj _podmape"
 
-#: ../src/bar.c:336
+#: ../src/bar.c:342
 msgid "Browse subdirectories"
 msgstr "Prebrskaj podmape"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:346
 msgid "Show Hidden Directories"
 msgstr "Pokaži skrite mape"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:346
 msgid "Show hidden directories"
 msgstr "Pokaži skrite mape"
 
-#: ../src/bar.c:342
+#: ../src/bar.c:348
 msgid "_Show Scanner"
 msgstr "_Pokaži preiskovalnik"
 
-#: ../src/bar.c:343
+#: ../src/bar.c:349
 msgid "Show scanner"
 msgstr "Pokaži preiskovalnik"
 
-#: ../src/bar.c:349
+#: ../src/bar.c:355
 msgid "Tree Browser"
 msgstr "Drevesni brskalnik"
 
-#: ../src/bar.c:350
+#: ../src/bar.c:356
 msgid "View by directory tree"
 msgstr "Pokaži drevo map"
 
-#: ../src/bar.c:352
+#: ../src/bar.c:358
 msgid "Artist and Album"
 msgstr "Izvajalec in album"
 
-#: ../src/bar.c:353
+#: ../src/bar.c:359
 msgid "View by artist and album"
 msgstr "Pokaži po izvajalcih in albumih"
 
-#: ../src/bar.c:358
+#: ../src/bar.c:364
 msgid "_Fill Tags…"
 msgstr "_Zapolni oznake …"
 
-#: ../src/bar.c:359
+#: ../src/bar.c:365
 msgid "Fill tags"
 msgstr "Zapolni oznake"
 
-#: ../src/bar.c:361
+#: ../src/bar.c:367
 msgid "_Rename Files and Directories…"
 msgstr "_Preimenuj datoteke in mape ..."
 
-#: ../src/bar.c:362
+#: ../src/bar.c:368
 msgid "Rename files and directories"
 msgstr "Preimenuj datoteke in mape"
 
-#: ../src/bar.c:364
+#: ../src/bar.c:370
 msgid "_Process Fields…"
 msgstr "_Obdelaj polja ..."
 
-#: ../src/bar.c:364 ../src/scan.c:182
+#: ../src/bar.c:370 ../src/scan_dialog.c:184
 msgid "Process Fields"
 msgstr "Obdelaj polja"
 
-#: ../src/bar.c:422
+#: ../src/bar.c:428
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Prišlo je do napake med združevanjem vmesnika: %s\n"
 
-#: ../src/bar.c:528
+#: ../src/bar.c:533
 msgid "Ready to start"
 msgstr "Pripravljeno za začetek"
 
-#: ../src/browser.c:369
+#: ../src/browser.c:376
 msgid "New default path for files selected"
 msgstr "Nova privzeta pot za izbrane datoteke"
 
-#: ../src/browser.c:670 ../src/easytag.c:4568
+#: ../src/browser.c:678 ../src/easytag.c:4561
 msgid "Some files have been modified but not saved"
 msgstr "Nekatere datoteke so bile spremenjene, ne pa tudi shranjene"
 
-#: ../src/browser.c:671
+#: ../src/browser.c:679
 msgid "Do you want to save them before changing the directory?"
 msgstr "Jih želite shraniti pred spremembo mape?"
 
-#: ../src/browser.c:675
+#: ../src/browser.c:683
 msgid "Confirm Directory Change"
 msgstr "Potrdi spremembo mape"
 
-#: ../src/browser.c:2121
+#: ../src/browser.c:2146
 msgid "<All albums>"
 msgstr "<Vsi albumi>"
 
-#: ../src/browser.c:2573
+#: ../src/browser.c:2607
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Napaka: iskanje %s, vozlišča %s v drevesu ni mogoče najti"
 
-#: ../src/browser.c:3065 ../src/browser.c:3143
+#: ../src/browser.c:3101 ../src/browser.c:3179
 msgid "Tree"
 msgstr "Drevo"
 
-#: ../src/browser.c:3066 ../src/cddb.c:803 ../src/misc.c:1911
+#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1903
 msgid "Filename"
 msgstr "Ime datoteke"
 
-#: ../src/browser.c:3066 ../src/cddb.c:804 ../src/misc.c:1912
+#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1904
 #: ../src/prefs.c:643
 msgid "Title"
 msgstr "Naslov"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Artist".
-#: ../src/browser.c:3067 ../src/browser.c:3074 ../src/cddb.c:483
-#: ../src/cddb.c:805 ../src/misc.c:1913 ../src/prefs.c:644
+#: ../src/browser.c:3103 ../src/browser.c:3110 ../src/cddb.c:483
+#: ../src/cddb.c:805 ../src/misc.c:1905 ../src/prefs.c:644
 msgid "Artist"
 msgstr "Izvajalec"
 
-#: ../src/browser.c:3067 ../src/misc.c:1914
+#: ../src/browser.c:3103 ../src/misc.c:1906
 msgid "Album Artist"
 msgstr "Izvajalec albuma"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Album".
-#: ../src/browser.c:3068 ../src/browser.c:3076 ../src/cddb.c:486
-#: ../src/cddb.c:806 ../src/misc.c:1915 ../src/prefs.c:645
+#: ../src/browser.c:3104 ../src/browser.c:3112 ../src/cddb.c:486
+#: ../src/cddb.c:806 ../src/misc.c:1907 ../src/prefs.c:645
 msgid "Album"
 msgstr "Album"
 
-#: ../src/browser.c:3068 ../src/cddb.c:807 ../src/misc.c:1917
+#: ../src/browser.c:3104 ../src/cddb.c:807 ../src/misc.c:1909
 msgid "Year"
 msgstr "Leto"
 
-#: ../src/browser.c:3068
+#: ../src/browser.c:3104
 msgid "Disc"
 msgstr "Disk"
 
-#: ../src/browser.c:3069 ../src/misc.c:1918
+#: ../src/browser.c:3105 ../src/misc.c:1910
 msgid "Track"
 msgstr "Posnetek"
 
-#: ../src/browser.c:3069 ../src/cddb.c:810 ../src/misc.c:1919
+#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1911
 #: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Zvrst"
 
-#: ../src/browser.c:3070 ../src/misc.c:1920 ../src/prefs.c:647
+#: ../src/browser.c:3106 ../src/misc.c:1912 ../src/prefs.c:647
 msgid "Comment"
 msgstr "Opomba"
 
-#: ../src/browser.c:3070 ../src/misc.c:1921 ../src/picture.c:863
+#: ../src/browser.c:3106 ../src/misc.c:1913 ../src/picture.c:1060
 #: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Skladatelj"
 
-#: ../src/browser.c:3071 ../src/misc.c:1922
+#: ../src/browser.c:3107 ../src/misc.c:1914
 msgid "Original Artist"
 msgstr "Izvirni izvajalec"
 
-#: ../src/browser.c:3072 ../src/misc.c:1923
+#: ../src/browser.c:3108 ../src/misc.c:1915
 msgid "Copyright"
 msgstr "Avtorske pravice"
 
-#: ../src/browser.c:3072 ../src/misc.c:1924
+#: ../src/browser.c:3108 ../src/misc.c:1916
 msgid "URL"
 msgstr "Naslov URL"
 
-#: ../src/browser.c:3073 ../src/misc.c:1925
+#: ../src/browser.c:3109 ../src/misc.c:1917
 msgid "Encoded By"
 msgstr "Kodirali"
 
-#: ../src/browser.c:3074
+#: ../src/browser.c:3110
 msgid "# Albums"
 msgstr "Št. albumov"
 
-#: ../src/browser.c:3075 ../src/browser.c:3076
+#: ../src/browser.c:3111 ../src/browser.c:3112
 msgid "# Files"
 msgstr "Št. datotek"
 
-#: ../src/browser.c:3101
+#: ../src/browser.c:3137
 msgid "Enter a directory to browse."
 msgstr "Vnesite ime mape za brskanje."
 
-#: ../src/browser.c:3110
+#: ../src/browser.c:3146
 msgid "Select a directory to browse."
 msgstr "Izberite mapo za brskanje."
 
@@ -826,128 +853,101 @@ msgstr "Izberite mapo za brskanje."
 #. * The label for displaying number of files in path (without subdirs)
 #.
 #. Translators: No files, as in "0 files".
-#: ../src/browser.c:3117 ../src/easytag.c:3472
+#: ../src/browser.c:3153 ../src/easytag.c:3469
 msgid "No files"
 msgstr "Ni datotek"
 
-#: ../src/browser.c:3195
+#: ../src/browser.c:3231
 msgid "Artist & Album"
 msgstr "Izvajalec in album"
 
 #. Only directories changed
-#: ../src/browser.c:3559 ../src/easytag.c:2890
+#: ../src/browser.c:3595 ../src/easytag.c:2881
 msgid "Rename Directory"
 msgstr "Preimenuj mapo"
 
-#: ../src/browser.c:3581
+#: ../src/browser.c:3617
 #, c-format
 msgid "Rename the directory '%s' to:"
 msgstr "Preimenuj mapo '%s' v:"
 
-#: ../src/browser.c:3600 ../src/misc.c:1175
+#: ../src/browser.c:3636 ../src/misc.c:1172
 msgid "Use mask:"
 msgstr "Uporabi masko:"
 
-#: ../src/browser.c:3603
+#: ../src/browser.c:3639
 msgid "If activated, it will use masks to rename directory."
 msgstr "Če je omogočeno, bo preimenovanje mape izvedeno z maskami."
 
-#: ../src/browser.c:3621
+#: ../src/browser.c:3657
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
 msgstr ""
 
 #. Preview label
-#: ../src/browser.c:3645
+#: ../src/browser.c:3681
 msgid "Rename directory preview"
 msgstr "Preimenuj predogled mape"
 
-#: ../src/browser.c:3737
+#: ../src/browser.c:3773
 msgid "You must type a directory name"
 msgstr "Vnesti je treba ime mape."
 
-#: ../src/browser.c:3738 ../src/browser.c:3759
+#: ../src/browser.c:3774 ../src/browser.c:3795
 msgid "Directory Name Error"
 msgstr "Napaka imena mape"
 
-#: ../src/browser.c:3756
+#: ../src/browser.c:3792
 #, c-format
 msgid "Could not convert '%s' into filename encoding."
 msgstr "'%s' ni mogoče pretvoriti v kodiranje imena datoteke."
 
-#: ../src/browser.c:3758
+#: ../src/browser.c:3794
 msgid "Please use another name"
 msgstr "Uporabite drugo ime."
 
-#: ../src/browser.c:3828
+#: ../src/browser.c:3864
 #, c-format
 msgid "The directory name '%s' already exists"
 msgstr "Ime mape '%s' že obstaja"
 
-#: ../src/browser.c:3829 ../src/easytag.c:2973
+#: ../src/browser.c:3865 ../src/easytag.c:2964
 msgid "Rename File Error"
 msgstr "Napaka preimenovanja datoteke"
 
-#: ../src/browser.c:3867 ../src/browser.c:3896
+#: ../src/browser.c:3903 ../src/browser.c:3932
 msgid "Rename Directory Error"
 msgstr "Napaka preimenovanja mape"
 
-#: ../src/browser.c:3934
+#: ../src/browser.c:3970
 msgid "Directory renamed"
 msgstr "Mapa je preimenovana"
 
-#: ../src/browser.c:3970
+#: ../src/browser.c:4006
 msgid "Browse Directory With"
 msgstr "Prebrskaj mapo s programom"
 
-#: ../src/browser.c:3986 ../src/browser.c:4112
+#: ../src/browser.c:4022 ../src/browser.c:4148
 msgid "Program to run:"
 msgstr "Program za zagon:"
 
-#: ../src/browser.c:3998
+#: ../src/browser.c:4034
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Vnesite program, ki naj bo zagnan. Kot parameter bo prejel trenutno mapo."
 
-#: ../src/browser.c:4092
+#: ../src/browser.c:4128
 msgid "Open Files With"
 msgstr "Odpri datoteke s programom"
 
-#: ../src/browser.c:4124
+#: ../src/browser.c:4160
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Vnesite program, ki naj bo zagnan. Kot parameter bo prejel trenutno datoteko."
 
-#: ../src/browser.c:4251
-msgid "You must type a program name"
-msgstr "Vnesti morate ime programa"
-
-#: ../src/browser.c:4252 ../src/browser.c:4269
-msgid "Program Name Error"
-msgstr "Napaka imena programa"
-
-#: ../src/browser.c:4267 ../src/misc.c:792
-#, c-format
-msgid "The program '%s' cannot be found"
-msgstr "Programa '%s' ni mogoče najti."
-
-#: ../src/browser.c:4318 ../src/misc.c:837 ../src/misc.c:884
-#, c-format
-msgid "Cannot execute ‘%s’ (%s)"
-msgstr "Ni mogoče izvesti programa ‘%s’ (%s)"
-
-#: ../src/browser.c:4339
-msgid "Cannot fork another process\n"
-msgstr "Ni mogoče razvejiti v drugo opravilo\n"
-
-#: ../src/browser.c:4373
-#, c-format
-msgid "Executed command: %s"
-msgstr "Izveden ukaz: %s"
-
 #: ../src/cddb.c:313
 msgid "Artist / Album"
 msgstr "Izvajalec / album"
@@ -1033,7 +1033,7 @@ msgstr "Vsa polja"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Other".
-#: ../src/cddb.c:492 ../src/picture.c:841 ../src/prefs.c:807
+#: ../src/cddb.c:492 ../src/picture.c:1038 ../src/prefs.c:807
 msgid "Other"
 msgstr "Ostalo"
 
@@ -1127,7 +1127,7 @@ msgstr "Kategorije"
 msgid "Results:"
 msgstr "Rezultati:"
 
-#: ../src/cddb.c:606 ../src/misc.c:1959
+#: ../src/cddb.c:606 ../src/misc.c:1951
 msgid "Search:"
 msgstr "Poišči:"
 
@@ -1188,7 +1188,7 @@ msgid "# Tracks"
 msgstr "# posnetkov"
 
 #. Check box to run the scanner
-#: ../src/cddb.c:847 ../src/misc.c:3000
+#: ../src/cddb.c:847 ../src/misc.c:2992
 msgid "Run the current scanner for each file"
 msgstr "Zaženi trenutni preiskovalnik za vsako datoteko"
 
@@ -1200,7 +1200,7 @@ msgstr "Poišči ujemajoče vrstice z algoritmom 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:859 ../src/prefs.c:1362
+#: ../src/cddb.c:859 ../src/prefs.c:1363
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM: Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every "
@@ -1280,7 +1280,7 @@ msgstr "Napaka pri branju odgovora CDDB (%s)"
 msgid "Cannot create file '%s' (%s)"
 msgstr "Datoteke '%s' ni mogoče ustvariti (%s)."
 
-#: ../src/cddb.c:1849 ../src/setting.c:1260
+#: ../src/cddb.c:1849 ../src/setting.c:1256
 #, c-format
 msgid "Cannot open file '%s' (%s)"
 msgstr "Datoteke '%s' ni mogoče odpreti (%s)."
@@ -1617,48 +1617,48 @@ msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Niza '%s' ni mogoče pretvoriti v UTF-8 (%s)."
 
 #. Starting messages
-#: ../src/easytag.c:211
+#: ../src/easytag.c:185
 #, c-format
 msgid "Starting EasyTAG version %s (PID: %d)…"
 msgstr "Začenjanje programa EasyTAG različice %s (PID: %d) ..."
 
-#: ../src/easytag.c:213
+#: ../src/easytag.c:187
 #, c-format
 msgid "Using libid3tag version %s"
 msgstr "Uporabljate libid3tag različice %s"
 
-#: ../src/easytag.c:216
+#: ../src/easytag.c:190
 #, c-format
 msgid "Using id3lib version %d.%d.%d"
 msgstr "Uporabljate id3lib različice %d.%d.%d"
 
-#: ../src/easytag.c:222
+#: ../src/easytag.c:196
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
 msgstr ""
 "Spremenljivka EASYTAGLANG je določena. Nastavljanje krajevnih nastavitev: "
 "'%s'"
 
-#: ../src/easytag.c:224
+#: ../src/easytag.c:198
 #, c-format
 msgid "Setting locale: '%s'"
 msgstr "Nastavljanje jezikovnih nastavitev: '%s'"
 
-#: ../src/easytag.c:229
+#: ../src/easytag.c:203
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')"
 msgstr "Uporabljate krajevne nastavitve '%s' (in navsezadnje '%s')"
 
-#: ../src/easytag.c:236
+#: ../src/easytag.c:210
 msgid "Unable to create setting directories"
 msgstr "Ni mogoče ustvariti nastavitvenih map"
 
-#: ../src/easytag.c:453 ../src/et_core.c:583
+#: ../src/easytag.c:427 ../src/et_core.c:637 ../src/et_core.c:649
 #, c-format
 msgid "Error while querying information for file: '%s' (%s)"
 msgstr "Napaka pri poizvedovanju po podatkih o datoteki: '%s' (%s)"
 
-#: ../src/easytag.c:518
+#: ../src/easytag.c:490
 #, c-format
 msgid "Cannot open path '%s'"
 msgstr "Poti '%s' ni mogoče odpreti."
@@ -1666,11 +1666,11 @@ msgstr "Poti '%s' ni mogoče odpreti."
 #.
 #. * Browser
 #.
-#: ../src/easytag.c:618 ../src/prefs.c:142
+#: ../src/easytag.c:582 ../src/prefs.c:142
 msgid "Browser"
 msgstr "Brskalnik"
 
-#: ../src/easytag.c:640 ../src/et_core.c:2727
+#: ../src/easytag.c:604 ../src/et_core.c:2857
 msgid "File"
 msgstr "Datoteka"
 
@@ -1680,382 +1680,382 @@ msgstr "Datoteka"
 #. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
 #. Version changed to encoder version
 #. Encoder version
-#: ../src/easytag.c:672 ../src/easytag.c:4200 ../src/flac_header.c:201
+#: ../src/easytag.c:636 ../src/easytag.c:4232 ../src/flac_header.c:201
 #: ../src/monkeyaudio_header.c:96 ../src/musepack_header.c:98
-#: ../src/ogg_header.c:389 ../src/wavpack_header.c:72
+#: ../src/ogg_header.c:389 ../src/opus_header.c:221 ../src/wavpack_header.c:72
 #, c-format
 msgid "Encoder:"
 msgstr "Kodirnik:"
 
-#: ../src/easytag.c:680
+#: ../src/easytag.c:644
 msgid "Bitrate:"
 msgstr "Bitna hitrost:"
 
 #. Translators: Please try to keep this string as short as possible as it
 #. * is shown in a narrow column.
-#: ../src/easytag.c:690
+#: ../src/easytag.c:654
 msgid "Frequency:"
 msgstr "Frekvenca:"
 
 #. Mode
-#: ../src/easytag.c:701 ../src/easytag.c:4204 ../src/mpeg_header.c:216
+#: ../src/easytag.c:665 ../src/easytag.c:4236 ../src/mpeg_header.c:216
 msgid "Mode:"
 msgstr "Način:"
 
-#: ../src/easytag.c:708
+#: ../src/easytag.c:672
 msgid "Size:"
 msgstr "Velikost:"
 
-#: ../src/easytag.c:715
+#: ../src/easytag.c:679
 msgid "Duration:"
 msgstr "Trajanje:"
 
 #. Main Frame
-#: ../src/easytag.c:762 ../src/et_core.c:2665
+#: ../src/easytag.c:726 ../src/et_core.c:2787
 msgid "Tag"
 msgstr "Oznaka"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: ../src/easytag.c:784
+#: ../src/easytag.c:748
 msgid "Common"
 msgstr "Splošno"
 
 #. Title
-#: ../src/easytag.c:791
+#: ../src/easytag.c:755
 msgid "Title:"
 msgstr "Naslov:"
 
-#: ../src/easytag.c:805
+#: ../src/easytag.c:769
 msgid "Tag selected files with this title"
 msgstr "Označi izbrane datoteke s tem naslovom"
 
 #. Artist
-#: ../src/easytag.c:810
+#: ../src/easytag.c:774
 msgid "Artist:"
 msgstr "Izvajalec:"
 
-#: ../src/easytag.c:824
+#: ../src/easytag.c:788
 msgid "Tag selected files with this artist"
 msgstr "Označi izbrane datoteke s tem izvajalcem"
 
 #. Album Artist
-#: ../src/easytag.c:829
+#: ../src/easytag.c:793
 msgid "Album artist:"
 msgstr "Izvajalec albuma:"
 
-#: ../src/easytag.c:843
+#: ../src/easytag.c:807
 msgid "Tag selected files with this album artist"
 msgstr "Označi izbrane datoteke s tem izvajalcem albuma"
 
 #. Album
-#: ../src/easytag.c:848
+#: ../src/easytag.c:812
 msgid "Album:"
 msgstr "Album:"
 
-#: ../src/easytag.c:862
+#: ../src/easytag.c:826
 msgid "Tag selected files with this album name"
 msgstr "Označi izbrane datoteke s tem naslovom albuma"
 
 #. Disc Number
-#: ../src/easytag.c:867
+#: ../src/easytag.c:831
 msgid "CD:"
 msgstr "CD:"
 
-#: ../src/easytag.c:884
+#: ../src/easytag.c:848
 msgid "Tag selected files with this disc number"
 msgstr "Označi izbrane datoteke s to številko plošče"
 
 #. Year
-#: ../src/easytag.c:889
+#: ../src/easytag.c:853
 msgid "Year:"
 msgstr "Leto:"
 
-#: ../src/easytag.c:909
+#: ../src/easytag.c:873
 msgid "Tag selected files with this year"
 msgstr "Označi izbrane datoteke s tem letom"
 
-#: ../src/easytag.c:923
+#: ../src/easytag.c:887
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr "Številči izbrane posnetke zaporedno. Začne z 01 v vsaki podmapi."
 
 #. To have enough space to display the icon
 #. To have enough space to display the icon
-#: ../src/easytag.c:932
+#: ../src/easytag.c:896
 msgid "Track #:"
 msgstr "# posnetka:"
 
-#: ../src/easytag.c:963
+#: ../src/easytag.c:927
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr ""
 "Izbranim posnetkom določite število datotek v isti mapi prikazane datoteke."
 
-#: ../src/easytag.c:983
+#: ../src/easytag.c:947
 msgid "Tag selected files with this number of tracks"
 msgstr "Označi izbrane datoteke s tem številom posnetkov"
 
 #. Genre
-#: ../src/easytag.c:987
+#: ../src/easytag.c:951
 msgid "Genre:"
 msgstr "Zvrst:"
 
-#: ../src/easytag.c:1015
+#: ../src/easytag.c:979
 msgid "Tag selected files with this genre"
 msgstr "Označi izbrane datoteke s to zvrstjo"
 
 #. Comment
-#: ../src/easytag.c:1020
+#: ../src/easytag.c:984
 msgid "Comment:"
 msgstr "Opomba:"
 
-#: ../src/easytag.c:1047
+#: ../src/easytag.c:1011
 msgid "Tag selected files with this comment"
 msgstr "Označi izbrane datoteke s tem komentarjem"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. Composer (name of the composers)
-#: ../src/easytag.c:1054
+#: ../src/easytag.c:1018
 msgid "Composer:"
 msgstr "Skladatelj:"
 
-#: ../src/easytag.c:1068
+#: ../src/easytag.c:1032
 msgid "Tag selected files with this composer"
 msgstr "Označi izbrane datoteke s tem skladateljem"
 
 #. Translators: Original Artist / Performer. Please try to keep this string
 #. * as short as possible, as it must fit into a narrow column.
-#: ../src/easytag.c:1075
+#: ../src/easytag.c:1039
 msgid "Orig. artist:"
 msgstr "Izvirni izvajalec:"
 
-#: ../src/easytag.c:1089
+#: ../src/easytag.c:1053
 msgid "Tag selected files with this original artist"
 msgstr "Označi izbrane datoteke s tem izvirnim izvajalcem"
 
 #. Copyright
-#: ../src/easytag.c:1095
+#: ../src/easytag.c:1059
 msgid "Copyright:"
 msgstr "Avtorske pravice:"
 
-#: ../src/easytag.c:1109
+#: ../src/easytag.c:1073
 msgid "Tag selected files with this copyright"
 msgstr "Označi izbrane datoteke s to avtorsko pravico"
 
 #. URL
-#: ../src/easytag.c:1115
+#: ../src/easytag.c:1079
 msgid "URL:"
 msgstr "Naslov URL:"
 
-#: ../src/easytag.c:1129
+#: ../src/easytag.c:1093
 msgid "Tag selected files with this URL"
 msgstr "Označi izbrane slike s tem naslovom URL"
 
 #. Encoded by
-#: ../src/easytag.c:1135
+#: ../src/easytag.c:1099
 msgid "Encoded by:"
 msgstr "Kodirano z:"
 
-#: ../src/easytag.c:1149
+#: ../src/easytag.c:1113
 msgid "Tag selected files with this encoder name"
 msgstr "Označi izbrane datoteke z imenom tega kodirnika"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1183 ../src/et_core.c:3100 ../src/et_core.c:3103
+#: ../src/easytag.c:1147 ../src/et_core.c:3229 ../src/et_core.c:3232
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/easytag.c:1207
+#: ../src/easytag.c:1171
 msgid "You can use drag and drop to add an image"
 msgstr "Sliko dodajte s povleci in spusti."
 
-#: ../src/easytag.c:1254
+#: ../src/easytag.c:1218
 msgid "Add images to the tag"
 msgstr "Oznaki dodaj slike"
 
-#: ../src/easytag.c:1272
+#: ../src/easytag.c:1236
 msgid "Remove selected images from the tag"
 msgstr "Odstrani izbrane slike oznaki"
 
-#: ../src/easytag.c:1286
+#: ../src/easytag.c:1250
 msgid "Save the selected images to files"
 msgstr "Shrani izbrane slike v datoteke"
 
-#: ../src/easytag.c:1297
+#: ../src/easytag.c:1261
 msgid "Edit image properties"
 msgstr "Uredi lastnosti slike"
 
-#: ../src/easytag.c:1311
+#: ../src/easytag.c:1275
 msgid "Tag selected files with these images"
 msgstr "Označi izbrane datoteke s temi slikami"
 
-#: ../src/easytag.c:1369
+#: ../src/easytag.c:1333
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Izbrane datoteke označene z naslovom '%s'."
 
-#: ../src/easytag.c:1371
+#: ../src/easytag.c:1335
 msgid "Removed title from selected files."
 msgstr "Naslov odstranjen iz izbranih datotek."
 
-#: ../src/easytag.c:1386
+#: ../src/easytag.c:1350
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Izbrane datoteke označene z izvajalcem '%s'."
 
-#: ../src/easytag.c:1388
+#: ../src/easytag.c:1352
 msgid "Removed artist from selected files."
 msgstr "Izvajalec odstranjen iz izbranih datotek."
 
-#: ../src/easytag.c:1402
+#: ../src/easytag.c:1366
 #, c-format
 msgid "Selected files tagged with album artist '%s'."
 msgstr "Izbrane datoteke so bile označene z izvajalcem albuma ('%s')."
 
-#: ../src/easytag.c:1404
+#: ../src/easytag.c:1368
 msgid "Removed album artist from selected files."
 msgstr "Iz izbranih datotek je bil odstranjen izvajalec albuma."
 
-#: ../src/easytag.c:1419
+#: ../src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Izbrane datoteke označene z albumom '%s'."
 
-#: ../src/easytag.c:1421
+#: ../src/easytag.c:1385
 msgid "Removed album name from selected files."
 msgstr "Iz izbranih datotek je bilo odstranjeno ime albuma."
 
-#: ../src/easytag.c:1458
+#: ../src/easytag.c:1422
 #, c-format
 msgid "Selected files tagged with disc number '%s/%s'."
 msgstr "Izbrane datoteke so bile označene s številko diska '%s/%s'."
 
-#: ../src/easytag.c:1463
+#: ../src/easytag.c:1427
 #, c-format
 msgid "Selected files tagged with disc number like 'xx'."
 msgstr "Izbrane datoteke so bile označene s številko diska v obliki 'xx'."
 
-#: ../src/easytag.c:1468
+#: ../src/easytag.c:1432
 msgid "Removed disc number from selected files."
 msgstr "Številka diska odstranjena iz izbranih datotek."
 
-#: ../src/easytag.c:1484
+#: ../src/easytag.c:1448
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Izbrane datoteke označene z letom '%s'."
 
-#: ../src/easytag.c:1486
+#: ../src/easytag.c:1450
 msgid "Removed year from selected files."
 msgstr "Leto odstranjeno iz izbranih datotek."
 
-#: ../src/easytag.c:1512 ../src/easytag.c:1602
+#: ../src/easytag.c:1476 ../src/easytag.c:1567
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Izbrane datoteke označene s posnetkom, kot je 'xx/%s'."
 
-#: ../src/easytag.c:1515
+#: ../src/easytag.c:1479
 #, c-format
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Izbrane datoteke označene s posnetkom, kot je 'xx'."
 
-#: ../src/easytag.c:1519 ../src/easytag.c:1605
+#: ../src/easytag.c:1483 ../src/easytag.c:1570
 msgid "Removed track number from selected files."
 msgstr "Številka posnetka odstranjena iz izbranih datotek."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1575
+#: ../src/easytag.c:1540
 #, c-format
 msgid "Selected tracks numbered sequentially."
 msgstr "Izbrane datoteke zaporedno oštevilčene."
 
-#: ../src/easytag.c:1621
+#: ../src/easytag.c:1586
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Izbrane datoteke označene z zvrstjo '%s'."
 
-#: ../src/easytag.c:1623
+#: ../src/easytag.c:1588
 msgid "Removed genre from selected files."
 msgstr "Zvrst odstranjena iz izbranih datotek."
 
-#: ../src/easytag.c:1645
+#: ../src/easytag.c:1610
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Izbrane datoteke označene s komentarjem '%s'."
 
-#: ../src/easytag.c:1647
+#: ../src/easytag.c:1612
 msgid "Removed comment from selected files."
 msgstr "Komentar odstranjen iz izbranih datotek."
 
-#: ../src/easytag.c:1661
+#: ../src/easytag.c:1626
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Izbrane datoteke označene s skladateljem '%s'."
 
-#: ../src/easytag.c:1663
+#: ../src/easytag.c:1628
 msgid "Removed composer from selected files."
 msgstr "Skladatelj odstranjen iz izbranih datotek."
 
-#: ../src/easytag.c:1678
+#: ../src/easytag.c:1643
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Izbrane datoteke so označene z izvornim avtorjem '%s'."
 
-#: ../src/easytag.c:1680
+#: ../src/easytag.c:1645
 msgid "Removed original artist from selected files."
 msgstr "Izvirni izvajalec je odstranjen iz izbranih datotek."
 
-#: ../src/easytag.c:1695
+#: ../src/easytag.c:1660
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Izbrane datoteke označene z avtorsko pravico '%s'."
 
-#: ../src/easytag.c:1697
+#: ../src/easytag.c:1662
 msgid "Removed copyright from selected files."
 msgstr "Avtorska pravica odstranjena iz izbranih datotek."
 
-#: ../src/easytag.c:1712
+#: ../src/easytag.c:1677
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Izbrane datoteke označene z naslovom URL '%s'."
 
-#: ../src/easytag.c:1714
+#: ../src/easytag.c:1679
 msgid "Removed URL from selected files."
 msgstr "URL odstranjen iz izbranih datotek."
 
-#: ../src/easytag.c:1729
+#: ../src/easytag.c:1694
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Izbrane datoteke so označene z imenom kodirnika '%s'."
 
-#: ../src/easytag.c:1731
+#: ../src/easytag.c:1696
 msgid "Removed encoder name from selected files."
 msgstr "Ime kodirnika je odstranjeno iz izbranih datotek."
 
-#: ../src/easytag.c:1763
+#: ../src/easytag.c:1728
 msgid "Selected files tagged with images."
 msgstr "Izbrane datoteke označene s slikami."
 
-#: ../src/easytag.c:1765
+#: ../src/easytag.c:1730
 msgid "Removed images from selected files."
 msgstr "Slike odstranjene iz izbranih datotek."
 
-#: ../src/easytag.c:2046
+#: ../src/easytag.c:2011
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Izberi način in masko in ponovno izvedi enako dejanje"
 
-#: ../src/easytag.c:2098
+#: ../src/easytag.c:2063
 msgid "All tags have been scanned"
 msgstr "Vse oznake so bile pregledane."
 
-#: ../src/easytag.c:2154
+#: ../src/easytag.c:2119
 msgid "All tags have been removed"
 msgstr "Vsi oznake so bile odstranjene."
 
-#: ../src/easytag.c:2444
+#: ../src/easytag.c:2424
 #, c-format
 msgid "A file was changed by an external program"
 msgid_plural "%d files were changed by an external program."
@@ -2064,154 +2064,154 @@ msgstr[1] "Zunanji program je spremenil %d datoteko."
 msgstr[2] "Zunanji program je spremenil %d datoteki."
 msgstr[3] "Zunanji program je spremenil %d datoteke."
 
-#: ../src/easytag.c:2449
+#: ../src/easytag.c:2429
 msgid "Do you want to continue saving the file?"
 msgstr "Želite nadaljevati s shranjevanjem datoteke?"
 
-#: ../src/easytag.c:2504 ../src/easytag.c:2524
+#: ../src/easytag.c:2487 ../src/easytag.c:2507
 msgid "Saving files was stopped"
 msgstr "Shranjevanje datotek je bilo ustavljeno"
 
-#: ../src/easytag.c:2526
+#: ../src/easytag.c:2509
 msgid "All files have been saved"
 msgstr "Vse datoteke so bile shranjene"
 
-#: ../src/easytag.c:2657
+#: ../src/easytag.c:2644
 #, c-format
 msgid "Cannot delete file (%s)"
 msgstr "Datoteke ni mogoče izbrisati (%s)."
 
-#: ../src/easytag.c:2677
+#: ../src/easytag.c:2665
 msgid "Files have been partially deleted"
 msgstr "Datoteke so bile delno izbrisane"
 
-#: ../src/easytag.c:2679
+#: ../src/easytag.c:2667
 msgid "All files have been deleted"
 msgstr "Vse datoteke so bile izbrisane"
 
-#: ../src/easytag.c:2795
+#: ../src/easytag.c:2783
 #, c-format
 msgid "Do you want to write the tag of file '%s'?"
 msgstr "Ali želite zapisati oznako datoteke '%s'?"
 
-#: ../src/easytag.c:2797
+#: ../src/easytag.c:2785
 msgid "Confirm Tag Writing"
 msgstr "Potrditev zapisovanja oznak"
 
-#: ../src/easytag.c:2802 ../src/easytag.c:2919 ../src/easytag.c:3179
+#: ../src/easytag.c:2790 ../src/easytag.c:2910 ../src/easytag.c:3173
 msgid "Repeat action for the remaining files"
 msgstr "Ponovi dejanje za ostale datoteke"
 
 #. Directories and filename changed
-#: ../src/easytag.c:2883 ../src/scan.c:181
+#: ../src/easytag.c:2874 ../src/scan_dialog.c:183
 msgid "Rename File and Directory"
 msgstr "Preimenuj datoteko ali mapo"
 
-#: ../src/easytag.c:2884
+#: ../src/easytag.c:2875
 msgid "File and directory rename confirmation required"
 msgstr "Zahtevana je potrditev preimenovanja datoteke in mape"
 
-#: ../src/easytag.c:2885
+#: ../src/easytag.c:2876
 #, c-format
 msgid "Do you want to rename the file and directory '%s' to '%s'?"
 msgstr "Ali želite preimenovati datoteko in mapo '%s' v '%s'?"
 
-#: ../src/easytag.c:2891
+#: ../src/easytag.c:2882
 msgid "Directory rename confirmation required"
 msgstr "Potrebna je potrditev preimenovanja mape"
 
-#: ../src/easytag.c:2892
+#: ../src/easytag.c:2883
 #, c-format
 msgid "Do you want to rename the directory '%s' to '%s'?"
 msgstr "Ali želite preimenovati mapo '%s' v '%s'?"
 
 #. Only filename changed
-#: ../src/easytag.c:2898
+#: ../src/easytag.c:2889
 msgid "Rename File"
 msgstr "Preimenuj datoteko"
 
-#: ../src/easytag.c:2899
+#: ../src/easytag.c:2890
 msgid "File rename confirmation required"
 msgstr "Potrebna je potrditev preimenovanja datoteke"
 
-#: ../src/easytag.c:2900
+#: ../src/easytag.c:2891
 #, c-format
 msgid "Do you want to rename the file '%s' to '%s'?"
 msgstr "Ali želite preimenovati datoteko '%s' v '%s'?"
 
-#: ../src/easytag.c:2966
+#: ../src/easytag.c:2957
 #, c-format
 msgid "Cannot rename file '%s' to '%s'"
 msgstr "Datoteke '%s' ni mogoče preimenovati v '%s'"
 
-#: ../src/easytag.c:2980
+#: ../src/easytag.c:2971
 #, c-format
 msgid "Cannot rename file '%s' to '%s': %s"
 msgstr "Datoteke '%s' ni mogoče preimenovati v '%s': %s"
 
-#: ../src/easytag.c:2984
+#: ../src/easytag.c:2975
 msgid "File(s) not renamed"
 msgstr "Datoteke, ki niso preimenovane"
 
-#: ../src/easytag.c:3093
+#: ../src/easytag.c:3087
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Zapisovanje oznake v '%s'"
 
-#: ../src/easytag.c:3100
+#: ../src/easytag.c:3094
 msgid "Tag(s) written"
 msgstr "Oznake so bile zapisane"
 
-#: ../src/easytag.c:3115
+#: ../src/easytag.c:3109
 #, c-format
 msgid "Cannot write tag in file '%s' (%s)"
 msgstr "V datoteko '%s' ni mogoče zapisati oznake (%s)"
 
-#: ../src/easytag.c:3128
+#: ../src/easytag.c:3122
 #, c-format
 msgid "Cannot write tag in file '%s'"
 msgstr "V datoteko '%s' ni mogoče zapisati oznake"
 
-#: ../src/easytag.c:3131
+#: ../src/easytag.c:3125
 msgid "Tag Write Error"
 msgstr "Napaka zapisovanja oznake"
 
-#: ../src/easytag.c:3176 ../src/easytag.c:3190
+#: ../src/easytag.c:3170 ../src/easytag.c:3184
 #, c-format
 msgid "Do you really want to delete the file '%s'?"
 msgstr "Res želite izbrisati datoteko '%s'?"
 
-#: ../src/easytag.c:3182 ../src/easytag.c:3192
+#: ../src/easytag.c:3176 ../src/easytag.c:3186
 msgid "Delete File"
 msgstr "Izbriši datoteko"
 
-#: ../src/easytag.c:3217
+#: ../src/easytag.c:3211
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Datoteka '%s' izbrisana"
 
-#: ../src/easytag.c:3349
+#: ../src/easytag.c:3346
 #, c-format
 msgid "Cannot read directory '%s'"
 msgstr "Mape '%s' ni mogoče prebrati."
 
-#: ../src/easytag.c:3353
+#: ../src/easytag.c:3350
 msgid "Directory Read Error"
 msgstr "Napaka branja mape"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3374
+#: ../src/easytag.c:3371
 #, c-format
 msgid "Search in progress…"
 msgstr "Iskanje je v teku ..."
 
-#: ../src/easytag.c:3397 ../src/et_core.c:2734
+#: ../src/easytag.c:3394 ../src/et_core.c:2864
 #, c-format
 msgid "File: '%s'"
 msgstr "Datoteka: '%s'"
 
 # Multiple plural!!!
-#: ../src/easytag.c:3447
+#: ../src/easytag.c:3444
 #, c-format
 msgid "Found one file in this directory and subdirectories"
 msgid_plural "Found %d files in this directory and subdirectories"
@@ -2220,7 +2220,7 @@ msgstr[1] "V tej mapi in njenih podrejenih mapah je %d datoteka."
 msgstr[2] "V tej mapi in njenih podrejenih mapah sta %d datoteki."
 msgstr[3] "V tej mapi in njenih podrejenih mapah so %d datoteke."
 
-#: ../src/easytag.c:3454
+#: ../src/easytag.c:3451
 #, c-format
 msgid "Found one file in this directory"
 msgid_plural "Found %d files in this directory"
@@ -2229,203 +2229,191 @@ msgstr[1] "V tej mapi je %d datoteka."
 msgstr[2] "V tej mapi sta %d datoteki."
 msgstr[3] "V tej mapi so %d datoteke."
 
-#: ../src/easytag.c:3476
+#: ../src/easytag.c:3473
 msgid "No file found in this directory and subdirectories"
 msgstr "V mapi in njenih podmapah ni mogoče najti datotek"
 
-#: ../src/easytag.c:3478
+#: ../src/easytag.c:3475
 msgid "No file found in this directory"
 msgstr "V mapi ni mogoče najti datotek"
 
-#: ../src/easytag.c:3546
+#: ../src/easytag.c:3543
 #, c-format
 msgid "Error opening directory '%s' (%s)"
 msgstr "Napaka pri odpiranju mape '%s' (%s)"
 
-#: ../src/easytag.c:3582
+#: ../src/easytag.c:3579
 #, c-format
 msgid "Cannot read directory (%s)"
 msgstr "Mape ni mogoče prebrati (%s)"
 
-#: ../src/easytag.c:3602
+#: ../src/easytag.c:3599
 msgid "Searching for audio files…"
 msgstr "Poteka iskanje zvočnih datotek ..."
 
-#: ../src/easytag.c:3603
+#: ../src/easytag.c:3600
 msgid "Searching"
 msgstr "Iskanje"
 
-#: ../src/easytag.c:4234
+#: ../src/easytag.c:4266
 msgid "Select a directory to browse"
 msgstr "Izberite mapo za brskanje"
 
 #. Menu items
-#: ../src/easytag.c:4381
+#: ../src/easytag.c:4412
 msgid "Tag selected files with this field"
 msgstr "Označi izbrane datoteke s podatki tega polja"
 
-#: ../src/easytag.c:4393 ../src/scan.c:2662
+#: ../src/easytag.c:4424 ../src/scan_dialog.c:2124
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Pretvori znaka '_' in '%20' v presledke"
 
-#: ../src/easytag.c:4400 ../src/scan.c:2664
+#: ../src/easytag.c:4431 ../src/scan_dialog.c:2126
 msgid "Convert ' ' to '_'"
 msgstr "Pretvori ' ' v '_'"
 
-#: ../src/easytag.c:4411
+#: ../src/easytag.c:4442
 msgid "All uppercase"
 msgstr "Vse velike črke"
 
-#: ../src/easytag.c:4418
+#: ../src/easytag.c:4449
 msgid "All lowercase"
 msgstr "Vse male črke"
 
-#: ../src/easytag.c:4425
+#: ../src/easytag.c:4456
 msgid "First letter uppercase"
 msgstr "Velika prva črka"
 
-#: ../src/easytag.c:4432
+#: ../src/easytag.c:4463
 msgid "First letter uppercase of each word"
 msgstr "Naj bo prva črka vsake besede velika"
 
-#: ../src/easytag.c:4443 ../src/prefs.c:1023 ../src/scan.c:2762
+#: ../src/easytag.c:4474 ../src/prefs.c:1023 ../src/scan_dialog.c:2224
 msgid "Remove spaces"
 msgstr "Odstrani presledke"
 
-#: ../src/easytag.c:4450
+#: ../src/easytag.c:4481
 msgid "Insert space before uppercase letter"
 msgstr "Vstavi presledek pred veliko črko"
 
-#: ../src/easytag.c:4457
+#: ../src/easytag.c:4488
 msgid "Remove duplicate spaces or underscores"
 msgstr "Odstrani podvojene presledke in podčrtaje"
 
-#: ../src/easytag.c:4464
+#: ../src/easytag.c:4495
 msgid "Remove all text"
 msgstr "Odstrani vse besedilo"
 
-#. gchar commmand[256];
-#: ../src/easytag.c:4487
-#, c-format
-msgid "EasyTAG version %s: Abnormal exit (PID: %d)"
-msgstr "Program EasyTAG različice %s: nenormalen konec (PID: %d)"
-
-#: ../src/easytag.c:4488 ../src/easytag.c:4499
-#, c-format
-msgid "Received signal '%s' (%d)"
-msgstr "Prejet signal '%s' (%d)"
-
-#: ../src/easytag.c:4491 ../src/easytag.c:4502
-#, c-format
-msgid ""
-"You have probably found a bug in EasyTAG. Please, file a bug report with a "
-"GDB backtrace ('gdb easytag core' then 'bt' and 'l') and information to "
-"reproduce it at: %s"
-msgstr ""
-
-#. To send messages to the console...
-#: ../src/easytag.c:4497
-#, c-format
-msgid "EasyTAG version %s: Abnormal exit (PID: %d)."
-msgstr "EasyTAG različice %s: neobičajni izhod (PID: %d)."
-
-#: ../src/easytag.c:4521
+#: ../src/easytag.c:4514
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: običajni izhod."
 
-#: ../src/easytag.c:4573
+#: ../src/easytag.c:4566
 msgid "Do you want to save them before quitting?"
 msgstr "Ali jih želite shraniti pred zapiranjem?"
 
-#: ../src/easytag.c:4596
+#: ../src/easytag.c:4593
 msgid "Do you really want to quit?"
 msgstr "Ali res želite končati?"
 
-#: ../src/et_core.c:505
+#: ../src/et_core.c:550
 #, c-format
 msgid "Error reading tag from ogg file (%s)"
 msgstr "Napaka med branjem oznak iz datoteke ogg (%s)"
 
-#: ../src/et_core.c:639
+#: ../src/et_core.c:579
+#, c-format
+msgid "Error reading tag from Opus file (%s)"
+msgstr "Napaka branja oznak iz datoteke Opus (%s)"
+
+#: ../src/et_core.c:722
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr "Datoteka '%s' je bila samodejno popravljena."
 
-#: ../src/et_core.c:2631
+#: ../src/et_core.c:2747
 msgid "ID3 Tag"
 msgstr "Oznaka ID3"
 
-#: ../src/et_core.c:2637
+#: ../src/et_core.c:2753
 msgid "Ogg Vorbis Tag"
 msgstr "Oznaka Ogg Vorbis"
 
-#: ../src/et_core.c:2643
+#: ../src/et_core.c:2759
 msgid "FLAC Vorbis Tag"
 msgstr "Oznaka FLAC Vorbis"
 
-#: ../src/et_core.c:2648
+#: ../src/et_core.c:2764
 msgid "APE Tag"
 msgstr "Oznaka APE"
 
-#: ../src/et_core.c:2653
+#: ../src/et_core.c:2769
 msgid "MP4/M4A/AAC Tag"
 msgstr "Oznaka MP4/M4A/AAC"
 
-#: ../src/et_core.c:2659
+#: ../src/et_core.c:2775
 msgid "Wavpack Tag"
 msgstr "Oznaka Wavpack"
 
-#: ../src/et_core.c:2679
+#: ../src/et_core.c:2781
+msgid "Opus Tag"
+msgstr "Oznaka Opus"
+
+#: ../src/et_core.c:2801
 msgid "MP3 File"
 msgstr "Datoteka MP3"
 
-#: ../src/et_core.c:2683
+#: ../src/et_core.c:2805
 msgid "MP2 File"
 msgstr "Datoteka MP2"
 
-#: ../src/et_core.c:2689
+#: ../src/et_core.c:2811
 msgid "Ogg Vorbis File"
 msgstr "Datoteka Ogg Vorbis"
 
-#: ../src/et_core.c:2695
+#: ../src/et_core.c:2817
 msgid "Speex File"
 msgstr "Datoteka Speex"
 
-#: ../src/et_core.c:2701
+#: ../src/et_core.c:2823
 msgid "FLAC File"
 msgstr "Datoteka FLAC"
 
-#: ../src/et_core.c:2706
+#: ../src/et_core.c:2828
 msgid "MusePack File"
 msgstr "Datoteka MusePack"
 
-#: ../src/et_core.c:2710
+#: ../src/et_core.c:2832
 msgid "Monkey's Audio File"
 msgstr "Zvočna datoteka Monkey"
 
-#: ../src/et_core.c:2715
+#: ../src/et_core.c:2837
 msgid "MP4/AAC File"
 msgstr "Datoteka MP4/AAC"
 
-#: ../src/et_core.c:2721
+#: ../src/et_core.c:2843
 msgid "Wavpack File"
 msgstr "Datoteka WavPack"
 
-#: ../src/et_core.c:2778 ../src/et_core.c:2833
+#: ../src/et_core.c:2849
+msgid "Opus File"
+msgstr "Datoteka Opus"
+
+#: ../src/et_core.c:2908 ../src/et_core.c:2963
 msgid "File not found"
 msgstr "Datoteke ni mogoče najti"
 
-#: ../src/et_core.c:2783
+#: ../src/et_core.c:2913
 #, c-format
 msgid "Cannot query file information (%s)"
 msgstr "Po podatkih o datoteki ni mogoče poizvedovati (%s)."
 
-#: ../src/et_core.c:2817
+#: ../src/et_core.c:2947
 msgid "Read-only file"
 msgstr "Datoteka samo za branje"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2881
+#: ../src/et_core.c:3011
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
@@ -2434,49 +2422,44 @@ msgstr[1] "%u datoteka"
 msgstr[2] "%u datoteki"
 msgstr[3] "%u datoteke"
 
-#: ../src/et_core.c:3086
+#: ../src/et_core.c:3215
 #, c-format
 msgid "Images (%d)"
 msgstr "Slike (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3128 ../src/flac_header.c:205
-#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
+#: ../src/et_core.c:3257 ../src/flac_header.c:205
+#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.cc:142
 #: ../src/mpeg_header.c:206 ../src/musepack_header.c:88
-#: ../src/ogg_header.c:401 ../src/wavpack_header.c:78
+#: ../src/ogg_header.c:401 ../src/opus_header.c:227 ../src/wavpack_header.c:78
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: ../src/et_core.c:3133 ../src/flac_header.c:210
-#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
+#: ../src/et_core.c:3262 ../src/flac_header.c:210
+#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.cc:147
 #: ../src/mpeg_header.c:211 ../src/musepack_header.c:93
-#: ../src/ogg_header.c:406 ../src/wavpack_header.c:83
+#: ../src/ogg_header.c:406 ../src/opus_header.c:232 ../src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/et_core.c:3276 ../src/scan.c:690
+#: ../src/et_core.c:3408 ../src/scan_dialog.c:688
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding"
 msgstr ""
 "Imena datoteke '%s' ni mogoče pretvoriti v sistemsko kodiranje imen datotek"
 
-#: ../src/et_core.c:3278
+#: ../src/et_core.c:3410
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Poskusite nastaviti okoljsko spremenljivko G_FILENAME_ENCODING."
 
-#: ../src/et_core.c:3279 ../src/scan.c:692
+#: ../src/et_core.c:3411 ../src/scan_dialog.c:690
 msgid "Filename translation"
 msgstr "Prevod imena datoteke"
 
-#: ../src/et_core.c:3940
-#, c-format
-msgid "Cannot change the permissions of file '%s' (%s)"
-msgstr "Spreminjanje dovoljenj datoteke '%s' je spodletelo (%s)"
-
-#: ../src/et_core.c:3978
+#: ../src/et_core.c:4116
 #, c-format
 msgid "Error writing tag type %d to file %s (%s)"
 msgstr "Napaka pri pisanju oznake vrste %d v datoteko %s (%s)"
@@ -2485,8 +2468,8 @@ msgstr "Napaka pri pisanju oznake vrste %d v datoteko %s (%s)"
 #. Mode
 #. mpeg4ip library seems to always return -1
 #. Mode
-#: ../src/flac_header.c:215 ../src/mp4_header.c:145 ../src/ogg_header.c:411
-#: ../src/wavpack_header.c:88
+#: ../src/flac_header.c:215 ../src/mp4_header.cc:153 ../src/ogg_header.c:411
+#: ../src/opus_header.c:237 ../src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Kanali:"
 
@@ -2495,7 +2478,7 @@ msgstr "Kanali:"
 msgid "Error while opening file: '%s' as FLAC (%s)."
 msgstr "Napaka pri odpiranju datoteke: '%s' kot FLAC (%s)."
 
-#: ../src/flac_tag.c:352 ../src/ogg_tag.c:347
+#: ../src/flac_tag.c:352 ../src/ogg_tag.c:310
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
@@ -2512,7 +2495,7 @@ msgstr "Slikovni blok ni veljaven: '%s'"
 msgid "Error: Failed to write comments to file '%s' (%s)."
 msgstr "Napaka: komentarjev ni mogoče zapisati v datoteko '%s' (%s)."
 
-#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:922
+#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1166
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Oznaka za '%s' zapisana"
@@ -2533,33 +2516,33 @@ msgstr ""
 msgid "Corrupted file"
 msgstr "Okvarjena datoteka"
 
-#: ../src/id3_tag.c:540
+#: ../src/id3_tag.c:555
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Oznaka za '%s' odstranjena"
 
-#: ../src/id3_tag.c:544 ../src/id3_tag.c:644
+#: ../src/id3_tag.c:559 ../src/id3_tag.c:659
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Napaka pri odstranjevanju oznake ID3v1 '%s' (%s)"
 
-#: ../src/id3_tag.c:546 ../src/id3_tag.c:616
+#: ../src/id3_tag.c:561 ../src/id3_tag.c:631
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Napaka pri odstranjevanju oznake ID3v2 '%s' (%s)"
 
-#: ../src/id3_tag.c:565
+#: ../src/id3_tag.c:580
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Napaka pri posodabljanju oznake ID3v2 '%s' (%s)"
 
-#: ../src/id3_tag.c:593
+#: ../src/id3_tag.c:608
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
 "version of id3lib is buggy"
 msgstr ""
 
-#: ../src/id3_tag.c:595
+#: ../src/id3_tag.c:610
 #, c-format
 msgid ""
 "If you reload this file, some characters in the tag may not be displayed "
@@ -2571,90 +2554,90 @@ msgid ""
 "File: %s"
 msgstr ""
 
-#: ../src/id3_tag.c:602
+#: ../src/id3_tag.c:617
 msgid "Buggy id3lib"
 msgstr "Hroščat id3lib"
 
-#: ../src/id3_tag.c:636
+#: ../src/id3_tag.c:651
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Napaka pri posodabljanju oznake ID3v1 '%s' (%s)"
 
-#: ../src/id3_tag.c:650 ../src/id3v24_tag.c:1049
+#: ../src/id3_tag.c:665 ../src/id3v24_tag.c:1048
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Oznaka za '%s' posodobljena"
 
-#: ../src/id3_tag.c:669
+#: ../src/id3_tag.c:684
 msgid "No error reported"
 msgstr "Ni poročil o napakah."
 
-#: ../src/id3_tag.c:671
+#: ../src/id3_tag.c:686
 msgid "No available memory"
 msgstr "Ni prostega pomnilnika."
 
-#: ../src/id3_tag.c:673
+#: ../src/id3_tag.c:688
 msgid "No data to parse"
 msgstr "Ni podatkov za razčlenjevanje"
 
-#: ../src/id3_tag.c:675
+#: ../src/id3_tag.c:690
 msgid "Improperly formatted data"
 msgstr "Neustrezno oblikovani podatki."
 
-#: ../src/id3_tag.c:677
+#: ../src/id3_tag.c:692
 msgid "No buffer to write to"
 msgstr "Ni medpomnilnika za pisanje"
 
-#: ../src/id3_tag.c:679
+#: ../src/id3_tag.c:694
 msgid "Buffer is too small"
 msgstr "Medpomnilnik je premajhen."
 
-#: ../src/id3_tag.c:681
+#: ../src/id3_tag.c:696
 msgid "Invalid frame ID"
 msgstr "Neveljaven ID okvirja."
 
-#: ../src/id3_tag.c:683
+#: ../src/id3_tag.c:698
 msgid "Requested field not found"
 msgstr "Zahtevanega polja ni mogoče najti"
 
-#: ../src/id3_tag.c:685
+#: ../src/id3_tag.c:700
 msgid "Unknown field type"
 msgstr "Neznana vrsta polja."
 
-#: ../src/id3_tag.c:687
+#: ../src/id3_tag.c:702
 msgid "Tag is already attached to a file"
 msgstr "Oznaka je datoteki že pripeta"
 
-#: ../src/id3_tag.c:689
+#: ../src/id3_tag.c:704
 msgid "Invalid tag version"
 msgstr "Neveljavna različica oznak"
 
-#: ../src/id3_tag.c:691
+#: ../src/id3_tag.c:706
 msgid "No file to parse"
 msgstr "Ni datoteke za razčlenjevanje"
 
-#: ../src/id3_tag.c:693
+#: ../src/id3_tag.c:708
 msgid "Attempting to write to a read-only file"
 msgstr "Poskus pisanja v datoteko, namenjeno branju"
 
-#: ../src/id3_tag.c:695
+#: ../src/id3_tag.c:710
 msgid "Error in compression/uncompression"
 msgstr "Napaka pri stiskanju/razširjanju"
 
-#: ../src/id3_tag.c:697
+#: ../src/id3_tag.c:712
 msgid "Unknown error message"
 msgstr "Neznano sporočilo o napaki"
 
-#: ../src/id3_tag.c:1301
+#: ../src/id3_tag.c:1316
 #, c-format
 msgid "Error while creating temporary file: '%s'"
 msgstr "Med ustvarjanjem nove datoteke je prišlo do napake: '%s'"
 
-#: ../src/id3_tag.c:1308
+#: ../src/id3_tag.c:1323
 msgid "Error while creating temporary file"
 msgstr "Pri ustvarjanju začasne datoteke je prišlo do napake"
 
-#: ../src/id3_tag.c:1328
+#: ../src/id3_tag.c:1343
 #, c-format
 msgid "Error while writing to file: '%s' (%s)"
 msgstr "Napaka pri pisanju v datoteko: '%s' (%s)"
@@ -2664,7 +2647,7 @@ msgstr "Napaka pri pisanju v datoteko: '%s' (%s)"
 #. * missing (not read for some reason) while reading from
 #. * the file.
 #.
-#: ../src/id3v24_tag.c:1504
+#: ../src/id3v24_tag.c:1503
 #, c-format
 msgid "Cannot write tag of file ‘%s’ (a byte was missing)"
 msgid_plural "Cannot write tag of file ‘%s’ (%s bytes were missing)"
@@ -2673,12 +2656,12 @@ msgstr[1] "V datoteko '%s' ni mogoče zapisati oznake (manjka %s bajt)"
 msgstr[2] "V datoteko '%s' ni mogoče zapisati oznake (manjkata %s bajta)"
 msgstr[3] "V datoteko '%s' ni mogoče zapisati oznake (manjkajo %s bajti)"
 
-#: ../src/id3v24_tag.c:1525
+#: ../src/id3v24_tag.c:1524
 #, c-format
 msgid "Cannot save tag of file '%s'"
 msgstr "Oznake datoteke '%s' ni mogoče zapisati"
 
-#: ../src/id3v24_tag.c:1536
+#: ../src/id3v24_tag.c:1535
 #, c-format
 msgid "Size error while saving tag of '%s'"
 msgstr "Prišlo je do napake pri shranjevanju oznake za '%s'"
@@ -2687,147 +2670,131 @@ msgstr "Prišlo je do napake pri shranjevanju oznake za '%s'"
 msgid "Log"
 msgstr "Dnevnik"
 
-#: ../src/misc.c:691
-msgid "Select File"
-msgstr "Izbor datoteke"
-
-#: ../src/misc.c:697
-msgid "Select Directory"
-msgstr "Izbor mape"
-
-#: ../src/misc.c:781
-msgid "No audio player defined"
-msgstr "Zvočni predvajalnik ni določen"
-
-#: ../src/misc.c:782
-msgid "Audio Player Warning"
-msgstr "Opozorilo zvočnega predvajalnika"
-
-#: ../src/misc.c:878
-msgid "Cannot fork another process"
-msgstr "Drugega procesa ni mogoče razvejiti"
+#: ../src/misc.c:720
+msgid "You must type a program name"
+msgstr "Vnesti morate ime programa"
 
-#. Translators: file size (bytes, kilobytes, megabytes, gigabytes,
-#. * terabytes).
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "B"
-msgstr "B"
+#: ../src/misc.c:721
+msgid "Program Name Error"
+msgstr "Napaka imena programa"
 
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "kB"
-msgstr "kB"
+#: ../src/misc.c:800
+#, c-format
+msgid "Executed command: %s"
+msgstr "Izveden ukaz: %s"
 
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "MB"
-msgstr "MB"
+#: ../src/misc.c:807
+#, c-format
+msgid "Failed to launch program: %s"
+msgstr "Zagon programa je spodletel: %s"
 
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "GB"
-msgstr "GB"
+#: ../src/misc.c:824
+msgid "Select File"
+msgstr "Izbor datoteke"
 
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "TB"
-msgstr "TB"
+#: ../src/misc.c:830
+msgid "Select Directory"
+msgstr "Izbor mape"
 
-#: ../src/misc.c:1145
+#: ../src/misc.c:1142
 msgid "Generate Playlist"
 msgstr "Ustvari seznam predvajanja"
 
-#: ../src/misc.c:1169
+#: ../src/misc.c:1166
 msgid "M3U Playlist Name"
 msgstr "Ime seznama predvajanja M3U"
 
-#: ../src/misc.c:1184
+#: ../src/misc.c:1181
 msgid "Use directory name"
 msgstr "Uporabi ime mape"
 
 #. Playlist options
-#: ../src/misc.c:1201
+#: ../src/misc.c:1198
 msgid "Playlist Options"
 msgstr "Možnosti seznama predvajanja"
 
-#: ../src/misc.c:1207
+#: ../src/misc.c:1204
 msgid "Include only the selected files"
 msgstr "Vključi le izbrane datoteke"
 
-#: ../src/misc.c:1210
+#: ../src/misc.c:1207
 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:1213
+#: ../src/misc.c:1210
 msgid "Use full path for files in playlist"
 msgstr "Za datoteke v seznamu predvajanja uporabi polno pot"
 
-#: ../src/misc.c:1216
+#: ../src/misc.c:1213
 msgid "Use relative path for files in playlist"
 msgstr "Za datoteke v seznamu predvajanja uporabi relativno pot"
 
 #. Create playlist in parent directory
-#: ../src/misc.c:1222
+#: ../src/misc.c:1219
 msgid "Create playlist in the parent directory"
 msgstr "Ustvari seznam predvajanja v nadrejeni mapi"
 
-#: ../src/misc.c:1225
+#: ../src/misc.c:1222
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Izbrana možnost določa, da bo seznam predvajanja ustvarjen v nadrejeni mapi."
 
 #. DOS Separator
-#: ../src/misc.c:1229
+#: ../src/misc.c:1226
 msgid "Use DOS directory separator"
 msgstr "Uporabi ločilo map za DOS"
 
-#: ../src/misc.c:1235
+#: ../src/misc.c:1232
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr "Ta možnost zamenja ločilo map za UNIX '/' v ločilo za DOS '\\'."
 
-#: ../src/misc.c:1244
+#: ../src/misc.c:1241
 msgid "Playlist Content"
 msgstr "Vsebina seznama predvajanja"
 
-#: ../src/misc.c:1250
+#: ../src/misc.c:1247
 msgid "Write only list of files"
 msgstr "Zapiši le seznam datotek"
 
-#: ../src/misc.c:1254
+#: ../src/misc.c:1251
 msgid "Write info using filename"
 msgstr "Zapiši podatke z uporabo imena datoteke"
 
-#: ../src/misc.c:1257
+#: ../src/misc.c:1254
 msgid "Write info using:"
 msgstr "Zapiši podatke z:"
 
-#: ../src/misc.c:1476
+#: ../src/misc.c:1468
 #, c-format
 msgid "Cannot write playlist file '%s'"
 msgstr "Ni mogoče zapisati datoteke seznama predvajanja '%s'."
 
-#: ../src/misc.c:1480
+#: ../src/misc.c:1472
 msgid "Playlist File Error"
 msgstr "Napaka datoteke seznama predvajanja"
 
-#: ../src/misc.c:1488
+#: ../src/misc.c:1480
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Datoteka seznama predvajanja '%s' zapisana."
 
-#: ../src/misc.c:1552 ../src/scan.c:3247 ../src/scan.c:3309
+#: ../src/misc.c:1544 ../src/scan_dialog.c:2709 ../src/scan_dialog.c:2771
 msgid "Invalid scanner mask"
 msgstr "Neveljavna maska preiskovalnika"
 
-#: ../src/misc.c:1916
+#: ../src/misc.c:1908
 msgid "CD"
 msgstr "CD"
 
-#: ../src/misc.c:1938
+#: ../src/misc.c:1930
 msgid "Find Files"
 msgstr "Najdi datoteke"
 
-#: ../src/misc.c:1970
+#: ../src/misc.c:1962
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2835,13 +2802,13 @@ msgstr ""
 "izpišejo vse datoteke."
 
 #. Where...
-#: ../src/misc.c:1976
+#: ../src/misc.c:1968
 msgid "In:"
 msgstr "V:"
 
 #. Translators: This option is for the previous 'in' option. For instance,
 #. * translate this as "Search" "In:" "the Filename".
-#: ../src/misc.c:1981
+#: ../src/misc.c:1973
 msgid "the Filename"
 msgstr "Ime datoteke"
 
@@ -2850,20 +2817,20 @@ 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:1987
+#: ../src/misc.c:1979
 msgid "the Tag"
 msgstr "Oznaka"
 
 #. Property of the search
-#: ../src/misc.c:1998 ../src/prefs.c:335
+#: ../src/misc.c:1990 ../src/prefs.c:335
 msgid "Case sensitive"
 msgstr "Razlikuj velike in male črke"
 
-#: ../src/misc.c:2225
+#: ../src/misc.c:2217
 msgid "Ready to search…"
 msgstr "Pripravljeno na iskanje ..."
 
-#: ../src/misc.c:2445
+#: ../src/misc.c:2437
 #, c-format
 msgid "Found one file"
 msgid_plural "Found %d files"
@@ -2872,96 +2839,96 @@ msgstr[1] "Najdena %d datoteka"
 msgstr[2] "Najdeni %d datoteki"
 msgstr[3] "Najdene %d datoteke"
 
-#: ../src/misc.c:2730
+#: ../src/misc.c:2722
 msgid "Load Filenames From a Text File"
 msgstr "Naloži imena datotek iz besedilne datoteke"
 
-#: ../src/misc.c:2759
+#: ../src/misc.c:2751
 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:2778
+#: ../src/misc.c:2770
 msgid " Load "
 msgstr " Naloži"
 
-#: ../src/misc.c:2796
+#: ../src/misc.c:2788
 msgid "Content of Text File"
 msgstr "Vsebina besedilne datoteke"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2817 ../src/misc.c:2912
+#: ../src/misc.c:2809 ../src/misc.c:2904
 msgid "Insert a blank line before the selected line"
 msgstr "Vstavi prazno vrstico pred izbrano vrstico"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2826 ../src/misc.c:2921
+#: ../src/misc.c:2818 ../src/misc.c:2913
 msgid "Delete the selected line"
 msgstr "Izbriši izbrano vrstico"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2835 ../src/misc.c:2930 ../src/misc.c:3416
+#: ../src/misc.c:2827 ../src/misc.c:2922 ../src/misc.c:3408
 msgid "Delete all blank lines"
 msgstr "Izbriši vse prazne vrstice"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2847 ../src/misc.c:2942
+#: ../src/misc.c:2839 ../src/misc.c:2934
 msgid "Move up the selected line"
 msgstr "Pomakni izbrano vrstico navzgor"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2856 ../src/misc.c:2951
+#: ../src/misc.c:2848 ../src/misc.c:2943
 msgid "Move down the selected line"
 msgstr "Pomakni izbrano vrstico navzdol"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2868 ../src/misc.c:2963 ../src/misc.c:3440
+#: ../src/misc.c:2860 ../src/misc.c:2955 ../src/misc.c:3432
 msgid "Reload"
 msgstr "Ponovno naloži"
 
-#: ../src/misc.c:2890
+#: ../src/misc.c:2882
 msgid "List of Files"
 msgstr "Seznam datotek"
 
-#: ../src/misc.c:2985
+#: ../src/misc.c:2977
 msgid "Selected line:"
 msgstr "Izbrana vrstica:"
 
-#: ../src/misc.c:3003
+#: ../src/misc.c:2995
 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:3090
+#: ../src/misc.c:3082
 #, c-format
 msgid "Cannot retrieve file info (%s)"
 msgstr "Podatkov o datoteki ni mogoče pridobiti (%s)."
 
-#: ../src/misc.c:3152
+#: ../src/misc.c:3144
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Ni mogoče odpreti datoteke '%s' (%s)"
 
-#: ../src/misc.c:3188
+#: ../src/misc.c:3180
 #, c-format
 msgid "Error reading file (%s)"
 msgstr "Napaka pri branju datoteke (%s)"
 
-#: ../src/misc.c:3404
+#: ../src/misc.c:3396
 msgid "Insert a blank line"
 msgstr "Vstavi prazno vrstico"
 
-#: ../src/misc.c:3410
+#: ../src/misc.c:3402
 msgid "Delete this line"
 msgstr "Izbriši to vrstico"
 
-#: ../src/misc.c:3425
+#: ../src/misc.c:3417
 msgid "Move up this line"
 msgstr "Premakni to vrstico navzgor"
 
-#: ../src/misc.c:3431
+#: ../src/misc.c:3423
 msgid "Move down this line"
 msgstr "Premakni to vrstico navzdol"
 
@@ -2971,26 +2938,26 @@ msgstr "Premakni to vrstico navzdol"
 msgid "Profile:"
 msgstr "Profil:"
 
-#: ../src/mp4_header.c:63 ../src/mp4_tag.c:65 ../src/mp4_tag.c:186
+#: ../src/mp4_header.cc:60 ../src/mp4_tag.cc:91 ../src/mp4_tag.cc:284
 msgid "MP4 format invalid"
 msgstr "Neveljaven zapis MP4"
 
-#: ../src/mp4_header.c:72 ../src/mp4_tag.c:74
+#: ../src/mp4_header.cc:68
 #, c-format
 msgid "File contains no audio track: '%s'"
 msgstr "Datoteka ne vsebuje zvočne sledi: '%s'"
 
-#: ../src/mp4_header.c:82
+#: ../src/mp4_header.cc:79
 #, c-format
 msgid "Error reading properties from file: '%s'"
 msgstr "Napaka med branjem lastnosti iz datoteke: '%s'"
 
-#: ../src/mp4_header.c:132 ../src/mpeg_header.c:204
+#: ../src/mp4_header.cc:140 ../src/mpeg_header.c:204
 #, c-format
 msgid "~%d kb/s"
 msgstr "~%d kb/s"
 
-#: ../src/mp4_tag.c:85 ../src/mp4_tag.c:194
+#: ../src/mp4_tag.cc:101 ../src/mp4_tag.cc:293
 #, c-format
 msgid "Error reading tags from file: '%s'"
 msgstr "Napaka med branjem oznak iz datoteke: '%s'"
@@ -3061,198 +3028,202 @@ msgstr ""
 msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
 msgstr "Napaka: odpiranje datoteke '%s' kot Vorbis je spodletelo (%s)."
 
-#: ../src/ogg_tag.c:186 ../src/ogg_tag.c:739
+#: ../src/ogg_tag.c:712 ../src/ogg_tag.c:887
 #, c-format
 msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Opozorilo: datoteka Ogg Vorbis '%s' vsebuje oznako ID3v2."
 
-#: ../src/picture.c:244 ../src/picture.c:269
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1258
 #, c-format
-msgid "Image file not loaded: %s"
-msgstr "Datoteka slike ni naložena: %s"
+msgid "Error with 'loader_write': %s"
+msgstr "Napaka ob 'loader_write': %s"
 
-#: ../src/picture.c:261
+#: ../src/ogg_tag.c:1050 ../src/picture.c:1181
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr "Napaka ob 'loader_close': %s"
+
+#: ../src/picture.c:104
+#, c-format
+msgid "Image file not saved: %s"
+msgstr "Datoteka slike ni shranjena: %s"
+
+#: ../src/picture.c:154
 #, c-format
 msgid "Cannot open file: '%s'"
 msgstr "Datoteke ni mogoče odpreti: '%s'"
 
-#: ../src/picture.c:265
+#: ../src/picture.c:158
 msgid "Image File Error"
 msgstr "Napaka slikovne datoteke"
 
-#: ../src/picture.c:276
+#: ../src/picture.c:162 ../src/picture.c:424
+#, c-format
+msgid "Image file not loaded: %s"
+msgstr "Datoteka slike ni naložena: %s"
+
+#: ../src/picture.c:446
 msgid "Image file loaded"
 msgstr "Slikovna datoteka naložena"
 
-#: ../src/picture.c:334
+#: ../src/picture.c:504
 msgid "Add Images"
 msgstr "Dodaj slike"
 
-#: ../src/picture.c:344 ../src/picture.c:700
+#: ../src/picture.c:514 ../src/picture.c:875
 msgid "All Files"
 msgstr "Vse datoteke"
 
-#: ../src/picture.c:350 ../src/picture.c:706
+#: ../src/picture.c:520 ../src/picture.c:881
 msgid "PNG and JPEG"
 msgstr "PNG in JPEG"
 
-#: ../src/picture.c:477
+#: ../src/picture.c:651
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Lastnosti slike %d/%d"
 
-#: ../src/picture.c:501
+#: ../src/picture.c:677
 msgid "Image Type"
 msgstr "Vrsta slike"
 
 #. Description of the picture
-#: ../src/picture.c:560
+#: ../src/picture.c:735
 msgid "Image Description:"
 msgstr "Opis slike:"
 
-#: ../src/picture.c:687
+#: ../src/picture.c:862
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Shrani sliko %d/%d"
 
-#: ../src/picture.c:759
-#, c-format
-msgid "Image file not saved: %s"
-msgstr "Datoteka slike ni shranjena: %s"
-
-#: ../src/picture.c:827
+#: ../src/picture.c:1022
 msgid "JPEG image"
 msgstr "Slika JPEG"
 
-#: ../src/picture.c:829
+#: ../src/picture.c:1024
 msgid "PNG image"
 msgstr "Slika PNG"
 
-#: ../src/picture.c:831
+#: ../src/picture.c:1026
+msgid "GIF image"
+msgstr "Slikovna datoteka GIF"
+
+#: ../src/picture.c:1028
 msgid "Unknown image"
 msgstr "Neznana slika"
 
-#: ../src/picture.c:843
+#: ../src/picture.c:1040
 msgid "32x32 pixel PNG file icon"
 msgstr "Ikona PNG velikosti 32x32 točk"
 
-#: ../src/picture.c:845
+#: ../src/picture.c:1042
 msgid "Other file icon"
 msgstr "Ikona druge vrste datoteke"
 
-#: ../src/picture.c:847
+#: ../src/picture.c:1044
 msgid "Cover (front)"
 msgstr "Prednja stran ovitka"
 
-#: ../src/picture.c:849
+#: ../src/picture.c:1046
 msgid "Cover (back)"
 msgstr "Hrbtna stran ovitka"
 
-#: ../src/picture.c:851
+#: ../src/picture.c:1048
 msgid "Leaflet page"
 msgstr "Stran knjižice"
 
-#: ../src/picture.c:853
+#: ../src/picture.c:1050
 msgid "Media (e.g. label side of CD)"
 msgstr "Medij (npr. stran CD z napisi)"
 
-#: ../src/picture.c:855
+#: ../src/picture.c:1052
 msgid "Lead artist/lead performer/soloist"
 msgstr "Glavni izvajalec/osrednji nastopajoči/solist"
 
-#: ../src/picture.c:857
+#: ../src/picture.c:1054
 msgid "Artist/performer"
 msgstr "Izvajalec"
 
-#: ../src/picture.c:859
+#: ../src/picture.c:1056
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: ../src/picture.c:861
+#: ../src/picture.c:1058
 msgid "Band/Orchestra"
 msgstr "Skupina/orkester"
 
-#: ../src/picture.c:865
+#: ../src/picture.c:1062
 msgid "Lyricist/text writer"
 msgstr "Avtor besedila"
 
-#: ../src/picture.c:867
+#: ../src/picture.c:1064
 msgid "Recording location"
 msgstr "Mesto snemanja"
 
-#: ../src/picture.c:869
+#: ../src/picture.c:1066
 msgid "During recording"
 msgstr "Med snemanjem"
 
-#: ../src/picture.c:871
+#: ../src/picture.c:1068
 msgid "During performance"
 msgstr "Med nastopom"
 
-#: ../src/picture.c:873
+#: ../src/picture.c:1070
 msgid "Movie/video screen capture"
 msgstr "Zaslonsko zajemanje videa"
 
-#: ../src/picture.c:875
+#: ../src/picture.c:1072
 msgid "A bright colored fish"
 msgstr "Svetlo obarvana riba"
 
-#: ../src/picture.c:877
+#: ../src/picture.c:1074
 msgid "Illustration"
 msgstr "Ilustracija"
 
-#: ../src/picture.c:879
+#: ../src/picture.c:1076
 msgid "Band/Artist logotype"
 msgstr "Logotip skupine/izvajalca"
 
-#: ../src/picture.c:881
+#: ../src/picture.c:1078
 msgid "Publisher/studio logotype"
 msgstr "Logotip založbe/studia"
 
-#: ../src/picture.c:885
+#: ../src/picture.c:1082
 msgid "Unknown image type"
 msgstr "Neznana vrsta slike"
 
-#: ../src/picture.c:915 ../src/picture.c:926
+#: ../src/picture.c:1112 ../src/picture.c:1123
 msgid "pixels"
 msgstr "točke"
 
-#: ../src/picture.c:916 ../src/picture.c:927
+#: ../src/picture.c:1113 ../src/picture.c:1124
 msgid "Type"
 msgstr "Vrsta"
 
-#: ../src/picture.c:928
+#: ../src/picture.c:1125
 msgid "Description"
 msgstr "Opis"
 
-#: ../src/picture.c:984
-#, c-format
-msgid "Error with 'loader_close': %s"
-msgstr "Napaka ob 'loader_close': %s"
-
-#: ../src/picture.c:1044
+#: ../src/picture.c:1241
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
 msgstr ""
 
-#: ../src/picture.c:1051
+#: ../src/picture.c:1248
 msgid "Cannot display the image"
 msgstr "Slike ni mogoče prikazati"
 
-#: ../src/picture.c:1053
+#: ../src/picture.c:1250
 msgid ""
 "Not enough data has been read to determine how to create the image buffer."
 msgstr ""
 
-#: ../src/picture.c:1055
+#: ../src/picture.c:1252
 msgid "Load Image File"
 msgstr "Naloži slikovno datoteko"
 
-#: ../src/picture.c:1061
-#, c-format
-msgid "Error with 'loader_write': %s"
-msgstr "Napaka ob 'loader_write': %s"
-
 #. Label
 #: ../src/prefs.c:152
 msgid "Default directory:"
@@ -4126,29 +4097,29 @@ msgstr "Ime uporabnika za posredovalni strežnik."
 msgid "User Password:"
 msgstr "Geslo uporabnika:"
 
-#: ../src/prefs.c:1337
-msgid "Password of user for the the proxy server."
-msgstr "Geslo uporabnika posredovalnega strežnika."
+#: ../src/prefs.c:1338
+msgid "Password of user for the proxy server."
+msgstr "Geslo uporabnika za posredniški strežnik. %s"
 
 #. Track Name list (CDDB results)
-#: ../src/prefs.c:1342
+#: ../src/prefs.c:1343
 msgid "Track Name List"
 msgstr "Seznam naslovov posnetkov"
 
-#: ../src/prefs.c:1349
+#: ../src/prefs.c:1350
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 
-#: ../src/prefs.c:1353
+#: ../src/prefs.c:1354
 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:1359
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4157,15 +4128,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: ../src/prefs.c:1373
+#: ../src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Potrditev"
 
-#: ../src/prefs.c:1378
+#: ../src/prefs.c:1379
 msgid "Confirm exit from program"
 msgstr "Potrdi izhod iz programa"
 
-#: ../src/prefs.c:1381
+#: ../src/prefs.c:1382
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4173,51 +4144,51 @@ msgstr ""
 "Izbrana možnost omogoči prikaz pogovornega okna, ki zahteva potrditev pred "
 "končanjem programa."
 
-#: ../src/prefs.c:1384
+#: ../src/prefs.c:1385
 msgid "Confirm writing of file tag"
 msgstr "Potrdi pisanje oznak v datoteko"
 
-#: ../src/prefs.c:1388
+#: ../src/prefs.c:1389
 msgid "Confirm renaming of file"
 msgstr "Potrdite preimenovanje datoteke"
 
-#: ../src/prefs.c:1392
+#: ../src/prefs.c:1393
 msgid "Confirm deleting of file"
 msgstr "Potrdite brisanje datoteke"
 
-#: ../src/prefs.c:1396
+#: ../src/prefs.c:1397
 msgid "Confirm writing of playlist"
 msgstr "Potrdite zapisovanje seznama predvajanja"
 
-#: ../src/prefs.c:1400
+#: ../src/prefs.c:1401
 msgid "Confirm changing directory when there are unsaved changes"
 msgstr "Potrdi spremembo mape, ko obstajajo neshranjene spremembe"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: ../src/prefs.c:1438
+#: ../src/prefs.c:1439
 #, c-format
 msgid "(Example: %.*d_-_Track_name_1.mp3)"
 msgstr "(Primer: %.*d_-_Ime_posnetka_1.mp3)"
 
 #. Translators: please do NOT translate '%.*d' in this string.
-#: ../src/prefs.c:1471
+#: ../src/prefs.c:1472
 #, c-format
 msgid "(Example: disc_%.*d_of_10/Track_name_1.mp3)"
 msgstr "(Primer: disk_%.*d_od_10/Ime_posnetka_1.mp3)"
 
-#: ../src/prefs.c:1613 ../src/setting.c:904
+#: ../src/prefs.c:1614 ../src/setting.c:904
 msgid "Configuration saved"
 msgstr "Nastavitve so shranjene"
 
-#: ../src/prefs.c:1621
+#: ../src/prefs.c:1622
 msgid "Configuration unchanged"
 msgstr "Nastavitve niso spremenjene"
 
-#: ../src/prefs.c:1707
+#: ../src/prefs.c:1713
 msgid "The selected path for 'Default path to files' is invalid"
 msgstr "Izbrana pot za 'Privzeta pot do datotek' je neveljavna"
 
-#: ../src/prefs.c:1708
+#: ../src/prefs.c:1715
 #, c-format
 msgid ""
 "Path: '%s'\n"
@@ -4226,110 +4197,110 @@ msgstr ""
 "Pot: '%s'\n"
 "Napaka: %s"
 
-#: ../src/prefs.c:1709
+#: ../src/prefs.c:1717
 msgid "Invalid Path Error"
 msgstr "Napaka neveljavne poti"
 
-#: ../src/prefs.c:1823
+#: ../src/prefs.c:1831
 #, c-format
 msgid "The audio file player '%s' cannot be found"
 msgstr "Predvajalnika zvočnih datotek '%s' ni mogoče najti"
 
-#: ../src/prefs.c:1825
+#: ../src/prefs.c:1833
 msgid "Audio Player Error"
 msgstr "Napaka zvočnega predvajalnika"
 
-#: ../src/scan.c:180
+#: ../src/scan_dialog.c:182
 msgid "Fill Tag"
 msgstr "Zapolni oznako"
 
-#: ../src/scan.c:358
+#: ../src/scan_dialog.c:356
 #, c-format
 msgid "Cannot calculate CRC value of file (%s)"
 msgstr "Vrednosti CDC datoteke ni mogoče izračunati (%s)"
 
-#: ../src/scan.c:373
+#: ../src/scan_dialog.c:371
 msgid "Tag successfully scanned"
 msgstr "Oznaka je uspešno preiskana"
 
-#: ../src/scan.c:375
+#: ../src/scan_dialog.c:373
 #, c-format
 msgid "Tag successfully scanned: %s"
 msgstr "Oznaka je uspešno preiskana: %s"
 
-#: ../src/scan.c:416
+#: ../src/scan_dialog.c:414
 #, c-format
 msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
 msgstr ""
 "Preiskovalnik oznak: nenavadno ... pripone '%s' v imenu datoteke '%s' ni "
 "mogoče najti"
 
-#: ../src/scan.c:498 ../src/scan.c:527
+#: ../src/scan_dialog.c:496 ../src/scan_dialog.c:525
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Napaka preiskovanja: ločila '%s' v '%s' ni mogoče najti"
 
-#: ../src/scan.c:714
+#: ../src/scan_dialog.c:712
 msgid "New filename successfully scanned"
 msgstr "Ime nove datoteke je uspešno preiskano"
 
-#: ../src/scan.c:717
+#: ../src/scan_dialog.c:715
 #, c-format
 msgid "New filename successfully scanned: %s"
 msgstr "Ime nove datoteke je uspešno preiskano: %s"
 
-#: ../src/scan.c:1817
+#: ../src/scan_dialog.c:1628
 #, c-format
 msgid "Error while processing fields: %s"
 msgstr "Napaka med obdelovanjem polj: %s"
 
 #. The window
-#: ../src/scan.c:2336
+#: ../src/scan_dialog.c:1798
 msgid "Tag and Filename Scan"
 msgstr "Preiskovanje oznak in imen datotek"
 
 #. TODO: Set related action to match AM_SCAN_FILES.
-#: ../src/scan.c:2345
+#: ../src/scan_dialog.c:1807
 msgid "Scan Files"
 msgstr "Preišči datoteke"
 
 #. Option Menu
-#: ../src/scan.c:2373
+#: ../src/scan_dialog.c:1835
 msgid "Scanner:"
 msgstr "Optični bralnik:"
 
-#: ../src/scan.c:2394
+#: ../src/scan_dialog.c:1856
 msgid "Select the type of scanner to use"
 msgstr "Izberite vrsto preiskovalnika za uporabo"
 
-#: ../src/scan.c:2403
+#: ../src/scan_dialog.c:1865
 msgid "Scanner Preferences"
 msgstr "Možnosti optičnega bralnika"
 
-#: ../src/scan.c:2412
+#: ../src/scan_dialog.c:1874
 msgid "Show / Hide Masks Editor"
 msgstr "Pokaži ali skrij urejevalnik mask"
 
-#: ../src/scan.c:2422
+#: ../src/scan_dialog.c:1884
 msgid "Show / Hide Legend"
 msgstr "Pokaži ali skrij legendo"
 
-#: ../src/scan.c:2452
+#: ../src/scan_dialog.c:1914
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse filename and "
 "path. Used to fill in tag fields"
 msgstr ""
 
 #. Preview label
-#: ../src/scan.c:2476
+#: ../src/scan_dialog.c:1938
 msgid "Fill tag preview"
 msgstr "Predogled zapolnjenja oznak"
 
-#: ../src/scan.c:2506
+#: ../src/scan_dialog.c:1968
 msgid "Prefix mask with current path"
 msgstr "Maska predpone s trenutno potjo"
 
-#: ../src/scan.c:2520
+#: ../src/scan_dialog.c:1982
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4338,15 +4309,15 @@ msgid ""
 msgstr ""
 
 #. Preview label
-#: ../src/scan.c:2545
+#: ../src/scan_dialog.c:2007
 msgid "Rename file preview"
 msgstr "Preimenuj predogled datoteke"
 
-#: ../src/scan.c:2564
+#: ../src/scan_dialog.c:2026
 msgid "Select fields:"
 msgstr "Izbor polj:"
 
-#: ../src/scan.c:2567
+#: ../src/scan_dialog.c:2029
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those which interest you"
@@ -4355,134 +4326,134 @@ msgstr ""
 "tista, ki so za vas zanimiva."
 
 #. Advice for Translators: set the first letter of filename translated
-#: ../src/scan.c:2571
+#: ../src/scan_dialog.c:2033
 msgid "F"
 msgstr "D"
 
-#: ../src/scan.c:2573
+#: ../src/scan_dialog.c:2035
 msgid "Process filename field"
 msgstr "Obdelaj polje imena datoteke"
 
 #. Advice for Translators: set the first letter of title translated
-#: ../src/scan.c:2575
+#: ../src/scan_dialog.c:2037
 msgid "T"
 msgstr "N"
 
-#: ../src/scan.c:2576
+#: ../src/scan_dialog.c:2038
 msgid "Process title field"
 msgstr "Obdelaj polje naslova"
 
 #. Advice for Translators: set the first letter of artist translated
-#: ../src/scan.c:2578
+#: ../src/scan_dialog.c:2040
 msgid "Ar"
 msgstr "I"
 
-#: ../src/scan.c:2579
+#: ../src/scan_dialog.c:2041
 msgid "Process file artist field"
 msgstr "Obdelaj polje izvajalca"
 
 #. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan.c:2581
+#: ../src/scan_dialog.c:2043
 msgid "AA"
 msgstr "Ia"
 
-#: ../src/scan.c:2582
+#: ../src/scan_dialog.c:2044
 msgid "Process album artist field"
 msgstr "Obdelaj polje izvajalca albuma"
 
 #. Advice for Translators: set the first letter of album translated
-#: ../src/scan.c:2584
+#: ../src/scan_dialog.c:2046
 msgid "Al"
 msgstr "Al"
 
-#: ../src/scan.c:2585
+#: ../src/scan_dialog.c:2047
 msgid "Process album field"
 msgstr "Obdelaj polje albuma"
 
 #. Advice for Translators: set the first letter of genre translated
-#: ../src/scan.c:2587
+#: ../src/scan_dialog.c:2049
 msgid "G"
 msgstr "Z"
 
-#: ../src/scan.c:2588
+#: ../src/scan_dialog.c:2050
 msgid "Process genre field"
 msgstr "Obdelaj polje zvrsti"
 
 #. Advice for Translators: set the first letter of comment translated
-#: ../src/scan.c:2590
+#: ../src/scan_dialog.c:2052
 msgid "Cm"
 msgstr "K"
 
-#: ../src/scan.c:2591
+#: ../src/scan_dialog.c:2053
 msgid "Process comment field"
 msgstr "Obdelaj polje komentarja"
 
 #. Advice for Translators: set the first letter of composer translated
-#: ../src/scan.c:2593
+#: ../src/scan_dialog.c:2055
 msgid "Cp"
 msgstr "Sk"
 
-#: ../src/scan.c:2594
+#: ../src/scan_dialog.c:2056
 msgid "Process composer field"
 msgstr "Obdelaj polje skladatelja"
 
 #. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan.c:2596
+#: ../src/scan_dialog.c:2058
 msgid "O"
 msgstr "O"
 
-#: ../src/scan.c:2597
+#: ../src/scan_dialog.c:2059
 msgid "Process original artist field"
 msgstr "Obdelaj polje izvirnega izvajalca"
 
 #. Advice for Translators: set the first letter of copyright translated
-#: ../src/scan.c:2599
+#: ../src/scan_dialog.c:2061
 msgid "Cr"
 msgstr "Ap"
 
-#: ../src/scan.c:2600
+#: ../src/scan_dialog.c:2062
 msgid "Process copyright field"
 msgstr "Obdelaj polje avtorske pravice"
 
 #. Advice for Translators: set the first letter of URL translated
-#: ../src/scan.c:2602
+#: ../src/scan_dialog.c:2064
 msgid "U"
 msgstr "U"
 
-#: ../src/scan.c:2603
+#: ../src/scan_dialog.c:2065
 msgid "Process URL field"
 msgstr "Obdelaj polje URL"
 
 #. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan.c:2605
+#: ../src/scan_dialog.c:2067
 msgid "E"
 msgstr "E"
 
-#: ../src/scan.c:2606
+#: ../src/scan_dialog.c:2068
 msgid "Process encoder name field"
 msgstr "Obdelaj polje imena kodirnika"
 
-#: ../src/scan.c:2650
+#: ../src/scan_dialog.c:2112
 msgid "Invert selection"
 msgstr "Preobrni izbor"
 
-#: ../src/scan.c:2657
+#: ../src/scan_dialog.c:2119
 msgid "Select/Unselect all"
 msgstr "Izberi ali prekliči izbor vseh"
 
-#: ../src/scan.c:2672
+#: ../src/scan_dialog.c:2134
 msgid "Convert:"
 msgstr "Pretvori:"
 
-#: ../src/scan.c:2674
+#: ../src/scan_dialog.c:2136
 msgid "to: "
 msgstr "v:"
 
-#: ../src/scan.c:2681
+#: ../src/scan_dialog.c:2143
 msgid "Do not convert"
 msgstr "Ne pretvori"
 
-#: ../src/scan.c:2700
+#: ../src/scan_dialog.c:2162
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4490,7 +4461,7 @@ msgstr ""
 "Podčrtaj ali niz '%20' zamenja en presledek. Primer: prej 'Besedilo"
 "%20Vnosa', poslej 'Besedilo Vnosa'."
 
-#: ../src/scan.c:2703
+#: ../src/scan_dialog.c:2165
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4498,38 +4469,38 @@ msgstr ""
 "Znak za presledek nadomesti z znakom za podčrtaj. Primer: prej 'Besedilo "
 "Vnosa', poslej 'Besedilo_Vnosa'."
 
-#: ../src/scan.c:2706
+#: ../src/scan_dialog.c:2168
 msgid ""
 "Replace a string by another one. Note that the search is case sensitive."
 msgstr ""
 "Zamenjaj niz z drugim. Iskanje upošteva razlikovanje med velikimi in malimi "
 "črkami."
 
-#: ../src/scan.c:2713
+#: ../src/scan_dialog.c:2175
 msgid "Capitalize all"
 msgstr "Velike začetnice povsod"
 
-#: ../src/scan.c:2715
+#: ../src/scan_dialog.c:2177
 msgid "Lowercase all"
 msgstr "Povsod male črke"
 
-#: ../src/scan.c:2717
+#: ../src/scan_dialog.c:2179
 msgid "Capitalize first letter"
 msgstr "Vsaka beseda naj ima veliko začetnico"
 
-#: ../src/scan.c:2719
+#: ../src/scan_dialog.c:2181
 msgid "Capitalize the first letter of each word"
 msgstr "Naj bo prva črka vsake besede velika"
 
-#: ../src/scan.c:2720
+#: ../src/scan_dialog.c:2182
 msgid "Detect Roman numerals"
 msgstr "Zaznaj rimske številke"
 
-#: ../src/scan.c:2722
+#: ../src/scan_dialog.c:2184
 msgid "Do not change capitalization"
 msgstr "Ne spreminjaj začetnic"
 
-#: ../src/scan.c:2744
+#: ../src/scan_dialog.c:2206
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4537,7 +4508,7 @@ msgstr ""
 "Pretvori vse besede v vseh poljih v velike črke. Primer: prej 'BESEDILO "
 "vnosa', poslej 'BESEDILO VNOSA'."
 
-#: ../src/scan.c:2747
+#: ../src/scan_dialog.c:2209
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4545,7 +4516,7 @@ msgstr ""
 "Pretvori vse besede v vseh poljih v male črke. Primer: prej 'BESEDILO "
 "vnosa', poslej 'besedilo vnosa'."
 
-#: ../src/scan.c:2750
+#: ../src/scan_dialog.c:2212
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4553,7 +4524,7 @@ msgstr ""
 "Pretvori začetnico prve besede v vseh poljih v veliko začetnico. Primer: "
 "prej 'Besedilo VNOSA', poslej 'Besedilo vnosa'."
 
-#: ../src/scan.c:2753
+#: ../src/scan_dialog.c:2215
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4561,7 +4532,7 @@ msgstr ""
 "Pretvori začetnico vsake besede v vseh poljih v veliko začetnico. Primer: "
 "prej 'Besedilo VNOSA', poslej 'Besedilo Vnosa'."
 
-#: ../src/scan.c:2756
+#: ../src/scan_dialog.c:2218
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -4569,19 +4540,19 @@ msgstr ""
 "Vsili pretvorbo v rimske številke in zapis z velikimi črkami. Na primer: "
 "vrednost 'ix. besedilo vnosa' se pretvori v : 'IX. Besedilo Vnosa'."
 
-#: ../src/scan.c:2764
+#: ../src/scan_dialog.c:2226
 msgid "Insert a space before uppercase letters"
 msgstr "Vstavi presledek pred veliko črko"
 
-#: ../src/scan.c:2766
+#: ../src/scan_dialog.c:2228
 msgid "Remove duplicate spaces and underscores"
 msgstr "Odstrani podvojene presledke in podčrtaje"
 
-#: ../src/scan.c:2768
+#: ../src/scan_dialog.c:2230
 msgid "Do not change word separators"
 msgstr "Ne spremeni ločila besed"
 
-#: ../src/scan.c:2782
+#: ../src/scan_dialog.c:2244
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4589,7 +4560,7 @@ msgstr ""
 "Vsi presledki med besedami so odstranjeni. Primer: prej 'Besedilo v vnosu', "
 "potem 'Besedilovvnosu'."
 
-#: ../src/scan.c:2785
+#: ../src/scan_dialog.c:2247
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4597,7 +4568,7 @@ msgstr ""
 "Pred vsako veliko črko se vstavi presledek. Primer: prej 'BesediloVnosa', "
 "nato 'Besedilo Vnosa'."
 
-#: ../src/scan.c:2788
+#: ../src/scan_dialog.c:2250
 msgid ""
 "Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4608,141 +4579,141 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2795
+#: ../src/scan_dialog.c:2257
 msgid "Legend"
 msgstr "Legenda"
 
-#: ../src/scan.c:2801
+#: ../src/scan_dialog.c:2263
 #, c-format
 msgid "%a: artist"
 msgstr "%a: izvajalec"
 
-#: ../src/scan.c:2804
+#: ../src/scan_dialog.c:2266
 msgid "%z: album artist"
 msgstr "%z: izvajalec albuma"
 
-#: ../src/scan.c:2807
+#: ../src/scan_dialog.c:2269
 msgid "%b: album"
 msgstr "%b: album"
 
-#: ../src/scan.c:2810
+#: ../src/scan_dialog.c:2272
 #, c-format
 msgid "%c: comment"
 msgstr "%c: komentar"
 
-#: ../src/scan.c:2813
+#: ../src/scan_dialog.c:2275
 #, c-format
 msgid "%p: composer"
 msgstr "%p: skladatelj"
 
-#: ../src/scan.c:2816
+#: ../src/scan_dialog.c:2278
 msgid "%r: copyright"
 msgstr "%r: avtorske pravice"
 
-#: ../src/scan.c:2819
+#: ../src/scan_dialog.c:2281
 #, c-format
 msgid "%d: disc number"
 msgstr "%d: številka diska"
 
-#: ../src/scan.c:2822
+#: ../src/scan_dialog.c:2284
 #, c-format
 msgid "%e: encoded by"
 msgstr "%e: kodirali"
 
-#: ../src/scan.c:2825
+#: ../src/scan_dialog.c:2287
 #, c-format
 msgid "%g: genre"
 msgstr "%g: zvrst"
 
-#: ../src/scan.c:2828
+#: ../src/scan_dialog.c:2290
 #, c-format
 msgid "%i: ignored"
 msgstr "%i: prezrto"
 
-#: ../src/scan.c:2831
+#: ../src/scan_dialog.c:2293
 msgid "%l: number of tracks"
 msgstr "%l: število posnetkov"
 
-#: ../src/scan.c:2834
+#: ../src/scan_dialog.c:2296
 #, c-format
 msgid "%o: orig. artist"
 msgstr "%o: izvirni izvajalec"
 
-#: ../src/scan.c:2837
+#: ../src/scan_dialog.c:2299
 #, c-format
 msgid "%n: track"
 msgstr "%n: posnetek"
 
-#: ../src/scan.c:2840
+#: ../src/scan_dialog.c:2302
 msgid "%t: title"
 msgstr "%t: naslov"
 
-#: ../src/scan.c:2843
+#: ../src/scan_dialog.c:2305
 #, c-format
 msgid "%u: URL"
 msgstr "%u: naslov URL"
 
-#: ../src/scan.c:2846
+#: ../src/scan_dialog.c:2308
 #, c-format
 msgid "%x: number of discs"
 msgstr "%x: število diskov"
 
-#: ../src/scan.c:2849
+#: ../src/scan_dialog.c:2311
 msgid "%y: year"
 msgstr "%y: leto"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2856
+#: ../src/scan_dialog.c:2318
 msgid "Mask Editor"
 msgstr "Urejevalnik mask"
 
-#: ../src/scan.c:2910
+#: ../src/scan_dialog.c:2372
 msgid "Create New Mask"
 msgstr "Ustvari novo masko"
 
-#: ../src/scan.c:2920
+#: ../src/scan_dialog.c:2382
 msgid "Move Up this Mask"
 msgstr "Premakni masko navzgor"
 
-#: ../src/scan.c:2930
+#: ../src/scan_dialog.c:2392
 msgid "Move Down this Mask"
 msgstr "Premakni masko navzdol"
 
-#: ../src/scan.c:2940
+#: ../src/scan_dialog.c:2402
 msgid "Duplicate Mask"
 msgstr "Podvoji masko"
 
-#: ../src/scan.c:2950
+#: ../src/scan_dialog.c:2412
 msgid "Add Default Masks"
 msgstr "Dodaj privzete maske"
 
-#: ../src/scan.c:2960
+#: ../src/scan_dialog.c:2422
 msgid "Remove Mask"
 msgstr "Odstrani masko"
 
-#: ../src/scan.c:2970
+#: ../src/scan_dialog.c:2432
 msgid "Save Masks"
 msgstr "Shrani maske"
 
-#: ../src/scan.c:3550
+#: ../src/scan_dialog.c:3012
 msgid "New_mask"
 msgstr "Nova _maska"
 
-#: ../src/scan.c:3589
+#: ../src/scan_dialog.c:3051
 msgid "Copy: No row selected"
 msgstr "Kopiraj: izbrana ni nobena vrstica"
 
-#: ../src/scan.c:3682
+#: ../src/scan_dialog.c:3144
 msgid "Remove: No row selected"
 msgstr "Odstrani: izbrana ni nobena vrstica"
 
-#: ../src/scan.c:3729
+#: ../src/scan_dialog.c:3191
 msgid "Move Up: No row selected"
 msgstr "Premakni navzgor: izbrana ni nobena vrstica"
 
-#: ../src/scan.c:3773
+#: ../src/scan_dialog.c:3235
 msgid "Move Down: No row selected"
 msgstr "Premakni navzdol: izbrana ni nobena vrstica"
 
@@ -4756,117 +4727,131 @@ msgstr "Ni mogoče zapisati nastavitvene datoteke: %s (%s)"
 msgid "Error while writing configuration file: %s"
 msgstr "Napaka med pisanjem v nastavitveno datoteko: %s."
 
-#: ../src/setting.c:1104
+#: ../src/setting.c:1100
 #, c-format
 msgid "Cannot open configuration file '%s' (%s)"
 msgstr "Ni mogoče odpreti nastavitvene datoteke '%s' (%s)"
 
-#: ../src/setting.c:1106
+#: ../src/setting.c:1102
 msgid "Loading default configuration"
 msgstr "Nalaganje privzetih nastavitev"
 
-#: ../src/setting.c:1147
+#: ../src/setting.c:1143
 #, c-format
 msgid "Cannot create or open file '%s' (%s)"
 msgstr "Ustvarjanje ali odpiranje '%s' je spodletelo (%s)"
 
-#: ../src/setting.c:1207
+#: ../src/setting.c:1203
 #, c-format
 msgid "Error: Cannot write list to file: %s (%s)"
 msgstr "Napaka: seznama ni mogoče zapisati v datoteko: %s (%s)"
 
-#: ../src/setting.c:1225
+#: ../src/setting.c:1221
 #, c-format
 msgid "Error while writing list file: %s"
 msgstr "Napaka med pisanjem v seznamsko datoteko: %s"
 
 #. Fall back to defaults
-#: ../src/setting.c:1305
+#: ../src/setting.c:1301
 msgid "Loading default 'Fill Tag' masks…"
 msgstr "Nalaganje privzetih mask za 'Zapolnjevanje oznak' …"
 
 #. Fall back to defaults
-#: ../src/setting.c:1335
+#: ../src/setting.c:1331
 msgid "Loading default 'Rename File' masks…"
 msgstr "Nalaganje privzetih mask 'Preimenuj datoteko' …"
 
 #. Fall back to defaults
-#: ../src/setting.c:1361
+#: ../src/setting.c:1357
 msgid "Loading default 'Rename Directory' masks…"
 msgstr "Nalaganje privzetih mask 'Preimenuj mapo' …"
 
-#: ../src/setting.c:1572
+#: ../src/setting.c:1568
 #, c-format
 msgid "Migrating configuration from directory '%s' to '%s'"
 msgstr "Premikanje nastavitve iz mape '%s' v '%s'"
 
-#: ../src/setting.c:1596
+#: ../src/setting.c:1592
 #, c-format
 msgid "Failed to migrate configuration file '%s'"
 msgstr "Preselitev nastavitvene datoteke '%s' je spodletela"
 
-#: ../src/setting.c:1633
+#: ../src/setting.c:1629
 #, c-format
 msgid "Error: Cannot create directory '%s' (%s)"
 msgstr "Napaka: mape '%s' ni mogoče ustvariti (%s)"
 
-#. Log_Print(_("DLL '%s' not already loaded. Try loading it..."), dllname);
-#: ../src/win32/win32dep.c:126
-#, c-format
-msgid "DLL '%s' not already loaded. Try loading it..."
-msgstr "DLL '%s' še vedno ni naložen. Poskusite ga naložiti ..."
+#~ msgid "The program '%s' cannot be found"
+#~ msgstr "Programa '%s' ni mogoče najti."
 
-#. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: ../src/win32/win32dep.c:130
-#, c-format
-msgid "DLL '%s' could not be loaded"
-msgstr "Knjižnice DLL '%s' ni mogoče naložiti."
+#~ msgid "Cannot execute ‘%s’ (%s)"
+#~ msgstr "Ni mogoče izvesti programa ‘%s’ (%s)"
 
-#. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: ../src/win32/win32dep.c:140
-#, c-format
-msgid "This version of '%s' contains '%s'"
-msgstr "Ta različica '%s' vsebuje '%s'"
+#~ msgid "Cannot fork another process\n"
+#~ msgstr "Ni mogoče razvejiti v drugo opravilo\n"
 
-#. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: ../src/win32/win32dep.c:146
-#, c-format
-msgid "Function '%s' not found in DLL '%s'"
-msgstr "Funkcije '%s' ni mogoče najti v knjižnici DLL '%s'"
+#~ msgid "EasyTAG version %s: Abnormal exit (PID: %d)"
+#~ msgstr "Program EasyTAG različice %s: nenormalen konec (PID: %d)"
 
-#. ET_Win32_Path_Replace_Backslashes(app_data_dir);
-#. Log_Print(_("EasyTAG settings directory: '%s'"), app_data_dir);
-#: ../src/win32/win32dep.c:282
-#, c-format
-msgid "EasyTAG settings directory: '%s'"
-msgstr "Mapa nastavitev EasyTAG: '%s'"
+#~ msgid "Received signal '%s' (%d)"
+#~ msgstr "Prejet signal '%s' (%d)"
 
-#. Log_Print(_("weasytag_init start..."));
-#: ../src/win32/win32dep.c:472
-#, c-format
-msgid "weasytag_init start..."
-msgstr "Začenjanje weasytag_init ..."
+#~ msgid "EasyTAG version %s: Abnormal exit (PID: %d)."
+#~ msgstr "EasyTAG različice %s: neobičajni izhod (PID: %d)."
 
-#. Log_Print(_("EasyTAG version: %s"),VERSION);
-#. g_print(_("EasyTAG version: %s"),VERSION);
-#. g_print("\n");
-#: ../src/win32/win32dep.c:478
-#, c-format
-msgid "GLib version: %u.%u.%u\n"
-msgstr "Različica Glib: %u.%u.%u\n"
+#~ msgid "Cannot change the permissions of file '%s' (%s)"
+#~ msgstr "Spreminjanje dovoljenj datoteke '%s' je spodletelo (%s)"
 
-#. Set Environmental Variables
-#. Log_Print(_("weasytag_init end..."));
-#: ../src/win32/win32dep.c:496
-#, c-format
-msgid "weasytag_init end..."
-msgstr "Zaključevanje weasytag_init ..."
+#~ msgid "No audio player defined"
+#~ msgstr "Zvočni predvajalnik ni določen"
 
-#. Log_Print(_("Audio player: '%s'"), player);
-#: ../src/win32/win32dep.c:620
-#, c-format
-msgid "Audio player: '%s'"
-msgstr "Predvajalnik zvoka: '%s'"
+#~ msgid "Audio Player Warning"
+#~ msgstr "Opozorilo zvočnega predvajalnika"
+
+#~ msgid "Cannot fork another process"
+#~ msgstr "Drugega procesa ni mogoče razvejiti"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB"
+#~ msgstr "MB"
+
+#~ msgid "GB"
+#~ msgstr "GB"
+
+#~ msgid "TB"
+#~ msgstr "TB"
+
+#~ msgid "DLL '%s' not already loaded. Try loading it..."
+#~ msgstr "DLL '%s' še vedno ni naložen. Poskusite ga naložiti ..."
+
+#~ msgid "DLL '%s' could not be loaded"
+#~ msgstr "Knjižnice DLL '%s' ni mogoče naložiti."
+
+#~ msgid "This version of '%s' contains '%s'"
+#~ msgstr "Ta različica '%s' vsebuje '%s'"
+
+#~ msgid "Function '%s' not found in DLL '%s'"
+#~ msgstr "Funkcije '%s' ni mogoče najti v knjižnici DLL '%s'"
+
+#~ msgid "EasyTAG settings directory: '%s'"
+#~ msgstr "Mapa nastavitev EasyTAG: '%s'"
+
+#~ msgid "weasytag_init start..."
+#~ msgstr "Začenjanje weasytag_init ..."
+
+#~ msgid "GLib version: %u.%u.%u\n"
+#~ msgstr "Različica Glib: %u.%u.%u\n"
+
+#~ msgid "weasytag_init end..."
+#~ msgstr "Zaključevanje weasytag_init ..."
+
+#~ msgid "Audio player: '%s'"
+#~ msgstr "Predvajalnik zvoka: '%s'"
 
 #~ msgid "Cannot execute %s (error %d)\n"
 #~ msgstr "Ni mogoče izvesti %s (napaka %d)\n"
diff --git a/src/easytag.c b/src/easytag.c
index cbd3f55..bcffeb1 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -1500,7 +1500,6 @@ Mini_Button_Clicked (GObject *object)
         etfilelist     = ET_Sort_File_List(etfilelist,SORTING_FILE_MODE);
         etfilelistfull = ET_Sort_File_List(etfilelistfull,SORTING_FILE_MODE);
 
-        for (l = etfilelist; l != NULL; l = g_list_next (l))
         while (etfilelist && etfilelistfull)
         {
             // To get the path of the file
@@ -4333,7 +4332,7 @@ Convert_First_Letters_Uppercase (GtkWidget *entry)
 {
     gchar *string = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
 
-    Scan_Process_Fields_First_Letters_Uppercase(string);
+    Scan_Process_Fields_First_Letters_Uppercase (&string);
     gtk_entry_set_text(GTK_ENTRY(entry),string);
     g_free(string);
 }
diff --git a/src/gio_wrapper.cc b/src/gio_wrapper.cc
index 9599494..e35b2f1 100644
--- a/src/gio_wrapper.cc
+++ b/src/gio_wrapper.cc
@@ -17,6 +17,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include "config.h"
+
+#ifdef ENABLE_MP4
+
 #include "gio_wrapper.h"
 
 GIO_InputStream::GIO_InputStream (GFile * file_) :
@@ -256,7 +260,7 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
     GFileIOStream *tstr;
     /* FIXME: Check for NULL. */
     GFile *tmp = g_file_new_tmp ("easytag-XXXXXX", &tstr, NULL);
-    char *buffer[4096];
+    char buffer[4096];
     gsize r;
 
     GOutputStream *ostream = g_io_stream_get_output_stream (G_IO_STREAM (tstr));
@@ -265,8 +269,8 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
     seek (0);
 
     while (g_input_stream_read_all (istream, buffer,
-                                    MIN (sizeof (buffer), start), &r, NULL,
-                                    &error) && r > 0)
+                                    MIN (G_N_ELEMENTS (buffer), start),
+                                    &r, NULL, &error) && r > 0)
     {
         gsize w;
         g_output_stream_write_all (ostream, buffer, r, &w, NULL, &error);
@@ -284,7 +288,6 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
 	}
 
         start -= r;
-        g_warning ("Wrote %lu bytes of %lu: %.*s", r, start, (int)r, buffer);
     }
 
     if (error)
@@ -471,3 +474,5 @@ const GError *GIO_IOStream::getError () const
 {
     return error;
 }
+
+#endif /* ENABLE_MP4 */
diff --git a/src/gio_wrapper.h b/src/gio_wrapper.h
index dc6c9da..e49e54d 100644
--- a/src/gio_wrapper.h
+++ b/src/gio_wrapper.h
@@ -20,6 +20,10 @@
 #ifndef ET_GIO_WRAPPER_H_
 #define ET_GIO_WRAPPER_H_
 
+#include "config.h"
+
+#ifdef ENABLE_MP4
+
 #include <tiostream.h>
 #include <gio/gio.h>
 
@@ -79,4 +83,6 @@ private:
     GError *error;
 };
 
+#endif /* ENABLE_MP4 */
+
 #endif /* ET_GIO_WRAPPER_H_ */
diff --git a/src/id3_tag.c b/src/id3_tag.c
index dabec6d..ebd5959 100644
--- a/src/id3_tag.c
+++ b/src/id3_tag.c
@@ -84,6 +84,53 @@ static gboolean Id3tag_Check_If_Id3lib_Is_Bugged (void);
  * Functions *
  *************/
 
+/**
+ * et_id3tag_get_tpos_from_file_tag:
+ * @FileTag: File_Tag to get disc_number and disc_total from
+ *
+ * This function will return TPOS from FileTag.
+ * Returns: a newly allocated string, should be freed using g_free.
+ */
+gchar *
+et_id3tag_get_tpos_from_file_tag (File_Tag *FileTag)
+{
+    GString *gstring;
+    gchar *p;
+
+    gstring = g_string_new ("");
+    p = FileTag->disc_number;
+
+    while (*p)
+    {
+        if (!isdigit (*p))
+        {
+            break;
+        }
+
+        g_string_append_c (gstring, *p);
+        p++;
+    }
+
+    if (FileTag->disc_total && *FileTag->disc_total)
+    {
+        g_string_append_c (gstring, '/');
+        p = FileTag->disc_total;
+
+        while (*p)
+        {
+            if (!isdigit (*p))
+            {
+                break;
+            }
+
+            g_string_append_c (gstring, *p);
+            p++;
+        }
+    }
+
+    return g_string_free (gstring, FALSE);
+}
+
 /*
  * Write the ID3 tags to the file. Returns TRUE on success, else 0.
  */
@@ -258,17 +305,7 @@ Id3tag_Write_File_v23Tag (ET_File *ETFile)
     {
         id3_frame = ID3Frame_NewID (ID3FID_PARTINSET);
         ID3Tag_AttachFrame (id3_tag, id3_frame);
-
-		if (FileTag->disc_total && g_utf8_strlen (FileTag->disc_total, -1) > 0)
-        {
-            string1 = g_strconcat (FileTag->disc_number, "/",
-                                   FileTag->disc_total, NULL);
-        }
-        else
-        {
-            string1 = g_strdup (FileTag->disc_number);
-        }
-
+        string1 = et_id3tag_get_tpos_from_file_tag (FileTag);
         Id3tag_Set_Field (id3_frame, ID3FN_TEXT, string1);
         g_free (string1);
         has_disc_number = TRUE;
diff --git a/src/id3_tag.h b/src/id3_tag.h
index ffae191..9424506 100644
--- a/src/id3_tag.h
+++ b/src/id3_tag.h
@@ -43,5 +43,6 @@ gboolean Id3tag_Write_File_Tag    (ET_File *ETFile);
 gchar   *Id3tag_Genre_To_String (unsigned char genre_code);
 guchar   Id3tag_String_To_Genre (gchar *genre);
 
+gchar *et_id3tag_get_tpos_from_file_tag (File_Tag *file_tag);
 
 #endif /* __ID3TAG_H__ */
diff --git a/src/id3lib/c_wrapper.cpp b/src/id3lib/c_wrapper.cpp
index c4ad235..7f63406 100644
--- a/src/id3lib/c_wrapper.cpp
+++ b/src/id3lib/c_wrapper.cpp
@@ -32,6 +32,8 @@
 #include <id3/field.h>
 #include <id3/tag.h>
 
+#include "id3_bugfix.h"
+
 #ifdef __cplusplus
 extern "C"
 {
diff --git a/src/id3v24_tag.c b/src/id3v24_tag.c
index 9324ef2..85f16c6 100644
--- a/src/id3v24_tag.c
+++ b/src/id3v24_tag.c
@@ -893,20 +893,14 @@ gboolean Id3tag_Write_File_v24Tag (ET_File *ETFile)
     /***************
      * Part of set *
      ***************/
-    if (FileTag->disc_number && FileTag->disc_total && *FileTag->disc_total)
+    if (FileTag->disc_number)
     {
-        string1 = g_strconcat (FileTag->disc_number, "/", FileTag->disc_total,
-                               NULL);
-    }
-    else
-    {
-        string1 = g_strdup (FileTag->disc_number);
+        string1 = et_id3tag_get_tpos_from_file_tag (FileTag);
+        etag_set_tags (string1, "TPOS", ID3_FIELD_TYPE_STRINGLIST, NULL, v2tag,
+                       &strip_tags);
+        g_free (string1);
     }
 
-    etag_set_tags (string1, "TPOS", ID3_FIELD_TYPE_STRINGLIST, NULL, v2tag,
-                   &strip_tags);
-    g_free (string1);
-
     /********
      * Year *
      ********/
diff --git a/src/ogg_tag.h b/src/ogg_tag.h
index f2137c1..d2099a5 100644
--- a/src/ogg_tag.h
+++ b/src/ogg_tag.h
@@ -24,6 +24,11 @@
 
 
 #include <glib.h>
+
+#include "config.h"
+
+#ifdef ENABLE_OGG
+
 #include "vcedit.h"
 #include "et_core.h"
 
@@ -33,9 +38,10 @@
 gboolean ogg_tag_read_file_tag (gchar *filename, File_Tag *FileTag,
                                 GError **error);
 gboolean ogg_tag_write_file_tag (ET_File *ETFile, GError **error);
-void
-et_add_file_tags_from_vorbis_comments (vorbis_comment *vc, File_Tag *FileTag,
-                                       const gchar *filename_utf8);
-void
-et_add_vorbis_comments_from_file_tags (vorbis_comment *vc, File_Tag *FileTag);
+
+void et_add_file_tags_from_vorbis_comments (vorbis_comment *vc, File_Tag *FileTag, const gchar *filename_utf8);
+void et_add_vorbis_comments_from_file_tags (vorbis_comment *vc, File_Tag *FileTag);
+
+#endif /* ENABLE_OGG */
+
 #endif /* __OGG_TAG_H__ */
diff --git a/src/picture.c b/src/picture.c
index 6eb5997..82e6aee 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -1329,12 +1329,10 @@ void Picture_Free (Picture *pic)
 static Picture *
 et_picture_load_file_data (GFile *file, GError **error)
 {
-    Picture *pic;
-    gchar *buffer = NULL;
     gsize size;
-    gsize bytes_read;
     GFileInfo *info;
     GFileInputStream *file_istream;
+    GOutputStream *ostream;
 
     info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SIZE,
                               G_FILE_QUERY_INFO_NONE, NULL, error);
@@ -1354,17 +1352,26 @@ et_picture_load_file_data (GFile *file, GError **error)
     }
 
     size = g_file_info_get_size (info);
-    buffer = g_malloc (size);
     g_object_unref (info);
 
-    if (!g_input_stream_read_all (G_INPUT_STREAM (file_istream), buffer, size,
-                                  &bytes_read, NULL, error))
+    /* HTTP servers may not report a size, or the file could be empty. */
+    if (size == 0)
+    {
+        ostream = g_memory_output_stream_new (NULL, 0, g_realloc, g_free);
+    }
+    else
     {
-        g_free (buffer);
+        gchar *buffer;
 
-        g_debug ("Only %" G_GSIZE_FORMAT " bytes out of %" G_GSIZE_FORMAT
-                 " bytes of picture data were read", bytes_read, size);
+        buffer = g_malloc (size);
+        ostream = g_memory_output_stream_new (buffer, size, g_realloc, g_free);
+    }
 
+    if (g_output_stream_splice (ostream, G_INPUT_STREAM (file_istream),
+                                G_OUTPUT_STREAM_SPLICE_NONE, NULL,
+                                error) == -1)
+    {
+        g_object_unref (ostream);
         g_object_unref (file_istream);
         g_assert (error == NULL || *error != NULL);
         return NULL;
@@ -1372,11 +1379,24 @@ et_picture_load_file_data (GFile *file, GError **error)
     else
     {
         /* Image loaded. */
-        pic = Picture_Allocate();
-        pic->size = size;
-        pic->data = (guchar *)buffer;
+        Picture *pic;
 
         g_object_unref (file_istream);
+
+        if (!g_output_stream_close (ostream, NULL, error))
+        {
+            g_object_unref (ostream);
+            g_assert (error == NULL || *error != NULL);
+            return NULL;
+        }
+
+        g_assert (error == NULL || *error == NULL);
+
+        pic = Picture_Allocate ();
+        pic->data = g_memory_output_stream_steal_data (G_MEMORY_OUTPUT_STREAM (ostream));
+        pic->size = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (ostream));
+
+        g_object_unref (ostream);
         g_assert (error == NULL || *error == NULL);
         return pic;
     }
diff --git a/src/scan.c b/src/scan.c
index 1eab0d1..cc74e04 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -40,12 +40,15 @@ Scan_Convert_Underscore_Into_Space (gchar *string)
 void
 Scan_Convert_P20_Into_Space (gchar *string)
 {
-    gchar *tmp = string;
+    gchar *tmp, *tmp1;
 
-    while ((tmp = strstr (tmp, "%20")) != NULL)
+    while ((tmp = strstr (string, "%20")) != NULL)
     {
+        tmp1 = tmp + 3;
         *(tmp++) = ' ';
-        strcpy (tmp, tmp + 2);
+        while (*tmp1)
+            *(tmp++) = *(tmp1++);
+        *tmp = '\0';
     }
 }
 
diff --git a/src/scan_dialog.c b/src/scan_dialog.c
index b9e175f..fe8cc00 100644
--- a/src/scan_dialog.c
+++ b/src/scan_dialog.c
@@ -1407,7 +1407,9 @@ Scan_Process_Fields_Functions (gchar **string)
     }
 
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsFirstLettersUppercase)))
-        Scan_Process_Fields_First_Letters_Uppercase(*string);
+    {
+        Scan_Process_Fields_First_Letters_Uppercase (string);
+    }
 
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsRemoveSpace)))
         Scan_Process_Fields_Remove_Space(*string);
@@ -1418,7 +1420,8 @@ Scan_Process_Fields_Functions (gchar **string)
  * 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)
+void
+Scan_Process_Fields_First_Letters_Uppercase (gchar **str)
 {
 /**** DANIEL TEST *****
     gchar *iter;
@@ -1441,6 +1444,7 @@ void Scan_Process_Fields_First_Letters_Uppercase (gchar *string)
     }
 ****/
 /**** Barış Çiçek version ****/
+    gchar *string = *str;
     gchar *word, *word1, *word2, *temp;
     gint i, len;
     gchar utf8_character[6];
@@ -1480,8 +1484,8 @@ void Scan_Process_Fields_First_Letters_Uppercase (gchar *string)
     }
 
     temp = Scan_Process_Fields_All_Downcase (string);
-    g_free (string);
-    string = temp;
+    g_free (*str);
+    *str = string = temp;
 
     if (!g_utf8_validate(string,-1,NULL))
     {
diff --git a/src/scan_dialog.h b/src/scan_dialog.h
index 8dc8ef6..83ec928 100644
--- a/src/scan_dialog.h
+++ b/src/scan_dialog.h
@@ -60,7 +60,7 @@ void et_scan_show (GtkAction *action, gpointer user_data);
 
 void entry_check_rename_file_mask (GtkEntry *entry, gpointer user_data);
 
-void Scan_Process_Fields_First_Letters_Uppercase (gchar *string);
+void Scan_Process_Fields_First_Letters_Uppercase (gchar **str);
 
 void Init_ScannerWindow (void);
 void Open_ScannerWindow (gint scanner_type);
diff --git a/src/vcedit.h b/src/vcedit.h
index 3c25eb8..ba1f716 100644
--- a/src/vcedit.h
+++ b/src/vcedit.h
@@ -11,9 +11,11 @@
 #ifndef __VCEDIT_H
 #define __VCEDIT_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif 
+#include "config.h"
+
+#ifdef ENABLE_OGG
+
+G_BEGIN_DECLS
 
 #include <stdio.h>
 #include <ogg/ogg.h>
@@ -65,8 +67,8 @@ extern vorbis_comment  *vcedit_comments(vcedit_state *state);
 extern int              vcedit_open(vcedit_state *state, GFile *in, GError **error);
 extern int              vcedit_write(vcedit_state *state, GFile *file, GError **error);
 
-#ifdef __cplusplus
-}
-#endif 
+G_END_DECLS
+
+#endif /* ENABLE_OGG */
 
 #endif /* __VCEDIT_H */
diff --git a/src/wavpack_tag.c b/src/wavpack_tag.c
index 61cc076..cc2a4c2 100644
--- a/src/wavpack_tag.c
+++ b/src/wavpack_tag.c
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef ENABLE_WAVPACK
 
@@ -32,7 +32,6 @@
 #include <wavpack/wavpack.h>
 
 #include "easytag.h"
-#include "vcedit.h"
 #include "et_core.h"
 #include "picture.h"
 #include "charset.h"
@@ -40,22 +39,6 @@
 #include "wavpack_tag.h"
 
 
-/***************
- * Declaration *
- ***************/
-
-#define MULTIFIELD_SEPARATOR " - "
-
-/**************
- * Prototypes *
- **************/
-gboolean Wavpack_Tag_Write_File (FILE *file_in, gchar *filename_in, vcedit_state *state);
-
-
-/*************
- * Functions *
- *************/
-
 /*
  * For the APEv2 tags, the following field names are officially supported and
  * recommended by WavPack (although there are no restrictions on what field names

-- 
easytag packaging



More information about the pkg-multimedia-commits mailing list