[SCM] easytag/upstream: Imported Upstream version 2.2.0

amigadave-guest at users.alioth.debian.org amigadave-guest at users.alioth.debian.org
Sat Apr 12 08:28:48 UTC 2014


The following commit has been merged in the upstream branch:
commit ff6ba34d02e1c5822b0479f2c4eab9773bd7ae6a
Author: David King <amigadave at amigadave.com>
Date:   Sat Apr 12 09:21:50 2014 +0100

    Imported Upstream version 2.2.0

diff --git a/AUTHORS b/AUTHORS
index e5b3fc3..af4e126 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,14 +2,15 @@ Please also see THANKS for non-code contributions
 
 David King <amigadave at amigadave.com>
   - GTK+ 3 port
-  - Co-maintainer
+  - Maintainer
 
 Kip Warner <kip at thevertigo.com>
-  - Co-maintainer
+  - Maintainer 2010-2012
 
 Santtu Lakkala <inz at inz.fi>
   - patches / DLM support
   - Initial GTK+ 3 port
+  - MP4 cover art support
 
 Jérôme Couderc <easytag at gmail.com>
   - Maintainer 2000-2008
@@ -31,6 +32,7 @@ Adrian Bunk <bunk at stusta.de>
 Abhinav Jangda <abhijangda at hotmail.com>
   - GIO porting
   - Several bugfixes
+  - Ogg Opus support
 
 Goetz Waschk <waschk at informatik.uni-rostock.de>
   - autoconf/automake
diff --git a/ChangeLog b/ChangeLog
index 675983d..ffdc61a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,1179 @@
+commit 049a6bef4fda3edb3701f11ec6adb438bbb4dac9
+Author: David King <amigadave at amigadave.com>
+Date:   Fri Apr 11 23:48:39 2014 +0100
+
+    Update NEWS for 2.2.0 release
+
+M	NEWS
+M	configure.ac
+
+commit 4201a7a75e11efca9f6ccabc341ecdf71994ba3d
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Apr 11 23:56:08 2014 +0100
+
+    Update man page for new format support
+
+M	doc/easytag.xml
+
+commit 33493b81c5de9f340702b4a10233498d6ff6f307
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Apr 11 23:42:14 2014 +0100
+
+    Hide help contents menuitem on Windows
+
+    Until Yelp runs on Windows, or the Mallard help is on help.gnome.org,
+    this will remain hidden.
+
+M	src/ui_manager.h
+
+commit c6a7d7b900766e29091ecec91bd992f8e8c7ee25
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Apr 11 23:07:48 2014 +0100
+
+    Update SOURCES for the upcoming 2.2.0 release
+
+M	SOURCES
+M	easytag-win32-installer.nsi.in
+
+commit a9b66c883f6eee2759d0a2aa418463af76788aec
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Apr 11 21:55:56 2014 +0100
+
+    Use TagLib namespace for ulong typedef
+
+    Under MinGW, ulong is not defined.
+
+M	src/gio_wrapper.cc
+M	src/gio_wrapper.h
+
+commit 4ddf4c8465cc39db88d21379d3cd298a8c372327
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Apr 11 21:13:01 2014 +0100
+
+    Mark changed files as bold by default
+
+    Marking changed files as red means that they are difficult to discern
+    when selected.
+
+M	src/setting.c
+
+commit 3c4f2f8873e5fec51f43888ed0f79de2a44f478d
+Author: Ekaterina Gerasimova <kittykat3756 at gmail.com>
+Date:	Fri Apr 11 21:06:59 2014 +0100
+
+    Review problems-ogg-split help page
+
+M	help/C/problems-ogg-split.page
+
+commit 4ccfaed1c85091124b1cf5c88d5713233bf14532
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Apr 10 00:21:15 2014 +0100
+
+    Add help page on Ogg tag splitting
+
+A	help/C/problems-ogg-split.page
+M	help/Makefile.am
+
+commit 5929722b0c30193c48cf0c8d7f0daeb6d4ca6f71
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Apr 11 14:13:01 2014 +0100
+
+    Update DOAP file for new file format support
+
+M	easytag.doap
+
+commit 7803968bb2ce6248efec6f3c71591d91593c0b89
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Apr 10 10:38:32 2014 +0100
+
+    Update help now that MP4 cover art is supported
+
+M	help/C/image.page
+
+commit f5957ed28b1c197f66f05aa16d1fb2f4adabde2d
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Apr 11 11:29:07 2014 +0100
+
+    Remove auto pointer template
+
+    Additionally, unref the stream on destruction of GIO_InputStream, as
+    closing the stream is not sufficient.
+
+M	src/gio_wrapper.cc
+
+commit e776981890fd7313996bf752a376cf2187eb5805
+Author: Santtu Lakkala <inz at inz.fi>
+Date:	Fri Apr 11 12:01:16 2014 +0300
+
+    Add basic error reporting to mp4_header.cc
+
+    Add some error reporting enabled by updates in GIO wrapper to
+    mp4_header.cc.
+
+M	src/mp4_header.cc
+
+commit 0955b0b8b3866f060d8b3a4a2661a1e023763dcb
+Author: Santtu Lakkala <inz at inz.fi>
+Date:	Fri Apr 11 12:01:15 2014 +0300
+
+    Add basic error reporting to mp4_tag.cc
+
+    Add some error reporting enabled by updates in GIO wrapper to
+    mp4_tag.cc.
+
+M	src/mp4_tag.cc
+
+commit 0bf00a1dce794cfc8fc6fefa6c75e3274369b0a9
+Author: Santtu Lakkala <inz at inz.fi>
+Date:	Fri Apr 11 12:01:14 2014 +0300
+
+    Improve error handling in GIO/TagLib wrapper
+
+    Add some error checks and a method for getting the error to the
+    GIO/TagLib compatibility layer.
+
+M	src/gio_wrapper.cc
+M	src/gio_wrapper.h
+
+commit 3b3f81a72c9de5dfb0fbd3f06eb7a6957bc944cd
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Apr 11 08:46:27 2014 +0100
+
+    Use GIO wrappers in mp4_header.cc
+
+M	src/mp4_header.cc
+
+commit 3a53d419f6c1b4d197f6c421f462cb2093f40612
+Author: Santtu Lakkala <inz at inz.fi>
+Date:	Thu Apr 10 11:01:53 2014 +0300
+
+    Use GIO wrappers in mp4_tag.cc
+
+    Make mp4_tag.cc use GIO wrapper for reading and writing MP4 tags with
+    TagLib.
+
+M	src/mp4_tag.cc
+
+commit 44ee383fb2d981c165c72e3d962df0a6dd131add
+Author: Santtu Lakkala <inz at inz.fi>
+Date:	Thu Apr 10 11:01:52 2014 +0300
+
+    Add GIO/TagLib compatibility layer
+
+    Create GIO based implementations of TagLib::IOStream, so TagLib can
+    be used
+    over GIO. The implementation still lacks almost all error handling,
+    but works
+    in normal situations.
+
+M	Makefile.am
+A	src/gio_wrapper.cc
+A	src/gio_wrapper.h
+
+commit 30798d62f77a92d96c97ae7c95d66efa5a60a1c6
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Apr 10 16:50:56 2014 +0100
+
+    Use C++ TagLib API for MP4 header information
+
+M	Makefile.am
+M	configure.ac
+M	po/POTFILES.in
+R071	src/mp4_header.c	src/mp4_header.cc
+M	src/mp4_header.h
+M	src/mp4_tag.cc
+
+commit e561c91e19342f2ecd475b36d1cc7e7793a95c13
+Author: Santtu Lakkala <inz at inz.fi>
+Date:	Thu Apr 10 09:32:42 2014 +0100
+
+    Support album artist in MP4 files
+
+    Use the atom directly, rather than going through the properties
+    convenience API.
+
+M	src/easytag.c
+M	src/mp4_tag.cc
+
+commit db6d50178a5f1b2e80faed02638a49be89b0a96e
+Author: Santtu Lakkala <inz at inz.fi>
+Date:	Thu Apr 10 08:32:29 2014 +0300
+
+    Implement cover art support for MP4
+
+    Adds support for saving cover image into MP4 files, and show the
+    images
+    tab for them as well. Add G_BEGIN_DECLS and G_END_DECLS in picture.h.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=701506
+
+M	src/easytag.c
+M	src/mp4_tag.cc
+M	src/picture.h
+
+commit e23ea390d7ec8a687fc0e82fb2d2542e71efe378
+Author: David King <amigadave at amigadave.com>
+Date:	Sat Mar 15 10:33:48 2014 +0000
+
+    Support extended fields for MP4 tags
+
+    Support the extended tags that are supported by TagLib, including
+    total
+    track number, disc number (and total), composer, copyright and encoded
+    by.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=701506
+
+M	src/easytag.c
+M	src/mp4_tag.cc
+
+commit dd2ce06e05705ed3587dbbdfefff4fc15d1fd94a
+Author: Santtu Lakkala <inz at inz.fi>
+Date:	Fri Apr 11 12:07:38 2014 +0300
+
+    Detect good set of warning flags for C++ compiler
+
+    At least gcc's g++ does not like all warning flags that the C compiler
+    does, so try them separately. Use -Werror to get failures, as
+    the wrong
+    flags only cause a warning.
+
+M	Makefile.am
+M	configure.ac
+
+commit 70a8891b4a2b35b9bd2df3c5af8fb7cff66f5caf
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Mar 6 23:38:39 2014 +0000
+
+    Use C++ TagLib API for MP4 tags
+
+    Eventually, this will enable handling of cover art and extended
+    tags for
+    MP4 files.
+
+M	Makefile.am
+M	configure.ac
+M	po/POTFILES.in
+R062	src/mp4_tag.c	src/mp4_tag.cc
+M	src/mp4_tag.h
+
+commit 4d0d294e00b7153e927c1df0037e360a95d2b227
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Apr 3 17:38:26 2014 +0100
+
+    Update NEWS for 2.1.10.99 preview release
+
+M	AUTHORS
+M	NEWS
+M	configure.ac
+
+commit df33e49df640f774520b76f7c7764c7dfc94a2b8
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Apr 11 13:59:20 2014 +0100
+
+    Fix ETFileDescription length
+
+M	src/et_core.c
+
+commit 46a2208d70f115f6e4849aebb23c44126f052f21
+Author: Santtu Lakkala <inz at inz.fi>
+Date:	Fri Apr 11 15:35:39 2014 +0300
+
+    Move file type table contents
+
+    The file type table was defined as static in a header, which
+    meant that
+    every object reading the header had a copy. Move the table to a source
+    file.
+
+M	src/et_core.c
+M	src/et_core.h
+
+commit b6f54eadbc5cdca9244653d5f7df881b08bf7bfd
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Apr 10 00:04:09 2014 +0100
+
+    Add help page on ID3 tag version problems
+
+    Also see https://bugs.launchpad.net/ubuntu/+source/easytag/+bug/684352
+
+M	help/C/index.page
+A	help/C/problems-id3.page
+M	help/Makefile.am
+
+commit 72712d730c6d0deb3c26895f1f41a0f9d469dd29
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Apr 9 23:36:13 2014 +0100
+
+    Update supported format list in help
+
+M	help/C/introduction.page
+
+commit daf24d5062be84d609cb6cf9998a96c8919fa80a
+Author: Praveen Illa <mail2ipn at gmail.com>
+Date:	Fri Apr 11 02:44:51 2014 +0530
+
+    Added Telugu initial Translation
+
+M	po/LINGUAS
+A	po/te.po
+
+commit dae0a35755b421485e48ec2e5aad4c7fbb9331e5
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Apr 10 21:36:16 2014 +0100
+
+    Set default size on image properties dialogue
+
+    This gives a better result than setting a size request on the image
+    types tree view.
+
+M	src/picture.c
+
+commit 553ba87d0311e4e4c64f2321b5aa654df0c4ae29
+Author: Santtu Lakkala <inz at inz.fi>
+Date:	Thu Apr 10 20:20:24 2014 +0100
+
+    Refactor Scan_Convert_P20_Into_Space()
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=726108
+
+M	src/scan.c
+
+commit 882f7ff40138fe7530c7ee5a46f8cf03a5c25705
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Apr 10 17:14:10 2014 +0100
+
+    Avoid C++ string conversion warnings
+
+    Change the type of string literals to const gchar * in
+    ET_File_Description.
+
+M	src/et_core.h
+
+commit b92ca8fa6de7cabc2179dca5c308f4414bbef6b5
+Author: Marek Černocký <marek at manet.cz>
+Date:	Wed Apr 9 14:24:29 2014 +0200
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit 745e88d5129d574f957bc9dc22ac386efea4695a
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Apr 9 09:31:55 2014 +0100
+
+    Update British English translation
+
+M	po/en_GB.po
+
+commit 6d878e8a48fb2bb78c235d90fdce129526060c21
+Author: Abhinav <abhijangda at hotmail.com>
+Date:	Wed Apr 9 12:43:00 2014 +0530
+
+    Avoid NULL deref in Scan_Rename_File_Prefix_Path()
+
+    Check if the current path is non-empty before trying to use the
+    name of
+    the currently-displayed file.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=727876
+    https://retrace.fedoraproject.org/faf/problems/1641130/
+
+M	src/scan_dialog.c
+
+commit d8d6d47db19617d174bdbc881aaae4cb95f66b91
+Author: Gianvito Cavasoli <gianvito at gmx.it>
+Date:	Tue Apr 8 19:26:44 2014 +0200
+
+    [l10n] Updated Italian translation.
+
+M	po/it.po
+
+commit 00ab3f419f63b6711b63ed7568f7f0ef2375f683
+Author: David King <amigadave at amigadave.com>
+Date:	Mon Apr 7 22:56:04 2014 +0100
+
+    Use gtester and add test and report make targets
+
+    Use the GLib testing utilities gtester and gtester-report to log and
+    generate reports from tests. Create targets for tests and test
+    reporting, and add further targets for more granular selection
+    of tests.
+    Use "make full-report" to run all GTest tests and generate an HTML
+    report of the results.
+
+M	.gitignore
+M	Makefile.am
+M	TODO
+M	configure.ac
+
+commit 30a0e93495e5e589941a35eb007a438dab04fc68
+Author: David King <amigadave at amigadave.com>
+Date:	Mon Apr 7 22:31:17 2014 +0100
+
+    Add simple performance tests for scanner functions
+
+M	tests/test-scan.c
+
+commit f43c0a65e1404535c5a11a0caf7576a69a576f70
+Author: Abhinav <abhijangda at hotmail.com>
+Date:	Mon Apr 7 21:08:59 2014 +0100
+
+    Improve scanner functions and fix tests
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=726108
+
+M	src/easytag.c
+M	src/scan.c
+M	src/scan.h
+M	src/scan_dialog.c
+M	tests/test-scan.c
+
+commit 55bc12913becad6c49894b18a7eb8816aa5346b6
+Author: Abhinav <abhijangda at hotmail.com>
+Date:	Mon Apr 7 18:38:58 2014 +0100
+
+    Add a test for scanner string functions
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=726108
+
+M	.gitignore
+M	Makefile.am
+A	tests/test-scan.c
+
+commit b34a2284d1da35dd642645dd73956ecde900477f
+Author: David King <amigadave at amigadave.com>
+Date:	Mon Apr 7 18:19:20 2014 +0100
+
+    Split scanner dialog off into scan_dialog.[c|h]
+
+    Prepare to add some tests and benchmarks for the scanner
+    string-handling
+    functions.
+
+M	Makefile.am
+M	po/POTFILES.in
+M	src/bar.c
+M	src/browser.c
+M	src/cddb.c
+M	src/easytag.c
+M	src/misc.c
+M	src/scan.c
+M	src/scan.h
+C096	src/scan.c	src/scan_dialog.c
+C077	src/scan.h	src/scan_dialog.h
+M	src/setting.c
+
+commit e92d01df738c167580c23adfc0ef3a7bb3893aa5
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date:	Mon Apr 7 19:06:20 2014 +0200
+
+    Updated Polish translation
+
+M	po/pl.po
+
+commit bf7256bc3e4b4855052af74d69ca0b0144af3f92
+Author: Wolfgang Stöggl <c72578 at yahoo.de>
+Date:	Mon Apr 7 13:48:43 2014 +0000
+
+    Updated German translation
+
+M	po/de.po
+
+commit 8cdd8146c8091b0fc0a2a13aa906070851ad0bd7
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date:	Mon Apr 7 12:16:43 2014 +0200
+
+    Updated Spanish translation
+
+M	po/es.po
+
+commit 87fe06a5e4966ce11f72d2621b5fb313c46719e7
+Author: David King <amigadave at amigadave.com>
+Date:	Mon Apr 7 08:35:43 2014 +0100
+
+    Fix typo in proxy tooltip string
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=727721
+
+M	src/prefs.c
+
+commit 3c7afc68f88bbdc35fc4e5015ead83906eb3089e
+Author: Alexandre Franke <alexandre.franke at gmail.com>
+Date:	Sun Apr 6 23:53:04 2014 +0000
+
+    Updated French translation
+
+M	po/fr.po
+
+commit c7b73721d6bdca411627dba57ce4dc6bbc9a1d69
+Author: Alexandre Franke <alexandre.franke at gmail.com>
+Date:	Sun Apr 6 23:47:05 2014 +0000
+
+    Updated French translation
+
+M	po/fr.po
+
+commit 480e68ff48bb1a0f32976089c199d0a804250c7b
+Author: Мирослав Николић <miroslavnikolic at rocketmail.com>
+Date:	Sat Apr 5 21:46:49 2014 +0200
+
+    Updated Serbian translation
+
+M	po/sr.po
+M	po/sr at latin.po
+
+commit 3b983605f4a828ac8856520363291f483662b11f
+Author: Marek Černocký <marek at manet.cz>
+Date:	Sat Apr 5 17:15:34 2014 +0200
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit e6adc18f915201e1ad410a159094fa1af436abeb
+Author: Wolfgang Stöggl <c72578 at yahoo.de>
+Date:	Sat Apr 5 10:35:33 2014 +0000
+
+    Updated German translation
+
+M	po/de.po
+
+commit ea93fe3ec0f4e414549515d1e4f67090f1c6d11c
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Apr 4 17:40:28 2014 +0100
+
+    Update about dialogue credits
+
+M	po/en_GB.po
+M	src/about.c
+
+commit a6b44d7abbf150235bcdc3233fe1161c3191c0b5
+Author: Santtu Lakkala <inz at inz.fi>
+Date:	Fri Apr 4 08:06:35 2014 +0300
+
+    Reimplement Roman numeral detection
+
+    Roman numeral detection code used complicated process of check, parse,
+    build, compare to detect if a string was a valid Roman numeral.
+    Reimplemented as a single step, that only checks for the validity (and
+    well-formedness) of the string, without computing its value.
+
+    It uses the same modern Roman numeral notation, including subtractive
+    notation.
+
+M	src/scan.c
+
+commit 8a5acffa8ed6749aa0de9306ea53349a5fe34fb0
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date:	Fri Apr 4 10:01:42 2014 +0200
+
+    Updated Spanish translation
+
+M	po/es.po
+
+commit 476068994d89ee939e89e296a13884d642830fc8
+Author: Abhinav <abhijangda at hotmail.com>
+Date:	Thu Apr 3 22:25:15 2014 +0100
+
+    Small optimization for scanner functions
+
+    Discovered while fixing bug 726108.
+
+M	src/scan.c
+
+commit ba436215925aba8bbab0dc7eb5a8d6aab34c7fe9
+Author: Rafael Ferreira <rafael.f.f1 at gmail.com>
+Date:	Thu Apr 3 17:13:03 2014 +0000
+
+    Updated Brazilian Portuguese translation
+
+M	po/pt_BR.po
+
+commit 46f71f0ae7b9d473c1da046f9af57d20b11f15d1
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date:	Thu Apr 3 18:54:26 2014 +0200
+
+    Updated Polish translation
+
+M	po/pl.po
+
+commit 67bdf5f9ae13d9aeb9bdef4c1676645b7ff993cc
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Apr 3 17:44:23 2014 +0100
+
+    Update British English translation
+
+M	po/en_GB.po
+
+commit af6bf46fd7b33d13e341e45ac5f74b2ec63465d8
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Apr 3 17:41:37 2014 +0100
+
+    Mention Ogg Speex support in AppData description
+
+M	data/easytag.appdata.xml.in
+
+commit 1d6c063e9bad986ed9bda60bca5aabef94780026
+Author: Rafael Ferreira <rafael.f.f1 at gmail.com>
+Date:	Thu Apr 3 10:56:43 2014 +0000
+
+    Updated Brazilian Portuguese translation
+
+M	po/pt_BR.po
+
+commit ee30ce13211495ff1b77fb3708b004689529cfb5
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Apr 2 19:43:00 2014 +0100
+
+    Rearrange Opus/Speex Ogg checks
+
+    Place the checks inside the path where Opus/Speex support is
+    enabled, to
+    prevent superfluous errors.
+
+M	configure.ac
+
+commit a6a18f5b624880f9f280324ee238981ff61daaaf
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Apr 2 17:52:22 2014 +0100
+
+    Error out if Ogg disabled but Speex/Opus enabled
+
+    Opus and Speex support depend on Ogg support for parsing of Vorbis
+    comments, used in both formats.
+
+M	configure.ac
+
+commit 32e494edc029bcb24b4148ed65cc355e17a25aef
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Apr 2 17:41:43 2014 +0100
+
+    Update AppData for Opus file support
+
+M	data/easytag.appdata.xml.in
+
+commit e8296e2848c9dd28bf4a1399f853e5aebef89f61
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Apr 2 17:21:24 2014 +0100
+
+    Fix reading header information from Opus files
+
+    Correctly read the sample rate and duration from Opus files.
+    Additionally, handle images in an Opus comment.
+
+M	src/opus_header.c
+M	src/picture.c
+
+commit 2b685a83e84b76dc4afa1180fc89918d115e12b5
+Author: Abhinav <abhijangda at hotmail.com>
+Date:	Sat Mar 29 21:32:58 2014 +0530
+
+    Support for writing tags to Ogg Opus files
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=692389
+
+M	src/et_core.c
+M	src/ogg_tag.h
+M	src/vcedit.c
+M	src/vcedit.h
+
+commit c636cd01eca6cdc4d741050790ac00354014d7a4
+Author: Abhinav <abhijangda at hotmail.com>
+Date:	Mon Mar 24 23:45:51 2014 +0530
+
+    Support reading tags from Ogg Opus files
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=692389
+
+M	Makefile.am
+M	README
+M	configure.ac
+M	po/POTFILES.in
+M	src/easytag.c
+M	src/et_core.c
+M	src/et_core.h
+M	src/ogg_tag.c
+M	src/ogg_tag.h
+A	src/opus_header.c
+A	src/opus_header.h
+A	src/opus_tag.c
+A	src/opus_tag.h
+
+commit b22129be5b931dccef89457bb2ab963a2c7057e3
+Author: David King <amigadave at amigadave.com>
+Date:	Mon Mar 31 16:49:14 2014 +0100
+
+    Show progress bar text with GTK+ 3
+
+M	src/bar.c
+M	src/gtk2_compat.c
+M	src/gtk2_compat.h
+
+commit 5ce6487893c911c9b7cbca5f35c3904eceb8facf
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Mar 30 20:29:44 2014 +0100
+
+    Switch to use GTK+ 3 by default
+
+M	configure.ac
+
+commit 47754d8f31f8711993dd6a730ef7c0eece6cac69
+Author: David King <amigadave at amigadave.com>
+Date:	Sat Mar 29 14:50:59 2014 +0000
+
+    Avoid a potentially-uninitialised variable
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=727295
+
+M	src/browser.c
+
+commit 12a6ef9c339a87b229da5c05d1377d990a6c3bce
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Mar 28 22:44:14 2014 +0000
+
+    Use G_BEGIN_DECLS in more headers
+
+    This makes it easier to test the C++ TagLib API for reading MP4 tags.
+
+M	src/charset.h
+M	src/et_core.h
+M	src/log.h
+M	src/misc.h
+M	src/mp4_tag.h
+
+commit 86d61b60e69e8289d7c49bf51f3f33b06f9524a8
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date:	Fri Mar 28 21:14:41 2014 +0100
+
+    Updated Polish translation
+
+M	po/pl.po
+
+commit 8d5b0e9fbff770d24f93a41e89aa922c251798b6
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Mar 28 11:42:28 2014 +0000
+
+    Fix a double free when opening a command-line path
+
+    https://retrace.fedoraproject.org/faf/problems/1625976/
+
+M	src/easytag.c
+
+commit 15b332dfe322c6cf590c799202c39b3985af4f57
+Author: Мирослав Николић <miroslavnikolic at rocketmail.com>
+Date:	Mon Mar 24 22:23:04 2014 +0100
+
+    Updated Serbian translation
+
+M	po/sr.po
+M	po/sr at latin.po
+
+commit 1f8be8569550ed424d174107a846cc8aff9f2a87
+Author: Andre Klapper <a9016009 at gmx.de>
+Date:	Sun Mar 23 21:16:44 2014 +0100
+
+    User docs: Make page ID the same as file name
+
+M	help/C/image-export.page
+
+commit 17fa304530e32f1f2b6e866a56b9c49122ab112c
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Mar 20 10:29:44 2014 +0000
+
+    Add British English translation
+
+    Created with en_GB.pl: https://wiki.gnome.org/BritishEnglish
+
+M	po/LINGUAS
+A	po/en_GB.po
+
+commit 030db34a07aeca90bde7807b2c2eceaee8cfd72a
+Author: Abhinav <abhijangda at hotmail.com>
+Date:	Thu Mar 20 12:59:30 2014 +0530
+
+    Check before flushing ogg stream in vcedit_write
+
+M	src/vcedit.c
+
+commit a27a8fe8cbd12dac86f0e615fbda068f8bdd4a10
+Author: Abhinav <abhijangda at hotmail.com>
+Date:	Tue Mar 18 15:28:33 2014 +0530
+
+    Avoid truncating Vorbis file when saving tags
+
+    Rather than writing to the same Vorbis file that tags are being read
+    from, and thus truncating the file while saving changed tags, write
+    to a
+    GMemoryOutputStream and then replace the on-disk contents with the
+    memory stream once it has been completely written.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=721351
+
+M	src/vcedit.c
+
+commit a84d6677a63fe65e2ec871e4b7432163683a1b49
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Mar 16 11:47:17 2014 +0000
+
+    Ask for confirmation when overwriting a file
+
+    When file renaming was rewritten to use GIO as part of bug 700500,
+    renames were set to overwrite the destination file. Change this
+    behaviour back to the original behaviour, to avoid data loss.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=726448
+
+M	src/easytag.c
+
+commit 61eddd3d0b97c172e6dad193b4626aa2001e49d6
+Author: ck Lux <lux.r.ck at gmail.com>
+Date:	Sat Mar 15 20:39:01 2014 +0800
+
+    Set unusable artist/album radio action insensitive
+
+    When no files are shown in the file list, make the artist/album radio
+    action insensitive.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=699957
+
+M	src/easytag.c
+
+commit 2117d62979dc4225a934949128ce375b6e31f321
+Author: Rafael Ferreira <rafael.f.f1 at gmail.com>
+Date:	Fri Mar 14 14:50:10 2014 +0000
+
+    Updated Brazilian Portuguese translation
+
+M	po/pt_BR.po
+
+commit 67d69800c2ee131c99ab58c67768022db3da02e1
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date:	Thu Mar 13 18:21:52 2014 +0100
+
+    Updated Spanish translation
+
+M	po/es.po
+
+commit a03be6bcf20e80a169c745498181271fce3e86df
+Author: Daniel Mustieles <daniel.mustieles at gmail.com>
+Date:	Wed Mar 12 18:21:02 2014 +0100
+
+    Updated Spanish translation
+
+M	po/es.po
+
+commit 23c95052f23a6938e64fe0e08dde355488e32c06
+Author: Aurimas Černius <aurisc4 at gmail.com>
+Date:	Tue Mar 11 16:25:41 2014 +0200
+
+    Updated Lithuanian translation
+
+M	po/lt.po
+
+commit a69d481e878d1b4e49698d6bcce3a12a662036a7
+Author: Attila Hammer <hammera at pickup.hu>
+Date:	Sat Mar 8 23:00:29 2014 +0000
+
+    Updated Hungarian translation
+
+M	po/hu.po
+
+commit f41120807e464e89e26b69c87c7262d6e0ff8cac
+Author: Marek Černocký <marek at manet.cz>
+Date:	Sat Mar 8 21:00:57 2014 +0100
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit e0c7574ef2ea5a6a3cc8ff92bd03d72d3f73e739
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Mar 7 23:15:06 2014 +0000
+
+    Fix load from text file dialogue response
+
+    Avoid an assert by fixing the accepted response types to include those
+    given at construction.
+
+    https://retrace.fedoraproject.org/faf/problems/1581387/
+
+M	src/misc.c
+
+commit ff711176d57064efc130207cbd6047f91ee63e0c
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Mar 7 21:09:52 2014 +0000
+
+    Convert GIF images to PNG when saving Vorbis tags
+
+M	src/ogg_tag.c
+
+commit 51b9e859a969fff66f3893e15dbedc1afca87616
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Mar 7 20:41:11 2014 +0000
+
+    Support writing GIF image data to files
+
+M	src/id3_tag.c
+M	src/picture.c
+M	src/picture.h
+
+commit 6563a0989a6d35d618a950262bd81d2ac50ed0ed
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Mar 7 22:41:43 2014 +0000
+
+    Avoid crash when saving unknown image types
+
+    https://retrace.fedoraproject.org/faf/problems/1586225/
+
+M	src/picture.c
+
+commit 17afda799f95c97263e52ab41fa8c9676aba3021
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Mar 7 15:34:08 2014 +0000
+
+    Avoid crash when declining deleting a file
+
+    https://retrace.fedoraproject.org/faf/problems/1586226/
+
+M	src/easytag.c
+
+commit f432ebd26c9bf5fc060eecb0c90635ca4acd3abd
+Author: Abhinav <abhijangda at hotmail.com>
+Date:	Thu Mar 6 15:57:33 2014 +0530
+
+    Improved asynchronous loading and saving of images
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=725399
+
+M	src/picture.c
+
+commit f77f63eb9ce7cf8b58bbc2251f2ef32c9352d6f4
+Author: Abhinav <abhijangda at hotmail.com>
+Date:	Wed Mar 5 20:55:47 2014 +0530
+
+    Load and save images asynchronously, bug 725399
+
+M	src/picture.c
+
+commit 0dd8052061cb90a5dc006403cf464293c444f440
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Mar 6 10:02:29 2014 +0000
+
+    Fix memory leak in Browser_List_Remove_File()
+
+M	src/browser.c
+
+commit e43447037ef994976961c015bfe00fc4163dc2ea
+Author: Santtu Lakkala <inz at inz.fi>
+Date:	Thu Mar 6 08:20:29 2014 +0200
+
+    Fix Roman numeral capitalization
+
+    Roman numeral capitalization was broken by the leak fix in commit
+    ae3dd7b81ba283ba0e9ea3d4aff326deedcc077e due to wrong variable usage.
+
+M	src/scan.c
+
+commit b55faaec5c20b0baba86e2b1dcf986bf70764088
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Mar 5 22:56:48 2014 +0000
+
+    Handle delete-event response from dialogues
+
+    GTK_RESPONSE_NONE only occurs if the dialogue is shown
+    programatically,
+    which is not the case in EasyTAG, so handle GTK_RESPONSE_DELETE_EVENT
+    instead.
+
+M	src/browser.c
+M	src/easytag.c
+
+commit 00a51984865ee079cb27f19c6199a09d40e68c7f
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Mar 5 22:51:37 2014 +0000
+
+    Refactor GList handling to iterate with for loops
+
+M	src/browser.c
+M	src/easytag.c
+M	src/et_core.c
+M	src/id3_tag.c
+M	src/id3v24_tag.c
+
+commit 8a40b3c9f765dc2e9a9e9256c17a44ff38455e3a
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Mar 5 22:47:13 2014 +0000
+
+    Fix a memory leak when loading images
+
+M	src/picture.c
+
+commit 5442958d1ea34a992007bbb2bc047a9a5515387d
+Author: David King <amigadave at amigadave.com>
+Date:	Mon Mar 3 16:19:28 2014 +0000
+
+    Return a gboolean from delete-event handler
+
+    Avoid undefined behaviour (manifesting as a crash on Fedora Rawhide)
+    by
+    correctly returning a gboolean in the main window delete-event
+    handler.
+    If the delete event was propagated by accident, the default handler
+    would destroy the window and lead to many subsequent problems.
+
+    Thanks to Igor Gnatenko for the bug report.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=725568
+    https://bugzilla.redhat.com/show_bug.cgi?id=1071563
+
+M	src/easytag.c
+
+commit df638532e2a0e343d97ceddd276506c95d2f25d2
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Feb 23 13:06:38 2014 +0000
+
+    Refactor GList handling when saving Vorbis tags
+
+M	src/ogg_tag.c
+
+commit ca662dfd2ac2c21843db52b3316c3d21db5b4087
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Feb 23 13:04:52 2014 +0000
+
+    Refactor GList handling in et_core.c
+
+    Refactor ET_Remove_File_From_Artist_Album_List() to use for loops to
+    iterate over a GList.
+
+M	src/et_core.c
+
+commit 069d2d755235d6c8549a6baed9a0f18c1e61f549
+Author: Abhinav <abhijangda at hotmail.com>
+Date:	Thu Feb 27 11:17:42 2014 +0530
+
+    Use GFileEnumerator instead of opendir()
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=725223
+
+M	src/browser.c
+
+commit 3557f72e5c4c5fd2e7881473febb35dd6359c063
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Feb 26 21:12:30 2014 +0000
+
+    Fix another leak in ogg_tag_read_file_tag()
+
+M	src/ogg_tag.c
+
+commit ad49c309811981aed03d376a37ae43217dbdce25
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Feb 26 20:43:35 2014 +0000
+
+    Fix memory leak in ogg_tag_read_file_tag()
+
+M	src/ogg_tag.c
+
+commit 4f9508505542ec19f63a0f0ecf95283d7ce77b4b
+Author: David King <amigadave at amigadave.com>
+Date:	Mon Feb 24 18:05:49 2014 +0000
+
+    Mark Vorbis tags with deprecated images as changed
+
+    Ensure that old COVERART fields containing cover art in Vorbis
+    tags are
+    migrated to the new METADATA_BLOCK_PICTURE by marking the tag as
+    modified, so that a save will be suggested (in the new format).
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=689420
+
+M	src/ogg_tag.c
+
+commit 58e3d9489bd0ca38787b6b82b4a9321c52c51d22
+Author: Abhinav <abhijangda at hotmail.com>
+Date:	Mon Feb 24 18:57:52 2014 +0530
+
+    Support for writing new Vorbis cover art
+
+    http://wiki.xiph.org/index.php/VorbisComment#Cover_art
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=689420
+
+M	src/ogg_tag.c
+
+commit bbcd91f4ca2e89ba36a02a0d9b21c23cba98090e
+Author: Abhinav <abhijangda at hotmail.com>
+Date:	Sat Feb 22 11:20:31 2014 +0530
+
+    Support for reading new Vorbis cover art
+
+    http://wiki.xiph.org/index.php/VorbisComment#Cover_art
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=689420
+
+M	src/ogg_tag.c
+
+commit b4c060d02732af1771c451be0aebaf42960ba1a0
+Author: David King <amigadave at amigadave.com>
+Date:	Mon Feb 24 17:43:18 2014 +0000
+
+    Fix memory leak in ET_Save_File_Tag_To_HD
+
+M	src/et_core.c
+
+commit eb48363cfab4b128d55f83ea5ab693416892412f
+Author: David King <amigadave at amigadave.com>
+Date:	Mon Feb 24 14:25:03 2014 +0000
+
+    Refactor querying of package installation path
+
+M	src/win32/win32dep.c
+M	src/win32/win32dep.h
+
+commit d8ad4bc6c1f12463ec02ba24b0b53431bedb6fa0
+Author: David King <amigadave at amigadave.com>
+Date:	Mon Feb 24 14:05:58 2014 +0000
+
+    Remove lots of Win32 cruft
+
+M	src/win32/win32dep.c
+M	src/win32/win32dep.h
+
+commit 1ce50a1d534bb448c0c4cd713987cdab3d9d245f
+Author: Balázs Úr <urbalazs at src.gnome.org>
+Date:	Sun Feb 23 16:40:17 2014 +0100
+
+    Updated Hungarian translation
+
+M	po/hu.po
+
+commit 8486dcd79a0958d0fde6062960a36585bf69bc98
+Author: Enrico Nicoletto <liverig at gmail.com>
+Date:	Fri Feb 21 14:08:13 2014 +0000
+
+    Updated Brazilian Portuguese translation
+
+M	po/pt_BR.po
+
+commit 1e55068cd7eaa78eda892a27fe52450edd99c496
+Author: Marek Černocký <marek at manet.cz>
+Date:	Thu Feb 20 23:18:20 2014 +0100
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit ecd99b088b935562740745b1f080257caab44924
+Author: Aurimas Černius <aurisc4 at gmail.com>
+Date:	Thu Feb 20 22:23:29 2014 +0200
+
+    Updated Lithuanian translation
+
+M	po/lt.po
+
 commit b27805dc163dff4d7b301b9be10a8d29b54a8a91
 Author: David King <amigadave at amigadave.com>
-Date:   Wed Feb 19 20:20:58 2014 +0000
+Date:	Wed Feb 19 20:20:58 2014 +0000
 
     Update NEWS for 2.1.10 release
 
diff --git a/Makefile.am b/Makefile.am
index 0260c1c..1f58f47 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-flac \
 	--enable-id3v23 \
 	--enable-ogg \
+	--enable-opus \
 	--enable-man \
 	--enable-mp3 \
 	--enable-mp4 \
@@ -27,6 +28,10 @@ easytag_CFLAGS = \
 	$(WARN_CFLAGS) \
 	$(EASYTAG_CFLAGS)
 
+easytag_CXXFLAGS = \
+	$(WARN_CXXFLAGS) \
+	$(EASYTAG_CFLAGS)
+
 easytag_SOURCES = \
 	src/id3lib/c_wrapper.cpp \
 	src/libapetag/apetaglib.c \
@@ -47,6 +52,7 @@ easytag_SOURCES = \
 	src/et_core.c \
 	src/flac_header.c \
 	src/flac_tag.c \
+	src/gio_wrapper.cc \
 	src/gtk2_compat.c \
 	src/id3_tag.c \
 	src/id3v24_tag.c \
@@ -54,14 +60,16 @@ easytag_SOURCES = \
 	src/misc.c \
 	src/monkeyaudio_header.c \
 	src/mpeg_header.c \
-	src/mp4_header.c \
-	src/mp4_tag.c \
+	src/mp4_tag.cc \
 	src/musepack_header.c \
 	src/ogg_header.c \
 	src/ogg_tag.c \
+	src/opus_header.c \
+	src/opus_tag.c \
 	src/picture.c \
 	src/prefs.c \
 	src/scan.c \
+	src/scan_dialog.c \
 	src/setting.c \
 	src/vcedit.c \
 	src/wavpack_header.c \
@@ -87,6 +95,7 @@ easytag_headers = \
 	src/flac_header.h \
 	src/flac_tag.h \
 	src/genres.h \
+	src/gio_wrapper.h \
 	src/gtk2_compat.h \
 	src/id3_tag.h \
 	src/log.h \
@@ -98,9 +107,12 @@ easytag_headers = \
 	src/musepack_header.h \
 	src/ogg_header.h \
 	src/ogg_tag.h \
+	src/opus_header.h \
+	src/opus_tag.h \
 	src/picture.h \
 	src/prefs.h \
 	src/scan.h \
+	src/scan_dialog.h \
 	src/setting.h \
 	src/ui_manager.h \
 	src/vcedit.h \
@@ -238,6 +250,7 @@ dist_noinst_DATA = \
 	src/libapetag/README.apetag \
 	src/libapetag/id3v2_read.c \
 	src/libapetag/id3v2_read.h \
+	src/mp4_header.cc \
 	src/win32/resource.h \
 	data/icons/win32/easytag.ico \
 	data/nsis/easytag-header.bmp \
@@ -259,10 +272,67 @@ tests/test-desktop-file-validate.sh: Makefile tests/.dstamp
 		echo "$(DESKTOP_FILE_VALIDATE) $(top_builddir)/$(desktop_DATA) || exit 1" >> $@; \
 		chmod +x $@
 
+# Not automake built-in TESTS_ENVIRONMENT!
+TEST_ENVIRONMENT = MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
+
+# test: run all tests.
+test: $(check_PROGRAMS)
+	$(AM_V_at)$(TEST_ENVIRONMENT) $(GTESTER) --verbose $(check_PROGRAMS)
+
+# test-report: run tests and generate report.
+# perf-report: run tests with -m perf and generate report.
+# full-report: like test-report: with -m perf and -m slow.
+test-report perf-report full-report: $(check_PROGRAMS)
+	$(AM_V_at)test -z "$(check_PROGRAMS)" || { \
+	  case $@ in \
+	  test-report) test_options="-k";; \
+	  perf-report) test_options="-k -m=perf";; \
+	  full-report) test_options="-k -m=perf -m=slow";; \
+	  esac ; \
+	  $(TEST_ENVIRONMENT) $(GTESTER) --verbose $$test_options -o test-log.xml $(check_PROGRAMS) ; \
+	  if test -d "$(top_srcdir)/.git" ; then \
+	    REVISION=`git describe` ; \
+	  else \
+	    REVISION=$(PACKAGE_VERSION) ; \
+	  fi ; \
+	  echo '<?xml version="1.0"?>' > $@.xml ; \
+	  echo '<report-collection>' >> $@.xml ; \
+	  echo '<info>' >> $@.xml ; \
+	  echo '  <package>$(PACKAGE_NAME)</package>' >> $@.xml ; \
+	  echo '  <version>$(PACKAGE_VERSION)</version>' >> $@.xml ; \
+	  echo "  <revision>$$REVISION</revision>" >> $@.xml ; \
+	  echo '</info>' >> $@.xml ; \
+	  sed '1,1s/^<?xml\b[^>?]*?>//' < test-log.xml >> $@.xml ; \
+	  rm test-log.xml ; \
+	  echo >> $@.xml ; \
+	  echo '</report-collection>' >> $@.xml ; \
+	  $(GTESTER_REPORT) --version 2>/dev/null 1>&2 ; test "$$?" != 0 || $(GTESTER_REPORT) $@.xml >$@.html ; \
+	}
+
+check_PROGRAMS = \
+	tests/test-scan
+
+tests_test_scan_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-I$(top_builddir) \
+	$(DEPRECATED_CPPFLAGS)
+
+tests_test_scan_CFLAGS = \
+	$(WARN_CFLAGS) \
+	$(EASYTAG_CFLAGS)
+
+tests_test_scan_SOURCES = \
+	tests/test-scan.c \
+	src/scan.c
+
+tests_test_scan_LDADD = \
+	$(EASYTAG_LIBS)
+
 check_SCRIPTS = \
 	tests/test-desktop-file-validate.sh
 
 TESTS = \
+	$(check_PROGRAMS) \
 	$(check_SCRIPTS)
 endif
 
@@ -272,12 +342,14 @@ CLEANFILES = \
 	$(desktop_DATA) \
 	$(easytag_rc) \
 	$(nodist_man_MANS) \
+	*.log \
 	easytag-$(PACKAGE_VERSION)-setup.exe \
 	easytag-win32-installer.nsi
 
 DISTCLEANFILES = \
 	po/.intltool-merge-cache
 
+check-local: test
 clean-local: clean-local-dstamp
 clean-local-dstamp:
 	-rm -f data/.dstamp
@@ -294,3 +366,4 @@ git-changelog-hook:
 dist-hook: git-changelog-hook
 
 .PHONY: clean-local-dstamp git-changelog-hook
+.PHONY: test test-report perf-report full-report
diff --git a/Makefile.in b/Makefile.in
index 67f4537..46c7b3c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,6 +81,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = easytag$(EXEEXT)
+ at EASYTAG_ENABLE_TESTS_TRUE@check_PROGRAMS = tests/test-scan$(EXEEXT)
 subdir = .
 DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
 	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
@@ -133,17 +134,20 @@ am_easytag_OBJECTS = src/id3lib/easytag-c_wrapper.$(OBJEXT) \
 	src/easytag-et_core.$(OBJEXT) \
 	src/easytag-flac_header.$(OBJEXT) \
 	src/easytag-flac_tag.$(OBJEXT) \
+	src/easytag-gio_wrapper.$(OBJEXT) \
 	src/easytag-gtk2_compat.$(OBJEXT) \
 	src/easytag-id3_tag.$(OBJEXT) src/easytag-id3v24_tag.$(OBJEXT) \
 	src/easytag-log.$(OBJEXT) src/easytag-misc.$(OBJEXT) \
 	src/easytag-monkeyaudio_header.$(OBJEXT) \
 	src/easytag-mpeg_header.$(OBJEXT) \
-	src/easytag-mp4_header.$(OBJEXT) src/easytag-mp4_tag.$(OBJEXT) \
+	src/easytag-mp4_tag.$(OBJEXT) \
 	src/easytag-musepack_header.$(OBJEXT) \
 	src/easytag-ogg_header.$(OBJEXT) src/easytag-ogg_tag.$(OBJEXT) \
-	src/easytag-picture.$(OBJEXT) src/easytag-prefs.$(OBJEXT) \
-	src/easytag-scan.$(OBJEXT) src/easytag-setting.$(OBJEXT) \
-	src/easytag-vcedit.$(OBJEXT) \
+	src/easytag-opus_header.$(OBJEXT) \
+	src/easytag-opus_tag.$(OBJEXT) src/easytag-picture.$(OBJEXT) \
+	src/easytag-prefs.$(OBJEXT) src/easytag-scan.$(OBJEXT) \
+	src/easytag-scan_dialog.$(OBJEXT) \
+	src/easytag-setting.$(OBJEXT) src/easytag-vcedit.$(OBJEXT) \
 	src/easytag-wavpack_header.$(OBJEXT) \
 	src/easytag-wavpack_tag.$(OBJEXT) \
 	src/win32/easytag-win32dep.$(OBJEXT)
@@ -151,8 +155,16 @@ easytag_OBJECTS = $(am_easytag_OBJECTS)
 am__DEPENDENCIES_1 =
 easytag_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(easytag_rc)
-easytag_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(easytag_LDFLAGS) \
-	$(LDFLAGS) -o $@
+easytag_LINK = $(CXXLD) $(easytag_CXXFLAGS) $(CXXFLAGS) \
+	$(easytag_LDFLAGS) $(LDFLAGS) -o $@
+am__tests_test_scan_SOURCES_DIST = tests/test-scan.c src/scan.c
+ at EASYTAG_ENABLE_TESTS_TRUE@am_tests_test_scan_OBJECTS = tests/tests_test_scan-test-scan.$(OBJEXT) \
+ at EASYTAG_ENABLE_TESTS_TRUE@	src/tests_test_scan-scan.$(OBJEXT)
+tests_test_scan_OBJECTS = $(am_tests_test_scan_OBJECTS)
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_scan_DEPENDENCIES =  \
+ at EASYTAG_ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1)
+tests_test_scan_LINK = $(CCLD) $(tests_test_scan_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SCRIPTS = $(dist_noinst_SCRIPTS)
 AM_V_P = $(am__v_P_ at AM_V@)
 am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
@@ -199,8 +211,8 @@ AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
-SOURCES = $(easytag_SOURCES)
-DIST_SOURCES = $(easytag_SOURCES)
+SOURCES = $(easytag_SOURCES) $(tests_test_scan_SOURCES)
+DIST_SOURCES = $(easytag_SOURCES) $(am__tests_test_scan_SOURCES_DIST)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
@@ -531,6 +543,8 @@ EXEEXT = @EXEEXT@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GTESTER = @GTESTER@
+GTESTER_REPORT = @GTESTER_REPORT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HELP_DIR = @HELP_DIR@
@@ -578,6 +592,7 @@ STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XMLCATALOG = @XMLCATALOG@
@@ -646,6 +661,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-flac \
 	--enable-id3v23 \
 	--enable-ogg \
+	--enable-opus \
 	--enable-man \
 	--enable-mp3 \
 	--enable-mp4 \
@@ -664,6 +680,10 @@ easytag_CFLAGS = \
 	$(WARN_CFLAGS) \
 	$(EASYTAG_CFLAGS)
 
+easytag_CXXFLAGS = \
+	$(WARN_CXXFLAGS) \
+	$(EASYTAG_CFLAGS)
+
 easytag_SOURCES = \
 	src/id3lib/c_wrapper.cpp \
 	src/libapetag/apetaglib.c \
@@ -684,6 +704,7 @@ easytag_SOURCES = \
 	src/et_core.c \
 	src/flac_header.c \
 	src/flac_tag.c \
+	src/gio_wrapper.cc \
 	src/gtk2_compat.c \
 	src/id3_tag.c \
 	src/id3v24_tag.c \
@@ -691,14 +712,16 @@ easytag_SOURCES = \
 	src/misc.c \
 	src/monkeyaudio_header.c \
 	src/mpeg_header.c \
-	src/mp4_header.c \
-	src/mp4_tag.c \
+	src/mp4_tag.cc \
 	src/musepack_header.c \
 	src/ogg_header.c \
 	src/ogg_tag.c \
+	src/opus_header.c \
+	src/opus_tag.c \
 	src/picture.c \
 	src/prefs.c \
 	src/scan.c \
+	src/scan_dialog.c \
 	src/setting.c \
 	src/vcedit.c \
 	src/wavpack_header.c \
@@ -724,6 +747,7 @@ easytag_headers = \
 	src/flac_header.h \
 	src/flac_tag.h \
 	src/genres.h \
+	src/gio_wrapper.h \
 	src/gtk2_compat.h \
 	src/id3_tag.h \
 	src/log.h \
@@ -735,9 +759,12 @@ easytag_headers = \
 	src/musepack_header.h \
 	src/ogg_header.h \
 	src/ogg_tag.h \
+	src/opus_header.h \
+	src/opus_tag.h \
 	src/picture.h \
 	src/prefs.h \
 	src/scan.h \
+	src/scan_dialog.h \
 	src/setting.h \
 	src/ui_manager.h \
 	src/vcedit.h \
@@ -825,6 +852,7 @@ dist_noinst_DATA = \
 	src/libapetag/README.apetag \
 	src/libapetag/id3v2_read.c \
 	src/libapetag/id3v2_read.h \
+	src/mp4_header.cc \
 	src/win32/resource.h \
 	data/icons/win32/easytag.ico \
 	data/nsis/easytag-header.bmp \
@@ -840,10 +868,30 @@ dist_noinst_DATA = \
 dist_noinst_SCRIPTS = \
 	autogen.sh
 
+
+# Not automake built-in TESTS_ENVIRONMENT!
+ at EASYTAG_ENABLE_TESTS_TRUE@TEST_ENVIRONMENT = MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_scan_CPPFLAGS = \
+ at EASYTAG_ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src \
+ at EASYTAG_ENABLE_TESTS_TRUE@	-I$(top_builddir) \
+ at EASYTAG_ENABLE_TESTS_TRUE@	$(DEPRECATED_CPPFLAGS)
+
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_scan_CFLAGS = \
+ at EASYTAG_ENABLE_TESTS_TRUE@	$(WARN_CFLAGS) \
+ at EASYTAG_ENABLE_TESTS_TRUE@	$(EASYTAG_CFLAGS)
+
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_scan_SOURCES = \
+ at EASYTAG_ENABLE_TESTS_TRUE@	tests/test-scan.c \
+ at EASYTAG_ENABLE_TESTS_TRUE@	src/scan.c
+
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_scan_LDADD = \
+ at EASYTAG_ENABLE_TESTS_TRUE@	$(EASYTAG_LIBS)
+
 @EASYTAG_ENABLE_TESTS_TRUE at check_SCRIPTS = \
 @EASYTAG_ENABLE_TESTS_TRUE@	tests/test-desktop-file-validate.sh
 
 @EASYTAG_ENABLE_TESTS_TRUE at TESTS = \
+ at EASYTAG_ENABLE_TESTS_TRUE@	$(check_PROGRAMS) \
 @EASYTAG_ENABLE_TESTS_TRUE@	$(check_SCRIPTS)
 
 CLEANFILES = \
@@ -852,6 +900,7 @@ CLEANFILES = \
 	$(desktop_DATA) \
 	$(easytag_rc) \
 	$(nodist_man_MANS) \
+	*.log \
 	easytag-$(PACKAGE_VERSION)-setup.exe \
 	easytag-win32-installer.nsi
 
@@ -862,7 +911,7 @@ all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .cpp .log .o .obj .test .test$(EXEEXT) .trs
+.SUFFIXES: .c .cc .cpp .log .o .obj .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -958,6 +1007,9 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+clean-checkPROGRAMS:
+	-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
 src/id3lib/$(am__dirstamp):
 	@$(MKDIR_P) src/id3lib
 	@: > src/id3lib/$(am__dirstamp)
@@ -1015,6 +1067,8 @@ src/easytag-flac_header.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/easytag-flac_tag.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/easytag-gio_wrapper.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/easytag-gtk2_compat.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/easytag-id3_tag.$(OBJEXT): src/$(am__dirstamp) \
@@ -1029,8 +1083,6 @@ src/easytag-monkeyaudio_header.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/easytag-mpeg_header.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-src/easytag-mp4_header.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
 src/easytag-mp4_tag.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/easytag-musepack_header.$(OBJEXT): src/$(am__dirstamp) \
@@ -1039,12 +1091,18 @@ src/easytag-ogg_header.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/easytag-ogg_tag.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/easytag-opus_header.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/easytag-opus_tag.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/easytag-picture.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/easytag-prefs.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/easytag-scan.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/easytag-scan_dialog.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/easytag-setting.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/easytag-vcedit.$(OBJEXT): src/$(am__dirstamp) \
@@ -1065,6 +1123,20 @@ src/win32/easytag-win32dep.$(OBJEXT): src/win32/$(am__dirstamp) \
 easytag$(EXEEXT): $(easytag_OBJECTS) $(easytag_DEPENDENCIES) $(EXTRA_easytag_DEPENDENCIES) 
 	@rm -f easytag$(EXEEXT)
 	$(AM_V_CXXLD)$(easytag_LINK) $(easytag_OBJECTS) $(easytag_LDADD) $(LIBS)
+tests/$(am__dirstamp):
+	@$(MKDIR_P) tests
+	@: > tests/$(am__dirstamp)
+tests/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) tests/$(DEPDIR)
+	@: > tests/$(DEPDIR)/$(am__dirstamp)
+tests/tests_test_scan-test-scan.$(OBJEXT): tests/$(am__dirstamp) \
+	tests/$(DEPDIR)/$(am__dirstamp)
+src/tests_test_scan-scan.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+
+tests/test-scan$(EXEEXT): $(tests_test_scan_OBJECTS) $(tests_test_scan_DEPENDENCIES) $(EXTRA_tests_test_scan_DEPENDENCIES) tests/$(am__dirstamp)
+	@rm -f tests/test-scan$(EXEEXT)
+	$(AM_V_CCLD)$(tests_test_scan_LINK) $(tests_test_scan_OBJECTS) $(tests_test_scan_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -1072,6 +1144,7 @@ mostlyclean-compile:
 	-rm -f src/id3lib/*.$(OBJEXT)
 	-rm -f src/libapetag/*.$(OBJEXT)
 	-rm -f src/win32/*.$(OBJEXT)
+	-rm -f tests/*.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -1089,31 +1162,36 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-et_core.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-flac_header.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-flac_tag.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-gio_wrapper.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-gtk2_compat.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-id3_tag.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-id3v24_tag.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-log.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-misc.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-monkeyaudio_header.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-mp4_header.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-mp4_tag.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-mpeg_header.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-musepack_header.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-ogg_header.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-ogg_tag.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-opus_header.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-opus_tag.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-picture.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-prefs.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-scan.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-scan_dialog.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-setting.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-vcedit.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-wavpack_header.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-wavpack_tag.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tests_test_scan-scan.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/id3lib/$(DEPDIR)/easytag-c_wrapper.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/libapetag/$(DEPDIR)/easytag-apetaglib.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/libapetag/$(DEPDIR)/easytag-info_mac.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/libapetag/$(DEPDIR)/easytag-info_mpc.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/libapetag/$(DEPDIR)/easytag-is_tag.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/win32/$(DEPDIR)/easytag-win32dep.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/tests_test_scan-test-scan.Po at am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -1467,34 +1545,6 @@ src/easytag-mpeg_header.obj: src/mpeg_header.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-mpeg_header.obj `if test -f 'src/mpeg_header.c'; then $(CYGPATH_W) 'src/mpeg_header.c'; else $(CYGPATH_W) '$(srcdir)/src/mpeg_header.c'; fi`
 
-src/easytag-mp4_header.o: src/mp4_header.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-mp4_header.o -MD -MP -MF src/$(DEPDIR)/easytag-mp4_header.Tpo -c -o src/easytag-mp4_header.o `test -f 'src/mp4_header.c' || echo '$(srcdir)/'`src/mp4_header.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-mp4_header.Tpo src/$(DEPDIR)/easytag-mp4_header.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/mp4_header.c' object='src/easytag-mp4_header.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-mp4_header.o `test -f 'src/mp4_header.c' || echo '$(srcdir)/'`src/mp4_header.c
-
-src/easytag-mp4_header.obj: src/mp4_header.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-mp4_header.obj -MD -MP -MF src/$(DEPDIR)/easytag-mp4_header.Tpo -c -o src/easytag-mp4_header.obj `if test -f 'src/mp4_header.c'; then $(CYGPATH_W) 'src/mp4_header.c'; else $(CYGPATH_W) '$(srcdir)/src/mp4_header.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-mp4_header.Tpo src/$(DEPDIR)/easytag-mp4_header.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/mp4_header.c' object='src/easytag-mp4_header.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-mp4_header.obj `if test -f 'src/mp4_header.c'; then $(CYGPATH_W) 'src/mp4_header.c'; else $(CYGPATH_W) '$(srcdir)/src/mp4_header.c'; fi`
-
-src/easytag-mp4_tag.o: src/mp4_tag.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-mp4_tag.o -MD -MP -MF src/$(DEPDIR)/easytag-mp4_tag.Tpo -c -o src/easytag-mp4_tag.o `test -f 'src/mp4_tag.c' || echo '$(srcdir)/'`src/mp4_tag.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-mp4_tag.Tpo src/$(DEPDIR)/easytag-mp4_tag.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/mp4_tag.c' object='src/easytag-mp4_tag.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-mp4_tag.o `test -f 'src/mp4_tag.c' || echo '$(srcdir)/'`src/mp4_tag.c
-
-src/easytag-mp4_tag.obj: src/mp4_tag.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-mp4_tag.obj -MD -MP -MF src/$(DEPDIR)/easytag-mp4_tag.Tpo -c -o src/easytag-mp4_tag.obj `if test -f 'src/mp4_tag.c'; then $(CYGPATH_W) 'src/mp4_tag.c'; else $(CYGPATH_W) '$(srcdir)/src/mp4_tag.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-mp4_tag.Tpo src/$(DEPDIR)/easytag-mp4_tag.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/mp4_tag.c' object='src/easytag-mp4_tag.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-mp4_tag.obj `if test -f 'src/mp4_tag.c'; then $(CYGPATH_W) 'src/mp4_tag.c'; else $(CYGPATH_W) '$(srcdir)/src/mp4_tag.c'; fi`
-
 src/easytag-musepack_header.o: src/musepack_header.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-musepack_header.o -MD -MP -MF src/$(DEPDIR)/easytag-musepack_header.Tpo -c -o src/easytag-musepack_header.o `test -f 'src/musepack_header.c' || echo '$(srcdir)/'`src/musepack_header.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-musepack_header.Tpo src/$(DEPDIR)/easytag-musepack_header.Po
@@ -1537,6 +1587,34 @@ src/easytag-ogg_tag.obj: src/ogg_tag.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-ogg_tag.obj `if test -f 'src/ogg_tag.c'; then $(CYGPATH_W) 'src/ogg_tag.c'; else $(CYGPATH_W) '$(srcdir)/src/ogg_tag.c'; fi`
 
+src/easytag-opus_header.o: src/opus_header.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-opus_header.o -MD -MP -MF src/$(DEPDIR)/easytag-opus_header.Tpo -c -o src/easytag-opus_header.o `test -f 'src/opus_header.c' || echo '$(srcdir)/'`src/opus_header.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-opus_header.Tpo src/$(DEPDIR)/easytag-opus_header.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/opus_header.c' object='src/easytag-opus_header.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-opus_header.o `test -f 'src/opus_header.c' || echo '$(srcdir)/'`src/opus_header.c
+
+src/easytag-opus_header.obj: src/opus_header.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-opus_header.obj -MD -MP -MF src/$(DEPDIR)/easytag-opus_header.Tpo -c -o src/easytag-opus_header.obj `if test -f 'src/opus_header.c'; then $(CYGPATH_W) 'src/opus_header.c'; else $(CYGPATH_W) '$(srcdir)/src/opus_header.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-opus_header.Tpo src/$(DEPDIR)/easytag-opus_header.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/opus_header.c' object='src/easytag-opus_header.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-opus_header.obj `if test -f 'src/opus_header.c'; then $(CYGPATH_W) 'src/opus_header.c'; else $(CYGPATH_W) '$(srcdir)/src/opus_header.c'; fi`
+
+src/easytag-opus_tag.o: src/opus_tag.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-opus_tag.o -MD -MP -MF src/$(DEPDIR)/easytag-opus_tag.Tpo -c -o src/easytag-opus_tag.o `test -f 'src/opus_tag.c' || echo '$(srcdir)/'`src/opus_tag.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-opus_tag.Tpo src/$(DEPDIR)/easytag-opus_tag.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/opus_tag.c' object='src/easytag-opus_tag.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-opus_tag.o `test -f 'src/opus_tag.c' || echo '$(srcdir)/'`src/opus_tag.c
+
+src/easytag-opus_tag.obj: src/opus_tag.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-opus_tag.obj -MD -MP -MF src/$(DEPDIR)/easytag-opus_tag.Tpo -c -o src/easytag-opus_tag.obj `if test -f 'src/opus_tag.c'; then $(CYGPATH_W) 'src/opus_tag.c'; else $(CYGPATH_W) '$(srcdir)/src/opus_tag.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-opus_tag.Tpo src/$(DEPDIR)/easytag-opus_tag.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/opus_tag.c' object='src/easytag-opus_tag.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-opus_tag.obj `if test -f 'src/opus_tag.c'; then $(CYGPATH_W) 'src/opus_tag.c'; else $(CYGPATH_W) '$(srcdir)/src/opus_tag.c'; fi`
+
 src/easytag-picture.o: src/picture.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-picture.o -MD -MP -MF src/$(DEPDIR)/easytag-picture.Tpo -c -o src/easytag-picture.o `test -f 'src/picture.c' || echo '$(srcdir)/'`src/picture.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-picture.Tpo src/$(DEPDIR)/easytag-picture.Po
@@ -1579,6 +1657,20 @@ src/easytag-scan.obj: src/scan.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-scan.obj `if test -f 'src/scan.c'; then $(CYGPATH_W) 'src/scan.c'; else $(CYGPATH_W) '$(srcdir)/src/scan.c'; fi`
 
+src/easytag-scan_dialog.o: src/scan_dialog.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-scan_dialog.o -MD -MP -MF src/$(DEPDIR)/easytag-scan_dialog.Tpo -c -o src/easytag-scan_dialog.o `test -f 'src/scan_dialog.c' || echo '$(srcdir)/'`src/scan_dialog.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-scan_dialog.Tpo src/$(DEPDIR)/easytag-scan_dialog.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/scan_dialog.c' object='src/easytag-scan_dialog.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-scan_dialog.o `test -f 'src/scan_dialog.c' || echo '$(srcdir)/'`src/scan_dialog.c
+
+src/easytag-scan_dialog.obj: src/scan_dialog.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-scan_dialog.obj -MD -MP -MF src/$(DEPDIR)/easytag-scan_dialog.Tpo -c -o src/easytag-scan_dialog.obj `if test -f 'src/scan_dialog.c'; then $(CYGPATH_W) 'src/scan_dialog.c'; else $(CYGPATH_W) '$(srcdir)/src/scan_dialog.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-scan_dialog.Tpo src/$(DEPDIR)/easytag-scan_dialog.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/scan_dialog.c' object='src/easytag-scan_dialog.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/easytag-scan_dialog.obj `if test -f 'src/scan_dialog.c'; then $(CYGPATH_W) 'src/scan_dialog.c'; else $(CYGPATH_W) '$(srcdir)/src/scan_dialog.c'; fi`
+
 src/easytag-setting.o: src/setting.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-setting.o -MD -MP -MF src/$(DEPDIR)/easytag-setting.Tpo -c -o src/easytag-setting.o `test -f 'src/setting.c' || echo '$(srcdir)/'`src/setting.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-setting.Tpo src/$(DEPDIR)/easytag-setting.Po
@@ -1649,7 +1741,35 @@ src/win32/easytag-win32dep.obj: src/win32/win32dep.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -c -o src/win32/easytag-win32dep.obj `if test -f 'src/win32/win32dep.c'; then $(CYGPATH_W) 'src/win32/win32dep.c'; else $(CYGPATH_W) '$(srcdir)/src/win32/win32dep.c'; fi`
 
-.cpp.o:
+tests/tests_test_scan-test-scan.o: tests/test-scan.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_scan_CPPFLAGS) $(CPPFLAGS) $(tests_test_scan_CFLAGS) $(CFLAGS) -MT tests/tests_test_scan-test-scan.o -MD -MP -MF tests/$(DEPDIR)/tests_test_scan-test-scan.Tpo -c -o tests/tests_test_scan-test-scan.o `test -f 'tests/test-scan.c' || echo '$(srcdir)/'`tests/test-scan.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_test_scan-test-scan.Tpo tests/$(DEPDIR)/tests_test_scan-test-scan.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/test-scan.c' object='tests/tests_test_scan-test-scan.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_scan_CPPFLAGS) $(CPPFLAGS) $(tests_test_scan_CFLAGS) $(CFLAGS) -c -o tests/tests_test_scan-test-scan.o `test -f 'tests/test-scan.c' || echo '$(srcdir)/'`tests/test-scan.c
+
+tests/tests_test_scan-test-scan.obj: tests/test-scan.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_scan_CPPFLAGS) $(CPPFLAGS) $(tests_test_scan_CFLAGS) $(CFLAGS) -MT tests/tests_test_scan-test-scan.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_scan-test-scan.Tpo -c -o tests/tests_test_scan-test-scan.obj `if test -f 'tests/test-scan.c'; then $(CYGPATH_W) 'tests/test-scan.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-scan.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_test_scan-test-scan.Tpo tests/$(DEPDIR)/tests_test_scan-test-scan.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/test-scan.c' object='tests/tests_test_scan-test-scan.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_scan_CPPFLAGS) $(CPPFLAGS) $(tests_test_scan_CFLAGS) $(CFLAGS) -c -o tests/tests_test_scan-test-scan.obj `if test -f 'tests/test-scan.c'; then $(CYGPATH_W) 'tests/test-scan.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-scan.c'; fi`
+
+src/tests_test_scan-scan.o: src/scan.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_scan_CPPFLAGS) $(CPPFLAGS) $(tests_test_scan_CFLAGS) $(CFLAGS) -MT src/tests_test_scan-scan.o -MD -MP -MF src/$(DEPDIR)/tests_test_scan-scan.Tpo -c -o src/tests_test_scan-scan.o `test -f 'src/scan.c' || echo '$(srcdir)/'`src/scan.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/tests_test_scan-scan.Tpo src/$(DEPDIR)/tests_test_scan-scan.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/scan.c' object='src/tests_test_scan-scan.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_scan_CPPFLAGS) $(CPPFLAGS) $(tests_test_scan_CFLAGS) $(CFLAGS) -c -o src/tests_test_scan-scan.o `test -f 'src/scan.c' || echo '$(srcdir)/'`src/scan.c
+
+src/tests_test_scan-scan.obj: src/scan.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_scan_CPPFLAGS) $(CPPFLAGS) $(tests_test_scan_CFLAGS) $(CFLAGS) -MT src/tests_test_scan-scan.obj -MD -MP -MF src/$(DEPDIR)/tests_test_scan-scan.Tpo -c -o src/tests_test_scan-scan.obj `if test -f 'src/scan.c'; then $(CYGPATH_W) 'src/scan.c'; else $(CYGPATH_W) '$(srcdir)/src/scan.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/tests_test_scan-scan.Tpo src/$(DEPDIR)/tests_test_scan-scan.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/scan.c' object='src/tests_test_scan-scan.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_scan_CPPFLAGS) $(CPPFLAGS) $(tests_test_scan_CFLAGS) $(CFLAGS) -c -o src/tests_test_scan-scan.obj `if test -f 'src/scan.c'; then $(CYGPATH_W) 'src/scan.c'; else $(CYGPATH_W) '$(srcdir)/src/scan.c'; fi`
+
+.cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
@@ -1657,7 +1777,7 @@ src/win32/easytag-win32dep.obj: src/win32/win32dep.c
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
-.cpp.obj:
+.cc.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
 @am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
@@ -1666,18 +1786,62 @@ src/win32/easytag-win32dep.obj: src/win32/win32dep.c
 @am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 src/id3lib/easytag-c_wrapper.o: src/id3lib/c_wrapper.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/id3lib/easytag-c_wrapper.o -MD -MP -MF src/id3lib/$(DEPDIR)/easytag-c_wrapper.Tpo -c -o src/id3lib/easytag-c_wrapper.o `test -f 'src/id3lib/c_wrapper.cpp' || echo '$(srcdir)/'`src/id3lib/c_wrapper.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CXXFLAGS) $(CXXFLAGS) -MT src/id3lib/easytag-c_wrapper.o -MD -MP -MF src/id3lib/$(DEPDIR)/easytag-c_wrapper.Tpo -c -o src/id3lib/easytag-c_wrapper.o `test -f 'src/id3lib/c_wrapper.cpp' || echo '$(srcdir)/'`src/id3lib/c_wrapper.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/id3lib/$(DEPDIR)/easytag-c_wrapper.Tpo src/id3lib/$(DEPDIR)/easytag-c_wrapper.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/id3lib/c_wrapper.cpp' object='src/id3lib/easytag-c_wrapper.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/id3lib/easytag-c_wrapper.o `test -f 'src/id3lib/c_wrapper.cpp' || echo '$(srcdir)/'`src/id3lib/c_wrapper.cpp
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CXXFLAGS) $(CXXFLAGS) -c -o src/id3lib/easytag-c_wrapper.o `test -f 'src/id3lib/c_wrapper.cpp' || echo '$(srcdir)/'`src/id3lib/c_wrapper.cpp
 
 src/id3lib/easytag-c_wrapper.obj: src/id3lib/c_wrapper.cpp
- at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/id3lib/easytag-c_wrapper.obj -MD -MP -MF src/id3lib/$(DEPDIR)/easytag-c_wrapper.Tpo -c -o src/id3lib/easytag-c_wrapper.obj `if test -f 'src/id3lib/c_wrapper.cpp'; then $(CYGPATH_W) 'src/id3lib/c_wrapper.cpp'; else $(CYGPATH_W) '$(srcdir)/src/id3lib/c_wrapper.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CXXFLAGS) $(CXXFLAGS) -MT src/id3lib/easytag-c_wrapper.obj -MD -MP -MF src/id3lib/$(DEPDIR)/easytag-c_wrapper.Tpo -c -o src/id3lib/easytag-c_wrapper.obj `if test -f 'src/id3lib/c_wrapper.cpp'; then $(CYGPATH_W) 'src/id3lib/c_wrapper.cpp'; else $(CYGPATH_W) '$(srcdir)/src/id3lib/c_wrapper.cpp'; fi`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/id3lib/$(DEPDIR)/easytag-c_wrapper.Tpo src/id3lib/$(DEPDIR)/easytag-c_wrapper.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/id3lib/c_wrapper.cpp' object='src/id3lib/easytag-c_wrapper.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/id3lib/easytag-c_wrapper.obj `if test -f 'src/id3lib/c_wrapper.cpp'; then $(CYGPATH_W) 'src/id3lib/c_wrapper.cpp'; else $(CYGPATH_W) '$(srcdir)/src/id3lib/c_wrapper.cpp'; fi`
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CXXFLAGS) $(CXXFLAGS) -c -o src/id3lib/easytag-c_wrapper.obj `if test -f 'src/id3lib/c_wrapper.cpp'; then $(CYGPATH_W) 'src/id3lib/c_wrapper.cpp'; else $(CYGPATH_W) '$(srcdir)/src/id3lib/c_wrapper.cpp'; fi`
+
+src/easytag-gio_wrapper.o: src/gio_wrapper.cc
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CXXFLAGS) $(CXXFLAGS) -MT src/easytag-gio_wrapper.o -MD -MP -MF src/$(DEPDIR)/easytag-gio_wrapper.Tpo -c -o src/easytag-gio_wrapper.o `test -f 'src/gio_wrapper.cc' || echo '$(srcdir)/'`src/gio_wrapper.cc
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-gio_wrapper.Tpo src/$(DEPDIR)/easytag-gio_wrapper.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/gio_wrapper.cc' object='src/easytag-gio_wrapper.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CXXFLAGS) $(CXXFLAGS) -c -o src/easytag-gio_wrapper.o `test -f 'src/gio_wrapper.cc' || echo '$(srcdir)/'`src/gio_wrapper.cc
+
+src/easytag-gio_wrapper.obj: src/gio_wrapper.cc
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CXXFLAGS) $(CXXFLAGS) -MT src/easytag-gio_wrapper.obj -MD -MP -MF src/$(DEPDIR)/easytag-gio_wrapper.Tpo -c -o src/easytag-gio_wrapper.obj `if test -f 'src/gio_wrapper.cc'; then $(CYGPATH_W) 'src/gio_wrapper.cc'; else $(CYGPATH_W) '$(srcdir)/src/gio_wrapper.cc'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-gio_wrapper.Tpo src/$(DEPDIR)/easytag-gio_wrapper.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/gio_wrapper.cc' object='src/easytag-gio_wrapper.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CXXFLAGS) $(CXXFLAGS) -c -o src/easytag-gio_wrapper.obj `if test -f 'src/gio_wrapper.cc'; then $(CYGPATH_W) 'src/gio_wrapper.cc'; else $(CYGPATH_W) '$(srcdir)/src/gio_wrapper.cc'; fi`
+
+src/easytag-mp4_tag.o: src/mp4_tag.cc
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CXXFLAGS) $(CXXFLAGS) -MT src/easytag-mp4_tag.o -MD -MP -MF src/$(DEPDIR)/easytag-mp4_tag.Tpo -c -o src/easytag-mp4_tag.o `test -f 'src/mp4_tag.cc' || echo '$(srcdir)/'`src/mp4_tag.cc
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-mp4_tag.Tpo src/$(DEPDIR)/easytag-mp4_tag.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/mp4_tag.cc' object='src/easytag-mp4_tag.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CXXFLAGS) $(CXXFLAGS) -c -o src/easytag-mp4_tag.o `test -f 'src/mp4_tag.cc' || echo '$(srcdir)/'`src/mp4_tag.cc
+
+src/easytag-mp4_tag.obj: src/mp4_tag.cc
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CXXFLAGS) $(CXXFLAGS) -MT src/easytag-mp4_tag.obj -MD -MP -MF src/$(DEPDIR)/easytag-mp4_tag.Tpo -c -o src/easytag-mp4_tag.obj `if test -f 'src/mp4_tag.cc'; then $(CYGPATH_W) 'src/mp4_tag.cc'; else $(CYGPATH_W) '$(srcdir)/src/mp4_tag.cc'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-mp4_tag.Tpo src/$(DEPDIR)/easytag-mp4_tag.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='src/mp4_tag.cc' object='src/easytag-mp4_tag.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CXXFLAGS) $(CXXFLAGS) -c -o src/easytag-mp4_tag.obj `if test -f 'src/mp4_tag.cc'; then $(CYGPATH_W) 'src/mp4_tag.cc'; else $(CYGPATH_W) '$(srcdir)/src/mp4_tag.cc'; fi`
+
+.cpp.o:
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 install-man1: $(nodist_man_MANS)
 	@$(NORMAL_INSTALL)
 	@list1=''; \
@@ -2168,7 +2332,7 @@ check-TESTS:
 	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
 	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
 	exit $$?;
-recheck: all $(check_SCRIPTS)
+recheck: all $(check_PROGRAMS) $(check_SCRIPTS)
 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 	@set +e; $(am__set_TESTS_bases); \
 	bases=`for i in $$bases; do echo $$i; done \
@@ -2179,6 +2343,13 @@ recheck: all $(check_SCRIPTS)
 	        am__force_recheck=am--force-recheck \
 	        TEST_LOGS="$$log_list"; \
 	exit $$?
+tests/test-scan.log: tests/test-scan$(EXEEXT)
+	@p='tests/test-scan$(EXEEXT)'; \
+	b='tests/test-scan'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 tests/test-desktop-file-validate.sh.log: tests/test-desktop-file-validate.sh
 	@p='tests/test-desktop-file-validate.sh'; \
 	b='tests/test-desktop-file-validate.sh'; \
@@ -2391,8 +2562,8 @@ distcleancheck: distclean
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
 check: check-recursive
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h
 installdirs: installdirs-recursive
@@ -2438,6 +2609,8 @@ distclean-generic:
 	-rm -f src/libapetag/$(am__dirstamp)
 	-rm -f src/win32/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/win32/$(am__dirstamp)
+	-rm -f tests/$(DEPDIR)/$(am__dirstamp)
+	-rm -f tests/$(am__dirstamp)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -2445,11 +2618,12 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-binPROGRAMS clean-generic clean-local mostlyclean-am
+clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
+	clean-local mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf src/$(DEPDIR) src/id3lib/$(DEPDIR) src/libapetag/$(DEPDIR) src/win32/$(DEPDIR)
+	-rm -rf src/$(DEPDIR) src/id3lib/$(DEPDIR) src/libapetag/$(DEPDIR) src/win32/$(DEPDIR) tests/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-tags
@@ -2503,7 +2677,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf src/$(DEPDIR) src/id3lib/$(DEPDIR) src/libapetag/$(DEPDIR) src/win32/$(DEPDIR)
+	-rm -rf src/$(DEPDIR) src/id3lib/$(DEPDIR) src/libapetag/$(DEPDIR) src/win32/$(DEPDIR) tests/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -2533,11 +2707,12 @@ uninstall-man: uninstall-man1
 	install-data-am install-strip uninstall-am
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-	am--refresh check check-TESTS check-am clean clean-binPROGRAMS \
-	clean-cscope clean-generic clean-local cscope cscopelist-am \
-	ctags ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
-	dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
-	distclean distclean-compile distclean-generic distclean-hdr \
+	am--refresh check check-TESTS check-am check-local clean \
+	clean-binPROGRAMS clean-checkPROGRAMS clean-cscope \
+	clean-generic clean-local cscope cscopelist-am ctags ctags-am \
+	dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzip \
+	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-binPROGRAMS install-data install-data-am \
@@ -2616,6 +2791,41 @@ uninstall-update-icon-cache:
 @EASYTAG_ENABLE_TESTS_TRUE@		echo "$(DESKTOP_FILE_VALIDATE) $(top_builddir)/$(desktop_DATA) || exit 1" >> $@; \
 @EASYTAG_ENABLE_TESTS_TRUE@		chmod +x $@
 
+# test: run all tests.
+ at EASYTAG_ENABLE_TESTS_TRUE@test: $(check_PROGRAMS)
+ at EASYTAG_ENABLE_TESTS_TRUE@	$(AM_V_at)$(TEST_ENVIRONMENT) $(GTESTER) --verbose $(check_PROGRAMS)
+
+# test-report: run tests and generate report.
+# perf-report: run tests with -m perf and generate report.
+# full-report: like test-report: with -m perf and -m slow.
+ at EASYTAG_ENABLE_TESTS_TRUE@test-report perf-report full-report: $(check_PROGRAMS)
+ at EASYTAG_ENABLE_TESTS_TRUE@	$(AM_V_at)test -z "$(check_PROGRAMS)" || { \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  case $@ in \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  test-report) test_options="-k";; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  perf-report) test_options="-k -m=perf";; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  full-report) test_options="-k -m=perf -m=slow";; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  esac ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  $(TEST_ENVIRONMENT) $(GTESTER) --verbose $$test_options -o test-log.xml $(check_PROGRAMS) ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  if test -d "$(top_srcdir)/.git" ; then \
+ at EASYTAG_ENABLE_TESTS_TRUE@	    REVISION=`git describe` ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  else \
+ at EASYTAG_ENABLE_TESTS_TRUE@	    REVISION=$(PACKAGE_VERSION) ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  fi ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  echo '<?xml version="1.0"?>' > $@.xml ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  echo '<report-collection>' >> $@.xml ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  echo '<info>' >> $@.xml ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  echo '  <package>$(PACKAGE_NAME)</package>' >> $@.xml ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  echo '  <version>$(PACKAGE_VERSION)</version>' >> $@.xml ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  echo "  <revision>$$REVISION</revision>" >> $@.xml ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  echo '</info>' >> $@.xml ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  sed '1,1s/^<?xml\b[^>?]*?>//' < test-log.xml >> $@.xml ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  rm test-log.xml ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  echo >> $@.xml ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  echo '</report-collection>' >> $@.xml ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	  $(GTESTER_REPORT) --version 2>/dev/null 1>&2 ; test "$$?" != 0 || $(GTESTER_REPORT) $@.xml >$@.html ; \
+ at EASYTAG_ENABLE_TESTS_TRUE@	}
+
+check-local: test
 clean-local: clean-local-dstamp
 clean-local-dstamp:
 	-rm -f data/.dstamp
@@ -2632,6 +2842,7 @@ git-changelog-hook:
 dist-hook: git-changelog-hook
 
 .PHONY: clean-local-dstamp git-changelog-hook
+.PHONY: test test-report perf-report full-report
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/NEWS b/NEWS
index 5e05e19..6882b57 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,30 @@
+2.2.0 - 2014-04-11 :
+====================
+
+    * Several stability fixes, found with Valgrind and the Fedora retrace
+      server
+    * Use GTK+ 3 by default, but still allow building against GTK+ 2
+    * Support extended tag fields in MP4 files
+    * Support GIF images in tags
+    * Abhinav Jangda’s Ogg Opus support, asynchronous image loading, scanner
+      function tests and new Vorbis cover art support
+    * Santtu Lakkala’s MP4 cover art and GIO support, fix for Roman numeral
+      capitalization
+    * Ask for confirmation before overwriting during renaming
+    * Ekaterina Gerasimova’s Mallard help updates
+    * Avoid truncating Vorbis audio data when saving
+    * Gianvito Cavasoli’s Italian translation update
+    * Alexandre Franke’s French translation updates and typo fix
+    * Wolfgang Stöggl’s German translation updates
+    * Piotr Drąg’s Polish translation updates
+    * Мирослав Николић’s Serbian translation update
+    * Daniel Mustieles’ Spanish translation updates
+    * Balázs Úr and Attila Hammer’s Hungarian translation updates
+    * Enrico Nicoletto and Rafael Ferrera’s Brazilian Portuguese translation
+      updates
+    * Marek Černocký’s Czech translation updates
+    * Aurimas Černius’s Lithuanian translation update
+
 2.1.10 - 2014-02-19 :
 =====================
 
diff --git a/README b/README
index df9af68..0e16fe7 100644
--- a/README
+++ b/README
@@ -57,8 +57,9 @@ 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)
-* libogg and libvorbis (http://www.vorbis.com) (if not deactivated by './configure --disable-ogg')
 * 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')
 * taglib (http://taglib.github.com/) (if not deactivated by './configure --disable-mp4')
 * wavpack (http://www.wavpack.com/) (if not deactivated by './configure --disable-wavpack')
 * yelp-tools (https://git.gnome.org/browse/yelp-tools)
diff --git a/TODO b/TODO
index 5469d28..e6b67ea 100644
--- a/TODO
+++ b/TODO
@@ -16,7 +16,6 @@ General tidying
 * Instantiate windows on first use, not at startup
 * GObjectification
 * Avoid using gtk_events_pending(), use asynchronous operations instead
-* Add a test suite
 
 After GTK+ 3
 ------------
diff --git a/config.h.in b/config.h.in
index 0e00eb8..148b0c0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -18,6 +18,9 @@
 /* Define for Ogg Vorbis support */
 #undef ENABLE_OGG
 
+/* Define for Ogg Opus support */
+#undef ENABLE_OPUS
+
 /* Define for Speex support */
 #undef ENABLE_SPEEX
 
diff --git a/configure b/configure
index a3076ee..97f0618 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.1.10.
+# Generated by GNU Autoconf 2.69 for EasyTAG 2.2.0.
 #
 # 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.1.10'
-PACKAGE_STRING='EasyTAG 2.1.10'
+PACKAGE_VERSION='2.2.0'
+PACKAGE_STRING='EasyTAG 2.2.0'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=easytag'
 PACKAGE_URL='https://wiki.gnome.org/Apps/EasyTAG'
 
@@ -631,6 +631,7 @@ EGREP
 GREP
 CPP
 DEPRECATED_CPPFLAGS
+WARN_CXXFLAGS
 WARN_CFLAGS
 EASYTAG_LIBS
 EASYTAG_CFLAGS
@@ -657,6 +658,8 @@ YELP_LC_MEDIA_LINKS
 LN_S
 EASYTAG_ENABLE_TESTS_FALSE
 EASYTAG_ENABLE_TESTS_TRUE
+GTESTER_REPORT
+GTESTER
 DESKTOP_FILE_VALIDATE
 ENABLE_MAN_FALSE
 ENABLE_MAN_TRUE
@@ -814,11 +817,12 @@ with_help_dir
 enable_mp3
 enable_id3v23
 enable_ogg
+enable_opus
 enable_speex
 enable_flac
 enable_mp4
 enable_wavpack
-with_gtk3
+with_gtk2
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1382,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.1.10 to adapt to many kinds of systems.
+\`configure' configures EasyTAG 2.2.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1452,7 +1456,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of EasyTAG 2.1.10:";;
+     short | recursive ) echo "Configuration of EasyTAG 2.2.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1479,6 +1483,7 @@ Optional Features:
   --disable-id3v23        Disable support for writing id3v2.3 tags
                           (default=enabled)
   --disable-ogg           Disable support for Ogg Vorbis files (default=auto)
+  --disable-opus          Disable support for Opus Vorbis files (default=auto)
   --disable-speex         Disable support for Ogg Speex files (default=auto)
   --disable-flac          Disable support for FLAC files (default=auto)
   --disable-mp4           Disable support for MP4 files (default=auto)
@@ -1490,8 +1495,8 @@ Optional Packages:
   --with-xml-catalog=CATALOG
                           path to xml catalog to use
   --with-help-dir=DIR     path where help files are installed
-  --with-gtk3             Enable experimental GTK+ 3 support (and disable GTK+
-                          2 support)
+  --with-gtk2             Enable deprecated GTK+ 2 support (and disable GTK+ 3
+                          support)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1586,7 +1591,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-EasyTAG configure 2.1.10
+EasyTAG configure 2.2.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1993,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.1.10, which was
+It was created by EasyTAG $as_me 2.2.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2862,7 +2867,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='easytag'
- VERSION='2.1.10'
+ VERSION='2.2.0'
 
 
 # Some tools Automake needs.
@@ -6385,11 +6390,97 @@ fi
 else
   have_desktop_file_validate=no
 fi
+       # Extract the first word of "gtester", so it can be a program name with args.
+set dummy gtester; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GTESTER+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GTESTER in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GTESTER="$GTESTER" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GTESTER="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GTESTER=$ac_cv_path_GTESTER
+if test -n "$GTESTER"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTESTER" >&5
+$as_echo "$GTESTER" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+       # Extract the first word of "gtester-report", so it can be a program name with args.
+set dummy gtester-report; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GTESTER_REPORT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GTESTER_REPORT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GTESTER_REPORT="$GTESTER_REPORT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GTESTER_REPORT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GTESTER_REPORT=$ac_cv_path_GTESTER_REPORT
+if test -n "$GTESTER_REPORT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTESTER_REPORT" >&5
+$as_echo "$GTESTER_REPORT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+       if test "x$ac_cv_path_GTESTER" != "xyes" -a "x$ac_cv_path_GTESTER_REPORT" != "xyes"; then :
+  have_gtester=yes
+else
+  have_gtester=no
+fi
 else
   have_desktop_file_validate=no
+       have_gtester=no
 fi
 
-if test "x$have_desktop_file_validate" = "xyes"; then :
+if test "x$have_desktop_file_validate" = "xyes" -a "x$have_gtester" = "xyes"; then :
   testing_utilities=yes
 else
   testing_utilities=no
@@ -6914,6 +7005,12 @@ if test "${enable_ogg+set}" = set; then :
 fi
 
 
+# Check whether --enable-opus was given.
+if test "${enable_opus+set}" = set; then :
+  enableval=$enable_opus;
+fi
+
+
 # Check whether --enable-speex was given.
 if test "${enable_speex+set}" = set; then :
   enableval=$enable_speex;
@@ -6964,31 +7061,31 @@ else
 fi
 
 
-# Check whether --with-gtk3 was given.
-if test "${with_gtk3+set}" = set; then :
-  withval=$with_gtk3;
+# Check whether --with-gtk2 was given.
+if test "${with_gtk2+set}" = set; then :
+  withval=$with_gtk2;
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use GTK+ 3" >&5
-$as_echo_n "checking whether to use GTK+ 3... " >&6; }
-if test "x$have_gtk3" = "xyes" -a "x$have_gtk2" = "xno" -a "x$with_gtk3" != "xyes"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: forcing GTK+ 3 support, as GTK+ 2 was not found" >&5
-$as_echo "$as_me: WARNING: forcing GTK+ 3 support, as GTK+ 2 was not found" >&2;}
-       with_gtk3=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use GTK+ 2" >&5
+$as_echo_n "checking whether to use GTK+ 2... " >&6; }
+if test "x$have_gtk2" = "xyes" -a "x$have_gtk3" = "xno" -a "x$with_gtk2" != "xyes"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: forcing GTK+ 2 support, as GTK+ 3 was not found" >&5
+$as_echo "$as_me: WARNING: forcing GTK+ 2 support, as GTK+ 3 was not found" >&2;}
+       with_gtk2=yes
 fi
-if test "x$with_gtk3" = "xyes"; then :
+if test "x$with_gtk2" = "xyes"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GTK+ 3 support is currently experimental!" >&5
-$as_echo "$as_me: WARNING: GTK+ 3 support is currently experimental!" >&2;}
-       GTK_DEPS="$GTK3_DEPS"
-       GTK_DEPRECATION_FLAGS="-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4"
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GTK+ 2 support is currently deprecated!" >&5
+$as_echo "$as_me: WARNING: GTK+ 2 support is currently deprecated!" >&2;}
+       GTK_DEPS="$GTK2_DEPS"
+       GTK_DEPRECATION_FLAGS="-DGSEAL_ENABLE -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-       GTK_DEPS="$GTK2_DEPS"
-       GTK_DEPRECATION_FLAGS="-DGSEAL_ENABLE -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+       GTK_DEPS="$GTK3_DEPS"
+       GTK_DEPRECATION_FLAGS="-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4"
 fi
 
 pkg_failed=no
@@ -7159,6 +7256,37 @@ fi
 fi
 
 
+OPUS_DEPS="opus >= 1.0 opusfile"
+if test "x$enable_opus" != "xno"; then :
+  if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$OPUS_DEPS\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$OPUS_DEPS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  have_opus=yes
+else
+  have_opus=no
+fi
+else
+  have_opus=no
+fi
+
+if test "x$have_opus" != "xno"; then :
+  if test "x$have_ogg" = "xno"; then :
+  as_fn_error $? "Opus support requested but Ogg support disabled. Ogg support is required." "$LINENO" 5
+fi
+
+$as_echo "#define ENABLE_OPUS /**/" >>confdefs.h
+
+else
+  OPUS_DEPS=""
+       if test "x$enable_opus" = "xyes"; then :
+  as_fn_error $? "Opus support requested but required dependencies ($OPUS_DEPS) not found" "$LINENO" 5
+fi
+fi
+
+
 SPEEX_DEPS="speex"
 if test "x$enable_speex" != "xno"; then :
   if test -n "$PKG_CONFIG" && \
@@ -7176,6 +7304,9 @@ else
 fi
 
 if test "x$have_speex" != "xno"; then :
+  if test "x$have_ogg" = "xno"; then :
+  as_fn_error $? "Speex support requested but Ogg support disabled. Ogg support is required." "$LINENO" 5
+fi
 
 $as_echo "#define ENABLE_SPEEX /**/" >>confdefs.h
 
@@ -7370,7 +7501,7 @@ fi
 
 
 
-TAGLIB_DEPS="taglib_c >= 1.6.0"
+TAGLIB_DEPS="taglib >= 1.6.0"
 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
@@ -7433,12 +7564,12 @@ if test -n "$EASYTAG_CFLAGS"; then
     pkg_cv_EASYTAG_CFLAGS="$EASYTAG_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GIO_DEPS \$GTK_DEPS \$OGG_DEPS \$SPEEX_DEPS \$FLAC_DEPS \$ID3TAG_DEPS \$TAGLIB_DEPS \$WAVPACK_DEPS\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "$GIO_DEPS $GTK_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GIO_DEPS \$GTK_DEPS \$OPUS_DEPS \$OGG_DEPS \$SPEEX_DEPS \$FLAC_DEPS \$ID3TAG_DEPS \$TAGLIB_DEPS \$WAVPACK_DEPS\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$GIO_DEPS $GTK_DEPS $OPUS_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EASYTAG_CFLAGS=`$PKG_CONFIG --cflags "$GIO_DEPS $GTK_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS" 2>/dev/null`
+  pkg_cv_EASYTAG_CFLAGS=`$PKG_CONFIG --cflags "$GIO_DEPS $GTK_DEPS $OPUS_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -7450,12 +7581,12 @@ if test -n "$EASYTAG_LIBS"; then
     pkg_cv_EASYTAG_LIBS="$EASYTAG_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GIO_DEPS \$GTK_DEPS \$OGG_DEPS \$SPEEX_DEPS \$FLAC_DEPS \$ID3TAG_DEPS \$TAGLIB_DEPS \$WAVPACK_DEPS\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "$GIO_DEPS $GTK_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GIO_DEPS \$GTK_DEPS \$OPUS_DEPS \$OGG_DEPS \$SPEEX_DEPS \$FLAC_DEPS \$ID3TAG_DEPS \$TAGLIB_DEPS \$WAVPACK_DEPS\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$GIO_DEPS $GTK_DEPS $OPUS_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EASYTAG_LIBS=`$PKG_CONFIG --libs "$GIO_DEPS $GTK_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS" 2>/dev/null`
+  pkg_cv_EASYTAG_LIBS=`$PKG_CONFIG --libs "$GIO_DEPS $GTK_DEPS $OPUS_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -7476,14 +7607,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EASYTAG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GIO_DEPS $GTK_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS" 2>&1`
+	        EASYTAG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GIO_DEPS $GTK_DEPS $OPUS_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS" 2>&1`
         else
-	        EASYTAG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GIO_DEPS $GTK_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS" 2>&1`
+	        EASYTAG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GIO_DEPS $GTK_DEPS $OPUS_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EASYTAG_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements ($GIO_DEPS $GTK_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS) were not met:
+	as_fn_error $? "Package requirements ($GIO_DEPS $GTK_DEPS $OPUS_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS) were not met:
 
 $EASYTAG_PKG_ERRORS
 
@@ -7637,6 +7768,57 @@ CFLAGS="$realsave_CFLAGS"
 
 WARN_CFLAGS="$tested_warning_flags"
 
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+realsave_CFLAGS="$CXXFLAGS"
+for option in $warning_flags; do
+    save_CFLAGS="$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; }
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  has_option=yes
+else
+  has_option=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	CXXFLAGS="$save_CXXFLAGS"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
+$as_echo "$has_option" >&6; }
+	if test $has_option = yes; then :
+  tested_cxx_warning_flags="$tested_cxx_warning_flags $option"
+fi
+	unset has_option
+	unset save_CFLAGS
+done
+unset option
+CXXFLAGS="$realsave_CXXFLAGS"
+
+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
+
+WARN_CXXFLAGS="$tested_cxx_warning_flags"
+
 DEPRECATED_CPPFLAGS="-DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -DG_DISABLE_DEPRECATED $GTK_DEPRECATION_FLAGS"
 
 
@@ -8785,7 +8967,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.1.10, which was
+This file was extended by EasyTAG $as_me 2.2.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8852,7 +9034,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.1.10
+EasyTAG config.status 2.2.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -9746,12 +9928,14 @@ echo Preprocessor ............: $CC $CPPFLAGS
 echo Deprecation defines .....: $DEPRECATED_CPPFLAGS
 echo Compiler ................: $CC $CFLAGS
 echo Compiler warnings .......: $WARN_CFLAGS
+echo C++ Compiler warnings ...: $WARN_CXXFLAGS
 echo Linker ..................: $CC $LDFLAGS $LIBS
 echo GTK version .............: `$PKG_CONFIG --modversion $GTK_DEPS`
 echo MP3 file support ........: $have_mp3
 echo ID3v2.3 tags support ....: $have_id3lib $ID3LIB_VERSION
 echo Ogg Vorbis file support .: $have_ogg
 echo Ogg Speex file support ..: $have_speex
+echo Ogg Opus file support ...: $have_opus
 echo FLAC file support .......: $have_flac
 echo MP4 file support ........: $have_taglib
 echo WavPack support .........: $have_wavpack
diff --git a/configure.ac b/configure.ac
index fbe1111..ae11d83 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.1.10], [https://bugzilla.gnome.org/enter_bug.cgi?product=easytag], [easytag], [https://wiki.gnome.org/Apps/EasyTAG])
+AC_INIT([EasyTAG], [2.2.0], [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])
@@ -71,10 +71,16 @@ AS_IF([test "x$enable_tests" != "xno"],
       [AC_PATH_PROG([DESKTOP_FILE_VALIDATE], [desktop-file-validate])
        AS_IF([test "x$ac_cv_path_DESKTOP_FILE_VALIDATE" != "xyes"],
              [have_desktop_file_validate=yes],
-             [have_desktop_file_validate=no])],
-      [have_desktop_file_validate=no])
-
-AS_IF([test "x$have_desktop_file_validate" = "xyes"],
+             [have_desktop_file_validate=no])
+       AC_PATH_PROG([GTESTER], [gtester])
+       AC_PATH_PROG([GTESTER_REPORT], [gtester-report])
+       AS_IF([test "x$ac_cv_path_GTESTER" != "xyes" -a "x$ac_cv_path_GTESTER_REPORT" != "xyes"],
+             [have_gtester=yes],
+             [have_gtester=no])],
+      [have_desktop_file_validate=no
+       have_gtester=no])
+
+AS_IF([test "x$have_desktop_file_validate" = "xyes" -a "x$have_gtester" = "xyes"],
       [testing_utilities=yes],
       [testing_utilities=no
        AS_IF([test "x$enable_tests" = "xyes"],
@@ -115,6 +121,9 @@ AC_ARG_ENABLE([id3v23],
 AC_ARG_ENABLE([ogg],
               [AS_HELP_STRING([--disable-ogg], [Disable support for Ogg Vorbis files (default=auto)])])
 
+AC_ARG_ENABLE([opus],
+              [AS_HELP_STRING([--disable-opus], [Disable support for Opus Vorbis files (default=auto)])])
+
 AC_ARG_ENABLE([speex],
               [AS_HELP_STRING([--disable-speex], [Disable support for Ogg Speex files (default=auto)])])
 
@@ -138,21 +147,21 @@ GTK3_DEPS="gtk+-3.0 >= 3.2.1"
 PKG_CHECK_EXISTS([$GTK2_DEPS], [have_gtk2=yes], [have_gtk2=no])
 PKG_CHECK_EXISTS([$GTK3_DEPS], [have_gtk3=yes], [have_gtk3=no])
 
-AC_ARG_WITH([gtk3],
-            [AS_HELP_STRING([--with-gtk3], [Enable experimental GTK+ 3 support (and disable GTK+ 2 support)])])
+AC_ARG_WITH([gtk2],
+            [AS_HELP_STRING([--with-gtk2], [Enable deprecated GTK+ 2 support (and disable GTK+ 3 support)])])
 
-AC_MSG_CHECKING([whether to use GTK+ 3])
-AS_IF([test "x$have_gtk3" = "xyes" -a "x$have_gtk2" = "xno" -a "x$with_gtk3" != "xyes"],
-      [AC_MSG_WARN([forcing GTK+ 3 support, as GTK+ 2 was not found])
-       with_gtk3=yes])
-AS_IF([test "x$with_gtk3" = "xyes"],
+AC_MSG_CHECKING([whether to use GTK+ 2])
+AS_IF([test "x$have_gtk2" = "xyes" -a "x$have_gtk3" = "xno" -a "x$with_gtk2" != "xyes"],
+      [AC_MSG_WARN([forcing GTK+ 2 support, as GTK+ 3 was not found])
+       with_gtk2=yes])
+AS_IF([test "x$with_gtk2" = "xyes"],
       [AC_MSG_RESULT([yes])
-       AC_MSG_WARN([GTK+ 3 support is currently experimental!])
-       GTK_DEPS="$GTK3_DEPS"
-       GTK_DEPRECATION_FLAGS="-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4"],
-      [AC_MSG_RESULT([no])
+       AC_MSG_WARN([GTK+ 2 support is currently deprecated!])
        GTK_DEPS="$GTK2_DEPS"
-       GTK_DEPRECATION_FLAGS="-DGSEAL_ENABLE -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"])
+       GTK_DEPRECATION_FLAGS="-DGSEAL_ENABLE -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"],
+      [AC_MSG_RESULT([no])
+       GTK_DEPS="$GTK3_DEPS"
+       GTK_DEPRECATION_FLAGS="-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4"])
 PKG_CHECK_MODULES([GTK], [$GTK_DEPS])
 
 
@@ -176,9 +185,25 @@ AS_IF([test "x$have_ogg" != "xno"],
              [AC_MSG_ERROR([OGG Vorbis support requested but required dependencies ($OGG_DEPS) not found])])])
 
 dnl ################################################
+dnl # Opus libraries
+dnl ################################################
+
+OPUS_DEPS="opus >= 1.0 opusfile"
+AS_IF([test "x$enable_opus" != "xno"],
+      [PKG_CHECK_EXISTS([$OPUS_DEPS], [have_opus=yes], [have_opus=no])],
+      [have_opus=no])
+
+AS_IF([test "x$have_opus" != "xno"],
+      [AS_IF([test "x$have_ogg" = "xno"],
+             [AC_MSG_ERROR([Opus support requested but Ogg support disabled. Ogg support is required.])])
+       AC_DEFINE([ENABLE_OPUS], [], [Define for Ogg Opus support])],
+      [OPUS_DEPS=""
+       AS_IF([test "x$enable_opus" = "xyes"],
+             [AC_MSG_ERROR([Opus support requested but required dependencies ($OPUS_DEPS) not found])])])
+
+dnl ################################################
 dnl # libSpeex library
 dnl ################################################
-dnl check for system libspeex
 
 SPEEX_DEPS="speex"
 AS_IF([test "x$enable_speex" != "xno"],
@@ -186,7 +211,9 @@ AS_IF([test "x$enable_speex" != "xno"],
       [have_speex=no])
 
 AS_IF([test "x$have_speex" != "xno"],
-      [AC_DEFINE([ENABLE_SPEEX], [], [Define for Speex support])],
+      [AS_IF([test "x$have_ogg" = "xno"],
+             [AC_MSG_ERROR([Speex support requested but Ogg support disabled. Ogg support is required.])])
+       AC_DEFINE([ENABLE_SPEEX], [], [Define for Speex support])],
       [SPEEX_DEPS=""
        AS_IF([test "x$enable_speex" = "xyes"],
              [AC_MSG_ERROR([OGG Speex support requested but required dependencies ($SPEEX_DEPS) not found])])])
@@ -194,7 +221,6 @@ AS_IF([test "x$have_speex" != "xno"],
 dnl ################################################
 dnl # libFLAC library
 dnl ################################################
-dnl check for system libflac
 
 FLAC_DEPS="flac >= 1.1.4"
 AS_IF([test "x$enable_flac" != "xno"],
@@ -257,7 +283,7 @@ dnl ################################################
 dnl # taglib library
 dnl ################################################
 
-TAGLIB_DEPS="taglib_c >= 1.6.0"
+TAGLIB_DEPS="taglib >= 1.6.0"
 AS_IF([test "x$enable_mp4" != "xno"],
       [PKG_CHECK_EXISTS([$TAGLIB_DEPS], [have_taglib=yes], [have_taglib=no])],
       [have_taglib=no])
@@ -284,7 +310,7 @@ AS_IF([test "x$have_wavpack" != "xno"],
 
 dnl Check the pkg-config dependencies
 GIO_DEPS="gio-2.0 >= 2.32.0" dnl For g_file_new_tmp()
-PKG_CHECK_MODULES([EASYTAG], [$GIO_DEPS $GTK_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS])
+PKG_CHECK_MODULES([EASYTAG], [$GIO_DEPS $GTK_DEPS $OPUS_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS $TAGLIB_DEPS $WAVPACK_DEPS])
 
 dnl Check for winsock
 AC_SEARCH_LIBS([gethostbyname], [nsl socket], [],
@@ -316,6 +342,26 @@ unset option
 CFLAGS="$realsave_CFLAGS"
 
 AC_SUBST([WARN_CFLAGS], ["$tested_warning_flags"])
+AC_LANG_PUSH([C++])
+
+realsave_CFLAGS="$CXXFLAGS"
+for option in $warning_flags; do
+    save_CFLAGS="$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])
+	CXXFLAGS="$save_CXXFLAGS"
+	AC_MSG_RESULT([$has_option])
+	AS_IF([test $has_option = yes],
+	      [tested_cxx_warning_flags="$tested_cxx_warning_flags $option"])
+	unset has_option
+	unset save_CFLAGS
+done
+unset option
+CXXFLAGS="$realsave_CXXFLAGS"
+
+AC_LANG_POP([C++])
+AC_SUBST([WARN_CXXFLAGS], ["$tested_cxx_warning_flags"])
 AC_SUBST([DEPRECATED_CPPFLAGS], ["-DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -DG_DISABLE_DEPRECATED $GTK_DEPRECATION_FLAGS"])
 
 dnl To enable 'gprof' profiling
@@ -357,12 +403,14 @@ echo Preprocessor ............: $CC $CPPFLAGS
 echo Deprecation defines .....: $DEPRECATED_CPPFLAGS
 echo Compiler ................: $CC $CFLAGS
 echo Compiler warnings .......: $WARN_CFLAGS
+echo C++ Compiler warnings ...: $WARN_CXXFLAGS
 echo Linker ..................: $CC $LDFLAGS $LIBS
 echo GTK version .............: `$PKG_CONFIG --modversion $GTK_DEPS`
 echo MP3 file support ........: $have_mp3
 echo ID3v2.3 tags support ....: $have_id3lib $ID3LIB_VERSION
 echo Ogg Vorbis file support .: $have_ogg
 echo Ogg Speex file support ..: $have_speex
+echo Ogg Opus file support ...: $have_opus
 echo FLAC file support .......: $have_flac
 echo MP4 file support ........: $have_taglib
 echo WavPack support .........: $have_wavpack
diff --git a/data/easytag.appdata.xml.in b/data/easytag.appdata.xml.in
index 01fef04..e3bac37 100644
--- a/data/easytag.appdata.xml.in
+++ b/data/easytag.appdata.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2013 David King <amigadave at amigadave.com> -->
+<!-- Copyright 2014 David King <amigadave at amigadave.com> -->
 <application>
     <id type="desktop">easytag.desktop</id>
     <licence>CC0</licence>
@@ -8,8 +8,8 @@
     <summary></summary>
 -->
     <description>
-        <_p>View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Vorbis,
-	MusePack, Monkey's Audio and WavPack files.</_p>
+        <_p>View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg
+        Speex, Ogg Vorbis, MusePack, Monkey's Audio and WavPack files.</_p>
 	<_p>Look up albums in online databases, bulk edit tags, create
 	playlists and rename a collection of files.</_p>
         <_p>A simple and nice GTK+ interface makes tagging easier under
diff --git a/doc/easytag.xml b/doc/easytag.xml
index cad9952..6011731 100644
--- a/doc/easytag.xml
+++ b/doc/easytag.xml
@@ -31,9 +31,9 @@
 <refsect1><title>Description</title>
 <para>
 <command>easytag</command> is a utility for viewing and editing tags for MP3,
-MP2, MP4/AAC, FLAC, Ogg Vorbis, MusePack, Monkey's Audio and WavPack files. Its
-simple and nice GTK+ interface makes tagging easier under Linux or
-Windows.</para>
+MP2, MP4/AAC, FLAC, Ogg Speex, Ogg Opus, Ogg Vorbis, MusePack, Monkey's Audio
+and WavPack files. Its simple and nice GTK+ interface makes tagging easier
+under Linux or Windows.</para>
 </refsect1>
 
 <refsect1><title>Invocation</title>
diff --git a/easytag-win32-installer.nsi.in b/easytag-win32-installer.nsi.in
index 79285d6..954921d 100644
--- a/easytag-win32-installer.nsi.in
+++ b/easytag-win32-installer.nsi.in
@@ -169,20 +169,23 @@ Section "Core ${PRODUCT_NAME} Files" SecProgram
   File "${PREFIX}/bin/iconv.dll"
   File "${PREFIX}/bin/libatk-1.0-0.dll"
   File "${PREFIX}/bin/libcairo-2.dll"
+  File "${PREFIX}/bin/libcairo-gobject-2.dll"
   File "${PREFIX}/bin/libFLAC-8.dll"
   File "${PREFIX}/bin/libffi-6.dll"
   File "${PREFIX}/bin/libgcc_s_sjlj-1.dll"
-  File "${PREFIX}/bin/libgdk-win32-2.0-0.dll"
+  File "${PREFIX}/bin/libgdk-3-0.dll"
   File "${PREFIX}/bin/libgdk_pixbuf-2.0-0.dll"
   File "${PREFIX}/bin/libgio-2.0-0.dll"
   File "${PREFIX}/bin/libglib-2.0-0.dll"
   File "${PREFIX}/bin/libgmodule-2.0-0.dll"
   File "${PREFIX}/bin/libgobject-2.0-0.dll"
-  File "${PREFIX}/bin/libgtk-win32-2.0-0.dll"
+  File "${PREFIX}/bin/libgtk-3-0.dll"
   File "${PREFIX}/bin/libid3-3-8-3.dll"
   File "${PREFIX}/bin/libid3tag-0.dll"
   File "${PREFIX}/bin/libintl-8.dll"
   File "${PREFIX}/bin/libogg-0.dll"
+  File "${PREFIX}/bin/libopus-0.dll"
+  File "${PREFIX}/bin/libopusfile-0.dll"
   File "${PREFIX}/bin/libpango-1.0-0.dll"
   File "${PREFIX}/bin/libpangocairo-1.0-0.dll"
   File "${PREFIX}/bin/libpangowin32-1.0-0.dll"
@@ -191,7 +194,6 @@ Section "Core ${PRODUCT_NAME} Files" SecProgram
   File "${PREFIX}/bin/libstdc++-6.dll"
   File "${PREFIX}/bin/libspeex-1.dll"
   File "${PREFIX}/bin/libtag.dll"
-  File "${PREFIX}/bin/libtag_c.dll"
   File "${PREFIX}/bin/libvorbis-0.dll"
   File "${PREFIX}/bin/libvorbisfile-3.dll"
   File "${PREFIX}/bin/libwavpack-1.dll"
@@ -201,20 +203,17 @@ Section "Core ${PRODUCT_NAME} Files" SecProgram
 
   SetOutPath "$INSTDIR\etc"
   File /r "${PREFIX}/etc/fonts"
-  File /r "${PREFIX}/etc/gtk-2.0"
+  File /r "${PREFIX}/etc/gtk-3.0"
   CreateDirectory "$INSTDIR\etc\pango"
 
   SetOutPath "$INSTDIR\lib"
   File /r "${PREFIX}/lib/gdk-pixbuf-2.0"
-  File /r "${PREFIX}/lib/gtk-2.0"
+  File /r "${PREFIX}/lib/gtk-3.0"
   File /r "${PREFIX}/lib/pango"
 
-  SetOutPath "$INSTDIR\share\themes\MS-Windows\gtk-2.0"
-  File "${PREFIX}/share/themes/MS-Windows/gtk-2.0/gtkrc"
-
-  SetOutPath "$INSTDIR\etc\gtk-2.0"
-  FileOpen $0 gtkrc w
-  FileWrite $0 "gtk-theme-name = $\"MS-Windows$\" $\r$\n"
+  SetOutPath "$INSTDIR\etc\gtk-3.0"
+  FileOpen $0 settings.ini w
+  FileWrite $0 "gtk-theme-name = $\"win32$\" $\r$\n"
   FileWrite $0 "gtk-icon-theme-name = $\"hicolor$\" $\r$\n"
   FileWrite $0 "gtk-toolbar-style = GTK_TOOLBAR_ICONS$\r$\n"
   FileClose $0
@@ -299,8 +298,8 @@ Section "${LOCALE} Translation"
   File "${PREFIX}/share/locale/${LOCALE}/LC_MESSAGES/atk10.mo"
   File "${PREFIX}/share/locale/${LOCALE}/LC_MESSAGES/gdk-pixbuf.mo"
   File "${PREFIX}/share/locale/${LOCALE}/LC_MESSAGES/glib20.mo"
-  File "${PREFIX}/share/locale/${LOCALE}/LC_MESSAGES/gtk20.mo"
-  File "${PREFIX}/share/locale/${LOCALE}/LC_MESSAGES/gtk20-properties.mo"
+  File "${PREFIX}/share/locale/${LOCALE}/LC_MESSAGES/gtk30.mo"
+  File "${PREFIX}/share/locale/${LOCALE}/LC_MESSAGES/gtk30-properties.mo"
 SectionEnd
 !macroend
 
@@ -385,10 +384,10 @@ Section Uninstall
   Delete /rebootok "$INSTDIR\bin\${PRODUCT_EXE_NAME}"
 
   RMDir /r "$INSTDIR\lib\pango"
-  RMDir /r "$INSTDIR\lib\gtk-2.0"
+  RMDir /r "$INSTDIR\lib\gtk-3.0"
   RMDir /r "$INSTDIR\lib\gdk-pixbuf-2.0"
   RMDir /r "$INSTDIR\etc\pango"
-  RMDir /r "$INSTDIR\etc\gtk-2.0"
+  RMDir /r "$INSTDIR\etc\gtk-3.0"
   RMDir /r "$INSTDIR\etc\fonts"
 
   Delete /rebootok "$INSTDIR\bin\zlib1.dll"
@@ -396,7 +395,6 @@ Section Uninstall
   Delete /rebootok "$INSTDIR\bin\libwavpack-1.dll"
   Delete /rebootok "$INSTDIR\bin\libvorbisfile-3.dll"
   Delete /rebootok "$INSTDIR\bin\libvorbis-0.dll"
-  Delete /rebootok "$INSTDIR\bin\libtag_c.dll"
   Delete /rebootok "$INSTDIR\bin\libtag.dll"
   Delete /rebootok "$INSTDIR\bin\libstdc++-6.dll"
   Delete /rebootok "$INSTDIR\bin\libspeex-1.dll"
@@ -405,18 +403,23 @@ Section Uninstall
   Delete /rebootok "$INSTDIR\bin\libpangowin32-1.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libpangocairo-1.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libpango-1.0-0.dll"
+  Delete /rebootok "$INSTDIR\bin\libopusfile-0.dll"
+  Delete /rebootok "$INSTDIR\bin\libopus-0.dll"
   Delete /rebootok "$INSTDIR\bin\libogg-0.dll"
   Delete /rebootok "$INSTDIR\bin\libintl-8.dll"
-  Delete /rebootok "$INSTDIR\bin\libgtk-win32-2.0-0.dll"
+  Delete /rebootok "$INSTDIR\bin\libid3tag-0.dll"
+  Delete /rebootok "$INSTDIR\bin\libid3-3-8-3.dll"
+  Delete /rebootok "$INSTDIR\bin\libgtk-3-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgobject-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgmodule-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libglib-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgio-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgdk_pixbuf-2.0-0.dll"
-  Delete /rebootok "$INSTDIR\bin\libgdk-win32-2.0-0.dll"
+  Delete /rebootok "$INSTDIR\bin\libgdk-3-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgcc_s_sjlj-1.dll"
   Delete /rebootok "$INSTDIR\bin\libffi-6.dll"
   Delete /rebootok "$INSTDIR\bin\libFLAC-8.dll"
+  Delete /rebootok "$INSTDIR\bin\libcairo-gobject-2.dll"
   Delete /rebootok "$INSTDIR\bin\libcairo-2.dll"
   Delete /rebootok "$INSTDIR\bin\libatk-1.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\iconv.dll"
diff --git a/help/C/image-export.page b/help/C/image-export.page
index 0074415..59a3342 100644
--- a/help/C/image-export.page
+++ b/help/C/image-export.page
@@ -1,7 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/"
       xmlns:its="http://www.w3.org/2005/11/its"
       type="task" style="task"
-      id="image-save">
+      id="image-export">
 
   <info>
     <link type="guide" xref="index#image"/>
diff --git a/help/C/image.page b/help/C/image.page
index d5cfe5f..22f5e1e 100644
--- a/help/C/image.page
+++ b/help/C/image.page
@@ -7,6 +7,7 @@
     <link type="guide" xref="index#image"/>
     <link type="guide" xref="tag"/>
     <revision pkgversion="2.1.9" date="2013-05-20" status="review"/>
+    <revision pkgversion="2.2.0" date="2014-04-10" status="review"/>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
@@ -47,8 +48,4 @@
   <p>You can work with more than one image at a time by selecting those images
   before you edit, apply, save to file or delete them.</p>
 
-  <note>
-    <p>Not all files support the image field. <sys>mp4</sys> files are one
-    example of files that do not support this field.</p>
-  </note>
 </page>
diff --git a/help/C/index.page b/help/C/index.page
index 23f1402..453ccc6 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -38,10 +38,10 @@
 
 <!--  <section id="preferences" style="2column">
     <title>Preferences</title>
-  </section>
+  </section>-->
 
   <section id="problems">
     <title>Common problems and questions</title>
-  </section>-->
+  </section>
 
 </page>
diff --git a/help/C/introduction.page b/help/C/introduction.page
index ef74ab8..bf758bc 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -6,6 +6,7 @@
   <info>
     <link type="guide" xref="index" group="#first"/>
     <revision pkgversion="2.1.9" date="2013-03-05" status="candidate" />
+    <revision pkgversion="2.2.0" date="2014-04-09" status="candidate" />
 
     <credit type="author">
       <name>Ekaterina Gerasimova</name>
@@ -20,6 +21,7 @@
   <title>Introduction</title>
 
   <p><app>EasyTAG</app> is a comprehensive tag editor for FLAC, Monkey's Audio,
-  MP2, MP3, MP4/AAC, MusePack, Ogg Vorbis, Speex and WavPack audio files.</p>
+  MP2, MP3, MP4/AAC, MusePack, Ogg Opus, Ogg Speex, Ogg Vorbis and WavPack
+  audio files.</p>
 
 </page>
diff --git a/help/C/problems-id3.page b/help/C/problems-id3.page
new file mode 100644
index 0000000..6f72802
--- /dev/null
+++ b/help/C/problems-id3.page
@@ -0,0 +1,58 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" style="task"
+      id="problems-id3">
+
+  <info>
+    <link type="guide" xref="index#problems"/>
+    <revision pkgversion="2.2.0" date="2014-04-09" status="review"/>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
+    <credit type="author">
+      <name>David King</name>
+      <email its:translate="no">amigadave at amigadave.com</email>
+    </credit>
+
+    <desc>Fix ID3 tags that show up blank or incorrect tags in other
+    applications</desc>
+  </info>
+
+  <title>MP3 tags not showing correctly</title>
+
+  <p><em>ID3</em> tags, which are used for MP3 files, can be of one of several
+  different versions. <app>EasyTAG</app> supports ID3v2.4, ID3v2.3 and ID3v1.1.
+  The default version in <app>EasyTAG</app> is ID3v2.4, which has the most
+  features and is most efficient.</p>
+
+  <p>Most applications support the most recent version of the ID3 standard:
+  ID3v2.4.</p>
+
+  <p>Some applications and devices may support only ID3v2.3 and ID3v1.1 tags,
+  and a few may support only ID3v1.1 tags. If another application or a device
+  has a problem reading tags from your files, you should try changing the ID3
+  tag version settings in the preferences:</p>
+
+  <steps>
+    <item>
+      <p>Select
+      <guiseq style="menuitem"><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui></guiseq></p>
+    </item>
+    <item>
+      <p>Select the <gui style="tab">ID3 Tag Settings</gui> tab</p>
+    </item>
+    <item>
+      <p>In the <gui style="group">ID3v2 tags</gui> section, choose the
+      <gui>ID3v2.3</gui> setting in the <gui>Version</gui> drop-down lid to
+      improve compatibility with other systems capable of reading ID3v2 tags</p>
+    </item>
+    <item>
+      <p>Make sure that <gui style="check">Write ID3v1.x tag</gui> is checked
+      in the <gui style="group">ID3v1 tags</gui> section</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">OK</gui> to save the settings</p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/problems-ogg-split.page b/help/C/problems-ogg-split.page
new file mode 100644
index 0000000..8d4dd97
--- /dev/null
+++ b/help/C/problems-ogg-split.page
@@ -0,0 +1,60 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" style="task"
+      id="problems-ogg-split">
+
+  <info>
+    <link type="guide" xref="index#problems"/>
+    <revision pkgversion="2.2.0" date="2014-04-11" status="candidate"/>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
+    <credit type="author">
+      <name>David King</name>
+      <email its:translate="no">amigadave at amigadave.com</email>
+    </credit>
+    <credit type="editor">
+      <name>Ekaterina Gerasimova</name>
+      <email its:translate="no">kittykat3756 at gmail.com</email>
+    </credit>
+
+    <desc>Split a single tag field into multiple fields when you save Ogg and
+    FLAC files</desc>
+  </info>
+
+  <title>Split tag fields when saving</title>
+
+  <p>In Ogg and FLAC files, it is possible to have more than one
+  <link xref="tag">tag field</link> of each type. For example, if two artists
+  performed a song, there can be two artist fields in the tag, one for each
+  artist. <app>EasyTAG</app> automatically reads the extra fields, combining
+  them together and showing them as if they were a single field.</p>
+
+  <p>Many applications do not read the multi-value field correctly, so the
+  default configuration is to save using a single field per entry. If the
+  application that you are using supports multiple field of one type, you can
+  configure EasyTAG to split fields when you save the file. Fields will
+  automatically be split whenever " - " occurs in the field. For example, in
+  the field "David Bowie - Queen", two fields would be saved: "David Bowie" and
+  "Queen".</p>
+
+  <p>To split fields when you save the files:</p>
+
+  <steps>
+    <item>
+      <p>Select
+      <guiseq style="menuitem"><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui></guiseq></p>
+    </item>
+    <item>
+      <p>Select the <gui style="tab">Tag Settings</gui> tab</p>
+    </item>
+    <item>
+      <p>In <gui style="group">Tag Splitting</gui> section, check the fields
+      that you want to be split into multiple fields when saving</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">OK</gui> to save the settings</p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/Makefile.am b/help/Makefile.am
index f48cb1b..470fba4 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -15,6 +15,8 @@ HELP_FILES = \
 	keyboard-shortcuts.page \
 	legal.xml \
 	playlist-generate.page \
+	problems-id3.page \
+	problems-ogg-split.page \
 	scanner.page \
 	starting.page \
 	tag-field.page \
diff --git a/help/Makefile.in b/help/Makefile.in
index ce997e8..5c6d0e6 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -144,6 +144,8 @@ EXEEXT = @EXEEXT@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GTESTER = @GTESTER@
+GTESTER_REPORT = @GTESTER_REPORT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 HELP_DIR = @HELP_DIR@
@@ -191,6 +193,7 @@ STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XMLCATALOG = @XMLCATALOG@
@@ -267,6 +270,8 @@ HELP_FILES = \
 	keyboard-shortcuts.page \
 	legal.xml \
 	playlist-generate.page \
+	problems-id3.page \
+	problems-ogg-split.page \
 	scanner.page \
 	starting.page \
 	tag-field.page \
diff --git a/po/LINGUAS b/po/LINGUAS
index 2e0def6..56eb67c 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -5,6 +5,7 @@ cs
 da
 de
 el
+en_GB
 es
 fr
 he
@@ -21,6 +22,7 @@ sl
 sr
 sr at latin
 sv
+te
 tr
 uk
 zh_CN
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2270e4d..90110cd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,15 +16,16 @@ src/id3v24_tag.c
 src/log.c
 src/misc.c
 src/monkeyaudio_header.c
-src/mp4_header.c
-src/mp4_tag.c
+src/mp4_header.cc
+src/mp4_tag.cc
 src/mpeg_header.c
 src/musepack_header.c
 src/ogg_header.c
 src/ogg_tag.c
+src/opus_header.c
 src/picture.c
 src/prefs.c
-src/scan.c
+src/scan_dialog.c
 src/setting.c
 src/vcedit.c
 src/wavpack_header.c
diff --git a/po/cs.po b/po/cs.po
index a333948..4492210 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,8 +10,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-02-08 11:25+0000\n"
-"PO-Revision-Date: 2014-02-09 09:22+0100\n"
+"POT-Creation-Date: 2014-04-07 09:21+0000\n"
+"PO-Revision-Date: 2014-04-05 17:15+0200\n"
 "Last-Translator: Marek Černocký <marek at manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list at gnome.org>\n"
 "Language: cs\n"
@@ -25,11 +25,11 @@ msgstr ""
 
 #: ../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."
+"View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg "
+"Vorbis, MusePack, Monkey's Audio and WavPack files."
 msgstr ""
 "Zobrazte si a upravte šítky (tzv. „tagy“) u souborů MP3, MP2, MP4/AAC, FLAC, "
-"Ogg Vorbis, MusePack, Monkey's Audio a WavPack."
+"Ogg Opus, Ogg Speex, Ogg Vorbis, MusePack, Monkey's Audio a WavPack."
 
 #: ../data/easytag.appdata.xml.in.h:2
 msgid ""
@@ -60,7 +60,7 @@ msgstr "Upravit metadata zvukového souboru"
 msgid "mp3;tag;audio;"
 msgstr "mp3;štítek;tag;audio;zvuk;"
 
-#: ../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 "
@@ -89,11 +89,11 @@ msgstr ""
 ">."
 
 #. Translators: put your own name here to appear in the about dialog.
-#: ../src/about.c:108
+#: ../src/about.c:106
 msgid "translator-credits"
 msgstr "Marek Černocký <marek at manet.cz>"
 
-#: ../src/about.c:118
+#: ../src/about.c:116
 msgid "View and edit tags in audio files"
 msgstr "Zobrazování a ůpravy štítků ve zvukových souborech"
 
@@ -120,729 +120,737 @@ msgstr "– upravovat štítky a názvy zvukových souborů"
 #.
 #. * Main Menu Actions
 #.
-#: ../src/bar.c:154
+#: ../src/bar.c:155
 msgid "_File"
 msgstr "_Soubor"
 
-#: ../src/bar.c:155
+#: ../src/bar.c:156
 msgid "Sort List by Tag"
 msgstr "Seřadit seznam podle štítků"
 
-#: ../src/bar.c:158
+#: ../src/bar.c:159
 msgid "Sort List by Property"
 msgstr "Seřadit seznam podle vlastností"
 
-#: ../src/bar.c:159
+#: ../src/bar.c:160
 msgid "Ascending by filename"
 msgstr "Vzestupně podle názvu souboru"
 
-#: ../src/bar.c:160
+#: ../src/bar.c:161
 msgid "Descending by filename"
 msgstr "Sestupně podle názvu souboru"
 
-#: ../src/bar.c:161
+#: ../src/bar.c:162
 msgid "Ascending by creation date"
 msgstr "Vzestupně podle data vytvoření"
 
-#: ../src/bar.c:162
+#: ../src/bar.c:163
 msgid "Descending by creation date"
 msgstr "Sestupně podle data vytvoření"
 
-#: ../src/bar.c:163
+#: ../src/bar.c:164
 msgid "Ascending by track number"
 msgstr "Vzestupně podle čísla skladby"
 
-#: ../src/bar.c:164
+#: ../src/bar.c:165
 msgid "Descending by track number"
 msgstr "Sestupně podle čísla skladby"
 
-#: ../src/bar.c:165
+#: ../src/bar.c:166
 msgid "Ascending by title"
 msgstr "Vzestupně podle názvu skladby"
 
-#: ../src/bar.c:166
+#: ../src/bar.c:167
 msgid "Descending by title"
 msgstr "Sestupně podle názvu skladby"
 
-#: ../src/bar.c:167
+#: ../src/bar.c:168
 msgid "Ascending by artist"
 msgstr "Vzestupně podle umělce"
 
-#: ../src/bar.c:168
+#: ../src/bar.c:169
 msgid "Descending by artist"
 msgstr "Sestupně podle umělce"
 
-#: ../src/bar.c:169
+#: ../src/bar.c:170
 msgid "Ascending by album artist"
 msgstr "Vzestupně podle umělce alba"
 
-#: ../src/bar.c:170
+#: ../src/bar.c:171
 msgid "Descending by album artist"
 msgstr "Sestupně podle umělce alba"
 
-#: ../src/bar.c:171
+#: ../src/bar.c:172
 msgid "Ascending by album"
 msgstr "Vzestupně podle názvu alba"
 
-#: ../src/bar.c:172
+#: ../src/bar.c:173
 msgid "Descending by album"
 msgstr "Sestupně podle názvu alba"
 
-#: ../src/bar.c:173
+#: ../src/bar.c:174
 msgid "Ascending by year"
 msgstr "Vzestupně podle roku"
 
-#: ../src/bar.c:174
+#: ../src/bar.c:175
 msgid "Descending by year"
 msgstr "Sestupně podle roku"
 
-#: ../src/bar.c:175
+#: ../src/bar.c:176
 msgid "Ascending by genre"
 msgstr "Vzestupně podle žánru"
 
-#: ../src/bar.c:176
+#: ../src/bar.c:177
 msgid "Descending by genre"
 msgstr "Sestupně podle žánru"
 
-#: ../src/bar.c:177
+#: ../src/bar.c:178
 msgid "Ascending by comment"
 msgstr "Vzestupně podle poznámky"
 
-#: ../src/bar.c:178
+#: ../src/bar.c:179
 msgid "Descending by comment"
 msgstr "Sestupně podle poznámky"
 
-#: ../src/bar.c:179
+#: ../src/bar.c:180
 msgid "Ascending by composer"
 msgstr "Vzestupně podle skladatele"
 
-#: ../src/bar.c:180
+#: ../src/bar.c:181
 msgid "Descending by composer"
 msgstr "Sestupně podle skladatele"
 
-#: ../src/bar.c:181
+#: ../src/bar.c:182
 msgid "Ascending by original artist"
 msgstr "Vzestupně podle původního umělce"
 
-#: ../src/bar.c:182
+#: ../src/bar.c:183
 msgid "Descending by original artist"
 msgstr "Sestupně podle původního umělce"
 
-#: ../src/bar.c:183
+#: ../src/bar.c:184
 msgid "Ascending by copyright"
 msgstr "Vzestupně podle copyrightu"
 
-#: ../src/bar.c:184
+#: ../src/bar.c:185
 msgid "Descending by copyright"
 msgstr "Sestupně podle copyrightu"
 
-#: ../src/bar.c:185
+#: ../src/bar.c:186
 msgid "Ascending by URL"
 msgstr "Vzestupně podle adresy URL"
 
-#: ../src/bar.c:186
+#: ../src/bar.c:187
 msgid "Descending by URL"
 msgstr "Sestupně podle adresy 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 "Vzestupně podle názvu kodéru"
 
 #. 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 "Sestupně podle názvu kodéru"
 
-#: ../src/bar.c:193
+#: ../src/bar.c:194
 msgid "Ascending by file type"
 msgstr "Vzestupně podle typu souboru"
 
-#: ../src/bar.c:194
+#: ../src/bar.c:195
 msgid "Descending by file type"
 msgstr "Sestupně podle typu souboru"
 
-#: ../src/bar.c:195
+#: ../src/bar.c:196
 msgid "Ascending by file size"
 msgstr "Vzestupně podle velikosti souboru"
 
-#: ../src/bar.c:196
+#: ../src/bar.c:197
 msgid "Descending by file size"
 msgstr "Sestupně podle velikosti souboru"
 
-#: ../src/bar.c:197
+#: ../src/bar.c:198
 msgid "Ascending by duration"
 msgstr "Vzestupně podle délky skladby"
 
-#: ../src/bar.c:198
+#: ../src/bar.c:199
 msgid "Descending by duration"
 msgstr "Sestupně podle délky skladby"
 
-#: ../src/bar.c:199
+#: ../src/bar.c:200
 msgid "Ascending by bitrate"
 msgstr "Vzestupně podle datového toku"
 
-#: ../src/bar.c:200
+#: ../src/bar.c:201
 msgid "Descending by bitrate"
 msgstr "Sestupně podle datového toku"
 
-#: ../src/bar.c:201
+#: ../src/bar.c:202
 msgid "Ascending by samplerate"
 msgstr "Vzestupně podle vzorkování"
 
-#: ../src/bar.c:202
+#: ../src/bar.c:203
 msgid "Descending by samplerate"
 msgstr "Sestupně podle vzorkování"
 
-#: ../src/bar.c:204
+#: ../src/bar.c:205
 msgid "Open Files With…"
 msgstr "Otevřít soubory pomocí…"
 
-#: ../src/bar.c:205
+#: ../src/bar.c:206
 msgid "Run a command on the selected files"
 msgstr "Spustit příkaz na vybrané soubory"
 
-#: ../src/bar.c:208
+#: ../src/bar.c:209
 msgid "Select all"
 msgstr "Vybrat vše"
 
-#: ../src/bar.c:209
+#: ../src/bar.c:210
 msgid "Unselect All"
 msgstr "Zrušit výběr všeho"
 
-#: ../src/bar.c:210
+#: ../src/bar.c:211
 msgid "Clear the current selection"
 msgstr "Zrušit aktuální výběr"
 
-#: ../src/bar.c:213
+#: ../src/bar.c:214
 msgid "Invert File Selection"
 msgstr "Invertovat výběr souborů"
 
-#: ../src/bar.c:214
+#: ../src/bar.c:215
 msgid "Invert file selection"
 msgstr "Invertovat výběr souborů"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete Files"
 msgstr "Vymazat soubory"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete files"
 msgstr "Vymazat soubory"
 
-#: ../src/bar.c:217
+#: ../src/bar.c:218
 msgid "_First File"
 msgstr "P_rvní soubor"
 
-#: ../src/bar.c:218
+#: ../src/bar.c:219
 msgid "First file"
 msgstr "První soubor"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "_Previous File"
 msgstr "_Předchozí soubor"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "Previous file"
 msgstr "Předchozí soubor"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "_Next File"
 msgstr "_Následující soubor"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "Next file"
 msgstr "Následující soubor"
 
-#: ../src/bar.c:221
+#: ../src/bar.c:222
 msgid "_Last File"
 msgstr "Pos_lední soubor"
 
-#: ../src/bar.c:222
+#: ../src/bar.c:223
 msgid "Last file"
 msgstr "Poslední soubor"
 
-#: ../src/bar.c:223
+#: ../src/bar.c:224
 msgid "S_can Files"
 msgstr "Prozkoumat _soubory"
 
-#: ../src/bar.c:224 ../src/scan.c:2352
+#: ../src/bar.c:225 ../src/scan.c:2008
 msgid "Scan selected files"
 msgstr "Prozkoumat vybrané soubory"
 
-#: ../src/bar.c:225
+#: ../src/bar.c:226
 msgid "_Remove Tags"
 msgstr "Odeb_rat štítky"
 
-#: ../src/bar.c:226
+#: ../src/bar.c:227
 msgid "Remove tags"
 msgstr "Odebrat štítky"
 
-#: ../src/bar.c:227
+#: ../src/bar.c:228
 msgid "_Undo Last Files Changes"
 msgstr "_Vrátit poslední změny v souborech"
 
-#: ../src/bar.c:228
+#: ../src/bar.c:229
 msgid "Undo last files changes"
 msgstr "Vrátit poslední změny v souborech"
 
-#: ../src/bar.c:230
+#: ../src/bar.c:231
 msgid "R_edo Last Files Changes"
 msgstr "Zopakovat posl_ední změny v souborech"
 
-#: ../src/bar.c:231
+#: ../src/bar.c:232
 msgid "Redo last files changes"
 msgstr "Zopakovat poslední změny v souborech"
 
-#: ../src/bar.c:233
+#: ../src/bar.c:234
 msgid "_Save Files"
 msgstr "_Uložit soubory"
 
-#: ../src/bar.c:234
+#: ../src/bar.c:235
 msgid "Save changes to selected files"
 msgstr "Uložit změny do vybraných souborů"
 
-#: ../src/bar.c:236
+#: ../src/bar.c:237
 msgid "_Force Save Files"
 msgstr "V_ynutit uložení souborů"
 
-#: ../src/bar.c:237
+#: ../src/bar.c:238
 msgid "Force saving files"
 msgstr "Vynutit uložení souborů"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo Last Changes"
 msgstr "Vrátit poslední změny"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo last changes"
 msgstr "Vrátit poslední změny"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo Last Changes"
 msgstr "Zopakovat poslední změny"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo last changes"
 msgstr "Zopakovat poslední změny"
 
-#: ../src/bar.c:241
+#: ../src/bar.c:242
 msgid "_Quit"
 msgstr "U_končit"
 
-#: ../src/bar.c:241 ../src/easytag.c:2403 ../src/easytag.c:4487
-#: ../src/easytag.c:4515
+#: ../src/bar.c:242 ../src/easytag.c:2429 ../src/easytag.c:4565
+#: ../src/easytag.c:4597
 msgid "Quit"
 msgstr "Ukončit"
 
-#: ../src/bar.c:244
+#: ../src/bar.c:245
 msgid "_Browser"
 msgstr "_Prohlížeč"
 
-#: ../src/bar.c:245
+#: ../src/bar.c:246
 msgid "_Home Directory"
 msgstr "_Domovská složka"
 
-#: ../src/bar.c:246
+#: ../src/bar.c:247
 msgid "Go to home directory"
 msgstr "Přejít do domovské složky"
 
-#: ../src/bar.c:248
+#: ../src/bar.c:249
 msgid "Desktop Directory"
 msgstr "Složka Plocha"
 
-#: ../src/bar.c:249
+#: ../src/bar.c:250
 msgid "Go to desktop directory"
 msgstr "Přejít do složky pracovní plochy"
 
-#: ../src/bar.c:251
+#: ../src/bar.c:252
 msgid "Documents Directory"
 msgstr "Složka Dokumenty"
 
-#: ../src/bar.c:252
+#: ../src/bar.c:253
 msgid "Go to documents directory"
 msgstr "Přejít do složky s dokumenty"
 
-#: ../src/bar.c:254
+#: ../src/bar.c:255
 msgid "Downloads Directory"
 msgstr "Složka Stažené"
 
-#: ../src/bar.c:255
+#: ../src/bar.c:256
 msgid "Go to downloads directory"
 msgstr "Přejít do složky se staženými soubory"
 
-#: ../src/bar.c:257
+#: ../src/bar.c:258
 msgid "Music Directory"
 msgstr "Složka Hudba"
 
-#: ../src/bar.c:258
+#: ../src/bar.c:259
 msgid "Go to music directory"
 msgstr "Přejít do složky s hudbou"
 
-#: ../src/bar.c:260
+#: ../src/bar.c:261
 msgid "_Parent Directory"
 msgstr "_Nadřazená složka"
 
-#: ../src/bar.c:261
+#: ../src/bar.c:262
 msgid "Go to parent directory"
 msgstr "Přejít do nadřazené složky"
 
-#: ../src/bar.c:263
+#: ../src/bar.c:264
 msgid "_Default Directory"
 msgstr "_Výchozí složka"
 
-#: ../src/bar.c:264
+#: ../src/bar.c:265
 msgid "Go to default directory"
 msgstr "Přejít do výchozí složky"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set _Current Path as Default"
 msgstr "Nastavit aktuální _cestu jako výchozí"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set current path as default"
 msgstr "Nastavit aktuální cestu jako výchozí"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename Directory…"
 msgstr "Přejmenovat složku…"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename directory"
 msgstr "Přejmenovat složku"
 
-#: ../src/bar.c:268
+#: ../src/bar.c:269
 msgid "Reload Directory"
 msgstr "Znovu načíst složku"
 
-#: ../src/bar.c:269
+#: ../src/bar.c:270
 msgid "Reload directory"
 msgstr "Znovu načíst složku"
 
-#: ../src/bar.c:272
+#: ../src/bar.c:273
 msgid "Browse Directory With…"
 msgstr "Procházet složku pomocí…"
 
-#: ../src/bar.c:273
+#: ../src/bar.c:274
 msgid "Run a command on the directory"
 msgstr "Spustit na složku příkaz"
 
-#: ../src/bar.c:275
+#: ../src/bar.c:276
 msgid "_Collapse Tree"
 msgstr "_Sbalit strom"
 
-#: ../src/bar.c:276
+#: ../src/bar.c:277
 msgid "Collapse directory tree"
 msgstr "Sbalit strom složek"
 
-#: ../src/bar.c:277
+#: ../src/bar.c:278
 msgid "_Reload Tree"
 msgstr "Znovu načíst st_rom"
 
-#: ../src/bar.c:278
+#: ../src/bar.c:279
 msgid "Reload directory tree"
 msgstr "Znovu načíst strom složek"
 
-#: ../src/bar.c:281
+#: ../src/bar.c:282
 msgid "S_canner Mode"
 msgstr "Režim průz_kumníka"
 
-#: ../src/bar.c:283
+#: ../src/bar.c:284
 msgid "_Miscellaneous"
 msgstr "_Různé"
 
-#: ../src/bar.c:284
+#: ../src/bar.c:285
 msgid "_Find…"
 msgstr "_Najít…"
 
-#: ../src/bar.c:285
+#: ../src/bar.c:286
 msgid "Search filenames and tags"
 msgstr "Hledat názvy souborů a štítků"
 
-#: ../src/bar.c:287
+#: ../src/bar.c:288
 msgid "CDD_B Search…"
 msgstr "Hledat v CDD_B…"
 
-#: ../src/bar.c:288
+#: ../src/bar.c:289
 msgid "CDDB search"
 msgstr "Vyhledat v databázi CDDB"
 
-#: ../src/bar.c:290
+#: ../src/bar.c:291
 msgid "Load Filenames From a Text File…"
 msgstr "Načíst názvy souborů z textu…"
 
-#: ../src/bar.c:291
+#: ../src/bar.c:292
 msgid "Load filenames from a text file"
 msgstr "Načíst názvy souborů z textového souboru"
 
-#: ../src/bar.c:293
+#: ../src/bar.c:294
 msgid "Generate Playlist…"
 msgstr "Vygenerovat seznam skladeb…"
 
-#: ../src/bar.c:294
+#: ../src/bar.c:295
 msgid "Generate a playlist"
 msgstr "Vygenerovat seznam skladeb"
 
-#: ../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 "Spustit přehrávač"
 
-#: ../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 "Spustit hudební přehrávač"
 
-#: ../src/bar.c:300
+#: ../src/bar.c:301
 msgid "_Edit"
 msgstr "_Upravit"
 
-#: ../src/bar.c:301
+#: ../src/bar.c:302
 msgid "_Preferences"
 msgstr "_Předvolby"
 
 #. The window
-#: ../src/bar.c:302 ../src/prefs.c:110
+#: ../src/bar.c:303 ../src/prefs.c:110
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: ../src/bar.c:304
+#: ../src/bar.c:305
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: ../src/bar.c:305
+#: ../src/bar.c:306
 msgid "_Go"
 msgstr "_Přejít"
 
-#: ../src/bar.c:307
+#: ../src/bar.c:308
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:311
+msgid "_Contents"
+msgstr "O_bsah"
+
+#: ../src/bar.c:312
+msgid "Show help"
+msgstr "Zobrazit nápovědu"
+
+#: ../src/bar.c:314
 msgid "_About"
 msgstr "O _aplikaci"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:314
 msgid "About"
 msgstr "O aplikaci"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: ../src/bar.c:314
+#: ../src/bar.c:320
 msgid "Stop the current action"
 msgstr "Zastavit probíhající činnost"
 
 #.
 #. * Popup menu's Actions
 #.
-#: ../src/bar.c:320
+#: ../src/bar.c:326
 msgid "_File Operations"
 msgstr "_Souborové operace"
 
-#: ../src/bar.c:321
+#: ../src/bar.c:327
 msgid "S_canner"
 msgstr "Průz_kumník"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:331
 msgid "CDDB Search Files…"
 msgstr "Hledat soubory v CDDB…"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:331
 msgid "CDDB search files…"
 msgstr "Hledat soubory v CDDB…"
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: ../src/bar.c:329
+#: ../src/bar.c:335
 msgid "Clear log"
 msgstr "Vymazat záznam"
 
 #. { 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 "Procházet _podsložky"
 
-#: ../src/bar.c:336
+#: ../src/bar.c:342
 msgid "Browse subdirectories"
 msgstr "Procházet podsložky"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:346
 msgid "Show Hidden Directories"
 msgstr "Zobrazit skryté složky"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:346
 msgid "Show hidden directories"
 msgstr "Zobrazit skryté složky"
 
-#: ../src/bar.c:342
+#: ../src/bar.c:348
 msgid "_Show Scanner"
 msgstr "_Zobrazit průzkumníka"
 
-#: ../src/bar.c:343
+#: ../src/bar.c:349
 msgid "Show scanner"
 msgstr "Zobrazit průzkumníka"
 
-#: ../src/bar.c:349
+#: ../src/bar.c:355
 msgid "Tree Browser"
 msgstr "Strom složek"
 
-#: ../src/bar.c:350
+#: ../src/bar.c:356
 msgid "View by directory tree"
 msgstr "Zobrazit podle stromu složek"
 
-#: ../src/bar.c:352
+#: ../src/bar.c:358
 msgid "Artist and Album"
 msgstr "Umělec a album"
 
-#: ../src/bar.c:353
+#: ../src/bar.c:359
 msgid "View by artist and album"
 msgstr "Zobrazit podle umělce a alba"
 
-#: ../src/bar.c:358
+#: ../src/bar.c:364
 msgid "_Fill Tags…"
 msgstr "_Vyplnit štítky…"
 
-#: ../src/bar.c:359
+#: ../src/bar.c:365
 msgid "Fill tags"
 msgstr "Vyplnit štítky"
 
-#: ../src/bar.c:361
+#: ../src/bar.c:367
 msgid "_Rename Files and Directories…"
 msgstr "Přejmenovat soubo_ry a složky…"
 
-#: ../src/bar.c:362
+#: ../src/bar.c:368
 msgid "Rename files and directories"
 msgstr "Přejmenovat soubory a složky"
 
-#: ../src/bar.c:364
+#: ../src/bar.c:370
 msgid "_Process Fields…"
 msgstr "Z_pracovat pole…"
 
-#: ../src/bar.c:364 ../src/scan.c:182
+#: ../src/bar.c:370 ../src/scan.c:182
 msgid "Process Fields"
 msgstr "Zpracovat pole"
 
-#: ../src/bar.c:422
+#: ../src/bar.c:428
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Nelze sloučit uživatelské rozhraní, chyba: %s\n"
 
-#: ../src/bar.c:528
+#: ../src/bar.c:533
 msgid "Ready to start"
 msgstr "Připraveno ke spuštění"
 
-#: ../src/browser.c:369
+#: ../src/browser.c:376
 msgid "New default path for files selected"
 msgstr "Vybrána nová výchozí cesta k souborům"
 
-#: ../src/browser.c:670 ../src/easytag.c:4483
+#: ../src/browser.c:678 ../src/easytag.c:4561
 msgid "Some files have been modified but not saved"
 msgstr "Některé soubory byly změněny, ale neuloženy"
 
-#: ../src/browser.c:671
+#: ../src/browser.c:679
 msgid "Do you want to save them before changing the directory?"
 msgstr "Chcete je před tím, než se změní složka, uložit?"
 
-#: ../src/browser.c:675
+#: ../src/browser.c:683
 msgid "Confirm Directory Change"
 msgstr "Potvrzení změny složky"
 
-#: ../src/browser.c:2121
+#: ../src/browser.c:2146
 msgid "<All albums>"
 msgstr "<všechna alba>"
 
-#: ../src/browser.c:2573
+#: ../src/browser.c:2607
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Chyba: Hledá se %s, nelze najít uzel %s ve stromu."
 
-#: ../src/browser.c:3067 ../src/browser.c:3145
+#: ../src/browser.c:3101 ../src/browser.c:3179
 msgid "Tree"
 msgstr "Strom"
 
-#: ../src/browser.c:3068 ../src/cddb.c:803 ../src/misc.c:1930
+#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1902
 msgid "Filename"
 msgstr "Název souboru"
 
-#: ../src/browser.c:3068 ../src/cddb.c:804 ../src/misc.c:1931
+#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1903
 #: ../src/prefs.c:643
 msgid "Title"
 msgstr "Název"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Artist".
-#: ../src/browser.c:3069 ../src/browser.c:3076 ../src/cddb.c:483
-#: ../src/cddb.c:805 ../src/misc.c:1932 ../src/prefs.c:644
+#: ../src/browser.c:3103 ../src/browser.c:3110 ../src/cddb.c:483
+#: ../src/cddb.c:805 ../src/misc.c:1904 ../src/prefs.c:644
 msgid "Artist"
 msgstr "Umělec"
 
-#: ../src/browser.c:3069 ../src/misc.c:1933
+#: ../src/browser.c:3103 ../src/misc.c:1905
 msgid "Album Artist"
 msgstr "Umělec alba"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Album".
-#: ../src/browser.c:3070 ../src/browser.c:3078 ../src/cddb.c:486
-#: ../src/cddb.c:806 ../src/misc.c:1934 ../src/prefs.c:645
+#: ../src/browser.c:3104 ../src/browser.c:3112 ../src/cddb.c:486
+#: ../src/cddb.c:806 ../src/misc.c:1906 ../src/prefs.c:645
 msgid "Album"
 msgstr "Album"
 
-#: ../src/browser.c:3070 ../src/cddb.c:807 ../src/misc.c:1936
+#: ../src/browser.c:3104 ../src/cddb.c:807 ../src/misc.c:1908
 msgid "Year"
 msgstr "Rok"
 
-#: ../src/browser.c:3070
+#: ../src/browser.c:3104
 msgid "Disc"
 msgstr "Disk"
 
-#: ../src/browser.c:3071 ../src/misc.c:1937
+#: ../src/browser.c:3105 ../src/misc.c:1909
 msgid "Track"
 msgstr "Skladba"
 
-#: ../src/browser.c:3071 ../src/cddb.c:810 ../src/misc.c:1938
+#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1910
 #: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Žánr"
 
-#: ../src/browser.c:3072 ../src/misc.c:1939 ../src/prefs.c:647
+#: ../src/browser.c:3106 ../src/misc.c:1911 ../src/prefs.c:647
 msgid "Comment"
 msgstr "Poznámka"
 
-#: ../src/browser.c:3072 ../src/misc.c:1940 ../src/picture.c:863
+#: ../src/browser.c:3106 ../src/misc.c:1912 ../src/picture.c:1059
 #: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Skladatel"
 
-#: ../src/browser.c:3073 ../src/misc.c:1941
+#: ../src/browser.c:3107 ../src/misc.c:1913
 msgid "Original Artist"
 msgstr "Původní umělec"
 
-#: ../src/browser.c:3074 ../src/misc.c:1942
+#: ../src/browser.c:3108 ../src/misc.c:1914
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../src/browser.c:3074 ../src/misc.c:1943
+#: ../src/browser.c:3108 ../src/misc.c:1915
 msgid "URL"
 msgstr "Adresa URL"
 
-#: ../src/browser.c:3075 ../src/misc.c:1944
+#: ../src/browser.c:3109 ../src/misc.c:1916
 msgid "Encoded By"
 msgstr "Kódováno pomocí"
 
-#: ../src/browser.c:3076
+#: ../src/browser.c:3110
 msgid "# Albums"
 msgstr "Počet alb"
 
-#: ../src/browser.c:3077 ../src/browser.c:3078
+#: ../src/browser.c:3111 ../src/browser.c:3112
 msgid "# Files"
 msgstr "Počet souborů"
 
-#: ../src/browser.c:3103
+#: ../src/browser.c:3137
 msgid "Enter a directory to browse."
 msgstr "Zadejte název složky, kterou chcete procházet."
 
-#: ../src/browser.c:3112
+#: ../src/browser.c:3146
 msgid "Select a directory to browse."
 msgstr "Vybrat složku pro procházení."
 
@@ -850,33 +858,33 @@ msgstr "Vybrat složku pro procházení."
 #. * The label for displaying number of files in path (without subdirs)
 #.
 #. Translators: No files, as in "0 files".
-#: ../src/browser.c:3119 ../src/easytag.c:3425
+#: ../src/browser.c:3153 ../src/easytag.c:3468
 msgid "No files"
 msgstr "žádný soubor"
 
-#: ../src/browser.c:3197
+#: ../src/browser.c:3231
 msgid "Artist & Album"
 msgstr "Umělec a album"
 
 #. Only directories changed
-#: ../src/browser.c:3561 ../src/easytag.c:2843
+#: ../src/browser.c:3595 ../src/easytag.c:2880
 msgid "Rename Directory"
 msgstr "Přejmenování složky"
 
-#: ../src/browser.c:3583
+#: ../src/browser.c:3617
 #, c-format
 msgid "Rename the directory '%s' to:"
 msgstr "Přejmenovat složku „%s“ na:"
 
-#: ../src/browser.c:3602 ../src/misc.c:1194
+#: ../src/browser.c:3636 ../src/misc.c:1171
 msgid "Use mask:"
 msgstr "Použít masku:"
 
-#: ../src/browser.c:3605
+#: ../src/browser.c:3639
 msgid "If activated, it will use masks to rename directory."
 msgstr "Pokud je zapnuto, použijí se k přejmenování složky masky."
 
-#: ../src/browser.c:3623
+#: ../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."
@@ -885,98 +893,70 @@ msgstr ""
 "použitím polí štítků."
 
 #. Preview label
-#: ../src/browser.c:3647
+#: ../src/browser.c:3681
 msgid "Rename directory preview"
 msgstr "Náhled přejmenování složky"
 
-#: ../src/browser.c:3739
+#: ../src/browser.c:3773
 msgid "You must type a directory name"
 msgstr "Musíte vyplnit název složky"
 
-#: ../src/browser.c:3740 ../src/browser.c:3761
+#: ../src/browser.c:3774 ../src/browser.c:3795
 msgid "Directory Name Error"
 msgstr "Chyba v názvu složky"
 
-#: ../src/browser.c:3758
+#: ../src/browser.c:3792
 #, c-format
 msgid "Could not convert '%s' into filename encoding."
 msgstr "Nelze převést „%s“ do kódování názvů souborů"
 
-#: ../src/browser.c:3760
+#: ../src/browser.c:3794
 msgid "Please use another name"
 msgstr "Použijte prosím jiný název"
 
-#: ../src/browser.c:3830
+#: ../src/browser.c:3864
 #, c-format
 msgid "The directory name '%s' already exists"
 msgstr "Složka s názvem „%s“ již existuje"
 
-#: ../src/browser.c:3831 ../src/easytag.c:2926
+#: ../src/browser.c:3865 ../src/easytag.c:2963
 msgid "Rename File Error"
 msgstr "Chyba při přejmenování souboru"
 
-#: ../src/browser.c:3869 ../src/browser.c:3898
+#: ../src/browser.c:3903 ../src/browser.c:3932
 msgid "Rename Directory Error"
 msgstr "Chyba při přejmenování složky"
 
-#: ../src/browser.c:3936
+#: ../src/browser.c:3970
 msgid "Directory renamed"
 msgstr "Složka přejmenována"
 
-#: ../src/browser.c:3972
+#: ../src/browser.c:4006
 msgid "Browse Directory With"
 msgstr "Procházet složku pomocí"
 
-#: ../src/browser.c:3988 ../src/browser.c:4114
+#: ../src/browser.c:4022 ../src/browser.c:4148
 msgid "Program to run:"
 msgstr "Program, který se má spustit:"
 
-#: ../src/browser.c:4000
+#: ../src/browser.c:4034
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Napište název programu, který se má spustit. Tomuto programu se předá "
 "aktuální složka jako parametr."
 
-#: ../src/browser.c:4094
+#: ../src/browser.c:4128
 msgid "Open Files With"
 msgstr "Otevřít soubory pomocí"
 
-#: ../src/browser.c:4126
+#: ../src/browser.c:4160
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Napište název programu, který se má spustit. Tomuto programu se předá "
 "aktuální soubor jako parametr."
 
-#: ../src/browser.c:4257
-msgid "You must type a program name"
-msgstr "Musíte vyplnit název programu"
-
-#: ../src/browser.c:4258 ../src/browser.c:4275
-msgid "Program Name Error"
-msgstr "Chyba v názvu programu"
-
-#: ../src/browser.c:4273 ../src/misc.c:794
-#, c-format
-msgid "The program '%s' cannot be found"
-msgstr "Nelze najít program „%s“"
-
-#: ../src/browser.c:4325 ../src/misc.c:840
-#, c-format
-msgid "Cannot execute ‘%s’ (%s)"
-msgstr "Nelze spustit „%s“ (%s)"
-
-#: ../src/browser.c:4369 ../src/misc.c:885
-#, c-format
-msgid "Executed command: %s"
-msgstr "Proveden příkaz: %s"
-
-#: ../src/browser.c:4375 ../src/misc.c:891
-#, c-format
-msgid "Failed to launch program: %s"
-msgstr "Selhalo spuštění programu: %s"
-
 #: ../src/cddb.c:313
 msgid "Artist / Album"
 msgstr "Umělec / album"
@@ -1066,7 +1046,7 @@ msgstr "Všechna pole"
 
 #. 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:1037 ../src/prefs.c:807
 msgid "Other"
 msgstr "Další"
 
@@ -1160,7 +1140,7 @@ msgstr "Kategorie"
 msgid "Results:"
 msgstr "Výsledky:"
 
-#: ../src/cddb.c:606 ../src/misc.c:1978
+#: ../src/cddb.c:606 ../src/misc.c:1950
 msgid "Search:"
 msgstr "Hledat:"
 
@@ -1224,7 +1204,7 @@ msgid "# Tracks"
 msgstr "Počet skladeb"
 
 #. Check box to run the scanner
-#: ../src/cddb.c:847 ../src/misc.c:3019
+#: ../src/cddb.c:847 ../src/misc.c:2991
 msgid "Run the current scanner for each file"
 msgstr "Spustí aktuálního průzkumníka pro každý soubor"
 
@@ -1236,7 +1216,7 @@ msgstr "Porovnávat řádky pomocí Levenshteinova 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 "
@@ -1654,47 +1634,47 @@ msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Řetězec „%s“ nelze převést do UTF-8 (%s)."
 
 #. Starting messages
-#: ../src/easytag.c:173
+#: ../src/easytag.c:184
 #, c-format
 msgid "Starting EasyTAG version %s (PID: %d)…"
 msgstr "Spouští se EasyTAG verze %s (ID procesu: %d)…"
 
-#: ../src/easytag.c:175
+#: ../src/easytag.c:186
 #, c-format
 msgid "Using libid3tag version %s"
 msgstr "Používá se knihovna libid3tag ve verzi %s"
 
-#: ../src/easytag.c:178
+#: ../src/easytag.c:189
 #, c-format
 msgid "Using id3lib version %d.%d.%d"
 msgstr "Používá se knihovna id3lib ve verzi %d.%d.%d"
 
-#: ../src/easytag.c:184
+#: ../src/easytag.c:195
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
 msgstr ""
 "Je definována proměnná EASYTAGLANG. Nastavuje se národn prostředí: „%s“"
 
-#: ../src/easytag.c:186
+#: ../src/easytag.c:197
 #, c-format
 msgid "Setting locale: '%s'"
 msgstr "Nastavuje se národní prostředí: „%s“"
 
-#: ../src/easytag.c:191
+#: ../src/easytag.c:202
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')"
 msgstr "Momentálně se používá národní prostředí „%s“ (a případně „%s“)"
 
-#: ../src/easytag.c:198
+#: ../src/easytag.c:209
 msgid "Unable to create setting directories"
 msgstr "Nelze vytvořit složky s nastavením"
 
-#: ../src/easytag.c:415 ../src/et_core.c:584
+#: ../src/easytag.c:426 ../src/et_core.c:597 ../src/et_core.c:609
 #, c-format
 msgid "Error while querying information for file: '%s' (%s)"
 msgstr "Chyba při dotazování na informace o souboru: „%s“ (%s)"
 
-#: ../src/easytag.c:479
+#: ../src/easytag.c:489
 #, c-format
 msgid "Cannot open path '%s'"
 msgstr "Nelze otevřít cestu „%s“"
@@ -1702,11 +1682,11 @@ msgstr "Nelze otevřít cestu „%s“"
 #.
 #. * Browser
 #.
-#: ../src/easytag.c:571 ../src/prefs.c:142
+#: ../src/easytag.c:581 ../src/prefs.c:142
 msgid "Browser"
 msgstr "Prohlížeč"
 
-#: ../src/easytag.c:593 ../src/et_core.c:2728
+#: ../src/easytag.c:603 ../src/et_core.c:2817
 msgid "File"
 msgstr "Soubor"
 
@@ -1716,113 +1696,113 @@ msgstr "Soubor"
 #. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
 #. Version changed to encoder version
 #. Encoder version
-#: ../src/easytag.c:625 ../src/easytag.c:4153 ../src/flac_header.c:201
+#: ../src/easytag.c:635 ../src/easytag.c:4231 ../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 "Kodér:"
 
-#: ../src/easytag.c:633
+#: ../src/easytag.c:643
 msgid "Bitrate:"
 msgstr "Datový tok:"
 
 #. Translators: Please try to keep this string as short as possible as it
 #. * is shown in a narrow column.
-#: ../src/easytag.c:643
+#: ../src/easytag.c:653
 msgid "Frequency:"
 msgstr "Vzorkování:"
 
 #. Mode
-#: ../src/easytag.c:654 ../src/easytag.c:4157 ../src/mpeg_header.c:216
+#: ../src/easytag.c:664 ../src/easytag.c:4235 ../src/mpeg_header.c:216
 msgid "Mode:"
 msgstr "Režim:"
 
-#: ../src/easytag.c:661
+#: ../src/easytag.c:671
 msgid "Size:"
 msgstr "Velikost:"
 
-#: ../src/easytag.c:668
+#: ../src/easytag.c:678
 msgid "Duration:"
 msgstr "Délka:"
 
 #. Main Frame
-#: ../src/easytag.c:715 ../src/et_core.c:2666
+#: ../src/easytag.c:725 ../src/et_core.c:2747
 msgid "Tag"
 msgstr "Štítek"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: ../src/easytag.c:737
+#: ../src/easytag.c:747
 msgid "Common"
 msgstr "Obecné"
 
 #. Title
-#: ../src/easytag.c:744
+#: ../src/easytag.c:754
 msgid "Title:"
 msgstr "Název:"
 
-#: ../src/easytag.c:758
+#: ../src/easytag.c:768
 msgid "Tag selected files with this title"
 msgstr "Nastavit vybraným souborům tento název"
 
 #. Artist
-#: ../src/easytag.c:763
+#: ../src/easytag.c:773
 msgid "Artist:"
 msgstr "Umělec:"
 
-#: ../src/easytag.c:777
+#: ../src/easytag.c:787
 msgid "Tag selected files with this artist"
 msgstr "Nastavit vybraným souborům tohoto umělce"
 
 #. Album Artist
-#: ../src/easytag.c:782
+#: ../src/easytag.c:792
 msgid "Album artist:"
 msgstr "Umělec alba:"
 
-#: ../src/easytag.c:796
+#: ../src/easytag.c:806
 msgid "Tag selected files with this album artist"
 msgstr "Nastavit vybraným souborům tohoto umělce alba"
 
 #. Album
-#: ../src/easytag.c:801
+#: ../src/easytag.c:811
 msgid "Album:"
 msgstr "Album:"
 
-#: ../src/easytag.c:815
+#: ../src/easytag.c:825
 msgid "Tag selected files with this album name"
 msgstr "Nastavit vybraným souborům tento název alba"
 
 #. Disc Number
-#: ../src/easytag.c:820
+#: ../src/easytag.c:830
 msgid "CD:"
 msgstr "CD:"
 
-#: ../src/easytag.c:837
+#: ../src/easytag.c:847
 msgid "Tag selected files with this disc number"
 msgstr "Nastavit vybraným souborům toto číslo disku"
 
 #. Year
-#: ../src/easytag.c:842
+#: ../src/easytag.c:852
 msgid "Year:"
 msgstr "Rok:"
 
-#: ../src/easytag.c:862
+#: ../src/easytag.c:872
 msgid "Tag selected files with this year"
 msgstr "Nastavit vybraným souborům tento rok"
 
-#: ../src/easytag.c:876
+#: ../src/easytag.c:886
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr "Očíslovat sekvenčně vybrané skladby. Začíná se od 01 v každé složce."
 
 #. To have enough space to display the icon
 #. To have enough space to display the icon
-#: ../src/easytag.c:885
+#: ../src/easytag.c:895
 msgid "Track #:"
 msgstr "Skladba č.:"
 
-#: ../src/easytag.c:916
+#: ../src/easytag.c:926
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1830,269 +1810,269 @@ msgstr ""
 "Nastavit počet souborů ve stejné složce, jako je zobrazený soubor, do pole s "
 "počtem skladeb."
 
-#: ../src/easytag.c:936
+#: ../src/easytag.c:946
 msgid "Tag selected files with this number of tracks"
 msgstr "Nastavit vybraným souborům tento počet skladeb"
 
 #. Genre
-#: ../src/easytag.c:940
+#: ../src/easytag.c:950
 msgid "Genre:"
 msgstr "Žánr:"
 
-#: ../src/easytag.c:968
+#: ../src/easytag.c:978
 msgid "Tag selected files with this genre"
 msgstr "Nastavit vybraným souborům tento žánr"
 
 #. Comment
-#: ../src/easytag.c:973
+#: ../src/easytag.c:983
 msgid "Comment:"
 msgstr "Poznámka:"
 
-#: ../src/easytag.c:1000
+#: ../src/easytag.c:1010
 msgid "Tag selected files with this comment"
 msgstr "Nastavit vybraným souborům tuto poznámku"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. Composer (name of the composers)
-#: ../src/easytag.c:1007
+#: ../src/easytag.c:1017
 msgid "Composer:"
 msgstr "Skladatel:"
 
-#: ../src/easytag.c:1021
+#: ../src/easytag.c:1031
 msgid "Tag selected files with this composer"
 msgstr "Nastavit vybraným souborům tohoto skladatele"
 
 #. 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:1028
+#: ../src/easytag.c:1038
 msgid "Orig. artist:"
 msgstr "Původní umělec:"
 
-#: ../src/easytag.c:1042
+#: ../src/easytag.c:1052
 msgid "Tag selected files with this original artist"
 msgstr "Nastavit vybraným souborům tohoto původního umělce"
 
 #. Copyright
-#: ../src/easytag.c:1048
+#: ../src/easytag.c:1058
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../src/easytag.c:1062
+#: ../src/easytag.c:1072
 msgid "Tag selected files with this copyright"
 msgstr "Nastavit vybraným souborům tento copyright"
 
 #. URL
-#: ../src/easytag.c:1068
+#: ../src/easytag.c:1078
 msgid "URL:"
 msgstr "Adresa URL:"
 
-#: ../src/easytag.c:1082
+#: ../src/easytag.c:1092
 msgid "Tag selected files with this URL"
 msgstr "Nastavit vybraným souborům tuto adresu URL"
 
 #. Encoded by
-#: ../src/easytag.c:1088
+#: ../src/easytag.c:1098
 msgid "Encoded by:"
 msgstr "Kódováno pomocí:"
 
-#: ../src/easytag.c:1102
+#: ../src/easytag.c:1112
 msgid "Tag selected files with this encoder name"
 msgstr "Nastavit vybraným souborům tento název kodéru"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1136 ../src/et_core.c:3101 ../src/et_core.c:3104
+#: ../src/easytag.c:1146 ../src/et_core.c:3189 ../src/et_core.c:3192
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/easytag.c:1160
+#: ../src/easytag.c:1170
 msgid "You can use drag and drop to add an image"
 msgstr "Pro přidání obrázku můžete použít postup „táhni a upusť“"
 
-#: ../src/easytag.c:1207
+#: ../src/easytag.c:1217
 msgid "Add images to the tag"
 msgstr "Přidat obrázky do štítku"
 
-#: ../src/easytag.c:1225
+#: ../src/easytag.c:1235
 msgid "Remove selected images from the tag"
 msgstr "Odstranit vybrané obrázky ze štítku"
 
-#: ../src/easytag.c:1239
+#: ../src/easytag.c:1249
 msgid "Save the selected images to files"
 msgstr "Uložit vybrané obrázky do souborů"
 
-#: ../src/easytag.c:1250
+#: ../src/easytag.c:1260
 msgid "Edit image properties"
 msgstr "Upravit vlastnosti obrázku"
 
-#: ../src/easytag.c:1264
+#: ../src/easytag.c:1274
 msgid "Tag selected files with these images"
 msgstr "Nastavit vybraným souborům tyto obrázky"
 
-#: ../src/easytag.c:1322
+#: ../src/easytag.c:1332
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "U vybraných souborů byl nastaven název na „%s“."
 
-#: ../src/easytag.c:1324
+#: ../src/easytag.c:1334
 msgid "Removed title from selected files."
 msgstr "Z vybraných souborů byl vymazán název."
 
-#: ../src/easytag.c:1339
+#: ../src/easytag.c:1349
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "U vybraných souborů byl nastaven umělec na „%s“."
 
-#: ../src/easytag.c:1341
+#: ../src/easytag.c:1351
 msgid "Removed artist from selected files."
 msgstr "Z vybraných souborů byl vymazán umělec."
 
-#: ../src/easytag.c:1355
+#: ../src/easytag.c:1365
 #, c-format
 msgid "Selected files tagged with album artist '%s'."
 msgstr "U vybraných souborů byl nastaven umělec alba na „%s“."
 
-#: ../src/easytag.c:1357
+#: ../src/easytag.c:1367
 msgid "Removed album artist from selected files."
 msgstr "Z vybraných souborů byl vymazán umělec alba."
 
-#: ../src/easytag.c:1372
+#: ../src/easytag.c:1382
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "U vybraných souborů bylo nastaveno album na „%s“."
 
-#: ../src/easytag.c:1374
+#: ../src/easytag.c:1384
 msgid "Removed album name from selected files."
 msgstr "Z vybraných souborů bylo vymazáno album."
 
-#: ../src/easytag.c:1411
+#: ../src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with disc number '%s/%s'."
 msgstr "U vybraných souborů bylo nastaveno číslo disku na „%s/%s“."
 
-#: ../src/easytag.c:1416
+#: ../src/easytag.c:1426
 #, c-format
 msgid "Selected files tagged with disc number like 'xx'."
 msgstr "U vybraných souborů bylo nastaveno číslo disku ve stylu „xx“."
 
-#: ../src/easytag.c:1421
+#: ../src/easytag.c:1431
 msgid "Removed disc number from selected files."
 msgstr "Z vybraných souborů bylo vymazáno číslo disku."
 
-#: ../src/easytag.c:1437
+#: ../src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "U vybraných souborů byl nastaven rok na „%s“."
 
-#: ../src/easytag.c:1439
+#: ../src/easytag.c:1449
 msgid "Removed year from selected files."
 msgstr "Z vybraných souborů byl vymazán rok."
 
-#: ../src/easytag.c:1465 ../src/easytag.c:1555
+#: ../src/easytag.c:1475 ../src/easytag.c:1566
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "U vybraných souborů bylo nastaveno pořadí v podobě „xx/%s“."
 
-#: ../src/easytag.c:1468
+#: ../src/easytag.c:1478
 #, c-format
 msgid "Selected files tagged with track like 'xx'."
 msgstr "U vybraných souborů bylo nastaveno pořadí v podobě „xx“."
 
-#: ../src/easytag.c:1472 ../src/easytag.c:1558
+#: ../src/easytag.c:1482 ../src/easytag.c:1569
 msgid "Removed track number from selected files."
 msgstr "Z vybraných souborů bylo vymazáno číslo skladby."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1528
+#: ../src/easytag.c:1539
 #, c-format
 msgid "Selected tracks numbered sequentially."
 msgstr "Vybrané skladby byly sekvenčně očíslovány."
 
-#: ../src/easytag.c:1574
+#: ../src/easytag.c:1585
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "U vybraných souborů byl ve štítku nastaven žánr na „%s“."
 
-#: ../src/easytag.c:1576
+#: ../src/easytag.c:1587
 msgid "Removed genre from selected files."
 msgstr "Z vybraných souborů byl vymazán žánr."
 
-#: ../src/easytag.c:1598
+#: ../src/easytag.c:1609
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "U vybraných souborů byla nastavena poznámka na „%s“."
 
-#: ../src/easytag.c:1600
+#: ../src/easytag.c:1611
 msgid "Removed comment from selected files."
 msgstr "Z vybraných souborů byla vymazána poznámka."
 
-#: ../src/easytag.c:1614
+#: ../src/easytag.c:1625
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "U vybraných souborů byl nastaven skladatel na „%s“."
 
-#: ../src/easytag.c:1616
+#: ../src/easytag.c:1627
 msgid "Removed composer from selected files."
 msgstr "Z vybraných souborů byl vymazán skladatel."
 
-#: ../src/easytag.c:1631
+#: ../src/easytag.c:1642
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "U vybraných souborů byl nastaven původní umělec na „%s“."
 
-#: ../src/easytag.c:1633
+#: ../src/easytag.c:1644
 msgid "Removed original artist from selected files."
 msgstr "Z vybraných souborů byl vymazán původní umělec."
 
-#: ../src/easytag.c:1648
+#: ../src/easytag.c:1659
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "U vybraných souborů byl nastaven copyright na „%s“."
 
-#: ../src/easytag.c:1650
+#: ../src/easytag.c:1661
 msgid "Removed copyright from selected files."
 msgstr "Z vybraných souborů byl vymazán copyright."
 
-#: ../src/easytag.c:1665
+#: ../src/easytag.c:1676
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "U vybraných souborů byla nastaven adresa URL na „%s“."
 
-#: ../src/easytag.c:1667
+#: ../src/easytag.c:1678
 msgid "Removed URL from selected files."
 msgstr "Z vybraných souborů byla vymazána adresa URL."
 
-#: ../src/easytag.c:1682
+#: ../src/easytag.c:1693
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "U vybraných souborů byl nastaven název kodéru na „%s“."
 
-#: ../src/easytag.c:1684
+#: ../src/easytag.c:1695
 msgid "Removed encoder name from selected files."
 msgstr "Z vybraných souborů byl vymazán název kodéru."
 
-#: ../src/easytag.c:1716
+#: ../src/easytag.c:1727
 msgid "Selected files tagged with images."
 msgstr "U vybraných souborů byly nastaveny obrázky."
 
-#: ../src/easytag.c:1718
+#: ../src/easytag.c:1729
 msgid "Removed images from selected files."
 msgstr "Z vybraných souborů byly vymazány obrázky."
 
-#: ../src/easytag.c:1999
+#: ../src/easytag.c:2010
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Vyberte režim a masku a zopakujte stejnou akci"
 
-#: ../src/easytag.c:2051
+#: ../src/easytag.c:2062
 msgid "All tags have been scanned"
 msgstr "Všechny štítky byly prozkoumány"
 
-#: ../src/easytag.c:2107
+#: ../src/easytag.c:2118
 msgid "All tags have been removed"
 msgstr "Všechny štítky byly odmazány"
 
-#: ../src/easytag.c:2397
+#: ../src/easytag.c:2423
 #, c-format
 msgid "A file was changed by an external program"
 msgid_plural "%d files were changed by an external program."
@@ -2100,153 +2080,153 @@ msgstr[0] "Soubor byl změněn externím programem."
 msgstr[1] "%d soubory byly změněny externím programem."
 msgstr[2] "%d souborů bylo změněno externím programem."
 
-#: ../src/easytag.c:2402
+#: ../src/easytag.c:2428
 msgid "Do you want to continue saving the file?"
 msgstr "Chcete pokračovat v ukládání souboru?"
 
-#: ../src/easytag.c:2457 ../src/easytag.c:2477
+#: ../src/easytag.c:2486 ../src/easytag.c:2506
 msgid "Saving files was stopped"
 msgstr "Ukládání souborů bylo zastaveno"
 
-#: ../src/easytag.c:2479
+#: ../src/easytag.c:2508
 msgid "All files have been saved"
 msgstr "Všechny soubory byly uloženy"
 
-#: ../src/easytag.c:2610
+#: ../src/easytag.c:2643
 #, c-format
 msgid "Cannot delete file (%s)"
 msgstr "Nelze smazat soubor (%s)"
 
-#: ../src/easytag.c:2630
+#: ../src/easytag.c:2664
 msgid "Files have been partially deleted"
 msgstr "Byly smazány jen některé soubory"
 
-#: ../src/easytag.c:2632
+#: ../src/easytag.c:2666
 msgid "All files have been deleted"
 msgstr "Všechny soubory byly smazány"
 
-#: ../src/easytag.c:2748
+#: ../src/easytag.c:2782
 #, c-format
 msgid "Do you want to write the tag of file '%s'?"
 msgstr "Chcete zapsat štítek do souboru „%s“ ?"
 
-#: ../src/easytag.c:2750
+#: ../src/easytag.c:2784
 msgid "Confirm Tag Writing"
 msgstr "Potvrzení zápisu štítku"
 
-#: ../src/easytag.c:2755 ../src/easytag.c:2872 ../src/easytag.c:3132
+#: ../src/easytag.c:2789 ../src/easytag.c:2909 ../src/easytag.c:3172
 msgid "Repeat action for the remaining files"
 msgstr "Opakovat akci pro zbytek souborů"
 
 #. Directories and filename changed
-#: ../src/easytag.c:2836 ../src/scan.c:181
+#: ../src/easytag.c:2873 ../src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Přejmenovat soubor a složku"
 
-#: ../src/easytag.c:2837
+#: ../src/easytag.c:2874
 msgid "File and directory rename confirmation required"
 msgstr "Je požadováno schválení přejmenování souboru a složky"
 
-#: ../src/easytag.c:2838
+#: ../src/easytag.c:2875
 #, c-format
 msgid "Do you want to rename the file and directory '%s' to '%s'?"
 msgstr "Chcete přejmenovat soubor a složku „%s“ na „%s“?"
 
-#: ../src/easytag.c:2844
+#: ../src/easytag.c:2881
 msgid "Directory rename confirmation required"
 msgstr "Je požadováno schválení přejmenování složky"
 
-#: ../src/easytag.c:2845
+#: ../src/easytag.c:2882
 #, c-format
 msgid "Do you want to rename the directory '%s' to '%s'?"
 msgstr "Chcete přejmenovat složku „%s“ na „%s“?"
 
 #. Only filename changed
-#: ../src/easytag.c:2851
+#: ../src/easytag.c:2888
 msgid "Rename File"
 msgstr "Přejmenování souboru"
 
-#: ../src/easytag.c:2852
+#: ../src/easytag.c:2889
 msgid "File rename confirmation required"
 msgstr "Je požadováno schválení přejmenování souboru"
 
-#: ../src/easytag.c:2853
+#: ../src/easytag.c:2890
 #, c-format
 msgid "Do you want to rename the file '%s' to '%s'?"
 msgstr "Chcete přejmenovat soubor „%s“ na „%s“?"
 
-#: ../src/easytag.c:2919
+#: ../src/easytag.c:2956
 #, c-format
 msgid "Cannot rename file '%s' to '%s'"
 msgstr "Nelze přejmenovat soubor „%s“ na „%s“"
 
-#: ../src/easytag.c:2933
+#: ../src/easytag.c:2970
 #, c-format
 msgid "Cannot rename file '%s' to '%s': %s"
 msgstr "Nelze přejmenovat soubor „%s“ na „%s“: %s"
 
-#: ../src/easytag.c:2937
+#: ../src/easytag.c:2974
 msgid "File(s) not renamed"
 msgstr "Soubor či soubory nebyly přejmenovány"
 
-#: ../src/easytag.c:3046
+#: ../src/easytag.c:3086
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Zapisuje se štítek do „%s“"
 
-#: ../src/easytag.c:3053
+#: ../src/easytag.c:3093
 msgid "Tag(s) written"
 msgstr "Štítek zapsán"
 
-#: ../src/easytag.c:3068
+#: ../src/easytag.c:3108
 #, c-format
 msgid "Cannot write tag in file '%s' (%s)"
 msgstr "Nelze zapsat štítek do souboru „%s“ (%s)"
 
-#: ../src/easytag.c:3081
+#: ../src/easytag.c:3121
 #, c-format
 msgid "Cannot write tag in file '%s'"
 msgstr "Nelze zapsat štítek do souboru „%s“"
 
-#: ../src/easytag.c:3084
+#: ../src/easytag.c:3124
 msgid "Tag Write Error"
 msgstr "Chyba při zápisu štítku"
 
-#: ../src/easytag.c:3129 ../src/easytag.c:3143
+#: ../src/easytag.c:3169 ../src/easytag.c:3183
 #, c-format
 msgid "Do you really want to delete the file '%s'?"
 msgstr "Opravdu chcete smazat soubor „%s“?"
 
-#: ../src/easytag.c:3135 ../src/easytag.c:3145
+#: ../src/easytag.c:3175 ../src/easytag.c:3185
 msgid "Delete File"
 msgstr "Vymazání souboru"
 
-#: ../src/easytag.c:3170
+#: ../src/easytag.c:3210
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Soubor „%s“ byl vymazán"
 
-#: ../src/easytag.c:3302
+#: ../src/easytag.c:3345
 #, c-format
 msgid "Cannot read directory '%s'"
 msgstr "Nelze číst složku „%s“"
 
-#: ../src/easytag.c:3306
+#: ../src/easytag.c:3349
 msgid "Directory Read Error"
 msgstr "Chyba při čtení složky"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3327
+#: ../src/easytag.c:3370
 #, c-format
 msgid "Search in progress…"
 msgstr "Probíhá hledání…"
 
-#: ../src/easytag.c:3350 ../src/et_core.c:2735
+#: ../src/easytag.c:3393 ../src/et_core.c:2824
 #, c-format
 msgid "File: '%s'"
 msgstr "Soubor: „%s“"
 
-#: ../src/easytag.c:3400
+#: ../src/easytag.c:3443
 #, c-format
 msgid "Found one file in this directory and subdirectories"
 msgid_plural "Found %d files in this directory and subdirectories"
@@ -2254,7 +2234,7 @@ msgstr[0] "Nalezen jeden soubor v této složce a jejích podsložkách"
 msgstr[1] "Nalezeny %d soubory v této složce a jejích podsložkách"
 msgstr[2] "Nalezeno %d souborů v této složce a jejích podsložkách"
 
-#: ../src/easytag.c:3407
+#: ../src/easytag.c:3450
 #, c-format
 msgid "Found one file in this directory"
 msgid_plural "Found %d files in this directory"
@@ -2262,178 +2242,191 @@ msgstr[0] "Nalezen jeden soubor v této složce"
 msgstr[1] "Nalezeny %d soubory v této složce"
 msgstr[2] "Nalezeno %d souborů v této složce"
 
-#: ../src/easytag.c:3429
+#: ../src/easytag.c:3472
 msgid "No file found in this directory and subdirectories"
 msgstr "V této složce ani jejích podsložkách nebyl nalezen žádný soubor"
 
-#: ../src/easytag.c:3431
+#: ../src/easytag.c:3474
 msgid "No file found in this directory"
 msgstr "V této složce nebyl nalezen žádný soubor"
 
-#: ../src/easytag.c:3499
+#: ../src/easytag.c:3542
 #, c-format
 msgid "Error opening directory '%s' (%s)"
 msgstr "Chyba otevírání složky „%s“ (%s)"
 
-#: ../src/easytag.c:3535
+#: ../src/easytag.c:3578
 #, c-format
 msgid "Cannot read directory (%s)"
 msgstr "Nelze číst složku (%s)"
 
-#: ../src/easytag.c:3555
+#: ../src/easytag.c:3598
 msgid "Searching for audio files…"
 msgstr "Vyhledávají se zvukové soubory…"
 
-#: ../src/easytag.c:3556
+#: ../src/easytag.c:3599
 msgid "Searching"
 msgstr "Hledání"
 
-#: ../src/easytag.c:4187
+#: ../src/easytag.c:4265
 msgid "Select a directory to browse"
 msgstr "Vyberte složku, kterou chcete procházet"
 
 #. Menu items
-#: ../src/easytag.c:4334
+#: ../src/easytag.c:4412
 msgid "Tag selected files with this field"
 msgstr "Nastavit vybraným souborům toto pole"
 
-#: ../src/easytag.c:4346 ../src/scan.c:2662
+#: ../src/easytag.c:4424 ../src/scan.c:2318
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Převést „_“ a „%20“ na mezery"
 
-#: ../src/easytag.c:4353 ../src/scan.c:2664
+#: ../src/easytag.c:4431 ../src/scan.c:2320
 msgid "Convert ' ' to '_'"
 msgstr "Převést „ “ na „_“"
 
-#: ../src/easytag.c:4364
+#: ../src/easytag.c:4442
 msgid "All uppercase"
 msgstr "Vše velkými písmeny"
 
-#: ../src/easytag.c:4371
+#: ../src/easytag.c:4449
 msgid "All lowercase"
 msgstr "Vše malými písmeny"
 
-#: ../src/easytag.c:4378
+#: ../src/easytag.c:4456
 msgid "First letter uppercase"
 msgstr "První písmeno velké"
 
-#: ../src/easytag.c:4385
+#: ../src/easytag.c:4463
 msgid "First letter uppercase of each word"
 msgstr "První písmeno každého slova velké"
 
-#: ../src/easytag.c:4396 ../src/prefs.c:1023 ../src/scan.c:2762
+#: ../src/easytag.c:4474 ../src/prefs.c:1023 ../src/scan.c:2418
 msgid "Remove spaces"
 msgstr "Odstranit mezery"
 
-#: ../src/easytag.c:4403
+#: ../src/easytag.c:4481
 msgid "Insert space before uppercase letter"
 msgstr "Vložit mezeru před velká písmena"
 
-#: ../src/easytag.c:4410
+#: ../src/easytag.c:4488
 msgid "Remove duplicate spaces or underscores"
 msgstr "Odstranit zdvojené mezery nebo podtržítka"
 
-#: ../src/easytag.c:4417
+#: ../src/easytag.c:4495
 msgid "Remove all text"
 msgstr "Odstranit všechen text"
 
-#: ../src/easytag.c:4436
+#: ../src/easytag.c:4514
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Standardní ukončení"
 
-#: ../src/easytag.c:4488
+#: ../src/easytag.c:4566
 msgid "Do you want to save them before quitting?"
 msgstr "Chcete je uložit, než skončíte?"
 
-#: ../src/easytag.c:4511
+#: ../src/easytag.c:4593
 msgid "Do you really want to quit?"
 msgstr "Opravdu chcete skončit?"
 
-#: ../src/et_core.c:506
+#: ../src/et_core.c:510
 #, c-format
 msgid "Error reading tag from ogg file (%s)"
 msgstr "Chyba při čtení štítku ze souboru ogg (%s)"
 
-#: ../src/et_core.c:640
+#: ../src/et_core.c:539
+#, c-format
+msgid "Error reading tag from Opus file (%s)"
+msgstr "Chyba při čtení štítku ze souboru Opus (%s)"
+
+#: ../src/et_core.c:682
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr "Pro soubor „%s“ byly použity automatické korekce."
 
-#: ../src/et_core.c:2632
+#: ../src/et_core.c:2707
 msgid "ID3 Tag"
 msgstr "Štítek ID3"
 
-#: ../src/et_core.c:2638
+#: ../src/et_core.c:2713
 msgid "Ogg Vorbis Tag"
 msgstr "Štítek Ogg Vorbis"
 
-#: ../src/et_core.c:2644
+#: ../src/et_core.c:2719
 msgid "FLAC Vorbis Tag"
 msgstr "Štítek FLAC"
 
-#: ../src/et_core.c:2649
+#: ../src/et_core.c:2724
 msgid "APE Tag"
 msgstr "Štítek APE"
 
-#: ../src/et_core.c:2654
+#: ../src/et_core.c:2729
 msgid "MP4/M4A/AAC Tag"
 msgstr "Štítek MP4/M4A/AAC"
 
-#: ../src/et_core.c:2660
+#: ../src/et_core.c:2735
 msgid "Wavpack Tag"
 msgstr "Štítek Wavpack"
 
-#: ../src/et_core.c:2680
+#: ../src/et_core.c:2741
+msgid "Opus Tag"
+msgstr "Štítek Opus"
+
+#: ../src/et_core.c:2761
 msgid "MP3 File"
 msgstr "Soubor MP3"
 
-#: ../src/et_core.c:2684
+#: ../src/et_core.c:2765
 msgid "MP2 File"
 msgstr "Soubor MP2"
 
-#: ../src/et_core.c:2690
+#: ../src/et_core.c:2771
 msgid "Ogg Vorbis File"
 msgstr "Soubor Ogg Vorbis"
 
-#: ../src/et_core.c:2696
+#: ../src/et_core.c:2777
 msgid "Speex File"
 msgstr "Soubor Speex"
 
-#: ../src/et_core.c:2702
+#: ../src/et_core.c:2783
 msgid "FLAC File"
 msgstr "Soubor FLAC"
 
-#: ../src/et_core.c:2707
+#: ../src/et_core.c:2788
 msgid "MusePack File"
 msgstr "Soubor MusePack"
 
-#: ../src/et_core.c:2711
+#: ../src/et_core.c:2792
 msgid "Monkey's Audio File"
 msgstr "Zvukový soubor Monkey"
 
-#: ../src/et_core.c:2716
+#: ../src/et_core.c:2797
 msgid "MP4/AAC File"
 msgstr "Soubor MP4/AAC"
 
-#: ../src/et_core.c:2722
+#: ../src/et_core.c:2803
 msgid "Wavpack File"
 msgstr "Soubor Wavpack"
 
-#: ../src/et_core.c:2779 ../src/et_core.c:2834
+#: ../src/et_core.c:2809
+msgid "Opus File"
+msgstr "Soubor Opus"
+
+#: ../src/et_core.c:2868 ../src/et_core.c:2923
 msgid "File not found"
 msgstr "Soubor nebyl nalezen"
 
-#: ../src/et_core.c:2784
+#: ../src/et_core.c:2873
 #, c-format
 msgid "Cannot query file information (%s)"
 msgstr "Nelze se dotázat na informace o souboru (%s)"
 
-#: ../src/et_core.c:2818
+#: ../src/et_core.c:2907
 msgid "Read-only file"
 msgstr "Soubor jen ke čtení"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2882
+#: ../src/et_core.c:2971
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
@@ -2441,48 +2434,43 @@ msgstr[0] "jeden soubor"
 msgstr[1] "%u soubory"
 msgstr[2] "%u souborů"
 
-#: ../src/et_core.c:3087
+#: ../src/et_core.c:3175
 #, c-format
 msgid "Images (%d)"
 msgstr "Obrázky (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3129 ../src/flac_header.c:205
+#: ../src/et_core.c:3217 ../src/flac_header.c:205
 #: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
 #: ../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:3134 ../src/flac_header.c:210
+#: ../src/et_core.c:3222 ../src/flac_header.c:210
 #: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
 #: ../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:3277 ../src/scan.c:690
+#: ../src/et_core.c:3368 ../src/scan.c:686
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding"
 msgstr "Nelze převést název souboru „%s“ do systémového kódování názvů soborů"
 
-#: ../src/et_core.c:3279
+#: ../src/et_core.c:3370
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Zkuste nastavit proměnnou prostředí G_FILENAME_ENCODING"
 
-#: ../src/et_core.c:3280 ../src/scan.c:692
+#: ../src/et_core.c:3371 ../src/scan.c:688
 msgid "Filename translation"
 msgstr "Překlad názvu souboru"
 
-#: ../src/et_core.c:3941
-#, c-format
-msgid "Cannot change the permissions of file '%s' (%s)"
-msgstr "Nelze změnit oprávnění souboru „%s“ (%s)"
-
-#: ../src/et_core.c:3979
+#: ../src/et_core.c:4076
 #, c-format
 msgid "Error writing tag type %d to file %s (%s)"
 msgstr "Chyba při zápisu štítku typu %d do souboru %s (%s)"
@@ -2492,7 +2480,7 @@ msgstr "Chyba při zápisu štítku typu %d do souboru %s (%s)"
 #. 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/opus_header.c:237 ../src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Kanály:"
 
@@ -2501,7 +2489,7 @@ msgstr "Kanály:"
 msgid "Error while opening file: '%s' as FLAC (%s)."
 msgstr "Chyba při otevírání souboru: „%s“ jako FLAC (%s)."
 
-#: ../src/flac_tag.c: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 "
@@ -2520,7 +2508,7 @@ msgstr "Blok s obrázkem není platný: „%s“"
 msgid "Error: Failed to write comments to file '%s' (%s)."
 msgstr "Chyba: Selhal zápis poznámek do souboru „%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 "Zapsán štítek do „%s“"
@@ -2543,27 +2531,27 @@ msgstr ""
 msgid "Corrupted file"
 msgstr "Poškozený soubor"
 
-#: ../src/id3_tag.c:540
+#: ../src/id3_tag.c:555
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Odstraněn štítek z „%s“"
 
-#: ../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 "Chyba při odstraňování štítku ID3v1 v „%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 "Chyba při odstraňování štítku ID3v2 v „%s“ (%s)"
 
-#: ../src/id3_tag.c:565
+#: ../src/id3_tag.c:580
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Chyba při aktualizaci štítku ID3v1 v „%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"
@@ -2571,7 +2559,7 @@ msgstr ""
 "Zkoušíte uložit tento šítek v Unikódu, ale bylo zjištěno, že máte verzi "
 "id3lib, která obsahuje chyby."
 
-#: ../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 "
@@ -2590,90 +2578,90 @@ msgstr ""
 "\n"
 "Soubor: %s"
 
-#: ../src/id3_tag.c:602
+#: ../src/id3_tag.c:617
 msgid "Buggy id3lib"
 msgstr "Chybová id3lib"
 
-#: ../src/id3_tag.c:636
+#: ../src/id3_tag.c:651
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Chyba při aktualizaci štítku ID3v1 v „%s“ (%s)"
 
-#: ../src/id3_tag.c:650 ../src/id3v24_tag.c:1050
+#: ../src/id3_tag.c:665 ../src/id3v24_tag.c:1048
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Aktualizován štítek v „%s“"
 
-#: ../src/id3_tag.c:669
+#: ../src/id3_tag.c:684
 msgid "No error reported"
 msgstr "Neohlášena žádná chyba"
 
-#: ../src/id3_tag.c:671
+#: ../src/id3_tag.c:686
 msgid "No available memory"
 msgstr "Není dostupná žádná pamět"
 
-#: ../src/id3_tag.c:673
+#: ../src/id3_tag.c:688
 msgid "No data to parse"
 msgstr "Žádná data ke zpracování"
 
-#: ../src/id3_tag.c:675
+#: ../src/id3_tag.c:690
 msgid "Improperly formatted data"
 msgstr "Chybně zformátovaná data"
 
-#: ../src/id3_tag.c:677
+#: ../src/id3_tag.c:692
 msgid "No buffer to write to"
 msgstr "Nebyla nalezena vyrovnávací paměť pro zápis"
 
-#: ../src/id3_tag.c:679
+#: ../src/id3_tag.c:694
 msgid "Buffer is too small"
 msgstr "Vyrovnávací paměť je příliš malá"
 
-#: ../src/id3_tag.c:681
+#: ../src/id3_tag.c:696
 msgid "Invalid frame ID"
 msgstr "Neplatné ID rámce"
 
-#: ../src/id3_tag.c:683
+#: ../src/id3_tag.c:698
 msgid "Requested field not found"
 msgstr "Požadované pole nebylo nalezeno"
 
-#: ../src/id3_tag.c:685
+#: ../src/id3_tag.c:700
 msgid "Unknown field type"
 msgstr "Neznámý typ pole"
 
-#: ../src/id3_tag.c:687
+#: ../src/id3_tag.c:702
 msgid "Tag is already attached to a file"
 msgstr "Štítek je již k souboru přiložen"
 
-#: ../src/id3_tag.c:689
+#: ../src/id3_tag.c:704
 msgid "Invalid tag version"
 msgstr "Neplatná verze štítku"
 
-#: ../src/id3_tag.c:691
+#: ../src/id3_tag.c:706
 msgid "No file to parse"
 msgstr "Žádný soubor ke zpracování"
 
-#: ../src/id3_tag.c:693
+#: ../src/id3_tag.c:708
 msgid "Attempting to write to a read-only file"
 msgstr "Pokus o zápis do souboru jen ke čtení"
 
-#: ../src/id3_tag.c:695
+#: ../src/id3_tag.c:710
 msgid "Error in compression/uncompression"
 msgstr "Chyba při komprimaci/dekomprimaci"
 
-#: ../src/id3_tag.c:697
+#: ../src/id3_tag.c:712
 msgid "Unknown error message"
 msgstr "Neznámá chybová zpráva"
 
-#: ../src/id3_tag.c:1301
+#: ../src/id3_tag.c:1316
 #, c-format
 msgid "Error while creating temporary file: '%s'"
 msgstr "Chyba při vytváření dočasného souboru: „%s“"
 
-#: ../src/id3_tag.c:1308
+#: ../src/id3_tag.c:1323
 msgid "Error while creating temporary file"
 msgstr "Chyba při vytváření dočasného souboru"
 
-#: ../src/id3_tag.c:1328
+#: ../src/id3_tag.c:1343
 #, c-format
 msgid "Error while writing to file: '%s' (%s)"
 msgstr "Chyba při zápisu do souboru: „%s“ (%s)"
@@ -2683,7 +2671,7 @@ msgstr "Chyba při zápisu do souboru: „%s“ (%s)"
 #. * missing (not read for some reason) while reading from
 #. * the file.
 #.
-#: ../src/id3v24_tag.c:1505
+#: ../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)"
@@ -2691,12 +2679,12 @@ msgstr[0] "Nelze zapsat štítek do souboru „%s“ (schází bajt)"
 msgstr[1] "Nelze zapsat štítek do souboru „%s“ (schází %s bajty)"
 msgstr[2] "Nelze zapsat štítek do souboru „%s“ (schází %s bajtů)"
 
-#: ../src/id3v24_tag.c:1526
+#: ../src/id3v24_tag.c:1524
 #, c-format
 msgid "Cannot save tag of file '%s'"
 msgstr "Nelze uložit štítek do souboru „%s“"
 
-#: ../src/id3v24_tag.c:1537
+#: ../src/id3v24_tag.c:1535
 #, c-format
 msgid "Size error while saving tag of '%s'"
 msgstr "Chyba velikosti při ukládání štítku „%s“"
@@ -2705,66 +2693,54 @@ msgstr "Chyba velikosti při ukládání štítku „%s“"
 msgid "Log"
 msgstr "Záznam"
 
-#: ../src/misc.c:692
-msgid "Select File"
-msgstr "Výběr souboru"
-
-#: ../src/misc.c:698
-msgid "Select Directory"
-msgstr "Výběr složky"
-
-#: ../src/misc.c:783
-msgid "No audio player defined"
-msgstr "Není nastaven žádný hudební přehrávač"
-
-#: ../src/misc.c:784
-msgid "Audio Player Warning"
-msgstr "Varování hudebního přehrávače"
+#: ../src/misc.c:719
+msgid "You must type a program name"
+msgstr "Musíte vyplnit název programu"
 
-#. Translators: file size (bytes, kilobytes, megabytes, gigabytes,
-#. * terabytes).
-#: ../src/misc.c:1049 ../src/misc.c:1069
-msgid "B"
-msgstr "B"
+#: ../src/misc.c:720
+msgid "Program Name Error"
+msgstr "Chyba v názvu programu"
 
-#: ../src/misc.c:1049 ../src/misc.c:1069
-msgid "kB"
-msgstr "kB"
+#: ../src/misc.c:799
+#, c-format
+msgid "Executed command: %s"
+msgstr "Proveden příkaz: %s"
 
-#: ../src/misc.c:1049 ../src/misc.c:1069
-msgid "MB"
-msgstr "MB"
+#: ../src/misc.c:806
+#, c-format
+msgid "Failed to launch program: %s"
+msgstr "Selhalo spuštění programu: %s"
 
-#: ../src/misc.c:1049 ../src/misc.c:1069
-msgid "GB"
-msgstr "GB"
+#: ../src/misc.c:823
+msgid "Select File"
+msgstr "Výběr souboru"
 
-#: ../src/misc.c:1049 ../src/misc.c:1069
-msgid "TB"
-msgstr "TB"
+#: ../src/misc.c:829
+msgid "Select Directory"
+msgstr "Výběr složky"
 
-#: ../src/misc.c:1164
+#: ../src/misc.c:1141
 msgid "Generate Playlist"
 msgstr "Generování seznamu skladeb"
 
-#: ../src/misc.c:1188
+#: ../src/misc.c:1165
 msgid "M3U Playlist Name"
 msgstr "Název seznamu M3U"
 
-#: ../src/misc.c:1203
+#: ../src/misc.c:1180
 msgid "Use directory name"
 msgstr "Použít název složky"
 
 #. Playlist options
-#: ../src/misc.c:1220
+#: ../src/misc.c:1197
 msgid "Playlist Options"
 msgstr "Volby seznamu skladeb"
 
-#: ../src/misc.c:1226
+#: ../src/misc.c:1203
 msgid "Include only the selected files"
 msgstr "Zahrnout pouze vybrané soubory"
 
-#: ../src/misc.c:1229
+#: ../src/misc.c:1206
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2772,29 +2748,29 @@ msgstr ""
 "Pokud je zapnuto, budou do seznamu skladeb zapsány pouze vybrané soubory. "
 "Jinak budou zapsány všechny soubory."
 
-#: ../src/misc.c:1232
+#: ../src/misc.c:1209
 msgid "Use full path for files in playlist"
 msgstr "K souborům v seznamu použít celou cestu"
 
-#: ../src/misc.c:1235
+#: ../src/misc.c:1212
 msgid "Use relative path for files in playlist"
 msgstr "K souborům v seznamu použít relativní cestu"
 
 #. Create playlist in parent directory
-#: ../src/misc.c:1241
+#: ../src/misc.c:1218
 msgid "Create playlist in the parent directory"
 msgstr "Vytvořit seznam skladeb v nadřazené složce"
 
-#: ../src/misc.c:1244
+#: ../src/misc.c:1221
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr "Pokud je zapnuto, bude se seznam skladeb vytvářet v nadřazené složce."
 
 #. DOS Separator
-#: ../src/misc.c:1248
+#: ../src/misc.c:1225
 msgid "Use DOS directory separator"
 msgstr "Používat oddělovač složek jako v systému DOS"
 
-#: ../src/misc.c:1254
+#: ../src/misc.c:1231
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2802,49 +2778,49 @@ msgstr ""
 "Tato volba nahrazuje oddělovač složek „/“ ze systému UNIX oddělovačem „\\“ "
 "ze systému DOS."
 
-#: ../src/misc.c:1263
+#: ../src/misc.c:1240
 msgid "Playlist Content"
 msgstr "Obsah seznamu skladeb"
 
-#: ../src/misc.c:1269
+#: ../src/misc.c:1246
 msgid "Write only list of files"
 msgstr "Zapsat jen seznam souborů"
 
-#: ../src/misc.c:1273
+#: ../src/misc.c:1250
 msgid "Write info using filename"
 msgstr "Zapsat informace za použití názvu souboru"
 
-#: ../src/misc.c:1276
+#: ../src/misc.c:1253
 msgid "Write info using:"
 msgstr "Zapsat informace za použití:"
 
-#: ../src/misc.c:1495
+#: ../src/misc.c:1467
 #, c-format
 msgid "Cannot write playlist file '%s'"
 msgstr "Nelze zapsat do souboru se seznamem skladeb „%s“"
 
-#: ../src/misc.c:1499
+#: ../src/misc.c:1471
 msgid "Playlist File Error"
 msgstr "Chyba souboru se seznamem skladeb"
 
-#: ../src/misc.c:1507
+#: ../src/misc.c:1479
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Zapsán soubor se seznamem skladeb „%s“"
 
-#: ../src/misc.c:1571 ../src/scan.c:3247 ../src/scan.c:3309
+#: ../src/misc.c:1543 ../src/scan.c:2903 ../src/scan.c:2965
 msgid "Invalid scanner mask"
 msgstr "Neplatná maska průzkumníka"
 
-#: ../src/misc.c:1935
+#: ../src/misc.c:1907
 msgid "CD"
 msgstr "CD"
 
-#: ../src/misc.c:1957
+#: ../src/misc.c:1929
 msgid "Find Files"
 msgstr "Hledání souborů"
 
-#: ../src/misc.c:1989
+#: ../src/misc.c:1961
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2852,13 +2828,13 @@ msgstr ""
 "zobrazení všech souborů."
 
 #. Where...
-#: ../src/misc.c:1995
+#: ../src/misc.c:1967
 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:2000
+#: ../src/misc.c:1972
 msgid "the Filename"
 msgstr "názvu souboru"
 
@@ -2867,20 +2843,20 @@ msgstr "názvu souboru"
 #. * Note: label changed to "the Tag" (to be the only one) to fix a Hungarian
 #. * grammatical problem (which uses one word to say "in the tag" like here)
 #.
-#: ../src/misc.c:2006
+#: ../src/misc.c:1978
 msgid "the Tag"
 msgstr "štítku"
 
 #. Property of the search
-#: ../src/misc.c:2017 ../src/prefs.c:335
+#: ../src/misc.c:1989 ../src/prefs.c:335
 msgid "Case sensitive"
 msgstr "Rozlišovat velikost písmen"
 
-#: ../src/misc.c:2244
+#: ../src/misc.c:2216
 msgid "Ready to search…"
 msgstr "Připraveno k hledání…"
 
-#: ../src/misc.c:2464
+#: ../src/misc.c:2436
 #, c-format
 msgid "Found one file"
 msgid_plural "Found %d files"
@@ -2888,63 +2864,63 @@ msgstr[0] "Nalezen jeden soubor"
 msgstr[1] "Nalezeny %d soubory"
 msgstr[2] "Nalezeno %d souborů"
 
-#: ../src/misc.c:2749
+#: ../src/misc.c:2721
 msgid "Load Filenames From a Text File"
 msgstr "Načtení názvů souborů z textového souboru"
 
-#: ../src/misc.c:2778
+#: ../src/misc.c:2750
 msgid "File:"
 msgstr "Soubor:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: ../src/misc.c:2797
+#: ../src/misc.c:2769
 msgid " Load "
 msgstr "Načíst"
 
-#: ../src/misc.c:2815
+#: ../src/misc.c:2787
 msgid "Content of Text File"
 msgstr "Obsah textového souboru"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2836 ../src/misc.c:2931
+#: ../src/misc.c:2808 ../src/misc.c:2903
 msgid "Insert a blank line before the selected line"
 msgstr "Vložit prázdný řádek před vybraný řádek"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2845 ../src/misc.c:2940
+#: ../src/misc.c:2817 ../src/misc.c:2912
 msgid "Delete the selected line"
 msgstr "Smazat vybraný řádek"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2854 ../src/misc.c:2949 ../src/misc.c:3435
+#: ../src/misc.c:2826 ../src/misc.c:2921 ../src/misc.c:3407
 msgid "Delete all blank lines"
 msgstr "Smazat všechny prázdné řádky"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2866 ../src/misc.c:2961
+#: ../src/misc.c:2838 ../src/misc.c:2933
 msgid "Move up the selected line"
 msgstr "Posunout vybraný řádek výš"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2875 ../src/misc.c:2970
+#: ../src/misc.c:2847 ../src/misc.c:2942
 msgid "Move down the selected line"
 msgstr "Posunout vybraný řádek níž"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2887 ../src/misc.c:2982 ../src/misc.c:3459
+#: ../src/misc.c:2859 ../src/misc.c:2954 ../src/misc.c:3431
 msgid "Reload"
 msgstr "Znovu načíst"
 
-#: ../src/misc.c:2909
+#: ../src/misc.c:2881
 msgid "List of Files"
 msgstr "Seznam souborů"
 
-#: ../src/misc.c:3004
+#: ../src/misc.c:2976
 msgid "Selected line:"
 msgstr "Vybraný řádek:"
 
-#: ../src/misc.c:3022
+#: ../src/misc.c:2994
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2952,34 +2928,34 @@ msgstr ""
 "Když je tato volba zapnuta, bude po načtení názvů souborů spuštěn aktuální "
 "průzkumník (okno průzkumníka musí být otevřeno)."
 
-#: ../src/misc.c:3109
+#: ../src/misc.c:3081
 #, c-format
 msgid "Cannot retrieve file info (%s)"
 msgstr "Nelze získat informace o souboru (%s)"
 
-#: ../src/misc.c:3171
+#: ../src/misc.c:3143
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Nelze otevřít soubor „%s“ (%s)"
 
-#: ../src/misc.c:3207
+#: ../src/misc.c:3179
 #, c-format
 msgid "Error reading file (%s)"
 msgstr "Chyba při čtení souboru (%s)"
 
-#: ../src/misc.c:3423
+#: ../src/misc.c:3395
 msgid "Insert a blank line"
 msgstr "Vložit prázdný řádek"
 
-#: ../src/misc.c:3429
+#: ../src/misc.c:3401
 msgid "Delete this line"
 msgstr "Smazat tento řádek"
 
-#: ../src/misc.c:3444
+#: ../src/misc.c:3416
 msgid "Move up this line"
 msgstr "Posunout tento řádek výš"
 
-#: ../src/misc.c:3450
+#: ../src/misc.c:3422
 msgid "Move down this line"
 msgstr "Posunout tento řádek níž"
 
@@ -3083,175 +3059,184 @@ msgstr ""
 msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
 msgstr "Chyba: Selhalo otevření souboru: „%s“ jako Vorbis (%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 "Varování : Soubor Ogg Vorbis „%s“ obsahuje štítek ID3v2."
 
-#: ../src/picture.c:244 ../src/picture.c:269
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1257
 #, c-format
-msgid "Image file not loaded: %s"
-msgstr "Soubor s obrázkem nebyl načten: %s"
+msgid "Error with 'loader_write': %s"
+msgstr "Chyba při použití „loader_write“: %s"
 
-#: ../src/picture.c:261
+#: ../src/ogg_tag.c:1050 ../src/picture.c:1180
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr "Chyba při použití „loader_close“: %s"
+
+#: ../src/picture.c:104
+#, c-format
+msgid "Image file not saved: %s"
+msgstr "Soubor s obrázkem nebyl uložen: %s"
+
+#: ../src/picture.c:154
 #, c-format
 msgid "Cannot open file: '%s'"
 msgstr "Nelze otevřít soubor: „%s“"
 
-#: ../src/picture.c:265
+#: ../src/picture.c:158
 msgid "Image File Error"
 msgstr "Chyba souboru s obrázkem"
 
-#: ../src/picture.c:276
+#: ../src/picture.c:162 ../src/picture.c:424
+#, c-format
+msgid "Image file not loaded: %s"
+msgstr "Soubor s obrázkem nebyl načten: %s"
+
+#: ../src/picture.c:446
 msgid "Image file loaded"
 msgstr "Soubor s obrázkem načten"
 
-#: ../src/picture.c:334
+#: ../src/picture.c:504
 msgid "Add Images"
 msgstr "Přidání obrázků"
 
-#: ../src/picture.c:344 ../src/picture.c:700
+#: ../src/picture.c:514 ../src/picture.c:874
 msgid "All Files"
 msgstr "Všechny soubory"
 
-#: ../src/picture.c:350 ../src/picture.c:706
+#: ../src/picture.c:520 ../src/picture.c:880
 msgid "PNG and JPEG"
 msgstr "PNG a JPEG"
 
-#: ../src/picture.c:477
+#: ../src/picture.c:651
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Vlastnosti obrázku %d/%d"
 
-#: ../src/picture.c:501
+#: ../src/picture.c:675
 msgid "Image Type"
 msgstr "Typ obrázku"
 
 #. Description of the picture
-#: ../src/picture.c:560
+#: ../src/picture.c:734
 msgid "Image Description:"
 msgstr "Popis obrázku:"
 
-#: ../src/picture.c:687
+#: ../src/picture.c:861
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Ukládání obrázku %d/%d"
 
-#: ../src/picture.c:759
-#, c-format
-msgid "Image file not saved: %s"
-msgstr "Soubor s obrázkem nebyl uložen: %s"
-
-#: ../src/picture.c:827
+#: ../src/picture.c:1021
 msgid "JPEG image"
 msgstr "Obrázek JPEG"
 
-#: ../src/picture.c:829
+#: ../src/picture.c:1023
 msgid "PNG image"
 msgstr "Obrázek PNG"
 
-#: ../src/picture.c:831
+#: ../src/picture.c:1025
+msgid "GIF image"
+msgstr "Obrázek GIF"
+
+#: ../src/picture.c:1027
 msgid "Unknown image"
 msgstr "Neznámý obrázek"
 
-#: ../src/picture.c:843
+#: ../src/picture.c:1039
 msgid "32x32 pixel PNG file icon"
 msgstr "Ikona souboru 32×32 pixelu PNG"
 
-#: ../src/picture.c:845
+#: ../src/picture.c:1041
 msgid "Other file icon"
 msgstr "Jiná ikona souboru"
 
-#: ../src/picture.c:847
+#: ../src/picture.c:1043
 msgid "Cover (front)"
 msgstr "Přebal (přední)"
 
-#: ../src/picture.c:849
+#: ../src/picture.c:1045
 msgid "Cover (back)"
 msgstr "Přebal (zadní)"
 
-#: ../src/picture.c:851
+#: ../src/picture.c:1047
 msgid "Leaflet page"
 msgstr "Stránka brožury"
 
-#: ../src/picture.c:853
+#: ../src/picture.c:1049
 msgid "Media (e.g. label side of CD)"
 msgstr "Médium (např. potisklá strana CD)"
 
-#: ../src/picture.c:855
+#: ../src/picture.c:1051
 msgid "Lead artist/lead performer/soloist"
 msgstr "Hlavní umělec/hlavní účinkující/sólista"
 
-#: ../src/picture.c:857
+#: ../src/picture.c:1053
 msgid "Artist/performer"
 msgstr "Umělec/účinkující"
 
-#: ../src/picture.c:859
+#: ../src/picture.c:1055
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: ../src/picture.c:861
+#: ../src/picture.c:1057
 msgid "Band/Orchestra"
 msgstr "Skupina/orchestr"
 
-#: ../src/picture.c:865
+#: ../src/picture.c:1061
 msgid "Lyricist/text writer"
 msgstr "Textař"
 
-#: ../src/picture.c:867
+#: ../src/picture.c:1063
 msgid "Recording location"
 msgstr "Místo nahrávání"
 
-#: ../src/picture.c:869
+#: ../src/picture.c:1065
 msgid "During recording"
 msgstr "Během nahrávání"
 
-#: ../src/picture.c:871
+#: ../src/picture.c:1067
 msgid "During performance"
 msgstr "Během představení"
 
-#: ../src/picture.c:873
+#: ../src/picture.c:1069
 msgid "Movie/video screen capture"
 msgstr "Zachytávání filmu/videa"
 
-#: ../src/picture.c:875
+#: ../src/picture.c:1071
 msgid "A bright colored fish"
 msgstr "Pestrobarevná ryba"
 
-#: ../src/picture.c:877
+#: ../src/picture.c:1073
 msgid "Illustration"
 msgstr "Ilustrace"
 
-#: ../src/picture.c:879
+#: ../src/picture.c:1075
 msgid "Band/Artist logotype"
 msgstr "Logo skupiny/umělce"
 
-#: ../src/picture.c:881
+#: ../src/picture.c:1077
 msgid "Publisher/studio logotype"
 msgstr "Logo vydavatele/studia"
 
-#: ../src/picture.c:885
+#: ../src/picture.c:1081
 msgid "Unknown image type"
 msgstr "Neznámý typ obrázku"
 
-#: ../src/picture.c:915 ../src/picture.c:926
+#: ../src/picture.c:1111 ../src/picture.c:1122
 msgid "pixels"
 msgstr "pixely"
 
-#: ../src/picture.c:916 ../src/picture.c:927
+#: ../src/picture.c:1112 ../src/picture.c:1123
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/picture.c:928
+#: ../src/picture.c:1124
 msgid "Description"
 msgstr "Popis"
 
-#: ../src/picture.c:984
-#, c-format
-msgid "Error with 'loader_close': %s"
-msgstr "Chyba při použití „loader_close“: %s"
-
-#: ../src/picture.c:1044
+#: ../src/picture.c:1240
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
@@ -3259,26 +3244,21 @@ msgstr ""
 "Nelze zobrazit obrázek, protože nebyl načten dostatek dat, podle kterých by "
 "se dalo určit, jaká se má vytvořit vyrovnávací paměť pro obrázek."
 
-#: ../src/picture.c:1051
+#: ../src/picture.c:1247
 msgid "Cannot display the image"
 msgstr "Nelze zobrazit obrázek"
 
-#: ../src/picture.c:1053
+#: ../src/picture.c:1249
 msgid ""
 "Not enough data has been read to determine how to create the image buffer."
 msgstr ""
 "Nebyl načten dostatek dat, podle kterých by se dalo určit, jaká se má "
 "vytvořit vyrovnávací paměť pro obrázek."
 
-#: ../src/picture.c:1055
+#: ../src/picture.c:1251
 msgid "Load Image File"
 msgstr "Načtení souboru s obrázkem"
 
-#: ../src/picture.c:1061
-#, c-format
-msgid "Error with 'loader_write': %s"
-msgstr "Chyba při použití „loader_write“: %s"
-
 #. Label
 #: ../src/prefs.c:152
 msgid "Default directory:"
@@ -4229,16 +4209,16 @@ msgstr "Jméno uživatele pro proxy server."
 msgid "User Password:"
 msgstr "Uživatelské heslo:"
 
-#: ../src/prefs.c:1337
-msgid "Password of user for the the proxy server."
+#: ../src/prefs.c:1338
+msgid "Password of user for the proxy server."
 msgstr "Heslo uživatele pro proxy server."
 
 #. Track Name list (CDDB results)
-#: ../src/prefs.c:1342
+#: ../src/prefs.c:1343
 msgid "Track Name List"
 msgstr "Seznam názvů skladeb"
 
-#: ../src/prefs.c:1349
+#: ../src/prefs.c:1350
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4246,7 +4226,7 @@ msgstr ""
 "Vybrat příslušný zvukový soubor (podle pozice nebo DLM pokud je aktivováno "
 "níže)"
 
-#: ../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."
@@ -4255,7 +4235,7 @@ msgstr ""
 "i odpovídající řádek v hlavním seznamu."
 
 #. Check box to use DLM (also used in the cddb window)
-#: ../src/prefs.c:1358
+#: ../src/prefs.c:1359
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4266,15 +4246,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: ../src/prefs.c:1373
+#: ../src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Potvrzování"
 
-#: ../src/prefs.c:1378
+#: ../src/prefs.c:1379
 msgid "Confirm exit from program"
 msgstr "Potvrzovat ukončení programu"
 
-#: ../src/prefs.c:1381
+#: ../src/prefs.c:1382
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4282,51 +4262,51 @@ msgstr ""
 "Pokud je zapnuto, otevře se dialogové okno s potvrzením před ukončením "
 "programu."
 
-#: ../src/prefs.c:1384
+#: ../src/prefs.c:1385
 msgid "Confirm writing of file tag"
 msgstr "Potvrzovat zápis štítků do souboru"
 
-#: ../src/prefs.c:1388
+#: ../src/prefs.c:1389
 msgid "Confirm renaming of file"
 msgstr "Potvrzovat přejmenování souboru"
 
-#: ../src/prefs.c:1392
+#: ../src/prefs.c:1393
 msgid "Confirm deleting of file"
 msgstr "Potvrzovat mazání souboru"
 
-#: ../src/prefs.c:1396
+#: ../src/prefs.c:1397
 msgid "Confirm writing of playlist"
 msgstr "Potvrzovat zápis seznamu skladeb"
 
-#: ../src/prefs.c:1400
+#: ../src/prefs.c:1401
 msgid "Confirm changing directory when there are unsaved changes"
 msgstr "Potvrzovat změnu složky, když jsou v ní neuložené změny"
 
 #. 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říklad: %.*d_-_Nazev_skladby_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 "(Příklad: disk_%.*d_z_10/Nazev_skladby_1.mp3)"
 
-#: ../src/prefs.c:1613 ../src/setting.c:904
+#: ../src/prefs.c:1614 ../src/setting.c:904
 msgid "Configuration saved"
 msgstr "Nastavení uloženo"
 
-#: ../src/prefs.c:1621
+#: ../src/prefs.c:1622
 msgid "Configuration unchanged"
 msgstr "Nastavení nezměněno"
 
-#: ../src/prefs.c:1707
+#: ../src/prefs.c:1713
 msgid "The selected path for 'Default path to files' is invalid"
 msgstr "Cesta vybraná jako „Výchozí cesta k souborům“ není platná"
 
-#: ../src/prefs.c:1708
+#: ../src/prefs.c:1715
 #, c-format
 msgid ""
 "Path: '%s'\n"
@@ -4335,16 +4315,16 @@ msgstr ""
 "Cesta: „%s“\n"
 "Chyba: %s"
 
-#: ../src/prefs.c:1709
+#: ../src/prefs.c:1717
 msgid "Invalid Path Error"
 msgstr "Chyba způsobená neplatnou cestou"
 
-#: ../src/prefs.c:1823
+#: ../src/prefs.c:1831
 #, c-format
 msgid "The audio file player '%s' cannot be found"
 msgstr "Hudební přehrávač „%s“ nebyl nalezen"
 
-#: ../src/prefs.c:1825
+#: ../src/prefs.c:1833
 msgid "Audio Player Error"
 msgstr "Chyba hudebního přehrávače"
 
@@ -4352,78 +4332,78 @@ msgstr "Chyba hudebního přehrávače"
 msgid "Fill Tag"
 msgstr "Vyplnit štítek"
 
-#: ../src/scan.c:358
+#: ../src/scan.c:354
 #, c-format
 msgid "Cannot calculate CRC value of file (%s)"
 msgstr "Nelze vypočítat hodnotu kontrolního součtu CRC pro soubor (%s)"
 
-#: ../src/scan.c:373
+#: ../src/scan.c:369
 msgid "Tag successfully scanned"
 msgstr "Štítek byl úspěšně prozkoumán"
 
-#: ../src/scan.c:375
+#: ../src/scan.c:371
 #, c-format
 msgid "Tag successfully scanned: %s"
 msgstr "Štítek byl úspěšně prozkoumán: %s"
 
-#: ../src/scan.c:416
+#: ../src/scan.c:412
 #, c-format
 msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
 msgstr ""
 "Průzkumník štítků: podivné…, ale přípona „%s“ nebyla v názvu souboru „%s“ "
 "nalezena"
 
-#: ../src/scan.c:498 ../src/scan.c:527
+#: ../src/scan.c:494 ../src/scan.c:523
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Chyba průzkumníka: nelze nalézt oddělovač „%s“ vrámci „%s“"
 
-#: ../src/scan.c:714
+#: ../src/scan.c:710
 msgid "New filename successfully scanned"
 msgstr "Nový název souboru byl úspěšně prozkoumán"
 
-#: ../src/scan.c:717
+#: ../src/scan.c:713
 #, c-format
 msgid "New filename successfully scanned: %s"
 msgstr "Nový název souboru byl úspěšně prozkoumán: %s"
 
-#: ../src/scan.c:1817
+#: ../src/scan.c:1822
 #, c-format
 msgid "Error while processing fields: %s"
 msgstr "Chyba při zpracování polí: %s"
 
 #. The window
-#: ../src/scan.c:2336
+#: ../src/scan.c:1992
 msgid "Tag and Filename Scan"
 msgstr "Průzkum štítků a názvů souborů"
 
 #. TODO: Set related action to match AM_SCAN_FILES.
-#: ../src/scan.c:2345
+#: ../src/scan.c:2001
 msgid "Scan Files"
 msgstr "Prozkoumat soubory"
 
 #. Option Menu
-#: ../src/scan.c:2373
+#: ../src/scan.c:2029
 msgid "Scanner:"
 msgstr "Průzkumník:"
 
-#: ../src/scan.c:2394
+#: ../src/scan.c:2050
 msgid "Select the type of scanner to use"
 msgstr "Vyberte druh průzkumníka, které se má použít"
 
-#: ../src/scan.c:2403
+#: ../src/scan.c:2059
 msgid "Scanner Preferences"
 msgstr "Předvolby průzkumníka"
 
-#: ../src/scan.c:2412
+#: ../src/scan.c:2068
 msgid "Show / Hide Masks Editor"
 msgstr "Zobrazit/skrýt editor masky"
 
-#: ../src/scan.c:2422
+#: ../src/scan.c:2078
 msgid "Show / Hide Legend"
 msgstr "Zobrazit/skrýt legendu"
 
-#: ../src/scan.c:2452
+#: ../src/scan.c:2108
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse filename and "
 "path. Used to fill in tag fields"
@@ -4432,15 +4412,15 @@ msgstr ""
 "zpracovávat název souboru a cesta. Použije se k vyplnění polí štítku."
 
 #. Preview label
-#: ../src/scan.c:2476
+#: ../src/scan.c:2132
 msgid "Fill tag preview"
 msgstr "Náhled vyplnění štítku"
 
-#: ../src/scan.c:2506
+#: ../src/scan.c:2162
 msgid "Prefix mask with current path"
 msgstr "Úvodní maska s aktuální cestou"
 
-#: ../src/scan.c:2520
+#: ../src/scan.c:2176
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4453,15 +4433,15 @@ msgstr ""
 "považováno za absolutní cestu, jinak za relativní ke staré cestě."
 
 #. Preview label
-#: ../src/scan.c:2545
+#: ../src/scan.c:2201
 msgid "Rename file preview"
 msgstr "Náhled přejmenování souboru"
 
-#: ../src/scan.c:2564
+#: ../src/scan.c:2220
 msgid "Select fields:"
 msgstr "Vyberte pole:"
 
-#: ../src/scan.c:2567
+#: ../src/scan.c:2223
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those which interest you"
@@ -4470,134 +4450,134 @@ msgstr ""
 "která chcete upravit."
 
 #. Advice for Translators: set the first letter of filename translated
-#: ../src/scan.c:2571
+#: ../src/scan.c:2227
 msgid "F"
 msgstr "F"
 
-#: ../src/scan.c:2573
+#: ../src/scan.c:2229
 msgid "Process filename field"
 msgstr "Upravit pole názvu souboru"
 
 #. Advice for Translators: set the first letter of title translated
-#: ../src/scan.c:2575
+#: ../src/scan.c:2231
 msgid "T"
 msgstr "T"
 
-#: ../src/scan.c:2576
+#: ../src/scan.c:2232
 msgid "Process title field"
 msgstr "Upravit pole s názvem"
 
 #. Advice for Translators: set the first letter of artist translated
-#: ../src/scan.c:2578
+#: ../src/scan.c:2234
 msgid "Ar"
 msgstr "Ar"
 
-#: ../src/scan.c:2579
+#: ../src/scan.c:2235
 msgid "Process file artist field"
 msgstr "Upravit pole s autorem"
 
 #. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan.c:2581
+#: ../src/scan.c:2237
 msgid "AA"
 msgstr "AA"
 
-#: ../src/scan.c:2582
+#: ../src/scan.c:2238
 msgid "Process album artist field"
 msgstr "Upravit pole s autorem alba"
 
 #. Advice for Translators: set the first letter of album translated
-#: ../src/scan.c:2584
+#: ../src/scan.c:2240
 msgid "Al"
 msgstr "Al"
 
-#: ../src/scan.c:2585
+#: ../src/scan.c:2241
 msgid "Process album field"
 msgstr "Upravit pole s albem"
 
 #. Advice for Translators: set the first letter of genre translated
-#: ../src/scan.c:2587
+#: ../src/scan.c:2243
 msgid "G"
 msgstr "G"
 
-#: ../src/scan.c:2588
+#: ../src/scan.c:2244
 msgid "Process genre field"
 msgstr "Upravit pole se žánrem"
 
 #. Advice for Translators: set the first letter of comment translated
-#: ../src/scan.c:2590
+#: ../src/scan.c:2246
 msgid "Cm"
 msgstr "Cm"
 
-#: ../src/scan.c:2591
+#: ../src/scan.c:2247
 msgid "Process comment field"
 msgstr "Upravit pole s poznámkou"
 
 #. Advice for Translators: set the first letter of composer translated
-#: ../src/scan.c:2593
+#: ../src/scan.c:2249
 msgid "Cp"
 msgstr "Cp"
 
-#: ../src/scan.c:2594
+#: ../src/scan.c:2250
 msgid "Process composer field"
 msgstr "Upravit pole se skladatelem"
 
 #. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan.c:2596
+#: ../src/scan.c:2252
 msgid "O"
 msgstr "O"
 
-#: ../src/scan.c:2597
+#: ../src/scan.c:2253
 msgid "Process original artist field"
 msgstr "Upravit pole s původním umělcem"
 
 #. Advice for Translators: set the first letter of copyright translated
-#: ../src/scan.c:2599
+#: ../src/scan.c:2255
 msgid "Cr"
 msgstr "Cr"
 
-#: ../src/scan.c:2600
+#: ../src/scan.c:2256
 msgid "Process copyright field"
 msgstr "Upravit pole s copyrightem"
 
 #. Advice for Translators: set the first letter of URL translated
-#: ../src/scan.c:2602
+#: ../src/scan.c:2258
 msgid "U"
 msgstr "U"
 
-#: ../src/scan.c:2603
+#: ../src/scan.c:2259
 msgid "Process URL field"
 msgstr "Upravit pole s adresou URL"
 
 #. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan.c:2605
+#: ../src/scan.c:2261
 msgid "E"
 msgstr "E"
 
-#: ../src/scan.c:2606
+#: ../src/scan.c:2262
 msgid "Process encoder name field"
 msgstr "Upravit pole s názvem kodéru"
 
-#: ../src/scan.c:2650
+#: ../src/scan.c:2306
 msgid "Invert selection"
 msgstr "Invertovat výběr"
 
-#: ../src/scan.c:2657
+#: ../src/scan.c:2313
 msgid "Select/Unselect all"
 msgstr "Vybrat vše/zrušit výběr všeho"
 
-#: ../src/scan.c:2672
+#: ../src/scan.c:2328
 msgid "Convert:"
 msgstr "Převést:"
 
-#: ../src/scan.c:2674
+#: ../src/scan.c:2330
 msgid "to: "
 msgstr "na : "
 
-#: ../src/scan.c:2681
+#: ../src/scan.c:2337
 msgid "Do not convert"
 msgstr "Nepřevádět"
 
-#: ../src/scan.c:2700
+#: ../src/scan.c:2356
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4605,7 +4585,7 @@ msgstr ""
 "Podtržítka nebo řetězec „%20“ budou nahrazovány jednou mezerou. Příklad "
 "před: „Text%20v%20nějaké_položce“ a po: „Text v nějaké položce“."
 
-#: ../src/scan.c:2703
+#: ../src/scan.c:2359
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4613,38 +4593,38 @@ msgstr ""
 "Mezera bude nahrazována jedním podtržítkem. Příklad před: „Text v nějaké "
 "položce“ a po: „Text_v_nějaké_položce“."
 
-#: ../src/scan.c:2706
+#: ../src/scan.c:2362
 msgid ""
 "Replace a string by another one. Note that the search is case sensitive."
 msgstr ""
 "Nahradit jeden řetězec jiným řetězcem. Upozorňujeme, že se při hledání "
 "rozlišuje velikost písmen."
 
-#: ../src/scan.c:2713
+#: ../src/scan.c:2369
 msgid "Capitalize all"
 msgstr "Vše na velká písmena"
 
-#: ../src/scan.c:2715
+#: ../src/scan.c:2371
 msgid "Lowercase all"
 msgstr "Vše na malá písmena"
 
-#: ../src/scan.c:2717
+#: ../src/scan.c:2373
 msgid "Capitalize first letter"
 msgstr "První písmeno na velké"
 
-#: ../src/scan.c:2719
+#: ../src/scan.c:2375
 msgid "Capitalize the first letter of each word"
 msgstr "První písmeno každého slova na velké"
 
-#: ../src/scan.c:2720
+#: ../src/scan.c:2376
 msgid "Detect Roman numerals"
 msgstr "Zjištěny římské číslice"
 
-#: ../src/scan.c:2722
+#: ../src/scan.c:2378
 msgid "Do not change capitalization"
 msgstr "Neměnit velikost písmen"
 
-#: ../src/scan.c:2744
+#: ../src/scan.c:2400
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4652,7 +4632,7 @@ msgstr ""
 "Převést všechna slova ve všech polích na velká písmena. Příklad před: „Text "
 "V NĚJAKÉM poli“ a po: „TEXT V NĚJAKÉM POLI“."
 
-#: ../src/scan.c:2747
+#: ../src/scan.c:2403
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4660,7 +4640,7 @@ msgstr ""
 "Převést všechna slova ve všech polích na malá písmena. Příklad před: „TEXT V "
 "nějakém poli“ a po: „text v nějakém poli“."
 
-#: ../src/scan.c:2750
+#: ../src/scan.c:2406
 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'."
@@ -4668,7 +4648,7 @@ msgstr ""
 "Převést první písmeno u prvních slov ve všech polích na velké písmeno. "
 "Příklad před: „text V Nějakém POLI“ a po: „Text v nějakém poli“."
 
-#: ../src/scan.c:2753
+#: ../src/scan.c:2409
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4676,7 +4656,7 @@ msgstr ""
 "Převést první písmeno u každého slova ve všech polích na velké písmeno. "
 "Příklad před: „Text v nějakém POLI“ a po: „Text V Nějakém Poli“."
 
-#: ../src/scan.c:2756
+#: ../src/scan.c:2412
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -4684,19 +4664,19 @@ msgstr ""
 "Vynutit převod na velká písmena u římských číslic. Příklad před: „ix. text v "
 "nějakém poli“ a po: „IX. text v nějakém poli“."
 
-#: ../src/scan.c:2764
+#: ../src/scan.c:2420
 msgid "Insert a space before uppercase letters"
 msgstr "Vložit mezeru před velká písmena"
 
-#: ../src/scan.c:2766
+#: ../src/scan.c:2422
 msgid "Remove duplicate spaces and underscores"
 msgstr "Odstranit zdvojené mezery a podtržítka"
 
-#: ../src/scan.c:2768
+#: ../src/scan.c:2424
 msgid "Do not change word separators"
 msgstr "Neměnit oddělovače slov"
 
-#: ../src/scan.c:2782
+#: ../src/scan.c:2438
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4704,7 +4684,7 @@ msgstr ""
 "Odstranit všechny mezery mezi slovy. Příklad před: „Text v nějakém poli“ a "
 "po: „TextVNějakémPoli“."
 
-#: ../src/scan.c:2785
+#: ../src/scan.c:2441
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4712,7 +4692,7 @@ msgstr ""
 "Před každé velké písmeno vložit mezeru. Příklad před: „TextVNějakémPoli“ a "
 "po: „Text V Nějakém Poli“."
 
-#: ../src/scan.c:2788
+#: ../src/scan.c:2444
 msgid ""
 "Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4723,141 +4703,141 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2795
+#: ../src/scan.c:2451
 msgid "Legend"
 msgstr "Legenda"
 
-#: ../src/scan.c:2801
+#: ../src/scan.c:2457
 #, c-format
 msgid "%a: artist"
 msgstr "%a: umělec"
 
-#: ../src/scan.c:2804
+#: ../src/scan.c:2460
 msgid "%z: album artist"
 msgstr "%a: umělec alba"
 
-#: ../src/scan.c:2807
+#: ../src/scan.c:2463
 msgid "%b: album"
 msgstr "%b: album"
 
-#: ../src/scan.c:2810
+#: ../src/scan.c:2466
 #, c-format
 msgid "%c: comment"
 msgstr "%c: poznámka"
 
-#: ../src/scan.c:2813
+#: ../src/scan.c:2469
 #, c-format
 msgid "%p: composer"
 msgstr "%p: skladatel"
 
-#: ../src/scan.c:2816
+#: ../src/scan.c:2472
 msgid "%r: copyright"
 msgstr "%r: copyright"
 
-#: ../src/scan.c:2819
+#: ../src/scan.c:2475
 #, c-format
 msgid "%d: disc number"
 msgstr "%d: číslo disku"
 
-#: ../src/scan.c:2822
+#: ../src/scan.c:2478
 #, c-format
 msgid "%e: encoded by"
 msgstr "%e: kódováno pomocí"
 
-#: ../src/scan.c:2825
+#: ../src/scan.c:2481
 #, c-format
 msgid "%g: genre"
 msgstr "%g: žánr"
 
-#: ../src/scan.c:2828
+#: ../src/scan.c:2484
 #, c-format
 msgid "%i: ignored"
 msgstr "%i: ignorováno"
 
-#: ../src/scan.c:2831
+#: ../src/scan.c:2487
 msgid "%l: number of tracks"
 msgstr "%l: počet skladeb"
 
-#: ../src/scan.c:2834
+#: ../src/scan.c:2490
 #, c-format
 msgid "%o: orig. artist"
 msgstr "%o: původní umělec"
 
-#: ../src/scan.c:2837
+#: ../src/scan.c:2493
 #, c-format
 msgid "%n: track"
 msgstr "%n: pořadí"
 
-#: ../src/scan.c:2840
+#: ../src/scan.c:2496
 msgid "%t: title"
 msgstr "%t: název"
 
-#: ../src/scan.c:2843
+#: ../src/scan.c:2499
 #, c-format
 msgid "%u: URL"
 msgstr "%u: adresa URL"
 
-#: ../src/scan.c:2846
+#: ../src/scan.c:2502
 #, c-format
 msgid "%x: number of discs"
 msgstr "%x: počet disků"
 
-#: ../src/scan.c:2849
+#: ../src/scan.c:2505
 msgid "%y: year"
 msgstr "%y: rok"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2856
+#: ../src/scan.c:2512
 msgid "Mask Editor"
 msgstr "Editor masky"
 
-#: ../src/scan.c:2910
+#: ../src/scan.c:2566
 msgid "Create New Mask"
 msgstr "Vytvořit novou masku"
 
-#: ../src/scan.c:2920
+#: ../src/scan.c:2576
 msgid "Move Up this Mask"
 msgstr "Posunout masku nahoru"
 
-#: ../src/scan.c:2930
+#: ../src/scan.c:2586
 msgid "Move Down this Mask"
 msgstr "Posunout masku dolů"
 
-#: ../src/scan.c:2940
+#: ../src/scan.c:2596
 msgid "Duplicate Mask"
 msgstr "Duplikovat masku"
 
-#: ../src/scan.c:2950
+#: ../src/scan.c:2606
 msgid "Add Default Masks"
 msgstr "Přidat výchozí masky"
 
-#: ../src/scan.c:2960
+#: ../src/scan.c:2616
 msgid "Remove Mask"
 msgstr "Odebrat masku"
 
-#: ../src/scan.c:2970
+#: ../src/scan.c:2626
 msgid "Save Masks"
 msgstr "Uložit masky"
 
-#: ../src/scan.c:3550
+#: ../src/scan.c:3206
 msgid "New_mask"
 msgstr "Nová _maska"
 
-#: ../src/scan.c:3589
+#: ../src/scan.c:3245
 msgid "Copy: No row selected"
 msgstr "Kopírování: Není vybrán žádný řádek"
 
-#: ../src/scan.c:3682
+#: ../src/scan.c:3338
 msgid "Remove: No row selected"
 msgstr "Odebírání: Není vybrán žádný řádek"
 
-#: ../src/scan.c:3729
+#: ../src/scan.c:3385
 msgid "Move Up: No row selected"
 msgstr "Posun výš: Není vybrán žádný řádek"
 
-#: ../src/scan.c:3773
+#: ../src/scan.c:3429
 msgid "Move Down: No row selected"
 msgstr "Posun níž: Není vybrán žádný řádek"
 
@@ -4924,85 +4904,3 @@ msgstr "Selhala migrace souboru s nastavením „%s“"
 #, c-format
 msgid "Error: Cannot create directory '%s' (%s)"
 msgstr "Chyba: Nelze vytvořit složku „%s“ (%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 "Dynamická knihovna „%s“ zatím nebyla načtena. Zkouší se načíst nyní…"
-
-#. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: ../src/win32/win32dep.c:130
-#, c-format
-msgid "DLL '%s' could not be loaded"
-msgstr "Dynamickou knihovnu „%s“ nelze načíst"
-
-#. 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 "Tato verze knihovny „%s“ obsahuje proceduru „%s“"
-
-#. 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 "Funkce „%s“ nebyla v dynamické knihovně „%s“ nalezena"
-
-#. 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 "Složka s nastavením EasyTag: „%s“"
-
-#. Log_Print(_("weasytag_init start..."));
-#: ../src/win32/win32dep.c:472
-#, c-format
-msgid "weasytag_init start..."
-msgstr "Spouští se weasytag_init…"
-
-#. 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 "Verze Glib: %u.%u.%u\n"
-
-#. Set Environmental Variables
-#. Log_Print(_("weasytag_init end..."));
-#: ../src/win32/win32dep.c:496
-#, c-format
-msgid "weasytag_init end..."
-msgstr "Končí weasytag_init…"
-
-#. Log_Print(_("Audio player: '%s'"), player);
-#: ../src/win32/win32dep.c:620
-#, c-format
-msgid "Audio player: '%s'"
-msgstr "Hudební přehrávač: „%s“"
-
-#~ msgid "Cannot fork another process\n"
-#~ msgstr "Nelze rozvětvit do dalšího procesu\n"
-
-#~ msgid "EasyTAG version %s: Abnormal exit (PID: %d)"
-#~ msgstr "EasyTAG verze %s: Nestandardní ukončení (PID: %d)"
-
-#~ msgid "Received signal '%s' (%d)"
-#~ msgstr "Obdržen signál „%s“ (%d)"
-
-#~ 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 ""
-#~ "Nejspíše jste v aplikaci EasyTAG nalezli chybu. Nahlaste prosím chybu "
-#~ "spolu s výpisem zásobníku z GDB (spustit „gdb easytag core“ a pak "
-#~ "zmáčknout „bt“ a „l“) a popisem, jak ji reprodukovat, na: %s"
-
-#~ msgid "EasyTAG version %s: Abnormal exit (PID: %d)."
-#~ msgstr "EasyTAG verze %s: Nestandardní ukončení (PID: %d)"
-
-#~ msgid "Cannot fork another process"
-#~ msgstr "Nelze rozvětvit do dalšího procesu"
diff --git a/po/de.po b/po/de.po
index 6c3d898..500ddbc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,12 +1,14 @@
 # German catalog for EasyTAG.
 # Copyright (C) 2000-2007 Free Software Foundation, Inc.
+#
+# Tag  -  Metainfo, Metainformationen
+#
+# [Please leave these: öäüßÖÄÜ]
 # Bastian Kleineidam <calvin at users.sourceforge.net>, 2000.
 # Adrian Bunk <bunk at fs.tum.de>, 2000.
 # Colin Marquardt <colin at marquardt-home.de>, 2001.
 # Philipp Thomas <pthomas at suse.de>, 2001.
 # Götz Waschk <goetz.waschk at gmail.com>, 2001-2008.
-#
-# [Please leave these: öäüßÖÄÜ]
 # Christian Kirbach <christian.kirbach at gmail.com>, 2013.
 # Mario Blättermann <mario.blaettermann at gmail.com>, 2013.
 # Wolfgang Stöggl <c72578 at yahoo.de>, 2014.
@@ -16,8 +18,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: 2014-01-03 21:28+0000\n"
-"PO-Revision-Date: 2014-01-04 11:19+0100\n"
+"POT-Creation-Date: 2014-04-07 09:21+0000\n"
+"PO-Revision-Date: 2014-04-07 15:47+0100\n"
 "Last-Translator: Wolfgang Stoeggl <c72578 at yahoo.de>\n"
 "Language-Team: Deutsch <gnome-de at gnome.org>\n"
 "Language: de\n"
@@ -25,7 +27,32 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.6.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 ""
+"Betrachten und bearbeiten Sie Metainformationen von Dateien in den Formaten: "
+"MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg Vorbis, MusePack, Monkey's "
+"Audio und WavPack."
+
+#: ../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 ""
+"Sie können Alben in Datenbanken im Netz nachschlagen, Metainformationen "
+"stapelweise bearbeiten und eine Sammlung an Dateien umbenennen."
+
+#: ../data/easytag.appdata.xml.in.h:3
+msgid ""
+"A simple and nice GTK+ interface makes tagging easier under GNU/Linux and "
+"Windows."
+msgstr ""
+"Die einfache und praktische GTK+-Schnittstelle macht das Hinzufügen von "
+"Metainformationen leichter unter GNU/Linux und Windows."
 
 #: ../data/easytag.desktop.in.h:1
 msgid "Sound File Metadata Editor"
@@ -38,9 +65,9 @@ msgstr "Metadaten von Audio-Dateien bearbeiten"
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/easytag.desktop.in.h:4
 msgid "mp3;tag;audio;"
-msgstr "mp3;tag;audio;"
+msgstr "mp3;tag;metainfo;audio;"
 
-#: ../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 "
@@ -63,7 +90,7 @@ msgstr ""
 "\n"
 "Dieses Programm wurde mit dem Ziel veröffentlicht, dass Sie es nützlich "
 "finden, jedoch OHNE JEGLICHE GARANTIE, sogar ohne eine implizite Garantie "
-"der VERKAUFBARKEIT oder der VERWENDBARKEIT FÜR EINEN SPEZIELLEN ZWECK."
+"der VERKAUFBARKEIT oder der VERWENDBARKEIT FÜR EINEN SPEZIELLEN ZWECK. "
 "Schauen Sie für weitere Informationen bitte in der »GNU General Public "
 "License« (GNU GPL) nach.\n"
 "\n"
@@ -72,15 +99,16 @@ msgstr ""
 "bitte <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 ""
 "Christian Kirbach <Christian.Kirbach at gmail.com>\n"
-"Mario Blättermann <mario.blaettermann at gmail.com>"
+"Mario Blättermann <mario.blaettermann at gmail.com>\n"
+"Wolfgang Stöggl <c72578 at yahoo.de>"
 
-#: ../src/about.c:118
+#: ../src/about.c:116
 msgid "View and edit tags in audio files"
-msgstr "Tags in Audio-Dateien ansehen und bearbeiten"
+msgstr "Metainformationen in Audio-Dateien ansehen und bearbeiten"
 
 #. 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
@@ -100,736 +128,744 @@ msgstr "Webseite: %s"
 
 #: ../src/application.c:98
 msgid "- Tag and rename audio files"
-msgstr "- Tags in Audio-Dateien einfügen und diese umbenennen"
+msgstr "- Metainformationen in Audio-Dateien einfügen und diese umbenennen"
 
 #.
 #. * Main Menu Actions
 #.
-#: ../src/bar.c:154
+#: ../src/bar.c:155
 msgid "_File"
 msgstr "_Datei"
 
-#: ../src/bar.c:155
+#: ../src/bar.c:156
 msgid "Sort List by Tag"
-msgstr "Liste nach Tag sortieren"
+msgstr "Liste nach Metainfo sortieren"
 
-#: ../src/bar.c:158
+#: ../src/bar.c:159
 msgid "Sort List by Property"
 msgstr "Liste nach Eigenschaft sortieren"
 
-#: ../src/bar.c:159
+#: ../src/bar.c:160
 msgid "Ascending by filename"
 msgstr "Aufsteigend nach Dateinamen "
 
-#: ../src/bar.c:160
+#: ../src/bar.c:161
 msgid "Descending by filename"
 msgstr "Absteigend nach Dateinamen"
 
-#: ../src/bar.c:161
+#: ../src/bar.c:162
 msgid "Ascending by creation date"
 msgstr "Aufsteigend nach Erstellungsdatum"
 
-#: ../src/bar.c:162
+#: ../src/bar.c:163
 msgid "Descending by creation date"
 msgstr "Absteigend nach Erstellungsdatum"
 
-#: ../src/bar.c:163
+#: ../src/bar.c:164
 msgid "Ascending by track number"
 msgstr "Aufsteigend nach Titelnummer"
 
-#: ../src/bar.c:164
+#: ../src/bar.c:165
 msgid "Descending by track number"
 msgstr "Absteigend nach Titelnummer"
 
-#: ../src/bar.c:165
+#: ../src/bar.c:166
 msgid "Ascending by title"
 msgstr "Aufsteigend nach Titel"
 
-#: ../src/bar.c:166
+#: ../src/bar.c:167
 msgid "Descending by title"
 msgstr "Absteigend nach Titel"
 
-#: ../src/bar.c:167
+#: ../src/bar.c:168
 msgid "Ascending by artist"
 msgstr "Aufsteigend nach Künstler"
 
-#: ../src/bar.c:168
+#: ../src/bar.c:169
 msgid "Descending by artist"
 msgstr "Absteigend nach Künstler"
 
-#: ../src/bar.c:169
+#: ../src/bar.c:170
 msgid "Ascending by album artist"
 msgstr "Aufsteigend nach Künstler des Albums"
 
-#: ../src/bar.c:170
+#: ../src/bar.c:171
 msgid "Descending by album artist"
 msgstr "Absteigend nach Künstler des Albums"
 
-#: ../src/bar.c:171
+#: ../src/bar.c:172
 msgid "Ascending by album"
 msgstr "Aufsteigend nach Album"
 
-#: ../src/bar.c:172
+#: ../src/bar.c:173
 msgid "Descending by album"
 msgstr "Absteigend nach Album"
 
-#: ../src/bar.c:173
+#: ../src/bar.c:174
 msgid "Ascending by year"
 msgstr "Aufsteigend nach Jahr"
 
-#: ../src/bar.c:174
+#: ../src/bar.c:175
 msgid "Descending by year"
 msgstr "Absteigend nach Jahr"
 
-#: ../src/bar.c:175
+#: ../src/bar.c:176
 msgid "Ascending by genre"
 msgstr "Aufsteigend nach Genre"
 
-#: ../src/bar.c:176
+#: ../src/bar.c:177
 msgid "Descending by genre"
 msgstr "Absteigend nach Genre"
 
-#: ../src/bar.c:177
+#: ../src/bar.c:178
 msgid "Ascending by comment"
 msgstr "Aufsteigend nach Kommentar"
 
-#: ../src/bar.c:178
+#: ../src/bar.c:179
 msgid "Descending by comment"
 msgstr "Absteigend nach Kommentar"
 
-#: ../src/bar.c:179
+#: ../src/bar.c:180
 msgid "Ascending by composer"
 msgstr "Aufsteigend nach Komponisten"
 
-#: ../src/bar.c:180
+#: ../src/bar.c:181
 msgid "Descending by composer"
 msgstr "Absteigend nach Komponisten"
 
-#: ../src/bar.c:181
+#: ../src/bar.c:182
 msgid "Ascending by original artist"
 msgstr "Aufsteigend nach Originalkünstler"
 
-#: ../src/bar.c:182
+#: ../src/bar.c:183
 msgid "Descending by original artist"
 msgstr "Absteigend nach Originalkünstler"
 
-#: ../src/bar.c:183
+#: ../src/bar.c:184
 msgid "Ascending by copyright"
 msgstr "Aufsteigend nach Copyright"
 
-#: ../src/bar.c:184
+#: ../src/bar.c:185
 msgid "Descending by copyright"
 msgstr "Absteigend nach Copyright"
 
-#: ../src/bar.c:185
+#: ../src/bar.c:186
 msgid "Ascending by URL"
 msgstr "Aufsteigend nach URL"
 
-#: ../src/bar.c:186
+#: ../src/bar.c:187
 msgid "Descending by URL"
 msgstr "Absteigend nach 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 "Aufsteigend nach Kodierer"
 
 #. 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 "Absteigend nach Kodierer"
 
-#: ../src/bar.c:193
+#: ../src/bar.c:194
 msgid "Ascending by file type"
 msgstr "Aufsteigend nach Dateityp"
 
-#: ../src/bar.c:194
+#: ../src/bar.c:195
 msgid "Descending by file type"
 msgstr "Absteigend nach Dateityp"
 
-#: ../src/bar.c:195
+#: ../src/bar.c:196
 msgid "Ascending by file size"
 msgstr "Aufsteigend nach Dateigröße"
 
-#: ../src/bar.c:196
+#: ../src/bar.c:197
 msgid "Descending by file size"
 msgstr "Absteigend nach Dateigröße"
 
-#: ../src/bar.c:197
+#: ../src/bar.c:198
 msgid "Ascending by duration"
 msgstr "Aufsteigend nach Länge"
 
-#: ../src/bar.c:198
+#: ../src/bar.c:199
 msgid "Descending by duration"
 msgstr "Absteigend nach Länge"
 
-#: ../src/bar.c:199
+#: ../src/bar.c:200
 msgid "Ascending by bitrate"
 msgstr "Aufsteigend nach Bitrate"
 
-#: ../src/bar.c:200
+#: ../src/bar.c:201
 msgid "Descending by bitrate"
 msgstr "Absteigend nach Bitrate"
 
-#: ../src/bar.c:201
+#: ../src/bar.c:202
 msgid "Ascending by samplerate"
 msgstr "Aufsteigend nach Samplerate"
 
-#: ../src/bar.c:202
+#: ../src/bar.c:203
 msgid "Descending by samplerate"
 msgstr "Absteigend nach Samplerate"
 
-#: ../src/bar.c:204
+#: ../src/bar.c:205
 msgid "Open Files With…"
 msgstr "Dateien öffnen mit …"
 
-#: ../src/bar.c:205
+#: ../src/bar.c:206
 msgid "Run a command on the selected files"
 msgstr "Einen Befehl mit den ausgewählten Dateien ausführen"
 
-#: ../src/bar.c:208
+#: ../src/bar.c:209
 msgid "Select all"
 msgstr "Alle auswählen"
 
-#: ../src/bar.c:209
+#: ../src/bar.c:210
 msgid "Unselect All"
 msgstr "Alle abwählen"
 
-#: ../src/bar.c:210
+#: ../src/bar.c:211
 msgid "Clear the current selection"
 msgstr "Aktuelle Auswahl löschen"
 
-#: ../src/bar.c:213
+#: ../src/bar.c:214
 msgid "Invert File Selection"
 msgstr "Dateiauswahl umkehren"
 
-#: ../src/bar.c:214
+#: ../src/bar.c:215
 msgid "Invert file selection"
 msgstr "Dateiauswahl umkehren"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete Files"
 msgstr "Dateien löschen"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete files"
 msgstr "Dateien löschen"
 
-#: ../src/bar.c:217
+#: ../src/bar.c:218
 msgid "_First File"
 msgstr "_Erste Datei"
 
-#: ../src/bar.c:218
+#: ../src/bar.c:219
 msgid "First file"
 msgstr "Erste Datei"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "_Previous File"
 msgstr "_Vorherige Datei"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "Previous file"
 msgstr "Vorherige Datei"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "_Next File"
 msgstr "_Nächste Datei"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "Next file"
 msgstr "Nächste Datei"
 
-#: ../src/bar.c:221
+#: ../src/bar.c:222
 msgid "_Last File"
 msgstr "Let_zte Datei"
 
-#: ../src/bar.c:222
+#: ../src/bar.c:223
 msgid "Last file"
 msgstr "Letzte Datei"
 
-#: ../src/bar.c:223
+#: ../src/bar.c:224
 msgid "S_can Files"
 msgstr "Dateien einle_sen"
 
-#: ../src/bar.c:224 ../src/scan.c:2352
+#: ../src/bar.c:225 ../src/scan.c:2008
 msgid "Scan selected files"
 msgstr "Ausgewählte Dateien einlesen"
 
-#: ../src/bar.c:225
+#: ../src/bar.c:226
 msgid "_Remove Tags"
-msgstr "Tags ent_fernen"
+msgstr "Metainformationen ent_fernen"
 
-#: ../src/bar.c:226
+#: ../src/bar.c:227
 msgid "Remove tags"
-msgstr "Tags entfernen"
+msgstr "Metainformationen entfernen"
 
-#: ../src/bar.c:227
+#: ../src/bar.c:228
 msgid "_Undo Last Files Changes"
 msgstr "Letzte Dateiänderungen rückgängig _machen"
 
-#: ../src/bar.c:228
+#: ../src/bar.c:229
 msgid "Undo last files changes"
 msgstr "Letzte Dateiänderungen rückgängig machen"
 
-#: ../src/bar.c:230
+#: ../src/bar.c:231
 msgid "R_edo Last Files Changes"
 msgstr "_Wiederholen der letzten Dateiänderungen"
 
-#: ../src/bar.c:231
+#: ../src/bar.c:232
 msgid "Redo last files changes"
 msgstr "Wiederholen der letzten Dateiänderungen"
 
-#: ../src/bar.c:233
+#: ../src/bar.c:234
 msgid "_Save Files"
 msgstr "Dateien _speichern"
 
-#: ../src/bar.c:234
+#: ../src/bar.c:235
 msgid "Save changes to selected files"
 msgstr "Änderungen in die ausgewählten Dateien speichern"
 
-#: ../src/bar.c:236
+#: ../src/bar.c:237
 msgid "_Force Save Files"
 msgstr "Speichern von Dateien _erzwingen"
 
-#: ../src/bar.c:237
+#: ../src/bar.c:238
 msgid "Force saving files"
 msgstr "Speichern von Dateien erzwingen"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo Last Changes"
 msgstr "Letzte Änderungen rückgängig machen"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo last changes"
 msgstr "Letzte Änderungen rückgängig machen"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo Last Changes"
 msgstr "Letzte Änderungen wiederholen"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo last changes"
 msgstr "Letzte Änderungen wiederholen"
 
-#: ../src/bar.c:241
+#: ../src/bar.c:242
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../src/bar.c:241 ../src/easytag.c:2450 ../src/easytag.c:4572
-#: ../src/easytag.c:4600
+#: ../src/bar.c:242 ../src/easytag.c:2429 ../src/easytag.c:4565
+#: ../src/easytag.c:4597
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../src/bar.c:244
+#: ../src/bar.c:245
 msgid "_Browser"
 msgstr "_Auswahl"
 
-#: ../src/bar.c:245
+#: ../src/bar.c:246
 msgid "_Home Directory"
 msgstr "_Persönlicher Ordner"
 
-#: ../src/bar.c:246
+#: ../src/bar.c:247
 msgid "Go to home directory"
 msgstr "Zum persönlichen Ordner gehen"
 
-#: ../src/bar.c:248
+#: ../src/bar.c:249
 msgid "Desktop Directory"
 msgstr "Schreibtischordner"
 
-#: ../src/bar.c:249
+#: ../src/bar.c:250
 msgid "Go to desktop directory"
 msgstr "Zum Schreibtischordner gehen"
 
-#: ../src/bar.c:251
+#: ../src/bar.c:252
 msgid "Documents Directory"
 msgstr "Dokumentenordner"
 
-#: ../src/bar.c:252
+#: ../src/bar.c:253
 msgid "Go to documents directory"
 msgstr "Zum Dokumentenordner gehen"
 
-#: ../src/bar.c:254
+#: ../src/bar.c:255
 msgid "Downloads Directory"
 msgstr "Download-Ordner"
 
-#: ../src/bar.c:255
+#: ../src/bar.c:256
 msgid "Go to downloads directory"
 msgstr "Zum Download-Ordner gehen"
 
-#: ../src/bar.c:257
+#: ../src/bar.c:258
 msgid "Music Directory"
 msgstr "Musikordner"
 
-#: ../src/bar.c:258
+#: ../src/bar.c:259
 msgid "Go to music directory"
 msgstr "Zum Musikordner gehen"
 
-#: ../src/bar.c:260
+#: ../src/bar.c:261
 msgid "_Parent Directory"
 msgstr "Ü_bergeordneter Ordner"
 
-#: ../src/bar.c:261
+#: ../src/bar.c:262
 msgid "Go to parent directory"
 msgstr "Zum Elternordner gehen"
 
-#: ../src/bar.c:263
+#: ../src/bar.c:264
 msgid "_Default Directory"
 msgstr "_Vorgabeordner"
 
-#: ../src/bar.c:264
+#: ../src/bar.c:265
 msgid "Go to default directory"
 msgstr "Zum Vorgabeordner gehen"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set _Current Path as Default"
 msgstr "_Aktuellen Pfad als Vorgabe festlegen"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set current path as default"
 msgstr "Aktuellen Pfad als Vorgabe festlegen"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename Directory…"
 msgstr "Ordner umbenennen …"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename directory"
 msgstr "Ordner umbenennen"
 
-#: ../src/bar.c:268
+#: ../src/bar.c:269
 msgid "Reload Directory"
 msgstr "Ordner neu einlesen"
 
-#: ../src/bar.c:269
+#: ../src/bar.c:270
 msgid "Reload directory"
 msgstr "Ordner neu einlesen"
 
-#: ../src/bar.c:272
+#: ../src/bar.c:273
 msgid "Browse Directory With…"
 msgstr "Ordner durchsuchen mit …"
 
-#: ../src/bar.c:273
+#: ../src/bar.c:274
 msgid "Run a command on the directory"
 msgstr "Einen Befehl im Ordner ausführen"
 
-#: ../src/bar.c:275
+#: ../src/bar.c:276
 msgid "_Collapse Tree"
 msgstr "Baum _einklappen"
 
-#: ../src/bar.c:276
+#: ../src/bar.c:277
 msgid "Collapse directory tree"
 msgstr "Ordnerbaum einklappen"
 
-#: ../src/bar.c:277
+#: ../src/bar.c:278
 msgid "_Reload Tree"
 msgstr "Baum _neu lesen"
 
-#: ../src/bar.c:278
+#: ../src/bar.c:279
 msgid "Reload directory tree"
 msgstr "Ordnerbaum neu einlesen"
 
-#: ../src/bar.c:281
+#: ../src/bar.c:282
 msgid "S_canner Mode"
 msgstr "S_canner-Modus"
 
-#: ../src/bar.c:283
+#: ../src/bar.c:284
 msgid "_Miscellaneous"
 msgstr "_Verschiedenes"
 
-#: ../src/bar.c:284
+#: ../src/bar.c:285
 msgid "_Find…"
 msgstr "_Suchen …"
 
-#: ../src/bar.c:285
+#: ../src/bar.c:286
 msgid "Search filenames and tags"
-msgstr "Dateinamen und Tags suchen"
+msgstr "Dateinamen und Metainformationen suchen"
 
-#: ../src/bar.c:287
+#: ../src/bar.c:288
 msgid "CDD_B Search…"
 msgstr "CDD_B-Dateisuche …"
 
-#: ../src/bar.c:288
+#: ../src/bar.c:289
 msgid "CDDB search"
 msgstr "CDDB-Suche"
 
-#: ../src/bar.c:290
+#: ../src/bar.c:291
 msgid "Load Filenames From a Text File…"
 msgstr "Dateinamen aus Textdatei laden …"
 
-#: ../src/bar.c:291
+#: ../src/bar.c:292
 msgid "Load filenames from a text file"
 msgstr "Dateinamen aus Textdatei laden"
 
-#: ../src/bar.c:293
+#: ../src/bar.c:294
 msgid "Generate Playlist…"
 msgstr "Wiedergabeliste erzeugen …"
 
-#: ../src/bar.c:294
+#: ../src/bar.c:295
 msgid "Generate a playlist"
 msgstr "Eine Wiedergabeliste erzeugen"
 
-#: ../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 "Audio-Wiedergabe starten"
 
-#: ../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 "Audio-Wiedergabe starten"
 
-#: ../src/bar.c:300
+#: ../src/bar.c:301
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../src/bar.c:301
+#: ../src/bar.c:302
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
 #. The window
-#: ../src/bar.c:302 ../src/prefs.c:110
+#: ../src/bar.c:303 ../src/prefs.c:110
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../src/bar.c:304
+#: ../src/bar.c:305
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../src/bar.c:305
+#: ../src/bar.c:306
 msgid "_Go"
 msgstr "_Gehe zu"
 
-#: ../src/bar.c:307
+#: ../src/bar.c:308
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:311
+msgid "_Contents"
+msgstr "In_halt"
+
+#: ../src/bar.c:312
+msgid "Show help"
+msgstr "Hilfe anzeigen"
+
+#: ../src/bar.c:314
 msgid "_About"
 msgstr "_Info"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:314
 msgid "About"
 msgstr "Info"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: ../src/bar.c:314
+#: ../src/bar.c:320
 msgid "Stop the current action"
 msgstr "Aktuellen Befehl abbrechen"
 
 #.
 #. * Popup menu's Actions
 #.
-#: ../src/bar.c:320
+#: ../src/bar.c:326
 msgid "_File Operations"
 msgstr "_Dateioptionen"
 
-#: ../src/bar.c:321
+#: ../src/bar.c:327
 msgid "S_canner"
 msgstr "S_canner"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:331
 msgid "CDDB Search Files…"
 msgstr "CDDB-Dateisuche …"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:331
 msgid "CDDB search files…"
 msgstr "CDDB-Dateisuche …"
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: ../src/bar.c:329
+#: ../src/bar.c:335
 msgid "Clear log"
 msgstr "Protokoll löschen"
 
 #. { 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 "_Unterordner durchsuchen"
 
-#: ../src/bar.c:336
+#: ../src/bar.c:342
 msgid "Browse subdirectories"
 msgstr "Unterordner durchsuchen"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:346
 msgid "Show Hidden Directories"
 msgstr "Verborgene Ordner anzeigen"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:346
 msgid "Show hidden directories"
 msgstr "Verborgene Ordner anzeigen"
 
-#: ../src/bar.c:342
+#: ../src/bar.c:348
 msgid "_Show Scanner"
 msgstr "_Scanner anzeigen"
 
-#: ../src/bar.c:343
+#: ../src/bar.c:349
 msgid "Show scanner"
 msgstr "Scanner anzeigen"
 
-#: ../src/bar.c:349
+#: ../src/bar.c:355
 msgid "Tree Browser"
 msgstr "Baumansicht"
 
-#: ../src/bar.c:350
+#: ../src/bar.c:356
 msgid "View by directory tree"
 msgstr "Ansicht nach Ordnerbaum"
 
-#: ../src/bar.c:352
+#: ../src/bar.c:358
 msgid "Artist and Album"
 msgstr "Künstler und Album"
 
-#: ../src/bar.c:353
+#: ../src/bar.c:359
 msgid "View by artist and album"
 msgstr "Ansicht nach Künstler und Album"
 
-#: ../src/bar.c:358
+#: ../src/bar.c:364
 msgid "_Fill Tags…"
-msgstr "Tags _füllen …"
+msgstr "Metainformationen _füllen …"
 
-#: ../src/bar.c:359
+#: ../src/bar.c:365
 msgid "Fill tags"
-msgstr "Tags füllen"
+msgstr "Metainformationen füllen"
 
-#: ../src/bar.c:361
+#: ../src/bar.c:367
 msgid "_Rename Files and Directories…"
 msgstr "Dateien und Ordner _umbenennen …"
 
-#: ../src/bar.c:362
+#: ../src/bar.c:368
 msgid "Rename files and directories"
 msgstr "Datei und Ordner umbenennen"
 
-#: ../src/bar.c:364
+#: ../src/bar.c:370
 msgid "_Process Fields…"
 msgstr "Felder _verarbeiten …"
 
-#: ../src/bar.c:364 ../src/scan.c:182
+#: ../src/bar.c:370 ../src/scan.c:182
 msgid "Process Fields"
 msgstr "Felder verarbeiten"
 
-#: ../src/bar.c:422
+#: ../src/bar.c:428
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Oberfläche konnte nicht verschmolzen werden, der Fehler war: %s\n"
 
-#: ../src/bar.c:528
+#: ../src/bar.c:533
 msgid "Ready to start"
 msgstr "Bereit zum Start"
 
-#: ../src/browser.c:369
+#: ../src/browser.c:376
 msgid "New default path for files selected"
 msgstr "Neuer Vorgabepfad für Dateien ausgewählt"
 
-#: ../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 "Einige Dateien wurden geändert, aber noch nicht gespeichert"
 
-#: ../src/browser.c:671
+#: ../src/browser.c:679
 msgid "Do you want to save them before changing the directory?"
 msgstr "Wollen Sie diese vor dem Wechseln des Ordners speichern?"
 
-#: ../src/browser.c:675
+#: ../src/browser.c:683
 msgid "Confirm Directory Change"
 msgstr "Ordnerwechsel bestätigen"
 
-#: ../src/browser.c:2121
+#: ../src/browser.c:2146
 msgid "<All albums>"
 msgstr "<Alle Alben>"
 
-#: ../src/browser.c:2573
+#: ../src/browser.c:2607
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr ""
 "Fehler: Bei der Suche nach %s konnte der Knoten %s nicht im Baum gefunden "
 "werden."
 
-#: ../src/browser.c:3065 ../src/browser.c:3143
+#: ../src/browser.c:3101 ../src/browser.c:3179
 msgid "Tree"
 msgstr "Baum"
 
-#: ../src/browser.c:3066 ../src/cddb.c:803 ../src/misc.c:1911
+#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1902
 msgid "Filename"
 msgstr "Dateiname"
 
-#: ../src/browser.c:3066 ../src/cddb.c:804 ../src/misc.c:1912
+#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1903
 #: ../src/prefs.c:643
 msgid "Title"
 msgstr "Titel"
 
 #. 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:1904 ../src/prefs.c:644
 msgid "Artist"
 msgstr "Künstler"
 
-#: ../src/browser.c:3067 ../src/misc.c:1914
+#: ../src/browser.c:3103 ../src/misc.c:1905
 msgid "Album Artist"
 msgstr "Künstler de Albums"
 
 #. 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:1906 ../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:1908
 msgid "Year"
 msgstr "Jahr"
 
-#: ../src/browser.c:3068
+#: ../src/browser.c:3104
 msgid "Disc"
 msgstr "Medium"
 
-#: ../src/browser.c:3069 ../src/misc.c:1918
+#: ../src/browser.c:3105 ../src/misc.c:1909
 msgid "Track"
 msgstr "Titel"
 
-#: ../src/browser.c:3069 ../src/cddb.c:810 ../src/misc.c:1919
+#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1910
 #: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Genre"
 
-#: ../src/browser.c:3070 ../src/misc.c:1920 ../src/prefs.c:647
+#: ../src/browser.c:3106 ../src/misc.c:1911 ../src/prefs.c:647
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../src/browser.c:3070 ../src/misc.c:1921 ../src/picture.c:863
+#: ../src/browser.c:3106 ../src/misc.c:1912 ../src/picture.c:1059
 #: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Komponist"
 
-#: ../src/browser.c:3071 ../src/misc.c:1922
+#: ../src/browser.c:3107 ../src/misc.c:1913
 msgid "Original Artist"
 msgstr "Originalkünstler"
 
-#: ../src/browser.c:3072 ../src/misc.c:1923
+#: ../src/browser.c:3108 ../src/misc.c:1914
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../src/browser.c:3072 ../src/misc.c:1924
+#: ../src/browser.c:3108 ../src/misc.c:1915
 msgid "URL"
 msgstr "Adresse"
 
-#: ../src/browser.c:3073 ../src/misc.c:1925
+#: ../src/browser.c:3109 ../src/misc.c:1916
 msgid "Encoded By"
 msgstr "Kodiert mit"
 
-#: ../src/browser.c:3074
+#: ../src/browser.c:3110
 msgid "# Albums"
 msgstr "# Alben"
 
-#: ../src/browser.c:3075 ../src/browser.c:3076
+#: ../src/browser.c:3111 ../src/browser.c:3112
 msgid "# Files"
 msgstr "# Dateien"
 
-#: ../src/browser.c:3101
+#: ../src/browser.c:3137
 msgid "Enter a directory to browse."
 msgstr "Geben Sie den zu durchsuchenden Ordner an."
 
-#: ../src/browser.c:3110
+#: ../src/browser.c:3146
 msgid "Select a directory to browse."
 msgstr "Wählen Sie einen Ordner zum Durchsuchen aus."
 
@@ -837,133 +873,105 @@ msgstr "Wählen Sie einen Ordner zum Durchsuchen aus."
 #. * 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:3468
 msgid "No files"
 msgstr "Keine Dateien"
 
-#: ../src/browser.c:3195
+#: ../src/browser.c:3231
 msgid "Artist & Album"
 msgstr "Künstler und Album"
 
 #. Only directories changed
-#: ../src/browser.c:3559 ../src/easytag.c:2890
+#: ../src/browser.c:3595 ../src/easytag.c:2880
 msgid "Rename Directory"
 msgstr "Ordner umbenennen"
 
-#: ../src/browser.c:3581
+#: ../src/browser.c:3617
 #, c-format
 msgid "Rename the directory '%s' to:"
 msgstr "Ordner »%s« umbenennen in:"
 
-#: ../src/browser.c:3600 ../src/misc.c:1175
+#: ../src/browser.c:3636 ../src/misc.c:1171
 msgid "Use mask:"
 msgstr "Maske verwenden:"
 
-#: ../src/browser.c:3603
+#: ../src/browser.c:3639
 msgid "If activated, it will use masks to rename directory."
-msgstr ""
-"Wenn aktiviert, dann werden Masken zur Umbenennung des Ordners verwendet."
+msgstr "Falls aktiviert, werden Masken zur Umbenennung des Ordners verwendet."
 
-#: ../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 ""
 "Wählen Sie eine Maske aus oder tippen Sie Codes ein (siehe Legende im "
-"Scanner), um den Ordner aus Tag-Feldern umzubenennen."
+"Scanner), um den Ordner aus Metainfo-Feldern umzubenennen."
 
 #. Preview label
-#: ../src/browser.c:3645
+#: ../src/browser.c:3681
 msgid "Rename directory preview"
 msgstr "Vorschau der Ordnerumbenennung"
 
-#: ../src/browser.c:3737
+#: ../src/browser.c:3773
 msgid "You must type a directory name"
 msgstr "Sie müssen einen Ordnernamen eingeben"
 
-#: ../src/browser.c:3738 ../src/browser.c:3759
+#: ../src/browser.c:3774 ../src/browser.c:3795
 msgid "Directory Name Error"
 msgstr "Fehler im Ordnernamen"
 
-#: ../src/browser.c:3756
+#: ../src/browser.c:3792
 #, c-format
 msgid "Could not convert '%s' into filename encoding."
 msgstr "»%s« konnte nicht in die Dateinamenskodierung umgewandelt werden."
 
-#: ../src/browser.c:3758
+#: ../src/browser.c:3794
 msgid "Please use another name"
 msgstr "Bitte verwenden Sie einen anderen Namen"
 
-#: ../src/browser.c:3828
+#: ../src/browser.c:3864
 #, c-format
 msgid "The directory name '%s' already exists"
 msgstr "Der Ordnername »%s« existiert bereits"
 
-#: ../src/browser.c:3829 ../src/easytag.c:2973
+#: ../src/browser.c:3865 ../src/easytag.c:2963
 msgid "Rename File Error"
 msgstr "Fehler beim Umbenennen der Datei"
 
-#: ../src/browser.c:3867 ../src/browser.c:3896
+#: ../src/browser.c:3903 ../src/browser.c:3932
 msgid "Rename Directory Error"
 msgstr "Fehler beim Umbenennen des Ordners"
 
-#: ../src/browser.c:3934
+#: ../src/browser.c:3970
 msgid "Directory renamed"
 msgstr "Ordner umbenannt"
 
-#: ../src/browser.c:3970
+#: ../src/browser.c:4006
 msgid "Browse Directory With"
 msgstr "Ordner durchsuchen mit"
 
-#: ../src/browser.c:3986 ../src/browser.c:4112
+#: ../src/browser.c:4022 ../src/browser.c:4148
 msgid "Program to run:"
 msgstr "Auszuführendes Programm:"
 
-#: ../src/browser.c:3998
+#: ../src/browser.c:4034
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Gib den Namen des Programms an, das gestartet werden soll. Es wird der "
 "aktuelle Ordner als Parameter verwendet."
 
-#: ../src/browser.c:4092
+#: ../src/browser.c:4128
 msgid "Open Files With"
 msgstr "Dateien öffnen mit"
 
-#: ../src/browser.c:4124
+#: ../src/browser.c:4160
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Geben Sie den Namen des Programms an, das gestartet werden soll. Es wird die "
 "aktuelle Datei als Parameter verwendet."
 
-#: ../src/browser.c:4251
-msgid "You must type a program name"
-msgstr "Sie müssen einen Programmnamen angeben"
-
-#: ../src/browser.c:4252 ../src/browser.c:4269
-msgid "Program Name Error"
-msgstr "Fehler im Programmnamen"
-
-#: ../src/browser.c:4267 ../src/misc.c:792
-#, c-format
-msgid "The program '%s' cannot be found"
-msgstr "Das Programm »%s« wurde nicht gefunden"
-
-#: ../src/browser.c:4318 ../src/misc.c:837 ../src/misc.c:884
-#, c-format
-msgid "Cannot execute ‘%s’ (%s)"
-msgstr "»%s« kann nicht ausgeführt werden (%s)"
-
-#: ../src/browser.c:4339
-msgid "Cannot fork another process\n"
-msgstr "Es kann kein weiterer Prozess abgespalten werden\n"
-
-#: ../src/browser.c:4373
-#, c-format
-msgid "Executed command: %s"
-msgstr "Ausgeführter Befehl: »%s«"
-
 #: ../src/cddb.c:313
 msgid "Artist / Album"
 msgstr "Künstler / Album"
@@ -1020,7 +1028,7 @@ msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
 msgstr ""
-"Wenn diese Option aktiviert wird, dann wird der ausgewählte Scanner nach dem "
+"Wenn diese Option aktiviert wird, wird der ausgewählte Scanner nach dem "
 "Laden der Felder gestartet (das Scannerfenster muss offen sein)."
 
 #.
@@ -1054,7 +1062,7 @@ msgstr "Alle Felder"
 
 #. 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:1037 ../src/prefs.c:807
 msgid "Other"
 msgstr "Andere"
 
@@ -1148,7 +1156,7 @@ msgstr "Kategorien"
 msgid "Results:"
 msgstr "Ergebnisse:"
 
-#: ../src/cddb.c:606 ../src/misc.c:1959
+#: ../src/cddb.c:606 ../src/misc.c:1950
 msgid "Search:"
 msgstr "Suche:"
 
@@ -1212,7 +1220,7 @@ msgid "# Tracks"
 msgstr "# Titel"
 
 #. Check box to run the scanner
-#: ../src/cddb.c:847 ../src/misc.c:3000
+#: ../src/cddb.c:847 ../src/misc.c:2991
 msgid "Run the current scanner for each file"
 msgstr "Aktuellen Scanner für alle Dateien ausführen"
 
@@ -1224,7 +1232,7 @@ msgstr "Passende Zeilen mit dem Levenshtein-Algorithmus finden"
 #. 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 "
@@ -1232,11 +1240,11 @@ msgid ""
 "used when selecting the corresponding audio file, or applying CDDB results, "
 "instead of using directly the position order."
 msgstr ""
-"Wenn aktiviert, dann wird der Levenshtein-Algorithmus (DLM : Damerau-"
-"Levenshtein-Metrik) verwendet, um den CDDB-Titel mit jedem Dateinamen im "
-"aktuellen Ordner zu vergleichen und die beste Übereinstimmung auszuwählen. "
-"Dies wird bei der Auswahl der zugehörigen Audiodatei oder der Anwendung der "
-"CDDB-Ergebnisse statt der Benutzung der direkten Reihenfolge durchgeführt."
+"Falls aktiviert, wird der Levenshtein-Algorithmus (DLM : Damerau-Levenshtein-"
+"Metrik) verwendet, um den CDDB-Titel mit jedem Dateinamen im aktuellen "
+"Ordner zu vergleichen und die beste Übereinstimmung auszuwählen. Dies wird "
+"bei der Auswahl der zugehörigen Audiodatei oder der Anwendung der CDDB-"
+"Ergebnisse statt der Benutzung der direkten Reihenfolge durchgeführt."
 
 #: ../src/cddb.c:871
 msgid "Load the selected lines or all lines (if no line selected)."
@@ -1309,7 +1317,7 @@ msgstr "Fehler beim Lesen der CDDB-Abfrage (%s)"
 msgid "Cannot create file '%s' (%s)"
 msgstr "Datei »%s« kann nicht angelegt werden (%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 "Datei »%s« kann nicht geöffnet werden (%s)"
@@ -1438,7 +1446,7 @@ msgstr ""
 
 #: ../src/cddb.c:3962
 msgid "Write Tag from CDDB"
-msgstr "Tag aus CDDB schreiben"
+msgstr "Metainfo aus CDDB schreiben"
 
 #: ../src/charset.c:47
 msgid "Arabic (IBM-864)"
@@ -1644,46 +1652,46 @@ msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Die Zeichenkette »%s« konnte nicht nach UTF-8 konvertiert werden (%s)."
 
 #. Starting messages
-#: ../src/easytag.c:211
+#: ../src/easytag.c:184
 #, c-format
 msgid "Starting EasyTAG version %s (PID: %d)…"
 msgstr "EasyTAG %s wird gestartet (PID: %d) …"
 
-#: ../src/easytag.c:213
+#: ../src/easytag.c:186
 #, c-format
 msgid "Using libid3tag version %s"
 msgstr "Es wird libid3tag Version %s verwendet"
 
-#: ../src/easytag.c:216
+#: ../src/easytag.c:189
 #, c-format
 msgid "Using id3lib version %d.%d.%d"
 msgstr "Es wird id3lib Version %d.%d.%d verwendet"
 
-#: ../src/easytag.c:222
+#: ../src/easytag.c:195
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
 msgstr "Variable EASYTAGLANG definiert. Sprache wird festgelegt: »%s«"
 
-#: ../src/easytag.c:224
+#: ../src/easytag.c:197
 #, c-format
 msgid "Setting locale: '%s'"
 msgstr "Sprache wird festgelegt: »%s«"
 
-#: ../src/easytag.c:229
+#: ../src/easytag.c:202
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')"
 msgstr "Momentan wird die Spracheinstellung »%s« verwendet (letztendlich »%s«)"
 
-#: ../src/easytag.c:236
+#: ../src/easytag.c:209
 msgid "Unable to create setting directories"
 msgstr "Konfigurationsordner können nicht angelegt werden"
 
-#: ../src/easytag.c:453 ../src/et_core.c:583
+#: ../src/easytag.c:426 ../src/et_core.c:597 ../src/et_core.c:609
 #, c-format
 msgid "Error while querying information for file: '%s' (%s)"
 msgstr "Fehler beim Abfragen von Informationen für die Datei: »%s« (%s)"
 
-#: ../src/easytag.c:518
+#: ../src/easytag.c:489
 #, c-format
 msgid "Cannot open path '%s'"
 msgstr "Pfad »%s« kann nicht geöffnet werden"
@@ -1691,11 +1699,11 @@ msgstr "Pfad »%s« kann nicht geöffnet werden"
 #.
 #. * Browser
 #.
-#: ../src/easytag.c:618 ../src/prefs.c:142
+#: ../src/easytag.c:581 ../src/prefs.c:142
 msgid "Browser"
 msgstr "Auswahl"
 
-#: ../src/easytag.c:640 ../src/et_core.c:2727
+#: ../src/easytag.c:603 ../src/et_core.c:2817
 msgid "File"
 msgstr "Datei"
 
@@ -1705,103 +1713,103 @@ msgstr "Datei"
 #. 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:635 ../src/easytag.c:4231 ../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 "Encoder:"
 
-#: ../src/easytag.c:680
+#: ../src/easytag.c:643
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
 #. 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:653
 msgid "Frequency:"
 msgstr "Frequenz:"
 
 #. Mode
-#: ../src/easytag.c:701 ../src/easytag.c:4204 ../src/mpeg_header.c:216
+#: ../src/easytag.c:664 ../src/easytag.c:4235 ../src/mpeg_header.c:216
 msgid "Mode:"
 msgstr "Modus:"
 
-#: ../src/easytag.c:708
+#: ../src/easytag.c:671
 msgid "Size:"
 msgstr "Größe:"
 
-#: ../src/easytag.c:715
+#: ../src/easytag.c:678
 msgid "Duration:"
 msgstr "Dauer:"
 
 #. Main Frame
-#: ../src/easytag.c:762 ../src/et_core.c:2665
+#: ../src/easytag.c:725 ../src/et_core.c:2747
 msgid "Tag"
-msgstr "Tag"
+msgstr "Metainfo"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: ../src/easytag.c:784
+#: ../src/easytag.c:747
 msgid "Common"
 msgstr "Allgemein"
 
 #. Title
-#: ../src/easytag.c:791
+#: ../src/easytag.c:754
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../src/easytag.c:805
+#: ../src/easytag.c:768
 msgid "Tag selected files with this title"
 msgstr "Diesen Titel in allen ausgewählten Dateien eintragen"
 
 #. Artist
-#: ../src/easytag.c:810
+#: ../src/easytag.c:773
 msgid "Artist:"
 msgstr "Künstler:"
 
-#: ../src/easytag.c:824
+#: ../src/easytag.c:787
 msgid "Tag selected files with this artist"
 msgstr "Diesen Künstler in allen ausgewählten Dateien eintragen"
 
 #. Album Artist
-#: ../src/easytag.c:829
+#: ../src/easytag.c:792
 msgid "Album artist:"
 msgstr "Alben-Künstler:"
 
-#: ../src/easytag.c:843
+#: ../src/easytag.c:806
 msgid "Tag selected files with this album artist"
 msgstr "Diesen Alben-Künstler in allen ausgewählten Dateien eintragen"
 
 #. Album
-#: ../src/easytag.c:848
+#: ../src/easytag.c:811
 msgid "Album:"
 msgstr "Album:"
 
-#: ../src/easytag.c:862
+#: ../src/easytag.c:825
 msgid "Tag selected files with this album name"
 msgstr "Diesen Albumnamen in allen ausgewählten Dateien eintragen"
 
 #. Disc Number
-#: ../src/easytag.c:867
+#: ../src/easytag.c:830
 msgid "CD:"
 msgstr "CD:"
 
-#: ../src/easytag.c:884
+#: ../src/easytag.c:847
 msgid "Tag selected files with this disc number"
 msgstr "Diese CD-Nummer in allen ausgewählten Dateien eintragen"
 
 #. Year
-#: ../src/easytag.c:889
+#: ../src/easytag.c:852
 msgid "Year:"
 msgstr "Jahr:"
 
-#: ../src/easytag.c:909
+#: ../src/easytag.c:872
 msgid "Tag selected files with this year"
 msgstr "Dieses Jahr in allen ausgewählten Dateien eintragen"
 
-#: ../src/easytag.c:923
+#: ../src/easytag.c:886
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Alle ausgewählten Titel sequenziell durchnummerieren. Beginnt mit 01 in "
@@ -1809,11 +1817,11 @@ msgstr ""
 
 #. To have enough space to display the icon
 #. To have enough space to display the icon
-#: ../src/easytag.c:932
+#: ../src/easytag.c:895
 msgid "Track #:"
 msgstr "Titel #:"
 
-#: ../src/easytag.c:963
+#: ../src/easytag.c:926
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1821,697 +1829,677 @@ msgstr ""
 "Fügt die Anzahl der Dateien, die in dem gleichen Ordner wie die aktuelle "
 "Datei sind, den ausgewählten Dateien hinzu."
 
-#: ../src/easytag.c:983
+#: ../src/easytag.c:946
 msgid "Tag selected files with this number of tracks"
 msgstr "Diese Gesamtzahl an Titeln in allen ausgewählten Dateien eintragen"
 
 #. Genre
-#: ../src/easytag.c:987
+#: ../src/easytag.c:950
 msgid "Genre:"
 msgstr "Genre:"
 
-#: ../src/easytag.c:1015
+#: ../src/easytag.c:978
 msgid "Tag selected files with this genre"
 msgstr "Dieses Genre in allen ausgewählten Dateien eintragen"
 
 #. Comment
-#: ../src/easytag.c:1020
+#: ../src/easytag.c:983
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../src/easytag.c:1047
+#: ../src/easytag.c:1010
 msgid "Tag selected files with this comment"
 msgstr "Diesen Kommentar in allen ausgewählten Dateien eintragen"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. Composer (name of the composers)
-#: ../src/easytag.c:1054
+#: ../src/easytag.c:1017
 msgid "Composer:"
-msgstr "Komponist"
+msgstr "Komponist:"
 
-#: ../src/easytag.c:1068
+#: ../src/easytag.c:1031
 msgid "Tag selected files with this composer"
 msgstr "Diesen Komponisten in allen ausgewählten Dateien eintragen"
 
 #. 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:1038
 msgid "Orig. artist:"
 msgstr "Originalkünstler:"
 
-#: ../src/easytag.c:1089
+#: ../src/easytag.c:1052
 msgid "Tag selected files with this original artist"
 msgstr "Diesen Originalkünstler in allen ausgewählten Dateien eintragen"
 
 #. Copyright
-#: ../src/easytag.c:1095
+#: ../src/easytag.c:1058
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../src/easytag.c:1109
+#: ../src/easytag.c:1072
 msgid "Tag selected files with this copyright"
 msgstr "Dieses Copyright in allen ausgewählten Dateien eintragen"
 
 #. URL
-#: ../src/easytag.c:1115
+#: ../src/easytag.c:1078
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/easytag.c:1129
+#: ../src/easytag.c:1092
 msgid "Tag selected files with this URL"
 msgstr "Diese URL in allen ausgewählten Dateien eintragen"
 
 #. Encoded by
-#: ../src/easytag.c:1135
+#: ../src/easytag.c:1098
 msgid "Encoded by:"
 msgstr "Kodierer:"
 
-#: ../src/easytag.c:1149
+#: ../src/easytag.c:1112
 msgid "Tag selected files with this encoder name"
 msgstr "Diesen Kodierer in allen ausgewählten Dateien eintragen"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1183 ../src/et_core.c:3100 ../src/et_core.c:3103
+#: ../src/easytag.c:1146 ../src/et_core.c:3189 ../src/et_core.c:3192
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/easytag.c:1207
+#: ../src/easytag.c:1170
 msgid "You can use drag and drop to add an image"
 msgstr "Sie können Bilder durch Ziehen und Ablegen hinzufügen"
 
-#: ../src/easytag.c:1254
+#: ../src/easytag.c:1217
 msgid "Add images to the tag"
-msgstr "Bilder dem Tag hinzufügen"
+msgstr "Bilder der Metainfo hinzufügen"
 
-#: ../src/easytag.c:1272
+#: ../src/easytag.c:1235
 msgid "Remove selected images from the tag"
-msgstr "Die gewählten Bilder aus dem Tag entfernen"
+msgstr "Die gewählten Bilder aus der Metainfo entfernen"
 
-#: ../src/easytag.c:1286
+#: ../src/easytag.c:1249
 msgid "Save the selected images to files"
 msgstr "Ausgewählte Bilder als Dateien speichern"
 
-#: ../src/easytag.c:1297
+#: ../src/easytag.c:1260
 msgid "Edit image properties"
 msgstr "Bildeigenschaften bearbeiten"
 
-#: ../src/easytag.c:1311
+#: ../src/easytag.c:1274
 msgid "Tag selected files with these images"
 msgstr "Diese Bilder in allen ausgewählten Dateien eintragen"
 
-#: ../src/easytag.c:1369
+#: ../src/easytag.c:1332
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "In allen ausgewählten Dateien wurde der Titel »%s« eingetragen."
 
-#: ../src/easytag.c:1371
+#: ../src/easytag.c:1334
 msgid "Removed title from selected files."
 msgstr "Dieser Titel wurde aus allen ausgewählten Dateien entfernt."
 
-#: ../src/easytag.c:1386
+#: ../src/easytag.c:1349
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Künstler »%s« wurde in allen ausgewählten Dateien eingetragen."
 
-#: ../src/easytag.c:1388
+#: ../src/easytag.c:1351
 msgid "Removed artist from selected files."
 msgstr "Künstler wurde(n) aus allen ausgewählten Dateien entfernt."
 
-#: ../src/easytag.c:1402
+#: ../src/easytag.c:1365
 #, c-format
 msgid "Selected files tagged with album artist '%s'."
 msgstr "Künstler »%s« wurde in allen ausgewählten Dateien eingetragen."
 
-#: ../src/easytag.c:1404
+#: ../src/easytag.c:1367
 msgid "Removed album artist from selected files."
 msgstr "Alben-Künstler wurde aus allen ausgewählten Dateien entfernt."
 
-#: ../src/easytag.c:1419
+#: ../src/easytag.c:1382
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Album »%s« wurde in allen ausgewählten Dateien eingetragen."
 
-#: ../src/easytag.c:1421
+#: ../src/easytag.c:1384
 msgid "Removed album name from selected files."
 msgstr "Albumname wurde aus allen ausgewählten Dateien entfernt."
 
-#: ../src/easytag.c:1458
+#: ../src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with disc number '%s/%s'."
 msgstr "CD-Nummer »%s/%s« wurde in allen ausgewählten Dateien eingetragen."
 
-#: ../src/easytag.c:1463
+#: ../src/easytag.c:1426
 #, c-format
 msgid "Selected files tagged with disc number like 'xx'."
 msgstr "CD-Nummer »xx« wurde in allen ausgewählten Dateien eingetragen."
 
-#: ../src/easytag.c:1468
+#: ../src/easytag.c:1431
 msgid "Removed disc number from selected files."
 msgstr "CD-Nummer aus allen ausgewählten Dateien entfernt."
 
-#: ../src/easytag.c:1484
+#: ../src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Jahr »%s« wurde in allen ausgewählten Dateien eingetragen."
 
-#: ../src/easytag.c:1486
+#: ../src/easytag.c:1449
 msgid "Removed year from selected files."
 msgstr "Jahr wurde aus allen ausgewählten Dateien entfernt."
 
-#: ../src/easytag.c:1512 ../src/easytag.c:1602
+#: ../src/easytag.c:1475 ../src/easytag.c:1566
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr ""
 "In allen ausgewählten Dateien wurden Titelnummern wie »xx/%s« eingetragen."
 
-#: ../src/easytag.c:1515
+#: ../src/easytag.c:1478
 #, c-format
 msgid "Selected files tagged with track like 'xx'."
 msgstr ""
 "In allen ausgewählten Dateien wurden Titelnummern wie »xx« eingetragen."
 
-#: ../src/easytag.c:1519 ../src/easytag.c:1605
+#: ../src/easytag.c:1482 ../src/easytag.c:1569
 msgid "Removed track number from selected files."
 msgstr "Titelnummer aus allen ausgewählten Dateien entfernt."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1575
+#: ../src/easytag.c:1539
 #, c-format
 msgid "Selected tracks numbered sequentially."
 msgstr "Alle ausgewählten Titel wurden durchnummeriert."
 
-#: ../src/easytag.c:1621
+#: ../src/easytag.c:1585
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Genre »%s« wurde in allen ausgewählten Dateien eingetragen."
 
-#: ../src/easytag.c:1623
+#: ../src/easytag.c:1587
 msgid "Removed genre from selected files."
 msgstr "Genre wurde aus allen ausgewählten Dateien entfernt."
 
-#: ../src/easytag.c:1645
+#: ../src/easytag.c:1609
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Kommentar »%s« wurde in allen ausgewählten Dateien eingetragen."
 
-#: ../src/easytag.c:1647
+#: ../src/easytag.c:1611
 msgid "Removed comment from selected files."
 msgstr "Kommentar wurde aus allen ausgewählten Dateien entfernt."
 
-#: ../src/easytag.c:1661
+#: ../src/easytag.c:1625
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Komponist »%s« wurde in allen ausgewählten Dateien eingetragen."
 
-#: ../src/easytag.c:1663
+#: ../src/easytag.c:1627
 msgid "Removed composer from selected files."
 msgstr "Komponist wurde aus allen ausgewählten Dateien entfernt."
 
-#: ../src/easytag.c:1678
+#: ../src/easytag.c:1642
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Originalkünstler »%s« wurde in allen ausgewählten Dateien eingetragen."
 
-#: ../src/easytag.c:1680
+#: ../src/easytag.c:1644
 msgid "Removed original artist from selected files."
 msgstr "Originalkünstler wurde aus allen ausgewählten Dateien entfernt."
 
-#: ../src/easytag.c:1695
+#: ../src/easytag.c:1659
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Copyright »%s« wurde in allen ausgewählten Dateien eingetragen."
 
-#: ../src/easytag.c:1697
+#: ../src/easytag.c:1661
 msgid "Removed copyright from selected files."
 msgstr "Copyright wurde aus allen ausgewählten Dateien entfernt."
 
-#: ../src/easytag.c:1712
+#: ../src/easytag.c:1676
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "URL »%s« wurde in allen ausgewählten Dateien eingetragen."
 
-#: ../src/easytag.c:1714
+#: ../src/easytag.c:1678
 msgid "Removed URL from selected files."
 msgstr "URL wurde aus allen ausgewählten Dateien entfernt."
 
-#: ../src/easytag.c:1729
+#: ../src/easytag.c:1693
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Kodierer »%s« wurde in allen ausgewählten Dateien eingetragen."
 
-#: ../src/easytag.c:1731
+#: ../src/easytag.c:1695
 msgid "Removed encoder name from selected files."
 msgstr "Kodierer wurde aus allen ausgewählten Dateien entfernt."
 
-#: ../src/easytag.c:1763
+#: ../src/easytag.c:1727
 msgid "Selected files tagged with images."
 msgstr "In allen ausgewählten Dateien wurden die Bilder eingetragen."
 
-#: ../src/easytag.c:1765
+#: ../src/easytag.c:1729
 msgid "Removed images from selected files."
 msgstr "Bilder wurden aus ausgewählten Dateien entfernt."
 
-#: ../src/easytag.c:2046
+#: ../src/easytag.c:2010
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Wählen Sie Modus und Maske und wiederholen Sie die Aktion"
 
-#: ../src/easytag.c:2098
+#: ../src/easytag.c:2062
 msgid "All tags have been scanned"
-msgstr "Alle Tags wurden durchsucht"
+msgstr "Alle Metainformationen wurden durchsucht"
 
-#: ../src/easytag.c:2154
+#: ../src/easytag.c:2118
 msgid "All tags have been removed"
-msgstr "Alle Tags wurden entfernt"
+msgstr "Alle Metainformationen wurden entfernt"
 
-#: ../src/easytag.c:2444
+#: ../src/easytag.c:2423
 #, c-format
 msgid "A file was changed by an external program"
 msgid_plural "%d files were changed by an external program."
 msgstr[0] "Eine Datei wurde von einem externen Programm geändert"
 msgstr[1] "%d Dateien wurden von einem externen Programm geändert"
 
-#: ../src/easytag.c:2449
+#: ../src/easytag.c:2428
 msgid "Do you want to continue saving the file?"
 msgstr "Wollen Sie die Datei speichern?"
 
-#: ../src/easytag.c:2504 ../src/easytag.c:2524
+#: ../src/easytag.c:2486 ../src/easytag.c:2506
 msgid "Saving files was stopped"
 msgstr "Speichern der Dateien wurde gestoppt"
 
-#: ../src/easytag.c:2526
+#: ../src/easytag.c:2508
 msgid "All files have been saved"
 msgstr "Alle Dateien wurden gespeichert"
 
-#: ../src/easytag.c:2657
+#: ../src/easytag.c:2643
 #, c-format
 msgid "Cannot delete file (%s)"
 msgstr "Datei kann nicht gelöscht werden (%s)"
 
-#: ../src/easytag.c:2677
+#: ../src/easytag.c:2664
 msgid "Files have been partially deleted"
 msgstr "Dateien wurden teilweise gelöscht"
 
-#: ../src/easytag.c:2679
+#: ../src/easytag.c:2666
 msgid "All files have been deleted"
 msgstr "Alle Dateien wurden gelöscht"
 
-#: ../src/easytag.c:2795
+#: ../src/easytag.c:2782
 #, c-format
 msgid "Do you want to write the tag of file '%s'?"
-msgstr "Wollen Sie den Tag der Datei »%s« schreiben?"
+msgstr "Wollen Sie die Metainfo der Datei »%s« schreiben?"
 
-#: ../src/easytag.c:2797
+#: ../src/easytag.c:2784
 msgid "Confirm Tag Writing"
-msgstr "Schreiben von Tags bestätigen"
+msgstr "Schreiben von Metainformationen bestätigen"
 
-#: ../src/easytag.c:2802 ../src/easytag.c:2919 ../src/easytag.c:3179
+#: ../src/easytag.c:2789 ../src/easytag.c:2909 ../src/easytag.c:3172
 msgid "Repeat action for the remaining files"
 msgstr "Aktion für die übrigen Dateien wiederholen"
 
 #. Directories and filename changed
-#: ../src/easytag.c:2883 ../src/scan.c:181
+#: ../src/easytag.c:2873 ../src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Datei und Ordner umbenennen"
 
-#: ../src/easytag.c:2884
+#: ../src/easytag.c:2874
 msgid "File and directory rename confirmation required"
 msgstr "Bestätigung zum Umbenennen von Dateien und Ordnern ist erforderlich"
 
-#: ../src/easytag.c:2885
+#: ../src/easytag.c:2875
 #, c-format
 msgid "Do you want to rename the file and directory '%s' to '%s'?"
 msgstr "Wollen Sie die Dateien und den Ordner »%s« in »%s« umbenennen?"
 
-#: ../src/easytag.c:2891
+#: ../src/easytag.c:2881
 msgid "Directory rename confirmation required"
 msgstr "Bestätigung zum Umbenennen von Ordnern ist erforderlich"
 
-#: ../src/easytag.c:2892
+#: ../src/easytag.c:2882
 #, c-format
 msgid "Do you want to rename the directory '%s' to '%s'?"
 msgstr "Wollen Sie den Ordner »%s« in »%s« umbenennen?"
 
 #. Only filename changed
-#: ../src/easytag.c:2898
+#: ../src/easytag.c:2888
 msgid "Rename File"
 msgstr "Datei umbenennen"
 
-#: ../src/easytag.c:2899
+#: ../src/easytag.c:2889
 msgid "File rename confirmation required"
 msgstr "Bestätigung zur Dateiumbenennung ist erforderlich"
 
-#: ../src/easytag.c:2900
+#: ../src/easytag.c:2890
 #, c-format
 msgid "Do you want to rename the file '%s' to '%s'?"
 msgstr "Wollen Sie die Datei »%s« in »%s« umbenennen?"
 
-#: ../src/easytag.c:2966
+#: ../src/easytag.c:2956
 #, c-format
 msgid "Cannot rename file '%s' to '%s'"
 msgstr "Datei »%s« kann nicht in »%s« umbenannt werden"
 
-#: ../src/easytag.c:2980
+#: ../src/easytag.c:2970
 #, c-format
 msgid "Cannot rename file '%s' to '%s': %s"
 msgstr "Datei »%s« kann nicht in »%s« umbenannt werden: %s"
 
-#: ../src/easytag.c:2984
+#: ../src/easytag.c:2974
 msgid "File(s) not renamed"
 msgstr "Datei(en) nicht umbenannt"
 
-#: ../src/easytag.c:3093
+#: ../src/easytag.c:3086
 #, c-format
 msgid "Writing tag of '%s'"
-msgstr "Tag von »%s« wird geschrieben"
+msgstr "Metainfo von »%s« wird geschrieben"
 
-#: ../src/easytag.c:3100
+#: ../src/easytag.c:3093
 msgid "Tag(s) written"
-msgstr "Tag(s) wurden geschrieben"
+msgstr "Metainfo wurde geschrieben"
 
-#: ../src/easytag.c:3115
+#: ../src/easytag.c:3108
 #, c-format
 msgid "Cannot write tag in file '%s' (%s)"
-msgstr "Tag kann nicht in Datei »%s« geschrieben werden (%s)"
+msgstr "Metainfo kann nicht in Datei »%s« geschrieben werden (%s)"
 
-#: ../src/easytag.c:3128
+#: ../src/easytag.c:3121
 #, c-format
 msgid "Cannot write tag in file '%s'"
-msgstr "Tag kann nicht in Datei »%s« geschrieben werden"
+msgstr "Metainfo kann nicht in Datei »%s« geschrieben werden"
 
-#: ../src/easytag.c:3131
+#: ../src/easytag.c:3124
 msgid "Tag Write Error"
-msgstr "Fehler beim Schreiben des Tags"
+msgstr "Fehler beim Schreiben der Metainfo"
 
-#: ../src/easytag.c:3176 ../src/easytag.c:3190
+#: ../src/easytag.c:3169 ../src/easytag.c:3183
 #, c-format
 msgid "Do you really want to delete the file '%s'?"
 msgstr "Wollen Sie die Datei »%s« wirklich löschen?"
 
-#: ../src/easytag.c:3182 ../src/easytag.c:3192
+#: ../src/easytag.c:3175 ../src/easytag.c:3185
 msgid "Delete File"
 msgstr "Datei löschen"
 
-#: ../src/easytag.c:3217
+#: ../src/easytag.c:3210
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Datei »%s« gelöscht"
 
-#: ../src/easytag.c:3349
+#: ../src/easytag.c:3345
 #, c-format
 msgid "Cannot read directory '%s'"
 msgstr "Der Ordner »%s« kann nicht gelesen werden"
 
-#: ../src/easytag.c:3353
+#: ../src/easytag.c:3349
 msgid "Directory Read Error"
 msgstr "Ordner-Lesefehler"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3374
+#: ../src/easytag.c:3370
 #, c-format
 msgid "Search in progress…"
 msgstr "Suche läuft …"
 
-#: ../src/easytag.c:3397 ../src/et_core.c:2734
+#: ../src/easytag.c:3393 ../src/et_core.c:2824
 #, c-format
 msgid "File: '%s'"
 msgstr "Datei: »%s«"
 
-#: ../src/easytag.c:3447
+#: ../src/easytag.c:3443
 #, c-format
 msgid "Found one file in this directory and subdirectories"
 msgid_plural "Found %d files in this directory and subdirectories"
 msgstr[0] "Eine Datei wurde in diesem Ordner und Unterordnern gefunden"
 msgstr[1] "%d Dateien wurden in diesem Ordner und Unterordnern gefunden"
 
-#: ../src/easytag.c:3454
+#: ../src/easytag.c:3450
 #, c-format
 msgid "Found one file in this directory"
 msgid_plural "Found %d files in this directory"
 msgstr[0] "Eine Datei wurde in diesem Ordner gefunden"
 msgstr[1] "%d Dateien wurde in diesem Ordner gefunden"
 
-#: ../src/easytag.c:3476
+#: ../src/easytag.c:3472
 msgid "No file found in this directory and subdirectories"
 msgstr "Keine Datei in diesem Ordner oder Unterordnern gefunden"
 
-#: ../src/easytag.c:3478
+#: ../src/easytag.c:3474
 msgid "No file found in this directory"
 msgstr "Keine Datei in diesem Ordner gefunden"
 
-#: ../src/easytag.c:3546
+#: ../src/easytag.c:3542
 #, c-format
 msgid "Error opening directory '%s' (%s)"
 msgstr "Fehler beim Öffnen des Ordners »%s« (%s)"
 
-#: ../src/easytag.c:3582
+#: ../src/easytag.c:3578
 #, c-format
 msgid "Cannot read directory (%s)"
 msgstr "Der Ordner kann nicht gelesen werden (%s)"
 
-#: ../src/easytag.c:3602
+#: ../src/easytag.c:3598
 msgid "Searching for audio files…"
 msgstr "Suche nach Audio-Dateien läuft …"
 
-#: ../src/easytag.c:3603
+#: ../src/easytag.c:3599
 msgid "Searching"
 msgstr "Suche läuft …"
 
-#: ../src/easytag.c:4234
+#: ../src/easytag.c:4265
 msgid "Select a directory to browse"
 msgstr "Wählen Sie einen Ordner zum Durchsuchen aus"
 
 #. Menu items
-#: ../src/easytag.c:4381
+#: ../src/easytag.c:4412
 msgid "Tag selected files with this field"
 msgstr "Dieses Feld in allen ausgewählten Dateien eintragen"
 
-#: ../src/easytag.c:4393 ../src/scan.c:2662
+#: ../src/easytag.c:4424 ../src/scan.c:2318
 msgid "Convert '_' and '%20' to spaces"
 msgstr "»_« und »%20« in Leerzeichen umwandeln"
 
-#: ../src/easytag.c:4400 ../src/scan.c:2664
+#: ../src/easytag.c:4431 ../src/scan.c:2320
 msgid "Convert ' ' to '_'"
 msgstr "» « in »_« umwandeln"
 
-#: ../src/easytag.c:4411
+#: ../src/easytag.c:4442
 msgid "All uppercase"
 msgstr "Alles groß schreiben"
 
-#: ../src/easytag.c:4418
+#: ../src/easytag.c:4449
 msgid "All lowercase"
 msgstr "Alles klein schreiben"
 
-#: ../src/easytag.c:4425
+#: ../src/easytag.c:4456
 msgid "First letter uppercase"
 msgstr "Ersten Buchstaben groß schreiben"
 
-#: ../src/easytag.c:4432
+#: ../src/easytag.c:4463
 msgid "First letter uppercase of each word"
 msgstr "Der erste Buchstabe jedes Wortes wird groß geschrieben"
 
-#: ../src/easytag.c:4443 ../src/prefs.c:1023 ../src/scan.c:2762
+#: ../src/easytag.c:4474 ../src/prefs.c:1023 ../src/scan.c:2418
 msgid "Remove spaces"
 msgstr "Leerzeichen entfernen"
 
-#: ../src/easytag.c:4450
+#: ../src/easytag.c:4481
 msgid "Insert space before uppercase letter"
 msgstr "Vor Großbuchstaben ein Leerzeichen einfügen"
 
-#: ../src/easytag.c:4457
+#: ../src/easytag.c:4488
 msgid "Remove duplicate spaces or underscores"
 msgstr "Doppelte Leerzeichen oder Unterstriche entfernen"
 
-#: ../src/easytag.c:4464
+#: ../src/easytag.c:4495
 msgid "Remove all text"
 msgstr "Allen Text entfernen"
 
-#. gchar commmand[256];
-#: ../src/easytag.c:4487
-#, c-format
-msgid "EasyTAG version %s: Abnormal exit (PID: %d)"
-msgstr "EasyTAG Version %s: Fehlerhaft beendet (PID: %d)"
-
-#: ../src/easytag.c:4488 ../src/easytag.c:4499
-#, c-format
-msgid "Received signal '%s' (%d)"
-msgstr "Signal »%s« (%d) wurde empfangen"
-
-#: ../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 ""
-"Sie haben vermutlich einen Fehler in EasyTAG gefunden. Senden Sie bitte "
-"einen Fehlerbericht mit einem GDB-Backtrace (»gdb easytag core«, dann »bt« "
-"und »l«) und Informationen zum Reproduzieren des Fehlers an: %s"
-
-#. To send messages to the console...
-#: ../src/easytag.c:4497
-#, c-format
-msgid "EasyTAG version %s: Abnormal exit (PID: %d)."
-msgstr "EasyTAG Version %s: Fehlerhaft beendet (PID: %d)."
-
-#: ../src/easytag.c:4521
+#: ../src/easytag.c:4514
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normal beendet."
 
-#: ../src/easytag.c:4573
+#: ../src/easytag.c:4566
 msgid "Do you want to save them before quitting?"
 msgstr "Wollen Sie diese vor dem Beenden speichern?"
 
-#: ../src/easytag.c:4596
+#: ../src/easytag.c:4593
 msgid "Do you really want to quit?"
 msgstr "Möchten Sie das Programm wirklich beenden?"
 
-#: ../src/et_core.c:505
+#: ../src/et_core.c:510
 #, c-format
 msgid "Error reading tag from ogg file (%s)"
-msgstr "Fehler beim Lesen des Tags der ogg-Datei (%s)"
+msgstr "Fehler beim Lesen der Metainfo der ogg-Datei (%s)"
+
+#: ../src/et_core.c:539
+#, c-format
+msgid "Error reading tag from Opus file (%s)"
+msgstr "Fehler beim Lesen der Metainfo der Opus-Datei (%s)"
 
-#: ../src/et_core.c:639
+#: ../src/et_core.c:682
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr "Automatische Korrekturen wurden für die Datei »%s« angewendet."
 
-#: ../src/et_core.c:2631
+#: ../src/et_core.c:2707
 msgid "ID3 Tag"
-msgstr "ID3-Tag"
+msgstr "ID3-Metainfo"
 
-#: ../src/et_core.c:2637
+#: ../src/et_core.c:2713
 msgid "Ogg Vorbis Tag"
-msgstr "Ogg-Vorbis-Tag"
+msgstr "Ogg-Vorbis-Metainfo"
 
-#: ../src/et_core.c:2643
+#: ../src/et_core.c:2719
 msgid "FLAC Vorbis Tag"
-msgstr "FLAC-Vorbis-Tag"
+msgstr "FLAC-Vorbis-Metainfo"
 
-#: ../src/et_core.c:2648
+#: ../src/et_core.c:2724
 msgid "APE Tag"
-msgstr "APE-Tag"
+msgstr "APE-Metainfo"
 
-#: ../src/et_core.c:2653
+#: ../src/et_core.c:2729
 msgid "MP4/M4A/AAC Tag"
-msgstr "MP4/M4A/AAC-Tag"
+msgstr "MP4/M4A/AAC-Metainfo"
 
-#: ../src/et_core.c:2659
+#: ../src/et_core.c:2735
 msgid "Wavpack Tag"
-msgstr "Wavpack-Tag"
+msgstr "Wavpack-Metainfo"
+
+#: ../src/et_core.c:2741
+msgid "Opus Tag"
+msgstr "Opus-Metainfo"
 
-#: ../src/et_core.c:2679
+#: ../src/et_core.c:2761
 msgid "MP3 File"
 msgstr "MP3-Datei"
 
-#: ../src/et_core.c:2683
+#: ../src/et_core.c:2765
 msgid "MP2 File"
 msgstr "MP2-Datei"
 
-#: ../src/et_core.c:2689
+#: ../src/et_core.c:2771
 msgid "Ogg Vorbis File"
 msgstr "Ogg-Vorbis-Datei"
 
-#: ../src/et_core.c:2695
+#: ../src/et_core.c:2777
 msgid "Speex File"
 msgstr "Speex-Datei"
 
-#: ../src/et_core.c:2701
+#: ../src/et_core.c:2783
 msgid "FLAC File"
 msgstr "FLAC-Datei"
 
-#: ../src/et_core.c:2706
+#: ../src/et_core.c:2788
 msgid "MusePack File"
 msgstr "MusePack-Datei"
 
-#: ../src/et_core.c:2710
+#: ../src/et_core.c:2792
 msgid "Monkey's Audio File"
 msgstr "Monkey's-Audio-Datei"
 
-#: ../src/et_core.c:2715
+#: ../src/et_core.c:2797
 msgid "MP4/AAC File"
 msgstr "MP4/AAC-Datei"
 
-#: ../src/et_core.c:2721
+#: ../src/et_core.c:2803
 msgid "Wavpack File"
 msgstr "Wavpack-Datei"
 
-#: ../src/et_core.c:2778 ../src/et_core.c:2833
+#: ../src/et_core.c:2809
+msgid "Opus File"
+msgstr "Opus-Datei"
+
+#: ../src/et_core.c:2868 ../src/et_core.c:2923
 msgid "File not found"
 msgstr "Datei nicht gefunden"
 
-#: ../src/et_core.c:2783
+#: ../src/et_core.c:2873
 #, c-format
 msgid "Cannot query file information (%s)"
 msgstr "Dateiinformation kann nicht abgefragt werden (%s)"
 
-#: ../src/et_core.c:2817
+#: ../src/et_core.c:2907
 msgid "Read-only file"
 msgstr "Datei ist nur lesbar"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2881
+#: ../src/et_core.c:2971
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
 msgstr[0] "Eine Datei"
 msgstr[1] "%u Dateien"
 
-#: ../src/et_core.c:3086
+#: ../src/et_core.c:3175
 #, c-format
 msgid "Images (%d)"
 msgstr "Bilder (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3128 ../src/flac_header.c:205
+#: ../src/et_core.c:3217 ../src/flac_header.c:205
 #: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
 #: ../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/et_core.c:3222 ../src/flac_header.c:210
 #: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
 #: ../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:3368 ../src/scan.c:686
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding"
 msgstr ""
 "Dateiname »%s« konnte nicht in die Dateinamenskodierung des Systems "
 "konvertiert werden."
 
-#: ../src/et_core.c:3278
+#: ../src/et_core.c:3370
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Versuchen Sie, die Umgebungsvariable G_FILENAME_ENCODING festzulegen."
 
-#: ../src/et_core.c:3279 ../src/scan.c:692
+#: ../src/et_core.c:3371 ../src/scan.c:688
 msgid "Filename translation"
 msgstr "Dateinamensübersetzung"
 
-#: ../src/et_core.c:3940
-#, c-format
-msgid "Cannot change the permissions of file '%s' (%s)"
-msgstr "Die Zugriffsrechte der Datei »%s« können nicht geändert werden (%s)"
-
-#: ../src/et_core.c:3978
+#: ../src/et_core.c:4076
 #, c-format
 msgid "Error writing tag type %d to file %s (%s)"
-msgstr "Fehler beim Schreiben von Tag-Typ %d in die Datei »%s« (%s)"
+msgstr "Fehler beim Schreiben von Metainfo-Typ %d in die Datei »%s« (%s)"
 
 #. Mode
 #. 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/opus_header.c:237 ../src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Kanäle:"
 
@@ -2520,14 +2508,14 @@ msgstr "Kanäle:"
 msgid "Error while opening file: '%s' as FLAC (%s)."
 msgstr "Fehler beim Öffnen der Datei: »%s« als 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 "
 "be lost while saving tag."
 msgstr ""
 "Der Jahreswert »%s« scheint für die Datei »%s« ungültig zu sein. Diese "
-"Information wird beim Speichern des Tags verloren gehen."
+"Information wird beim Speichern der Metainfo verloren gehen."
 
 #: ../src/flac_tag.c:1061
 #, c-format
@@ -2540,10 +2528,10 @@ msgid "Error: Failed to write comments to file '%s' (%s)."
 msgstr ""
 "Fehler: Kommentare können nicht in Datei geschrieben werden: »%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 "Tag von »%s« wurde geschrieben"
+msgstr "Metainfo von »%s« wurde geschrieben"
 
 #: ../src/id3_tag.c:158
 #, c-format
@@ -2563,35 +2551,35 @@ msgstr ""
 msgid "Corrupted file"
 msgstr "Beschädigte Datei"
 
-#: ../src/id3_tag.c:540
+#: ../src/id3_tag.c:555
 #, c-format
 msgid "Removed tag of '%s'"
-msgstr "Tag von »%s« wurde entfernt"
+msgstr "Metainfo von »%s« wurde entfernt"
 
-#: ../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 "Fehler beim Entfernen des ID3v1-Tags von »%s« (%s)"
+msgstr "Fehler beim Entfernen der ID3v1-Metainfo von »%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 "Fehler beim Entfernen des ID3v2-Tags von »%s« (%s)"
+msgstr "Fehler beim Entfernen der ID3v2-Metainfo von »%s« (%s)"
 
-#: ../src/id3_tag.c:565
+#: ../src/id3_tag.c:580
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
-msgstr "Fehler beim Aktualisieren des ID3v2-Tags von »%s« (%s)"
+msgstr "Fehler beim Aktualisieren der ID3v2-Metainfo von »%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 ""
-"Sie haben versucht, dieses Tag als Unicode zu speichern, aber Ihre Version "
-"von id3lib ist fehlerhaft."
+"Sie haben versucht, diese Metainfo als Unicode zu speichern, aber Ihre "
+"Version von id3lib ist fehlerhaft."
 
-#: ../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 "
@@ -2611,90 +2599,90 @@ msgstr ""
 "\n"
 "Datei : %s"
 
-#: ../src/id3_tag.c:602
+#: ../src/id3_tag.c:617
 msgid "Buggy id3lib"
 msgstr "Fehlerhafte id3lib"
 
-#: ../src/id3_tag.c:636
+#: ../src/id3_tag.c:651
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
-msgstr "Fehler beim Aktualisieren des ID3v1-Tags von »%s« (%s)"
+msgstr "Fehler beim Aktualisieren der ID3v1-Metainfo von »%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 "Tag von »%s« wurde aktualisiert"
+msgstr "Metainfo von »%s« wurde aktualisiert"
 
-#: ../src/id3_tag.c:669
+#: ../src/id3_tag.c:684
 msgid "No error reported"
 msgstr "Kein Fehler gemeldet"
 
-#: ../src/id3_tag.c:671
+#: ../src/id3_tag.c:686
 msgid "No available memory"
 msgstr "Kein Speicher verfügbar"
 
-#: ../src/id3_tag.c:673
+#: ../src/id3_tag.c:688
 msgid "No data to parse"
 msgstr "Keine Daten zu analysieren"
 
-#: ../src/id3_tag.c:675
+#: ../src/id3_tag.c:690
 msgid "Improperly formatted data"
 msgstr "Ungeeignet formatierte Daten"
 
-#: ../src/id3_tag.c:677
+#: ../src/id3_tag.c:692
 msgid "No buffer to write to"
 msgstr "Kein Schreibpuffer vorhanden"
 
-#: ../src/id3_tag.c:679
+#: ../src/id3_tag.c:694
 msgid "Buffer is too small"
 msgstr "Puffer zu klein"
 
-#: ../src/id3_tag.c:681
+#: ../src/id3_tag.c:696
 msgid "Invalid frame ID"
 msgstr "Ungültige Frame-ID"
 
-#: ../src/id3_tag.c:683
+#: ../src/id3_tag.c:698
 msgid "Requested field not found"
 msgstr "Angefordertes Feld nicht gefunden"
 
-#: ../src/id3_tag.c:685
+#: ../src/id3_tag.c:700
 msgid "Unknown field type"
 msgstr "Unbekannter Feldtyp"
 
-#: ../src/id3_tag.c:687
+#: ../src/id3_tag.c:702
 msgid "Tag is already attached to a file"
-msgstr "Tag hängt bereits an einer Datei"
+msgstr "Metainfo ist bereits an eine Datei angefügt"
 
-#: ../src/id3_tag.c:689
+#: ../src/id3_tag.c:704
 msgid "Invalid tag version"
-msgstr "Ungültige Tag-Version"
+msgstr "Ungültige Metainfo-Version"
 
-#: ../src/id3_tag.c:691
+#: ../src/id3_tag.c:706
 msgid "No file to parse"
 msgstr "Keine Datei zu analysieren"
 
-#: ../src/id3_tag.c:693
+#: ../src/id3_tag.c:708
 msgid "Attempting to write to a read-only file"
 msgstr "Versuch, in eine nur lesbare Datei zu schreiben"
 
-#: ../src/id3_tag.c:695
+#: ../src/id3_tag.c:710
 msgid "Error in compression/uncompression"
 msgstr "Fehler beim Komprimieren/Dekomprimieren"
 
-#: ../src/id3_tag.c:697
+#: ../src/id3_tag.c:712
 msgid "Unknown error message"
 msgstr "Unbekannte Fehlermeldung"
 
-#: ../src/id3_tag.c:1301
+#: ../src/id3_tag.c:1316
 #, c-format
 msgid "Error while creating temporary file: '%s'"
 msgstr "Fehler beim Erstellen der temporären Datei: »%s«"
 
-#: ../src/id3_tag.c:1308
+#: ../src/id3_tag.c:1323
 msgid "Error while creating temporary file"
 msgstr "Fehler beim Erstellen der temporären Datei"
 
-#: ../src/id3_tag.c:1328
+#: ../src/id3_tag.c:1343
 #, c-format
 msgid "Error while writing to file: '%s' (%s)"
 msgstr "Fehler beim Schreiben in die Datei: »%s« (%s)"
@@ -2704,124 +2692,108 @@ msgstr "Fehler beim Schreiben in die Datei: »%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)"
 msgstr[0] ""
-"»Tag« der Datei »%s« konnte nicht geschrieben werden (ein Byte fehlte)"
+"Metainfo der Datei »%s« konnte nicht geschrieben werden (ein Byte fehlte)"
 msgstr[1] ""
-"»Tag« der Datei »%s« konnte nicht geschrieben werden (%s Bytes fehlten)"
+"Metainfo der Datei »%s« konnte nicht geschrieben werden (%s Bytes fehlten)"
 
-#: ../src/id3v24_tag.c:1525
+#: ../src/id3v24_tag.c:1524
 #, c-format
 msgid "Cannot save tag of file '%s'"
-msgstr "Tag der Datei »%s« kann nicht gespeichert werden"
+msgstr "Metainfo der Datei »%s« kann nicht gespeichert werden"
 
-#: ../src/id3v24_tag.c:1536
+#: ../src/id3v24_tag.c:1535
 #, c-format
 msgid "Size error while saving tag of '%s'"
-msgstr "Größenfehler beim speichern des Tags von »%s«"
+msgstr "Größenfehler beim Speichern der Metainformationen von »%s«"
 
 #: ../src/log.c:100
 msgid "Log"
 msgstr "Protokoll"
 
-#: ../src/misc.c:691
-msgid "Select File"
-msgstr "Datei wählen"
-
-#: ../src/misc.c:697
-msgid "Select Directory"
-msgstr "Ordner auswählen"
-
-#: ../src/misc.c:781
-msgid "No audio player defined"
-msgstr "Kein Musikwiedergabeprogramm festgelegt"
-
-#: ../src/misc.c:782
-msgid "Audio Player Warning"
-msgstr "Audio-Wiedergabe-Warnung"
-
-#: ../src/misc.c:878
-msgid "Cannot fork another process"
-msgstr "Es kann kein weiterer Prozess abgespalten werden"
+#: ../src/misc.c:719
+msgid "You must type a program name"
+msgstr "Sie müssen einen Programmnamen angeben"
 
-#. Translators: file size (bytes, kilobytes, megabytes, gigabytes,
-#. * terabytes).
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "B"
-msgstr "B"
+#: ../src/misc.c:720
+msgid "Program Name Error"
+msgstr "Fehler im Programmnamen"
 
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "kB"
-msgstr "kB"
+#: ../src/misc.c:799
+#, c-format
+msgid "Executed command: %s"
+msgstr "Ausgeführter Befehl: »%s«"
 
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "MB"
-msgstr "MB"
+#: ../src/misc.c:806
+#, c-format
+msgid "Failed to launch program: %s"
+msgstr "Starten des Programms gescheitert: %s"
 
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "GB"
-msgstr "GB"
+#: ../src/misc.c:823
+msgid "Select File"
+msgstr "Datei wählen"
 
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "TB"
-msgstr "TB"
+#: ../src/misc.c:829
+msgid "Select Directory"
+msgstr "Ordner auswählen"
 
-#: ../src/misc.c:1145
+#: ../src/misc.c:1141
 msgid "Generate Playlist"
 msgstr "Eine Wiedergabeliste erzeugen"
 
-#: ../src/misc.c:1169
+#: ../src/misc.c:1165
 msgid "M3U Playlist Name"
 msgstr "M3U-Wiedergabelistenname"
 
-#: ../src/misc.c:1184
+#: ../src/misc.c:1180
 msgid "Use directory name"
 msgstr "Ordnernamen verwenden"
 
 #. Playlist options
-#: ../src/misc.c:1201
+#: ../src/misc.c:1197
 msgid "Playlist Options"
 msgstr "Wiedergabelisten-Optionen"
 
-#: ../src/misc.c:1207
+#: ../src/misc.c:1203
 msgid "Include only the selected files"
 msgstr "Nur ausgewählte Dateien einfügen"
 
-#: ../src/misc.c:1210
+#: ../src/misc.c:1206
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
 msgstr ""
-"Wenn aktiviert, dann werden nur die ausgewählten Dateien in die "
-"Wiedergabeliste geschrieben, ansonsten werden alle Dateien verwendet."
+"Falls aktiviert, werden nur die ausgewählten Dateien in die Wiedergabeliste "
+"geschrieben, ansonsten werden alle Dateien verwendet."
 
-#: ../src/misc.c:1213
+#: ../src/misc.c:1209
 msgid "Use full path for files in playlist"
 msgstr "Vollen Pfad für Dateien in der Wiedergabeliste verwenden"
 
-#: ../src/misc.c:1216
+#: ../src/misc.c:1212
 msgid "Use relative path for files in playlist"
 msgstr "Relativen Pfad für Dateien in der Wiedergabeliste verwenden"
 
 #. Create playlist in parent directory
-#: ../src/misc.c:1222
+#: ../src/misc.c:1218
 msgid "Create playlist in the parent directory"
 msgstr "Wiedergabeliste im Elternordner erzeugen"
 
-#: ../src/misc.c:1225
+#: ../src/misc.c:1221
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
-"Wenn aktiviert, dann wird die Wiedergabelistendatei im Elternordner erzeugt."
+"Falls aktiviert, wird die Wiedergabelistendatei im Elternordner erzeugt."
 
 #. DOS Separator
-#: ../src/misc.c:1229
+#: ../src/misc.c:1225
 msgid "Use DOS directory separator"
 msgstr "DOS-Ordnertrennsymbol verwenden"
 
-#: ../src/misc.c:1235
+#: ../src/misc.c:1231
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2829,49 +2801,49 @@ msgstr ""
 "Diese Option ersetzt das UNIX-Ordnertrennzeichen »/« durch das DOS-Zeichen "
 "»\\«."
 
-#: ../src/misc.c:1244
+#: ../src/misc.c:1240
 msgid "Playlist Content"
 msgstr "Inhalt der Wiedergabeliste"
 
-#: ../src/misc.c:1250
+#: ../src/misc.c:1246
 msgid "Write only list of files"
 msgstr "Nur Liste der Dateien schreiben."
 
-#: ../src/misc.c:1254
+#: ../src/misc.c:1250
 msgid "Write info using filename"
 msgstr "Dateinamen beim Schreiben der Informationen verwenden"
 
-#: ../src/misc.c:1257
+#: ../src/misc.c:1253
 msgid "Write info using:"
 msgstr "Information schreiben mit:"
 
-#: ../src/misc.c:1476
+#: ../src/misc.c:1467
 #, c-format
 msgid "Cannot write playlist file '%s'"
 msgstr "Die Wiedergabelistendatei »%s« kann nicht geschrieben werden"
 
-#: ../src/misc.c:1480
+#: ../src/misc.c:1471
 msgid "Playlist File Error"
 msgstr "Fehler in der Wiedergabelistendatei"
 
-#: ../src/misc.c:1488
+#: ../src/misc.c:1479
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Wiedergabelistendatei »%s« wurde geschrieben."
 
-#: ../src/misc.c:1552 ../src/scan.c:3247 ../src/scan.c:3309
+#: ../src/misc.c:1543 ../src/scan.c:2903 ../src/scan.c:2965
 msgid "Invalid scanner mask"
 msgstr "Ungültige Scannermaske"
 
-#: ../src/misc.c:1916
+#: ../src/misc.c:1907
 msgid "CD"
 msgstr "CD"
 
-#: ../src/misc.c:1938
+#: ../src/misc.c:1929
 msgid "Find Files"
 msgstr "Dateien suchen"
 
-#: ../src/misc.c:1970
+#: ../src/misc.c:1961
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2879,13 +2851,13 @@ msgstr ""
 "zur Anzeige aller Dateien."
 
 #. Where...
-#: ../src/misc.c:1976
+#: ../src/misc.c:1967
 msgid "In:"
 msgstr "In:"
 
 #. 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:1972
 msgid "the Filename"
 msgstr "der Dateiname"
 
@@ -2894,83 +2866,83 @@ msgstr "der Dateiname"
 #. * Note: label changed to "the Tag" (to be the only one) to fix a Hungarian
 #. * grammatical problem (which uses one word to say "in the tag" like here)
 #.
-#: ../src/misc.c:1987
+#: ../src/misc.c:1978
 msgid "the Tag"
-msgstr "das Tag"
+msgstr "der Metainfo"
 
 #. Property of the search
-#: ../src/misc.c:1998 ../src/prefs.c:335
+#: ../src/misc.c:1989 ../src/prefs.c:335
 msgid "Case sensitive"
 msgstr "Groß/Kleinschreibung beachten"
 
-#: ../src/misc.c:2225
+#: ../src/misc.c:2216
 msgid "Ready to search…"
 msgstr "Bereit zur Suche …"
 
-#: ../src/misc.c:2445
+#: ../src/misc.c:2436
 #, c-format
 msgid "Found one file"
 msgid_plural "Found %d files"
 msgstr[0] "Eine Datei gefunden"
 msgstr[1] "%d Dateien gefunden"
 
-#: ../src/misc.c:2730
+#: ../src/misc.c:2721
 msgid "Load Filenames From a Text File"
 msgstr "Dateinamen aus Textdatei laden"
 
-#: ../src/misc.c:2759
+#: ../src/misc.c:2750
 msgid "File:"
 msgstr "Datei:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: ../src/misc.c:2778
+#: ../src/misc.c:2769
 msgid " Load "
 msgstr " Laden "
 
-#: ../src/misc.c:2796
+#: ../src/misc.c:2787
 msgid "Content of Text File"
 msgstr "Inhalt der Textdatei"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2817 ../src/misc.c:2912
+#: ../src/misc.c:2808 ../src/misc.c:2903
 msgid "Insert a blank line before the selected line"
 msgstr "Vor der ausgewählten Zeile eine Leerzeile einfügen"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2826 ../src/misc.c:2921
+#: ../src/misc.c:2817 ../src/misc.c:2912
 msgid "Delete the selected line"
 msgstr "Ausgewählte Zeile löschen"
 
 #. 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:2826 ../src/misc.c:2921 ../src/misc.c:3407
 msgid "Delete all blank lines"
 msgstr "Alle Leerzeilen löschen"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2847 ../src/misc.c:2942
+#: ../src/misc.c:2838 ../src/misc.c:2933
 msgid "Move up the selected line"
 msgstr "Ausgewählte Zeile nach oben verschieben"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2856 ../src/misc.c:2951
+#: ../src/misc.c:2847 ../src/misc.c:2942
 msgid "Move down the selected line"
 msgstr "Ausgewählte Zeile nach unten verschieben"
 
 #. 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:2859 ../src/misc.c:2954 ../src/misc.c:3431
 msgid "Reload"
 msgstr "Neu laden"
 
-#: ../src/misc.c:2890
+#: ../src/misc.c:2881
 msgid "List of Files"
 msgstr "Liste der Dateien"
 
-#: ../src/misc.c:2985
+#: ../src/misc.c:2976
 msgid "Selected line:"
 msgstr "Ausgewählte Zeile:"
 
-#: ../src/misc.c:3003
+#: ../src/misc.c:2994
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2978,34 +2950,34 @@ msgstr ""
 "Wenn diese Option aktiviert wird, dann wird der ausgewählte Scanner nach dem "
 "Laden der Dateinamen gestartet (das Scannerfenster muss offen sein)."
 
-#: ../src/misc.c:3090
+#: ../src/misc.c:3081
 #, c-format
 msgid "Cannot retrieve file info (%s)"
 msgstr "Dateiinformation kann nicht abgerufen werden (%s)"
 
-#: ../src/misc.c:3152
+#: ../src/misc.c:3143
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Datei »%s« kann nicht geöffnet werden (%s)"
 
-#: ../src/misc.c:3188
+#: ../src/misc.c:3179
 #, c-format
 msgid "Error reading file (%s)"
 msgstr "Fehler beim Lesen der Datei: (%s)"
 
-#: ../src/misc.c:3404
+#: ../src/misc.c:3395
 msgid "Insert a blank line"
 msgstr "Eine Leerzeile einfügen"
 
-#: ../src/misc.c:3410
+#: ../src/misc.c:3401
 msgid "Delete this line"
 msgstr "Diese Zeile löschen"
 
-#: ../src/misc.c:3425
+#: ../src/misc.c:3416
 msgid "Move up this line"
 msgstr "Diese Zeile nach oben verschieben"
 
-#: ../src/misc.c:3431
+#: ../src/misc.c:3422
 msgid "Move down this line"
 msgstr "Diese Zeile nach unten verschieben"
 
@@ -3037,7 +3009,7 @@ msgstr "~%d kb/s"
 #: ../src/mp4_tag.c:85 ../src/mp4_tag.c:194
 #, c-format
 msgid "Error reading tags from file: '%s'"
-msgstr "Fehler beim Lesen der Tags der Datei: »%s«"
+msgstr "Fehler beim Lesen der Metainformationen der Datei: »%s«"
 
 #: ../src/mpeg_header.c:64
 msgid "Stereo"
@@ -3109,175 +3081,184 @@ msgstr ""
 msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
 msgstr "Fehler: Öffnen der Datei: »%s« als Vorbis (%s) schlug fehl."
 
-#: ../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 "Warnung: Die Ogg Vorbis-Datei »%s« enthält ein ID3v2-Tag."
+msgstr "Warnung: Die Ogg Vorbis-Datei »%s« enthält eine ID3v2-Metainfo."
 
-#: ../src/picture.c:244 ../src/picture.c:269
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1257
 #, c-format
-msgid "Image file not loaded: %s"
-msgstr "Bilddatei nicht geladen: %s"
+msgid "Error with 'loader_write': %s"
+msgstr "Fehler bei »loader_write«: %s"
+
+#: ../src/ogg_tag.c:1050 ../src/picture.c:1180
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr "Fehler bei »loader_close«: %s"
+
+#: ../src/picture.c:104
+#, c-format
+msgid "Image file not saved: %s"
+msgstr "Bilddatei nicht gespeichert: %s"
 
-#: ../src/picture.c:261
+#: ../src/picture.c:154
 #, c-format
 msgid "Cannot open file: '%s'"
 msgstr "Datei kann nicht geöffnet werden: »%s«"
 
-#: ../src/picture.c:265
+#: ../src/picture.c:158
 msgid "Image File Error"
 msgstr "Fehler in Bilddatei"
 
-#: ../src/picture.c:276
+#: ../src/picture.c:162 ../src/picture.c:424
+#, c-format
+msgid "Image file not loaded: %s"
+msgstr "Bilddatei nicht geladen: %s"
+
+#: ../src/picture.c:446
 msgid "Image file loaded"
 msgstr "Bilddatei geladen"
 
-#: ../src/picture.c:334
+#: ../src/picture.c:504
 msgid "Add Images"
 msgstr "Bilder hinzufügen"
 
-#: ../src/picture.c:344 ../src/picture.c:700
+#: ../src/picture.c:514 ../src/picture.c:874
 msgid "All Files"
 msgstr "Alle Dateien"
 
-#: ../src/picture.c:350 ../src/picture.c:706
+#: ../src/picture.c:520 ../src/picture.c:880
 msgid "PNG and JPEG"
 msgstr "PNG und JPEG"
 
-#: ../src/picture.c:477
+#: ../src/picture.c:651
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Bildeigenschaften %d/%d"
 
-#: ../src/picture.c:501
+#: ../src/picture.c:675
 msgid "Image Type"
 msgstr "Bildtyp"
 
 #. Description of the picture
-#: ../src/picture.c:560
+#: ../src/picture.c:734
 msgid "Image Description:"
 msgstr "Bildbeschreibung:"
 
-#: ../src/picture.c:687
+#: ../src/picture.c:861
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Bild speichern %d/%d"
 
-#: ../src/picture.c:759
-#, c-format
-msgid "Image file not saved: %s"
-msgstr "Bilddatei nicht gespeichert: %s"
-
-#: ../src/picture.c:827
+#: ../src/picture.c:1021
 msgid "JPEG image"
 msgstr "JPEG-Bild"
 
-#: ../src/picture.c:829
+#: ../src/picture.c:1023
 msgid "PNG image"
 msgstr "PNG-Bild"
 
-#: ../src/picture.c:831
+#: ../src/picture.c:1025
+msgid "GIF image"
+msgstr "GIF-Bild"
+
+#: ../src/picture.c:1027
 msgid "Unknown image"
 msgstr "Unbekanntes Bild"
 
-#: ../src/picture.c:843
+#: ../src/picture.c:1039
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32-Pixel PNG-Symboldatei"
 
-#: ../src/picture.c:845
+#: ../src/picture.c:1041
 msgid "Other file icon"
 msgstr "Andere Symboldatei"
 
-#: ../src/picture.c:847
+#: ../src/picture.c:1043
 msgid "Cover (front)"
 msgstr "Vorderseite"
 
-#: ../src/picture.c:849
+#: ../src/picture.c:1045
 msgid "Cover (back)"
 msgstr "Rückseite"
 
-#: ../src/picture.c:851
+#: ../src/picture.c:1047
 msgid "Leaflet page"
 msgstr "Faltblatt"
 
-#: ../src/picture.c:853
+#: ../src/picture.c:1049
 msgid "Media (e.g. label side of CD)"
 msgstr "Medium (z.B. Label der CD)"
 
-#: ../src/picture.c:855
+#: ../src/picture.c:1051
 msgid "Lead artist/lead performer/soloist"
 msgstr "Führender Künstler/Darsteller/Solist"
 
-#: ../src/picture.c:857
+#: ../src/picture.c:1053
 msgid "Artist/performer"
 msgstr "Künstler/Darsteller"
 
-#: ../src/picture.c:859
+#: ../src/picture.c:1055
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: ../src/picture.c:861
+#: ../src/picture.c:1057
 msgid "Band/Orchestra"
 msgstr "Band/Orchester"
 
-#: ../src/picture.c:865
+#: ../src/picture.c:1061
 msgid "Lyricist/text writer"
 msgstr "Lyriker/Textautor"
 
-#: ../src/picture.c:867
+#: ../src/picture.c:1063
 msgid "Recording location"
 msgstr "Aufnahmeort"
 
-#: ../src/picture.c:869
+#: ../src/picture.c:1065
 msgid "During recording"
 msgstr "Während der Aufnahme"
 
-#: ../src/picture.c:871
+#: ../src/picture.c:1067
 msgid "During performance"
 msgstr "Während der Aufführung"
 
-#: ../src/picture.c:873
+#: ../src/picture.c:1069
 msgid "Movie/video screen capture"
 msgstr "Film/Video-Bildschirmfoto"
 
-#: ../src/picture.c:875
+#: ../src/picture.c:1071
 msgid "A bright colored fish"
 msgstr "Ein heller, farbiger Fisch"
 
-#: ../src/picture.c:877
+#: ../src/picture.c:1073
 msgid "Illustration"
 msgstr "Illustration"
 
-#: ../src/picture.c:879
+#: ../src/picture.c:1075
 msgid "Band/Artist logotype"
 msgstr "Band-/Künstlerlogo"
 
-#: ../src/picture.c:881
+#: ../src/picture.c:1077
 msgid "Publisher/studio logotype"
 msgstr "Verlags-/Studiologo"
 
-#: ../src/picture.c:885
+#: ../src/picture.c:1081
 msgid "Unknown image type"
 msgstr "Unbekannter Bildtyp"
 
-#: ../src/picture.c:915 ../src/picture.c:926
+#: ../src/picture.c:1111 ../src/picture.c:1122
 msgid "pixels"
 msgstr "Pixel"
 
-#: ../src/picture.c:916 ../src/picture.c:927
+#: ../src/picture.c:1112 ../src/picture.c:1123
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/picture.c:928
+#: ../src/picture.c:1124
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../src/picture.c:984
-#, c-format
-msgid "Error with 'loader_close': %s"
-msgstr "Fehler bei »loader_close«: %s"
-
-#: ../src/picture.c:1044
+#: ../src/picture.c:1240
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
@@ -3285,26 +3266,21 @@ msgstr ""
 "Das Bild kann nicht angezeigt werden, weil nicht genug Daten geladen wurden, "
 "um zu bestimmen, wie der Bildpuffer erstellt werden muss."
 
-#: ../src/picture.c:1051
+#: ../src/picture.c:1247
 msgid "Cannot display the image"
 msgstr "Das Bild kann nicht angezeigt werden"
 
-#: ../src/picture.c:1053
+#: ../src/picture.c:1249
 msgid ""
 "Not enough data has been read to determine how to create the image buffer."
 msgstr ""
 "Es wurden nicht genug Daten geladen, um zu bestimmen, wie der Bildpuffer "
 "erstellt werden muss."
 
-#: ../src/picture.c:1055
+#: ../src/picture.c:1251
 msgid "Load Image File"
 msgstr "Bilddatei laden"
 
-#: ../src/picture.c:1061
-#, c-format
-msgid "Error with 'loader_write': %s"
-msgstr "Fehler bei »loader_write«: %s"
-
 #. Label
 #: ../src/prefs.c:152
 msgid "Default directory:"
@@ -3392,7 +3368,7 @@ msgid ""
 "If activated, information about the file as the bitrate, the time, the size, "
 "will be displayed under the filename entry."
 msgstr ""
-"Wenn aktiviert, werden Informationen über die Datei wie Bitrate, Spielzeit, "
+"Falls aktiviert, werden Informationen über die Datei wie Bitrate, Spielzeit, "
 "Dateigröße unter dem Dateinamen angezeigt."
 
 #: ../src/prefs.c:244
@@ -3552,8 +3528,8 @@ msgstr "Wählen Sie die Art der Datei-Sortierung beim Laden eines Ordners."
 #: ../src/prefs.c:344
 msgid "If activated, the sorting of the list will be dependent on the case."
 msgstr ""
-"Wenn aktiviert, dann hängt die Sortierung der Liste von der Groß/"
-"Kleinschreibung ab."
+"Falls aktiviert, hängt die Sortierung der Liste von der Groß/Kleinschreibung "
+"ab."
 
 #. File Player
 #: ../src/prefs.c:348
@@ -3584,7 +3560,7 @@ msgstr "Protokoll im Hauptfenster anzeigen"
 
 #: ../src/prefs.c:394
 msgid "If activated, the log view would be visible in the main window."
-msgstr "Wenn aktiviert, dann wird das Protokoll im Hauptfenster angezeigt."
+msgstr "Falls aktiviert, wird das Protokoll im Hauptfenster angezeigt."
 
 #: ../src/prefs.c:400
 msgid "Max number of lines:"
@@ -3622,7 +3598,7 @@ msgstr ""
 "Illegale Zeichen des Dateinamens für FAT32/16- und ISO9660+Joliet-"
 "Dateisysteme umwandeln (»\\«, »:«, »*«, »?«, »\"«, »<«, »>«, »|«), um "
 "Probleme beim Umbenennen der Datei zu verhindern. Das ist sinnvoll beim "
-"Umbenennen der Datei über die Tags mit dem Scanner."
+"Umbenennen der Datei mit dem Scanner anhand der Metainfo."
 
 #. Extension case (lower/upper?)
 #: ../src/prefs.c:441
@@ -3755,12 +3731,12 @@ msgstr ""
 #.
 #: ../src/prefs.c:533
 msgid "Tag Settings"
-msgstr "Tag-Einstellungen"
+msgstr "Metainfo-Einstellungen"
 
 #. Tag Options
 #: ../src/prefs.c:539
 msgid "Tag Options"
-msgstr "Tag-Optionen"
+msgstr "Metainfo-Optionen"
 
 #: ../src/prefs.c:545
 msgid "Auto completion of date if not complete"
@@ -3787,9 +3763,9 @@ msgid ""
 "obtain a number with 'n' digits (for example, with two digits: '05', '09', "
 "'10'…). Else it keeps the 'raw' track value."
 msgstr ""
-"Wenn aktiviert, dann werden für das Feld mit der Titelnummer »n« Zeichen und "
-"die Ziffer »0« zum Auffüllen verwendet (z.B. mit zwei Zeichen: »05«, »09«, "
-"»10« …). Ansonsten wird der »rohe« Titelwert verwendet."
+"Falls aktiviert, werden für das Feld mit der Titelnummer »n« Zeichen und die "
+"Ziffer »0« zum Auffüllen verwendet (z.B. mit zwei Zeichen: »05«, »09«, »10« "
+"…). Ansonsten wird der »rohe« Titelwert verwendet."
 
 #: ../src/prefs.c:578
 msgid "Write the disc field with the following number of digits:"
@@ -3812,21 +3788,21 @@ msgstr "Fokus auf dem gleichen Eingabefeld belassen"
 #: ../src/prefs.c:625
 msgid "Return focus to the first tag field (i.e. 'Title' field)"
 msgstr ""
-"Den Fokus an das Feld des ersten Tags zurückgeben (z.B. das Titel-Feld)"
+"Den Fokus an das Feld der ersten Metainfo zurückgeben (z.B. das Titel-Feld)"
 
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(SetFocusToFirstTagField),SET_FOCUS_TO_FIRST_TAG_FIELD);
 #. Tag Splitting
 #: ../src/prefs.c:630
 msgid "Tag Splitting"
-msgstr "Tag-Aufspaltung"
+msgstr "Metainfo-Aufspaltung"
 
 #: ../src/prefs.c:639
 msgid ""
 "For Vorbis tags, selected fields will be split at dashes and saved as "
 "separate tags"
 msgstr ""
-"Für Vorbis-Tags werden die ausgewählten Felder an den Strichen getrennt und "
-"als separate Tags gespeichert"
+"Für Vorbis-Metainformationen werden die ausgewählten Felder an den Strichen "
+"getrennt und als separate Metainformationen gespeichert"
 
 #: ../src/prefs.c:649
 msgid "Original artist"
@@ -3837,17 +3813,17 @@ msgstr "Originalkünstler"
 #.
 #: ../src/prefs.c:670
 msgid "ID3 Tag Settings"
-msgstr "ID3-Tag-Einstellungen"
+msgstr "ID3-Metainfo-Einstellungen"
 
 #. Tag Rules frame
 #: ../src/prefs.c:679
 msgid "ID3 Tag Rules"
-msgstr "ID3-Tag-Regeln"
+msgstr "ID3-Metainfo-Regeln"
 
 #. Strip tag when fields (managed by EasyTAG) are empty
 #: ../src/prefs.c:691
 msgid "Strip tags if all fields are set to blank"
-msgstr "Tags werden entfernt, wenn alle Felder leer sind"
+msgstr "Metainformationen werden entfernt, wenn alle Felder leer sind"
 
 #: ../src/prefs.c:694
 msgid ""
@@ -3856,10 +3832,10 @@ msgid ""
 "strip the whole tag when these seven standard data fields have been set to "
 "blank."
 msgstr ""
-"Da ID3v2-Tags außer Titel, Künstler, Album, Jahr, Titel, Genre oder "
-"Kommentar noch weitere Daten enthalten können (wie z.B. angehängte Bilder, "
-"Liedtexte, …), ermöglicht es diese Option, den Tag vollständig zu entfernen, "
-"wenn alle der sieben Standard-Datenfelder leer sind."
+"Da ID3v2-Metainformationen außer Titel, Künstler, Album, Jahr, Titel, Genre "
+"oder Kommentar noch weitere Daten enthalten können (wie z.B. angehängte "
+"Bilder, Liedtexte, …), ermöglicht es diese Option, die Metainfo vollständig "
+"zu entfernen, wenn alle der sieben Standard-Datenfelder leer sind."
 
 #. Convert old ID3v2 tag version
 #: ../src/prefs.c:700
@@ -3871,7 +3847,7 @@ msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
 msgstr ""
-"Wenn aktiviert, dann wird ein Tag in einer alten ID3v2-Version (z.B. "
+"Falls aktiviert, wird eine Metainfo in einer alten ID3v2-Version (z.B. "
 "ID3v2.2) auf die ID3v2.3-Version aktualisiert."
 
 #. Use CRC32
@@ -3881,7 +3857,7 @@ msgstr "CRC32 verwenden"
 
 #: ../src/prefs.c:710
 msgid "Set CRC32 in the ID3v2 tags"
-msgstr "CRC32 in ID3v2-Tags verwenden"
+msgstr "CRC32 in ID3v2-Metainformationen verwenden"
 
 #. Use Compression
 #: ../src/prefs.c:713
@@ -3890,7 +3866,7 @@ msgstr "Komprimierung verwenden"
 
 #: ../src/prefs.c:717
 msgid "Set Compression in the ID3v2 tags"
-msgstr "Komprimierung in den ID3v2-Tags verwenden"
+msgstr "Komprimierung in den ID3v2-Metainformationen verwenden"
 
 #. Write Genre in text
 #: ../src/prefs.c:720
@@ -3902,31 +3878,32 @@ msgid ""
 "Don't use ID3v1 number references in genre tag. Enable this if you see "
 "numbers as genre in your music player."
 msgstr ""
-"Keine ID3v1-Zahlreferenzen im Genre-Tag verwenden. Aktivieren Sie dies, wenn "
-"Zahlen als Genre in Ihrer Musikwiedergabe angezeigt werden sollen."
+"Festlegen, dass keine ID3v1-Zahlreferenzen in Genre-Metainfo verwendet "
+"werden sollen. Aktivieren Sie dies, wenn Zahlen als Genre in Ihrer "
+"Musikwiedergabe angezeigt werden."
 
 #. Character Set for writing ID3 tag
 #: ../src/prefs.c:727
 msgid "Character Set for writing ID3 tags"
-msgstr "Zeichensatz für das Schreiben von ID3-Tags"
+msgstr "Zeichensatz für das Schreiben von ID3-Metainformationen"
 
 #. ID3v2 tags
 #: ../src/prefs.c:734
 msgid "ID3v2 tags"
-msgstr "ID3v2-Tags"
+msgstr "ID3v2-Metainformationen"
 
 #. Write ID3v2 tag
 #: ../src/prefs.c:747
 msgid "Write ID3v2 tag"
-msgstr "ID3v2-Tag schreiben"
+msgstr "ID3v2-Metainfo schreiben"
 
 #: ../src/prefs.c:750
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
 msgstr ""
-"Ist dies aktiviert, wird ein ID3v2.4-Tag am Anfang von MP3-Dateien "
-"hinzugefügt oder aktualisiert. Anderenfalls wird der Tag entfernt."
+"Falls aktiviert, wird eine ID3v2.4-Metainfo am Anfang von MP3-Dateien "
+"hinzugefügt oder aktualisiert. Anderenfalls wird die Metainfo entfernt."
 
 #. ID3v2 tag version
 #: ../src/prefs.c:757
@@ -3939,7 +3916,7 @@ msgid ""
 " - ID3v2.3 is written using id3lib,\n"
 " - ID3v2.4 is written using libid3tag (recommended)."
 msgstr ""
-"Wählen Sie die Version des ID3v2-Tags:\n"
+"Wählen Sie die Version der ID3v2-Metainfo:\n"
 " - ID3v2.3 wird mit id3lib geschrieben,\n"
 " - ID3v2.4 wird mit libid3tag geschrieben (empfohlen)."
 
@@ -3960,7 +3937,7 @@ msgstr "Unicode-Typ"
 
 #: ../src/prefs.c:815
 msgid "Character set used to write the tag data in the file."
-msgstr "Zeichensatz um Tag-Daten in die Datei zu schreiben."
+msgstr "Zeichensatz um Metainfo-Daten in die Datei zu schreiben."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
@@ -3993,29 +3970,30 @@ msgstr "//IGNORE"
 #. ID3v1 tags
 #: ../src/prefs.c:859
 msgid "ID3v1 tags"
-msgstr "ID3v1-Tag"
+msgstr "ID3v1-Metainfo"
 
 #. Write ID3v1 tag
 #: ../src/prefs.c:873
 msgid "Write ID3v1.x tag"
-msgstr "ID3v1.x-Tag schreiben"
+msgstr "ID3v1.x-Metainfo schreiben"
 
 #: ../src/prefs.c:876
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
 msgstr ""
-"Ist dies aktiviert, wird ein ID3v1-Tag am Ende von MP3-Dateien hinzugefügt "
-"oder aktualisiert. Anderenfalls wird der Tag entfernt."
+"Falls aktiviert, wird eine ID3v1-Metainfo am Ende von MP3-Dateien "
+"hinzugefügt oder aktualisiert. Anderenfalls werden die Metainformationen "
+"entfernt."
 
 #: ../src/prefs.c:890
 msgid "Character set used to write ID3v1 tag data in the file."
-msgstr "Zeichensatz um ID3v1-Tag-Daten in die Datei zu schreiben."
+msgstr "Zeichensatz um ID3v1-Metainfo-Daten in die Datei zu schreiben."
 
 #. Character Set for reading tag
 #: ../src/prefs.c:928
 msgid "Character Set for reading ID3 tags"
-msgstr "Zeichensatz zum Lesen von ID3-Tags"
+msgstr "Zeichensatz zum Lesen von ID3-Metainformationen"
 
 #: ../src/prefs.c:942
 msgid "Non-standard:"
@@ -4037,24 +4015,25 @@ msgid ""
 "'Windows-1251' to load tags written under Windows. And 'KOI8-R' to load tags "
 "written under Unix systems."
 msgstr ""
-"Dieser Zeichensatz wird verwendet zum Lesen des Tags, zur Konvertierung "
-"jeder Zeichenkette aus einem ISO-8859-1-Feld des Tags (für ID3v2 und/oder "
-"ID3v1-Tag).\n"
+"Dieser Zeichensatz wird zum Lesen der Metainfo verwendet, zur Konvertierung "
+"jeder Zeichenkette aus einem ISO-8859-1-Feld der Metainfo (für ID3v2 und/"
+"oder ID3v1-Metainfo).\n"
 "\n"
 "Zum Beispiel:\n"
 "  - in früheren Versionen von EasyTAG konnte man UTF-8-Zeichenketten in ein "
-"ISO-8859-1-Feld speichern. Das ist nicht korrekt. Um diese Tags nach Unicode "
-"zu konvertieren: Aktivieren Sie diese Einstellung und wählen Sie UTF-8. Sie "
-"müssen außerdem oben die Option »Versuchen, die Tags als ISO-8859-1 zu "
-"speichern. Wenn das nicht möglich ist, UNICODE verwenden (empfohlen)« oder "
-"»Tags immer im UNICODE-Zeichensatz speichern« wählen.\n"
-"  - Wenn Unicode nicht verwendet wird, dann können Russen den Zeichensatz "
-"»Windows-1251« wählen, um Tags zu laden, die unter Windows geschrieben "
-"wurden, oder »KOI8-R« für Tags, die unter Unix geschrieben wurden."
+"ISO-8859-1-Feld speichern. Das ist nicht korrekt. Um diese Metainfo nach "
+"Unicode zu konvertieren: Aktivieren Sie diese Einstellung und wählen Sie "
+"UTF-8. Sie müssen außerdem oben die Option »Versuchen, die Metainfo als "
+"ISO-8859-1 zu speichern. Wenn das nicht möglich ist, UNICODE verwenden "
+"(empfohlen)« oder »Metainfo immer im UNICODE-Zeichensatz speichern« wählen.\n"
+"  - Wenn Unicode nicht verwendet wird, dann können russischsprachige "
+"Anwender den Zeichensatz »Windows-1251« wählen, um Metainformationen zu "
+"laden, die unter Windows geschrieben wurden, oder »KOI8-R« für "
+"Metainformationen, die unter Unix geschrieben wurden."
 
 #: ../src/prefs.c:966
 msgid "Character set used to read tag data in the file."
-msgstr "Zeichensatz um Tag-Daten aus der Datei zu lesen."
+msgstr "Zeichensatz um Metainfo-Daten aus der Datei zu lesen."
 
 #.
 #. * Scanner
@@ -4066,7 +4045,7 @@ msgstr "Scanner"
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
 #: ../src/prefs.c:990
 msgid "Fill Tag Scanner - Character Conversion"
-msgstr "Scanner zum Füllen der Tags - Zeichensatzkonvertierung"
+msgstr "Scanner zum Füllen der Metainformationen - Zeichensatzkonvertierung"
 
 #: ../src/prefs.c:996 ../src/prefs.c:1021
 msgid "Convert underscore character '_' and string '%20' to space ' '"
@@ -4081,8 +4060,8 @@ msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
 msgstr ""
-"Wenn aktiviert, dann wird diese Konvertierung bei der Anwendung einer Maske "
-"im Scanner nach Tags benutzt."
+"Falls aktiviert, wird diese Konvertierung bei der Anwendung einer Maske für "
+"Metainformationen im Scanner benutzt."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
 #: ../src/prefs.c:1016
@@ -4094,8 +4073,8 @@ msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
 msgstr ""
-"Wenn aktiviert, dann wird diese Konvertierung bei der Anwendung einer Maske "
-"im Scanner nach Dateinamen benutzt."
+"Falls aktiviert, wird diese Konvertierung bei der Anwendung einer Maske im "
+"Scanner nach Dateinamen benutzt."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
 #: ../src/prefs.c:1040
@@ -4147,15 +4126,15 @@ msgstr "Felder"
 #. Overwrite text into tag fields
 #: ../src/prefs.c:1078
 msgid "Overwrite fields when scanning tags"
-msgstr "Felder überschreiben, wenn Tags gescannt werden"
+msgstr "Felder überschreiben, wenn Metainformationen gescannt werden"
 
 #: ../src/prefs.c:1081
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
 msgstr ""
-"Scanner ersetzt vorhandenen Text in Feldern mit neuem Inhalt, wenn "
-"aktiviert. Wenn nicht, werden nur leere Felder ausgefüllt."
+"Falls aktiviert, ersetzt der Scanner vorhandenen Text in Feldern mit neuem "
+"Inhalt. Ansonsten werden nur leere Felder ausgefüllt."
 
 #: ../src/prefs.c:1092
 msgid "Set this text as default comment:"
@@ -4166,13 +4145,15 @@ msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
 msgstr ""
-"Aktivieren Sie diese Option, wenn bei Verwendung des »Tag füllen«-Scanners "
-"dieser Text in das Kommentarfeld eingetragen werden soll."
+"Aktivieren Sie diese Option, wenn bei Verwendung des »Metainfo füllen«-"
+"Scanners dieser Text in das Kommentarfeld eingetragen werden soll."
 
 #. CRC32 comment
 #: ../src/prefs.c:1113
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
-msgstr "CRC32 als Standardkommentar verwenden (nur für Dateien mit ID3-Tags)."
+msgstr ""
+"CRC32 als Standardkommentar verwenden (nur für Dateien mit ID3-"
+"Metainformationen)."
 
 #: ../src/prefs.c:1117
 msgid ""
@@ -4180,7 +4161,7 @@ msgid ""
 "when using the 'Fill Tag' scanner."
 msgstr ""
 "Berechnet den CRC-32-Wert der Datei und schreibt ihn bei der Verwendung des "
-"»Tag füllen«-Scanners in das Kommentarfeld."
+"»Metainfo füllen«-Scanners in das Kommentarfeld."
 
 #.
 #. * CDDB
@@ -4269,32 +4250,33 @@ msgstr "Benutzername für den Proxy-Server."
 msgid "User Password:"
 msgstr "Benutzer-Passwort:"
 
-#: ../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 "Passwort des Benutzers des Proxy-Servers."
 
 #. Track Name list (CDDB results)
-#: ../src/prefs.c:1342
+#: ../src/prefs.c:1343
 msgid "Track Name List"
 msgstr "Titelnamensliste"
 
-#: ../src/prefs.c:1349
+#: ../src/prefs.c:1350
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 "Passende Datei wählen (nach Position oder DLM, wenn nachfolgend aktiviert)"
 
-#: ../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 ""
-"Wenn aktiviert, wird bei der Auswahl einer Zeile in der Titelliste die "
+"Falls aktiviert, wird bei der Auswahl einer Zeile in der Titelliste die "
 "passende Datei in der Hauptliste ebenfalls ausgewählt."
 
 #. Check box to use DLM (also used in the cddb window)
-#: ../src/prefs.c:1358
+#: ../src/prefs.c:1359
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4305,15 +4287,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: ../src/prefs.c:1373
+#: ../src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Bestätigung"
 
-#: ../src/prefs.c:1378
+#: ../src/prefs.c:1379
 msgid "Confirm exit from program"
 msgstr "Beenden des Programms bestätigen"
 
-#: ../src/prefs.c:1381
+#: ../src/prefs.c:1382
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4321,53 +4303,53 @@ msgstr ""
 "Falls aktiviert, öffnet sich ein Dialogfenster, um eine Bestätigung zu "
 "erfragen, bevor das Programm beendet wird."
 
-#: ../src/prefs.c:1384
+#: ../src/prefs.c:1385
 msgid "Confirm writing of file tag"
-msgstr "Schreiben des Tags bestätigen"
+msgstr "Schreiben der Metainfo bestätigen"
 
-#: ../src/prefs.c:1388
+#: ../src/prefs.c:1389
 msgid "Confirm renaming of file"
 msgstr "Umbenennen der Datei bestätigen"
 
-#: ../src/prefs.c:1392
+#: ../src/prefs.c:1393
 msgid "Confirm deleting of file"
 msgstr "Löschen der Datei bestätigen"
 
-#: ../src/prefs.c:1396
+#: ../src/prefs.c:1397
 msgid "Confirm writing of playlist"
 msgstr "Schreiben der Wiedergabeliste bestätigen"
 
-#: ../src/prefs.c:1400
+#: ../src/prefs.c:1401
 msgid "Confirm changing directory when there are unsaved changes"
 msgstr ""
 "Wechseln des Ordners bestätigen, wenn ungespeicherte Änderungen vorhanden "
 "sind"
 
 #. 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 "(Beispiel: %.*d_-_Titel_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 "(Beispiel: cd_%.*d_of_10/Titel_Name_1.mp3)"
 
-#: ../src/prefs.c:1613 ../src/setting.c:904
+#: ../src/prefs.c:1614 ../src/setting.c:904
 msgid "Configuration saved"
 msgstr "Konfiguration gespeichert"
 
-#: ../src/prefs.c:1621
+#: ../src/prefs.c:1622
 msgid "Configuration unchanged"
 msgstr "Konfiguration ist unverändert"
 
-#: ../src/prefs.c:1707
+#: ../src/prefs.c:1713
 msgid "The selected path for 'Default path to files' is invalid"
 msgstr "Der ausgewählte Pfad für »Vorgabepfad zu Dateien« ist ungültig"
 
-#: ../src/prefs.c:1708
+#: ../src/prefs.c:1715
 #, c-format
 msgid ""
 "Path: '%s'\n"
@@ -4376,113 +4358,113 @@ msgstr ""
 "Pfad: »%s«\n"
 "Fehler: %s"
 
-#: ../src/prefs.c:1709
+#: ../src/prefs.c:1717
 msgid "Invalid Path Error"
 msgstr "Fehler durch ungültigen Pfad"
 
-#: ../src/prefs.c:1823
+#: ../src/prefs.c:1831
 #, c-format
 msgid "The audio file player '%s' cannot be found"
 msgstr "Das Wiedergabeprogramm »%s« wurde nicht gefunden"
 
-#: ../src/prefs.c:1825
+#: ../src/prefs.c:1833
 msgid "Audio Player Error"
 msgstr "Fehler in der Audio-Wiedergabe"
 
 #: ../src/scan.c:180
 msgid "Fill Tag"
-msgstr "Tag füllen"
+msgstr "Metainfo füllen"
 
-#: ../src/scan.c:358
+#: ../src/scan.c:354
 #, c-format
 msgid "Cannot calculate CRC value of file (%s)"
 msgstr "CRC-Wert der Datei kann nicht berechnet werden (%s)"
 
-#: ../src/scan.c:373
+#: ../src/scan.c:369
 msgid "Tag successfully scanned"
-msgstr "Tag wurde erfolgreich gescannt"
+msgstr "Metainfo wurde erfolgreich gescannt"
 
-#: ../src/scan.c:375
+#: ../src/scan.c:371
 #, c-format
 msgid "Tag successfully scanned: %s"
-msgstr "Tag wurde erfolgreich gescannt: %s"
+msgstr "Metainfo wurde erfolgreich gescannt: %s"
 
-#: ../src/scan.c:416
+#: ../src/scan.c:412
 #, c-format
 msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
 msgstr ""
-"Tag-Scanner: Seltsam … die Erweiterung »%s« wurde nicht im Dateinamen »%s« "
-"gefunden"
+"Metainfo-Scanner: Seltsam … die Erweiterung »%s« wurde nicht im Dateinamen "
+"»%s« gefunden"
 
-#: ../src/scan.c:498 ../src/scan.c:527
+#: ../src/scan.c:494 ../src/scan.c:523
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Scan-Fehler: Trenner »%s« in »%s« nicht auffindbar"
 
-#: ../src/scan.c:714
+#: ../src/scan.c:710
 msgid "New filename successfully scanned"
 msgstr "Neuer Dateiname wurde erfolgreich eingelesen"
 
-#: ../src/scan.c:717
+#: ../src/scan.c:713
 #, c-format
 msgid "New filename successfully scanned: %s"
 msgstr "Neuer Dateiname wurde erfolgreich eingelesen: %s"
 
-#: ../src/scan.c:1817
+#: ../src/scan.c:1822
 #, c-format
 msgid "Error while processing fields: %s"
 msgstr "Fehler beim Verarbeiten der Felder: %s"
 
 #. The window
-#: ../src/scan.c:2336
+#: ../src/scan.c:1992
 msgid "Tag and Filename Scan"
-msgstr "Scan von Tag und Dateinamen"
+msgstr "Scan von Metainformationen und Dateinamen"
 
 #. TODO: Set related action to match AM_SCAN_FILES.
-#: ../src/scan.c:2345
+#: ../src/scan.c:2001
 msgid "Scan Files"
 msgstr "Datei(en) einlesen"
 
 #. Option Menu
-#: ../src/scan.c:2373
+#: ../src/scan.c:2029
 msgid "Scanner:"
 msgstr "Scanner:"
 
-#: ../src/scan.c:2394
+#: ../src/scan.c:2050
 msgid "Select the type of scanner to use"
 msgstr "Typ des zu verwendenden Scanners auswählen"
 
-#: ../src/scan.c:2403
+#: ../src/scan.c:2059
 msgid "Scanner Preferences"
 msgstr "Scanner-Einstellungen"
 
-#: ../src/scan.c:2412
+#: ../src/scan.c:2068
 msgid "Show / Hide Masks Editor"
 msgstr "Maskeneditor anzeigen/verstecken"
 
-#: ../src/scan.c:2422
+#: ../src/scan.c:2078
 msgid "Show / Hide Legend"
 msgstr "Legende anzeigen/verstecken"
 
-#: ../src/scan.c:2452
+#: ../src/scan.c:2108
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse filename and "
 "path. Used to fill in tag fields"
 msgstr ""
 "Wählen Sie eine Maske aus oder geben Sie unter Verwendung von Codes (siehe "
 "Legende) eine solche ein, um Dateinamen und Pfade zu verarbeiten. Wird zum "
-"Ausfüllen der Tag-Felder verwendet."
+"Ausfüllen der Metainfo-Felder verwendet."
 
 #. Preview label
-#: ../src/scan.c:2476
+#: ../src/scan.c:2132
 msgid "Fill tag preview"
-msgstr "Vorschau für Tag-Füllung"
+msgstr "Vorschau für Metainfo-Füllung"
 
-#: ../src/scan.c:2506
+#: ../src/scan.c:2162
 msgid "Prefix mask with current path"
 msgstr "Aktuellen Pfad vor die Maske stellen"
 
-#: ../src/scan.c:2520
+#: ../src/scan.c:2176
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4490,21 +4472,21 @@ msgid ""
 "path, otherwise is relative to the old path."
 msgstr ""
 "Wählen Sie eine Maske oder geben Sie eine eigene entsprechend der Codes ein "
-"(siehe Legende), um die Felder der Tags zu verarbeiten, so dass ein neuer "
-"Dateiname erzeugt wird.\n"
+"(siehe Legende), um die Felder der Metainformationen zu verarbeiten, so dass "
+"ein neuer Dateiname erzeugt wird.\n"
 "Verwenden Sie »/« zum Anlegen von Ordnern. Wenn das erste Zeichen »/« ist, "
-"so ist es ein absoluter Pfad, andernfalls relativ zum alten Pfad."
+"so ist es ein absoluter Pfad, andernfalls relativ zum bisherigen Pfad."
 
 #. Preview label
-#: ../src/scan.c:2545
+#: ../src/scan.c:2201
 msgid "Rename file preview"
 msgstr "Vorschau der Datei-Umbenennung"
 
-#: ../src/scan.c:2564
+#: ../src/scan.c:2220
 msgid "Select fields:"
 msgstr "Felder auswählen:"
 
-#: ../src/scan.c:2567
+#: ../src/scan.c:2223
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those which interest you"
@@ -4513,134 +4495,134 @@ msgstr ""
 "können. Wählen Sie die geeigneten aus."
 
 #. Advice for Translators: set the first letter of filename translated
-#: ../src/scan.c:2571
+#: ../src/scan.c:2227
 msgid "F"
 msgstr "F"
 
-#: ../src/scan.c:2573
+#: ../src/scan.c:2229
 msgid "Process filename field"
 msgstr "Dateinamensfeld verarbeiten"
 
 #. Advice for Translators: set the first letter of title translated
-#: ../src/scan.c:2575
+#: ../src/scan.c:2231
 msgid "T"
 msgstr "T"
 
-#: ../src/scan.c:2576
+#: ../src/scan.c:2232
 msgid "Process title field"
 msgstr "Titelfeld bearbeiten"
 
 #. Advice for Translators: set the first letter of artist translated
-#: ../src/scan.c:2578
+#: ../src/scan.c:2234
 msgid "Ar"
 msgstr "Kü"
 
-#: ../src/scan.c:2579
+#: ../src/scan.c:2235
 msgid "Process file artist field"
 msgstr "Künstlerfeld dieser Datei bearbeiten"
 
 #. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan.c:2581
+#: ../src/scan.c:2237
 msgid "AA"
 msgstr "AA"
 
-#: ../src/scan.c:2582
+#: ../src/scan.c:2238
 msgid "Process album artist field"
 msgstr "Künstlerfeld dieses Albums bearbeiten"
 
 #. Advice for Translators: set the first letter of album translated
-#: ../src/scan.c:2584
+#: ../src/scan.c:2240
 msgid "Al"
 msgstr "Al"
 
-#: ../src/scan.c:2585
+#: ../src/scan.c:2241
 msgid "Process album field"
 msgstr "Albumfeld bearbeiten"
 
 #. Advice for Translators: set the first letter of genre translated
-#: ../src/scan.c:2587
+#: ../src/scan.c:2243
 msgid "G"
 msgstr "G"
 
-#: ../src/scan.c:2588
+#: ../src/scan.c:2244
 msgid "Process genre field"
 msgstr "Genrefeld bearbeiten"
 
 #. Advice for Translators: set the first letter of comment translated
-#: ../src/scan.c:2590
+#: ../src/scan.c:2246
 msgid "Cm"
 msgstr "K"
 
-#: ../src/scan.c:2591
+#: ../src/scan.c:2247
 msgid "Process comment field"
 msgstr "Kommentarfeld bearbeiten"
 
 #. Advice for Translators: set the first letter of composer translated
-#: ../src/scan.c:2593
+#: ../src/scan.c:2249
 msgid "Cp"
 msgstr "Ko"
 
-#: ../src/scan.c:2594
+#: ../src/scan.c:2250
 msgid "Process composer field"
 msgstr "Komponistenfeld bearbeiten"
 
 #. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan.c:2596
+#: ../src/scan.c:2252
 msgid "O"
 msgstr "O"
 
-#: ../src/scan.c:2597
+#: ../src/scan.c:2253
 msgid "Process original artist field"
 msgstr "Originalkünstlerfeld dieser Datei bearbeiten"
 
 #. Advice for Translators: set the first letter of copyright translated
-#: ../src/scan.c:2599
+#: ../src/scan.c:2255
 msgid "Cr"
 msgstr "Co"
 
-#: ../src/scan.c:2600
+#: ../src/scan.c:2256
 msgid "Process copyright field"
 msgstr "Copyright-Feld bearbeiten"
 
 #. Advice for Translators: set the first letter of URL translated
-#: ../src/scan.c:2602
+#: ../src/scan.c:2258
 msgid "U"
 msgstr "U"
 
-#: ../src/scan.c:2603
+#: ../src/scan.c:2259
 msgid "Process URL field"
 msgstr "URL-Feld bearbeiten"
 
 #. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan.c:2605
+#: ../src/scan.c:2261
 msgid "E"
 msgstr "K"
 
-#: ../src/scan.c:2606
+#: ../src/scan.c:2262
 msgid "Process encoder name field"
 msgstr "Kodiererfeld bearbeiten"
 
-#: ../src/scan.c:2650
+#: ../src/scan.c:2306
 msgid "Invert selection"
 msgstr "Auswahl umkehren"
 
-#: ../src/scan.c:2657
+#: ../src/scan.c:2313
 msgid "Select/Unselect all"
 msgstr "Alle aus-/abwählen"
 
-#: ../src/scan.c:2672
+#: ../src/scan.c:2328
 msgid "Convert:"
 msgstr "Umwandeln:"
 
-#: ../src/scan.c:2674
+#: ../src/scan.c:2330
 msgid "to: "
 msgstr "nach: "
 
-#: ../src/scan.c:2681
+#: ../src/scan.c:2337
 msgid "Do not convert"
 msgstr "Nicht umwandeln"
 
-#: ../src/scan.c:2700
+#: ../src/scan.c:2356
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4649,7 +4631,7 @@ msgstr ""
 "ersetzt. (Beispiel, vorher: »Text%20in%20einem_Eintrag«, danach: »Text in "
 "einem Eintrag«)."
 
-#: ../src/scan.c:2703
+#: ../src/scan.c:2359
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4657,38 +4639,38 @@ msgstr ""
 "Ein Leerzeichen wird durch einen Unterstrich ersetzt. Beispiel, vorher: "
 "»Text in einem Eintrag«, danach: »Text_in_einem_Eintrag«."
 
-#: ../src/scan.c:2706
+#: ../src/scan.c:2362
 msgid ""
 "Replace a string by another one. Note that the search is case sensitive."
 msgstr ""
 "Eine Zeichenkette durch eine andere ersetzen. Beachten Sie, dass die Suche "
 "Groß- und Kleinschreibung unterscheidet."
 
-#: ../src/scan.c:2713
+#: ../src/scan.c:2369
 msgid "Capitalize all"
 msgstr "Alles in Großbuchstaben umwandeln"
 
-#: ../src/scan.c:2715
+#: ../src/scan.c:2371
 msgid "Lowercase all"
 msgstr "Alles in Kleinbuchstaben umwandeln"
 
-#: ../src/scan.c:2717
+#: ../src/scan.c:2373
 msgid "Capitalize first letter"
 msgstr "Ersten Buchstaben groß schreiben"
 
-#: ../src/scan.c:2719
+#: ../src/scan.c:2375
 msgid "Capitalize the first letter of each word"
 msgstr "Der erste Buchstabe jeden Wortes groß schreiben"
 
-#: ../src/scan.c:2720
+#: ../src/scan.c:2376
 msgid "Detect Roman numerals"
 msgstr "Römische Zahlen erkennen"
 
-#: ../src/scan.c:2722
+#: ../src/scan.c:2378
 msgid "Do not change capitalization"
 msgstr "Großschreibung nicht ändern"
 
-#: ../src/scan.c:2744
+#: ../src/scan.c:2400
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4696,7 +4678,7 @@ msgstr ""
 "Alle Wörter in allen Feldern werden in Großbuchstaben geschrieben. Beispiel, "
 "vorher: »Text IN EINEM Eintrag«, danach: »TEXT IN EINEM EINTRAG«."
 
-#: ../src/scan.c:2747
+#: ../src/scan.c:2403
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4704,7 +4686,7 @@ msgstr ""
 "Wörter in allen Feldern klein schreiben. Beispiel, vorher: »TEXT IN einem "
 "Eintrag«, danach: »text in einem eintrag«."
 
-#: ../src/scan.c:2750
+#: ../src/scan.c:2406
 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'."
@@ -4713,7 +4695,7 @@ msgstr ""
 "geschrieben. Beispiel, vorher: »text IN Einem EINTRAG«, danach: »Text in "
 "einem eintrag«."
 
-#: ../src/scan.c:2753
+#: ../src/scan.c:2409
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4721,7 +4703,7 @@ msgstr ""
 "Der erste Buchstabe jedes Wortes in allen Feldern wird groß geschrieben. "
 "Beispiel, vorher: »Text in einem EINTRAG«, danach: »Text In Einem Eintrag«."
 
-#: ../src/scan.c:2756
+#: ../src/scan.c:2412
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -4729,19 +4711,19 @@ msgstr ""
 "Großbuchstaben bei römischen Zahlen erzwingen, z.B. wird »ix. text in einem "
 "feld« zu »IX. Text In Einem Feld«."
 
-#: ../src/scan.c:2764
+#: ../src/scan.c:2420
 msgid "Insert a space before uppercase letters"
 msgstr "Vor Großbuchstaben ein Leerzeichen einfügen"
 
-#: ../src/scan.c:2766
+#: ../src/scan.c:2422
 msgid "Remove duplicate spaces and underscores"
 msgstr "Doppelte Leerzeichen und Unterstriche entfernen"
 
-#: ../src/scan.c:2768
+#: ../src/scan.c:2424
 msgid "Do not change word separators"
 msgstr "Worttrenner nicht ändern"
 
-#: ../src/scan.c:2782
+#: ../src/scan.c:2438
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4749,7 +4731,7 @@ msgstr ""
 "Alle Leerzeichen zwischen Wörtern werden entfernt. Beispiel, vorher: »Text "
 "In Einem Eintrag«, danach: »TextInEinemEintrag«."
 
-#: ../src/scan.c:2785
+#: ../src/scan.c:2441
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4757,7 +4739,7 @@ msgstr ""
 "Vor jedem Großbuchstaben wird ein Leerzeichen eingefügt. Beispiel, vorher: "
 "»TextInEinemEintrag«, danach: »Text In Einem Eintrag«."
 
-#: ../src/scan.c:2788
+#: ../src/scan.c:2444
 msgid ""
 "Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4768,141 +4750,141 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2795
+#: ../src/scan.c:2451
 msgid "Legend"
 msgstr "Legende"
 
-#: ../src/scan.c:2801
+#: ../src/scan.c:2457
 #, c-format
 msgid "%a: artist"
 msgstr "%a: Künstler"
 
-#: ../src/scan.c:2804
+#: ../src/scan.c:2460
 msgid "%z: album artist"
 msgstr "%a: Albenkünstler"
 
-#: ../src/scan.c:2807
+#: ../src/scan.c:2463
 msgid "%b: album"
 msgstr "%b: Album"
 
-#: ../src/scan.c:2810
+#: ../src/scan.c:2466
 #, c-format
 msgid "%c: comment"
 msgstr "%c: Kommentar"
 
-#: ../src/scan.c:2813
+#: ../src/scan.c:2469
 #, c-format
 msgid "%p: composer"
 msgstr "%p: Komponist"
 
-#: ../src/scan.c:2816
+#: ../src/scan.c:2472
 msgid "%r: copyright"
 msgstr "%r: Copyright"
 
-#: ../src/scan.c:2819
+#: ../src/scan.c:2475
 #, c-format
 msgid "%d: disc number"
 msgstr "%d: CD-Nummer"
 
-#: ../src/scan.c:2822
+#: ../src/scan.c:2478
 #, c-format
 msgid "%e: encoded by"
 msgstr "%e: Kodierer"
 
-#: ../src/scan.c:2825
+#: ../src/scan.c:2481
 #, c-format
 msgid "%g: genre"
 msgstr "%g: Genre"
 
-#: ../src/scan.c:2828
+#: ../src/scan.c:2484
 #, c-format
 msgid "%i: ignored"
 msgstr "%i: wird ignoriert"
 
-#: ../src/scan.c:2831
+#: ../src/scan.c:2487
 msgid "%l: number of tracks"
 msgstr "%l: Anzahl der Titel"
 
-#: ../src/scan.c:2834
+#: ../src/scan.c:2490
 #, c-format
 msgid "%o: orig. artist"
 msgstr "%o: Originalkünstler"
 
-#: ../src/scan.c:2837
+#: ../src/scan.c:2493
 #, c-format
 msgid "%n: track"
 msgstr "%n: Stück"
 
-#: ../src/scan.c:2840
+#: ../src/scan.c:2496
 msgid "%t: title"
 msgstr "%t: Titel"
 
-#: ../src/scan.c:2843
+#: ../src/scan.c:2499
 #, c-format
 msgid "%u: URL"
 msgstr "%u: URL"
 
-#: ../src/scan.c:2846
+#: ../src/scan.c:2502
 #, c-format
 msgid "%x: number of discs"
 msgstr "%x: Anzahl der Medien"
 
-#: ../src/scan.c:2849
+#: ../src/scan.c:2505
 msgid "%y: year"
 msgstr "%y: Jahr"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2856
+#: ../src/scan.c:2512
 msgid "Mask Editor"
 msgstr "Maskeneditor"
 
-#: ../src/scan.c:2910
+#: ../src/scan.c:2566
 msgid "Create New Mask"
 msgstr "Neue Maske erstellen"
 
-#: ../src/scan.c:2920
+#: ../src/scan.c:2576
 msgid "Move Up this Mask"
 msgstr "Maske nach oben verschieben"
 
-#: ../src/scan.c:2930
+#: ../src/scan.c:2586
 msgid "Move Down this Mask"
 msgstr "Maske nach unten verschieben"
 
-#: ../src/scan.c:2940
+#: ../src/scan.c:2596
 msgid "Duplicate Mask"
 msgstr "Maske duplizieren"
 
-#: ../src/scan.c:2950
+#: ../src/scan.c:2606
 msgid "Add Default Masks"
 msgstr "Vorgabemasken hinzufügen"
 
-#: ../src/scan.c:2960
+#: ../src/scan.c:2616
 msgid "Remove Mask"
 msgstr "Maske löschen"
 
-#: ../src/scan.c:2970
+#: ../src/scan.c:2626
 msgid "Save Masks"
 msgstr "Masken speichern"
 
-#: ../src/scan.c:3550
+#: ../src/scan.c:3206
 msgid "New_mask"
 msgstr "Neue_Maske"
 
-#: ../src/scan.c:3589
+#: ../src/scan.c:3245
 msgid "Copy: No row selected"
 msgstr "Kopieren: keine Zeile ausgewählt"
 
-#: ../src/scan.c:3682
+#: ../src/scan.c:3338
 msgid "Remove: No row selected"
 msgstr "Löschen: keine Zeile ausgewählt"
 
-#: ../src/scan.c:3729
+#: ../src/scan.c:3385
 msgid "Move Up: No row selected"
 msgstr "Nach oben verschieben: keine Zeile ausgewählt"
 
-#: ../src/scan.c:3773
+#: ../src/scan.c:3429
 msgid "Move Down: No row selected"
 msgstr "Nach unten verschieben: keine Zeile ausgewählt"
 
@@ -4916,117 +4898,140 @@ msgstr "Fehler: Konfigurationsdatei kann nicht geschrieben werden: %s (%s)"
 msgid "Error while writing configuration file: %s"
 msgstr "Fehler beim Schreiben der Konfigurationsdatei: »%s«"
 
-#: ../src/setting.c:1104
+#: ../src/setting.c:1100
 #, c-format
 msgid "Cannot open configuration file '%s' (%s)"
 msgstr "Konfigurationsdatei »%s« kann nicht geöffnet werden (%s)"
 
-#: ../src/setting.c:1106
+#: ../src/setting.c:1102
 msgid "Loading default configuration"
 msgstr "Standardkonfiguration wird geladen"
 
-#: ../src/setting.c:1147
+#: ../src/setting.c:1143
 #, c-format
 msgid "Cannot create or open file '%s' (%s)"
 msgstr "Datei »%s« kann nicht erstellt oder geöffnet werden (%s)"
 
-#: ../src/setting.c:1207
+#: ../src/setting.c:1203
 #, c-format
 msgid "Error: Cannot write list to file: %s (%s)"
 msgstr "Fehler: Liste kann nicht in Datei geschrieben werden: %s (%s)"
 
-#: ../src/setting.c:1225
+#: ../src/setting.c:1221
 #, c-format
 msgid "Error while writing list file: %s"
 msgstr "Fehler beim Schreiben der Dateiliste: »%s«"
 
 #. Fall back to defaults
-#: ../src/setting.c:1305
+#: ../src/setting.c:1301
 msgid "Loading default 'Fill Tag' masks…"
-msgstr "Vorgaben für »Tag füllen«-Masken werden geladen …"
+msgstr "Vorgaben für »Metainfo füllen«-Masken werden geladen …"
 
 #. Fall back to defaults
-#: ../src/setting.c:1335
+#: ../src/setting.c:1331
 msgid "Loading default 'Rename File' masks…"
 msgstr "Vorgabe für »Datei umbenennen«-Masken werden geladen …"
 
 #. Fall back to defaults
-#: ../src/setting.c:1361
+#: ../src/setting.c:1357
 msgid "Loading default 'Rename Directory' masks…"
 msgstr "Vorgabe für »Ordner umbenennen«-Masken werden geladen …"
 
-#: ../src/setting.c:1572
+#: ../src/setting.c:1568
 #, c-format
 msgid "Migrating configuration from directory '%s' to '%s'"
 msgstr "Konfiguration wird von Ordner »%s« nach »%s« migriert"
 
-#: ../src/setting.c:1596
+#: ../src/setting.c:1592
 #, c-format
 msgid "Failed to migrate configuration file '%s'"
 msgstr "Konfigurationsdatei »%s« kann nicht migriert werden"
 
-#: ../src/setting.c:1633
+#: ../src/setting.c:1629
 #, c-format
 msgid "Error: Cannot create directory '%s' (%s)"
 msgstr "Fehler: Ordner »%s« kann nicht angelegt werden (%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« noch nicht geladen. Es wird versucht, sie zu laden …"
+#~ msgid "The program '%s' cannot be found"
+#~ msgstr "Das Programm »%s« wurde nicht gefunden"
 
-#. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: ../src/win32/win32dep.c:130
-#, c-format
-msgid "DLL '%s' could not be loaded"
-msgstr "DLL »%s« konnte nicht geladen werden"
+#~ msgid "Cannot execute ‘%s’ (%s)"
+#~ msgstr "»%s« kann nicht ausgeführt werden (%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 "Diese Version von »%s« enthält »%s«"
+#~ msgid "Cannot fork another process\n"
+#~ msgstr "Es kann kein weiterer Prozess abgespalten werden\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 "Funktion »%s« nicht in DLL »%s« gefunden"
+#~ msgid "EasyTAG version %s: Abnormal exit (PID: %d)"
+#~ msgstr "EasyTAG Version %s: Fehlerhaft beendet (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 "Ordner für EasyTAG-Einstellungen: »%s«"
+#~ msgid "Received signal '%s' (%d)"
+#~ msgstr "Signal »%s« (%d) wurde empfangen"
 
-#. Log_Print(_("weasytag_init start..."));
-#: ../src/win32/win32dep.c:472
-#, c-format
-msgid "weasytag_init start..."
-msgstr "weasytag_init gestartet …"
+#~ 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 ""
+#~ "Sie haben vermutlich einen Fehler in EasyTAG gefunden. Senden Sie bitte "
+#~ "einen Fehlerbericht mit einem GDB-Backtrace (»gdb easytag core«, dann "
+#~ "»bt« und »l«) und Informationen zum Reproduzieren des Fehlers an: %s"
 
-#. 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 "GLib Version: %u.%u.%u\n"
+#~ msgid "EasyTAG version %s: Abnormal exit (PID: %d)."
+#~ msgstr "EasyTAG Version %s: Fehlerhaft beendet (PID: %d)."
 
-#. Set Environmental Variables
-#. Log_Print(_("weasytag_init end..."));
-#: ../src/win32/win32dep.c:496
-#, c-format
-msgid "weasytag_init end..."
-msgstr "weasytag_init beendet …"
+#~ msgid "Cannot change the permissions of file '%s' (%s)"
+#~ msgstr "Die Zugriffsrechte der Datei »%s« können nicht geändert werden (%s)"
 
-#. Log_Print(_("Audio player: '%s'"), player);
-#: ../src/win32/win32dep.c:620
-#, c-format
-msgid "Audio player: '%s'"
-msgstr "Audio-Wiedergabeprogramm: »%s«"
+#~ msgid "No audio player defined"
+#~ msgstr "Kein Musikwiedergabeprogramm festgelegt"
+
+#~ msgid "Audio Player Warning"
+#~ msgstr "Audio-Wiedergabe-Warnung"
+
+#~ msgid "Cannot fork another process"
+#~ msgstr "Es kann kein weiterer Prozess abgespalten werden"
+
+#~ 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« noch nicht geladen. Es wird versucht, sie zu laden …"
+
+#~ msgid "DLL '%s' could not be loaded"
+#~ msgstr "DLL »%s« konnte nicht geladen werden"
+
+#~ msgid "This version of '%s' contains '%s'"
+#~ msgstr "Diese Version von »%s« enthält »%s«"
+
+#~ msgid "Function '%s' not found in DLL '%s'"
+#~ msgstr "Funktion »%s« nicht in DLL »%s« gefunden"
+
+#~ msgid "EasyTAG settings directory: '%s'"
+#~ msgstr "Ordner für EasyTAG-Einstellungen: »%s«"
+
+#~ msgid "weasytag_init start..."
+#~ msgstr "weasytag_init gestartet …"
+
+#~ msgid "GLib version: %u.%u.%u\n"
+#~ msgstr "GLib Version: %u.%u.%u\n"
+
+#~ msgid "weasytag_init end..."
+#~ msgstr "weasytag_init beendet …"
+
+#~ msgid "Audio player: '%s'"
+#~ msgstr "Audio-Wiedergabeprogramm: »%s«"
 
 #~ msgid "Cannot execute %s (error %d)\n"
 #~ msgstr "»%s« kann nicht ausgeführt werden (Fehler %d)\n"
@@ -6509,10 +6514,6 @@ msgstr "Audio-Wiedergabeprogramm: »%s«"
 #~ msgid "Writing tag(s) …"
 #~ msgstr "Tag(s) werden geschrieben …"
 
-#, fuzzy
-#~ msgid "List Content :"
-#~ msgstr "Inhalt der Playliste"
-
 #~ msgid "Prepare reading of directory …"
 #~ msgstr "Lesen des Verzeichnisses wird vorbereitet …"
 
diff --git a/po/sl.po b/po/en_GB.po
similarity index 54%
copy from po/sl.po
copy to po/en_GB.po
index 31eb704..24affe5 100644
--- a/po/sl.po
+++ b/po/en_GB.po
@@ -1,42 +1,60 @@
-# Slovenian translation for easytag.
-# Copyright (C) 2012 easytag's COPYRIGHT HOLDER
-# This file is distributed under the same license as the easytag package.
-#
-# Martin Srebotnjak <miles at filmsi.net>, 2013.
-# Matej Urbančič <mateju at svn.gnome.org>, 2012-2014.
+# British English translation of EasyTAG.
+# Copyright (C) 2014 David King
+# This file is distributed under the same license as the EasyTAG package.
+# David King <amigadave at amigadave.com>, 2014.
 #
 msgid ""
 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"
-"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"
+"Project-Id-Version: easytag-2.1.10\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-04-09 09:31+0100\n"
+"PO-Revision-Date: 2014-03-20 10:18+0000\n"
+"Last-Translator: David King <amigadave at amigadave.com>\n"
+"Language-Team: British English <gnome-i18n at gnome.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100==4 ? 3 : 0);\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Poedit 1.5.4\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 Opus, Ogg Speex, Ogg "
+"Vorbis, MusePack, Monkey's Audio and WavPack files."
+msgstr ""
+"View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg "
+"Vorbis, MusePack, Monkey's Audio and WavPack files."
+
+#: ../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 ""
+"Look up albums in online databases, bulk edit tags, create playlists and "
+"rename a collection of files."
+
+#: ../data/easytag.appdata.xml.in.h:3
+msgid ""
+"A simple and nice GTK+ interface makes tagging easier under GNU/Linux and "
+"Windows."
+msgstr ""
+"A simple and nice GTK+ interface makes tagging easier under GNU/Linux and "
+"Windows."
 
 #: ../data/easytag.desktop.in.h:1
 msgid "Sound File Metadata Editor"
-msgstr "Urejevalnik metapodatkov zvočnih datotek"
+msgstr "Sound File Metadata Editor"
 
 #: ../data/easytag.desktop.in.h:2
 msgid "Edit sound file metadata"
-msgstr "Urejanje metapodatkov zvočnih datotek"
+msgstr "Edit sound file metadata"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/easytag.desktop.in.h:4
 msgid "mp3;tag;audio;"
-msgstr "mp3;oznake;tag;zvok;skladbe;"
+msgstr "mp3;tag;audio;"
 
-#: ../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 "
@@ -51,997 +69,984 @@ msgid ""
 "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 ""
-"Program je prosta programska oprema; lahko jo razširjate in/ali spreminjate "
-"pod pogoji Splošnega javnega dovoljenja GNU (GNU General Public License), "
-"kot ga je objavila ustanova Free Software Foundation; bodisi različice 2 ali "
-"(po vaši izbiri) poljubne poznejše različice.\n"
+"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"
-"Program se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA "
-"JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA "
-"DOLOČEN NAMEN.  Za podrobnosti glejte besedilo Javnega dovoljenja GNU.\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"
-"Skupaj s programom bi morali prejeti izvod splošnega javnega dovoljenja GNU "
-"(GNU General Public License); če ga niste si oglejte spletno stran <http://"
-"www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <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 "Matej Urbančič <matej.urban at svn.gnome.org>"
+msgstr "David King <amigadave at amigadave.com>"
 
-#: ../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"
+msgstr "View and edit tags in audio files"
 
 #. 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
 #, c-format
 msgid "Error while opening file: '%s' (%s)."
-msgstr "Napaka med odpiranjem datoteke: '%s' (%s)."
+msgstr "Error while opening file: '%s' (%s)."
 
 #: ../src/application.c:37
 msgid "Print the version and exit"
-msgstr "Izpiši različico in zapri"
+msgstr "Print the version and exit"
 
 #: ../src/application.c:89
 #, c-format
 msgid "Website: %s"
-msgstr "Spletišče: %s"
+msgstr "Website: %s"
 
 #: ../src/application.c:98
 msgid "- Tag and rename audio files"
-msgstr "- označevanje in preimenovanje zvočnih datotek"
+msgstr "- Tag and rename audio files"
 
 #.
 #. * Main Menu Actions
 #.
-#: ../src/bar.c:154
+#: ../src/bar.c:155
 msgid "_File"
-msgstr "_Datoteka"
+msgstr "_File"
 
-#: ../src/bar.c:155
+#: ../src/bar.c:156
 msgid "Sort List by Tag"
-msgstr "Razvrsti seznam po oznakah"
+msgstr "Sort List by Tag"
 
-#: ../src/bar.c:158
+#: ../src/bar.c:159
 msgid "Sort List by Property"
-msgstr "Razvrsti seznam po lastnostih"
+msgstr "Sort List by Property"
 
-#: ../src/bar.c:159
+#: ../src/bar.c:160
 msgid "Ascending by filename"
-msgstr "Razvrsti po imenu datoteke (naraščajoče)"
+msgstr "Ascending by filename"
 
-#: ../src/bar.c:160
+#: ../src/bar.c:161
 msgid "Descending by filename"
-msgstr "Razvrsti po imenu datoteke (padajoče)"
+msgstr "Descending by filename"
 
-#: ../src/bar.c:161
+#: ../src/bar.c:162
 msgid "Ascending by creation date"
-msgstr "Razvrsti po datumu ustvarjanja (naraščajoče)"
+msgstr "Ascending by creation date"
 
-#: ../src/bar.c:162
+#: ../src/bar.c:163
 msgid "Descending by creation date"
-msgstr "Razvrsti po datumu ustvarjanja (padajoče)"
+msgstr "Descending by creation date"
 
-#: ../src/bar.c:163
+#: ../src/bar.c:164
 msgid "Ascending by track number"
-msgstr "Naraščajoče po vrstnem redu sledi"
+msgstr "Ascending by track number"
 
-#: ../src/bar.c:164
+#: ../src/bar.c:165
 msgid "Descending by track number"
-msgstr "Padajoče po vrstnem redu sledi"
+msgstr "Descending by track number"
 
-#: ../src/bar.c:165
+#: ../src/bar.c:166
 msgid "Ascending by title"
-msgstr "Naraščajoče po naslovu"
+msgstr "Ascending by title"
 
-#: ../src/bar.c:166
+#: ../src/bar.c:167
 msgid "Descending by title"
-msgstr "Padajoče po naslovu"
+msgstr "Descending by title"
 
-#: ../src/bar.c:167
+#: ../src/bar.c:168
 msgid "Ascending by artist"
-msgstr "Naraščajoče po izvajalcu"
+msgstr "Ascending by artist"
 
-#: ../src/bar.c:168
+#: ../src/bar.c:169
 msgid "Descending by artist"
-msgstr "Padajoče po izvajalcu"
+msgstr "Descending by artist"
 
-#: ../src/bar.c:169
+#: ../src/bar.c:170
 msgid "Ascending by album artist"
-msgstr "Naraščajoče po izvajalcu albuma"
+msgstr "Ascending by album artist"
 
-#: ../src/bar.c:170
+#: ../src/bar.c:171
 msgid "Descending by album artist"
-msgstr "Padajoče po izvajalcu albuma"
+msgstr "Descending by album artist"
 
-#: ../src/bar.c:171
+#: ../src/bar.c:172
 msgid "Ascending by album"
-msgstr "Naraščajoče po albumu"
+msgstr "Ascending by album"
 
-#: ../src/bar.c:172
+#: ../src/bar.c:173
 msgid "Descending by album"
-msgstr "Padajoče po albumu"
+msgstr "Descending by album"
 
-#: ../src/bar.c:173
+#: ../src/bar.c:174
 msgid "Ascending by year"
-msgstr "Naraščajoče po letu izida"
+msgstr "Ascending by year"
 
-#: ../src/bar.c:174
+#: ../src/bar.c:175
 msgid "Descending by year"
-msgstr "Padajoče po letu izida"
+msgstr "Descending by year"
 
-#: ../src/bar.c:175
+#: ../src/bar.c:176
 msgid "Ascending by genre"
-msgstr "Naraščajoče po zvrsti"
+msgstr "Ascending by genre"
 
-#: ../src/bar.c:176
+#: ../src/bar.c:177
 msgid "Descending by genre"
-msgstr "Padajoče po zvrsti"
+msgstr "Descending by genre"
 
-#: ../src/bar.c:177
+#: ../src/bar.c:178
 msgid "Ascending by comment"
-msgstr "Naraščajoče po opombah"
+msgstr "Ascending by comment"
 
-#: ../src/bar.c:178
+#: ../src/bar.c:179
 msgid "Descending by comment"
-msgstr "Padajoče po opombah"
+msgstr "Descending by comment"
 
-#: ../src/bar.c:179
+#: ../src/bar.c:180
 msgid "Ascending by composer"
-msgstr "naraščajoče po skladatelju"
+msgstr "Ascending by composer"
 
-#: ../src/bar.c:180
+#: ../src/bar.c:181
 msgid "Descending by composer"
-msgstr "padajoče po skladatelju"
+msgstr "Descending by composer"
 
-#: ../src/bar.c:181
+#: ../src/bar.c:182
 msgid "Ascending by original artist"
-msgstr "naraščajoče po izvirnem izvajalcu"
+msgstr "Ascending by original artist"
 
-#: ../src/bar.c:182
+#: ../src/bar.c:183
 msgid "Descending by original artist"
-msgstr "padajoče po izvirnem izvajalcu"
+msgstr "Descending by original artist"
 
-#: ../src/bar.c:183
+#: ../src/bar.c:184
 msgid "Ascending by copyright"
-msgstr "Naraščajoče po avtorskih pravicah"
+msgstr "Ascending by copyright"
 
-#: ../src/bar.c:184
+#: ../src/bar.c:185
 msgid "Descending by copyright"
-msgstr "Padajoče po avtorskih pravicah"
+msgstr "Descending by copyright"
 
-#: ../src/bar.c:185
+#: ../src/bar.c:186
 msgid "Ascending by URL"
-msgstr "Naraščajoče po naslovu URL"
+msgstr "Ascending by URL"
 
-#: ../src/bar.c:186
+#: ../src/bar.c:187
 msgid "Descending by URL"
-msgstr "Padajoče po naslovu URL"
+msgstr "Descending by 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"
+msgstr "Ascending by encoder name"
 
 #. 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"
+msgstr "Descending by encoder name"
 
-#: ../src/bar.c:193
+#: ../src/bar.c:194
 msgid "Ascending by file type"
-msgstr "Naraščajoče po vrsti datoteke"
+msgstr "Ascending by file type"
 
-#: ../src/bar.c:194
+#: ../src/bar.c:195
 msgid "Descending by file type"
-msgstr "Padajoče po vrsti datoteke"
+msgstr "Descending by file type"
 
-#: ../src/bar.c:195
+#: ../src/bar.c:196
 msgid "Ascending by file size"
-msgstr "Naraščajoče po velikosti datoteke"
+msgstr "Ascending by file size"
 
-#: ../src/bar.c:196
+#: ../src/bar.c:197
 msgid "Descending by file size"
-msgstr "Padajoče po velikosti datoteke"
+msgstr "Descending by file size"
 
-#: ../src/bar.c:197
+#: ../src/bar.c:198
 msgid "Ascending by duration"
-msgstr "Naraščajoče po trajanju"
+msgstr "Ascending by duration"
 
-#: ../src/bar.c:198
+#: ../src/bar.c:199
 msgid "Descending by duration"
-msgstr "Padajoče po trajanju"
+msgstr "Descending by duration"
 
-#: ../src/bar.c:199
+#: ../src/bar.c:200
 msgid "Ascending by bitrate"
-msgstr "Naraščajoče po bitni hitrosti"
+msgstr "Ascending by bitrate"
 
-#: ../src/bar.c:200
+#: ../src/bar.c:201
 msgid "Descending by bitrate"
-msgstr "Padajoče po bitni hitrosti"
+msgstr "Descending by bitrate"
 
-#: ../src/bar.c:201
+#: ../src/bar.c:202
 msgid "Ascending by samplerate"
-msgstr "naraščajoče po meri vzorčenja"
+msgstr "Ascending by samplerate"
 
-#: ../src/bar.c:202
+#: ../src/bar.c:203
 msgid "Descending by samplerate"
-msgstr "padajoče po meri vzorčenja"
+msgstr "Descending by samplerate"
 
-#: ../src/bar.c:204
+#: ../src/bar.c:205
 msgid "Open Files With…"
-msgstr "Odpri s programom ..."
+msgstr "Open Files With…"
 
-#: ../src/bar.c:205
+#: ../src/bar.c:206
 msgid "Run a command on the selected files"
-msgstr "Izvedi ukaz na izbranih datotekah"
+msgstr "Run a command on the selected files"
 
-#: ../src/bar.c:208
+#: ../src/bar.c:209
 msgid "Select all"
-msgstr "Izberi vse"
+msgstr "Select all"
 
-#: ../src/bar.c:209
+#: ../src/bar.c:210
 msgid "Unselect All"
-msgstr "Prekliči celoten izbor"
+msgstr "Unselect All"
 
-#: ../src/bar.c:210
+#: ../src/bar.c:211
 msgid "Clear the current selection"
-msgstr "Počisti trenutni izbor"
+msgstr "Clear the current selection"
 
-#: ../src/bar.c:213
+#: ../src/bar.c:214
 msgid "Invert File Selection"
-msgstr "Preobrni izbor datotek"
+msgstr "Invert File Selection"
 
-#: ../src/bar.c:214
+#: ../src/bar.c:215
 msgid "Invert file selection"
-msgstr "Preobrni izbor datotek"
+msgstr "Invert file selection"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete Files"
-msgstr "Izbriši datoteke"
+msgstr "Delete Files"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete files"
-msgstr "Izbriši datoteke"
+msgstr "Delete files"
 
-#: ../src/bar.c:217
+#: ../src/bar.c:218
 msgid "_First File"
-msgstr "_Prva datoteka"
+msgstr "_First File"
 
-#: ../src/bar.c:218
+#: ../src/bar.c:219
 msgid "First file"
-msgstr "Prva datoteka"
+msgstr "First file"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "_Previous File"
-msgstr "_Predhodna datoteka"
+msgstr "_Previous File"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "Previous file"
-msgstr "Predhodna datoteka"
+msgstr "Previous file"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "_Next File"
-msgstr "_Naslednja datoteka"
+msgstr "_Next File"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "Next file"
-msgstr "Naslednja datoteka"
+msgstr "Next file"
 
-#: ../src/bar.c:221
+#: ../src/bar.c:222
 msgid "_Last File"
-msgstr "_Zadnja datoteka"
+msgstr "_Last File"
 
-#: ../src/bar.c:222
+#: ../src/bar.c:223
 msgid "Last file"
-msgstr "Zadnja datoteka"
+msgstr "Last file"
 
-#: ../src/bar.c:223
+#: ../src/bar.c:224
 msgid "S_can Files"
-msgstr "_Preišči datoteke"
+msgstr "S_can Files"
 
-#: ../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"
+msgstr "Scan selected files"
 
-#: ../src/bar.c:225
+#: ../src/bar.c:226
 msgid "_Remove Tags"
-msgstr "_Odstrani oznake"
+msgstr "_Remove Tags"
 
-#: ../src/bar.c:226
+#: ../src/bar.c:227
 msgid "Remove tags"
-msgstr "Odstrani oznake"
+msgstr "Remove tags"
 
-#: ../src/bar.c:227
+#: ../src/bar.c:228
 msgid "_Undo Last Files Changes"
-msgstr "_Razveljavi zadnje spremembe datotek"
+msgstr "_Undo Last Files Changes"
 
-#: ../src/bar.c:228
+#: ../src/bar.c:229
 msgid "Undo last files changes"
-msgstr "Razveljavi zadnje spremembe datotek"
+msgstr "Undo last files changes"
 
-#: ../src/bar.c:230
+#: ../src/bar.c:231
 msgid "R_edo Last Files Changes"
-msgstr "_Ponovi zadnje spremembe datotek"
+msgstr "R_edo Last Files Changes"
 
-#: ../src/bar.c:231
+#: ../src/bar.c:232
 msgid "Redo last files changes"
-msgstr "Ponovi zadnje spremembe datotek"
+msgstr "Redo last files changes"
 
-#: ../src/bar.c:233
+#: ../src/bar.c:234
 msgid "_Save Files"
-msgstr "_Shrani datoteke"
+msgstr "_Save Files"
 
-#: ../src/bar.c:234
+#: ../src/bar.c:235
 msgid "Save changes to selected files"
-msgstr "Shrani spremembe v izbrane datoteke"
+msgstr "Save changes to selected files"
 
-#: ../src/bar.c:236
+#: ../src/bar.c:237
 msgid "_Force Save Files"
-msgstr "_Vsili shranjevanje datotek"
+msgstr "_Force Save Files"
 
-#: ../src/bar.c:237
+#: ../src/bar.c:238
 msgid "Force saving files"
-msgstr "Vsili shranjevanje datotek"
+msgstr "Force saving files"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo Last Changes"
-msgstr "Razveljavi zadnje spremembe"
+msgstr "Undo Last Changes"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo last changes"
-msgstr "Razveljavi zadnje spremembe"
+msgstr "Undo last changes"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo Last Changes"
-msgstr "Ponovno uveljavi zadnje spremembe"
+msgstr "Redo Last Changes"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo last changes"
-msgstr "Ponovno uveljavi zadnje spremembe"
+msgstr "Redo last changes"
 
-#: ../src/bar.c:241
+#: ../src/bar.c:242
 msgid "_Quit"
-msgstr "_Končaj"
+msgstr "_Quit"
 
-#: ../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"
+msgstr "Quit"
 
-#: ../src/bar.c:244
+#: ../src/bar.c:245
 msgid "_Browser"
-msgstr "_Brskalnik"
+msgstr "_Browser"
 
-#: ../src/bar.c:245
+#: ../src/bar.c:246
 msgid "_Home Directory"
-msgstr "_Domača mapa"
+msgstr "_Home Directory"
 
-#: ../src/bar.c:246
+#: ../src/bar.c:247
 msgid "Go to home directory"
-msgstr "Pojdi v domačo mapo"
+msgstr "Go to home directory"
 
-#: ../src/bar.c:248
+#: ../src/bar.c:249
 msgid "Desktop Directory"
-msgstr "Mapa Namizje"
+msgstr "Desktop Directory"
 
-#: ../src/bar.c:249
+#: ../src/bar.c:250
 msgid "Go to desktop directory"
-msgstr "Pojdi v mapo namizja"
+msgstr "Go to desktop directory"
 
-#: ../src/bar.c:251
+#: ../src/bar.c:252
 msgid "Documents Directory"
-msgstr "Mapa Dokumenti"
+msgstr "Documents Directory"
 
-#: ../src/bar.c:252
+#: ../src/bar.c:253
 msgid "Go to documents directory"
-msgstr "Pojdi v mapo dokumentov"
+msgstr "Go to documents directory"
 
-#: ../src/bar.c:254
+#: ../src/bar.c:255
 msgid "Downloads Directory"
-msgstr "Mapa Prejemi"
+msgstr "Downloads Directory"
 
-#: ../src/bar.c:255
+#: ../src/bar.c:256
 msgid "Go to downloads directory"
-msgstr "Pojdi v mapo prenosov"
+msgstr "Go to downloads directory"
 
-#: ../src/bar.c:257
+#: ../src/bar.c:258
 msgid "Music Directory"
-msgstr "Mapa Glasba"
+msgstr "Music Directory"
 
-#: ../src/bar.c:258
+#: ../src/bar.c:259
 msgid "Go to music directory"
-msgstr "Pojdi v mapo z glasbo"
+msgstr "Go to music directory"
 
-#: ../src/bar.c:260
+#: ../src/bar.c:261
 msgid "_Parent Directory"
-msgstr "_Nadrejena mapa"
+msgstr "_Parent Directory"
 
-#: ../src/bar.c:261
+#: ../src/bar.c:262
 msgid "Go to parent directory"
-msgstr "Pojdi v mapo višje"
+msgstr "Go to parent directory"
 
-#: ../src/bar.c:263
+#: ../src/bar.c:264
 msgid "_Default Directory"
-msgstr "_Privzeta mapa"
+msgstr "_Default Directory"
 
-#: ../src/bar.c:264
+#: ../src/bar.c:265
 msgid "Go to default directory"
-msgstr "Pojdi v privzeto mapo"
+msgstr "Go to default directory"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set _Current Path as Default"
-msgstr "Nastavi _trenutno pot kot privzeto"
+msgstr "Set _Current Path as Default"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set current path as default"
-msgstr "Nastavi trenutno pot kot privzeto"
+msgstr "Set current path as default"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename Directory…"
-msgstr "Preimenuj mapo ..."
+msgstr "Rename Directory…"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename directory"
-msgstr "Preimenuj mapo"
+msgstr "Rename directory"
 
-#: ../src/bar.c:268
+#: ../src/bar.c:269
 msgid "Reload Directory"
-msgstr "Ponovno naloži mapo"
+msgstr "Reload Directory"
 
-#: ../src/bar.c:269
+#: ../src/bar.c:270
 msgid "Reload directory"
-msgstr "Ponovno naloži mapo"
+msgstr "Reload directory"
 
-#: ../src/bar.c:272
+#: ../src/bar.c:273
 msgid "Browse Directory With…"
-msgstr "Prebrskaj mapo z ..."
+msgstr "Browse Directory With…"
 
-#: ../src/bar.c:273
+#: ../src/bar.c:274
 msgid "Run a command on the directory"
-msgstr "Izvedi ukaz v mapi"
+msgstr "Run a command on the directory"
 
-#: ../src/bar.c:275
+#: ../src/bar.c:276
 msgid "_Collapse Tree"
-msgstr "_Strni drevo"
+msgstr "_Collapse Tree"
 
-#: ../src/bar.c:276
+#: ../src/bar.c:277
 msgid "Collapse directory tree"
-msgstr "Strni drevo map"
+msgstr "Collapse directory tree"
 
-#: ../src/bar.c:277
+#: ../src/bar.c:278
 msgid "_Reload Tree"
-msgstr "Po_novno naloži drevo"
+msgstr "_Reload Tree"
 
-#: ../src/bar.c:278
+#: ../src/bar.c:279
 msgid "Reload directory tree"
-msgstr "Ponovno naloži drevo map"
+msgstr "Reload directory tree"
 
-#: ../src/bar.c:281
+#: ../src/bar.c:282
 msgid "S_canner Mode"
-msgstr "_Način preiskovanja datotek"
+msgstr "S_canner Mode"
 
-#: ../src/bar.c:283
+#: ../src/bar.c:284
 msgid "_Miscellaneous"
-msgstr "_Razno"
+msgstr "_Miscellaneous"
 
-#: ../src/bar.c:284
+#: ../src/bar.c:285
 msgid "_Find…"
-msgstr "_Najdi ..."
+msgstr "_Find…"
 
-#: ../src/bar.c:285
+#: ../src/bar.c:286
 msgid "Search filenames and tags"
-msgstr "Poišči imena datotek in oznake"
+msgstr "Search filenames and tags"
 
-#: ../src/bar.c:287
+#: ../src/bar.c:288
 msgid "CDD_B Search…"
-msgstr "Iskanje CDD_B ..."
+msgstr "CDD_B Search…"
 
-#: ../src/bar.c:288
+#: ../src/bar.c:289
 msgid "CDDB search"
-msgstr "Iskanje po CDDB"
+msgstr "CDDB search"
 
-#: ../src/bar.c:290
+#: ../src/bar.c:291
 msgid "Load Filenames From a Text File…"
-msgstr "Naloži imena datotek iz besedilne datoteke ..."
+msgstr "Load Filenames From a Text File…"
 
-#: ../src/bar.c:291
+#: ../src/bar.c:292
 msgid "Load filenames from a text file"
-msgstr "Naloži imena datotek iz besedilne datoteke"
+msgstr "Load filenames from a text file"
 
-#: ../src/bar.c:293
+#: ../src/bar.c:294
 msgid "Generate Playlist…"
-msgstr "Ustvari seznam predvajanja ..."
+msgstr "Generate Playlist…"
 
-#: ../src/bar.c:294
+#: ../src/bar.c:295
 msgid "Generate a playlist"
-msgstr "Ustvari seznam predvajanja"
+msgstr "Generate a playlist"
 
-#: ../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"
+msgstr "Run Audio Player"
 
-#: ../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"
+msgstr "Run audio player"
 
-#: ../src/bar.c:300
+#: ../src/bar.c:301
 msgid "_Edit"
-msgstr "_Uredi"
+msgstr "_Edit"
 
-#: ../src/bar.c:301
+#: ../src/bar.c:302
 msgid "_Preferences"
-msgstr "_Možnosti"
+msgstr "_Preferences"
 
 #. The window
-#: ../src/bar.c:302 ../src/prefs.c:110
+#: ../src/bar.c:303 ../src/prefs.c:110
 msgid "Preferences"
-msgstr "Možnosti"
+msgstr "Preferences"
 
-#: ../src/bar.c:304
+#: ../src/bar.c:305
 msgid "_View"
-msgstr "Po_gled"
+msgstr "_View"
 
-#: ../src/bar.c:305
+#: ../src/bar.c:306
 msgid "_Go"
-msgstr "_Pojdi"
+msgstr "_Go"
 
-#: ../src/bar.c:307
+#: ../src/bar.c:308
 msgid "_Help"
-msgstr "Pomo_č"
+msgstr "_Help"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:311
+msgid "_Contents"
+msgstr "_Contents"
+
+#: ../src/bar.c:312
+msgid "Show help"
+msgstr "Show help"
+
+#: ../src/bar.c:314
 msgid "_About"
-msgstr "_O programu"
+msgstr "_About"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:314
 msgid "About"
-msgstr "O programu"
+msgstr "About"
 
 #.
 #. * 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"
+msgstr "Stop the current action"
 
 #.
 #. * Popup menu's Actions
 #.
-#: ../src/bar.c:320
+#: ../src/bar.c:326
 msgid "_File Operations"
-msgstr "Opravila _datotek"
+msgstr "_File Operations"
 
-#: ../src/bar.c:321
+#: ../src/bar.c:327
 msgid "S_canner"
-msgstr "_Preiskovalnik"
+msgstr "S_canner"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:331
 msgid "CDDB Search Files…"
-msgstr "Datoteke iskanja CDDB ..."
+msgstr "CDDB Search Files…"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:331
 msgid "CDDB search files…"
-msgstr "Datoteke iskanja CDDB ...Odstranjevanje namestitvenih datotek ..."
+msgstr "CDDB search files…"
 
 #. { 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"
+msgstr "Clear log"
 
 #. { 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"
+msgstr "Browse _Subdirectories"
 
-#: ../src/bar.c:336
+#: ../src/bar.c:342
 msgid "Browse subdirectories"
-msgstr "Prebrskaj podmape"
+msgstr "Browse subdirectories"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:346
 msgid "Show Hidden Directories"
-msgstr "Pokaži skrite mape"
+msgstr "Show Hidden Directories"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:346
 msgid "Show hidden directories"
-msgstr "Pokaži skrite mape"
+msgstr "Show hidden directories"
 
-#: ../src/bar.c:342
+#: ../src/bar.c:348
 msgid "_Show Scanner"
-msgstr "_Pokaži preiskovalnik"
+msgstr "_Show Scanner"
 
-#: ../src/bar.c:343
+#: ../src/bar.c:349
 msgid "Show scanner"
-msgstr "Pokaži preiskovalnik"
+msgstr "Show scanner"
 
-#: ../src/bar.c:349
+#: ../src/bar.c:355
 msgid "Tree Browser"
-msgstr "Drevesni brskalnik"
+msgstr "Tree Browser"
 
-#: ../src/bar.c:350
+#: ../src/bar.c:356
 msgid "View by directory tree"
-msgstr "Pokaži drevo map"
+msgstr "View by directory tree"
 
-#: ../src/bar.c:352
+#: ../src/bar.c:358
 msgid "Artist and Album"
-msgstr "Izvajalec in album"
+msgstr "Artist and Album"
 
-#: ../src/bar.c:353
+#: ../src/bar.c:359
 msgid "View by artist and album"
-msgstr "Pokaži po izvajalcih in albumih"
+msgstr "View by artist and album"
 
-#: ../src/bar.c:358
+#: ../src/bar.c:364
 msgid "_Fill Tags…"
-msgstr "_Zapolni oznake …"
+msgstr "_Fill Tags…"
 
-#: ../src/bar.c:359
+#: ../src/bar.c:365
 msgid "Fill tags"
-msgstr "Zapolni oznake"
+msgstr "Fill tags"
 
-#: ../src/bar.c:361
+#: ../src/bar.c:367
 msgid "_Rename Files and Directories…"
-msgstr "_Preimenuj datoteke in mape ..."
+msgstr "_Rename Files and Directories…"
 
-#: ../src/bar.c:362
+#: ../src/bar.c:368
 msgid "Rename files and directories"
-msgstr "Preimenuj datoteke in mape"
+msgstr "Rename files and directories"
 
-#: ../src/bar.c:364
+#: ../src/bar.c:370
 msgid "_Process Fields…"
-msgstr "_Obdelaj polja ..."
+msgstr "_Process Fields…"
 
-#: ../src/bar.c:364 ../src/scan.c:182
+#: ../src/bar.c:370 ../src/scan_dialog.c:184
 msgid "Process Fields"
-msgstr "Obdelaj polja"
+msgstr "Process Fields"
 
-#: ../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"
+msgstr "Could not merge UI, error was: %s\n"
 
-#: ../src/bar.c:528
+#: ../src/bar.c:533
 msgid "Ready to start"
-msgstr "Pripravljeno za začetek"
+msgstr "Ready to start"
 
-#: ../src/browser.c:369
+#: ../src/browser.c:376
 msgid "New default path for files selected"
-msgstr "Nova privzeta pot za izbrane datoteke"
+msgstr "New default path for files selected"
 
-#: ../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"
+msgstr "Some files have been modified but not saved"
 
-#: ../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?"
+msgstr "Do you want to save them before changing the directory?"
 
-#: ../src/browser.c:675
+#: ../src/browser.c:683
 msgid "Confirm Directory Change"
-msgstr "Potrdi spremembo mape"
+msgstr "Confirm Directory Change"
 
-#: ../src/browser.c:2121
+#: ../src/browser.c:2146
 msgid "<All albums>"
-msgstr "<Vsi albumi>"
+msgstr "<All albums>"
 
-#: ../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"
+msgstr "Error: Searching for %s, could not find node %s in tree."
 
-#: ../src/browser.c:3065 ../src/browser.c:3143
+#: ../src/browser.c:3101 ../src/browser.c:3179
 msgid "Tree"
-msgstr "Drevo"
+msgstr "Tree"
 
-#: ../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"
+msgstr "Filename"
 
-#: ../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"
+msgstr "Title"
 
 #. 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"
+msgstr "Artist"
 
-#: ../src/browser.c:3067 ../src/misc.c:1914
+#: ../src/browser.c:3103 ../src/misc.c:1906
 msgid "Album Artist"
-msgstr "Izvajalec albuma"
+msgstr "Album Artist"
 
 #. 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"
+msgstr "Year"
 
-#: ../src/browser.c:3068
+#: ../src/browser.c:3104
 msgid "Disc"
-msgstr "Disk"
+msgstr "Disc"
 
-#: ../src/browser.c:3069 ../src/misc.c:1918
+#: ../src/browser.c:3105 ../src/misc.c:1910
 msgid "Track"
-msgstr "Posnetek"
+msgstr "Track"
 
-#: ../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"
+msgstr "Genre"
 
-#: ../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"
+msgstr "Comment"
 
-#: ../src/browser.c:3070 ../src/misc.c:1921 ../src/picture.c:863
+#: ../src/browser.c:3106 ../src/misc.c:1913 ../src/picture.c:1059
 #: ../src/prefs.c:648
 msgid "Composer"
-msgstr "Skladatelj"
+msgstr "Composer"
 
-#: ../src/browser.c:3071 ../src/misc.c:1922
+#: ../src/browser.c:3107 ../src/misc.c:1914
 msgid "Original Artist"
-msgstr "Izvirni izvajalec"
+msgstr "Original Artist"
 
-#: ../src/browser.c:3072 ../src/misc.c:1923
+#: ../src/browser.c:3108 ../src/misc.c:1915
 msgid "Copyright"
-msgstr "Avtorske pravice"
+msgstr "Copyright"
 
-#: ../src/browser.c:3072 ../src/misc.c:1924
+#: ../src/browser.c:3108 ../src/misc.c:1916
 msgid "URL"
-msgstr "Naslov URL"
+msgstr "URL"
 
-#: ../src/browser.c:3073 ../src/misc.c:1925
+#: ../src/browser.c:3109 ../src/misc.c:1917
 msgid "Encoded By"
-msgstr "Kodirali"
+msgstr "Encoded By"
 
-#: ../src/browser.c:3074
+#: ../src/browser.c:3110
 msgid "# Albums"
-msgstr "Št. albumov"
+msgstr "# Albums"
 
-#: ../src/browser.c:3075 ../src/browser.c:3076
+#: ../src/browser.c:3111 ../src/browser.c:3112
 msgid "# Files"
-msgstr "Št. datotek"
+msgstr "# Files"
 
-#: ../src/browser.c:3101
+#: ../src/browser.c:3137
 msgid "Enter a directory to browse."
-msgstr "Vnesite ime mape za brskanje."
+msgstr "Enter a directory to browse."
 
-#: ../src/browser.c:3110
+#: ../src/browser.c:3146
 msgid "Select a directory to browse."
-msgstr "Izberite mapo za brskanje."
+msgstr "Select a directory to browse."
 
 #.
 #. * 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"
+msgstr "No files"
 
-#: ../src/browser.c:3195
+#: ../src/browser.c:3231
 msgid "Artist & Album"
-msgstr "Izvajalec in album"
+msgstr "Artist & 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"
+msgstr "Rename Directory"
 
-#: ../src/browser.c:3581
+#: ../src/browser.c:3617
 #, c-format
 msgid "Rename the directory '%s' to:"
-msgstr "Preimenuj mapo '%s' v:"
+msgstr "Rename the directory '%s' to:"
 
-#: ../src/browser.c:3600 ../src/misc.c:1175
+#: ../src/browser.c:3636 ../src/misc.c:1172
 msgid "Use mask:"
-msgstr "Uporabi masko:"
+msgstr "Use mask:"
 
-#: ../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."
+msgstr "If activated, it will use masks to rename directory."
 
-#: ../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 ""
+"Select or type in a mask using codes (see Legend in Scanner Window) to "
+"rename the directory from tag fields."
 
 #. Preview label
-#: ../src/browser.c:3645
+#: ../src/browser.c:3681
 msgid "Rename directory preview"
-msgstr "Preimenuj predogled mape"
+msgstr "Rename directory preview"
 
-#: ../src/browser.c:3737
+#: ../src/browser.c:3773
 msgid "You must type a directory name"
-msgstr "Vnesti je treba ime mape."
+msgstr "You must type a directory name"
 
-#: ../src/browser.c:3738 ../src/browser.c:3759
+#: ../src/browser.c:3774 ../src/browser.c:3795
 msgid "Directory Name Error"
-msgstr "Napaka imena mape"
+msgstr "Directory Name Error"
 
-#: ../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."
+msgstr "Could not convert '%s' into filename encoding."
 
-#: ../src/browser.c:3758
+#: ../src/browser.c:3794
 msgid "Please use another name"
-msgstr "Uporabite drugo ime."
+msgstr "Please use another name"
 
-#: ../src/browser.c:3828
+#: ../src/browser.c:3864
 #, c-format
 msgid "The directory name '%s' already exists"
-msgstr "Ime mape '%s' že obstaja"
+msgstr "The directory name '%s' already exists"
 
-#: ../src/browser.c:3829 ../src/easytag.c:2973
+#: ../src/browser.c:3865 ../src/easytag.c:2964
 msgid "Rename File Error"
-msgstr "Napaka preimenovanja datoteke"
+msgstr "Rename File Error"
 
-#: ../src/browser.c:3867 ../src/browser.c:3896
+#: ../src/browser.c:3903 ../src/browser.c:3932
 msgid "Rename Directory Error"
-msgstr "Napaka preimenovanja mape"
+msgstr "Rename Directory Error"
 
-#: ../src/browser.c:3934
+#: ../src/browser.c:3970
 msgid "Directory renamed"
-msgstr "Mapa je preimenovana"
+msgstr "Directory renamed"
 
-#: ../src/browser.c:3970
+#: ../src/browser.c:4006
 msgid "Browse Directory With"
-msgstr "Prebrskaj mapo s programom"
+msgstr "Browse Directory With"
 
-#: ../src/browser.c:3986 ../src/browser.c:4112
+#: ../src/browser.c:4022 ../src/browser.c:4148
 msgid "Program to run:"
-msgstr "Program za zagon:"
+msgstr "Program to run:"
 
-#: ../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."
+"Enter the program to run. It will receive the current directory as parameter."
 
-#: ../src/browser.c:4092
+#: ../src/browser.c:4128
 msgid "Open Files With"
-msgstr "Odpri datoteke s programom"
+msgstr "Open Files With"
 
-#: ../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"
+"Enter the program to run. It will receive the current file as parameter."
 
 #: ../src/cddb.c:313
 msgid "Artist / Album"
-msgstr "Izvajalec / album"
+msgstr "Artist / Album"
 
 #: ../src/cddb.c:313
 msgid "Category"
-msgstr "Kategorija"
+msgstr "Category"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Track Name".
 #: ../src/cddb.c:314 ../src/cddb.c:489
 msgid "Track Name"
-msgstr "Ime posnetka"
+msgstr "Track Name"
 
 #: ../src/cddb.c:314
 msgid "Duration"
-msgstr "Trajanje"
+msgstr "Duration"
 
 #: ../src/cddb.c:326
 msgid "CDDB Search"
-msgstr "Iskanje CDDB"
+msgstr "CDDB Search"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
 #: ../src/cddb.c:346
 msgid "Automatic Search"
-msgstr "Samodejno iskanje"
+msgstr "Automatic Search"
 
 #: ../src/cddb.c:356
 msgid "Request CDDB"
-msgstr "Zahteva iskanja CDDB"
+msgstr "Request CDDB"
 
 #: ../src/cddb.c:366
 msgid ""
 "Request automatically the CDDB using the selected files (the order is "
 "important) to generate the CddbID"
 msgstr ""
+"Request automatically the CDDB using the selected files (the order is "
+"important) to generate the CddbID"
 
 #: ../src/cddb.c:377 ../src/cddb.c:457
 msgid "Stop the search"
-msgstr "Zaustavi iskanje"
+msgstr "Stop the search"
 
 #. Check box to run the scanner
 #: ../src/cddb.c:384
 msgid "Use local CDDB"
-msgstr "Uporabi krajevni CDDB"
+msgstr "Use local CDDB"
 
 #: ../src/cddb.c:387 ../src/cddb.c:850
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
 msgstr ""
+"When activating this option, after loading the fields, the current selected "
+"scanner will be ran (the scanner window must be opened)."
 
 #.
 #. * 2 - Page for manual search
 #.
 #: ../src/cddb.c:404
 msgid "Manual Search"
-msgstr "Ročno iskanje"
+msgstr "Manual Search"
 
 #: ../src/cddb.c:416
 msgid "Words:"
-msgstr "Besede:"
+msgstr "Words:"
 
 #: ../src/cddb.c:429
 msgid "Enter the words to search (separated by a space or '+')"
-msgstr "Vnesite besede za iskanje (ločene s presledkom ali '+')"
+msgstr "Enter the words to search (separated by a space or '+')"
 
 #.
 #. * Search options
 #.
 #: ../src/cddb.c:469
 msgid "Search In:"
-msgstr "Poišči v:"
+msgstr "Search In:"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "All fields".
 #: ../src/cddb.c:479
 msgid "All Fields"
-msgstr "Vsa polja"
+msgstr "All Fields"
 
 #. 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:1037 ../src/prefs.c:807
 msgid "Other"
-msgstr "Ostalo"
+msgstr "Other"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "All Categories".
 #: ../src/cddb.c:516
 msgid "All Categories"
-msgstr "Vse kategorije"
+msgstr "All Categories"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Blues".
@@ -1053,19 +1058,19 @@ msgstr "Blues"
 #. * instance, translate this as "Search in:" "Classical".
 #: ../src/cddb.c:523
 msgid "Classical"
-msgstr "Klasika"
+msgstr "Classical"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Country".
 #: ../src/cddb.c:526
 msgid "Country"
-msgstr "Država"
+msgstr "Country"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Folk".
 #: ../src/cddb.c:529
 msgid "Folk"
-msgstr "Narodna"
+msgstr "Folk"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Jazz".
@@ -1077,7 +1082,7 @@ msgstr "Jazz"
 #. * instance, translate this as "Search in:" "Misc".
 #: ../src/cddb.c:535
 msgid "Misc."
-msgstr "Razno"
+msgstr "Misc."
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "New age".
@@ -1101,65 +1106,63 @@ msgstr "Rock"
 #. * instance, translate this as "Search in:" "Soundtrack".
 #: ../src/cddb.c:547
 msgid "Soundtrack"
-msgstr "Filmska glasba"
+msgstr "Soundtrack"
 
 #: ../src/cddb.c:587
 msgid "included: funk, soul, rap, pop, industrial, metal, etc."
-msgstr "vključeni so: funk, soul, rap, pop, metal, itn."
+msgstr "included: funk, soul, rap, pop, industrial, metal, etc."
 
 #: ../src/cddb.c:588
 msgid "movies, shows"
-msgstr "filmi, oddaje"
+msgstr "movies, shows"
 
 #: ../src/cddb.c:589
 msgid "others that do not fit in the above categories"
-msgstr "drugi, ki ne ustrezajo zgodnjim kategorijam"
+msgstr "others that do not fit in the above categories"
 
 #. Button to display/hide the categories
 #: ../src/cddb.c:592
 msgid "Categories"
-msgstr "Kategorije"
+msgstr "Categories"
 
 #.
 #. * Results command
 #.
 #: ../src/cddb.c:600
 msgid "Results:"
-msgstr "Rezultati:"
+msgstr "Results:"
 
-#: ../src/cddb.c:606 ../src/misc.c:1959
+#: ../src/cddb.c:606 ../src/misc.c:1951
 msgid "Search:"
-msgstr "Poišči:"
+msgstr "Search:"
 
 #: ../src/cddb.c:620
 msgid "Enter the words to search in the list below"
-msgstr "Vnesite besede za iskanje po spodnjem seznamu"
+msgstr "Enter the words to search in the list below"
 
 #: ../src/cddb.c:632
 msgid "Search Next"
-msgstr "Poišči naslednje"
+msgstr "Search Next"
 
 #: ../src/cddb.c:638
 msgid "Search Previous"
-msgstr "Poišči predhodno"
+msgstr "Search Previous"
 
 #: ../src/cddb.c:649
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
-msgstr ""
-"Pokaži le rdeče vrstice (ali pokaži vse vrstice) na seznamu 'Izvajalec / "
-"album'"
+msgstr "Show only red lines (or show all lines) in the 'Artist / Album' list"
 
 #: ../src/cddb.c:655
 msgid "Unselect all lines"
-msgstr "Prekliči izbor vseh vrstic"
+msgstr "Unselect all lines"
 
 #: ../src/cddb.c:661
 msgid "Invert lines selection"
-msgstr "Preobrni izbor vrsic"
+msgstr "Invert lines selection"
 
 #: ../src/cddb.c:670
 msgid "Select all lines"
-msgstr "Izberi vse vrstice"
+msgstr "Select all lines"
 
 #: ../src/cddb.c:788
 msgid ""
@@ -1167,40 +1170,43 @@ msgid ""
 "no line is selected.\n"
 "You can also reorder lines in this list before using 'apply' button."
 msgstr ""
+"Select lines to 'apply' to your files list. All lines will be processed if "
+"no line is selected.\n"
+"You can also reorder lines in this list before using 'apply' button."
 
 #.
 #. * Apply results to fields...
 #.
 #: ../src/cddb.c:795
 msgid "Set Into:"
-msgstr "Nastavi v:"
+msgstr "Set Into:"
 
 #: ../src/cddb.c:801
 msgid "All"
-msgstr "Vse"
+msgstr "All"
 
 #: ../src/cddb.c:808
 msgid "Track #"
-msgstr "Št. posnetka"
+msgstr "Track #"
 
 #: ../src/cddb.c:809
 msgid "# Tracks"
-msgstr "# posnetkov"
+msgstr "# Tracks"
 
 #. 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"
+msgstr "Run the current scanner for each file"
 
 #. Check box to use DLM (also used in the preferences window)
 #: ../src/cddb.c:854
 msgid "Match lines with the Levenshtein algorithm"
-msgstr "Poišči ujemajoče vrstice z algoritmom Levenshtein"
+msgstr "Match lines with the Levenshtein algorithm"
 
 #. 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 "
@@ -1208,82 +1214,86 @@ msgid ""
 "used when selecting the corresponding audio file, or applying CDDB results, "
 "instead of using directly the position order."
 msgstr ""
+"When activating this option, the Levenshtein algorithm (DLM: Damerau-"
+"Levenshtein Metric) will be used to match the CDDB title against every "
+"filename in the current folder, and to select the best match. This will be "
+"used when selecting the corresponding audio file, or applying CDDB results, "
+"instead of using directly the position order."
 
 #: ../src/cddb.c:871
 msgid "Load the selected lines or all lines (if no line selected)."
-msgstr "Naloži izbrane vrstice ali vse vrstice (če ni izbrana nobena vrstica)"
+msgstr "Load the selected lines or all lines (if no line selected)."
 
 #: ../src/cddb.c:881
 msgid "Ready to search"
-msgstr "Pripravljeno na iskanje"
+msgstr "Ready to search"
 
 #: ../src/cddb.c:1352
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
-"Album: '%s', izvajalec: '%s', dolžina: '%s', leto: '%s', zvrst: '%s', ID: "
-"'%s'"
+"Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 
 #: ../src/cddb.c:1588
 #, c-format
 msgid "Resolving host '%s'…"
-msgstr "Razločevanje gostitelja '%s' ..."
+msgstr "Resolving host '%s'…"
 
 #: ../src/cddb.c:1629
 #, c-format
 msgid "Cannot create a new socket (%s)"
-msgstr "Ni mogoče ustvariti novega vtiča (%s)"
+msgstr "Cannot create a new socket (%s)"
 
 #: ../src/cddb.c:1643
 msgid "Cannot set options on the newly-created socket"
-msgstr ""
+msgstr "Cannot set options on the newly-created socket"
 
 #. Open connection to the server.
 #: ../src/cddb.c:1647
 #, c-format
 msgid "Connecting to host '%s', port '%d'…"
-msgstr "Povezovanje z gostiteljem '%s', vrata '%d' ..."
+msgstr "Connecting to host '%s', port '%d'…"
 
 #: ../src/cddb.c:1660
 #, c-format
 msgid "Cannot connect to host '%s' (%s)"
-msgstr "Povezava z gostiteljem '%s' je spodletela (%s)"
+msgstr "Cannot connect to host '%s' (%s)"
 
 #: ../src/cddb.c:1684
 #, c-format
 msgid "Cannot resolve host '%s' (%s)"
-msgstr "Gostitelja '%s' ni mogoče razločiti (%s)."
+msgstr "Cannot resolve host '%s' (%s)"
 
 #: ../src/cddb.c:1697
 #, c-format
 msgid "Connected to host '%s'"
-msgstr "Vzpostavljena je povezava z gostiteljem '%s'"
+msgstr "Connected to host '%s'"
 
 #: ../src/cddb.c:1778
 #, c-format
 msgid "Error while writing CDDB results to file '%s'"
-msgstr "Napaka pri pisanju rezultatov CDDB v datoteko '%s'"
+msgstr "Error while writing CDDB results to file '%s'"
 
 #: ../src/cddb.c:1789
 #, c-format
 msgid "Receiving data (%s)…"
-msgstr "Prejemanje podatkov (%s) ..."
+msgstr "Receiving data (%s)…"
 
 #: ../src/cddb.c:1801
 #, c-format
 msgid "Error when reading CDDB response (%s)"
-msgstr "Napaka pri branju odgovora CDDB (%s)"
+msgstr "Error when reading CDDB response (%s)"
 
 #: ../src/cddb.c:1808
 #, c-format
 msgid "Cannot create file '%s' (%s)"
-msgstr "Datoteke '%s' ni mogoče ustvariti (%s)."
+msgstr "Cannot create file '%s' (%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)."
+msgstr "Cannot open file '%s' (%s)"
 
 #. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
 #. Send the request
@@ -1293,12 +1303,12 @@ msgstr "Datoteke '%s' ni mogoče odpreti (%s)."
 #. Send the request
 #: ../src/cddb.c:2314 ../src/cddb.c:2643 ../src/cddb.c:3516
 msgid "Sending request…"
-msgstr "Pošiljanje zahteve ..."
+msgstr "Sending request…"
 
 #: ../src/cddb.c:2318 ../src/cddb.c:2647 ../src/cddb.c:3216 ../src/cddb.c:3520
 #, c-format
 msgid "Cannot send the request (%s)"
-msgstr "Zahteve ni mogoče poslati (%s)"
+msgstr "Cannot send the request (%s)"
 
 #.
 #. * Read the answer
@@ -1306,258 +1316,252 @@ msgstr "Zahteve ni mogoče poslati (%s)"
 #. Read the answer
 #: ../src/cddb.c:2344 ../src/cddb.c:3230 ../src/cddb.c:3529
 msgid "Receiving data…"
-msgstr "Prejemanje podatkov ..."
+msgstr "Receiving data…"
 
 #: ../src/cddb.c:2351 ../src/cddb.c:2676 ../src/cddb.c:3237 ../src/cddb.c:3536
 msgid "The server returned a bad response"
-msgstr "Strežnik je vrnil izmaličen odgovor."
+msgstr "The server returned a bad response"
 
 #: ../src/cddb.c:2365 ../src/cddb.c:2692 ../src/cddb.c:3252 ../src/cddb.c:3553
 #: ../src/cddb.c:3568
 #, c-format
 msgid "The server returned a bad response: %s"
-msgstr "Strežnik je vrnil izmaličen odgovor: %s"
+msgstr "The server returned a bad response: %s"
 
 #: ../src/cddb.c:2512
 #, c-format
 msgid "Sorry, the web-based search is currently not available"
-msgstr "Žal spletno iskanje trenutno ni na voljo"
+msgstr "Sorry, the web-based search is currently not available"
 
 #: ../src/cddb.c:2514 ../src/cddb.c:2863
 #, c-format
 msgid "Found one matching album"
 msgid_plural "Found %d matching albums"
-msgstr[0] "Najdenih %d ustreznih albumov"
-msgstr[1] "Najden %d ustrezen album"
-msgstr[2] "Najdena %d ustrezna albuma"
-msgstr[3] "Najdeni %d ustrezni albumi"
+msgstr[0] "Found one matching album"
+msgstr[1] "Found %d matching albums"
 
 #: ../src/cddb.c:2664
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)…"
-msgstr "Prejemanje podatkov strani %d (album %d/%d) ..."
+msgstr "Receiving data of page %d (album %d/%d)…"
 
 #: ../src/cddb.c:2666
 #, c-format
 msgid "Receiving data of page %d…"
-msgstr "Pridobivanje podatkov strani %d ..."
+msgstr "Receiving data of page %d…"
 
 #: ../src/cddb.c:2830
 #, c-format
 msgid "More results to load…"
-msgstr "Dodatni rezultati za nalaganje ..."
+msgstr "More results to load…"
 
 #: ../src/cddb.c:2959
 #, c-format
 msgid "No file selected"
-msgstr "Ni izbrane datoteke"
+msgstr "No file selected"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
 #: ../src/cddb.c:2967
 #, c-format
 msgid "More than 99 files selected. Cannot send request"
-msgstr "Izbranih je več kot 99 datotek. Zahteve ni mogoče poslati"
+msgstr "More than 99 files selected. Cannot send request"
 
 #: ../src/cddb.c:2973
 #, c-format
 msgid "One file selected"
 msgid_plural "%d files selected"
-msgstr[0] "Izbranih je %d datotek"
-msgstr[1] "Izbrana je %d datoteka"
-msgstr[2] "Izbrani sta %d datoteki"
-msgstr[3] "Izbrane so %d datoteke"
+msgstr[0] "One file selected"
+msgstr[1] "%d files selected"
 
 #: ../src/cddb.c:3056
 msgid "The path for 'Local CD Database' was not defined"
-msgstr "Pot za 'Krajevno zbirko podatkov CDDB' ni bila določena"
+msgstr "The path for 'Local CD Database' was not defined"
 
 #. Translators: 'it' in this sentence refers to the local CD
 #. * database path.
 #: ../src/cddb.c:3059
 msgid "Enter it in the preferences window before using this search."
-msgstr "Pot do krajevne zbirke CD vnesite v okno nastavitev pred iskanjem."
+msgstr "Enter it in the preferences window before using this search."
 
 #: ../src/cddb.c:3061
 msgid "Local CD search"
-msgstr "Krajevno iskanje CD"
+msgstr "Local CD search"
 
 #. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
 #: ../src/cddb.c:3206
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"
-msgstr "Pošiljanje zahteve (CddbID: %s, #posnetkov: %d, dolžina nosilca: %d)…"
+msgstr "Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"
 
 #: ../src/cddb.c:3363
 #, c-format
 msgid "DiscID '%s' gave one matching album"
 msgid_plural "DiscID '%s' gave %d matching albums"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "DiscID '%s' gave one matching album"
+msgstr[1] "DiscID '%s' gave %d matching albums"
 
 #: ../src/cddb.c:3460
 #, c-format
 msgid "Can't load file: '%s' (%s)."
-msgstr "Datoteke ni mogoče naložiti: '%s' (%s)."
+msgstr "Can't load file: '%s' (%s)."
 
 #. Load the track list of the album
 #: ../src/cddb.c:3759
 msgid "Loading album track list…"
-msgstr "Nalaganje seznama posnetkov na albumu ..."
+msgstr "Loading album track list…"
 
 #: ../src/cddb.c:3958
 msgid "The number of CDDB results does not match the number of selected files"
-msgstr "Število zadetkov CDDB se ne ujema s številom izbranih datotek"
+msgstr "The number of CDDB results does not match the number of selected files"
 
 #: ../src/cddb.c:3962
 msgid "Write Tag from CDDB"
-msgstr "Zapiši oznako iz CDDB"
+msgstr "Write Tag from CDDB"
 
 #: ../src/charset.c:47
 msgid "Arabic (IBM-864)"
-msgstr "Arabsko (IBM-864)"
+msgstr "Arabic (IBM-864)"
 
 #: ../src/charset.c:48
 msgid "Arabic (ISO-8859-6)"
-msgstr "Arabsko (ISO-8859-6)"
+msgstr "Arabic (ISO-8859-6)"
 
 #: ../src/charset.c:49
 msgid "Arabic (Windows-1256)"
-msgstr "Arabsko (windows-1256)"
+msgstr "Arabic (Windows-1256)"
 
 #: ../src/charset.c:50
 msgid "Baltic (ISO-8859-13)"
-msgstr "Baltsko (ISO-8859-13)"
+msgstr "Baltic (ISO-8859-13)"
 
 #: ../src/charset.c:51
 msgid "Baltic (ISO-8859-4)"
-msgstr "Baltsko (ISO-8859-4)"
+msgstr "Baltic (ISO-8859-4)"
 
 #: ../src/charset.c:52
 msgid "Baltic (Windows-1257)"
-msgstr "Baltsko (windows-1257)"
+msgstr "Baltic (Windows-1257)"
 
 #: ../src/charset.c:53
 msgid "Celtic (ISO-8859-14)"
-msgstr "Keltsko (ISO-8859-14)"
+msgstr "Celtic (ISO-8859-14)"
 
 #: ../src/charset.c:54
 msgid "Central European (IBM-852)"
-msgstr "Srednjeevropsko (IBM-852)"
+msgstr "Central European (IBM-852)"
 
 #: ../src/charset.c:55
 msgid "Central European (ISO-8859-2)"
-msgstr "Srednjeevropsko (ISO-8859-2)"
+msgstr "Central European (ISO-8859-2)"
 
 #: ../src/charset.c:56
 msgid "Central European (Windows-1250)"
-msgstr "Srednjeevropsko (Windows-1250)"
+msgstr "Central European (Windows-1250)"
 
 #: ../src/charset.c:57
 msgid "Chinese Simplified (GB18030)"
-msgstr "Poenostavljeno kitajsko (GB18030)"
+msgstr "Chinese Simplified (GB18030)"
 
 #: ../src/charset.c:58
 msgid "Chinese Simplified (GB2312)"
-msgstr "Poenostavljeno kitajsko (GB2312)"
+msgstr "Chinese Simplified (GB2312)"
 
 #: ../src/charset.c:59
 msgid "Chinese Traditional (Big5)"
-msgstr "Tradicionalno kitajsko (Big5)"
+msgstr "Chinese Traditional (Big5)"
 
 #: ../src/charset.c:60
 msgid "Chinese Traditional (Big5-HKSCS)"
-msgstr "Tradicionalno kitajsko (Big5-HKSCS)"
+msgstr "Chinese Traditional (Big5-HKSCS)"
 
 #: ../src/charset.c:61
 msgid "Cyrillic (IBM-855)"
-msgstr "Cirilica (IBM-855)"
+msgstr "Cyrillic (IBM-855)"
 
 #: ../src/charset.c:62
 msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cirilica (ISO-8859-5)"
+msgstr "Cyrillic (ISO-8859-5)"
 
 #: ../src/charset.c:63
 msgid "Cyrillic (ISO-IR-111)"
-msgstr "Cirilica (ISO-IR-111)"
+msgstr "Cyrillic (ISO-IR-111)"
 
 #: ../src/charset.c:64
 msgid "Cyrillic (KOI8-R)"
-msgstr "Cirilica (KOI8-R)"
+msgstr "Cyrillic (KOI8-R)"
 
 #: ../src/charset.c:65
 msgid "Cyrillic (Windows-1251)"
-msgstr "Cirilica (Windows-1251)"
+msgstr "Cyrillic (Windows-1251)"
 
 #: ../src/charset.c:66
 msgid "Cyrillic/Russian (CP-866)"
-msgstr "Cirilica/_Rusko (IBM-866)"
+msgstr "Cyrillic/Russian (CP-866)"
 
 #: ../src/charset.c:67
 msgid "Cyrillic/Ukrainian (KOI8-U)"
-msgstr "Cirilica/Ukrajinsko (_KOI8-U)"
+msgstr "Cyrillic/Ukrainian (KOI8-U)"
 
 #: ../src/charset.c:68
 msgid "English (US-ASCII)"
-msgstr "Angleško (_US-ASCII)"
+msgstr "English (US-ASCII)"
 
 #: ../src/charset.c:69
 msgid "Greek (ISO-8859-7)"
-msgstr "Grško (ISO-8859-7)"
+msgstr "Greek (ISO-8859-7)"
 
 #: ../src/charset.c:70
 msgid "Greek (Windows-1253)"
-msgstr "Grško (Windows-1253)"
+msgstr "Greek (Windows-1253)"
 
 #: ../src/charset.c:71
 msgid "Hebrew (IBM-862)"
-msgstr "Hebrejsko (IBM-862)"
+msgstr "Hebrew (IBM-862)"
 
 #: ../src/charset.c:72
 msgid "Hebrew (Windows-1255)"
-msgstr "Hebrejsko (Windows-1255)"
+msgstr "Hebrew (Windows-1255)"
 
 #: ../src/charset.c:73
 msgid "Japanese (EUC-JP)"
-msgstr "Japonsko (EUC-JP)"
+msgstr "Japanese (EUC-JP)"
 
 #: ../src/charset.c:74
 msgid "Japanese (ISO-2022-JP)"
-msgstr "Japonsko (ISO-2022-JP)"
+msgstr "Japanese (ISO-2022-JP)"
 
 #: ../src/charset.c:75
 msgid "Japanese (Shift_JIS)"
-msgstr "Japonsko (Shift-JIS)"
+msgstr "Japanese (Shift_JIS)"
 
 #: ../src/charset.c:76
 msgid "Korean (EUC-KR)"
-msgstr "Korejsko (EUC-KR)"
+msgstr "Korean (EUC-KR)"
 
 #: ../src/charset.c:77
 msgid "Nordic (ISO-8859-10)"
-msgstr "Nordijsko (ISO-8859-10)"
+msgstr "Nordic (ISO-8859-10)"
 
 #: ../src/charset.c:78
 msgid "South European (ISO-8859-3)"
-msgstr "Južno evropsko (ISO-8859-3)"
+msgstr "South European (ISO-8859-3)"
 
 #: ../src/charset.c:79
 msgid "Thai (TIS-620)"
-msgstr "Tajsko (TIS-620)"
+msgstr "Thai (TIS-620)"
 
 #: ../src/charset.c:80
 msgid "Turkish (IBM-857)"
-msgstr "Turško (IBM-857)"
+msgstr "Turkish (IBM-857)"
 
 #: ../src/charset.c:81
 msgid "Turkish (ISO-8859-9)"
-msgstr "Turško (ISO-8859-9)"
+msgstr "Turkish (ISO-8859-9)"
 
 #: ../src/charset.c:82
 msgid "Turkish (Windows-1254)"
-msgstr "Turško (Windows-1254)"
+msgstr "Turkish (Windows-1254)"
 
 #. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
 #: ../src/charset.c:84
@@ -1570,109 +1574,108 @@ msgstr "Unicode (UTF-8)"
 #. {N_("Unicode (UTF-32LE)"),                "UTF-32LE"      },
 #: ../src/charset.c:91
 msgid "Vietnamese (VISCII)"
-msgstr "Vietnamsko (VISCII)"
+msgstr "Vietnamese (VISCII)"
 
 #: ../src/charset.c:92
 msgid "Vietnamese (Windows-1258)"
-msgstr "Vietnamsko (Windows-1258)"
+msgstr "Vietnamese (Windows-1258)"
 
 #: ../src/charset.c:93
 msgid "Visual Hebrew (ISO-8859-8)"
-msgstr "Hebrejsko predočeno (ISO-8859-8)"
+msgstr "Visual Hebrew (ISO-8859-8)"
 
 #: ../src/charset.c:94
 msgid "Western (IBM-850)"
-msgstr "Zahodno (IBM-850)"
+msgstr "Western (IBM-850)"
 
 #: ../src/charset.c:95
 msgid "Western (ISO-8859-1)"
-msgstr "Zahodno (ISO-8859-1)"
+msgstr "Western (ISO-8859-1)"
 
 #: ../src/charset.c:96
 msgid "Western (ISO-8859-15)"
-msgstr "Zahodno (ISO-8859-15)"
+msgstr "Western (ISO-8859-15)"
 
 #: ../src/charset.c:97
 msgid "Western (Windows-1252)"
-msgstr "Zahodno (Windows-1252)"
+msgstr "Western (Windows-1252)"
 
 #: ../src/charset.c:511
 #, c-format
 msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
-msgstr "Imena datoteke '%s' ni mogoče pretvoriti v UTF-8 (%s)."
+msgstr "The filename '%s' couldn't be converted into UTF-8 (%s)."
 
 #: ../src/charset.c:512 ../src/charset.c:611 ../src/charset.c:674
 msgid "Invalid UTF-8"
-msgstr "Neveljavna oznaka UTF-8"
+msgstr "Invalid UTF-8"
 
 #: ../src/charset.c:610
 #, c-format
 msgid ""
 "The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
-msgstr "Niza UTF-8 '%s' ni mogoče pretvoriti v kodiranje imen datotek (%s)."
+msgstr ""
+"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 
 #: ../src/charset.c:673
 #, c-format
 msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
-msgstr "Niza '%s' ni mogoče pretvoriti v UTF-8 (%s)."
+msgstr "The string '%s' couldn't be converted into 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) ..."
+msgstr "Starting EasyTAG version %s (PID: %d)…"
 
-#: ../src/easytag.c:213
+#: ../src/easytag.c:187
 #, c-format
 msgid "Using libid3tag version %s"
-msgstr "Uporabljate libid3tag različice %s"
+msgstr "Using libid3tag version %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"
+msgstr "Using id3lib version %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'"
+msgstr "Variable EASYTAGLANG defined. Setting locale: '%s'"
 
-#: ../src/easytag.c:224
+#: ../src/easytag.c:198
 #, c-format
 msgid "Setting locale: '%s'"
-msgstr "Nastavljanje jezikovnih nastavitev: '%s'"
+msgstr "Setting locale: '%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')"
+msgstr "Currently using locale '%s' (and eventually '%s')"
 
-#: ../src/easytag.c:236
+#: ../src/easytag.c:210
 msgid "Unable to create setting directories"
-msgstr "Ni mogoče ustvariti nastavitvenih map"
+msgstr "Unable to create setting directories"
 
-#: ../src/easytag.c:453 ../src/et_core.c:583
+#: ../src/easytag.c:427 ../src/et_core.c:597 ../src/et_core.c:609
 #, c-format
 msgid "Error while querying information for file: '%s' (%s)"
-msgstr "Napaka pri poizvedovanju po podatkih o datoteki: '%s' (%s)"
+msgstr "Error while querying information for file: '%s' (%s)"
 
-#: ../src/easytag.c:518
+#: ../src/easytag.c:490
 #, c-format
 msgid "Cannot open path '%s'"
-msgstr "Poti '%s' ni mogoče odpreti."
+msgstr "Cannot open path '%s'"
 
 #.
 #. * Browser
 #.
-#: ../src/easytag.c:618 ../src/prefs.c:142
+#: ../src/easytag.c:582 ../src/prefs.c:142
 msgid "Browser"
-msgstr "Brskalnik"
+msgstr "Browser"
 
-#: ../src/easytag.c:640 ../src/et_core.c:2727
+#: ../src/easytag.c:604 ../src/et_core.c:2817
 msgid "File"
-msgstr "Datoteka"
+msgstr "File"
 
 #. Default values are MPs data
 #. Nothing to display
@@ -1680,847 +1683,824 @@ 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:"
+msgstr "Encoder:"
 
-#: ../src/easytag.c:680
+#: ../src/easytag.c:644
 msgid "Bitrate:"
-msgstr "Bitna hitrost:"
+msgstr "Bitrate:"
 
 #. 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:"
+msgstr "Frequency:"
 
 #. 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:"
+msgstr "Mode:"
 
-#: ../src/easytag.c:708
+#: ../src/easytag.c:672
 msgid "Size:"
-msgstr "Velikost:"
+msgstr "Size:"
 
-#: ../src/easytag.c:715
+#: ../src/easytag.c:679
 msgid "Duration:"
-msgstr "Trajanje:"
+msgstr "Duration:"
 
 #. Main Frame
-#: ../src/easytag.c:762 ../src/et_core.c:2665
+#: ../src/easytag.c:726 ../src/et_core.c:2747
 msgid "Tag"
-msgstr "Oznaka"
+msgstr "Tag"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: ../src/easytag.c:784
+#: ../src/easytag.c:748
 msgid "Common"
-msgstr "Splošno"
+msgstr "Common"
 
 #. Title
-#: ../src/easytag.c:791
+#: ../src/easytag.c:755
 msgid "Title:"
-msgstr "Naslov:"
+msgstr "Title:"
 
-#: ../src/easytag.c:805
+#: ../src/easytag.c:769
 msgid "Tag selected files with this title"
-msgstr "Označi izbrane datoteke s tem naslovom"
+msgstr "Tag selected files with this title"
 
 #. Artist
-#: ../src/easytag.c:810
+#: ../src/easytag.c:774
 msgid "Artist:"
-msgstr "Izvajalec:"
+msgstr "Artist:"
 
-#: ../src/easytag.c:824
+#: ../src/easytag.c:788
 msgid "Tag selected files with this artist"
-msgstr "Označi izbrane datoteke s tem izvajalcem"
+msgstr "Tag selected files with this artist"
 
 #. Album Artist
-#: ../src/easytag.c:829
+#: ../src/easytag.c:793
 msgid "Album artist:"
-msgstr "Izvajalec albuma:"
+msgstr "Album artist:"
 
-#: ../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"
+msgstr "Tag selected files with this album artist"
 
 #. 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"
+msgstr "Tag selected files with this album name"
 
 #. 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"
+msgstr "Tag selected files with this disc number"
 
 #. Year
-#: ../src/easytag.c:889
+#: ../src/easytag.c:853
 msgid "Year:"
-msgstr "Leto:"
+msgstr "Year:"
 
-#: ../src/easytag.c:909
+#: ../src/easytag.c:873
 msgid "Tag selected files with this year"
-msgstr "Označi izbrane datoteke s tem letom"
+msgstr "Tag selected files with this year"
 
-#: ../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."
+msgstr ""
+"Number selected tracks sequentially. Starts at 01 in each subdirectory."
 
 #. 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:"
+msgstr "Track #:"
 
-#: ../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."
+"Set the number of files, in the same directory of the displayed file, to the "
+"selected tracks."
 
-#: ../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"
+msgstr "Tag selected files with this number of tracks"
 
 #. Genre
-#: ../src/easytag.c:987
+#: ../src/easytag.c:951
 msgid "Genre:"
-msgstr "Zvrst:"
+msgstr "Genre:"
 
-#: ../src/easytag.c:1015
+#: ../src/easytag.c:979
 msgid "Tag selected files with this genre"
-msgstr "Označi izbrane datoteke s to zvrstjo"
+msgstr "Tag selected files with this genre"
 
 #. Comment
-#: ../src/easytag.c:1020
+#: ../src/easytag.c:984
 msgid "Comment:"
-msgstr "Opomba:"
+msgstr "Comment:"
 
-#: ../src/easytag.c:1047
+#: ../src/easytag.c:1011
 msgid "Tag selected files with this comment"
-msgstr "Označi izbrane datoteke s tem komentarjem"
+msgstr "Tag selected files with this comment"
 
 #. 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:"
+msgstr "Composer:"
 
-#: ../src/easytag.c:1068
+#: ../src/easytag.c:1032
 msgid "Tag selected files with this composer"
-msgstr "Označi izbrane datoteke s tem skladateljem"
+msgstr "Tag selected files with this composer"
 
 #. 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:"
+msgstr "Orig. artist:"
 
-#: ../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"
+msgstr "Tag selected files with this original artist"
 
 #. Copyright
-#: ../src/easytag.c:1095
+#: ../src/easytag.c:1059
 msgid "Copyright:"
-msgstr "Avtorske pravice:"
+msgstr "Copyright:"
 
-#: ../src/easytag.c:1109
+#: ../src/easytag.c:1073
 msgid "Tag selected files with this copyright"
-msgstr "Označi izbrane datoteke s to avtorsko pravico"
+msgstr "Tag selected files with this copyright"
 
 #. URL
-#: ../src/easytag.c:1115
+#: ../src/easytag.c:1079
 msgid "URL:"
-msgstr "Naslov URL:"
+msgstr "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"
+msgstr "Tag selected files with this URL"
 
 #. Encoded by
-#: ../src/easytag.c:1135
+#: ../src/easytag.c:1099
 msgid "Encoded by:"
-msgstr "Kodirano z:"
+msgstr "Encoded by:"
 
-#: ../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"
+msgstr "Tag selected files with this encoder name"
 
 #.
 #. * 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:3189 ../src/et_core.c:3192
 msgid "Images"
-msgstr "Slike"
+msgstr "Images"
 
-#: ../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."
+msgstr "You can use drag and drop to add an image"
 
-#: ../src/easytag.c:1254
+#: ../src/easytag.c:1218
 msgid "Add images to the tag"
-msgstr "Oznaki dodaj slike"
+msgstr "Add images to the tag"
 
-#: ../src/easytag.c:1272
+#: ../src/easytag.c:1236
 msgid "Remove selected images from the tag"
-msgstr "Odstrani izbrane slike oznaki"
+msgstr "Remove selected images from the tag"
 
-#: ../src/easytag.c:1286
+#: ../src/easytag.c:1250
 msgid "Save the selected images to files"
-msgstr "Shrani izbrane slike v datoteke"
+msgstr "Save the selected images to files"
 
-#: ../src/easytag.c:1297
+#: ../src/easytag.c:1261
 msgid "Edit image properties"
-msgstr "Uredi lastnosti slike"
+msgstr "Edit image properties"
 
-#: ../src/easytag.c:1311
+#: ../src/easytag.c:1275
 msgid "Tag selected files with these images"
-msgstr "Označi izbrane datoteke s temi slikami"
+msgstr "Tag selected files with these images"
 
-#: ../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'."
+msgstr "Selected files tagged with title '%s'."
 
-#: ../src/easytag.c:1371
+#: ../src/easytag.c:1335
 msgid "Removed title from selected files."
-msgstr "Naslov odstranjen iz izbranih datotek."
+msgstr "Removed title from selected files."
 
-#: ../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'."
+msgstr "Selected files tagged with artist '%s'."
 
-#: ../src/easytag.c:1388
+#: ../src/easytag.c:1352
 msgid "Removed artist from selected files."
-msgstr "Izvajalec odstranjen iz izbranih datotek."
+msgstr "Removed artist from selected files."
 
-#: ../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')."
+msgstr "Selected files tagged with album artist '%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."
+msgstr "Removed album artist from selected files."
 
-#: ../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'."
+msgstr "Selected files tagged with album '%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."
+msgstr "Removed album name from selected files."
 
-#: ../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'."
+msgstr "Selected files tagged with disc number '%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'."
+msgstr "Selected files tagged with disc number like 'xx'."
 
-#: ../src/easytag.c:1468
+#: ../src/easytag.c:1432
 msgid "Removed disc number from selected files."
-msgstr "Številka diska odstranjena iz izbranih datotek."
+msgstr "Removed disc number from selected files."
 
-#: ../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'."
+msgstr "Selected files tagged with year '%s'."
 
-#: ../src/easytag.c:1486
+#: ../src/easytag.c:1450
 msgid "Removed year from selected files."
-msgstr "Leto odstranjeno iz izbranih datotek."
+msgstr "Removed year from selected files."
 
-#: ../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'."
+msgstr "Selected files tagged with track like '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'."
+msgstr "Selected files tagged with track like '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."
+msgstr "Removed track number from selected files."
 
 #. 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."
+msgstr "Selected tracks numbered sequentially."
 
-#: ../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'."
+msgstr "Selected files tagged with genre '%s'."
 
-#: ../src/easytag.c:1623
+#: ../src/easytag.c:1588
 msgid "Removed genre from selected files."
-msgstr "Zvrst odstranjena iz izbranih datotek."
+msgstr "Removed genre from selected files."
 
-#: ../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'."
+msgstr "Selected files tagged with comment '%s'."
 
-#: ../src/easytag.c:1647
+#: ../src/easytag.c:1612
 msgid "Removed comment from selected files."
-msgstr "Komentar odstranjen iz izbranih datotek."
+msgstr "Removed comment from selected files."
 
-#: ../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'."
+msgstr "Selected files tagged with composer '%s'."
 
-#: ../src/easytag.c:1663
+#: ../src/easytag.c:1628
 msgid "Removed composer from selected files."
-msgstr "Skladatelj odstranjen iz izbranih datotek."
+msgstr "Removed composer from selected files."
 
-#: ../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'."
+msgstr "Selected files tagged with original artist '%s'."
 
-#: ../src/easytag.c:1680
+#: ../src/easytag.c:1645
 msgid "Removed original artist from selected files."
-msgstr "Izvirni izvajalec je odstranjen iz izbranih datotek."
+msgstr "Removed original artist from selected files."
 
-#: ../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'."
+msgstr "Selected files tagged with copyright '%s'."
 
-#: ../src/easytag.c:1697
+#: ../src/easytag.c:1662
 msgid "Removed copyright from selected files."
-msgstr "Avtorska pravica odstranjena iz izbranih datotek."
+msgstr "Removed copyright from selected files."
 
-#: ../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'."
+msgstr "Selected files tagged with URL '%s'."
 
-#: ../src/easytag.c:1714
+#: ../src/easytag.c:1679
 msgid "Removed URL from selected files."
-msgstr "URL odstranjen iz izbranih datotek."
+msgstr "Removed URL from selected files."
 
-#: ../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'."
+msgstr "Selected files tagged with encoder name '%s'."
 
-#: ../src/easytag.c:1731
+#: ../src/easytag.c:1696
 msgid "Removed encoder name from selected files."
-msgstr "Ime kodirnika je odstranjeno iz izbranih datotek."
+msgstr "Removed encoder name from selected files."
 
-#: ../src/easytag.c:1763
+#: ../src/easytag.c:1728
 msgid "Selected files tagged with images."
-msgstr "Izbrane datoteke označene s slikami."
+msgstr "Selected files tagged with images."
 
-#: ../src/easytag.c:1765
+#: ../src/easytag.c:1730
 msgid "Removed images from selected files."
-msgstr "Slike odstranjene iz izbranih datotek."
+msgstr "Removed images from selected files."
 
-#: ../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"
+msgstr "Select Mode and Mask, and redo the same action"
 
-#: ../src/easytag.c:2098
+#: ../src/easytag.c:2063
 msgid "All tags have been scanned"
-msgstr "Vse oznake so bile pregledane."
+msgstr "All tags have been scanned"
 
-#: ../src/easytag.c:2154
+#: ../src/easytag.c:2119
 msgid "All tags have been removed"
-msgstr "Vsi oznake so bile odstranjene."
+msgstr "All tags have been removed"
 
-#: ../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."
-msgstr[0] "Zunanji program je spremenil %d datotek."
-msgstr[1] "Zunanji program je spremenil %d datoteko."
-msgstr[2] "Zunanji program je spremenil %d datoteki."
-msgstr[3] "Zunanji program je spremenil %d datoteke."
+msgstr[0] "A file was changed by an external program"
+msgstr[1] "%d files were changed by an external program."
 
-#: ../src/easytag.c:2449
+#: ../src/easytag.c:2429
 msgid "Do you want to continue saving the file?"
-msgstr "Želite nadaljevati s shranjevanjem datoteke?"
+msgstr "Do you want to continue saving the file?"
 
-#: ../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"
+msgstr "Saving files was stopped"
 
-#: ../src/easytag.c:2526
+#: ../src/easytag.c:2509
 msgid "All files have been saved"
-msgstr "Vse datoteke so bile shranjene"
+msgstr "All files have been saved"
 
-#: ../src/easytag.c:2657
+#: ../src/easytag.c:2644
 #, c-format
 msgid "Cannot delete file (%s)"
-msgstr "Datoteke ni mogoče izbrisati (%s)."
+msgstr "Cannot delete file (%s)"
 
-#: ../src/easytag.c:2677
+#: ../src/easytag.c:2665
 msgid "Files have been partially deleted"
-msgstr "Datoteke so bile delno izbrisane"
+msgstr "Files have been partially deleted"
 
-#: ../src/easytag.c:2679
+#: ../src/easytag.c:2667
 msgid "All files have been deleted"
-msgstr "Vse datoteke so bile izbrisane"
+msgstr "All files have been deleted"
 
-#: ../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'?"
+msgstr "Do you want to write the tag of file '%s'?"
 
-#: ../src/easytag.c:2797
+#: ../src/easytag.c:2785
 msgid "Confirm Tag Writing"
-msgstr "Potrditev zapisovanja oznak"
+msgstr "Confirm Tag Writing"
 
-#: ../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"
+msgstr "Repeat action for the remaining files"
 
 #. 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"
+msgstr "Rename File and Directory"
 
-#: ../src/easytag.c:2884
+#: ../src/easytag.c:2875
 msgid "File and directory rename confirmation required"
-msgstr "Zahtevana je potrditev preimenovanja datoteke in mape"
+msgstr "File and directory rename confirmation required"
 
-#: ../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'?"
+msgstr "Do you want to rename the file and directory '%s' to '%s'?"
 
-#: ../src/easytag.c:2891
+#: ../src/easytag.c:2882
 msgid "Directory rename confirmation required"
-msgstr "Potrebna je potrditev preimenovanja mape"
+msgstr "Directory rename confirmation required"
 
-#: ../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'?"
+msgstr "Do you want to rename the directory '%s' to '%s'?"
 
 #. Only filename changed
-#: ../src/easytag.c:2898
+#: ../src/easytag.c:2889
 msgid "Rename File"
-msgstr "Preimenuj datoteko"
+msgstr "Rename File"
 
-#: ../src/easytag.c:2899
+#: ../src/easytag.c:2890
 msgid "File rename confirmation required"
-msgstr "Potrebna je potrditev preimenovanja datoteke"
+msgstr "File rename confirmation required"
 
-#: ../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'?"
+msgstr "Do you want to rename the file '%s' to '%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'"
+msgstr "Cannot rename file '%s' to '%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"
+msgstr "Cannot rename file '%s' to '%s': %s"
 
-#: ../src/easytag.c:2984
+#: ../src/easytag.c:2975
 msgid "File(s) not renamed"
-msgstr "Datoteke, ki niso preimenovane"
+msgstr "File(s) not renamed"
 
-#: ../src/easytag.c:3093
+#: ../src/easytag.c:3087
 #, c-format
 msgid "Writing tag of '%s'"
-msgstr "Zapisovanje oznake v '%s'"
+msgstr "Writing tag of '%s'"
 
-#: ../src/easytag.c:3100
+#: ../src/easytag.c:3094
 msgid "Tag(s) written"
-msgstr "Oznake so bile zapisane"
+msgstr "Tag(s) written"
 
-#: ../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)"
+msgstr "Cannot write tag in file '%s' (%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"
+msgstr "Cannot write tag in file '%s'"
 
-#: ../src/easytag.c:3131
+#: ../src/easytag.c:3125
 msgid "Tag Write Error"
-msgstr "Napaka zapisovanja oznake"
+msgstr "Tag Write Error"
 
-#: ../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'?"
+msgstr "Do you really want to delete the file '%s'?"
 
-#: ../src/easytag.c:3182 ../src/easytag.c:3192
+#: ../src/easytag.c:3176 ../src/easytag.c:3186
 msgid "Delete File"
-msgstr "Izbriši datoteko"
+msgstr "Delete File"
 
-#: ../src/easytag.c:3217
+#: ../src/easytag.c:3211
 #, c-format
 msgid "File '%s' deleted"
-msgstr "Datoteka '%s' izbrisana"
+msgstr "File '%s' deleted"
 
-#: ../src/easytag.c:3349
+#: ../src/easytag.c:3346
 #, c-format
 msgid "Cannot read directory '%s'"
-msgstr "Mape '%s' ni mogoče prebrati."
+msgstr "Cannot read directory '%s'"
 
-#: ../src/easytag.c:3353
+#: ../src/easytag.c:3350
 msgid "Directory Read Error"
-msgstr "Napaka branja mape"
+msgstr "Directory Read Error"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3374
+#: ../src/easytag.c:3371
 #, c-format
 msgid "Search in progress…"
-msgstr "Iskanje je v teku ..."
+msgstr "Search in progress…"
 
-#: ../src/easytag.c:3397 ../src/et_core.c:2734
+#: ../src/easytag.c:3394 ../src/et_core.c:2824
 #, c-format
 msgid "File: '%s'"
-msgstr "Datoteka: '%s'"
+msgstr "File: '%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"
-msgstr[0] "V tej mapi in njenih podrejenih mapah je %d datotek."
-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."
+msgstr[0] "Found one file in this directory and subdirectories"
+msgstr[1] "Found %d files in this directory and subdirectories"
 
-#: ../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"
-msgstr[0] "V tej mapi je %d datotek."
-msgstr[1] "V tej mapi je %d datoteka."
-msgstr[2] "V tej mapi sta %d datoteki."
-msgstr[3] "V tej mapi so %d datoteke."
+msgstr[0] "Found one file in this directory"
+msgstr[1] "Found %d files in this directory"
 
-#: ../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"
+msgstr "No file found in this directory and subdirectories"
 
-#: ../src/easytag.c:3478
+#: ../src/easytag.c:3475
 msgid "No file found in this directory"
-msgstr "V mapi ni mogoče najti datotek"
+msgstr "No file found in this directory"
 
-#: ../src/easytag.c:3546
+#: ../src/easytag.c:3543
 #, c-format
 msgid "Error opening directory '%s' (%s)"
-msgstr "Napaka pri odpiranju mape '%s' (%s)"
+msgstr "Error opening directory '%s' (%s)"
 
-#: ../src/easytag.c:3582
+#: ../src/easytag.c:3579
 #, c-format
 msgid "Cannot read directory (%s)"
-msgstr "Mape ni mogoče prebrati (%s)"
+msgstr "Cannot read directory (%s)"
 
-#: ../src/easytag.c:3602
+#: ../src/easytag.c:3599
 msgid "Searching for audio files…"
-msgstr "Poteka iskanje zvočnih datotek ..."
+msgstr "Searching for audio files…"
 
-#: ../src/easytag.c:3603
+#: ../src/easytag.c:3600
 msgid "Searching"
-msgstr "Iskanje"
+msgstr "Searching"
 
-#: ../src/easytag.c:4234
+#: ../src/easytag.c:4266
 msgid "Select a directory to browse"
-msgstr "Izberite mapo za brskanje"
+msgstr "Select a directory to browse"
 
 #. 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"
+msgstr "Tag selected files with this field"
 
-#: ../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"
+msgstr "Convert '_' and '%20' to spaces"
 
-#: ../src/easytag.c:4400 ../src/scan.c:2664
+#: ../src/easytag.c:4431 ../src/scan_dialog.c:2126
 msgid "Convert ' ' to '_'"
-msgstr "Pretvori ' ' v '_'"
+msgstr "Convert ' ' to '_'"
 
-#: ../src/easytag.c:4411
+#: ../src/easytag.c:4442
 msgid "All uppercase"
-msgstr "Vse velike črke"
+msgstr "All uppercase"
 
-#: ../src/easytag.c:4418
+#: ../src/easytag.c:4449
 msgid "All lowercase"
-msgstr "Vse male črke"
+msgstr "All lowercase"
 
-#: ../src/easytag.c:4425
+#: ../src/easytag.c:4456
 msgid "First letter uppercase"
-msgstr "Velika prva črka"
+msgstr "First letter uppercase"
 
-#: ../src/easytag.c:4432
+#: ../src/easytag.c:4463
 msgid "First letter uppercase of each word"
-msgstr "Naj bo prva črka vsake besede velika"
+msgstr "First letter uppercase of each word"
 
-#: ../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"
+msgstr "Remove spaces"
 
-#: ../src/easytag.c:4450
+#: ../src/easytag.c:4481
 msgid "Insert space before uppercase letter"
-msgstr "Vstavi presledek pred veliko črko"
+msgstr "Insert space before uppercase letter"
 
-#: ../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
-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 ""
+msgstr "Remove duplicate spaces or underscores"
 
-#. 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:4495
+msgid "Remove all text"
+msgstr "Remove all text"
 
-#: ../src/easytag.c:4521
+#: ../src/easytag.c:4514
 msgid "EasyTAG: Normal exit."
-msgstr "EasyTAG: običajni izhod."
+msgstr "EasyTAG: Normal exit."
 
-#: ../src/easytag.c:4573
+#: ../src/easytag.c:4566
 msgid "Do you want to save them before quitting?"
-msgstr "Ali jih želite shraniti pred zapiranjem?"
+msgstr "Do you want to save them before quitting?"
 
-#: ../src/easytag.c:4596
+#: ../src/easytag.c:4593
 msgid "Do you really want to quit?"
-msgstr "Ali res želite končati?"
+msgstr "Do you really want to quit?"
 
-#: ../src/et_core.c:505
+#: ../src/et_core.c:510
 #, c-format
 msgid "Error reading tag from ogg file (%s)"
-msgstr "Napaka med branjem oznak iz datoteke ogg (%s)"
+msgstr "Error reading tag from ogg file (%s)"
+
+#: ../src/et_core.c:539
+#, c-format
+msgid "Error reading tag from Opus file (%s)"
+msgstr "Error reading tag from Opus file (%s)"
 
-#: ../src/et_core.c:639
+#: ../src/et_core.c:682
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
-msgstr "Datoteka '%s' je bila samodejno popravljena."
+msgstr "Automatic corrections applied for file '%s'."
 
-#: ../src/et_core.c:2631
+#: ../src/et_core.c:2707
 msgid "ID3 Tag"
-msgstr "Oznaka ID3"
+msgstr "ID3 Tag"
 
-#: ../src/et_core.c:2637
+#: ../src/et_core.c:2713
 msgid "Ogg Vorbis Tag"
-msgstr "Oznaka Ogg Vorbis"
+msgstr "Ogg Vorbis Tag"
 
-#: ../src/et_core.c:2643
+#: ../src/et_core.c:2719
 msgid "FLAC Vorbis Tag"
-msgstr "Oznaka FLAC Vorbis"
+msgstr "FLAC Vorbis Tag"
 
-#: ../src/et_core.c:2648
+#: ../src/et_core.c:2724
 msgid "APE Tag"
-msgstr "Oznaka APE"
+msgstr "APE Tag"
 
-#: ../src/et_core.c:2653
+#: ../src/et_core.c:2729
 msgid "MP4/M4A/AAC Tag"
-msgstr "Oznaka MP4/M4A/AAC"
+msgstr "MP4/M4A/AAC Tag"
 
-#: ../src/et_core.c:2659
+#: ../src/et_core.c:2735
 msgid "Wavpack Tag"
-msgstr "Oznaka Wavpack"
+msgstr "Wavpack Tag"
+
+#: ../src/et_core.c:2741
+msgid "Opus Tag"
+msgstr "Opus Tag"
 
-#: ../src/et_core.c:2679
+#: ../src/et_core.c:2761
 msgid "MP3 File"
-msgstr "Datoteka MP3"
+msgstr "MP3 File"
 
-#: ../src/et_core.c:2683
+#: ../src/et_core.c:2765
 msgid "MP2 File"
-msgstr "Datoteka MP2"
+msgstr "MP2 File"
 
-#: ../src/et_core.c:2689
+#: ../src/et_core.c:2771
 msgid "Ogg Vorbis File"
-msgstr "Datoteka Ogg Vorbis"
+msgstr "Ogg Vorbis File"
 
-#: ../src/et_core.c:2695
+#: ../src/et_core.c:2777
 msgid "Speex File"
-msgstr "Datoteka Speex"
+msgstr "Speex File"
 
-#: ../src/et_core.c:2701
+#: ../src/et_core.c:2783
 msgid "FLAC File"
-msgstr "Datoteka FLAC"
+msgstr "FLAC File"
 
-#: ../src/et_core.c:2706
+#: ../src/et_core.c:2788
 msgid "MusePack File"
-msgstr "Datoteka MusePack"
+msgstr "MusePack File"
 
-#: ../src/et_core.c:2710
+#: ../src/et_core.c:2792
 msgid "Monkey's Audio File"
-msgstr "Zvočna datoteka Monkey"
+msgstr "Monkey's Audio File"
 
-#: ../src/et_core.c:2715
+#: ../src/et_core.c:2797
 msgid "MP4/AAC File"
-msgstr "Datoteka MP4/AAC"
+msgstr "MP4/AAC File"
 
-#: ../src/et_core.c:2721
+#: ../src/et_core.c:2803
 msgid "Wavpack File"
-msgstr "Datoteka WavPack"
+msgstr "Wavpack File"
+
+#: ../src/et_core.c:2809
+msgid "Opus File"
+msgstr "Opus File"
 
-#: ../src/et_core.c:2778 ../src/et_core.c:2833
+#: ../src/et_core.c:2868 ../src/et_core.c:2923
 msgid "File not found"
-msgstr "Datoteke ni mogoče najti"
+msgstr "File not found"
 
-#: ../src/et_core.c:2783
+#: ../src/et_core.c:2873
 #, c-format
 msgid "Cannot query file information (%s)"
-msgstr "Po podatkih o datoteki ni mogoče poizvedovati (%s)."
+msgstr "Cannot query file information (%s)"
 
-#: ../src/et_core.c:2817
+#: ../src/et_core.c:2907
 msgid "Read-only file"
-msgstr "Datoteka samo za branje"
+msgstr "Read-only file"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2881
+#: ../src/et_core.c:2971
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
-msgstr[0] "%u datotek"
-msgstr[1] "%u datoteka"
-msgstr[2] "%u datoteki"
-msgstr[3] "%u datoteke"
+msgstr[0] "One file"
+msgstr[1] "%u files"
 
-#: ../src/et_core.c:3086
+#: ../src/et_core.c:3175
 #, c-format
 msgid "Images (%d)"
-msgstr "Slike (%d)"
+msgstr "Images (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3128 ../src/flac_header.c:205
+#: ../src/et_core.c:3217 ../src/flac_header.c:205
 #: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
 #: ../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/et_core.c:3222 ../src/flac_header.c:210
 #: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
 #: ../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:3368 ../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"
+msgstr "Could not convert filename '%s' into system filename encoding"
 
-#: ../src/et_core.c:3278
+#: ../src/et_core.c:3370
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
-msgstr "Poskusite nastaviti okoljsko spremenljivko G_FILENAME_ENCODING."
+msgstr "Try setting the environment variable G_FILENAME_ENCODING."
 
-#: ../src/et_core.c:3279 ../src/scan.c:692
+#: ../src/et_core.c:3371 ../src/scan_dialog.c:690
 msgid "Filename translation"
-msgstr "Prevod imena datoteke"
+msgstr "Filename translation"
 
-#: ../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:4076
 #, c-format
 msgid "Error writing tag type %d to file %s (%s)"
-msgstr "Napaka pri pisanju oznake vrste %d v datoteko %s (%s)"
+msgstr "Error writing tag type %d to file %s (%s)"
 
 #. Mode
 #. 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/opus_header.c:237 ../src/wavpack_header.c:88
 msgid "Channels:"
-msgstr "Kanali:"
+msgstr "Channels:"
 
 #: ../src/flac_tag.c:131 ../src/flac_tag.c:850 ../src/flac_tag.c:860
 #, c-format
 msgid "Error while opening file: '%s' as FLAC (%s)."
-msgstr "Napaka pri odpiranju datoteke: '%s' kot FLAC (%s)."
+msgstr "Error while opening file: '%s' as 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 "
 "be lost while saving tag."
 msgstr ""
+"The year value '%s' seems to be invalid in file '%s'. The information will "
+"be lost while saving tag."
 
 #: ../src/flac_tag.c:1061
 #, c-format
 msgid "Picture block isn't valid: '%s'"
-msgstr "Slikovni blok ni veljaven: '%s'"
+msgstr "Picture block isn't valid: '%s'"
 
 #: ../src/flac_tag.c:1094
 #, c-format
 msgid "Error: Failed to write comments to file '%s' (%s)."
-msgstr "Napaka: komentarjev ni mogoče zapisati v datoteko '%s' (%s)."
+msgstr "Error: Failed to write comments to file '%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"
+msgstr "Written tag of '%s'"
 
 #: ../src/id3_tag.c:158
 #, c-format
 msgid "Error while reading file: '%s' (%s)"
-msgstr "Napaka pri branju datoteke: '%s' (%s)"
+msgstr "Error while reading file: '%s' (%s)"
 
 #: ../src/id3_tag.c:170
 #, c-format
@@ -2528,38 +2508,42 @@ msgid ""
 "As the following corrupted file '%s' will cause an error in id3lib, it will "
 "not be processed"
 msgstr ""
+"As the following corrupted file '%s' will cause an error in id3lib, it will "
+"not be processed"
 
 #: ../src/id3_tag.c:172
 msgid "Corrupted file"
-msgstr "Okvarjena datoteka"
+msgstr "Corrupted file"
 
-#: ../src/id3_tag.c:540
+#: ../src/id3_tag.c:555
 #, c-format
 msgid "Removed tag of '%s'"
-msgstr "Oznaka za '%s' odstranjena"
+msgstr "Removed tag of '%s'"
 
-#: ../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)"
+msgstr "Error while removing ID3v1 tag of '%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)"
+msgstr "Error while removing ID3v2 tag of '%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)"
+msgstr "Error while updating ID3v2 tag of '%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 ""
+"You have tried to save this tag to Unicode but it was detected that your "
+"version of id3lib is buggy"
 
-#: ../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 "
@@ -2570,420 +2554,411 @@ msgid ""
 "\n"
 "File: %s"
 msgstr ""
+"If you reload this file, some characters in the tag may not be displayed "
+"correctly. Please, apply the patch src/id3lib/"
+"patch_id3lib_3.8.3_UTF16_writing_bug.diff to id3lib, which is available in "
+"the EasyTAG package sources.\n"
+"Note that this message will appear only once.\n"
+"\n"
+"File: %s"
 
-#: ../src/id3_tag.c:602
+#: ../src/id3_tag.c:617
 msgid "Buggy id3lib"
-msgstr "Hroščat id3lib"
+msgstr "Buggy 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)"
+msgstr "Error while updating ID3v1 tag of '%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"
+msgstr "Updated tag of '%s'"
 
-#: ../src/id3_tag.c:669
+#: ../src/id3_tag.c:684
 msgid "No error reported"
-msgstr "Ni poročil o napakah."
+msgstr "No error reported"
 
-#: ../src/id3_tag.c:671
+#: ../src/id3_tag.c:686
 msgid "No available memory"
-msgstr "Ni prostega pomnilnika."
+msgstr "No available memory"
 
-#: ../src/id3_tag.c:673
+#: ../src/id3_tag.c:688
 msgid "No data to parse"
-msgstr "Ni podatkov za razčlenjevanje"
+msgstr "No data to parse"
 
-#: ../src/id3_tag.c:675
+#: ../src/id3_tag.c:690
 msgid "Improperly formatted data"
-msgstr "Neustrezno oblikovani podatki."
+msgstr "Improperly formatted data"
 
-#: ../src/id3_tag.c:677
+#: ../src/id3_tag.c:692
 msgid "No buffer to write to"
-msgstr "Ni medpomnilnika za pisanje"
+msgstr "No buffer to write to"
 
-#: ../src/id3_tag.c:679
+#: ../src/id3_tag.c:694
 msgid "Buffer is too small"
-msgstr "Medpomnilnik je premajhen."
+msgstr "Buffer is too small"
 
-#: ../src/id3_tag.c:681
+#: ../src/id3_tag.c:696
 msgid "Invalid frame ID"
-msgstr "Neveljaven ID okvirja."
+msgstr "Invalid frame ID"
 
-#: ../src/id3_tag.c:683
+#: ../src/id3_tag.c:698
 msgid "Requested field not found"
-msgstr "Zahtevanega polja ni mogoče najti"
+msgstr "Requested field not found"
 
-#: ../src/id3_tag.c:685
+#: ../src/id3_tag.c:700
 msgid "Unknown field type"
-msgstr "Neznana vrsta polja."
+msgstr "Unknown field type"
 
-#: ../src/id3_tag.c:687
+#: ../src/id3_tag.c:702
 msgid "Tag is already attached to a file"
-msgstr "Oznaka je datoteki že pripeta"
+msgstr "Tag is already attached to a file"
 
-#: ../src/id3_tag.c:689
+#: ../src/id3_tag.c:704
 msgid "Invalid tag version"
-msgstr "Neveljavna različica oznak"
+msgstr "Invalid tag version"
 
-#: ../src/id3_tag.c:691
+#: ../src/id3_tag.c:706
 msgid "No file to parse"
-msgstr "Ni datoteke za razčlenjevanje"
+msgstr "No file to parse"
 
-#: ../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"
+msgstr "Attempting to write to a read-only file"
 
-#: ../src/id3_tag.c:695
+#: ../src/id3_tag.c:710
 msgid "Error in compression/uncompression"
-msgstr "Napaka pri stiskanju/razširjanju"
+msgstr "Error in compression/uncompression"
 
-#: ../src/id3_tag.c:697
+#: ../src/id3_tag.c:712
 msgid "Unknown error message"
-msgstr "Neznano sporočilo o napaki"
+msgstr "Unknown error message"
 
-#: ../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'"
+msgstr "Error while creating temporary file: '%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"
+msgstr "Error while creating temporary file"
 
-#: ../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)"
+msgstr "Error while writing to file: '%s' (%s)"
 
 #. Translators: The first string is a filename, the
 #. * second string is the number of bytes that were
 #. * 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)"
-msgstr[0] "V datoteko '%s' ni mogoče zapisati oznake (manjka %s bajtov)"
-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)"
+msgstr[0] "Cannot write tag of file ‘%s’ (a byte was missing)"
+msgstr[1] "Cannot write tag of file ‘%s’ (%s bytes were missing)"
 
-#: ../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"
+msgstr "Cannot save tag of file '%s'"
 
-#: ../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'"
+msgstr "Size error while saving tag of '%s'"
 
 #: ../src/log.c:100
 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"
+msgstr "Log"
 
-#: ../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 "You must type a program name"
 
-#. 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 "Program Name Error"
 
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "kB"
-msgstr "kB"
+#: ../src/misc.c:800
+#, c-format
+msgid "Executed command: %s"
+msgstr "Executed command: %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 "Failed to launch program: %s"
 
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "GB"
-msgstr "GB"
+#: ../src/misc.c:824
+msgid "Select File"
+msgstr "Select File"
 
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "TB"
-msgstr "TB"
+#: ../src/misc.c:830
+msgid "Select Directory"
+msgstr "Select Directory"
 
-#: ../src/misc.c:1145
+#: ../src/misc.c:1142
 msgid "Generate Playlist"
-msgstr "Ustvari seznam predvajanja"
+msgstr "Generate Playlist"
 
-#: ../src/misc.c:1169
+#: ../src/misc.c:1166
 msgid "M3U Playlist Name"
-msgstr "Ime seznama predvajanja M3U"
+msgstr "M3U Playlist Name"
 
-#: ../src/misc.c:1184
+#: ../src/misc.c:1181
 msgid "Use directory name"
-msgstr "Uporabi ime mape"
+msgstr "Use directory name"
 
 #. Playlist options
-#: ../src/misc.c:1201
+#: ../src/misc.c:1198
 msgid "Playlist Options"
-msgstr "Možnosti seznama predvajanja"
+msgstr "Playlist Options"
 
-#: ../src/misc.c:1207
+#: ../src/misc.c:1204
 msgid "Include only the selected files"
-msgstr "Vključi le izbrane datoteke"
+msgstr "Include only the selected files"
 
-#: ../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 ""
+"If activated, only the selected files will be written in the playlist file. "
+"Else, all the files will be written."
 
-#: ../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"
+msgstr "Use full path for files in playlist"
 
-#: ../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"
+msgstr "Use relative path for files in playlist"
 
 #. 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"
+msgstr "Create playlist in the parent directory"
 
-#: ../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."
+msgstr "If activated, the playlist will be created in the parent directory."
 
 #. DOS Separator
-#: ../src/misc.c:1229
+#: ../src/misc.c:1226
 msgid "Use DOS directory separator"
-msgstr "Uporabi ločilo map za DOS"
+msgstr "Use DOS directory separator"
 
-#: ../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 '\\'."
+msgstr ""
+"This option replaces the UNIX directory separator '/' into DOS separator "
+"'\\'."
 
-#: ../src/misc.c:1244
+#: ../src/misc.c:1241
 msgid "Playlist Content"
-msgstr "Vsebina seznama predvajanja"
+msgstr "Playlist Content"
 
-#: ../src/misc.c:1250
+#: ../src/misc.c:1247
 msgid "Write only list of files"
-msgstr "Zapiši le seznam datotek"
+msgstr "Write only list of files"
 
-#: ../src/misc.c:1254
+#: ../src/misc.c:1251
 msgid "Write info using filename"
-msgstr "Zapiši podatke z uporabo imena datoteke"
+msgstr "Write info using filename"
 
-#: ../src/misc.c:1257
+#: ../src/misc.c:1254
 msgid "Write info using:"
-msgstr "Zapiši podatke z:"
+msgstr "Write info using:"
 
-#: ../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'."
+msgstr "Cannot write playlist file '%s'"
 
-#: ../src/misc.c:1480
+#: ../src/misc.c:1472
 msgid "Playlist File Error"
-msgstr "Napaka datoteke seznama predvajanja"
+msgstr "Playlist File Error"
 
-#: ../src/misc.c:1488
+#: ../src/misc.c:1480
 #, c-format
 msgid "Written playlist file '%s'"
-msgstr "Datoteka seznama predvajanja '%s' zapisana."
+msgstr "Written playlist file '%s'"
 
-#: ../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"
+msgstr "Invalid scanner mask"
 
-#: ../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"
+msgstr "Find Files"
 
-#: ../src/misc.c:1970
+#: ../src/misc.c:1962
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
-"Vnesite besedo, ki jo iščete v datotekah, ali pa pustite prazno, da se "
-"izpišejo vse datoteke."
+"Type the word to search into files. Or type nothing to display all files."
 
 #. Where...
-#: ../src/misc.c:1976
+#: ../src/misc.c:1968
 msgid "In:"
-msgstr "V:"
+msgstr "In:"
 
 #. 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"
+msgstr "the Filename"
 
 #. Translators: This option is for the previous 'in' option. For instance,
 #. * translate this as "Search" "In:" "the Tag".
 #. * 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"
+msgstr "the Tag"
 
 #. 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"
+msgstr "Case sensitive"
 
-#: ../src/misc.c:2225
+#: ../src/misc.c:2217
 msgid "Ready to search…"
-msgstr "Pripravljeno na iskanje ..."
+msgstr "Ready to search…"
 
-#: ../src/misc.c:2445
+#: ../src/misc.c:2437
 #, c-format
 msgid "Found one file"
 msgid_plural "Found %d files"
-msgstr[0] "Najdenih %d datotek"
-msgstr[1] "Najdena %d datoteka"
-msgstr[2] "Najdeni %d datoteki"
-msgstr[3] "Najdene %d datoteke"
+msgstr[0] "Found one file"
+msgstr[1] "Found %d files"
 
-#: ../src/misc.c:2730
+#: ../src/misc.c:2722
 msgid "Load Filenames From a Text File"
-msgstr "Naloži imena datotek iz besedilne datoteke"
+msgstr "Load Filenames From a Text File"
 
-#: ../src/misc.c:2759
+#: ../src/misc.c:2751
 msgid "File:"
-msgstr "Datoteka:"
+msgstr "File:"
 
 #. 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"
+msgstr " Load "
 
-#: ../src/misc.c:2796
+#: ../src/misc.c:2788
 msgid "Content of Text File"
-msgstr "Vsebina besedilne datoteke"
+msgstr "Content of Text File"
 
 #. 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"
+msgstr "Insert a blank line before the selected line"
 
 #. 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"
+msgstr "Delete the selected line"
 
 #. 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"
+msgstr "Delete all blank lines"
 
 #. 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"
+msgstr "Move up the selected line"
 
 #. 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"
+msgstr "Move down the selected line"
 
 #. 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"
+msgstr "Reload"
 
-#: ../src/misc.c:2890
+#: ../src/misc.c:2882
 msgid "List of Files"
-msgstr "Seznam datotek"
+msgstr "List of Files"
 
-#: ../src/misc.c:2985
+#: ../src/misc.c:2977
 msgid "Selected line:"
-msgstr "Izbrana vrstica:"
+msgstr "Selected line:"
 
-#: ../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 ""
+"When activating this option, after loading the filenames, the current "
+"selected scanner will be ran (the scanner window must be opened)."
 
-#: ../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)."
+msgstr "Cannot retrieve file info (%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)"
+msgstr "Can't open file '%s' (%s)"
 
-#: ../src/misc.c:3188
+#: ../src/misc.c:3180
 #, c-format
 msgid "Error reading file (%s)"
-msgstr "Napaka pri branju datoteke (%s)"
+msgstr "Error reading file (%s)"
 
-#: ../src/misc.c:3404
+#: ../src/misc.c:3396
 msgid "Insert a blank line"
-msgstr "Vstavi prazno vrstico"
+msgstr "Insert a blank line"
 
-#: ../src/misc.c:3410
+#: ../src/misc.c:3402
 msgid "Delete this line"
-msgstr "Izbriši to vrstico"
+msgstr "Delete this line"
 
-#: ../src/misc.c:3425
+#: ../src/misc.c:3417
 msgid "Move up this line"
-msgstr "Premakni to vrstico navzgor"
+msgstr "Move up this line"
 
-#: ../src/misc.c:3431
+#: ../src/misc.c:3423
 msgid "Move down this line"
-msgstr "Premakni to vrstico navzdol"
+msgstr "Move down this line"
 
 #. Mode changed to profile name
 #: ../src/monkeyaudio_header.c:78 ../src/musepack_header.c:80
 #, c-format
 msgid "Profile:"
-msgstr "Profil:"
+msgstr "Profile:"
 
 #: ../src/mp4_header.c:63 ../src/mp4_tag.c:65 ../src/mp4_tag.c:186
 msgid "MP4 format invalid"
-msgstr "Neveljaven zapis MP4"
+msgstr "MP4 format invalid"
 
 #: ../src/mp4_header.c:72 ../src/mp4_tag.c:74
 #, c-format
 msgid "File contains no audio track: '%s'"
-msgstr "Datoteka ne vsebuje zvočne sledi: '%s'"
+msgstr "File contains no audio track: '%s'"
 
 #: ../src/mp4_header.c:82
 #, c-format
 msgid "Error reading properties from file: '%s'"
-msgstr "Napaka med branjem lastnosti iz datoteke: '%s'"
+msgstr "Error reading properties from file: '%s'"
 
 #: ../src/mp4_header.c:132 ../src/mpeg_header.c:204
 #, c-format
@@ -2993,7 +2968,7 @@ msgstr "~%d kb/s"
 #: ../src/mp4_tag.c:85 ../src/mp4_tag.c:194
 #, c-format
 msgid "Error reading tags from file: '%s'"
-msgstr "Napaka med branjem oznak iz datoteke: '%s'"
+msgstr "Error reading tags from file: '%s'"
 
 #: ../src/mpeg_header.c:64
 msgid "Stereo"
@@ -3001,15 +2976,15 @@ msgstr "Stereo"
 
 #: ../src/mpeg_header.c:65
 msgid "Joint stereo"
-msgstr "Združeni stereo"
+msgstr "Joint stereo"
 
 #: ../src/mpeg_header.c:66
 msgid "Dual channel"
-msgstr "Dvokanalno"
+msgstr "Dual channel"
 
 #: ../src/mpeg_header.c:67
 msgid "Single channel"
-msgstr "Enokanalno"
+msgstr "Single channel"
 
 #. MPEG, Layer versions
 #: ../src/mpeg_header.c:194
@@ -3020,7 +2995,7 @@ msgstr "MPEG"
 #: ../src/ogg_header.c:227
 #, c-format
 msgid "Error while opening file: '%s' (%s)"
-msgstr "Napaka pri odpiranju datoteke: '%s' (%s)"
+msgstr "Error while opening file: '%s' (%s)"
 
 #: ../src/ogg_header.c:243
 #, c-format
@@ -3028,26 +3003,28 @@ msgid ""
 "Ogg Vorbis: The specified bitstream does not exist or the file has been "
 "initialized improperly (file: '%s')."
 msgstr ""
+"Ogg Vorbis: The specified bitstream does not exist or the file has been "
+"initialised improperly (file: '%s')."
 
 #: ../src/ogg_header.c:279
 #, c-format
 msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
-msgstr "Ogg Vorbis: branje z medija je vrnilo napako (datoteka: '%s')."
+msgstr "Ogg Vorbis: Read from media returned an error (file: '%s')."
 
 #: ../src/ogg_header.c:282
 #, c-format
 msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
-msgstr "Ogg Vorbis: bitni pretok niso podatki Vorbis (datoteka: '%s')."
+msgstr "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
 
 #: ../src/ogg_header.c:285
 #, c-format
 msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
-msgstr "Ogg Vorbis: neujemanje različice Vorbis (datoteka: '%s')."
+msgstr "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
 
 #: ../src/ogg_header.c:288
 #, c-format
 msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
-msgstr ""
+msgstr "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
 
 #: ../src/ogg_header.c:291
 #, c-format
@@ -3055,222 +3032,232 @@ msgid ""
 "Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack corruption "
 "(file: '%s')."
 msgstr ""
+"Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack corruption "
+"(file: '%s')."
 
 #: ../src/ogg_header.c:337
 #, c-format
 msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
-msgstr "Napaka: odpiranje datoteke '%s' kot Vorbis je spodletelo (%s)."
+msgstr "Error: Failed to open file: '%s' as Vorbis (%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."
+msgstr "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
 
-#: ../src/picture.c:244 ../src/picture.c:269
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1257
 #, c-format
-msgid "Image file not loaded: %s"
-msgstr "Datoteka slike ni naložena: %s"
+msgid "Error with 'loader_write': %s"
+msgstr "Error with 'loader_write': %s"
+
+#: ../src/ogg_tag.c:1050 ../src/picture.c:1180
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr "Error with 'loader_close': %s"
+
+#: ../src/picture.c:104
+#, c-format
+msgid "Image file not saved: %s"
+msgstr "Image file not saved: %s"
 
-#: ../src/picture.c:261
+#: ../src/picture.c:154
 #, c-format
 msgid "Cannot open file: '%s'"
-msgstr "Datoteke ni mogoče odpreti: '%s'"
+msgstr "Cannot open file: '%s'"
 
-#: ../src/picture.c:265
+#: ../src/picture.c:158
 msgid "Image File Error"
-msgstr "Napaka slikovne datoteke"
+msgstr "Image File Error"
+
+#: ../src/picture.c:162 ../src/picture.c:424
+#, c-format
+msgid "Image file not loaded: %s"
+msgstr "Image file not loaded: %s"
 
-#: ../src/picture.c:276
+#: ../src/picture.c:446
 msgid "Image file loaded"
-msgstr "Slikovna datoteka naložena"
+msgstr "Image file loaded"
 
-#: ../src/picture.c:334
+#: ../src/picture.c:504
 msgid "Add Images"
-msgstr "Dodaj slike"
+msgstr "Add Images"
 
-#: ../src/picture.c:344 ../src/picture.c:700
+#: ../src/picture.c:514 ../src/picture.c:874
 msgid "All Files"
-msgstr "Vse datoteke"
+msgstr "All Files"
 
-#: ../src/picture.c:350 ../src/picture.c:706
+#: ../src/picture.c:520 ../src/picture.c:880
 msgid "PNG and JPEG"
-msgstr "PNG in JPEG"
+msgstr "PNG and JPEG"
 
-#: ../src/picture.c:477
+#: ../src/picture.c:651
 #, c-format
 msgid "Image Properties %d/%d"
-msgstr "Lastnosti slike %d/%d"
+msgstr "Image Properties %d/%d"
 
-#: ../src/picture.c:501
+#: ../src/picture.c:675
 msgid "Image Type"
-msgstr "Vrsta slike"
+msgstr "Image Type"
 
 #. Description of the picture
-#: ../src/picture.c:560
+#: ../src/picture.c:734
 msgid "Image Description:"
-msgstr "Opis slike:"
+msgstr "Image Description:"
 
-#: ../src/picture.c:687
+#: ../src/picture.c:861
 #, 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"
+msgstr "Save Image %d/%d"
 
-#: ../src/picture.c:827
+#: ../src/picture.c:1021
 msgid "JPEG image"
-msgstr "Slika JPEG"
+msgstr "JPEG image"
 
-#: ../src/picture.c:829
+#: ../src/picture.c:1023
 msgid "PNG image"
-msgstr "Slika PNG"
+msgstr "PNG image"
 
-#: ../src/picture.c:831
+#: ../src/picture.c:1025
+msgid "GIF image"
+msgstr "GIF image"
+
+#: ../src/picture.c:1027
 msgid "Unknown image"
-msgstr "Neznana slika"
+msgstr "Unknown image"
 
-#: ../src/picture.c:843
+#: ../src/picture.c:1039
 msgid "32x32 pixel PNG file icon"
-msgstr "Ikona PNG velikosti 32x32 točk"
+msgstr "32x32 pixel PNG file icon"
 
-#: ../src/picture.c:845
+#: ../src/picture.c:1041
 msgid "Other file icon"
-msgstr "Ikona druge vrste datoteke"
+msgstr "Other file icon"
 
-#: ../src/picture.c:847
+#: ../src/picture.c:1043
 msgid "Cover (front)"
-msgstr "Prednja stran ovitka"
+msgstr "Cover (front)"
 
-#: ../src/picture.c:849
+#: ../src/picture.c:1045
 msgid "Cover (back)"
-msgstr "Hrbtna stran ovitka"
+msgstr "Cover (back)"
 
-#: ../src/picture.c:851
+#: ../src/picture.c:1047
 msgid "Leaflet page"
-msgstr "Stran knjižice"
+msgstr "Leaflet page"
 
-#: ../src/picture.c:853
+#: ../src/picture.c:1049
 msgid "Media (e.g. label side of CD)"
-msgstr "Medij (npr. stran CD z napisi)"
+msgstr "Media (e.g. label side of CD)"
 
-#: ../src/picture.c:855
+#: ../src/picture.c:1051
 msgid "Lead artist/lead performer/soloist"
-msgstr "Glavni izvajalec/osrednji nastopajoči/solist"
+msgstr "Lead artist/lead performer/soloist"
 
-#: ../src/picture.c:857
+#: ../src/picture.c:1053
 msgid "Artist/performer"
-msgstr "Izvajalec"
+msgstr "Artist/performer"
 
-#: ../src/picture.c:859
+#: ../src/picture.c:1055
 msgid "Conductor"
-msgstr "Dirigent"
+msgstr "Conductor"
 
-#: ../src/picture.c:861
+#: ../src/picture.c:1057
 msgid "Band/Orchestra"
-msgstr "Skupina/orkester"
+msgstr "Band/Orchestra"
 
-#: ../src/picture.c:865
+#: ../src/picture.c:1061
 msgid "Lyricist/text writer"
-msgstr "Avtor besedila"
+msgstr "Lyricist/text writer"
 
-#: ../src/picture.c:867
+#: ../src/picture.c:1063
 msgid "Recording location"
-msgstr "Mesto snemanja"
+msgstr "Recording location"
 
-#: ../src/picture.c:869
+#: ../src/picture.c:1065
 msgid "During recording"
-msgstr "Med snemanjem"
+msgstr "During recording"
 
-#: ../src/picture.c:871
+#: ../src/picture.c:1067
 msgid "During performance"
-msgstr "Med nastopom"
+msgstr "During performance"
 
-#: ../src/picture.c:873
+#: ../src/picture.c:1069
 msgid "Movie/video screen capture"
-msgstr "Zaslonsko zajemanje videa"
+msgstr "Movie/video screen capture"
 
-#: ../src/picture.c:875
+#: ../src/picture.c:1071
 msgid "A bright colored fish"
-msgstr "Svetlo obarvana riba"
+msgstr "A bright coloured fish"
 
-#: ../src/picture.c:877
+#: ../src/picture.c:1073
 msgid "Illustration"
-msgstr "Ilustracija"
+msgstr "Illustration"
 
-#: ../src/picture.c:879
+#: ../src/picture.c:1075
 msgid "Band/Artist logotype"
-msgstr "Logotip skupine/izvajalca"
+msgstr "Band/Artist logotype"
 
-#: ../src/picture.c:881
+#: ../src/picture.c:1077
 msgid "Publisher/studio logotype"
-msgstr "Logotip založbe/studia"
+msgstr "Publisher/studio logotype"
 
-#: ../src/picture.c:885
+#: ../src/picture.c:1081
 msgid "Unknown image type"
-msgstr "Neznana vrsta slike"
+msgstr "Unknown image type"
 
-#: ../src/picture.c:915 ../src/picture.c:926
+#: ../src/picture.c:1111 ../src/picture.c:1122
 msgid "pixels"
-msgstr "točke"
+msgstr "pixels"
 
-#: ../src/picture.c:916 ../src/picture.c:927
+#: ../src/picture.c:1112 ../src/picture.c:1123
 msgid "Type"
-msgstr "Vrsta"
+msgstr "Type"
 
-#: ../src/picture.c:928
+#: ../src/picture.c:1124
 msgid "Description"
-msgstr "Opis"
-
-#: ../src/picture.c:984
-#, c-format
-msgid "Error with 'loader_close': %s"
-msgstr "Napaka ob 'loader_close': %s"
+msgstr "Description"
 
-#: ../src/picture.c:1044
+#: ../src/picture.c:1240
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
 msgstr ""
+"Cannot display the image because not enough data has been read to determine "
+"how to create the image buffer."
 
-#: ../src/picture.c:1051
+#: ../src/picture.c:1247
 msgid "Cannot display the image"
-msgstr "Slike ni mogoče prikazati"
+msgstr "Cannot display the image"
 
-#: ../src/picture.c:1053
+#: ../src/picture.c:1249
 msgid ""
 "Not enough data has been read to determine how to create the image buffer."
 msgstr ""
+"Not enough data has been read to determine how to create the image buffer."
 
-#: ../src/picture.c:1055
+#: ../src/picture.c:1251
 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"
+msgstr "Load Image File"
 
 #. Label
 #: ../src/prefs.c:152
 msgid "Default directory:"
-msgstr "Privzeta mapa:"
+msgstr "Default directory:"
 
 #: ../src/prefs.c:165
 msgid ""
 "Specify the directory where your files are located. This path will be loaded "
 "when EasyTAG starts without parameter."
 msgstr ""
-"Navedite mapo, kjer se nahajajo datoteke. Ta pot bo privzeto naložena, ko je "
-"program EasyTAG zagnan brez parametra."
+"Specify the directory where your files are located. This path will be loaded "
+"when EasyTAG starts without parameter."
 
 #. Load directory on startup
 #: ../src/prefs.c:186
 msgid ""
 "Load on startup the default directory or the directory passed as argument"
 msgstr ""
+"Load on startup the default directory or the directory passed as argument"
 
 #: ../src/prefs.c:189
 msgid ""
@@ -3278,251 +3265,259 @@ msgid ""
 "Note that this path may be overridden by the parameter passed to easytag "
 "(easytag /path_to/mp3_files)."
 msgstr ""
+"Automatically search files, when EasyTAG starts, into the default directory. "
+"Note that this path may be overridden by the parameter passed to easytag "
+"(easytag /path_to/mp3_files)."
 
 #. Browse subdirectories
 #: ../src/prefs.c:194
 msgid "Search subdirectories"
-msgstr "Preišči podmape"
+msgstr "Search subdirectories"
 
 #: ../src/prefs.c:197
 msgid "Search subdirectories for files when reading a directory into the tree."
 msgstr ""
+"Search subdirectories for files when reading a directory into the tree."
 
 #. Open the node to show subdirectories
 #: ../src/prefs.c:201
 msgid "Show subdirectories when selecting a directory"
-msgstr "Ob izbiranju mape pokaži podmape"
+msgstr "Show subdirectories when selecting a directory"
 
 #: ../src/prefs.c:205
 msgid ""
 "This expands the selected node into the file browser to display the sub-"
 "directories."
 msgstr ""
-"S tem razširite izbrano vozlišče v datotečnem brskalniku, da pokaže "
-"podrejene mape."
+"This expands the selected node into the file browser to display the sub-"
+"directories."
 
 #. Browse hidden directories
 #: ../src/prefs.c:209
 msgid "Search hidden directories"
-msgstr "Preišči skrite mape"
+msgstr "Search hidden directories"
 
 #: ../src/prefs.c:214
 msgid "Search hidden directories for files (directories starting by a '.')."
-msgstr "Datoteke išči v skritih mapah (mape, ki se začenjajo z '.')."
+msgstr "Search hidden directories for files (directories starting by a '.')."
 
 #.
 #. * Misc
 #.
 #: ../src/prefs.c:222
 msgid "Misc"
-msgstr "Razno"
+msgstr "Misc"
 
 #. User interface
 #: ../src/prefs.c:228
 msgid "User Interface"
-msgstr "Uporabniški vmesnik "
+msgstr "User Interface"
 
 #. Show header infos
 #: ../src/prefs.c:235
 msgid "Show header information of file"
-msgstr "Pokaži podatke glave iz datoteke"
+msgstr "Show header information of file"
 
 #: ../src/prefs.c:238
 msgid ""
 "If activated, information about the file as the bitrate, the time, the size, "
 "will be displayed under the filename entry."
 msgstr ""
+"If activated, information about the file as the bitrate, the time, the size, "
+"will be displayed under the filename entry."
 
 #: ../src/prefs.c:244
 msgid "Display changed files in list using:"
-msgstr "Prikaži spremenjene datoteke s seznama z uporabo:"
+msgstr "Display changed files in list using:"
 
 #: ../src/prefs.c:247
 msgid "Red color"
-msgstr "Rdeča barva"
+msgstr "Red colour"
 
 #: ../src/prefs.c:253
 msgid "Bold style"
-msgstr "Krepki slog"
+msgstr "Bold style"
 
 #. Sorting List Options
 #: ../src/prefs.c:259
 msgid "Sorting List Options"
-msgstr "Možnosti razvrščanja seznama"
+msgstr "Sorting List Options"
 
 #. Sorting method
 #: ../src/prefs.c:268
 msgid "Sort the file list by:"
-msgstr "Seznam datotek razvrsti:"
+msgstr "Sort the file list by:"
 
 #: ../src/prefs.c:278
 msgid "Ascending filename"
-msgstr "naraščajoče po imenu datoteke"
+msgstr "Ascending filename"
 
 #: ../src/prefs.c:280
 msgid "Descending filename"
-msgstr "padajoče po imenu datoteke"
+msgstr "Descending filename"
 
 #: ../src/prefs.c:281
 msgid "Ascending title"
-msgstr "naraščajoče po naslovu"
+msgstr "Ascending title"
 
 #: ../src/prefs.c:282
 msgid "Descending title"
-msgstr "padajoče po naslovu"
+msgstr "Descending title"
 
 #: ../src/prefs.c:283
 msgid "Ascending artist"
-msgstr "naraščajoče po izvajalcu"
+msgstr "Ascending artist"
 
 #: ../src/prefs.c:284
 msgid "Descending artist"
-msgstr "padajoče po izvajalcu"
+msgstr "Descending artist"
 
 #: ../src/prefs.c:286
 msgid "Ascending album artist"
-msgstr "Naraščajoče po izvajalcu albuma"
+msgstr "Ascending album artist"
 
 #: ../src/prefs.c:288
 msgid "Descending album artist"
-msgstr "Padajoče po izvajalcu albuma"
+msgstr "Descending album artist"
 
 #: ../src/prefs.c:289
 msgid "Ascending album"
-msgstr "naraščajoče po albumu"
+msgstr "Ascending album"
 
 #: ../src/prefs.c:290
 msgid "Descending album"
-msgstr "padajoče po albumu"
+msgstr "Descending album"
 
 #: ../src/prefs.c:291
 msgid "Ascending year"
-msgstr "naraščajoče po letu"
+msgstr "Ascending year"
 
 #: ../src/prefs.c:292
 msgid "Descending year"
-msgstr "padajoče po letu"
+msgstr "Descending year"
 
 #: ../src/prefs.c:294
 msgid "Ascending disc number"
-msgstr "naraščajoče po številki nosilca"
+msgstr "Ascending disc number"
 
 #: ../src/prefs.c:296
 msgid "Descending disc number"
-msgstr "padajoče po številki nosilca"
+msgstr "Descending disc number"
 
 #: ../src/prefs.c:298
 msgid "Ascending track number"
-msgstr "naraščajoče po številki posnetka"
+msgstr "Ascending track number"
 
 #: ../src/prefs.c:300
 msgid "Descending track number"
-msgstr "padajoče po številki posnetka"
+msgstr "Descending track number"
 
 #: ../src/prefs.c:301
 msgid "Ascending genre"
-msgstr "naraščajoče po zvrsti"
+msgstr "Ascending genre"
 
 #: ../src/prefs.c:302
 msgid "Descending genre"
-msgstr "padajoče po zvrsti"
+msgstr "Descending genre"
 
 #: ../src/prefs.c:303
 msgid "Ascending comment"
-msgstr "naraščajoče po komentarju"
+msgstr "Ascending comment"
 
 #: ../src/prefs.c:304
 msgid "Descending comment"
-msgstr "padajoče po komentarju"
+msgstr "Descending comment"
 
 #: ../src/prefs.c:306
 msgid "Ascending composer"
-msgstr "naraščajoče po skladatelju"
+msgstr "Ascending composer"
 
 #: ../src/prefs.c:308
 msgid "Descending composer"
-msgstr "padajoče po skladatelju"
+msgstr "Descending composer"
 
 #: ../src/prefs.c:310
 msgid "Ascending original artist"
-msgstr "Naraščajoče po izvirnem izvajalcu"
+msgstr "Ascending original artist"
 
 #: ../src/prefs.c:312
 msgid "Descending original artist"
-msgstr "Padajoče po izvirnem izvajalcu"
+msgstr "Descending original artist"
 
 #: ../src/prefs.c:314
 msgid "Ascending copyright"
-msgstr "Naraščajoče po avtorskih pravicah"
+msgstr "Ascending copyright"
 
 #: ../src/prefs.c:316
 msgid "Descending copyright"
-msgstr "Padajoče po avtorskih pravicah"
+msgstr "Descending copyright"
 
 #: ../src/prefs.c:318
 msgid "Ascending URL"
-msgstr "Naraščajoče po naslovu URL"
+msgstr "Ascending URL"
 
 #: ../src/prefs.c:320
 msgid "Descending URL"
-msgstr "Padajoče po naslovu URL"
+msgstr "Descending URL"
 
 #: ../src/prefs.c:322
 msgid "Ascending encoded by"
-msgstr "Naraščajoče po imenu kodirnika"
+msgstr "Ascending encoded by"
 
 #: ../src/prefs.c:324
 msgid "Descending encoded by"
-msgstr "Padajoče po imenu kodirnika"
+msgstr "Descending encoded by"
 
 #: ../src/prefs.c:326
 msgid "Ascending creation date"
-msgstr "naraščajoče po datumu nastanka"
+msgstr "Ascending creation date"
 
 #: ../src/prefs.c:328
 msgid "Descending creation date"
-msgstr "padajoče po datumu nastanka"
+msgstr "Descending creation date"
 
 #: ../src/prefs.c:332
 msgid "Select the type of file sorting when loading a directory."
-msgstr "Izberite vrsto razvrščanja, ko se naloži vsebina mape."
+msgstr "Select the type of file sorting when loading a directory."
 
 #: ../src/prefs.c:344
 msgid "If activated, the sorting of the list will be dependent on the case."
-msgstr ""
+msgstr "If activated, the sorting of the list will be dependent on the case."
 
 #. File Player
 #: ../src/prefs.c:348
 msgid "File Audio Player"
-msgstr "Zvočni predvajalnik datotek"
+msgstr "File Audio Player"
 
 #: ../src/prefs.c:360
 msgid "Player to run:"
-msgstr "Predvajalnik, ki se odpre:"
+msgstr "Player to run:"
 
 #: ../src/prefs.c:366
 msgid ""
 "Enter the program used to play the files. Some arguments can be passed for "
 "the program (as 'xmms -p') before to receive files as other arguments."
 msgstr ""
+"Enter the program used to play the files. Some arguments can be passed for "
+"the program (as 'xmms -p') before to receive files as other arguments."
 
 #. Log options
 #: ../src/prefs.c:384
 msgid "Log Options"
-msgstr "Možnosti beleženja"
+msgstr "Log Options"
 
 #. Show / hide log view
 #: ../src/prefs.c:391
 msgid "Show log view in main window"
-msgstr "Pokaži zapisnik v glavnem oknu"
+msgstr "Show log view in main window"
 
 #: ../src/prefs.c:394
 msgid "If activated, the log view would be visible in the main window."
-msgstr ""
+msgstr "If activated, the log view would be visible in the main window."
 
 #: ../src/prefs.c:400
 msgid "Max number of lines:"
-msgstr "Največje število vrstic:"
+msgstr "Max number of lines:"
 
 #. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formatted_Toggled),NULL);
 #. * g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
@@ -3535,16 +3530,16 @@ msgstr "Največje število vrstic:"
 #.
 #: ../src/prefs.c:418
 msgid "File Settings"
-msgstr "Nastavitve datoteke"
+msgstr "File Settings"
 
 #. File (name) Options
 #: ../src/prefs.c:424
 msgid "File Options"
-msgstr "Možnosti datoteke"
+msgstr "File Options"
 
 #: ../src/prefs.c:430
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
-msgstr "Zamenjaj neveljavne znake v imenu datoteke (za Windows in CD-rom)"
+msgstr "Replace illegal characters in filename (for Windows and CD-Rom)"
 
 #: ../src/prefs.c:433
 msgid ""
@@ -3553,46 +3548,50 @@ msgid ""
 "problem when renaming the file. This is useful when renaming the file from "
 "the tag with the scanner."
 msgstr ""
+"Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
+"('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
+"problem when renaming the file. This is useful when renaming the file from "
+"the tag with the scanner."
 
 #. Extension case (lower/upper?)
 #: ../src/prefs.c:441
 msgid "Convert filename extension to:"
-msgstr "Pretvori pripono imena datoteke v:"
+msgstr "Convert filename extension to:"
 
 #: ../src/prefs.c:444
 msgid "Lower Case"
-msgstr "male črke"
+msgstr "Lower Case"
 
 #: ../src/prefs.c:447
 msgid "For example, the extension will be converted to '.mp3'"
-msgstr "Primer: končnica bo pretvorjena v '.mp3'"
+msgstr "For example, the extension will be converted to '.mp3'"
 
 #: ../src/prefs.c:450
 msgid "Upper Case"
-msgstr "velike črke"
+msgstr "Upper Case"
 
 #: ../src/prefs.c:453
 msgid "For example, the extension will be converted to '.MP3'"
-msgstr "Primer: končnica bo pretvorjena v '.MP3'"
+msgstr "For example, the extension will be converted to '.MP3'"
 
 #: ../src/prefs.c:456
 msgid "No Change"
-msgstr "Brez spremembe"
+msgstr "No Change"
 
 #: ../src/prefs.c:459
 msgid "The extension will not be converted"
-msgstr "Končnica ne bo pretvorjena"
+msgstr "The extension will not be converted"
 
 #. Preserve modification time
 #: ../src/prefs.c:462
 msgid "Preserve modification time of the file"
-msgstr "Ohrani datum spremembe datoteke"
+msgstr "Preserve modification time of the file"
 
 #: ../src/prefs.c:465
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
-"Ohrani čas spremembe (med lastnostmi datoteke) pri shranjevanju datoteke."
+"Preserve the modification time (in file properties) when saving the file."
 
 #. Change directory modification time
 #: ../src/prefs.c:469
@@ -3600,8 +3599,8 @@ msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
-"Posodobi čas spremembe nadrejene mape datoteke (priporočeno ob uporabi "
-"programa Amarok)"
+"Update modification time of the parent directory of the file (recommended "
+"when using Amarok)"
 
 #: ../src/prefs.c:473
 msgid ""
@@ -3612,11 +3611,17 @@ msgid ""
 "performance reasons, they refresh file information by detecting changes of "
 "the parent directory."
 msgstr ""
+"The modification time of the parent directory of the file will be updated "
+"when saving tag the file. At the present time it is automatically done only "
+"when renaming a file.\n"
+"This feature is interesting when using applications like Amarok. For "
+"performance reasons, they refresh file information by detecting changes of "
+"the parent directory."
 
 #. Character Set for Filename
 #: ../src/prefs.c:481
 msgid "Character Set for Filename"
-msgstr "Znakovni nabor za ime datoteke"
+msgstr "Character Set for Filename"
 
 #. Rules for character set
 #: ../src/prefs.c:493
@@ -3624,12 +3629,12 @@ msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
 msgstr ""
-"Pravila, ki naj veljajo, če nekaterih znakov ni mogoče pretvoriti v "
-"sistemsko kodiranje znakov ob zapisovanju imena datoteke:"
+"Rules to apply if some characters can't be converted to the system character "
+"encoding when writing filename:"
 
 #: ../src/prefs.c:499
 msgid "Try another character encoding"
-msgstr "Poskusi drugi kodiranje znakov"
+msgstr "Try another character encoding"
 
 #: ../src/prefs.c:503
 msgid ""
@@ -3637,11 +3642,15 @@ msgid ""
 "your locale (for example: ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
 "for 'ro'). If it fails, it will try the character encoding ISO-8859-1."
 msgstr ""
+"With this option, it will try the conversion to the encoding associated to "
+"your locale (for example: ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
+"for 'ro'). If it fails, it will try the character encoding ISO-8859-1."
 
 #: ../src/prefs.c:510
 msgid ""
 "Force using the system character encoding and activate the transliteration"
-msgstr "Vsili uporabo sistemskega nabora znakov in začni prečrkovanje"
+msgstr ""
+"Force using the system character encoding and activate the transliteration"
 
 #: ../src/prefs.c:514 ../src/prefs.c:844 ../src/prefs.c:913
 msgid ""
@@ -3649,34 +3658,41 @@ msgid ""
 "character set, it can be approximated through one or several similarly "
 "looking characters."
 msgstr ""
+"With this option, when a character cannot be represented in the target "
+"character set, it can be approximated through one or several similarly "
+"looking characters."
 
 #: ../src/prefs.c:520
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr ""
+"Force using the system character encoding and silently discard some "
+"characters"
 
 #: ../src/prefs.c:524 ../src/prefs.c:854 ../src/prefs.c:923
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it will be silently discarded."
 msgstr ""
+"With this option, when a character cannot be represented in the target "
+"character set, it will be silently discarded."
 
 #.
 #. * Tag Settings
 #.
 #: ../src/prefs.c:533
 msgid "Tag Settings"
-msgstr "Nastavitve oznak"
+msgstr "Tag Settings"
 
 #. Tag Options
 #: ../src/prefs.c:539
 msgid "Tag Options"
-msgstr "Možnosti oznak"
+msgstr "Tag Options"
 
 #: ../src/prefs.c:545
 msgid "Auto completion of date if not complete"
-msgstr "Samodopolnjevanje, če datum ni popoln"
+msgstr "Auto completion of date if not complete"
 
 #: ../src/prefs.c:548
 msgid ""
@@ -3684,10 +3700,13 @@ msgid ""
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
 "1996, 95 => 1995…)."
 msgstr ""
+"Try to complete the year field if you enter only the last numerals of the "
+"date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
+"1996, 95 => 1995…)."
 
 #: ../src/prefs.c:556
 msgid "Write the track field with the following number of digits:"
-msgstr "V polje posnetka zapisuj z naslednjim številom števk:"
+msgstr "Write the track field with the following number of digits:"
 
 #: ../src/prefs.c:559
 msgid ""
@@ -3695,63 +3714,68 @@ msgid ""
 "obtain a number with 'n' digits (for example, with two digits: '05', '09', "
 "'10'…). Else it keeps the 'raw' track value."
 msgstr ""
+"If activated, the track field is written using the number '0' as padding to "
+"obtain a number with 'n' digits (for example, with two digits: '05', '09', "
+"'10'…). Else it keeps the 'raw' track value."
 
 #: ../src/prefs.c:578
 msgid "Write the disc field with the following number of digits:"
-msgstr "V polje diska zapisuj z naslednjim številom števk:"
+msgstr "Write the disc field with the following number of digits:"
 
 #: ../src/prefs.c:583
 msgid "Whether to pad the disc field with leading zeroes"
-msgstr ""
+msgstr "Whether to pad the disc field with leading zeroes"
 
 #: ../src/prefs.c:613
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr ""
+"Tag field focus when switching files in list with shortcuts Page Up/Page "
+"Down:"
 
 #: ../src/prefs.c:619
 msgid "Keep focus to the same tag field"
-msgstr "Obdrži pozornost na istem polju oznak"
+msgstr "Keep focus to the same tag field"
 
 #: ../src/prefs.c:625
 msgid "Return focus to the first tag field (i.e. 'Title' field)"
-msgstr "Vrni pozornost na prvo polje oznak (t.j. polje 'Naslov')"
+msgstr "Return focus to the first tag field (i.e. 'Title' field)"
 
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(SetFocusToFirstTagField),SET_FOCUS_TO_FIRST_TAG_FIELD);
 #. Tag Splitting
 #: ../src/prefs.c:630
 msgid "Tag Splitting"
-msgstr "Deljenje oznak"
+msgstr "Tag Splitting"
 
 #: ../src/prefs.c:639
 msgid ""
 "For Vorbis tags, selected fields will be split at dashes and saved as "
 "separate tags"
 msgstr ""
-"Za oznake Vorbis se bodo izbrana polja razdelila pri vezajih in shranila kot "
-"ločene oznake"
+"For Vorbis tags, selected fields will be split at dashes and saved as "
+"separate tags"
 
 #: ../src/prefs.c:649
 msgid "Original artist"
-msgstr "Izvirni izvajalec"
+msgstr "Original artist"
 
 #.
 #. * ID3 Tag Settings
 #.
 #: ../src/prefs.c:670
 msgid "ID3 Tag Settings"
-msgstr "Nastavitve oznak ID3"
+msgstr "ID3 Tag Settings"
 
 #. Tag Rules frame
 #: ../src/prefs.c:679
 msgid "ID3 Tag Rules"
-msgstr "Pravila oznak ID3"
+msgstr "ID3 Tag Rules"
 
 #. Strip tag when fields (managed by EasyTAG) are empty
 #: ../src/prefs.c:691
 msgid "Strip tags if all fields are set to blank"
-msgstr "Odstrani oznake, če so vsa polja prazna"
+msgstr "Strip tags if all fields are set to blank"
 
 #: ../src/prefs.c:694
 msgid ""
@@ -3760,72 +3784,82 @@ msgid ""
 "strip the whole tag when these seven standard data fields have been set to "
 "blank."
 msgstr ""
+"As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
+"Genre or Comment (as an attached image, lyrics…), this option allows you to "
+"strip the whole tag when these seven standard data fields have been set to "
+"blank."
 
 #. Convert old ID3v2 tag version
 #: ../src/prefs.c:700
 msgid "Automatically convert old ID3v2 tag versions"
-msgstr "Samodejno pretvori stare različice oznak ID3v2"
+msgstr "Automatically convert old ID3v2 tag versions"
 
 #: ../src/prefs.c:703
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
 msgstr ""
+"If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
+"ID3v2.3 version."
 
 #. Use CRC32
 #: ../src/prefs.c:707
 msgid "Use CRC32"
-msgstr "Uporabi CRC32"
+msgstr "Use CRC32"
 
 #: ../src/prefs.c:710
 msgid "Set CRC32 in the ID3v2 tags"
-msgstr "V oznakah ID3v2 nastavi CRC32"
+msgstr "Set CRC32 in the ID3v2 tags"
 
 #. Use Compression
 #: ../src/prefs.c:713
 msgid "Use Compression"
-msgstr "Uporabi stiskanje"
+msgstr "Use Compression"
 
 #: ../src/prefs.c:717
 msgid "Set Compression in the ID3v2 tags"
-msgstr "V oznakah ID3v2 nastavi stiskanje"
+msgstr "Set Compression in the ID3v2 tags"
 
 #. Write Genre in text
 #: ../src/prefs.c:720
 msgid "Write Genre in text only"
-msgstr "Zapiši zvrst v besedilnem načinu"
+msgstr "Write Genre in text only"
 
 #: ../src/prefs.c:724
 msgid ""
 "Don't use ID3v1 number references in genre tag. Enable this if you see "
 "numbers as genre in your music player."
 msgstr ""
+"Don't use ID3v1 number references in genre tag. Enable this if you see "
+"numbers as genre in your music player."
 
 #. Character Set for writing ID3 tag
 #: ../src/prefs.c:727
 msgid "Character Set for writing ID3 tags"
-msgstr "Nabor znakov za zapisovanje oznak ID3"
+msgstr "Character Set for writing ID3 tags"
 
 #. ID3v2 tags
 #: ../src/prefs.c:734
 msgid "ID3v2 tags"
-msgstr "Oznake ID3v2"
+msgstr "ID3v2 tags"
 
 #. Write ID3v2 tag
 #: ../src/prefs.c:747
 msgid "Write ID3v2 tag"
-msgstr "Zapiši oznako ID3v2"
+msgstr "Write ID3v2 tag"
 
 #: ../src/prefs.c:750
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
 msgstr ""
+"If activated, an ID3v2.4 tag will be added or updated at the beginning of "
+"the MP3 files. Else it will be stripped."
 
 #. ID3v2 tag version
 #: ../src/prefs.c:757
 msgid "Version:"
-msgstr "Različica:"
+msgstr "Version:"
 
 #: ../src/prefs.c:763
 msgid ""
@@ -3833,35 +3867,38 @@ msgid ""
 " - ID3v2.3 is written using id3lib,\n"
 " - ID3v2.4 is written using libid3tag (recommended)."
 msgstr ""
+"Select the ID3v2 tag version to write:\n"
+" - ID3v2.3 is written using id3lib,\n"
+" - ID3v2.4 is written using libid3tag (recommended)."
 
 #. Charset
 #. Id3V1 writing character set
 #: ../src/prefs.c:778 ../src/prefs.c:882
 msgid "Charset:"
-msgstr "Znakovni nabor:"
+msgstr "Charset:"
 
 #. Unicode
 #: ../src/prefs.c:783
 msgid "Unicode "
-msgstr "Unikod"
+msgstr "Unicode "
 
 #: ../src/prefs.c:791
 msgid "Unicode type to use"
-msgstr "Uporabljena vrsta Unikod"
+msgstr "Unicode type to use"
 
 #: ../src/prefs.c:815
 msgid "Character set used to write the tag data in the file."
-msgstr "Nabor znakov, uporabljen za zapis podatkov oznake v datoteko."
+msgstr "Character set used to write the tag data in the file."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
 #: ../src/prefs.c:825 ../src/prefs.c:894
 msgid "Additional settings for iconv():"
-msgstr "Dodatne nastavitve za iconv():"
+msgstr "Additional settings for iconv():"
 
 #: ../src/prefs.c:831 ../src/prefs.c:900
 msgid "No"
-msgstr "Ne"
+msgstr "No"
 
 #: ../src/prefs.c:835 ../src/prefs.c:904
 msgid ""
@@ -3869,6 +3906,9 @@ msgid ""
 "character set, it isn't changed. But note that an error message will be "
 "displayed for information."
 msgstr ""
+"With this option, when a character cannot be represented in the target "
+"character set, it isn't changed. But note that an error message will be "
+"displayed for information."
 
 #: ../src/prefs.c:840 ../src/prefs.c:909
 msgid "//TRANSLIT"
@@ -3876,36 +3916,38 @@ msgstr "//TRANSLIT"
 
 #: ../src/prefs.c:850 ../src/prefs.c:919
 msgid "//IGNORE"
-msgstr "//PREZRI"
+msgstr "//IGNORE"
 
 #. ID3v1 tags
 #: ../src/prefs.c:859
 msgid "ID3v1 tags"
-msgstr "Oznake ID3v1"
+msgstr "ID3v1 tags"
 
 #. Write ID3v1 tag
 #: ../src/prefs.c:873
 msgid "Write ID3v1.x tag"
-msgstr "Zapiši oznako ID3v1.x"
+msgstr "Write ID3v1.x tag"
 
 #: ../src/prefs.c:876
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
 msgstr ""
+"If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
+"files. Else it will be stripped."
 
 #: ../src/prefs.c:890
 msgid "Character set used to write ID3v1 tag data in the file."
-msgstr "Nabor znakov, uporabljen za zapisovanje oznak ID3v1 v datoteko."
+msgstr "Character set used to write ID3v1 tag data in the file."
 
 #. Character Set for reading tag
 #: ../src/prefs.c:928
 msgid "Character Set for reading ID3 tags"
-msgstr "Nabor znakov za branje oznak ID3"
+msgstr "Character Set for reading ID3 tags"
 
 #: ../src/prefs.c:942
 msgid "Non-standard:"
-msgstr "Nestandardno:"
+msgstr "Non-standard:"
 
 #: ../src/prefs.c:948
 msgid ""
@@ -3923,62 +3965,76 @@ msgid ""
 "'Windows-1251' to load tags written under Windows. And 'KOI8-R' to load tags "
 "written under Unix systems."
 msgstr ""
+"This character set will be used when reading the tag data, to convert each "
+"string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
+"tag).\n"
+"\n"
+"For example:\n"
+"  - In previous versions of EasyTAG, you could save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct. To convert these tags to Unicode: "
+"activate this option and select UTF-8. You must also activate above the "
+"option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
+"UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
+"  - If Unicode was not used, Russian people can select the character set "
+"'Windows-1251' to load tags written under Windows. And 'KOI8-R' to load tags "
+"written under Unix systems."
 
 #: ../src/prefs.c:966
 msgid "Character set used to read tag data in the file."
-msgstr "Nabor znakov, uporabljen za branje podatkov oznak v datoteki."
+msgstr "Character set used to read tag data in the file."
 
 #.
 #. * Scanner
 #.
 #: ../src/prefs.c:980
 msgid "Scanner"
-msgstr "Preiskovalnik"
+msgstr "Scanner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
 #: ../src/prefs.c:990
 msgid "Fill Tag Scanner - Character Conversion"
-msgstr "Preiskovalnik oznak - pretvorba z nakov"
+msgstr "Fill Tag Scanner - Character Conversion"
 
 #: ../src/prefs.c:996 ../src/prefs.c:1021
 msgid "Convert underscore character '_' and string '%20' to space ' '"
-msgstr "Pretvori podčrtaj ('_') in niz '%20' v presledek (' ')"
+msgstr "Convert underscore character '_' and string '%20' to space ' '"
 
 #: ../src/prefs.c:998 ../src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
-msgstr "Pretvori presledek (' ') v podčrtaj ('_')"
+msgstr "Convert space ' ' to underscore '_'"
 
 #: ../src/prefs.c:1010 ../src/prefs.c:1012
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
 msgstr ""
-"Izbrana možnost omogoča uporabo pretvarjanja pri uveljavnljanju maske "
-"preiskovalnika oznak."
+"If activated, this conversion will be used when applying a mask from the "
+"scanner for tags."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
 #: ../src/prefs.c:1016
 msgid "Rename File Scanner - Character Conversion"
-msgstr "Preimenovalnik datotek - pretvarjanje znakov"
+msgstr "Rename File Scanner - Character Conversion"
 
 #: ../src/prefs.c:1033 ../src/prefs.c:1035 ../src/prefs.c:1037
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
 msgstr ""
-"Izbrana možnost omogoča uporabo pretvarjanja pri uveljavnljanju maske "
-"preimenovanja imen datotek."
+"If activated, this conversion will be used when applying a mask from the "
+"scanner for filenames."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
 #: ../src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
-msgstr "Preiskovalnik opravil - pretvarjanje znakov"
+msgstr "Process Fields Scanner - Character Conversion"
 
 #. Don't convert some words like to, feat. first letter uppercase.
 #: ../src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
+"Don't uppercase first letter of words for some prepositions and articles."
 
 #: ../src/prefs.c:1051
 msgid ""
@@ -3987,60 +4043,70 @@ msgid ""
 "word' (for example, you will obtain 'Text in an Entry' instead of 'Text In "
 "An Entry')."
 msgstr ""
+"Don't convert first letter of words like prepositions, articles and words "
+"like feat., when using the scanner 'First letter uppercase of each "
+"word' (for example, you will obtain 'Text in an Entry' instead of 'Text In "
+"An Entry')."
 
 #. Properties of the scanner window
 #: ../src/prefs.c:1057
 msgid "Scanner Window"
-msgstr "Okno preiskovalnika"
+msgstr "Scanner Window"
 
 #: ../src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
-msgstr "Ob zagonu programa odpri okno preiskovalnika"
+msgstr "Open the Scanner Window on startup"
 
 #: ../src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr ""
+"Activate this option to open automatically the scanner window when EasyTAG "
+"starts."
 
 #. Other options
 #: ../src/prefs.c:1071
 msgid "Fields"
-msgstr "Polja"
+msgstr "Fields"
 
 #. Overwrite text into tag fields
 #: ../src/prefs.c:1078
 msgid "Overwrite fields when scanning tags"
-msgstr "Prepiši polja med preiskovanjem oznak"
+msgstr "Overwrite fields when scanning tags"
 
 #: ../src/prefs.c:1081
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
 msgstr ""
+"If activated, the scanner will replace existing text in fields by the new "
+"one. If deactivated, only blank fields of the tag will be filled."
 
 #: ../src/prefs.c:1092
 msgid "Set this text as default comment:"
-msgstr "Vpiši besedilo kot privzeto opombo:"
+msgstr "Set this text as default comment:"
 
 #: ../src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
 msgstr ""
+"Activate this option if you want to put the following string into the "
+"comment field when using the 'Fill Tag' scanner."
 
 #. CRC32 comment
 #: ../src/prefs.c:1113
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
-msgstr "Uporabi CRC32 kot privzeto opombo (za datoteke zgolj z oznakami ID3)."
+msgstr "Use CRC32 as the default comment (for files with ID3 tags only)."
 
 #: ../src/prefs.c:1117
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
 msgstr ""
-"Izračuna vrednost CRC-32 datoteke in ga zapiše v polje komentarja, pri "
-"uporabi možnosti preiskovalnika 'Zapolni oznake'."
+"Calculates the CRC-32 value of the file and writes it into the comment field "
+"when using the 'Fill Tag' scanner."
 
 #.
 #. * CDDB
@@ -4052,34 +4118,34 @@ msgstr "CDDB"
 #. CDDB Server Settings (Automatic Search)
 #: ../src/prefs.c:1134
 msgid "Server Settings for Automatic Search"
-msgstr "Nastavitve strežnika za samodejno iskanje"
+msgstr "Server Settings for Automatic Search"
 
 #: ../src/prefs.c:1143 ../src/prefs.c:1182 ../src/prefs.c:1216
 msgid "Name:"
-msgstr "Ime:"
+msgstr "Name:"
 
 #: ../src/prefs.c:1162 ../src/prefs.c:1190 ../src/prefs.c:1225
 #: ../src/prefs.c:1310
 msgid "Port:"
-msgstr "Vrata:"
+msgstr "Port:"
 
 #: ../src/prefs.c:1172 ../src/prefs.c:1200 ../src/prefs.c:1234
 msgid "CGI Path:"
-msgstr "Pot CGI:"
+msgstr "CGI Path:"
 
 #. CDDB Server Settings (Manual Search)
 #: ../src/prefs.c:1208
 msgid "Server Settings for Manual Search"
-msgstr "Nastavitve strežnika za ročno iskanje"
+msgstr "Server Settings for Manual Search"
 
 #. Local access for CDDB (Automatic Search)
 #: ../src/prefs.c:1242
 msgid "Local CDDB"
-msgstr "Krajevna zbirka CDDB"
+msgstr "Local CDDB"
 
 #: ../src/prefs.c:1250
 msgid "Path:"
-msgstr "Pot:"
+msgstr "Path:"
 
 #: ../src/prefs.c:1262
 msgid ""
@@ -4088,785 +4154,738 @@ msgid ""
 "'country', 'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' "
 "and 'misc'."
 msgstr ""
+"Specify the directory where the local CD database is located. The local CD "
+"database contains the eleven following directories 'blues', 'classical', "
+"'country', 'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' "
+"and 'misc'."
 
 #. CDDB Proxy Settings
 #: ../src/prefs.c:1288
 msgid "Proxy Settings"
-msgstr "Nastavitve posredniškega strežnika"
+msgstr "Proxy Settings"
 
 #: ../src/prefs.c:1297
 msgid "Use a proxy"
-msgstr "Uporabi posredniški strežnik"
+msgstr "Use a proxy"
 
 #: ../src/prefs.c:1300
 msgid "Set active the settings of the proxy server."
-msgstr "Omogoči nastavitve posredovalnega strežnika."
+msgstr "Set active the settings of the proxy server."
 
 #: ../src/prefs.c:1302
 msgid "Host Name:"
-msgstr "Ime gostitelja:"
+msgstr "Host Name:"
 
 #: ../src/prefs.c:1309
 msgid "Name of the proxy server."
-msgstr "Ime posredniškega strežnika."
+msgstr "Name of the proxy server."
 
 #: ../src/prefs.c:1317
 msgid "Port of the proxy server."
-msgstr "Vrata posredniškega strežnika."
+msgstr "Port of the proxy server."
 
 #: ../src/prefs.c:1321
 msgid "User Name:"
-msgstr "Uporabniško ime:"
+msgstr "User Name:"
 
 #: ../src/prefs.c:1328
 msgid "Name of user for the the proxy server."
-msgstr "Ime uporabnika za posredovalni strežnik."
+msgstr "Name of user for the the proxy server."
 
 #: ../src/prefs.c:1329
 msgid "User Password:"
-msgstr "Geslo uporabnika:"
+msgstr "User Password:"
 
-#: ../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 "Password of user for the proxy server."
 
 #. Track Name list (CDDB results)
-#: ../src/prefs.c:1342
+#: ../src/prefs.c:1343
 msgid "Track Name List"
-msgstr "Seznam naslovov posnetkov"
+msgstr "Track Name List"
 
-#: ../src/prefs.c:1349
+#: ../src/prefs.c:1350
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
+"Select corresponding audio file (according position or DLM if activated "
+"below)"
 
-#: ../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 ""
+"If activated, when selecting a line in the list of tracks name, the "
+"corresponding audio file in the main list will be also selected."
 
 #. 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)"
 msgstr ""
+"Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
+"files (using filename)"
 
 #.
 #. * Confirmation
 #.
-#: ../src/prefs.c:1373
+#: ../src/prefs.c:1374
 msgid "Confirmation"
-msgstr "Potrditev"
+msgstr "Confirmation"
 
-#: ../src/prefs.c:1378
+#: ../src/prefs.c:1379
 msgid "Confirm exit from program"
-msgstr "Potrdi izhod iz programa"
+msgstr "Confirm exit from program"
 
-#: ../src/prefs.c:1381
+#: ../src/prefs.c:1382
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr ""
-"Izbrana možnost omogoči prikaz pogovornega okna, ki zahteva potrditev pred "
-"končanjem programa."
+"If activated, opens a dialogue box to ask confirmation before exiting the "
+"program."
 
-#: ../src/prefs.c:1384
+#: ../src/prefs.c:1385
 msgid "Confirm writing of file tag"
-msgstr "Potrdi pisanje oznak v datoteko"
+msgstr "Confirm writing of file tag"
 
-#: ../src/prefs.c:1388
+#: ../src/prefs.c:1389
 msgid "Confirm renaming of file"
-msgstr "Potrdite preimenovanje datoteke"
+msgstr "Confirm renaming of file"
 
-#: ../src/prefs.c:1392
+#: ../src/prefs.c:1393
 msgid "Confirm deleting of file"
-msgstr "Potrdite brisanje datoteke"
+msgstr "Confirm deleting of file"
 
-#: ../src/prefs.c:1396
+#: ../src/prefs.c:1397
 msgid "Confirm writing of playlist"
-msgstr "Potrdite zapisovanje seznama predvajanja"
+msgstr "Confirm writing of playlist"
 
-#: ../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"
+msgstr "Confirm changing directory when there are unsaved changes"
 
 #. 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)"
+msgstr "(Example: %.*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 "(Primer: disk_%.*d_od_10/Ime_posnetka_1.mp3)"
+msgstr "(Example: disc_%.*d_of_10/Track_name_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"
+msgstr "Configuration saved"
 
-#: ../src/prefs.c:1621
+#: ../src/prefs.c:1622
 msgid "Configuration unchanged"
-msgstr "Nastavitve niso spremenjene"
+msgstr "Configuration unchanged"
 
-#: ../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"
+msgstr "The selected path for 'Default path to files' is invalid"
 
-#: ../src/prefs.c:1708
+#: ../src/prefs.c:1715
 #, c-format
 msgid ""
 "Path: '%s'\n"
 "Error: %s"
 msgstr ""
-"Pot: '%s'\n"
-"Napaka: %s"
+"Path: '%s'\n"
+"Error: %s"
 
-#: ../src/prefs.c:1709
+#: ../src/prefs.c:1717
 msgid "Invalid Path Error"
-msgstr "Napaka neveljavne poti"
+msgstr "Invalid Path Error"
 
-#: ../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"
+msgstr "The audio file player '%s' cannot be found"
 
-#: ../src/prefs.c:1825
+#: ../src/prefs.c:1833
 msgid "Audio Player Error"
-msgstr "Napaka zvočnega predvajalnika"
+msgstr "Audio Player Error"
 
-#: ../src/scan.c:180
+#: ../src/scan_dialog.c:182
 msgid "Fill Tag"
-msgstr "Zapolni oznako"
+msgstr "Fill Tag"
 
-#: ../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)"
+msgstr "Cannot calculate CRC value of file (%s)"
 
-#: ../src/scan.c:373
+#: ../src/scan_dialog.c:371
 msgid "Tag successfully scanned"
-msgstr "Oznaka je uspešno preiskana"
+msgstr "Tag successfully scanned"
 
-#: ../src/scan.c:375
+#: ../src/scan_dialog.c:373
 #, c-format
 msgid "Tag successfully scanned: %s"
-msgstr "Oznaka je uspešno preiskana: %s"
+msgstr "Tag successfully scanned: %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"
+"Tag scanner: strange… the extension '%s' was not found in filename '%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 "Napaka preiskovanja: ločila '%s' v '%s' ni mogoče najti"
+msgstr "Scan Error: can't find separator '%s' within '%s'"
 
-#: ../src/scan.c:714
+#: ../src/scan_dialog.c:712
 msgid "New filename successfully scanned"
-msgstr "Ime nove datoteke je uspešno preiskano"
+msgstr "New filename successfully scanned"
 
-#: ../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"
+msgstr "New filename successfully scanned: %s"
 
-#: ../src/scan.c:1817
+#: ../src/scan_dialog.c:1628
 #, c-format
 msgid "Error while processing fields: %s"
-msgstr "Napaka med obdelovanjem polj: %s"
+msgstr "Error while processing fields: %s"
 
 #. The window
-#: ../src/scan.c:2336
+#: ../src/scan_dialog.c:1798
 msgid "Tag and Filename Scan"
-msgstr "Preiskovanje oznak in imen datotek"
+msgstr "Tag and Filename Scan"
 
 #. 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"
+msgstr "Scan Files"
 
 #. Option Menu
-#: ../src/scan.c:2373
+#: ../src/scan_dialog.c:1835
 msgid "Scanner:"
-msgstr "Optični bralnik:"
+msgstr "Scanner:"
 
-#: ../src/scan.c:2394
+#: ../src/scan_dialog.c:1856
 msgid "Select the type of scanner to use"
-msgstr "Izberite vrsto preiskovalnika za uporabo"
+msgstr "Select the type of scanner to use"
 
-#: ../src/scan.c:2403
+#: ../src/scan_dialog.c:1865
 msgid "Scanner Preferences"
-msgstr "Možnosti optičnega bralnika"
+msgstr "Scanner Preferences"
 
-#: ../src/scan.c:2412
+#: ../src/scan_dialog.c:1874
 msgid "Show / Hide Masks Editor"
-msgstr "Pokaži ali skrij urejevalnik mask"
+msgstr "Show / Hide Masks Editor"
 
-#: ../src/scan.c:2422
+#: ../src/scan_dialog.c:1884
 msgid "Show / Hide Legend"
-msgstr "Pokaži ali skrij legendo"
+msgstr "Show / Hide Legend"
 
-#: ../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 ""
+"Select or type in a mask using codes (see Legend) to parse filename and "
+"path. Used to fill in tag fields"
 
 #. Preview label
-#: ../src/scan.c:2476
+#: ../src/scan_dialog.c:1938
 msgid "Fill tag preview"
-msgstr "Predogled zapolnjenja oznak"
+msgstr "Fill tag preview"
 
-#: ../src/scan.c:2506
+#: ../src/scan_dialog.c:1968
 msgid "Prefix mask with current path"
-msgstr "Maska predpone s trenutno potjo"
+msgstr "Prefix mask with current path"
 
-#: ../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"
 "Use / to make directories. If the first character is /, it's a absolute "
 "path, otherwise is relative to the old path."
 msgstr ""
+"Select or type in a mask using codes (see Legend) to parse tag fields. Used "
+"to rename the file.\n"
+"Use / to make directories. If the first character is /, it's a absolute "
+"path, otherwise is relative to the old path."
 
 #. Preview label
-#: ../src/scan.c:2545
+#: ../src/scan_dialog.c:2007
 msgid "Rename file preview"
-msgstr "Preimenuj predogled datoteke"
+msgstr "Rename file preview"
 
-#: ../src/scan.c:2564
+#: ../src/scan_dialog.c:2026
 msgid "Select fields:"
-msgstr "Izbor polj:"
+msgstr "Select fields:"
 
-#: ../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"
 msgstr ""
-"Gumbi na desni predstavljajo polja, ki jih je mogoče obdelati. Izberite "
-"tista, ki so za vas zanimiva."
+"The buttons on the right represent the fields which can be processed. Select "
+"those which interest you"
 
 #. Advice for Translators: set the first letter of filename translated
-#: ../src/scan.c:2571
+#: ../src/scan_dialog.c:2033
 msgid "F"
-msgstr "D"
+msgstr "F"
 
-#: ../src/scan.c:2573
+#: ../src/scan_dialog.c:2035
 msgid "Process filename field"
-msgstr "Obdelaj polje imena datoteke"
+msgstr "Process filename field"
 
 #. Advice for Translators: set the first letter of title translated
-#: ../src/scan.c:2575
+#: ../src/scan_dialog.c:2037
 msgid "T"
-msgstr "N"
+msgstr "T"
 
-#: ../src/scan.c:2576
+#: ../src/scan_dialog.c:2038
 msgid "Process title field"
-msgstr "Obdelaj polje naslova"
+msgstr "Process title field"
 
 #. Advice for Translators: set the first letter of artist translated
-#: ../src/scan.c:2578
+#: ../src/scan_dialog.c:2040
 msgid "Ar"
-msgstr "I"
+msgstr "Ar"
 
-#: ../src/scan.c:2579
+#: ../src/scan_dialog.c:2041
 msgid "Process file artist field"
-msgstr "Obdelaj polje izvajalca"
+msgstr "Process file artist field"
 
 #. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan.c:2581
+#: ../src/scan_dialog.c:2043
 msgid "AA"
-msgstr "Ia"
+msgstr "AA"
 
-#: ../src/scan.c:2582
+#: ../src/scan_dialog.c:2044
 msgid "Process album artist field"
-msgstr "Obdelaj polje izvajalca albuma"
+msgstr "Process album artist field"
 
 #. 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"
+msgstr "Process album field"
 
 #. Advice for Translators: set the first letter of genre translated
-#: ../src/scan.c:2587
+#: ../src/scan_dialog.c:2049
 msgid "G"
-msgstr "Z"
+msgstr "G"
 
-#: ../src/scan.c:2588
+#: ../src/scan_dialog.c:2050
 msgid "Process genre field"
-msgstr "Obdelaj polje zvrsti"
+msgstr "Process genre field"
 
 #. Advice for Translators: set the first letter of comment translated
-#: ../src/scan.c:2590
+#: ../src/scan_dialog.c:2052
 msgid "Cm"
-msgstr "K"
+msgstr "Cm"
 
-#: ../src/scan.c:2591
+#: ../src/scan_dialog.c:2053
 msgid "Process comment field"
-msgstr "Obdelaj polje komentarja"
+msgstr "Process comment field"
 
 #. Advice for Translators: set the first letter of composer translated
-#: ../src/scan.c:2593
+#: ../src/scan_dialog.c:2055
 msgid "Cp"
-msgstr "Sk"
+msgstr "Cp"
 
-#: ../src/scan.c:2594
+#: ../src/scan_dialog.c:2056
 msgid "Process composer field"
-msgstr "Obdelaj polje skladatelja"
+msgstr "Process composer field"
 
 #. 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"
+msgstr "Process original artist field"
 
 #. Advice for Translators: set the first letter of copyright translated
-#: ../src/scan.c:2599
+#: ../src/scan_dialog.c:2061
 msgid "Cr"
-msgstr "Ap"
+msgstr "Cr"
 
-#: ../src/scan.c:2600
+#: ../src/scan_dialog.c:2062
 msgid "Process copyright field"
-msgstr "Obdelaj polje avtorske pravice"
+msgstr "Process copyright field"
 
 #. 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"
+msgstr "Process URL field"
 
 #. 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"
+msgstr "Process encoder name field"
 
-#: ../src/scan.c:2650
+#: ../src/scan_dialog.c:2112
 msgid "Invert selection"
-msgstr "Preobrni izbor"
+msgstr "Invert selection"
 
-#: ../src/scan.c:2657
+#: ../src/scan_dialog.c:2119
 msgid "Select/Unselect all"
-msgstr "Izberi ali prekliči izbor vseh"
+msgstr "Select/Unselect all"
 
-#: ../src/scan.c:2672
+#: ../src/scan_dialog.c:2134
 msgid "Convert:"
-msgstr "Pretvori:"
+msgstr "Convert:"
 
-#: ../src/scan.c:2674
+#: ../src/scan_dialog.c:2136
 msgid "to: "
-msgstr "v:"
+msgstr "to: "
 
-#: ../src/scan.c:2681
+#: ../src/scan_dialog.c:2143
 msgid "Do not convert"
-msgstr "Ne pretvori"
+msgstr "Do not convert"
 
-#: ../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'."
 msgstr ""
-"Podčrtaj ali niz '%20' zamenja en presledek. Primer: prej 'Besedilo"
-"%20Vnosa', poslej 'Besedilo Vnosa'."
+"The underscore character or the string '%20' are replaced by one space. "
+"Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
 
-#: ../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'."
 msgstr ""
-"Znak za presledek nadomesti z znakom za podčrtaj. Primer: prej 'Besedilo "
-"Vnosa', poslej 'Besedilo_Vnosa'."
+"The space character is replaced by one underscore character. Example, "
+"before: 'Text In An Entry', after: 'Text_In_An_Entry'."
 
-#: ../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."
+"Replace a string by another one. Note that the search is case sensitive."
 
-#: ../src/scan.c:2713
+#: ../src/scan_dialog.c:2175
 msgid "Capitalize all"
-msgstr "Velike začetnice povsod"
+msgstr "Capitalize all"
 
-#: ../src/scan.c:2715
+#: ../src/scan_dialog.c:2177
 msgid "Lowercase all"
-msgstr "Povsod male črke"
+msgstr "Lowercase all"
 
-#: ../src/scan.c:2717
+#: ../src/scan_dialog.c:2179
 msgid "Capitalize first letter"
-msgstr "Vsaka beseda naj ima veliko začetnico"
+msgstr "Capitalize first letter"
 
-#: ../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"
+msgstr "Capitalize the first letter of each word"
 
-#: ../src/scan.c:2720
+#: ../src/scan_dialog.c:2182
 msgid "Detect Roman numerals"
-msgstr "Zaznaj rimske številke"
+msgstr "Detect Roman numerals"
 
-#: ../src/scan.c:2722
+#: ../src/scan_dialog.c:2184
 msgid "Do not change capitalization"
-msgstr "Ne spreminjaj začetnic"
+msgstr "Do not change capitalization"
 
-#: ../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'."
 msgstr ""
-"Pretvori vse besede v vseh poljih v velike črke. Primer: prej 'BESEDILO "
-"vnosa', poslej 'BESEDILO VNOSA'."
+"Convert all words in all fields to upper case. Example, before: 'Text IN AN "
+"entry', after: 'TEXT IN AN ENTRY'."
 
-#: ../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'."
 msgstr ""
-"Pretvori vse besede v vseh poljih v male črke. Primer: prej 'BESEDILO "
-"vnosa', poslej 'besedilo vnosa'."
+"Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
+"entry', after: 'text in an entry'."
 
-#: ../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'."
 msgstr ""
-"Pretvori začetnico prve besede v vseh poljih v veliko začetnico. Primer: "
-"prej 'Besedilo VNOSA', poslej 'Besedilo vnosa'."
+"Convert the initial of the first word in all fields to upper case. Example, "
+"before: 'text IN An ENTRY', after: 'Text in an entry'."
 
-#: ../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'."
 msgstr ""
-"Pretvori začetnico vsake besede v vseh poljih v veliko začetnico. Primer: "
-"prej 'Besedilo VNOSA', poslej 'Besedilo Vnosa'."
+"Convert the initial of each word in all fields to upper case. Example, "
+"before: 'Text in an ENTRY', after: 'Text In An Entry'."
 
-#: ../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'."
 msgstr ""
-"Vsili pretvorbo v rimske številke in zapis z velikimi črkami. Na primer: "
-"vrednost 'ix. besedilo vnosa' se pretvori v : 'IX. Besedilo Vnosa'."
+"Force to convert to upper case the Roman numerals. Example, before: 'ix. "
+"text in an entry', after: 'IX. Text In An Entry'."
 
-#: ../src/scan.c:2764
+#: ../src/scan_dialog.c:2226
 msgid "Insert a space before uppercase letters"
-msgstr "Vstavi presledek pred veliko črko"
+msgstr "Insert a space before uppercase letters"
 
-#: ../src/scan.c:2766
+#: ../src/scan_dialog.c:2228
 msgid "Remove duplicate spaces and underscores"
-msgstr "Odstrani podvojene presledke in podčrtaje"
+msgstr "Remove duplicate spaces and underscores"
 
-#: ../src/scan.c:2768
+#: ../src/scan_dialog.c:2230
 msgid "Do not change word separators"
-msgstr "Ne spremeni ločila besed"
+msgstr "Do not change word separators"
 
-#: ../src/scan.c:2782
+#: ../src/scan_dialog.c:2244
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
-"Vsi presledki med besedami so odstranjeni. Primer: prej 'Besedilo v vnosu', "
-"potem 'Besedilovvnosu'."
+"All spaces between words are removed. Example, before: 'Text In An Entry', "
+"after: 'TextInAnEntry'."
 
-#: ../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'."
 msgstr ""
-"Pred vsako veliko črko se vstavi presledek. Primer: prej 'BesediloVnosa', "
-"nato 'Besedilo Vnosa'."
+"A space is inserted before each upper case letter. Example, before: "
+"'TextInAnEntry', after: 'Text In An Entry'."
 
-#: ../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'."
 msgstr ""
-"Odstrani podvojene presledke in podčrtaje. Primer: prej 'Besedilo__vnosa  "
-"datoteke', potem 'Besedilo_vnosa datoteke'."
+"Duplicate spaces and underscores are removed. Example, before: "
+"'Text__In__An   Entry', after: 'Text_In_An Entry'."
 
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2795
+#: ../src/scan_dialog.c:2257
 msgid "Legend"
-msgstr "Legenda"
+msgstr "Legend"
 
-#: ../src/scan.c:2801
+#: ../src/scan_dialog.c:2263
 #, c-format
 msgid "%a: artist"
-msgstr "%a: izvajalec"
+msgstr "%a: artist"
 
-#: ../src/scan.c:2804
+#: ../src/scan_dialog.c:2266
 msgid "%z: album artist"
-msgstr "%z: izvajalec albuma"
+msgstr "%z: album artist"
 
-#: ../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"
+msgstr "%c: comment"
 
-#: ../src/scan.c:2813
+#: ../src/scan_dialog.c:2275
 #, c-format
 msgid "%p: composer"
-msgstr "%p: skladatelj"
+msgstr "%p: composer"
 
-#: ../src/scan.c:2816
+#: ../src/scan_dialog.c:2278
 msgid "%r: copyright"
-msgstr "%r: avtorske pravice"
+msgstr "%r: copyright"
 
-#: ../src/scan.c:2819
+#: ../src/scan_dialog.c:2281
 #, c-format
 msgid "%d: disc number"
-msgstr "%d: številka diska"
+msgstr "%d: disc number"
 
-#: ../src/scan.c:2822
+#: ../src/scan_dialog.c:2284
 #, c-format
 msgid "%e: encoded by"
-msgstr "%e: kodirali"
+msgstr "%e: encoded by"
 
-#: ../src/scan.c:2825
+#: ../src/scan_dialog.c:2287
 #, c-format
 msgid "%g: genre"
-msgstr "%g: zvrst"
+msgstr "%g: genre"
 
-#: ../src/scan.c:2828
+#: ../src/scan_dialog.c:2290
 #, c-format
 msgid "%i: ignored"
-msgstr "%i: prezrto"
+msgstr "%i: ignored"
 
-#: ../src/scan.c:2831
+#: ../src/scan_dialog.c:2293
 msgid "%l: number of tracks"
-msgstr "%l: število posnetkov"
+msgstr "%l: number of tracks"
 
-#: ../src/scan.c:2834
+#: ../src/scan_dialog.c:2296
 #, c-format
 msgid "%o: orig. artist"
-msgstr "%o: izvirni izvajalec"
+msgstr "%o: orig. artist"
 
-#: ../src/scan.c:2837
+#: ../src/scan_dialog.c:2299
 #, c-format
 msgid "%n: track"
-msgstr "%n: posnetek"
+msgstr "%n: track"
 
-#: ../src/scan.c:2840
+#: ../src/scan_dialog.c:2302
 msgid "%t: title"
-msgstr "%t: naslov"
+msgstr "%t: title"
 
-#: ../src/scan.c:2843
+#: ../src/scan_dialog.c:2305
 #, c-format
 msgid "%u: URL"
-msgstr "%u: naslov URL"
+msgstr "%u: URL"
 
-#: ../src/scan.c:2846
+#: ../src/scan_dialog.c:2308
 #, c-format
 msgid "%x: number of discs"
-msgstr "%x: število diskov"
+msgstr "%x: number of discs"
 
-#: ../src/scan.c:2849
+#: ../src/scan_dialog.c:2311
 msgid "%y: year"
-msgstr "%y: leto"
+msgstr "%y: year"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2856
+#: ../src/scan_dialog.c:2318
 msgid "Mask Editor"
-msgstr "Urejevalnik mask"
+msgstr "Mask Editor"
 
-#: ../src/scan.c:2910
+#: ../src/scan_dialog.c:2372
 msgid "Create New Mask"
-msgstr "Ustvari novo masko"
+msgstr "Create New Mask"
 
-#: ../src/scan.c:2920
+#: ../src/scan_dialog.c:2382
 msgid "Move Up this Mask"
-msgstr "Premakni masko navzgor"
+msgstr "Move Up this Mask"
 
-#: ../src/scan.c:2930
+#: ../src/scan_dialog.c:2392
 msgid "Move Down this Mask"
-msgstr "Premakni masko navzdol"
+msgstr "Move Down this Mask"
 
-#: ../src/scan.c:2940
+#: ../src/scan_dialog.c:2402
 msgid "Duplicate Mask"
-msgstr "Podvoji masko"
+msgstr "Duplicate Mask"
 
-#: ../src/scan.c:2950
+#: ../src/scan_dialog.c:2412
 msgid "Add Default Masks"
-msgstr "Dodaj privzete maske"
+msgstr "Add Default Masks"
 
-#: ../src/scan.c:2960
+#: ../src/scan_dialog.c:2422
 msgid "Remove Mask"
-msgstr "Odstrani masko"
+msgstr "Remove Mask"
 
-#: ../src/scan.c:2970
+#: ../src/scan_dialog.c:2432
 msgid "Save Masks"
-msgstr "Shrani maske"
+msgstr "Save Masks"
 
-#: ../src/scan.c:3550
+#: ../src/scan_dialog.c:3012
 msgid "New_mask"
-msgstr "Nova _maska"
+msgstr "New_mask"
 
-#: ../src/scan.c:3589
+#: ../src/scan_dialog.c:3051
 msgid "Copy: No row selected"
-msgstr "Kopiraj: izbrana ni nobena vrstica"
+msgstr "Copy: No row selected"
 
-#: ../src/scan.c:3682
+#: ../src/scan_dialog.c:3144
 msgid "Remove: No row selected"
-msgstr "Odstrani: izbrana ni nobena vrstica"
+msgstr "Remove: No row selected"
 
-#: ../src/scan.c:3729
+#: ../src/scan_dialog.c:3191
 msgid "Move Up: No row selected"
-msgstr "Premakni navzgor: izbrana ni nobena vrstica"
+msgstr "Move Up: No row selected"
 
-#: ../src/scan.c:3773
+#: ../src/scan_dialog.c:3235
 msgid "Move Down: No row selected"
-msgstr "Premakni navzdol: izbrana ni nobena vrstica"
+msgstr "Move Down: No row selected"
 
 #: ../src/setting.c:924
 #, c-format
 msgid "Error: Cannot write configuration file: %s (%s)"
-msgstr "Ni mogoče zapisati nastavitvene datoteke: %s (%s)"
+msgstr "Error: Cannot write configuration file: %s (%s)"
 
 #: ../src/setting.c:944 ../src/setting.c:961 ../src/setting.c:981
 #, c-format
 msgid "Error while writing configuration file: %s"
-msgstr "Napaka med pisanjem v nastavitveno datoteko: %s."
+msgstr "Error while writing configuration file: %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)"
+msgstr "Cannot open configuration file '%s' (%s)"
 
-#: ../src/setting.c:1106
+#: ../src/setting.c:1102
 msgid "Loading default configuration"
-msgstr "Nalaganje privzetih nastavitev"
+msgstr "Loading default configuration"
 
-#: ../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)"
+msgstr "Cannot create or open file '%s' (%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)"
+msgstr "Error: Cannot write list to file: %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"
+msgstr "Error while writing list file: %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' …"
+msgstr "Loading default 'Fill Tag' masks…"
 
 #. Fall back to defaults
-#: ../src/setting.c:1335
+#: ../src/setting.c:1331
 msgid "Loading default 'Rename File' masks…"
-msgstr "Nalaganje privzetih mask 'Preimenuj datoteko' …"
+msgstr "Loading default 'Rename File' masks…"
 
 #. Fall back to defaults
-#: ../src/setting.c:1361
+#: ../src/setting.c:1357
 msgid "Loading default 'Rename Directory' masks…"
-msgstr "Nalaganje privzetih mask 'Preimenuj mapo' …"
+msgstr "Loading default 'Rename Directory' masks…"
 
-#: ../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'"
+msgstr "Migrating configuration from directory '%s' to '%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"
+msgstr "Failed to migrate configuration file '%s'"
 
-#: ../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 ..."
-
-#. 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."
-
-#. 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'"
-
-#. 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'"
-
-#. 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'"
-
-#. Log_Print(_("weasytag_init start..."));
-#: ../src/win32/win32dep.c:472
-#, c-format
-msgid "weasytag_init start..."
-msgstr "Začenjanje weasytag_init ..."
-
-#. 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"
-
-#. Set Environmental Variables
-#. Log_Print(_("weasytag_init end..."));
-#: ../src/win32/win32dep.c:496
-#, c-format
-msgid "weasytag_init end..."
-msgstr "Zaključevanje weasytag_init ..."
-
-#. Log_Print(_("Audio player: '%s'"), player);
-#: ../src/win32/win32dep.c:620
-#, c-format
-msgid "Audio player: '%s'"
-msgstr "Predvajalnik zvoka: '%s'"
-
-#~ msgid "Cannot execute %s (error %d)\n"
-#~ msgstr "Ni mogoče izvesti %s (napaka %d)\n"
+msgstr "Error: Cannot create directory '%s' (%s)"
diff --git a/po/es.po b/po/es.po
index c60a313..c232604 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,24 +5,48 @@
 # Francisco Javier F. Serrador <serrador at cvs.gnome.org> 2005.
 # Francisco Javier F. Serrador <serrador at tecknolabs.com> 2005.
 # Nicolás Satragno <nsatragno at gnome.org>, 2012, 2013.
-# Daniel Mustieles <daniel.mustieles at gmail.com>, 2012, 2013.
 # Milagros Alessandra Infante Montero <maim92 at gmail.com>, 2012, 2013.
+# Daniel Mustieles <daniel.mustieles at gmail.com>, 2012, 2013, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: easytag-1.99.11\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=easytag&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-11-19 13:31+0000\n"
-"PO-Revision-Date: 2013-11-27 00:25-0500\n"
-"Last-Translator: Milagros Alessandra Infante Montero <maim92 at gmail.com>\n"
-"Language-Team: Español; Castellano <gnome-es-list at gnome.org>\n"
+"POT-Creation-Date: 2014-04-07 09:21+0000\n"
+"PO-Revision-Date: 2014-04-07 12:16+0200\n"
+"Last-Translator: Daniel Mustieles <daniel.mustieles at gmail.com>\n"
+"Language-Team: Español <gnome-es-list at gnome.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Gtranslator 2.91.5\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 ""
+"Ver y editar etiquetas de archivos MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg "
+"Speex, Ogg Vorbis, MusePack, Monkey's Audio y WavPack "
+
+#: ../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 ""
+"Buscar álbumes el bases de datos en línea, editar etiquetas en masa, crear "
+"listas de reproducción y renombrar una colección de archivos."
+
+#: ../data/easytag.appdata.xml.in.h:3
+msgid ""
+"A simple and nice GTK+ interface makes tagging easier under GNU/Linux and "
+"Windows."
+msgstr ""
+"La simple y bonita interfaz de GTK+ hace que sea más fácil etiquetar en GNU/"
+"Linux y Windows."
 
 #: ../data/easytag.desktop.in.h:1
 msgid "Sound File Metadata Editor"
@@ -37,7 +61,7 @@ msgstr "Editar los metadatos de archivos de sonido"
 msgid "mp3;tag;audio;"
 msgstr "mp3;etiqueta;sonido;"
 
-#: ../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 "
@@ -66,14 +90,14 @@ msgstr ""
 "programa. Sino, ver <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 ""
-"Daniel Mustieles <daniel.mustieles at gmail.com>, 2012\n"
+"Daniel Mustieles <daniel.mustieles at gmail.com>, 2012 - 2014\n"
 "Nicolás Satragno <nsatragno at gnome.org>, 2012, 2013\n"
 "Milagros Alessandra Infante Montero <maim92 at gmail.com>, 2012, 2013"
 
-#: ../src/about.c:118
+#: ../src/about.c:116
 msgid "View and edit tags in audio files"
 msgstr "Ver y editar etiquetas en archivos de sonido"
 
@@ -100,729 +124,737 @@ msgstr "- Etiquetar y renombrar archivos de sonido"
 #.
 #. * Main Menu Actions
 #.
-#: ../src/bar.c:154
+#: ../src/bar.c:155
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../src/bar.c:155
+#: ../src/bar.c:156
 msgid "Sort List by Tag"
 msgstr "Ordenar lista por etiquetas"
 
-#: ../src/bar.c:158
+#: ../src/bar.c:159
 msgid "Sort List by Property"
 msgstr "Ordenar lista por propiedad"
 
-#: ../src/bar.c:159
+#: ../src/bar.c:160
 msgid "Ascending by filename"
 msgstr "Ascendente por nombre de archivo"
 
-#: ../src/bar.c:160
+#: ../src/bar.c:161
 msgid "Descending by filename"
 msgstr "Descendente por nombre de archivo"
 
-#: ../src/bar.c:161
+#: ../src/bar.c:162
 msgid "Ascending by creation date"
 msgstr "Ascendente por fecha de creación"
 
-#: ../src/bar.c:162
+#: ../src/bar.c:163
 msgid "Descending by creation date"
 msgstr "Descendente por fecha de creación"
 
-#: ../src/bar.c:163
+#: ../src/bar.c:164
 msgid "Ascending by track number"
 msgstr "Ascendente por número de pista"
 
-#: ../src/bar.c:164
+#: ../src/bar.c:165
 msgid "Descending by track number"
 msgstr "Descendente por número de pista"
 
-#: ../src/bar.c:165
+#: ../src/bar.c:166
 msgid "Ascending by title"
 msgstr "Ascendente por título"
 
-#: ../src/bar.c:166
+#: ../src/bar.c:167
 msgid "Descending by title"
 msgstr "Descendente por título"
 
-#: ../src/bar.c:167
+#: ../src/bar.c:168
 msgid "Ascending by artist"
 msgstr "Ascendente por artista"
 
-#: ../src/bar.c:168
+#: ../src/bar.c:169
 msgid "Descending by artist"
 msgstr "Descendente por artista"
 
-#: ../src/bar.c:169
+#: ../src/bar.c:170
 msgid "Ascending by album artist"
 msgstr "Ascendente por artista del álbum"
 
-#: ../src/bar.c:170
+#: ../src/bar.c:171
 msgid "Descending by album artist"
 msgstr "Descendente por artista del álbum"
 
-#: ../src/bar.c:171
+#: ../src/bar.c:172
 msgid "Ascending by album"
 msgstr "Ascendente por álbum"
 
-#: ../src/bar.c:172
+#: ../src/bar.c:173
 msgid "Descending by album"
 msgstr "Descendente por álbum"
 
-#: ../src/bar.c:173
+#: ../src/bar.c:174
 msgid "Ascending by year"
 msgstr "Ascendente por año"
 
-#: ../src/bar.c:174
+#: ../src/bar.c:175
 msgid "Descending by year"
 msgstr "Descendente por año"
 
-#: ../src/bar.c:175
+#: ../src/bar.c:176
 msgid "Ascending by genre"
 msgstr "Ascendente por género"
 
-#: ../src/bar.c:176
+#: ../src/bar.c:177
 msgid "Descending by genre"
 msgstr "Descendente por género"
 
-#: ../src/bar.c:177
+#: ../src/bar.c:178
 msgid "Ascending by comment"
 msgstr "Ascendente por comentario"
 
-#: ../src/bar.c:178
+#: ../src/bar.c:179
 msgid "Descending by comment"
 msgstr "Descendente por comentario"
 
-#: ../src/bar.c:179
+#: ../src/bar.c:180
 msgid "Ascending by composer"
 msgstr "Ascendente por compositor"
 
-#: ../src/bar.c:180
+#: ../src/bar.c:181
 msgid "Descending by composer"
 msgstr "Descendente por compositor"
 
-#: ../src/bar.c:181
+#: ../src/bar.c:182
 msgid "Ascending by original artist"
 msgstr "Ascendente por artista original"
 
-#: ../src/bar.c:182
+#: ../src/bar.c:183
 msgid "Descending by original artist"
 msgstr "Descendente por artista original"
 
-#: ../src/bar.c:183
+#: ../src/bar.c:184
 msgid "Ascending by copyright"
 msgstr "Ascendente por copyright"
 
-#: ../src/bar.c:184
+#: ../src/bar.c:185
 msgid "Descending by copyright"
 msgstr "Descendente por copyright"
 
-#: ../src/bar.c:185
+#: ../src/bar.c:186
 msgid "Ascending by URL"
 msgstr "Ascendente por URL"
 
-#: ../src/bar.c:186
+#: ../src/bar.c:187
 msgid "Descending by URL"
 msgstr "Descendente por 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 "Ascendente por nombre de codificador"
 
 #. 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 "Descendente por nombre de codificador"
 
-#: ../src/bar.c:193
+#: ../src/bar.c:194
 msgid "Ascending by file type"
 msgstr "Ascendente por tipo de archivo"
 
-#: ../src/bar.c:194
+#: ../src/bar.c:195
 msgid "Descending by file type"
 msgstr "Descendente por tipo de archivo"
 
-#: ../src/bar.c:195
+#: ../src/bar.c:196
 msgid "Ascending by file size"
 msgstr "Ascendente por tamaño de archivo"
 
-#: ../src/bar.c:196
+#: ../src/bar.c:197
 msgid "Descending by file size"
 msgstr "Descendente por tamaño de archivo"
 
-#: ../src/bar.c:197
+#: ../src/bar.c:198
 msgid "Ascending by duration"
 msgstr "Ascendente por duración"
 
-#: ../src/bar.c:198
+#: ../src/bar.c:199
 msgid "Descending by duration"
 msgstr "Descendente por duración"
 
-#: ../src/bar.c:199
+#: ../src/bar.c:200
 msgid "Ascending by bitrate"
 msgstr "Ascendente por tasa de bits"
 
-#: ../src/bar.c:200
+#: ../src/bar.c:201
 msgid "Descending by bitrate"
 msgstr "Descendente por tasa de bits"
 
-#: ../src/bar.c:201
+#: ../src/bar.c:202
 msgid "Ascending by samplerate"
 msgstr "Ascendente por tasa de muestreo"
 
-#: ../src/bar.c:202
+#: ../src/bar.c:203
 msgid "Descending by samplerate"
 msgstr "Descendente por tasa de muestreo"
 
-#: ../src/bar.c:204
+#: ../src/bar.c:205
 msgid "Open Files With…"
 msgstr "Abrir archivo con…"
 
-#: ../src/bar.c:205
+#: ../src/bar.c:206
 msgid "Run a command on the selected files"
 msgstr "Ejecutar un comando en los archivos seleccionados"
 
-#: ../src/bar.c:208
+#: ../src/bar.c:209
 msgid "Select all"
 msgstr "Seleccionar todo"
 
-#: ../src/bar.c:209
+#: ../src/bar.c:210
 msgid "Unselect All"
 msgstr "Deseleccionar todo"
 
-#: ../src/bar.c:210
+#: ../src/bar.c:211
 msgid "Clear the current selection"
 msgstr "Limpiar la selección actual"
 
-#: ../src/bar.c:213
+#: ../src/bar.c:214
 msgid "Invert File Selection"
 msgstr "Invertir la Selección de Archivos"
 
-#: ../src/bar.c:214
+#: ../src/bar.c:215
 msgid "Invert file selection"
 msgstr "Invertir la selección de archivos"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete Files"
 msgstr "Eliminar archivos"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete files"
 msgstr "Eliminar archivos"
 
-#: ../src/bar.c:217
+#: ../src/bar.c:218
 msgid "_First File"
 msgstr "_Primer archivo"
 
-#: ../src/bar.c:218
+#: ../src/bar.c:219
 msgid "First file"
 msgstr "Primer archivo"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "_Previous File"
 msgstr "Archivo _anterior"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "Previous file"
 msgstr "Archivo anterior"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "_Next File"
 msgstr "_Siguiente archivo"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "Next file"
 msgstr "Siguiente archivo"
 
-#: ../src/bar.c:221
+#: ../src/bar.c:222
 msgid "_Last File"
 msgstr "_Último archivo"
 
-#: ../src/bar.c:222
+#: ../src/bar.c:223
 msgid "Last file"
 msgstr "Último archivo"
 
-#: ../src/bar.c:223
+#: ../src/bar.c:224
 msgid "S_can Files"
 msgstr "A_nalizar archivos"
 
-#: ../src/bar.c:224 ../src/scan.c:2352
+#: ../src/bar.c:225 ../src/scan.c:2008
 msgid "Scan selected files"
 msgstr "Analizar archivos seleccionados"
 
-#: ../src/bar.c:225
+#: ../src/bar.c:226
 msgid "_Remove Tags"
 msgstr "_Quitar etiquetas"
 
-#: ../src/bar.c:226
+#: ../src/bar.c:227
 msgid "Remove tags"
 msgstr "Quitar etiquetas"
 
-#: ../src/bar.c:227
+#: ../src/bar.c:228
 msgid "_Undo Last Files Changes"
 msgstr "_Deshacer los últimos cambios de los archivos"
 
-#: ../src/bar.c:228
+#: ../src/bar.c:229
 msgid "Undo last files changes"
 msgstr "Deshacer los últimos cambios de los archivos"
 
-#: ../src/bar.c:230
+#: ../src/bar.c:231
 msgid "R_edo Last Files Changes"
 msgstr "R_ehacer últimos cambios de los archivos"
 
-#: ../src/bar.c:231
+#: ../src/bar.c:232
 msgid "Redo last files changes"
 msgstr "Rehacer los último cambios de los archivos"
 
-#: ../src/bar.c:233
+#: ../src/bar.c:234
 msgid "_Save Files"
 msgstr "_Guardar archivos"
 
-#: ../src/bar.c:234
+#: ../src/bar.c:235
 msgid "Save changes to selected files"
 msgstr "Guardar cambios en los archivos seleccionados"
 
-#: ../src/bar.c:236
+#: ../src/bar.c:237
 msgid "_Force Save Files"
 msgstr "_Forzar guardado de archivos"
 
-#: ../src/bar.c:237
+#: ../src/bar.c:238
 msgid "Force saving files"
 msgstr "Forzar el guardado de archivos"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo Last Changes"
 msgstr "Deshacer últimos cambios"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo last changes"
 msgstr "Deshacer los últimos cambios"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo Last Changes"
 msgstr "Rehacer últimos cambios"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo last changes"
 msgstr "Rehacer los últimos cambios"
 
-#: ../src/bar.c:241
+#: ../src/bar.c:242
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../src/bar.c:241 ../src/easytag.c:2450 ../src/easytag.c:4572
-#: ../src/easytag.c:4600
+#: ../src/bar.c:242 ../src/easytag.c:2429 ../src/easytag.c:4565
+#: ../src/easytag.c:4597
 msgid "Quit"
 msgstr "Salir"
 
-#: ../src/bar.c:244
+#: ../src/bar.c:245
 msgid "_Browser"
 msgstr "_Explorador"
 
-#: ../src/bar.c:245
+#: ../src/bar.c:246
 msgid "_Home Directory"
 msgstr "Carpeta _personal"
 
-#: ../src/bar.c:246
+#: ../src/bar.c:247
 msgid "Go to home directory"
 msgstr "Ir a la carpeta personal"
 
-#: ../src/bar.c:248
+#: ../src/bar.c:249
 msgid "Desktop Directory"
 msgstr "Carpeta Escritorio"
 
-#: ../src/bar.c:249
+#: ../src/bar.c:250
 msgid "Go to desktop directory"
 msgstr "Ir a la carpeta del escritorio"
 
-#: ../src/bar.c:251
+#: ../src/bar.c:252
 msgid "Documents Directory"
 msgstr "Carpeta Documentos"
 
-#: ../src/bar.c:252
+#: ../src/bar.c:253
 msgid "Go to documents directory"
 msgstr "Ir a la carpeta de documentos"
 
-#: ../src/bar.c:254
+#: ../src/bar.c:255
 msgid "Downloads Directory"
 msgstr "Carpeta Descargas"
 
-#: ../src/bar.c:255
+#: ../src/bar.c:256
 msgid "Go to downloads directory"
 msgstr "Ir a la carpeta de descargas"
 
-#: ../src/bar.c:257
+#: ../src/bar.c:258
 msgid "Music Directory"
 msgstr "Carpeta Música"
 
-#: ../src/bar.c:258
+#: ../src/bar.c:259
 msgid "Go to music directory"
 msgstr "Ir a la carpeta de música"
 
-#: ../src/bar.c:260
+#: ../src/bar.c:261
 msgid "_Parent Directory"
 msgstr "Carpeta _padre"
 
-#: ../src/bar.c:261
+#: ../src/bar.c:262
 msgid "Go to parent directory"
 msgstr "Ir a la carpeta superior"
 
-#: ../src/bar.c:263
+#: ../src/bar.c:264
 msgid "_Default Directory"
 msgstr "_Carpeta predeterminada"
 
-#: ../src/bar.c:264
+#: ../src/bar.c:265
 msgid "Go to default directory"
 msgstr "Ir a la carpeta predeterminada"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set _Current Path as Default"
 msgstr "Establecer la carpeta _actual como predeterminada"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set current path as default"
 msgstr "Establecer ruta actual como predeterminada"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename Directory…"
 msgstr "Renombrar carpeta…"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename directory"
 msgstr "Renombrar carpeta"
 
-#: ../src/bar.c:268
+#: ../src/bar.c:269
 msgid "Reload Directory"
 msgstr "Recargar carpeta"
 
-#: ../src/bar.c:269
+#: ../src/bar.c:270
 msgid "Reload directory"
 msgstr "Recargar carpeta"
 
-#: ../src/bar.c:272
+#: ../src/bar.c:273
 msgid "Browse Directory With…"
 msgstr "Explorar carpeta con…"
 
-#: ../src/bar.c:273
+#: ../src/bar.c:274
 msgid "Run a command on the directory"
 msgstr "Ejecutar un comando en la carpeta"
 
-#: ../src/bar.c:275
+#: ../src/bar.c:276
 msgid "_Collapse Tree"
 msgstr "_Contraer árbol"
 
-#: ../src/bar.c:276
+#: ../src/bar.c:277
 msgid "Collapse directory tree"
 msgstr "Contraer árbol de carpetas"
 
-#: ../src/bar.c:277
+#: ../src/bar.c:278
 msgid "_Reload Tree"
 msgstr "_Recargar árbol"
 
-#: ../src/bar.c:278
+#: ../src/bar.c:279
 msgid "Reload directory tree"
 msgstr "Recargar árbol de carpetas"
 
-#: ../src/bar.c:281
+#: ../src/bar.c:282
 msgid "S_canner Mode"
 msgstr "Modo a_nalizador"
 
-#: ../src/bar.c:283
+#: ../src/bar.c:284
 msgid "_Miscellaneous"
 msgstr "_Varios"
 
-#: ../src/bar.c:284
+#: ../src/bar.c:285
 msgid "_Find…"
 msgstr "_Buscar…"
 
-#: ../src/bar.c:285
+#: ../src/bar.c:286
 msgid "Search filenames and tags"
 msgstr "Buscar nombres de archivo y etiquetas"
 
-#: ../src/bar.c:287
+#: ../src/bar.c:288
 msgid "CDD_B Search…"
 msgstr "Búsqueda CDD_B…"
 
-#: ../src/bar.c:288
+#: ../src/bar.c:289
 msgid "CDDB search"
 msgstr "Buscar CDDB…"
 
-#: ../src/bar.c:290
+#: ../src/bar.c:291
 msgid "Load Filenames From a Text File…"
 msgstr "Cargar nombres de archivos desde un archivo de texto…"
 
-#: ../src/bar.c:291
+#: ../src/bar.c:292
 msgid "Load filenames from a text file"
 msgstr "Cargar nombres de archivos desde un archivo de texto"
 
-#: ../src/bar.c:293
+#: ../src/bar.c:294
 msgid "Generate Playlist…"
 msgstr "Generar lista de reproducción…"
 
-#: ../src/bar.c:294
+#: ../src/bar.c:295
 msgid "Generate a playlist"
 msgstr "Generar una lista de reproducción"
 
-#: ../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 "Ejecutar reproductor de audio"
 
-#: ../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 "Ejecutar reproductor de audio"
 
-#: ../src/bar.c:300
+#: ../src/bar.c:301
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/bar.c:301
+#: ../src/bar.c:302
 msgid "_Preferences"
 msgstr "_Preferencias"
 
 #. The window
-#: ../src/bar.c:302 ../src/prefs.c:110
+#: ../src/bar.c:303 ../src/prefs.c:110
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../src/bar.c:304
+#: ../src/bar.c:305
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/bar.c:305
+#: ../src/bar.c:306
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../src/bar.c:307
+#: ../src/bar.c:308
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:311
+msgid "_Contents"
+msgstr "_Contenido"
+
+#: ../src/bar.c:312
+msgid "Show help"
+msgstr "Mostrar ayuda"
+
+#: ../src/bar.c:314
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:314
 msgid "About"
 msgstr "Acerca de"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: ../src/bar.c:314
+#: ../src/bar.c:320
 msgid "Stop the current action"
 msgstr "Detener la acción actual"
 
 #.
 #. * Popup menu's Actions
 #.
-#: ../src/bar.c:320
+#: ../src/bar.c:326
 msgid "_File Operations"
 msgstr "_Operaciones de archivo"
 
-#: ../src/bar.c:321
+#: ../src/bar.c:327
 msgid "S_canner"
 msgstr "Anali_zador"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:331
 msgid "CDDB Search Files…"
 msgstr "Buscar archivos en CDDB…"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:331
 msgid "CDDB search files…"
 msgstr "Buscar archivos en CDDB…"
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: ../src/bar.c:329
+#: ../src/bar.c:335
 msgid "Clear log"
 msgstr "Limpiar el registro"
 
 #. { 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 "Explorar_subcarpetas"
 
-#: ../src/bar.c:336
+#: ../src/bar.c:342
 msgid "Browse subdirectories"
 msgstr "Explorar subcarpetas"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:346
 msgid "Show Hidden Directories"
 msgstr "Mostrar carpetas ocultas"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:346
 msgid "Show hidden directories"
 msgstr "Mostrar carpetas ocultas"
 
-#: ../src/bar.c:342
+#: ../src/bar.c:348
 msgid "_Show Scanner"
 msgstr "_Mostrar analizador"
 
-#: ../src/bar.c:343
+#: ../src/bar.c:349
 msgid "Show scanner"
 msgstr "Mostrar analizador"
 
-#: ../src/bar.c:349
+#: ../src/bar.c:355
 msgid "Tree Browser"
 msgstr "Navegador de árbol"
 
-#: ../src/bar.c:350
+#: ../src/bar.c:356
 msgid "View by directory tree"
 msgstr "Ver por árbol de carpetas"
 
-#: ../src/bar.c:352
+#: ../src/bar.c:358
 msgid "Artist and Album"
 msgstr "Artista y álbum"
 
-#: ../src/bar.c:353
+#: ../src/bar.c:359
 msgid "View by artist and album"
 msgstr "Ver por artista y álbum"
 
-#: ../src/bar.c:358
+#: ../src/bar.c:364
 msgid "_Fill Tags…"
 msgstr "_Rellenar etiquetas…"
 
-#: ../src/bar.c:359
+#: ../src/bar.c:365
 msgid "Fill tags"
 msgstr "Rellenar etiquetas…"
 
-#: ../src/bar.c:361
+#: ../src/bar.c:367
 msgid "_Rename Files and Directories…"
 msgstr "_Renombrar archivos y carpetas…"
 
-#: ../src/bar.c:362
+#: ../src/bar.c:368
 msgid "Rename files and directories"
 msgstr "Renombrar archivos y carpetas"
 
-#: ../src/bar.c:364
+#: ../src/bar.c:370
 msgid "_Process Fields…"
 msgstr "_Procesar campos…"
 
-#: ../src/bar.c:364 ../src/scan.c:182
+#: ../src/bar.c:370 ../src/scan.c:182
 msgid "Process Fields"
 msgstr "Procesar campos"
 
-#: ../src/bar.c:422
+#: ../src/bar.c:428
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "No se pudo combinar el IU, el error fue: %s\n"
 
-#: ../src/bar.c:528
+#: ../src/bar.c:533
 msgid "Ready to start"
 msgstr "Listo para empezar"
 
-#: ../src/browser.c:369
+#: ../src/browser.c:376
 msgid "New default path for files selected"
 msgstr "Seleccionada la nueva ruta predeterminada para los archivos"
 
-#: ../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 "Se han modificado algunos archivos pero no se han guardado"
 
-#: ../src/browser.c:671
+#: ../src/browser.c:679
 msgid "Do you want to save them before changing the directory?"
 msgstr "¿Quiere guardarlos antes de cambiar de carpeta?"
 
-#: ../src/browser.c:675
+#: ../src/browser.c:683
 msgid "Confirm Directory Change"
 msgstr "Confirmar el cambio de carpeta"
 
-#: ../src/browser.c:2121
+#: ../src/browser.c:2146
 msgid "<All albums>"
 msgstr "<Todos los álbumes>"
 
-#: ../src/browser.c:2573
+#: ../src/browser.c:2607
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Error: buscando %s, no se pudo encontrar el nodo %s en el árbol."
 
-#: ../src/browser.c:3065 ../src/browser.c:3143
+#: ../src/browser.c:3101 ../src/browser.c:3179
 msgid "Tree"
 msgstr "Árbol"
 
-#: ../src/browser.c:3066 ../src/cddb.c:803 ../src/misc.c:1911
+#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1902
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: ../src/browser.c:3066 ../src/cddb.c:804 ../src/misc.c:1912
+#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1903
 #: ../src/prefs.c:643
 msgid "Title"
 msgstr "Título"
 
 #. 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:1904 ../src/prefs.c:644
 msgid "Artist"
 msgstr "Artista"
 
-#: ../src/browser.c:3067 ../src/misc.c:1914
+#: ../src/browser.c:3103 ../src/misc.c:1905
 msgid "Album Artist"
 msgstr "Artista del álbum"
 
 #. 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:1906 ../src/prefs.c:645
 msgid "Album"
 msgstr "Álbum"
 
-#: ../src/browser.c:3068 ../src/cddb.c:807 ../src/misc.c:1917
+#: ../src/browser.c:3104 ../src/cddb.c:807 ../src/misc.c:1908
 msgid "Year"
 msgstr "Año"
 
-#: ../src/browser.c:3068
+#: ../src/browser.c:3104
 msgid "Disc"
 msgstr "Disco"
 
-#: ../src/browser.c:3069 ../src/misc.c:1918
+#: ../src/browser.c:3105 ../src/misc.c:1909
 msgid "Track"
 msgstr "Pista"
 
-#: ../src/browser.c:3069 ../src/cddb.c:810 ../src/misc.c:1919
+#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1910
 #: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Género"
 
-#: ../src/browser.c:3070 ../src/misc.c:1920 ../src/prefs.c:647
+#: ../src/browser.c:3106 ../src/misc.c:1911 ../src/prefs.c:647
 msgid "Comment"
 msgstr "Comentario"
 
-#: ../src/browser.c:3070 ../src/misc.c:1921 ../src/picture.c:863
+#: ../src/browser.c:3106 ../src/misc.c:1912 ../src/picture.c:1059
 #: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Compositor"
 
-#: ../src/browser.c:3071 ../src/misc.c:1922
+#: ../src/browser.c:3107 ../src/misc.c:1913
 msgid "Original Artist"
 msgstr "Artista original"
 
-#: ../src/browser.c:3072 ../src/misc.c:1923
+#: ../src/browser.c:3108 ../src/misc.c:1914
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../src/browser.c:3072 ../src/misc.c:1924
+#: ../src/browser.c:3108 ../src/misc.c:1915
 msgid "URL"
 msgstr "URL"
 
-#: ../src/browser.c:3073 ../src/misc.c:1925
+#: ../src/browser.c:3109 ../src/misc.c:1916
 msgid "Encoded By"
 msgstr "Codificado por"
 
-#: ../src/browser.c:3074
+#: ../src/browser.c:3110
 msgid "# Albums"
 msgstr "N.º de álbumes"
 
-#: ../src/browser.c:3075 ../src/browser.c:3076
+#: ../src/browser.c:3111 ../src/browser.c:3112
 msgid "# Files"
 msgstr "N.º de archivos"
 
-#: ../src/browser.c:3101
+#: ../src/browser.c:3137
 msgid "Enter a directory to browse."
 msgstr "Introducir una carpeta que examinar."
 
-#: ../src/browser.c:3110
+#: ../src/browser.c:3146
 msgid "Select a directory to browse."
 msgstr "Seleccionar una carpeta para examinarla."
 
@@ -830,33 +862,33 @@ msgstr "Seleccionar una carpeta para examinarla."
 #. * 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:3468
 msgid "No files"
 msgstr "No hay archivos"
 
-#: ../src/browser.c:3195
+#: ../src/browser.c:3231
 msgid "Artist & Album"
 msgstr "Artista y álbum"
 
 #. Only directories changed
-#: ../src/browser.c:3559 ../src/easytag.c:2890
+#: ../src/browser.c:3595 ../src/easytag.c:2880
 msgid "Rename Directory"
 msgstr "Renombrar la carpeta"
 
-#: ../src/browser.c:3581
+#: ../src/browser.c:3617
 #, c-format
 msgid "Rename the directory '%s' to:"
 msgstr "Renombrar la carpeta «%s» a:"
 
-#: ../src/browser.c:3600 ../src/misc.c:1175
+#: ../src/browser.c:3636 ../src/misc.c:1171
 msgid "Use mask:"
 msgstr "Usar máscara:"
 
-#: ../src/browser.c:3603
+#: ../src/browser.c:3639
 msgid "If activated, it will use masks to rename directory."
 msgstr "Si está activado, usará máscaras para renombrar la carpeta."
 
-#: ../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."
@@ -866,97 +898,70 @@ msgstr ""
 "etiquetas."
 
 #. Preview label
-#: ../src/browser.c:3645
+#: ../src/browser.c:3681
 msgid "Rename directory preview"
 msgstr "Previsualización del renombrado de carpeta"
 
-#: ../src/browser.c:3737
+#: ../src/browser.c:3773
 msgid "You must type a directory name"
 msgstr "Debe introducir un nombre de directorio"
 
-#: ../src/browser.c:3738 ../src/browser.c:3759
+#: ../src/browser.c:3774 ../src/browser.c:3795
 msgid "Directory Name Error"
 msgstr "Error en el nombre de la carpeta"
 
-#: ../src/browser.c:3756
+#: ../src/browser.c:3792
 #, c-format
 msgid "Could not convert '%s' into filename encoding."
 msgstr "No se puede convertir «%s» a la codificación del nombre de archivo."
 
-#: ../src/browser.c:3758
+#: ../src/browser.c:3794
 msgid "Please use another name"
 msgstr "Use otro nombre"
 
-#: ../src/browser.c:3828
+#: ../src/browser.c:3864
 #, c-format
 msgid "The directory name '%s' already exists"
 msgstr "El nombre de la carpeta «%s» ya existe"
 
-#: ../src/browser.c:3829 ../src/easytag.c:2973
+#: ../src/browser.c:3865 ../src/easytag.c:2963
 msgid "Rename File Error"
 msgstr "Error al renombrar el archivo"
 
-#: ../src/browser.c:3867 ../src/browser.c:3896
+#: ../src/browser.c:3903 ../src/browser.c:3932
 msgid "Rename Directory Error"
 msgstr "Error al renombrar la carpeta"
 
-#: ../src/browser.c:3934
+#: ../src/browser.c:3970
 msgid "Directory renamed"
 msgstr "Carpeta renombrada"
 
-#: ../src/browser.c:3970
+#: ../src/browser.c:4006
 msgid "Browse Directory With"
 msgstr "Explorar carpeta con"
 
-#: ../src/browser.c:3986 ../src/browser.c:4112
+#: ../src/browser.c:4022 ../src/browser.c:4148
 msgid "Program to run:"
 msgstr "Programa que ejecutar:"
 
-#: ../src/browser.c:3998
+#: ../src/browser.c:4034
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Introduzca el programa que ejecutar. Recibirá la carpeta actual como "
 "parámetro."
 
-#: ../src/browser.c:4092
+#: ../src/browser.c:4128
 msgid "Open Files With"
 msgstr "Abrir archivos con"
 
-#: ../src/browser.c:4124
+#: ../src/browser.c:4160
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Introduzca el programa que ejecutar. Recibirá el archivo actual como "
 "parámetro."
 
-#: ../src/browser.c:4251
-msgid "You must type a program name"
-msgstr "Debe introducir un nombre de programa"
-
-#: ../src/browser.c:4252 ../src/browser.c:4269
-msgid "Program Name Error"
-msgstr "Error del nombre del programa"
-
-#: ../src/browser.c:4267 ../src/misc.c:792
-#, c-format
-msgid "The program '%s' cannot be found"
-msgstr "No se puede encontrar el programa «%s»"
-
-#: ../src/browser.c:4318 ../src/misc.c:837 ../src/misc.c:884
-#, c-format
-msgid "Cannot execute ‘%s’ (%s)"
-msgstr "No se puede ejecutar «%s» (%s)"
-
-#: ../src/browser.c:4339
-msgid "Cannot fork another process\n"
-msgstr "No se puede crear otro proceso\n"
-
-#: ../src/browser.c:4373
-#, c-format
-msgid "Executed command: %s"
-msgstr "Comando ejecutado: %s"
-
 #: ../src/cddb.c:313
 msgid "Artist / Album"
 msgstr "Artista / Álbum"
@@ -1047,7 +1052,7 @@ msgstr "Todos los 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:841 ../src/prefs.c:807
+#: ../src/cddb.c:492 ../src/picture.c:1037 ../src/prefs.c:807
 msgid "Other"
 msgstr "Otro"
 
@@ -1141,7 +1146,7 @@ msgstr "Categorías"
 msgid "Results:"
 msgstr "Resultados:"
 
-#: ../src/cddb.c:606 ../src/misc.c:1959
+#: ../src/cddb.c:606 ../src/misc.c:1950
 msgid "Search:"
 msgstr "Buscar:"
 
@@ -1205,7 +1210,7 @@ msgid "# Tracks"
 msgstr "N.º de pistas"
 
 #. Check box to run the scanner
-#: ../src/cddb.c:847 ../src/misc.c:3000
+#: ../src/cddb.c:847 ../src/misc.c:2991
 msgid "Run the current scanner for each file"
 msgstr "Ejecutar el analizador actual para cada archivo"
 
@@ -1217,7 +1222,7 @@ msgstr "Líneas coincidentes con el 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 "
@@ -1302,7 +1307,7 @@ msgstr "Error al leer la respuesta de CDDB (%s)"
 msgid "Cannot create file '%s' (%s)"
 msgstr "No se puede crear el archivo «%s» (%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 "No se puede abrir el archivo «%s» (%s)"
@@ -1638,47 +1643,47 @@ msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "La cadena «%s» no se pudo convertir a UTF-8 (%s)."
 
 #. Starting messages
-#: ../src/easytag.c:211
+#: ../src/easytag.c:184
 #, c-format
 msgid "Starting EasyTAG version %s (PID: %d)…"
 msgstr "Iniciando EasyTAG versión %s (PID: %d)…"
 
-#: ../src/easytag.c:213
+#: ../src/easytag.c:186
 #, c-format
 msgid "Using libid3tag version %s"
 msgstr "Usando libid3tag versión %s"
 
-#: ../src/easytag.c:216
+#: ../src/easytag.c:189
 #, c-format
 msgid "Using id3lib version %d.%d.%d"
 msgstr "Usando id3lib versión %d.%d.%d"
 
-#: ../src/easytag.c:222
+#: ../src/easytag.c:195
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
 msgstr "Variable EASYTAGLANG definida. Configuración regional: «%s»"
 
-#: ../src/easytag.c:224
+#: ../src/easytag.c:197
 #, c-format
 msgid "Setting locale: '%s'"
 msgstr "Configuración regional: «%s»"
 
-#: ../src/easytag.c:229
+#: ../src/easytag.c:202
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')"
 msgstr ""
 "Usando actualmente la configuración regional «%s» (y eventualmente «%s»)"
 
-#: ../src/easytag.c:236
+#: ../src/easytag.c:209
 msgid "Unable to create setting directories"
 msgstr "No se puede crear la carpeta de configuraciones"
 
-#: ../src/easytag.c:453 ../src/et_core.c:583
+#: ../src/easytag.c:426 ../src/et_core.c:597 ../src/et_core.c:609
 #, c-format
 msgid "Error while querying information for file: '%s' (%s)"
 msgstr "Error al consultar la información del archivo: «%s» (%s)"
 
-#: ../src/easytag.c:518
+#: ../src/easytag.c:489
 #, c-format
 msgid "Cannot open path '%s'"
 msgstr "No se puede abrir la ruta: «%s»"
@@ -1686,11 +1691,11 @@ msgstr "No se puede abrir la ruta: «%s»"
 #.
 #. * Browser
 #.
-#: ../src/easytag.c:618 ../src/prefs.c:142
+#: ../src/easytag.c:581 ../src/prefs.c:142
 msgid "Browser"
 msgstr "Examinador"
 
-#: ../src/easytag.c:640 ../src/et_core.c:2727
+#: ../src/easytag.c:603 ../src/et_core.c:2817
 msgid "File"
 msgstr "Archivo"
 
@@ -1700,103 +1705,103 @@ msgstr "Archivo"
 #. 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:635 ../src/easytag.c:4231 ../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 "Codificador:"
 
-#: ../src/easytag.c:680
+#: ../src/easytag.c:643
 msgid "Bitrate:"
 msgstr "Tasa de bits:"
 
 #. 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:653
 msgid "Frequency:"
 msgstr "Frecuencia:"
 
 #. Mode
-#: ../src/easytag.c:701 ../src/easytag.c:4204 ../src/mpeg_header.c:216
+#: ../src/easytag.c:664 ../src/easytag.c:4235 ../src/mpeg_header.c:216
 msgid "Mode:"
 msgstr "Modo:"
 
-#: ../src/easytag.c:708
+#: ../src/easytag.c:671
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: ../src/easytag.c:715
+#: ../src/easytag.c:678
 msgid "Duration:"
 msgstr "Duración:"
 
 #. Main Frame
-#: ../src/easytag.c:762 ../src/et_core.c:2665
+#: ../src/easytag.c:725 ../src/et_core.c:2747
 msgid "Tag"
 msgstr "Etiqueta"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: ../src/easytag.c:784
+#: ../src/easytag.c:747
 msgid "Common"
 msgstr "General"
 
 #. Title
-#: ../src/easytag.c:791
+#: ../src/easytag.c:754
 msgid "Title:"
 msgstr "Título:"
 
-#: ../src/easytag.c:805
+#: ../src/easytag.c:768
 msgid "Tag selected files with this title"
 msgstr "Etiquetar archivos seleccionados con este título"
 
 #. Artist
-#: ../src/easytag.c:810
+#: ../src/easytag.c:773
 msgid "Artist:"
 msgstr "Artista:"
 
-#: ../src/easytag.c:824
+#: ../src/easytag.c:787
 msgid "Tag selected files with this artist"
 msgstr "Etiquetar archivos seleccionados con este artista"
 
 #. Album Artist
-#: ../src/easytag.c:829
+#: ../src/easytag.c:792
 msgid "Album artist:"
 msgstr "Artista del álbum:"
 
-#: ../src/easytag.c:843
+#: ../src/easytag.c:806
 msgid "Tag selected files with this album artist"
 msgstr "Etiquetar archivos seleccionados con este artista del álbum"
 
 #. Album
-#: ../src/easytag.c:848
+#: ../src/easytag.c:811
 msgid "Album:"
 msgstr "Álbum:"
 
-#: ../src/easytag.c:862
+#: ../src/easytag.c:825
 msgid "Tag selected files with this album name"
 msgstr "Etiquetar archivos seleccionados con este nombre de álbum"
 
 #. Disc Number
-#: ../src/easytag.c:867
+#: ../src/easytag.c:830
 msgid "CD:"
 msgstr "CD:"
 
-#: ../src/easytag.c:884
+#: ../src/easytag.c:847
 msgid "Tag selected files with this disc number"
 msgstr "Etiquetar archivos seleccionados con este número de disco"
 
 #. Year
-#: ../src/easytag.c:889
+#: ../src/easytag.c:852
 msgid "Year:"
 msgstr "Año:"
 
-#: ../src/easytag.c:909
+#: ../src/easytag.c:872
 msgid "Tag selected files with this year"
 msgstr "Etiquetar archivos seleccionados con este año"
 
-#: ../src/easytag.c:923
+#: ../src/easytag.c:886
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Numerar todas las pistas seleccionadas secuencialmente. Empieza con 01 en "
@@ -1804,11 +1809,11 @@ msgstr ""
 
 #. To have enough space to display the icon
 #. To have enough space to display the icon
-#: ../src/easytag.c:932
+#: ../src/easytag.c:895
 msgid "Track #:"
 msgstr "Pista n.º:"
 
-#: ../src/easytag.c:963
+#: ../src/easytag.c:926
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1816,685 +1821,665 @@ msgstr ""
 "Establecer el número de archivos, en la misma carpeta del archivo mostrado, "
 "a las pistas seleccionadas."
 
-#: ../src/easytag.c:983
+#: ../src/easytag.c:946
 msgid "Tag selected files with this number of tracks"
 msgstr "Etiquetar archivos seleccionados con este número de pistas"
 
 #. Genre
-#: ../src/easytag.c:987
+#: ../src/easytag.c:950
 msgid "Genre:"
 msgstr "Género:"
 
-#: ../src/easytag.c:1015
+#: ../src/easytag.c:978
 msgid "Tag selected files with this genre"
 msgstr "Etiquetar archivos seleccionados con este género"
 
 #. Comment
-#: ../src/easytag.c:1020
+#: ../src/easytag.c:983
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../src/easytag.c:1047
+#: ../src/easytag.c:1010
 msgid "Tag selected files with this comment"
 msgstr "Etiquetar archivos seleccionados con este comentario"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. Composer (name of the composers)
-#: ../src/easytag.c:1054
+#: ../src/easytag.c:1017
 msgid "Composer:"
 msgstr "Compositor:"
 
-#: ../src/easytag.c:1068
+#: ../src/easytag.c:1031
 msgid "Tag selected files with this composer"
 msgstr "Etiquetar archivos seleccionados con este 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:1075
+#: ../src/easytag.c:1038
 msgid "Orig. artist:"
 msgstr "Artista orig.:"
 
-#: ../src/easytag.c:1089
+#: ../src/easytag.c:1052
 msgid "Tag selected files with this original artist"
 msgstr "Etiquetar archivos seleccionados con este artista original"
 
 #. Copyright
-#: ../src/easytag.c:1095
+#: ../src/easytag.c:1058
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../src/easytag.c:1109
+#: ../src/easytag.c:1072
 msgid "Tag selected files with this copyright"
 msgstr "Etiquetar archivos seleccionados con este copyright"
 
 #. URL
-#: ../src/easytag.c:1115
+#: ../src/easytag.c:1078
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/easytag.c:1129
+#: ../src/easytag.c:1092
 msgid "Tag selected files with this URL"
 msgstr "Etiquetar archivos seleccionados con este URL"
 
 #. Encoded by
-#: ../src/easytag.c:1135
+#: ../src/easytag.c:1098
 msgid "Encoded by:"
 msgstr "Codificado por:"
 
-#: ../src/easytag.c:1149
+#: ../src/easytag.c:1112
 msgid "Tag selected files with this encoder name"
 msgstr "Etiquetar archivos seleccionados con este nombre de codificador"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1183 ../src/et_core.c:3100 ../src/et_core.c:3103
+#: ../src/easytag.c:1146 ../src/et_core.c:3189 ../src/et_core.c:3192
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/easytag.c:1207
+#: ../src/easytag.c:1170
 msgid "You can use drag and drop to add an image"
 msgstr "Puede arrastrar y soltar para añadir una imagen"
 
-#: ../src/easytag.c:1254
+#: ../src/easytag.c:1217
 msgid "Add images to the tag"
 msgstr "Añadir imágenes a la etiqueta"
 
-#: ../src/easytag.c:1272
+#: ../src/easytag.c:1235
 msgid "Remove selected images from the tag"
 msgstr "Quitar las imágenes seleccionadas de la etiqueta"
 
-#: ../src/easytag.c:1286
+#: ../src/easytag.c:1249
 msgid "Save the selected images to files"
 msgstr "Guardar las imágenes seleccionadas a archivos"
 
-#: ../src/easytag.c:1297
+#: ../src/easytag.c:1260
 msgid "Edit image properties"
 msgstr "Editar las propiedades de la imagen"
 
-#: ../src/easytag.c:1311
+#: ../src/easytag.c:1274
 msgid "Tag selected files with these images"
 msgstr "Etiquetar archivos seleccionados con estas imágenes"
 
-#: ../src/easytag.c:1369
+#: ../src/easytag.c:1332
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Archivos seleccionados etiquetados con el título «%s»."
 
-#: ../src/easytag.c:1371
+#: ../src/easytag.c:1334
 msgid "Removed title from selected files."
 msgstr "Título eliminado de los archivos seleccionados."
 
-#: ../src/easytag.c:1386
+#: ../src/easytag.c:1349
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Archivos seleccionados etiquetados con el artista «%s»."
 
-#: ../src/easytag.c:1388
+#: ../src/easytag.c:1351
 msgid "Removed artist from selected files."
 msgstr "Artista eliminado de los archivos seleccionados."
 
-#: ../src/easytag.c:1402
+#: ../src/easytag.c:1365
 #, c-format
 msgid "Selected files tagged with album artist '%s'."
 msgstr "Archivos seleccionados etiquetados con el artista del álbum «%s»."
 
-#: ../src/easytag.c:1404
+#: ../src/easytag.c:1367
 msgid "Removed album artist from selected files."
 msgstr "Eliminado artista del álbum de los archivos seleccionados."
 
-#: ../src/easytag.c:1419
+#: ../src/easytag.c:1382
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Archivos seleccionados etiquetados con álbum «%s»."
 
-#: ../src/easytag.c:1421
+#: ../src/easytag.c:1384
 msgid "Removed album name from selected files."
 msgstr "Nombre de álbum eliminado de los archivos seleccionados."
 
-#: ../src/easytag.c:1458
+#: ../src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with disc number '%s/%s'."
 msgstr "Archivos seleccionados etiquetados con el número de disco «%s/%s»."
 
-#: ../src/easytag.c:1463
+#: ../src/easytag.c:1426
 #, c-format
 msgid "Selected files tagged with disc number like 'xx'."
 msgstr "Archivos seleccionados etiquetados con el número de disco como «xx»."
 
-#: ../src/easytag.c:1468
+#: ../src/easytag.c:1431
 msgid "Removed disc number from selected files."
 msgstr "Número de disco eliminado de los archivos seleccionados."
 
-#: ../src/easytag.c:1484
+#: ../src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Archivos seleccionados etiquetados con el año «%s»."
 
-#: ../src/easytag.c:1486
+#: ../src/easytag.c:1449
 msgid "Removed year from selected files."
 msgstr "Año eliminado de los archivos seleccionados."
 
-#: ../src/easytag.c:1512 ../src/easytag.c:1602
+#: ../src/easytag.c:1475 ../src/easytag.c:1566
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Archivos seleccionados etiquetados con la pista como «xx/%s»."
 
-#: ../src/easytag.c:1515
+#: ../src/easytag.c:1478
 #, c-format
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Archivos seleccionados etiquetados con la pista como «xx»."
 
-#: ../src/easytag.c:1519 ../src/easytag.c:1605
+#: ../src/easytag.c:1482 ../src/easytag.c:1569
 msgid "Removed track number from selected files."
 msgstr "Número de pista eliminado de los archivos seleccionados."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1575
+#: ../src/easytag.c:1539
 #, c-format
 msgid "Selected tracks numbered sequentially."
 msgstr "Pistas seleccionadas numeradas secuencialmente."
 
-#: ../src/easytag.c:1621
+#: ../src/easytag.c:1585
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Archivos seleccionados etiquetados con el género «%s»."
 
-#: ../src/easytag.c:1623
+#: ../src/easytag.c:1587
 msgid "Removed genre from selected files."
 msgstr "Género eliminado de los archivos seleccionados."
 
-#: ../src/easytag.c:1645
+#: ../src/easytag.c:1609
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Archivos seleccionados etiquetados con el comentario «%s»."
 
-#: ../src/easytag.c:1647
+#: ../src/easytag.c:1611
 msgid "Removed comment from selected files."
 msgstr "Comentario eliminado de los archivos seleccionados."
 
-#: ../src/easytag.c:1661
+#: ../src/easytag.c:1625
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Archivos seleccionados etiquetados con el compositor «%s»."
 
-#: ../src/easytag.c:1663
+#: ../src/easytag.c:1627
 msgid "Removed composer from selected files."
 msgstr "Eliminado el compositor de los archivos seleccionados."
 
-#: ../src/easytag.c:1678
+#: ../src/easytag.c:1642
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Archivos seleccionados etiquetados con el artista original «%s»."
 
-#: ../src/easytag.c:1680
+#: ../src/easytag.c:1644
 msgid "Removed original artist from selected files."
 msgstr "Eliminado el artista original de los archivos seleccionados."
 
-#: ../src/easytag.c:1695
+#: ../src/easytag.c:1659
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Archivos seleccionados etiquetados con copyright «%s»."
 
-#: ../src/easytag.c:1697
+#: ../src/easytag.c:1661
 msgid "Removed copyright from selected files."
 msgstr "Eliminado el copyright de los archivos seleccionados."
 
-#: ../src/easytag.c:1712
+#: ../src/easytag.c:1676
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Archivos seleccionados etiquetados con el URL «%s»."
 
-#: ../src/easytag.c:1714
+#: ../src/easytag.c:1678
 msgid "Removed URL from selected files."
 msgstr "URL eliminado de los archivos seleccionados."
 
-#: ../src/easytag.c:1729
+#: ../src/easytag.c:1693
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Archivos seleccionados etiquetados con el nombre de codificador «%s»."
 
-#: ../src/easytag.c:1731
+#: ../src/easytag.c:1695
 msgid "Removed encoder name from selected files."
 msgstr "Eliminado el nombre del codificador de los archivos seleccionados."
 
-#: ../src/easytag.c:1763
+#: ../src/easytag.c:1727
 msgid "Selected files tagged with images."
 msgstr "Archivos seleccionados etiquetados con imágenes."
 
-#: ../src/easytag.c:1765
+#: ../src/easytag.c:1729
 msgid "Removed images from selected files."
 msgstr "Imágenes eliminadas de los archivos seleccionados."
 
-#: ../src/easytag.c:2046
+#: ../src/easytag.c:2010
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Seleccionar Modo y Máscara y rehacer la misma acción"
 
-#: ../src/easytag.c:2098
+#: ../src/easytag.c:2062
 msgid "All tags have been scanned"
 msgstr "Todas las etiquetas han sido analizadas"
 
-#: ../src/easytag.c:2154
+#: ../src/easytag.c:2118
 msgid "All tags have been removed"
 msgstr "Todas las etiquetas han sido eliminadas"
 
-#: ../src/easytag.c:2444
+#: ../src/easytag.c:2423
 #, c-format
 msgid "A file was changed by an external program"
 msgid_plural "%d files were changed by an external program."
 msgstr[0] "Se ha cambiado un archivo por un programa externo"
 msgstr[1] "Se han cambiado %d archivos por un programa externo."
 
-#: ../src/easytag.c:2449
+#: ../src/easytag.c:2428
 msgid "Do you want to continue saving the file?"
 msgstr "¿Quiere continuar guardando el archivo?"
 
-#: ../src/easytag.c:2504 ../src/easytag.c:2524
+#: ../src/easytag.c:2486 ../src/easytag.c:2506
 msgid "Saving files was stopped"
 msgstr "Se detuvo al guardar archivos"
 
-#: ../src/easytag.c:2526
+#: ../src/easytag.c:2508
 msgid "All files have been saved"
 msgstr "Todos los archivos se han guardado"
 
-#: ../src/easytag.c:2657
+#: ../src/easytag.c:2643
 #, c-format
 msgid "Cannot delete file (%s)"
 msgstr "No se puede eliminar el archivo (%s)"
 
-#: ../src/easytag.c:2677
+#: ../src/easytag.c:2664
 msgid "Files have been partially deleted"
 msgstr "Se han eliminado los archivos parcialmente"
 
-#: ../src/easytag.c:2679
+#: ../src/easytag.c:2666
 msgid "All files have been deleted"
 msgstr "Se han eliminado todos los archivos"
 
-#: ../src/easytag.c:2795
+#: ../src/easytag.c:2782
 #, c-format
 msgid "Do you want to write the tag of file '%s'?"
 msgstr "¿Quiere escribir la etiqueta del archivo «%s»?"
 
-#: ../src/easytag.c:2797
+#: ../src/easytag.c:2784
 msgid "Confirm Tag Writing"
 msgstr "Confirmar escritura de etiqueta"
 
-#: ../src/easytag.c:2802 ../src/easytag.c:2919 ../src/easytag.c:3179
+#: ../src/easytag.c:2789 ../src/easytag.c:2909 ../src/easytag.c:3172
 msgid "Repeat action for the remaining files"
 msgstr "Repetir acción para el resto de los archivos"
 
 #. Directories and filename changed
-#: ../src/easytag.c:2883 ../src/scan.c:181
+#: ../src/easytag.c:2873 ../src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Renombrar archivo y carpeta"
 
-#: ../src/easytag.c:2884
+#: ../src/easytag.c:2874
 msgid "File and directory rename confirmation required"
 msgstr "Se requiere confirmación para renombrar el archivo y la carpeta"
 
-#: ../src/easytag.c:2885
+#: ../src/easytag.c:2875
 #, c-format
 msgid "Do you want to rename the file and directory '%s' to '%s'?"
 msgstr "¿Quiere renombrar el archivo y carpeta «%s» a «%s»?"
 
-#: ../src/easytag.c:2891
+#: ../src/easytag.c:2881
 msgid "Directory rename confirmation required"
 msgstr "Se requiere confirmar el renombrado de la carpeta"
 
-#: ../src/easytag.c:2892
+#: ../src/easytag.c:2882
 #, c-format
 msgid "Do you want to rename the directory '%s' to '%s'?"
 msgstr "¿Quiere renombrar la carpeta «%s» a «%s»?"
 
 #. Only filename changed
-#: ../src/easytag.c:2898
+#: ../src/easytag.c:2888
 msgid "Rename File"
 msgstr "Renombrar el archivo"
 
-#: ../src/easytag.c:2899
+#: ../src/easytag.c:2889
 msgid "File rename confirmation required"
 msgstr "Se requiere confirmación para renombrar el archivo"
 
-#: ../src/easytag.c:2900
+#: ../src/easytag.c:2890
 #, c-format
 msgid "Do you want to rename the file '%s' to '%s'?"
 msgstr "¿Quiere renombrar el archivo «%s» a «%s»?"
 
-#: ../src/easytag.c:2966
+#: ../src/easytag.c:2956
 #, c-format
 msgid "Cannot rename file '%s' to '%s'"
 msgstr "No se puede renombrar el archivo «%s» a «%s»"
 
-#: ../src/easytag.c:2980
+#: ../src/easytag.c:2970
 #, c-format
 msgid "Cannot rename file '%s' to '%s': %s"
 msgstr "No se puede renombrar el archivo «%s» a «%s»: %s"
 
-#: ../src/easytag.c:2984
+#: ../src/easytag.c:2974
 msgid "File(s) not renamed"
 msgstr "Archivo(s) no renombrados"
 
-#: ../src/easytag.c:3093
+#: ../src/easytag.c:3086
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Escribiendo etiqueta de «%s»"
 
-#: ../src/easytag.c:3100
+#: ../src/easytag.c:3093
 msgid "Tag(s) written"
 msgstr "Etiqueta(s) escritas"
 
-#: ../src/easytag.c:3115
+#: ../src/easytag.c:3108
 #, c-format
 msgid "Cannot write tag in file '%s' (%s)"
 msgstr "No se puede escribir la etiqueta en el archivo «%s» (%s)"
 
-#: ../src/easytag.c:3128
+#: ../src/easytag.c:3121
 #, c-format
 msgid "Cannot write tag in file '%s'"
 msgstr "No se puede escribir la etiqueta en el archivo «%s»"
 
-#: ../src/easytag.c:3131
+#: ../src/easytag.c:3124
 msgid "Tag Write Error"
 msgstr " Error al escribir etiqueta"
 
-#: ../src/easytag.c:3176 ../src/easytag.c:3190
+#: ../src/easytag.c:3169 ../src/easytag.c:3183
 #, c-format
 msgid "Do you really want to delete the file '%s'?"
 msgstr "¿Realmente quiere eliminar el archivo «%s»?"
 
-#: ../src/easytag.c:3182 ../src/easytag.c:3192
+#: ../src/easytag.c:3175 ../src/easytag.c:3185
 msgid "Delete File"
 msgstr "Eliminar archivo"
 
-#: ../src/easytag.c:3217
+#: ../src/easytag.c:3210
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Archivo «%s» eliminado"
 
-#: ../src/easytag.c:3349
+#: ../src/easytag.c:3345
 #, c-format
 msgid "Cannot read directory '%s'"
 msgstr "No se puede leer carpeta «%s»"
 
-#: ../src/easytag.c:3353
+#: ../src/easytag.c:3349
 msgid "Directory Read Error"
 msgstr "Error al leer carpeta"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3374
+#: ../src/easytag.c:3370
 #, c-format
 msgid "Search in progress…"
 msgstr "Búsqueda en progreso…"
 
-#: ../src/easytag.c:3397 ../src/et_core.c:2734
+#: ../src/easytag.c:3393 ../src/et_core.c:2824
 #, c-format
 msgid "File: '%s'"
 msgstr "Archivo: «%s»"
 
-#: ../src/easytag.c:3447
+#: ../src/easytag.c:3443
 #, c-format
 msgid "Found one file in this directory and subdirectories"
 msgid_plural "Found %d files in this directory and subdirectories"
 msgstr[0] "Encontrado un archivo en esta carpeta y subcarpetas."
 msgstr[1] "Encontrados %d archivos en esta carpeta y subcarpetas."
 
-#: ../src/easytag.c:3454
+#: ../src/easytag.c:3450
 #, c-format
 msgid "Found one file in this directory"
 msgid_plural "Found %d files in this directory"
 msgstr[0] "Encontrado un archivo en esta carpeta"
 msgstr[1] "Encontrados %d archivos en esta carpeta"
 
-#: ../src/easytag.c:3476
+#: ../src/easytag.c:3472
 msgid "No file found in this directory and subdirectories"
 msgstr "No se han encontrados archivos en esta carpeta y subcarpetas"
 
-#: ../src/easytag.c:3478
+#: ../src/easytag.c:3474
 msgid "No file found in this directory"
 msgstr "No se han encontrado archivos en esta carpeta"
 
-#: ../src/easytag.c:3546
+#: ../src/easytag.c:3542
 #, c-format
 msgid "Error opening directory '%s' (%s)"
 msgstr "Error al abrir la carpeta «%s» (%s)"
 
-#: ../src/easytag.c:3582
+#: ../src/easytag.c:3578
 #, c-format
 msgid "Cannot read directory (%s)"
 msgstr "No se puede leer carpeta (%s)"
 
-#: ../src/easytag.c:3602
+#: ../src/easytag.c:3598
 msgid "Searching for audio files…"
 msgstr "Buscando por archivos de sonido…"
 
-#: ../src/easytag.c:3603
+#: ../src/easytag.c:3599
 msgid "Searching"
 msgstr "Buscando"
 
-#: ../src/easytag.c:4234
+#: ../src/easytag.c:4265
 msgid "Select a directory to browse"
 msgstr "Seleccione una carpeta para examinar"
 
 #. Menu items
-#: ../src/easytag.c:4381
+#: ../src/easytag.c:4412
 msgid "Tag selected files with this field"
 msgstr "Etiquetar archivos seleccionados con este campo"
 
-#: ../src/easytag.c:4393 ../src/scan.c:2662
+#: ../src/easytag.c:4424 ../src/scan.c:2318
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Convertir «_» y «%20» a espacios"
 
-#: ../src/easytag.c:4400 ../src/scan.c:2664
+#: ../src/easytag.c:4431 ../src/scan.c:2320
 msgid "Convert ' ' to '_'"
 msgstr "Convertir « » a «_»"
 
-#: ../src/easytag.c:4411
+#: ../src/easytag.c:4442
 msgid "All uppercase"
 msgstr "Todas mayúsculas"
 
-#: ../src/easytag.c:4418
+#: ../src/easytag.c:4449
 msgid "All lowercase"
 msgstr "Todas minúsculas"
 
-#: ../src/easytag.c:4425
+#: ../src/easytag.c:4456
 msgid "First letter uppercase"
 msgstr "Primera letra mayúscula"
 
-#: ../src/easytag.c:4432
+#: ../src/easytag.c:4463
 msgid "First letter uppercase of each word"
 msgstr "Primera letra de cada palabra en mayúscula"
 
-#: ../src/easytag.c:4443 ../src/prefs.c:1023 ../src/scan.c:2762
+#: ../src/easytag.c:4474 ../src/prefs.c:1023 ../src/scan.c:2418
 msgid "Remove spaces"
 msgstr "Quitar espacios"
 
-#: ../src/easytag.c:4450
+#: ../src/easytag.c:4481
 msgid "Insert space before uppercase letter"
 msgstr "Insertar espacios antes de letra en mayúsculas"
 
-#: ../src/easytag.c:4457
+#: ../src/easytag.c:4488
 msgid "Remove duplicate spaces or underscores"
 msgstr "Quitar espacios o subrayados duplicados"
 
-#: ../src/easytag.c:4464
+#: ../src/easytag.c:4495
 msgid "Remove all text"
 msgstr "Quitar todo el texto"
 
-#. gchar commmand[256];
-#: ../src/easytag.c:4487
-#, c-format
-msgid "EasyTAG version %s: Abnormal exit (PID: %d)"
-msgstr "EasyTAG versión %s: salida anormal (PID: %d)"
-
-#: ../src/easytag.c:4488 ../src/easytag.c:4499
-#, c-format
-msgid "Received signal '%s' (%d)"
-msgstr "Señal recibida «%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 ""
-"Probablemente ha encontrado un error en EasyTAG. Por favor, envíe un informe "
-"de error con una traza inversa GDB («gdb easytag core», después «bt» y «l») "
-"e información sobre cómo reproducirlo en: %s"
-
-#. To send messages to the console...
-#: ../src/easytag.c:4497
-#, c-format
-msgid "EasyTAG version %s: Abnormal exit (PID: %d)."
-msgstr "EasyTAG versión %s: salida anormal (PID: %d)."
-
-#: ../src/easytag.c:4521
+#: ../src/easytag.c:4514
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: salida normal."
 
-#: ../src/easytag.c:4573
+#: ../src/easytag.c:4566
 msgid "Do you want to save them before quitting?"
 msgstr "¿Quiere guardarlos antes de salir?"
 
-#: ../src/easytag.c:4596
+#: ../src/easytag.c:4593
 msgid "Do you really want to quit?"
 msgstr "¿Seguro que desea salir?"
 
-#: ../src/et_core.c:505
+#: ../src/et_core.c:510
 #, c-format
 msgid "Error reading tag from ogg file (%s)"
 msgstr "Error al leer etiqueta del archivo ogg: (%s)"
 
-#: ../src/et_core.c:639
+#: ../src/et_core.c:539
+#, c-format
+msgid "Error reading tag from Opus file (%s)"
+msgstr "Error al leer etiqueta del archivo Opus (%s)"
+
+#: ../src/et_core.c:682
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr "Correcciones automáticas aplicadas para el archivo «%s»."
 
-#: ../src/et_core.c:2631
+#: ../src/et_core.c:2707
 msgid "ID3 Tag"
 msgstr "Etiqueta ID3"
 
-#: ../src/et_core.c:2637
+#: ../src/et_core.c:2713
 msgid "Ogg Vorbis Tag"
 msgstr "Etiqueta Ogg Vorbis"
 
-#: ../src/et_core.c:2643
+#: ../src/et_core.c:2719
 msgid "FLAC Vorbis Tag"
 msgstr "Etiqueta FLAC Vorbis"
 
-#: ../src/et_core.c:2648
+#: ../src/et_core.c:2724
 msgid "APE Tag"
 msgstr "Etiqueta APE"
 
-#: ../src/et_core.c:2653
+#: ../src/et_core.c:2729
 msgid "MP4/M4A/AAC Tag"
 msgstr "Etiqueta MP4/M4A/AAC"
 
-#: ../src/et_core.c:2659
+#: ../src/et_core.c:2735
 msgid "Wavpack Tag"
 msgstr "Etiqueta Wavpack"
 
-#: ../src/et_core.c:2679
+#: ../src/et_core.c:2741
+msgid "Opus Tag"
+msgstr "Etiqueta Opus"
+
+#: ../src/et_core.c:2761
 msgid "MP3 File"
 msgstr "Archivo MP3"
 
-#: ../src/et_core.c:2683
+#: ../src/et_core.c:2765
 msgid "MP2 File"
 msgstr "Archivo MP2"
 
-#: ../src/et_core.c:2689
+#: ../src/et_core.c:2771
 msgid "Ogg Vorbis File"
 msgstr "Archivo Ogg Vorbis"
 
-#: ../src/et_core.c:2695
+#: ../src/et_core.c:2777
 msgid "Speex File"
 msgstr "Archivo Speex"
 
-#: ../src/et_core.c:2701
+#: ../src/et_core.c:2783
 msgid "FLAC File"
 msgstr "Archivo FLAC"
 
-#: ../src/et_core.c:2706
+#: ../src/et_core.c:2788
 msgid "MusePack File"
 msgstr "Archivo MusePack"
 
-#: ../src/et_core.c:2710
+#: ../src/et_core.c:2792
 msgid "Monkey's Audio File"
 msgstr "Archivo de sonido Monkey"
 
-#: ../src/et_core.c:2715
+#: ../src/et_core.c:2797
 msgid "MP4/AAC File"
 msgstr "Archivo MP4/AAC"
 
-#: ../src/et_core.c:2721
+#: ../src/et_core.c:2803
 msgid "Wavpack File"
 msgstr "Archivo Wavpack"
 
-#: ../src/et_core.c:2778 ../src/et_core.c:2833
+#: ../src/et_core.c:2809
+msgid "Opus File"
+msgstr "Archivo Opus"
+
+#: ../src/et_core.c:2868 ../src/et_core.c:2923
 msgid "File not found"
 msgstr "Archivo no encontrado"
 
-#: ../src/et_core.c:2783
+#: ../src/et_core.c:2873
 #, c-format
 msgid "Cannot query file information (%s)"
 msgstr "No se puede consultar la información del archivo (%s)"
 
-#: ../src/et_core.c:2817
+#: ../src/et_core.c:2907
 msgid "Read-only file"
 msgstr "Archivo de solo lectura"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2881
+#: ../src/et_core.c:2971
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
 msgstr[0] "Un archivo"
 msgstr[1] "%u archivos"
 
-#: ../src/et_core.c:3086
+#: ../src/et_core.c:3175
 #, c-format
 msgid "Images (%d)"
 msgstr "Imágenes (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3128 ../src/flac_header.c:205
+#: ../src/et_core.c:3217 ../src/flac_header.c:205
 #: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
 #: ../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/et_core.c:3222 ../src/flac_header.c:210
 #: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
 #: ../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:3368 ../src/scan.c:686
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding"
 msgstr ""
 "No se puede convertir el nombre de archivo «%s» a la codificación de nombres "
 "de archivo del sistema"
 
-#: ../src/et_core.c:3278
+#: ../src/et_core.c:3370
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Intente configurar la variable de entorno G_FILENAME_ENCODING."
 
-#: ../src/et_core.c:3279 ../src/scan.c:692
+#: ../src/et_core.c:3371 ../src/scan.c:688
 msgid "Filename translation"
 msgstr "Traducción del nombre de archivo"
 
-#: ../src/et_core.c:3940
-#, c-format
-msgid "Cannot change the permissions of file '%s' (%s)"
-msgstr "No se pueden cambiar los permisos del archivo «%s» (%s)"
-
-#: ../src/et_core.c:3978
+#: ../src/et_core.c:4076
 #, c-format
 msgid "Error writing tag type %d to file %s (%s)"
 msgstr "Error al escribir el tipo de etiqueta %d al archivo %s (%s)"
@@ -2504,7 +2489,7 @@ msgstr "Error al escribir el tipo de etiqueta %d al archivo %s (%s)"
 #. 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/opus_header.c:237 ../src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Canales:"
 
@@ -2513,7 +2498,7 @@ msgstr "Canales:"
 msgid "Error while opening file: '%s' as FLAC (%s)."
 msgstr "Error al abrir archivo: «%s» como 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 "
@@ -2532,7 +2517,7 @@ msgstr "El bloque de imagen no es válido: «%s»"
 msgid "Error: Failed to write comments to file '%s' (%s)."
 msgstr "Error: fallo al escribir comentarios al archivo «%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 "Etiqueta escrita de «%s»"
@@ -2555,27 +2540,27 @@ msgstr ""
 msgid "Corrupted file"
 msgstr "Archivo dañado"
 
-#: ../src/id3_tag.c:540
+#: ../src/id3_tag.c:555
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Etiqueta eliminada de «%s»"
 
-#: ../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 "Error al eliminar la etiqueta ID3v1 de «%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 "Error al eliminar la etiqueta ID3v2 de «%s» (%s)"
 
-#: ../src/id3_tag.c:565
+#: ../src/id3_tag.c:580
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Error al actualizar la etiqueta ID3v2 de «%s» (%s)"
 
-#: ../src/id3_tag.c: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"
@@ -2583,7 +2568,7 @@ msgstr ""
 "Ha intentado guardar esta etiqueta en Unicode pero se detectó que su versión "
 "de id3lib tiene errores"
 
-#: ../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 "
@@ -2602,90 +2587,90 @@ msgstr ""
 "\n"
 "Archivo: %s"
 
-#: ../src/id3_tag.c:602
+#: ../src/id3_tag.c:617
 msgid "Buggy id3lib"
 msgstr "id3lib con errores"
 
-#: ../src/id3_tag.c:636
+#: ../src/id3_tag.c:651
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Error al actualizar la etiqueta ID3v1 de «%s» (%s)"
 
-#: ../src/id3_tag.c:650 ../src/id3v24_tag.c:1049
+#: ../src/id3_tag.c:665 ../src/id3v24_tag.c:1048
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Actualizada la etiqueta de «%s»"
 
-#: ../src/id3_tag.c:669
+#: ../src/id3_tag.c:684
 msgid "No error reported"
 msgstr "No se han reportado errores"
 
-#: ../src/id3_tag.c:671
+#: ../src/id3_tag.c:686
 msgid "No available memory"
 msgstr "No hay memoria disponible"
 
-#: ../src/id3_tag.c:673
+#: ../src/id3_tag.c:688
 msgid "No data to parse"
 msgstr "No hay datos que analizar"
 
-#: ../src/id3_tag.c:675
+#: ../src/id3_tag.c:690
 msgid "Improperly formatted data"
 msgstr "Datos incorrectamente formateados"
 
-#: ../src/id3_tag.c:677
+#: ../src/id3_tag.c:692
 msgid "No buffer to write to"
 msgstr "No hay búfer para escribir"
 
-#: ../src/id3_tag.c:679
+#: ../src/id3_tag.c:694
 msgid "Buffer is too small"
 msgstr "El búfer es demasiado pequeño"
 
-#: ../src/id3_tag.c:681
+#: ../src/id3_tag.c:696
 msgid "Invalid frame ID"
 msgstr "ID de marco no válido"
 
-#: ../src/id3_tag.c:683
+#: ../src/id3_tag.c:698
 msgid "Requested field not found"
 msgstr "Campo solicitado no encontrado"
 
-#: ../src/id3_tag.c:685
+#: ../src/id3_tag.c:700
 msgid "Unknown field type"
 msgstr "Tipo de campo desconocido"
 
-#: ../src/id3_tag.c:687
+#: ../src/id3_tag.c:702
 msgid "Tag is already attached to a file"
 msgstr "La etiqueta ya está adjuntada a un archivo"
 
-#: ../src/id3_tag.c:689
+#: ../src/id3_tag.c:704
 msgid "Invalid tag version"
 msgstr "Versión de etiqueta no válida"
 
-#: ../src/id3_tag.c:691
+#: ../src/id3_tag.c:706
 msgid "No file to parse"
 msgstr "Ningún archivo que procesar"
 
-#: ../src/id3_tag.c:693
+#: ../src/id3_tag.c:708
 msgid "Attempting to write to a read-only file"
 msgstr "Intentando escribir en un archivo de sólo lectura"
 
-#: ../src/id3_tag.c:695
+#: ../src/id3_tag.c:710
 msgid "Error in compression/uncompression"
 msgstr "Error en compresión/descompresión"
 
-#: ../src/id3_tag.c:697
+#: ../src/id3_tag.c:712
 msgid "Unknown error message"
 msgstr "Mensaje de error desconocido"
 
-#: ../src/id3_tag.c:1301
+#: ../src/id3_tag.c:1316
 #, c-format
 msgid "Error while creating temporary file: '%s'"
 msgstr "Error al crear archivo temporal: «%s»"
 
-#: ../src/id3_tag.c:1308
+#: ../src/id3_tag.c:1323
 msgid "Error while creating temporary file"
 msgstr "Error al crear archivo temporal"
 
-#: ../src/id3_tag.c:1328
+#: ../src/id3_tag.c:1343
 #, c-format
 msgid "Error while writing to file: '%s' (%s)"
 msgstr "Error al escribir al archivo: «%s» (%s)"
@@ -2695,7 +2680,7 @@ msgstr "Error al escribir al archivo: «%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)"
@@ -2703,12 +2688,12 @@ msgstr[0] "No se puede escribir la etiqueta del archivo «%s» (faltaba un byte)
 msgstr[1] ""
 "No se puede escribir la etiqueta del archivo «%s» (faltaban %s bytes)"
 
-#: ../src/id3v24_tag.c:1525
+#: ../src/id3v24_tag.c:1524
 #, c-format
 msgid "Cannot save tag of file '%s'"
 msgstr "No se puede guardar etiqueta del archivo «%s»"
 
-#: ../src/id3v24_tag.c:1536
+#: ../src/id3v24_tag.c:1535
 #, c-format
 msgid "Size error while saving tag of '%s'"
 msgstr "Error de tamaño al guardar etiqueta de «%s»"
@@ -2717,70 +2702,54 @@ msgstr "Error de tamaño al guardar etiqueta de «%s»"
 msgid "Log"
 msgstr "Registro"
 
-#: ../src/misc.c:691
-msgid "Select File"
-msgstr "Seleccionar archivo"
-
-#: ../src/misc.c:697
-msgid "Select Directory"
-msgstr "Seleccionar una carpeta"
-
-#: ../src/misc.c:781
-msgid "No audio player defined"
-msgstr "No se ha definido un reproductor de sonido"
-
-#: ../src/misc.c:782
-msgid "Audio Player Warning"
-msgstr "Advertencia del reproductor de sonido"
-
-#: ../src/misc.c:878
-msgid "Cannot fork another process"
-msgstr "No se puede crear otro proceso"
+#: ../src/misc.c:719
+msgid "You must type a program name"
+msgstr "Debe introducir un nombre de programa"
 
-#. Translators: file size (bytes, kilobytes, megabytes, gigabytes,
-#. * terabytes).
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "B"
-msgstr "B"
+#: ../src/misc.c:720
+msgid "Program Name Error"
+msgstr "Error del nombre del programa"
 
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "kB"
-msgstr "kB"
+#: ../src/misc.c:799
+#, c-format
+msgid "Executed command: %s"
+msgstr "Comando ejecutado: %s"
 
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "MB"
-msgstr "MB"
+#: ../src/misc.c:806
+#, c-format
+msgid "Failed to launch program: %s"
+msgstr "Falló al lanzar el programa: %s"
 
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "GB"
-msgstr "GB"
+#: ../src/misc.c:823
+msgid "Select File"
+msgstr "Seleccionar archivo"
 
-#: ../src/misc.c:1046 ../src/misc.c:1066
-msgid "TB"
-msgstr "TB"
+#: ../src/misc.c:829
+msgid "Select Directory"
+msgstr "Seleccionar una carpeta"
 
-#: ../src/misc.c:1145
+#: ../src/misc.c:1141
 msgid "Generate Playlist"
 msgstr "Generar lista de reproducción"
 
-#: ../src/misc.c:1169
+#: ../src/misc.c:1165
 msgid "M3U Playlist Name"
 msgstr "Nombre de la lista de reproducción M3U"
 
-#: ../src/misc.c:1184
+#: ../src/misc.c:1180
 msgid "Use directory name"
 msgstr "Usar nombre de la carpeta"
 
 #. Playlist options
-#: ../src/misc.c:1201
+#: ../src/misc.c:1197
 msgid "Playlist Options"
 msgstr "Opciones de la lista de reproducción"
 
-#: ../src/misc.c:1207
+#: ../src/misc.c:1203
 msgid "Include only the selected files"
 msgstr "Incluir sólo los archivos seleccionados"
 
-#: ../src/misc.c:1210
+#: ../src/misc.c:1206
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2789,30 +2758,30 @@ msgstr ""
 "archivo de la lista de reproducción. De lo contrario, se escribirán todos "
 "los archivos."
 
-#: ../src/misc.c:1213
+#: ../src/misc.c:1209
 msgid "Use full path for files in playlist"
 msgstr "Usar ruta completa para los archivos en la lista de reproducción"
 
-#: ../src/misc.c:1216
+#: ../src/misc.c:1212
 msgid "Use relative path for files in playlist"
 msgstr "Usar ruta relativa para los archivos en la lista de reproducción"
 
 #. Create playlist in parent directory
-#: ../src/misc.c:1222
+#: ../src/misc.c:1218
 msgid "Create playlist in the parent directory"
 msgstr "Crear lista de reproducción en la carpeta padre"
 
-#: ../src/misc.c:1225
+#: ../src/misc.c:1221
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Si está activado, la lista de reproducción se creará en la carpeta padre."
 
 #. DOS Separator
-#: ../src/misc.c:1229
+#: ../src/misc.c:1225
 msgid "Use DOS directory separator"
 msgstr "Usar el separador de carpetas de DOS"
 
-#: ../src/misc.c:1235
+#: ../src/misc.c:1231
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2820,49 +2789,49 @@ msgstr ""
 "Esta opción reemplaza el separador de carpetas UNIX «/» por el separador DOS "
 "«\\»."
 
-#: ../src/misc.c:1244
+#: ../src/misc.c:1240
 msgid "Playlist Content"
 msgstr "Contenido de la lista de reproducción"
 
-#: ../src/misc.c:1250
+#: ../src/misc.c:1246
 msgid "Write only list of files"
 msgstr "Escribir sólo la lista de archivos"
 
-#: ../src/misc.c:1254
+#: ../src/misc.c:1250
 msgid "Write info using filename"
 msgstr "Escribir información usando el nombre de archivo"
 
-#: ../src/misc.c:1257
+#: ../src/misc.c:1253
 msgid "Write info using:"
 msgstr "Escribir información usando:"
 
-#: ../src/misc.c:1476
+#: ../src/misc.c:1467
 #, c-format
 msgid "Cannot write playlist file '%s'"
 msgstr "No se puede escribir el archivo de lista de reproducción «%s»"
 
-#: ../src/misc.c:1480
+#: ../src/misc.c:1471
 msgid "Playlist File Error"
 msgstr "Error del archivo de lista de reproducción"
 
-#: ../src/misc.c:1488
+#: ../src/misc.c:1479
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Se ha escrito el archivo de la lista «%s»"
 
-#: ../src/misc.c:1552 ../src/scan.c:3247 ../src/scan.c:3309
+#: ../src/misc.c:1543 ../src/scan.c:2903 ../src/scan.c:2965
 msgid "Invalid scanner mask"
 msgstr "Máscara del analizador no válida"
 
-#: ../src/misc.c:1916
+#: ../src/misc.c:1907
 msgid "CD"
 msgstr "CD"
 
-#: ../src/misc.c:1938
+#: ../src/misc.c:1929
 msgid "Find Files"
 msgstr "Buscar archivos"
 
-#: ../src/misc.c:1970
+#: ../src/misc.c:1961
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2870,13 +2839,13 @@ msgstr ""
 "mostrar todos los archivos."
 
 #. Where...
-#: ../src/misc.c:1976
+#: ../src/misc.c:1967
 msgid "In:"
 msgstr "En:"
 
 #. 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:1972
 msgid "the Filename"
 msgstr "el nombre del archivo"
 
@@ -2885,83 +2854,83 @@ msgstr "el nombre del archivo"
 #. * Note: label changed to "the Tag" (to be the only one) to fix a Hungarian
 #. * grammatical problem (which uses one word to say "in the tag" like here)
 #.
-#: ../src/misc.c:1987
+#: ../src/misc.c:1978
 msgid "the Tag"
 msgstr "la etiqueta"
 
 #. Property of the search
-#: ../src/misc.c:1998 ../src/prefs.c:335
+#: ../src/misc.c:1989 ../src/prefs.c:335
 msgid "Case sensitive"
 msgstr "Sensible a capitalización"
 
-#: ../src/misc.c:2225
+#: ../src/misc.c:2216
 msgid "Ready to search…"
 msgstr "Listo para buscar…"
 
-#: ../src/misc.c:2445
+#: ../src/misc.c:2436
 #, c-format
 msgid "Found one file"
 msgid_plural "Found %d files"
 msgstr[0] "Se encontró un archivo"
 msgstr[1] "Se encontraron %d archivos"
 
-#: ../src/misc.c:2730
+#: ../src/misc.c:2721
 msgid "Load Filenames From a Text File"
 msgstr "Cargar nombres de archivos desde un archivo de texto"
 
-#: ../src/misc.c:2759
+#: ../src/misc.c:2750
 msgid "File:"
 msgstr "Archivo:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: ../src/misc.c:2778
+#: ../src/misc.c:2769
 msgid " Load "
 msgstr " Cargar "
 
-#: ../src/misc.c:2796
+#: ../src/misc.c:2787
 msgid "Content of Text File"
 msgstr "Contenido del archivo de texto"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2817 ../src/misc.c:2912
+#: ../src/misc.c:2808 ../src/misc.c:2903
 msgid "Insert a blank line before the selected line"
 msgstr "Insertar un línea en blanco antes de la línea seleccionada"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2826 ../src/misc.c:2921
+#: ../src/misc.c:2817 ../src/misc.c:2912
 msgid "Delete the selected line"
 msgstr "Eliminar la línea seleccionada"
 
 #. 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:2826 ../src/misc.c:2921 ../src/misc.c:3407
 msgid "Delete all blank lines"
 msgstr "Eliminar todas las líneas en blanco"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2847 ../src/misc.c:2942
+#: ../src/misc.c:2838 ../src/misc.c:2933
 msgid "Move up the selected line"
 msgstr "Subir la línea seleccionada"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2856 ../src/misc.c:2951
+#: ../src/misc.c:2847 ../src/misc.c:2942
 msgid "Move down the selected line"
 msgstr "Bajar la línea seleccionada"
 
 #. 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:2859 ../src/misc.c:2954 ../src/misc.c:3431
 msgid "Reload"
 msgstr "Recargar"
 
-#: ../src/misc.c:2890
+#: ../src/misc.c:2881
 msgid "List of Files"
 msgstr "Lista de archivos"
 
-#: ../src/misc.c:2985
+#: ../src/misc.c:2976
 msgid "Selected line:"
 msgstr "Línea seleccionada:"
 
-#: ../src/misc.c:3003
+#: ../src/misc.c:2994
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2970,34 +2939,34 @@ msgstr ""
 "analizador seleccionado actual se ejecutará (la ventana del analizador debe "
 "estar abierta)."
 
-#: ../src/misc.c:3090
+#: ../src/misc.c:3081
 #, c-format
 msgid "Cannot retrieve file info (%s)"
 msgstr "No se puede recuperar la información del archivo (%s)"
 
-#: ../src/misc.c:3152
+#: ../src/misc.c:3143
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "No se puede abrir el archivo «%s» (%s)"
 
-#: ../src/misc.c:3188
+#: ../src/misc.c:3179
 #, c-format
 msgid "Error reading file (%s)"
 msgstr "Error al leer el archivo (%s)"
 
-#: ../src/misc.c:3404
+#: ../src/misc.c:3395
 msgid "Insert a blank line"
 msgstr "Insertar una línea en blanco"
 
-#: ../src/misc.c:3410
+#: ../src/misc.c:3401
 msgid "Delete this line"
 msgstr "Eliminar esta línea"
 
-#: ../src/misc.c:3425
+#: ../src/misc.c:3416
 msgid "Move up this line"
 msgstr "Subir esta línea"
 
-#: ../src/misc.c:3431
+#: ../src/misc.c:3422
 msgid "Move down this line"
 msgstr "Bajar esta línea"
 
@@ -3102,175 +3071,184 @@ msgstr ""
 msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
 msgstr "Error: falló al abrir el archivo: «%s» como vorbis (%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 "Advertencia: el archivo Ogg Vorbis «%s» contiene una etiqueta ID3v2."
 
-#: ../src/picture.c:244 ../src/picture.c:269
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1257
 #, c-format
-msgid "Image file not loaded: %s"
-msgstr "No se cargó el archivo de imagen: %s"
+msgid "Error with 'loader_write': %s"
+msgstr "Error con «loader_write»: %s"
+
+#: ../src/ogg_tag.c:1050 ../src/picture.c:1180
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr "Error con «loader_close»: %s"
 
-#: ../src/picture.c:261
+#: ../src/picture.c:104
+#, c-format
+msgid "Image file not saved: %s"
+msgstr "No se guardó el archivo de imagen: %s"
+
+#: ../src/picture.c:154
 #, c-format
 msgid "Cannot open file: '%s'"
 msgstr "No se puede abrir el archivo: «%s»"
 
-#: ../src/picture.c:265
+#: ../src/picture.c:158
 msgid "Image File Error"
 msgstr "Error en el archivo de imagen"
 
-#: ../src/picture.c:276
+#: ../src/picture.c:162 ../src/picture.c:424
+#, c-format
+msgid "Image file not loaded: %s"
+msgstr "No se cargó el archivo de imagen: %s"
+
+#: ../src/picture.c:446
 msgid "Image file loaded"
 msgstr "Archivo de imagen cargado"
 
-#: ../src/picture.c:334
+#: ../src/picture.c:504
 msgid "Add Images"
 msgstr "Añadir imágenes"
 
-#: ../src/picture.c:344 ../src/picture.c:700
+#: ../src/picture.c:514 ../src/picture.c:874
 msgid "All Files"
 msgstr "Todos los archivos"
 
-#: ../src/picture.c:350 ../src/picture.c:706
+#: ../src/picture.c:520 ../src/picture.c:880
 msgid "PNG and JPEG"
 msgstr "PNG y JPEG"
 
-#: ../src/picture.c:477
+#: ../src/picture.c:651
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Propiedades de la imagen %d/%d"
 
-#: ../src/picture.c:501
+#: ../src/picture.c:675
 msgid "Image Type"
 msgstr "Tipo de imagen"
 
 #. Description of the picture
-#: ../src/picture.c:560
+#: ../src/picture.c:734
 msgid "Image Description:"
 msgstr "Descripción de la imagen:"
 
-#: ../src/picture.c:687
+#: ../src/picture.c:861
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Guardar la imagen %d/%d"
 
-#: ../src/picture.c:759
-#, c-format
-msgid "Image file not saved: %s"
-msgstr "No se guardó el archivo de imagen: %s"
-
-#: ../src/picture.c:827
+#: ../src/picture.c:1021
 msgid "JPEG image"
 msgstr "Imagen JPEG"
 
-#: ../src/picture.c:829
+#: ../src/picture.c:1023
 msgid "PNG image"
 msgstr "Imagen PNG"
 
-#: ../src/picture.c:831
+#: ../src/picture.c:1025
+msgid "GIF image"
+msgstr "Imagen GIF"
+
+#: ../src/picture.c:1027
 msgid "Unknown image"
 msgstr "Imagen desconocida"
 
-#: ../src/picture.c:843
+#: ../src/picture.c:1039
 msgid "32x32 pixel PNG file icon"
 msgstr "Icono de archivo PNG de 32x32 píxeles"
 
-#: ../src/picture.c:845
+#: ../src/picture.c:1041
 msgid "Other file icon"
 msgstr "Otro icono de archivo"
 
-#: ../src/picture.c:847
+#: ../src/picture.c:1043
 msgid "Cover (front)"
 msgstr "Carátula (frontal)"
 
-#: ../src/picture.c:849
+#: ../src/picture.c:1045
 msgid "Cover (back)"
 msgstr "Carátula (trasera)"
 
-#: ../src/picture.c:851
+#: ../src/picture.c:1047
 msgid "Leaflet page"
 msgstr "Página del folleto"
 
-#: ../src/picture.c:853
+#: ../src/picture.c:1049
 msgid "Media (e.g. label side of CD)"
 msgstr "Medios (ej. etiqueta lateral del CD)"
 
-#: ../src/picture.c:855
+#: ../src/picture.c:1051
 msgid "Lead artist/lead performer/soloist"
 msgstr "Artista líder/intérprete líder/solista"
 
-#: ../src/picture.c:857
+#: ../src/picture.c:1053
 msgid "Artist/performer"
 msgstr "Artista/intérprete"
 
-#: ../src/picture.c:859
+#: ../src/picture.c:1055
 msgid "Conductor"
 msgstr "Director"
 
-#: ../src/picture.c:861
+#: ../src/picture.c:1057
 msgid "Band/Orchestra"
 msgstr "Banda/Orquesta"
 
-#: ../src/picture.c:865
+#: ../src/picture.c:1061
 msgid "Lyricist/text writer"
 msgstr "Escritor de las letras/texto"
 
-#: ../src/picture.c:867
+#: ../src/picture.c:1063
 msgid "Recording location"
 msgstr "Lugar de grabación"
 
-#: ../src/picture.c:869
+#: ../src/picture.c:1065
 msgid "During recording"
 msgstr "Durante la grabación"
 
-#: ../src/picture.c:871
+#: ../src/picture.c:1067
 msgid "During performance"
 msgstr "Durante la ejecución"
 
-#: ../src/picture.c:873
+#: ../src/picture.c:1069
 msgid "Movie/video screen capture"
 msgstr "Captura de pantalla de la película/vídeo"
 
-#: ../src/picture.c:875
+#: ../src/picture.c:1071
 msgid "A bright colored fish"
 msgstr "Un pez brillante coloreado"
 
-#: ../src/picture.c:877
+#: ../src/picture.c:1073
 msgid "Illustration"
 msgstr "Ilustración"
 
-#: ../src/picture.c:879
+#: ../src/picture.c:1075
 msgid "Band/Artist logotype"
 msgstr "Logotipo de banda/artista"
 
-#: ../src/picture.c:881
+#: ../src/picture.c:1077
 msgid "Publisher/studio logotype"
 msgstr "Logotipo del editor/estudio"
 
-#: ../src/picture.c:885
+#: ../src/picture.c:1081
 msgid "Unknown image type"
 msgstr "Tipo de imagen desconocido"
 
-#: ../src/picture.c:915 ../src/picture.c:926
+#: ../src/picture.c:1111 ../src/picture.c:1122
 msgid "pixels"
 msgstr "píxeles"
 
-#: ../src/picture.c:916 ../src/picture.c:927
+#: ../src/picture.c:1112 ../src/picture.c:1123
 msgid "Type"
 msgstr "Tipo"
 
-#: ../src/picture.c:928
+#: ../src/picture.c:1124
 msgid "Description"
 msgstr "Descripción"
 
-#: ../src/picture.c:984
-#, c-format
-msgid "Error with 'loader_close': %s"
-msgstr "Error con «loader_close»: %s"
-
-#: ../src/picture.c:1044
+#: ../src/picture.c:1240
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
@@ -3278,26 +3256,21 @@ msgstr ""
 "No se puede mostrar la imagen, debido a que no se han leído suficientes "
 "datos para determinar cómo crear el búfer de la imagen."
 
-#: ../src/picture.c:1051
+#: ../src/picture.c:1247
 msgid "Cannot display the image"
 msgstr "No se puede mostrar la imagen"
 
-#: ../src/picture.c:1053
+#: ../src/picture.c:1249
 msgid ""
 "Not enough data has been read to determine how to create the image buffer."
 msgstr ""
 "No se han leído suficientes datos para determinar cómo crear el búfer de la "
 "imagen."
 
-#: ../src/picture.c:1055
+#: ../src/picture.c:1251
 msgid "Load Image File"
 msgstr "Cargar archivo de imagen"
 
-#: ../src/picture.c:1061
-#, c-format
-msgid "Error with 'loader_write': %s"
-msgstr "Error con «loader_write»: %s"
-
 #. Label
 #: ../src/prefs.c:152
 msgid "Default directory:"
@@ -4275,16 +4248,17 @@ msgstr "Nombre de usuario para el servidor proxy."
 msgid "User Password:"
 msgstr "Contraseña de usuario:"
 
-#: ../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 "Contraseña de usuario para el servidor proxy."
 
 #. Track Name list (CDDB results)
-#: ../src/prefs.c:1342
+#: ../src/prefs.c:1343
 msgid "Track Name List"
 msgstr "Lista de nombre de pista"
 
-#: ../src/prefs.c:1349
+#: ../src/prefs.c:1350
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4292,7 +4266,7 @@ msgstr ""
 "Seleccionar el archivo de sonido correspondiente (de acuerdo a la posición o "
 "DLM si estuviese activado abajo)"
 
-#: ../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."
@@ -4302,7 +4276,7 @@ msgstr ""
 "seleccionará también."
 
 #. 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)"
@@ -4313,15 +4287,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: ../src/prefs.c:1373
+#: ../src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Confirmación"
 
-#: ../src/prefs.c:1378
+#: ../src/prefs.c:1379
 msgid "Confirm exit from program"
 msgstr "Confirmar la salida del programa"
 
-#: ../src/prefs.c:1381
+#: ../src/prefs.c:1382
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4329,52 +4303,52 @@ msgstr ""
 "Si está activada, abre una caja de diálogo para confirmar si desea salir del "
 "programa."
 
-#: ../src/prefs.c:1384
+#: ../src/prefs.c:1385
 msgid "Confirm writing of file tag"
 msgstr "Confirmar escritura de la etiqueta del archivo"
 
-#: ../src/prefs.c:1388
+#: ../src/prefs.c:1389
 msgid "Confirm renaming of file"
 msgstr "Confirmar renombrado de archivo"
 
-#: ../src/prefs.c:1392
+#: ../src/prefs.c:1393
 msgid "Confirm deleting of file"
 msgstr "Confirmar eliminación de archivos"
 
-#: ../src/prefs.c:1396
+#: ../src/prefs.c:1397
 msgid "Confirm writing of playlist"
 msgstr "Confirmar escritura de la lista de reproducción"
 
-#: ../src/prefs.c:1400
+#: ../src/prefs.c:1401
 msgid "Confirm changing directory when there are unsaved changes"
 msgstr "Confirmar cambio de carpeta cuando hay cambios sin guardar"
 
 #. 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 "(Ejemplo : %.*d_-_Nombre_pista_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 "(Ejemplo: disc_%.*d_of_10/Nombre_pista_1.mp3)"
 
-#: ../src/prefs.c:1613 ../src/setting.c:904
+#: ../src/prefs.c:1614 ../src/setting.c:904
 msgid "Configuration saved"
 msgstr "Configuración guardada"
 
-#: ../src/prefs.c:1621
+#: ../src/prefs.c:1622
 msgid "Configuration unchanged"
 msgstr "Configuración sin cambios"
 
-#: ../src/prefs.c:1707
+#: ../src/prefs.c:1713
 msgid "The selected path for 'Default path to files' is invalid"
 msgstr ""
 "La ruta seleccionada para «Ruta a archivos predeterminada» no es válida"
 
-#: ../src/prefs.c:1708
+#: ../src/prefs.c:1715
 #, c-format
 msgid ""
 "Path: '%s'\n"
@@ -4383,16 +4357,16 @@ msgstr ""
 "Ruta: «%s»\n"
 "Error: %s"
 
-#: ../src/prefs.c:1709
+#: ../src/prefs.c:1717
 msgid "Invalid Path Error"
 msgstr "Error de ruta no válida"
 
-#: ../src/prefs.c:1823
+#: ../src/prefs.c:1831
 #, c-format
 msgid "The audio file player '%s' cannot be found"
 msgstr "No se puede encontrar el reproductor del archivo de sonido «%s»"
 
-#: ../src/prefs.c:1825
+#: ../src/prefs.c:1833
 msgid "Audio Player Error"
 msgstr "Error del reproductor de audio"
 
@@ -4400,78 +4374,78 @@ msgstr "Error del reproductor de audio"
 msgid "Fill Tag"
 msgstr "Rellenar etiqueta"
 
-#: ../src/scan.c:358
+#: ../src/scan.c:354
 #, c-format
 msgid "Cannot calculate CRC value of file (%s)"
 msgstr "No se puede calcular el valor CRC del archivo (%s)"
 
-#: ../src/scan.c:373
+#: ../src/scan.c:369
 msgid "Tag successfully scanned"
 msgstr "Etiqueta analizada con éxito"
 
-#: ../src/scan.c:375
+#: ../src/scan.c:371
 #, c-format
 msgid "Tag successfully scanned: %s"
 msgstr "Etiqueta analizada con éxito: %s"
 
-#: ../src/scan.c:416
+#: ../src/scan.c:412
 #, c-format
 msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
 msgstr ""
 "Etiqueta del analizador: extraño… la extensión «%s» no se encuentra en el "
 "nombre de archivo «%s»"
 
-#: ../src/scan.c:498 ../src/scan.c:527
+#: ../src/scan.c:494 ../src/scan.c:523
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Error al analizar: no se puede encontrar el separador «%s» entre «%s»"
 
-#: ../src/scan.c:714
+#: ../src/scan.c:710
 msgid "New filename successfully scanned"
 msgstr "Nombre de archivo nuevo analizado con éxito"
 
-#: ../src/scan.c:717
+#: ../src/scan.c:713
 #, c-format
 msgid "New filename successfully scanned: %s"
 msgstr "Nombre de archivo nuevo analizado con éxito: %s"
 
-#: ../src/scan.c:1817
+#: ../src/scan.c:1822
 #, c-format
 msgid "Error while processing fields: %s"
 msgstr "Error al procesar campos: %s"
 
 #. The window
-#: ../src/scan.c:2336
+#: ../src/scan.c:1992
 msgid "Tag and Filename Scan"
 msgstr "Análisis de etiquetas y nombres de archivo"
 
 #. TODO: Set related action to match AM_SCAN_FILES.
-#: ../src/scan.c:2345
+#: ../src/scan.c:2001
 msgid "Scan Files"
 msgstr "Analizar archivos"
 
 #. Option Menu
-#: ../src/scan.c:2373
+#: ../src/scan.c:2029
 msgid "Scanner:"
 msgstr "Analizador:"
 
-#: ../src/scan.c:2394
+#: ../src/scan.c:2050
 msgid "Select the type of scanner to use"
 msgstr "Seleccionar el tipo de analizador que usar"
 
-#: ../src/scan.c:2403
+#: ../src/scan.c:2059
 msgid "Scanner Preferences"
 msgstr "Preferencias del analizador"
 
-#: ../src/scan.c:2412
+#: ../src/scan.c:2068
 msgid "Show / Hide Masks Editor"
 msgstr "Mostrar u ocultar editor de máscaras"
 
-#: ../src/scan.c:2422
+#: ../src/scan.c:2078
 msgid "Show / Hide Legend"
 msgstr "Mostrar u ocultar leyenda"
 
-#: ../src/scan.c:2452
+#: ../src/scan.c:2108
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse filename and "
 "path. Used to fill in tag fields"
@@ -4481,15 +4455,15 @@ msgstr ""
 "etiquetas."
 
 #. Preview label
-#: ../src/scan.c:2476
+#: ../src/scan.c:2132
 msgid "Fill tag preview"
 msgstr "Rellenar vista previa de la etiqueta"
 
-#: ../src/scan.c:2506
+#: ../src/scan.c:2162
 msgid "Prefix mask with current path"
 msgstr "Máscara del prefijo con la ruta actual"
 
-#: ../src/scan.c:2520
+#: ../src/scan.c:2176
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4502,15 +4476,15 @@ msgstr ""
 "absoluta, de lo contrario es relativa a la ruta anterior."
 
 #. Preview label
-#: ../src/scan.c:2545
+#: ../src/scan.c:2201
 msgid "Rename file preview"
 msgstr "Renombrar vista previa del archivo"
 
-#: ../src/scan.c:2564
+#: ../src/scan.c:2220
 msgid "Select fields:"
 msgstr "Seleccionar campos:"
 
-#: ../src/scan.c:2567
+#: ../src/scan.c:2223
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those which interest you"
@@ -4519,134 +4493,134 @@ msgstr ""
 "Seleccione aquellos que le interesen"
 
 #. Advice for Translators: set the first letter of filename translated
-#: ../src/scan.c:2571
+#: ../src/scan.c:2227
 msgid "F"
 msgstr "F"
 
-#: ../src/scan.c:2573
+#: ../src/scan.c:2229
 msgid "Process filename field"
 msgstr "Procesar campo del nombre de archivo"
 
 #. Advice for Translators: set the first letter of title translated
-#: ../src/scan.c:2575
+#: ../src/scan.c:2231
 msgid "T"
 msgstr "T"
 
-#: ../src/scan.c:2576
+#: ../src/scan.c:2232
 msgid "Process title field"
 msgstr "Procesar campo de título"
 
 #. Advice for Translators: set the first letter of artist translated
-#: ../src/scan.c:2578
+#: ../src/scan.c:2234
 msgid "Ar"
 msgstr "Ar"
 
-#: ../src/scan.c:2579
+#: ../src/scan.c:2235
 msgid "Process file artist field"
 msgstr "Procesar campo de artista de archivo"
 
 #. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan.c:2581
+#: ../src/scan.c:2237
 msgid "AA"
 msgstr "AA"
 
-#: ../src/scan.c:2582
+#: ../src/scan.c:2238
 msgid "Process album artist field"
 msgstr "Procesar campo de artista del álbum"
 
 #. Advice for Translators: set the first letter of album translated
-#: ../src/scan.c:2584
+#: ../src/scan.c:2240
 msgid "Al"
 msgstr "Al"
 
-#: ../src/scan.c:2585
+#: ../src/scan.c:2241
 msgid "Process album field"
 msgstr "Procesar campo de álbum"
 
 #. Advice for Translators: set the first letter of genre translated
-#: ../src/scan.c:2587
+#: ../src/scan.c:2243
 msgid "G"
 msgstr "G"
 
-#: ../src/scan.c:2588
+#: ../src/scan.c:2244
 msgid "Process genre field"
 msgstr "Procesar campo de género"
 
 #. Advice for Translators: set the first letter of comment translated
-#: ../src/scan.c:2590
+#: ../src/scan.c:2246
 msgid "Cm"
 msgstr "Cm"
 
-#: ../src/scan.c:2591
+#: ../src/scan.c:2247
 msgid "Process comment field"
 msgstr "Procesar campo de comentario"
 
 #. Advice for Translators: set the first letter of composer translated
-#: ../src/scan.c:2593
+#: ../src/scan.c:2249
 msgid "Cp"
 msgstr "Cp"
 
-#: ../src/scan.c:2594
+#: ../src/scan.c:2250
 msgid "Process composer field"
 msgstr "Procesar campo del compositor"
 
 #. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan.c:2596
+#: ../src/scan.c:2252
 msgid "O"
 msgstr "O"
 
-#: ../src/scan.c:2597
+#: ../src/scan.c:2253
 msgid "Process original artist field"
 msgstr "Procesar campo de artista original"
 
 #. Advice for Translators: set the first letter of copyright translated
-#: ../src/scan.c:2599
+#: ../src/scan.c:2255
 msgid "Cr"
 msgstr "Cr"
 
-#: ../src/scan.c:2600
+#: ../src/scan.c:2256
 msgid "Process copyright field"
 msgstr "Procesar campo de copyright"
 
 #. Advice for Translators: set the first letter of URL translated
-#: ../src/scan.c:2602
+#: ../src/scan.c:2258
 msgid "U"
 msgstr "U"
 
-#: ../src/scan.c:2603
+#: ../src/scan.c:2259
 msgid "Process URL field"
 msgstr "Procesar campo de URL"
 
 #. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan.c:2605
+#: ../src/scan.c:2261
 msgid "E"
 msgstr "E"
 
-#: ../src/scan.c:2606
+#: ../src/scan.c:2262
 msgid "Process encoder name field"
 msgstr "Procesar campo de nombre de codificador"
 
-#: ../src/scan.c:2650
+#: ../src/scan.c:2306
 msgid "Invert selection"
 msgstr "Invertir la selección"
 
-#: ../src/scan.c:2657
+#: ../src/scan.c:2313
 msgid "Select/Unselect all"
 msgstr "Seleccionar/deseleccionar todo"
 
-#: ../src/scan.c:2672
+#: ../src/scan.c:2328
 msgid "Convert:"
 msgstr "Convertir:"
 
-#: ../src/scan.c:2674
+#: ../src/scan.c:2330
 msgid "to: "
 msgstr "a:"
 
-#: ../src/scan.c:2681
+#: ../src/scan.c:2337
 msgid "Do not convert"
 msgstr "No convertir"
 
-#: ../src/scan.c:2700
+#: ../src/scan.c:2356
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4654,7 +4628,7 @@ msgstr ""
 "El carácter de subrayado o la cadena «%20» se reemplazan por un espacio. "
 "Ejemplo, antes: «Texto%20En%20Una_Entrada», después: «Texto En Una Entrada»."
 
-#: ../src/scan.c:2703
+#: ../src/scan.c:2359
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4662,38 +4636,38 @@ msgstr ""
 "El carácter de espacio se reemplaza por un carácter de subrayado. Ejemplo, "
 "antes: «Texto En Una Entrada», después: «Texto_En_Una_Entrada»."
 
-#: ../src/scan.c:2706
+#: ../src/scan.c:2362
 msgid ""
 "Replace a string by another one. Note that the search is case sensitive."
 msgstr ""
 "Reemplazar una cadena por otra. Tenga en cuneta que la búsqueda es sensible "
 "a capitalización."
 
-#: ../src/scan.c:2713
+#: ../src/scan.c:2369
 msgid "Capitalize all"
 msgstr "Todo en mayúscula"
 
-#: ../src/scan.c:2715
+#: ../src/scan.c:2371
 msgid "Lowercase all"
 msgstr "Todo en minúscula"
 
-#: ../src/scan.c:2717
+#: ../src/scan.c:2373
 msgid "Capitalize first letter"
 msgstr "Primera letra en mayúscula"
 
-#: ../src/scan.c:2719
+#: ../src/scan.c:2375
 msgid "Capitalize the first letter of each word"
 msgstr "Primera letra de cada palabra en mayúscula"
 
-#: ../src/scan.c:2720
+#: ../src/scan.c:2376
 msgid "Detect Roman numerals"
 msgstr "Detectar números romanos"
 
-#: ../src/scan.c:2722
+#: ../src/scan.c:2378
 msgid "Do not change capitalization"
 msgstr "No cambiar la capitalización"
 
-#: ../src/scan.c:2744
+#: ../src/scan.c:2400
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4701,7 +4675,7 @@ msgstr ""
 "Convertir todas las palabras en todos los campos a mayúsculas. Ejemplo, "
 "antes: «Texto EN UNA entrada», después: «TEXTO EN UNA ENTRADA»."
 
-#: ../src/scan.c:2747
+#: ../src/scan.c:2403
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4709,7 +4683,7 @@ msgstr ""
 "Convertir todas las palabras en todos los campos a minúsculas. Ejemplo, "
 "antes: «TEXTO EN una entrada», después: «texto en una entrada»."
 
-#: ../src/scan.c:2750
+#: ../src/scan.c:2406
 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'."
@@ -4717,7 +4691,7 @@ msgstr ""
 "Convertir la inicial de la primera palabra en todos los campos a mayúsculas. "
 "Ejemplo, antes: «texto EN Una ENTRADA», después: «Texto en una entrada»."
 
-#: ../src/scan.c:2753
+#: ../src/scan.c:2409
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4725,7 +4699,7 @@ msgstr ""
 "Convertir la inicial de cada palabra en todos los campos a mayúsculas. "
 "Ejemplo, antes: «Texto en una ENTRADA», después: «Texto En Una Entrada»."
 
-#: ../src/scan.c:2756
+#: ../src/scan.c:2412
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -4733,19 +4707,19 @@ msgstr ""
 "Forzar a convertir a mayúsculas los números romanos. Ejemplo, antes: «ix. "
 "texto en una entrada», después: «IX. Texto En Una Entrada»."
 
-#: ../src/scan.c:2764
+#: ../src/scan.c:2420
 msgid "Insert a space before uppercase letters"
 msgstr "Insertar un espacio antes de las letras en mayúscula"
 
-#: ../src/scan.c:2766
+#: ../src/scan.c:2422
 msgid "Remove duplicate spaces and underscores"
 msgstr "Quitar espacios duplicados y subrayados"
 
-#: ../src/scan.c:2768
+#: ../src/scan.c:2424
 msgid "Do not change word separators"
 msgstr "No cambiar los separadores de palabra"
 
-#: ../src/scan.c:2782
+#: ../src/scan.c:2438
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4753,7 +4727,7 @@ msgstr ""
 "Todos los espacios entre palabras se eliminan. Ejemplo, antes: «Texto En Una "
 "Entrada», después: «TextoEnUnaEntrada»."
 
-#: ../src/scan.c:2785
+#: ../src/scan.c:2441
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4761,7 +4735,7 @@ msgstr ""
 "Se inserta un espacio antes de cada letra mayúscula. Ejemplo, antes: "
 "«TextoEnUnaEntrada», después: «Texto En Una Entrada»."
 
-#: ../src/scan.c:2788
+#: ../src/scan.c:2444
 msgid ""
 "Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4772,141 +4746,141 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2795
+#: ../src/scan.c:2451
 msgid "Legend"
 msgstr "Leyenda"
 
-#: ../src/scan.c:2801
+#: ../src/scan.c:2457
 #, c-format
 msgid "%a: artist"
 msgstr "%a: artista"
 
-#: ../src/scan.c:2804
+#: ../src/scan.c:2460
 msgid "%z: album artist"
 msgstr "%z: artista del álbum"
 
-#: ../src/scan.c:2807
+#: ../src/scan.c:2463
 msgid "%b: album"
 msgstr "%b: álbum"
 
-#: ../src/scan.c:2810
+#: ../src/scan.c:2466
 #, c-format
 msgid "%c: comment"
 msgstr "%c: comentario"
 
-#: ../src/scan.c:2813
+#: ../src/scan.c:2469
 #, c-format
 msgid "%p: composer"
 msgstr "%p: compositor"
 
-#: ../src/scan.c:2816
+#: ../src/scan.c:2472
 msgid "%r: copyright"
 msgstr "%r: copyright"
 
-#: ../src/scan.c:2819
+#: ../src/scan.c:2475
 #, c-format
 msgid "%d: disc number"
 msgstr "%d: número de disco"
 
-#: ../src/scan.c:2822
+#: ../src/scan.c:2478
 #, c-format
 msgid "%e: encoded by"
 msgstr "%e: codificado por"
 
-#: ../src/scan.c:2825
+#: ../src/scan.c:2481
 #, c-format
 msgid "%g: genre"
 msgstr "%g: género"
 
-#: ../src/scan.c:2828
+#: ../src/scan.c:2484
 #, c-format
 msgid "%i: ignored"
 msgstr "%i: ignorado"
 
-#: ../src/scan.c:2831
+#: ../src/scan.c:2487
 msgid "%l: number of tracks"
 msgstr "%l: número de pistas"
 
-#: ../src/scan.c:2834
+#: ../src/scan.c:2490
 #, c-format
 msgid "%o: orig. artist"
 msgstr "%o: artista orig."
 
-#: ../src/scan.c:2837
+#: ../src/scan.c:2493
 #, c-format
 msgid "%n: track"
 msgstr "%n: pista"
 
-#: ../src/scan.c:2840
+#: ../src/scan.c:2496
 msgid "%t: title"
 msgstr "%t: título"
 
-#: ../src/scan.c:2843
+#: ../src/scan.c:2499
 #, c-format
 msgid "%u: URL"
 msgstr "%u: URL"
 
-#: ../src/scan.c:2846
+#: ../src/scan.c:2502
 #, c-format
 msgid "%x: number of discs"
 msgstr "%x: número de discos"
 
-#: ../src/scan.c:2849
+#: ../src/scan.c:2505
 msgid "%y: year"
 msgstr "%y: año"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2856
+#: ../src/scan.c:2512
 msgid "Mask Editor"
 msgstr "Editor de máscara"
 
-#: ../src/scan.c:2910
+#: ../src/scan.c:2566
 msgid "Create New Mask"
 msgstr "Crear nueva máscara"
 
-#: ../src/scan.c:2920
+#: ../src/scan.c:2576
 msgid "Move Up this Mask"
 msgstr "Subir esta máscara"
 
-#: ../src/scan.c:2930
+#: ../src/scan.c:2586
 msgid "Move Down this Mask"
 msgstr "Bajar esta máscara"
 
-#: ../src/scan.c:2940
+#: ../src/scan.c:2596
 msgid "Duplicate Mask"
 msgstr "Duplicar máscara"
 
-#: ../src/scan.c:2950
+#: ../src/scan.c:2606
 msgid "Add Default Masks"
 msgstr "Añadir máscaras predeterminadas"
 
-#: ../src/scan.c:2960
+#: ../src/scan.c:2616
 msgid "Remove Mask"
 msgstr "Eliminar máscara"
 
-#: ../src/scan.c:2970
+#: ../src/scan.c:2626
 msgid "Save Masks"
 msgstr "Guardar máscaras"
 
-#: ../src/scan.c:3550
+#: ../src/scan.c:3206
 msgid "New_mask"
 msgstr "Máscara_nueva"
 
-#: ../src/scan.c:3589
+#: ../src/scan.c:3245
 msgid "Copy: No row selected"
 msgstr "Copiar: ninguna fila seleccionada"
 
-#: ../src/scan.c:3682
+#: ../src/scan.c:3338
 msgid "Remove: No row selected"
 msgstr "Quitar: ninguna fila seleccionada"
 
-#: ../src/scan.c:3729
+#: ../src/scan.c:3385
 msgid "Move Up: No row selected"
 msgstr "Subir: ninguna fila seleccionada"
 
-#: ../src/scan.c:3773
+#: ../src/scan.c:3429
 msgid "Move Down: No row selected"
 msgstr "Bajar: ninguna fila seleccionada"
 
@@ -4920,117 +4894,140 @@ msgstr "Error: no se puede escribir el archivo de configuración: %s (%s)"
 msgid "Error while writing configuration file: %s"
 msgstr "Error al escribir el archivo de configuración: %s"
 
-#: ../src/setting.c:1104
+#: ../src/setting.c:1100
 #, c-format
 msgid "Cannot open configuration file '%s' (%s)"
 msgstr "No se puede abrir el archivo de configuración «%s» (%s)"
 
-#: ../src/setting.c:1106
+#: ../src/setting.c:1102
 msgid "Loading default configuration"
 msgstr "Cargando configuración predeterminada"
 
-#: ../src/setting.c:1147
+#: ../src/setting.c:1143
 #, c-format
 msgid "Cannot create or open file '%s' (%s)"
 msgstr "No se puede crear o abrir el archivo «%s» (%s)"
 
-#: ../src/setting.c:1207
+#: ../src/setting.c:1203
 #, c-format
 msgid "Error: Cannot write list to file: %s (%s)"
 msgstr "Errot: no se puede escribir la lista al archivo: %s (%s)"
 
-#: ../src/setting.c:1225
+#: ../src/setting.c:1221
 #, c-format
 msgid "Error while writing list file: %s"
 msgstr "Error al escribir el archivo de lista: %s"
 
 #. Fall back to defaults
-#: ../src/setting.c:1305
+#: ../src/setting.c:1301
 msgid "Loading default 'Fill Tag' masks…"
 msgstr "Cargando máscaras predeterminadas de «Rellenar etiqueta»…"
 
 #. Fall back to defaults
-#: ../src/setting.c:1335
+#: ../src/setting.c:1331
 msgid "Loading default 'Rename File' masks…"
 msgstr "Cargando máscaras predeterminadas de «Renombrar archivo»…"
 
 #. Fall back to defaults
-#: ../src/setting.c:1361
+#: ../src/setting.c:1357
 msgid "Loading default 'Rename Directory' masks…"
 msgstr "Cargando máscaras predeterminadas de «Renombrar carpeta»…"
 
-#: ../src/setting.c:1572
+#: ../src/setting.c:1568
 #, c-format
 msgid "Migrating configuration from directory '%s' to '%s'"
 msgstr "Migrando configuración de la carpeta «%s» a «%s»"
 
-#: ../src/setting.c:1596
+#: ../src/setting.c:1592
 #, c-format
 msgid "Failed to migrate configuration file '%s'"
 msgstr "Falló al migrar el archivo de configuración «%s»"
 
-#: ../src/setting.c:1633
+#: ../src/setting.c:1629
 #, c-format
 msgid "Error: Cannot create directory '%s' (%s)"
 msgstr "Error: no se puede crear la carpeta «%s» (%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 "La DLL «%s» aún no está cargada. Intentar cargarla…"
+#~ msgid "The program '%s' cannot be found"
+#~ msgstr "No se puede encontrar el programa «%s»"
 
-#. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: ../src/win32/win32dep.c:130
-#, c-format
-msgid "DLL '%s' could not be loaded"
-msgstr "La DLL «%s» no se puede cargar"
+#~ msgid "Cannot execute ‘%s’ (%s)"
+#~ msgstr "No se puede ejecutar «%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 "Esta versión de «%s» contiene «%s»"
+#~ msgid "Cannot fork another process\n"
+#~ msgstr "No se puede crear otro proceso\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 "La función «%s» no se encuentra en la DLL «%s»"
+#~ msgid "EasyTAG version %s: Abnormal exit (PID: %d)"
+#~ msgstr "EasyTAG versión %s: salida anormal (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 "Carpeta de configuración de EasyTAG: «%s»"
+#~ msgid "Received signal '%s' (%d)"
+#~ msgstr "Señal recibida «%s» (%d)"
 
-#. Log_Print(_("weasytag_init start..."));
-#: ../src/win32/win32dep.c:472
-#, c-format
-msgid "weasytag_init start..."
-msgstr "inicio de weasytag_init…"
+#~ 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 ""
+#~ "Probablemente ha encontrado un error en EasyTAG. Por favor, envíe un "
+#~ "informe de error con una traza inversa GDB («gdb easytag core», después "
+#~ "«bt» y «l») e información sobre cómo reproducirlo en: %s"
 
-#. 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 "GLib versión: %u.%u.%u\n"
+#~ msgid "EasyTAG version %s: Abnormal exit (PID: %d)."
+#~ msgstr "EasyTAG versión %s: salida anormal (PID: %d)."
 
-#. Set Environmental Variables
-#. Log_Print(_("weasytag_init end..."));
-#: ../src/win32/win32dep.c:496
-#, c-format
-msgid "weasytag_init end..."
-msgstr "fin de weasytag_init…"
+#~ msgid "Cannot change the permissions of file '%s' (%s)"
+#~ msgstr "No se pueden cambiar los permisos del archivo «%s» (%s)"
 
-#. Log_Print(_("Audio player: '%s'"), player);
-#: ../src/win32/win32dep.c:620
-#, c-format
-msgid "Audio player: '%s'"
-msgstr "Reproductor de sonido: «%s»"
+#~ msgid "No audio player defined"
+#~ msgstr "No se ha definido un reproductor de sonido"
+
+#~ msgid "Audio Player Warning"
+#~ msgstr "Advertencia del reproductor de sonido"
+
+#~ msgid "Cannot fork another process"
+#~ msgstr "No se puede crear otro proceso"
+
+#~ 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 "La DLL «%s» aún no está cargada. Intentar cargarla…"
+
+#~ msgid "DLL '%s' could not be loaded"
+#~ msgstr "La DLL «%s» no se puede cargar"
+
+#~ msgid "This version of '%s' contains '%s'"
+#~ msgstr "Esta versión de «%s» contiene «%s»"
+
+#~ msgid "Function '%s' not found in DLL '%s'"
+#~ msgstr "La función «%s» no se encuentra en la DLL «%s»"
+
+#~ msgid "EasyTAG settings directory: '%s'"
+#~ msgstr "Carpeta de configuración de EasyTAG: «%s»"
+
+#~ msgid "weasytag_init start..."
+#~ msgstr "inicio de weasytag_init…"
+
+#~ msgid "GLib version: %u.%u.%u\n"
+#~ msgstr "GLib versión: %u.%u.%u\n"
+
+#~ msgid "weasytag_init end..."
+#~ msgstr "fin de weasytag_init…"
+
+#~ msgid "Audio player: '%s'"
+#~ msgstr "Reproductor de sonido: «%s»"
 
 #~ msgid "Cannot execute %s (error %d)\n"
 #~ msgstr "No se puede ejecutar «%s» (error %d)\n"
diff --git a/po/fr.po b/po/fr.po
index 7c66e37..9b977b0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,1368 +3,1311 @@
 # This file is distributed under the same license as the EasyTAG package.
 # Jérôme Couderc <j.couderc at ifrance.com>, 2000, 2001, 2002, 2004, 2005.
 # Jérôme Couderc <easytag at gmail.com>, 2005, 2006, 2007, 2008.
+# Alain Lojewski <allomervan at gmail.com>, 2012.
+# Alexandre Franke <alexandre.franke at gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG 2.1.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 21:49+0000\n"
-"PO-Revision-Date: 2008-07-12 10:41+0100\n"
-"Last-Translator: Jerome Couderc <easytag at gmail.com>\n"
-"Language-Team: French <fr at li.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=easytag&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-04-06 23:47+0000\n"
+"PO-Revision-Date: 2014-04-07 01:52+0200\n"
+"Last-Translator: Alexandre Franke <alexandre.franke at gmail.com>\n"
+"Language-Team: GNOME French Team <gnomefr at traduc.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: ../easytag.desktop.in.h:1
-msgid "Sound File Metadata Editor"
-msgstr "Éditeur de Métadonnées de Fichier Son"
-
-#: ../easytag.desktop.in.h:2
-msgid "Edit sound file metadata"
-msgstr "Modifier les métadonnées de fichiers son"
+#: ../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 "Afficher et modifier les étiquettes pour les fichiers MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg "
+"Vorbis, MusePack, Monkey's Audio et WavPack."
 
-#: ../easytag.desktop.in.h:3
-msgid "mp3;tag;audio;"
+#: ../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 ""
+"Rechercher les albums dans les bases de données en ligne, modifier les étiquettes en masse, créer des listes de lecture et renommer une collection de fichier."
 
-#: ../src/about.c:139
+#: ../data/easytag.appdata.xml.in.h:3
 msgid ""
-"    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
-"Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
-"GTK+ interface makes tagging easier under GNU/Linux."
+"A simple and nice GTK+ interface makes tagging easier under GNU/Linux and "
+"Windows."
 msgstr ""
-"    EasyTAG est un utilitaire pour visualiser et éditer les tags des "
-"fichiers MP3, MP2, FLAC, Ogg Vorbis, MP4/AAC, MusePack et Monkey's Audio. "
-"Son interface GTK+ simple et agréable rend le marquage plus simple sous GNU/"
-"Linux."
-
-#: ../src/about.c:147 ../src/about.c:148 ../src/about.c:149 ../src/about.c:150
-#: ../src/about.c:181
-msgid "(German translation)"
-msgstr "(traduction Allemande)"
-
-#: ../src/about.c:151 ../src/about.c:152
-msgid "(Russian translation)"
-msgstr "(traduction Russe)"
-
-#: ../src/about.c:153 ../src/about.c:154
-msgid "(Dutch translation)"
-msgstr "(traduction Hollandaise)"
-
-#: ../src/about.c:155 ../src/about.c:156 ../src/about.c:157
-msgid "(Swedish translation)"
-msgstr "(traduction Suédoise)"
-
-#: ../src/about.c:158 ../src/about.c:159 ../src/about.c:160
-msgid "(Hungarian translation)"
-msgstr "(traduction Hongroise)"
-
-#: ../src/about.c:161 ../src/about.c:162
-msgid "(Italian translation)"
-msgstr "(traduction Italienne)"
-
-#: ../src/about.c:163
-msgid "(Japanese translation)"
-msgstr "(traduction Japonaise)"
-
-#: ../src/about.c:164 ../src/about.c:165
-msgid "(Ukrainian translation)"
-msgstr "(traduction Ukrainienne)"
-
-#: ../src/about.c:166 ../src/about.c:167
-msgid "(Czech translation)"
-msgstr "(traduction Tchèque)"
-
-#: ../src/about.c:168 ../src/about.c:169 ../src/about.c:170
-msgid "(Spanish translation)"
-msgstr "(traduction Espagnole)"
-
-#: ../src/about.c:171
-msgid "(Polish translation)"
-msgstr "(traduction Polonaise)"
-
-#: ../src/about.c:172
-msgid "(Romanian translation)"
-msgstr "(traduction Roumaine)"
-
-#: ../src/about.c:173
-msgid "(Danish translation)"
-msgstr "(traduction Danoise)"
-
-#: ../src/about.c:174
-msgid "(Greek translation)"
-msgstr "(traduction Grecque)"
-
-#: ../src/about.c:175
-msgid "(Brazilian Portuguese translation)"
-msgstr "(traduction Portugais Brésilien)"
-
-#: ../src/about.c:176
-msgid "(Bulgarian translation)"
-msgstr "(traduction Bulgare)"
-
-#: ../src/about.c:177
-msgid "(Chinese translation)"
-msgstr "(traduction Chinoise)"
-
-#: ../src/about.c:178
-msgid "(Chinese (Taiwan) translation)"
-msgstr "(traduction Chinoise (Taïwan))"
-
-#: ../src/about.c:179
-msgid "(Hebrew translation)"
-msgstr "(traduction Hébraïque)"
-
-#: ../src/about.c:180
-msgid "(Serbian translation)"
-msgstr "(traduction Serbe)"
-
-#: ../src/about.c:182
-#, fuzzy
-msgid "(Lithuanian translation)"
-msgstr "(traduction Italienne)"
-
-#: ../src/about.c:241
-msgid "Extension Name"
-msgstr "Nom de l'extension"
-
-#: ../src/about.c:242
-msgid "Status"
-msgstr "Statut"
-
-#: ../src/about.c:243 ../src/browser.c:3035 ../src/misc.c:1927
-#: ../src/prefs.c:669
-msgid "Comment"
-msgstr "Comment."
-
-#. Config
-#: ../src/about.c:260
-#, fuzzy
-msgid "About…"
-msgstr "A Propos"
-
-#.
-#. * Tab for common information
-#.
-#: ../src/about.c:278 ../src/bar.c:244
-msgid "About"
-msgstr "A Propos"
+"Une interface simple et agréable en GTK+ qui rend l'étiquetage plus facile sous GNU/Linux et Windows."
 
-#: ../src/about.c:312
-#, c-format
-msgid "(compiled: %s)"
-msgstr "(compilé le: %s)"
-
-#: ../src/about.c:316
-#, c-format
-msgid "(using: GTK+ %d.%d.%d)"
-msgstr "(utilisé: GTK+ %d.%d.%d)"
-
-#: ../src/about.c:324
-#, c-format
-msgid "Author: %s"
-msgstr "Auteur : %s"
-
-#: ../src/about.c:328 ../src/easytag.c:230
-#, c-format
-msgid "E-mail: %s"
-msgstr "E-mail : %s"
-
-#: ../src/about.c:334
-msgid "Web Page: "
-msgstr "Page Web : "
-
-#: ../src/about.c:347
-msgid "Description:"
-msgstr "Description :"
-
-#.
-#. * Tab for extensions
-#.
-#: ../src/about.c:363
-msgid "Extensions"
-msgstr "Extensions"
-
-#: ../src/about.c:429
-msgid "MP3 file support"
-msgstr "Support des fichiers MP3"
-
-#: ../src/about.c:432 ../src/about.c:462 ../src/about.c:474 ../src/about.c:490
-#: ../src/about.c:503 ../src/about.c:515
-msgid "enabled"
-msgstr "activé"
-
-#: ../src/about.c:436 ../src/about.c:452 ../src/about.c:465 ../src/about.c:477
-#: ../src/about.c:494 ../src/about.c:506 ../src/about.c:518
-msgid "disabled"
-msgstr "désactivé"
-
-#: ../src/about.c:445
-msgid "ID3v2.3 tags writting support"
-msgstr "Support des tags ID3v2.3"
-
-#: ../src/about.c:448
-msgid "available"
-msgstr "disponible"
-
-#: ../src/about.c:459
-msgid "Ogg Vorbis file support"
-msgstr "Support des fichiers Ogg Vorbis"
-
-#: ../src/about.c:471
-msgid "Speex file support"
-msgstr "Support des fichiers Speex"
+#: ../data/easytag.desktop.in.h:1
+msgid "Sound File Metadata Editor"
+msgstr "Éditeur de métadonnées des fichiers audio"
 
-#: ../src/about.c:487
-msgid "FLAC file support"
-msgstr "Support des fichiers FLAC"
+#: ../data/easytag.desktop.in.h:2
+msgid "Edit sound file metadata"
+msgstr "Modifier les métadonnées des fichiers audio"
 
-#: ../src/about.c:500
-msgid "MP4/AAC file support"
-msgstr "Support des fichiers MP4/AAC"
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: ../data/easytag.desktop.in.h:4
+msgid "mp3;tag;audio;"
+msgstr "mp3;étiquettes;audio;"
 
-#: ../src/about.c:512
-msgid "WavPack file support"
-msgstr "Support des fichiers WavPack"
+#: ../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 "
+"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 ""
+"Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le "
+"modifier au titre des clauses de la Licence Publique Générale GNU, telle que "
+"publiée par la Free Software Foundation ; soit la version 2 de la Licence, "
+"ou (à votre discrétion) une version ultérieure quelconque.\n"
+"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE "
+"GARANTIE ; sans même une garantie implicite de COMMERCIABILITÉ ou DE "
+"CONFORMITÉ À UNE UTILISATION PARTICULIÈRE. Voir la Licence Publique Générale "
+"GNU pour plus de détails.\n"
+"\n"
+"Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU "
+"avec ce programme ; si ce n'est pas le cas, écrivez à la Free Software "
+"Foundation Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#.
-#. * Tab for thanks
-#.
-#: ../src/about.c:527
-msgid "Thanks"
-msgstr "Remerciements"
+#. Translators: put your own name here to appear in the about dialog.
+#: ../src/about.c:106
+msgid "translator-credits"
+msgstr ""
+"Alain Lojewski <allomervan at gmail.com>, 2012.\n"
+"Alexandre Franke <alexandre.franke at gmail.com>, 2014."
 
-#: ../src/about.c:547
-msgid "Translations:\n"
-msgstr "Traductions :\n"
+#: ../src/about.c:116
+msgid "View and edit tags in audio files"
+msgstr "Afficher et modifier les étiquettes des fichiers audio"
 
-#: ../src/about.c:577
-msgid "General:\n"
-msgstr "Général :\n"
+#. 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
+#, c-format
+msgid "Error while opening file: '%s' (%s)."
+msgstr "Erreur lors de l'ouverture du fichier : « %s » (%s)."
 
-#: ../src/about.c:594
-msgid "Changes"
-msgstr "Historique"
+#: ../src/application.c:37
+msgid "Print the version and exit"
+msgstr "Affiche la version et sort"
 
-#: ../src/about.c:616
+#: ../src/application.c:89
 #, c-format
-msgid "Can't open file '%s' (%s)\n"
-msgstr "Impossible d'ouvrir le fichier '%s' (%s)\n"
+msgid "Website: %s"
+msgstr "Site Web : %s"
 
-#. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: ../src/ape_tag.c:74 ../src/et_core.c:4515 ../src/flac_header.c:126
-#: ../src/id3_tag.c:145 ../src/id3_tag.c:1205 ../src/id3_tag.c:1284
-#: ../src/misc.c:1770 ../src/mp4_header.c:211 ../src/mp4_header.c:220
-#: ../src/mp4_tag.c:98 ../src/mp4_tag.c:109 ../src/mp4_tag.c:281
-#: ../src/mp4_tag.c:290 ../src/mpeg_header.c:209 ../src/ogg_header.c:82
-#: ../src/ogg_header.c:186 ../src/ogg_tag.c:146 ../src/ogg_tag.c:657
-#, c-format
-msgid "ERROR while opening file: '%s' (%s)."
-msgstr "ERREUR lors de l'ouverture du fichier: '%s' (%s)."
+#: ../src/application.c:98
+msgid "- Tag and rename audio files"
+msgstr "- Étiqueter et renommer des fichiers audio"
 
 #.
 #. * Main Menu Actions
 #.
-#: ../src/bar.c:148
+#: ../src/bar.c:155
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../src/bar.c:149
-msgid "Sort list by tag"
-msgstr "Classer liste par tag"
+#: ../src/bar.c:156
+msgid "Sort List by Tag"
+msgstr "Trier la liste par étiquette"
 
-#: ../src/bar.c:150
-msgid "Sort list by property"
-msgstr "Classer liste par propriétés"
+#: ../src/bar.c:159
+msgid "Sort List by Property"
+msgstr "Trier la liste par propriété"
 
-#: ../src/bar.c:151
+#: ../src/bar.c:160
 msgid "Ascending by filename"
 msgstr "Ordre croissant des noms de fichiers"
 
-#: ../src/bar.c:152
+#: ../src/bar.c:161
 msgid "Descending by filename"
 msgstr "Ordre décroissant des noms de fichiers"
 
-#: ../src/bar.c:153
+#: ../src/bar.c:162
 msgid "Ascending by creation date"
 msgstr "Ordre croissant des dates de création"
 
-#: ../src/bar.c:154
+#: ../src/bar.c:163
 msgid "Descending by creation date"
 msgstr "Ordre décroissant des dates de création"
 
-#: ../src/bar.c:155
+#: ../src/bar.c:164
 msgid "Ascending by track number"
 msgstr "Ordre croissant des pistes"
 
-#: ../src/bar.c:156
+#: ../src/bar.c:165
 msgid "Descending by track number"
 msgstr "Ordre décroissant des pistes"
 
-#: ../src/bar.c:157
+#: ../src/bar.c:166
 msgid "Ascending by title"
 msgstr "Ordre croissant des titres"
 
-#: ../src/bar.c:158
+#: ../src/bar.c:167
 msgid "Descending by title"
 msgstr "Ordre décroissant des titres"
 
-#: ../src/bar.c:159
+#: ../src/bar.c:168
 msgid "Ascending by artist"
 msgstr "Ordre croissant des artistes"
 
-#: ../src/bar.c:160
+#: ../src/bar.c:169
 msgid "Descending by artist"
 msgstr "Ordre décroissant des artistes"
 
-#: ../src/bar.c:161
-#, fuzzy
+#: ../src/bar.c:170
 msgid "Ascending by album artist"
-msgstr "Ordre croissant des artistes"
+msgstr "Ordre croissant des artistes de l'album"
 
-#: ../src/bar.c:162
-#, fuzzy
+#: ../src/bar.c:171
 msgid "Descending by album artist"
-msgstr "Ordre décroissant des artistes"
+msgstr "Ordre décroissant des artistes de l'album"
 
-#: ../src/bar.c:163
+#: ../src/bar.c:172
 msgid "Ascending by album"
 msgstr "Ordre croissant des albums"
 
-#: ../src/bar.c:164
+#: ../src/bar.c:173
 msgid "Descending by album"
 msgstr "Ordre décroissant des albums"
 
-#: ../src/bar.c:165
+#: ../src/bar.c:174
 msgid "Ascending by year"
 msgstr "Ordre croissant des années"
 
-#: ../src/bar.c:166
+#: ../src/bar.c:175
 msgid "Descending by year"
 msgstr "Ordre décroissant des années"
 
-#: ../src/bar.c:167
+#: ../src/bar.c:176
 msgid "Ascending by genre"
 msgstr "Ordre croissant des genres"
 
-#: ../src/bar.c:168
+#: ../src/bar.c:177
 msgid "Descending by genre"
 msgstr "Ordre décroissant des genres"
 
-#: ../src/bar.c:169
+#: ../src/bar.c:178
 msgid "Ascending by comment"
 msgstr "Ordre croissant des commentaires"
 
-#: ../src/bar.c:170
+#: ../src/bar.c:179
 msgid "Descending by comment"
 msgstr "Ordre décroissant des commentaires"
 
-#: ../src/bar.c:171
+#: ../src/bar.c:180
 msgid "Ascending by composer"
 msgstr "Ordre croissant des compositeurs"
 
-#: ../src/bar.c:172
+#: ../src/bar.c:181
 msgid "Descending by composer"
 msgstr "Ordre décroissant des compositeurs"
 
-#: ../src/bar.c:173
+#: ../src/bar.c:182
 msgid "Ascending by original artist"
 msgstr "Ordre croissant des artistes originaux"
 
-#: ../src/bar.c:174
+#: ../src/bar.c:183
 msgid "Descending by original artist"
 msgstr "Ordre décroissant des artistes originaux"
 
-#: ../src/bar.c:175
+#: ../src/bar.c:184
 msgid "Ascending by copyright"
 msgstr "Ordre croissant des copyrights"
 
-#: ../src/bar.c:176
+#: ../src/bar.c:185
 msgid "Descending by copyright"
 msgstr "Ordre décroissant des copyrights"
 
-#: ../src/bar.c:177
+#: ../src/bar.c:186
 msgid "Ascending by URL"
 msgstr "Ordre croissant des URL"
 
-#: ../src/bar.c:178
+#: ../src/bar.c:187
 msgid "Descending by URL"
 msgstr "Ordre décroissant des URL"
 
-#: ../src/bar.c:179
+#. 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:190
 msgid "Ascending by encoder name"
 msgstr "Ordre croissant des noms d'encodeur"
 
-#: ../src/bar.c:180
+#. 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:193
 msgid "Descending by encoder name"
 msgstr "Ordre décroissant des noms d'encodeur"
 
-#: ../src/bar.c:181
+#: ../src/bar.c:194
 msgid "Ascending by file type"
 msgstr "Ordre croissant des types de fichiers"
 
-#: ../src/bar.c:182
+#: ../src/bar.c:195
 msgid "Descending by file type"
 msgstr "Ordre décroissant des types de fichiers"
 
-#: ../src/bar.c:183
+#: ../src/bar.c:196
 msgid "Ascending by file size"
-msgstr "Ordre croissant de taille des fichiers"
+msgstr "Ordre croissant des tailles de fichiers"
 
-#: ../src/bar.c:184
+#: ../src/bar.c:197
 msgid "Descending by file size"
-msgstr "Ordre décroissant de taille des fichiers"
+msgstr "Ordre décroissant des tailles de fichiers"
 
-#: ../src/bar.c:185
+#: ../src/bar.c:198
 msgid "Ascending by duration"
 msgstr "Ordre croissant des durées"
 
-#: ../src/bar.c:186
+#: ../src/bar.c:199
 msgid "Descending by duration"
 msgstr "Ordre décroissant des durées"
 
-#: ../src/bar.c:187
+#: ../src/bar.c:200
 msgid "Ascending by bitrate"
 msgstr "Ordre croissant des débits"
 
-#: ../src/bar.c:188
+#: ../src/bar.c:201
 msgid "Descending by bitrate"
 msgstr "Ordre décroissant des débits"
 
-#: ../src/bar.c:189
+#: ../src/bar.c:202
 msgid "Ascending by samplerate"
 msgstr "Ordre croissant des fréquences"
 
-#: ../src/bar.c:190
+#: ../src/bar.c:203
 msgid "Descending by samplerate"
 msgstr "Ordre décroissant des fréquences"
 
-#: ../src/bar.c:192
-#, fuzzy
-msgid "Open File(s) with…"
-msgstr "Ouvrir le(s) Fichier(s) avec ..."
+#: ../src/bar.c:205
+msgid "Open Files With…"
+msgstr "Ouvrir les fichiers avec…"
 
-#: ../src/bar.c:193 ../src/cddb.c:324
-msgid "Select All Files"
-msgstr "Sélectionner tous les Fichiers"
+#: ../src/bar.c:206
+msgid "Run a command on the selected files"
+msgstr "Lancer une commande sur les fichiers sélectionnés"
 
-#: ../src/bar.c:194
-msgid "Unselect All Files"
-msgstr "Désélectionner tous les Fichiers"
+#: ../src/bar.c:209
+msgid "Select all"
+msgstr "Tout sélectionner"
 
-#: ../src/bar.c:195 ../src/cddb.c:331
-msgid "Invert Files Selection"
-msgstr "Inverser la Sélection des Fichiers"
+#: ../src/bar.c:210
+msgid "Unselect All"
+msgstr "Désélectionner tout"
 
-#: ../src/bar.c:196
-msgid "Delete File(s)"
-msgstr "Effacer le(s) Fichier(s) ..."
+#: ../src/bar.c:211
+msgid "Clear the current selection"
+msgstr "Effacer la sélection actuelle"
 
-#: ../src/bar.c:197
+#: ../src/bar.c:214
+msgid "Invert File Selection"
+msgstr "Inverser la sélection des fichiers"
+
+#: ../src/bar.c:215
+msgid "Invert file selection"
+msgstr "Inverser la sélection des fichiers"
+
+#: ../src/bar.c:217
+msgid "Delete Files"
+msgstr "Supprimer les fichiers"
+
+#: ../src/bar.c:217
+msgid "Delete files"
+msgstr "Supprimer les fichiers"
+
+#: ../src/bar.c:218
 msgid "_First File"
-msgstr "Premier _Fichier"
+msgstr "Premier _fichier"
 
-#: ../src/bar.c:197
-msgid "First File"
-msgstr "Premier Fichier"
+#: ../src/bar.c:219
+msgid "First file"
+msgstr "Premier fichier"
 
-#: ../src/bar.c:198
+#: ../src/bar.c:220
 msgid "_Previous File"
-msgstr "Fichier _Précédent"
+msgstr "Fichier _précédent"
 
-#: ../src/bar.c:198
-msgid "Previous File"
-msgstr "Fichier Précédent"
+#: ../src/bar.c:220
+msgid "Previous file"
+msgstr "Fichier précédent"
 
-#: ../src/bar.c:199
+#: ../src/bar.c:221
 msgid "_Next File"
-msgstr "Fichier Suivant"
+msgstr "Fichier _suivant"
 
-#: ../src/bar.c:199
-msgid "Next File"
-msgstr "Fichier Suivant"
+#: ../src/bar.c:221
+msgid "Next file"
+msgstr "Fichier suivant"
 
-#: ../src/bar.c:200
+#: ../src/bar.c:222
 msgid "_Last File"
-msgstr "Dernier Fichier"
+msgstr "_Dernier fichier"
 
-#: ../src/bar.c:200
-msgid "Last File"
-msgstr "Dernier Fichier"
+#: ../src/bar.c:223
+msgid "Last file"
+msgstr "Dernier fichier"
 
-#. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
-#. and binding Ctrl+C effectively stops the user copying text..
-#: ../src/bar.c:203
-msgid "S_can File(s)"
-msgstr "S_canner le(s) Fichier(s)"
+#: ../src/bar.c:224
+msgid "S_can Files"
+msgstr "S_canner les fichiers"
 
-#: ../src/bar.c:203
-msgid "Scan File(s)"
-msgstr "Scanner le(s) Fichier(s)"
+#: ../src/bar.c:225 ../src/scan.c:2008
+msgid "Scan selected files"
+msgstr "Scanner les fichiers sélectionnés"
 
-#: ../src/bar.c:204
-msgid "_Remove Tag(s)"
-msgstr "Effacer le(s) Tag(s)"
+#: ../src/bar.c:226
+msgid "_Remove Tags"
+msgstr "_Supprimer les étiquettes"
 
-#: ../src/bar.c:204
-msgid "Remove Tag(s)"
-msgstr "Effacer le(s) Tag(s)"
+#: ../src/bar.c:227
+msgid "Remove tags"
+msgstr "Supprimer les étiquettes"
 
-#: ../src/bar.c:205
-msgid "_Undo Last File(s) Changes"
-msgstr "Ann_uler Modifs des Fichier(s)"
+#: ../src/bar.c:228
+msgid "_Undo Last Files Changes"
+msgstr "Ann_uler les dernières modifications de fichiers"
 
-#: ../src/bar.c:205
-msgid "Undo Last File(s) Changes"
-msgstr "Annuler Modifs des Fichier(s)"
+#: ../src/bar.c:229
+msgid "Undo last files changes"
+msgstr "Annuler les dernières modifications de fichiers"
 
-#: ../src/bar.c:206
-msgid "R_edo Last File(s) Changes"
-msgstr "R_efaire Modifs des Fichier(s)"
+#: ../src/bar.c:231
+msgid "R_edo Last Files Changes"
+msgstr "Rétabli_r les dernières modifications de fichiers"
 
-#: ../src/bar.c:206
-msgid "Redo Last File(s) Changes"
-msgstr "Refaire Modifs des Fichier(s)"
+#: ../src/bar.c:232
+msgid "Redo last files changes"
+msgstr "Rétablir les dernières modifications de fichiers"
 
-#: ../src/bar.c:207
-msgid "_Save File(s)"
-msgstr "_Sauver le(s) Fichier(s)"
+#: ../src/bar.c:234
+msgid "_Save Files"
+msgstr "_Enregistrer les fichiers"
 
-#: ../src/bar.c:207
-msgid "Save File(s)"
-msgstr "Sauver le(s) Fichier(s)"
+#: ../src/bar.c:235
+msgid "Save changes to selected files"
+msgstr "Enregistrer les modifications dans les fichiers sélectionnés"
 
-#: ../src/bar.c:208
-msgid "_Force Saving File(s)"
-msgstr "_Forcer la Sauvegarde de(s) Fichier(s)"
+#: ../src/bar.c:237
+msgid "_Force Save Files"
+msgstr "_Forcer l'enregistrement des fichiers"
 
-#: ../src/bar.c:208
-msgid "Force Saving File(s)"
-msgstr "Forcer la Sauvegarde de(s) Fichier(s)"
+#: ../src/bar.c:238
+msgid "Force saving files"
+msgstr "Forcer l'enregistrement des fichiers"
 
-#: ../src/bar.c:209
+#: ../src/bar.c:240
 msgid "Undo Last Changes"
-msgstr "Annuler les Derniers Changements"
+msgstr "Annuler les dernières modifications"
 
-#: ../src/bar.c:210
+#: ../src/bar.c:240
+msgid "Undo last changes"
+msgstr "Annuler les dernières modifications"
+
+#: ../src/bar.c:241
 msgid "Redo Last Changes"
-msgstr "Refaire les Derniers Changements"
+msgstr "Rétablir les dernières modifications"
 
-#: ../src/bar.c:211
+#: ../src/bar.c:241
+msgid "Redo last changes"
+msgstr "Rétablir les dernières modifications"
+
+#: ../src/bar.c:242
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../src/bar.c:211 ../src/easytag.c:2238 ../src/easytag.c:4913
-#: ../src/easytag.c:4939
+#: ../src/bar.c:242 ../src/easytag.c:2429 ../src/easytag.c:4565
+#: ../src/easytag.c:4597
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../src/bar.c:213
+#: ../src/bar.c:245
 msgid "_Browser"
 msgstr "Sélec_teur"
 
-#: ../src/bar.c:214
-msgid "Go to _Home Directory"
-msgstr "Aller dans le dossier Personnel"
+#: ../src/bar.c:246
+msgid "_Home Directory"
+msgstr "Répertoire _personnel"
 
-#: ../src/bar.c:214
-msgid "Go to Home Directory"
-msgstr "Aller dans le dossier Personnel"
+#: ../src/bar.c:247
+msgid "Go to home directory"
+msgstr "Aller dans le répertoire personnel"
 
-#: ../src/bar.c:215
-msgid "Go to Desktop Directory"
-msgstr "Aller dans le dossier du Bureau"
+#: ../src/bar.c:249
+msgid "Desktop Directory"
+msgstr "Répertoire Bureau"
 
-#: ../src/bar.c:216
-msgid "Go to Documents Directory"
-msgstr "Aller dans le dossier Documents"
+#: ../src/bar.c:250
+msgid "Go to desktop directory"
+msgstr "Aller dans le répertoire Bureau"
 
-#: ../src/bar.c:217
-msgid "Go to Downloads Directory"
-msgstr "Aller dans le dossier Téléchargements"
+#: ../src/bar.c:252
+msgid "Documents Directory"
+msgstr "Répertoire Documents"
 
-#: ../src/bar.c:218
-msgid "Go to Music Directory"
-msgstr "Aller dans le dossier Musiques"
+#: ../src/bar.c:253
+msgid "Go to documents directory"
+msgstr "Aller dans le répertoire Documents"
 
-#: ../src/bar.c:219
-msgid "Go to _Default Directory"
-msgstr "Aller dans le Répertoire par _Défaut"
+#: ../src/bar.c:255
+msgid "Downloads Directory"
+msgstr "Répertoire Téléchargements"
 
-#: ../src/bar.c:219
-msgid "Go to Default Directory"
-msgstr "Aller dans le Répertoire par Défaut"
+#: ../src/bar.c:256
+msgid "Go to downloads directory"
+msgstr "Aller dans le répertoire Téléchargements"
 
-#: ../src/bar.c:220
-msgid "Set _Current Path as Default"
-msgstr "Mettre le Chemin _Courant par Défaut"
+#: ../src/bar.c:258
+msgid "Music Directory"
+msgstr "Répertoire Musiques"
 
-#: ../src/bar.c:220
-msgid "Set Current Path as Default"
-msgstr "Mettre le Chemin Courant par Défaut"
+#: ../src/bar.c:259
+msgid "Go to music directory"
+msgstr "Aller dans le répertoire Musiques"
 
-#: ../src/bar.c:221
-msgid "Tree View | Artist-Album View"
-msgstr "Arborescence | Vue par Artiste-Album"
+#: ../src/bar.c:261
+msgid "_Parent Directory"
+msgstr "Répertoire parent"
 
-#. Only directories changed
-#: ../src/bar.c:222 ../src/easytag.c:2664
-#, fuzzy
+#: ../src/bar.c:262
+msgid "Go to parent directory"
+msgstr "Aller dans le répertoire parent"
+
+#: ../src/bar.c:264
+msgid "_Default Directory"
+msgstr "Répertoire par _défaut"
+
+#: ../src/bar.c:265
+msgid "Go to default directory"
+msgstr "Aller dans le répertoire par défaut"
+
+#: ../src/bar.c:267
+msgid "Set _Current Path as Default"
+msgstr "Définir le chemin a_ctuel par défaut"
+
+#: ../src/bar.c:267
+msgid "Set current path as default"
+msgstr "Définir le chemin actuel par défaut"
+
+#: ../src/bar.c:268
 msgid "Rename Directory…"
-msgstr "Renommer le Répertoire..."
+msgstr "Renommer le répertoire…"
 
-#: ../src/bar.c:223
+#: ../src/bar.c:268
+msgid "Rename directory"
+msgstr "Renommer le répertoire"
+
+#: ../src/bar.c:269
 msgid "Reload Directory"
-msgstr "Recharger le Répertoire"
+msgstr "Recharger le répertoire"
 
-#: ../src/bar.c:224 ../src/browser.c:4157
-#, fuzzy
-msgid "Browse Directory with…"
-msgstr "Parcourir le Répertoire avec ..."
+#: ../src/bar.c:270
+msgid "Reload directory"
+msgstr "Recharger le répertoire"
 
-#: ../src/bar.c:225
-msgid "_Collapse Tree"
-msgstr "Refermer l'Arborescence"
+#: ../src/bar.c:273
+msgid "Browse Directory With…"
+msgstr "Parcourir le répertoire avec…"
 
-#: ../src/bar.c:226
-msgid "_Refresh Tree"
-msgstr "_Rafraîchir l'Arborescence"
+#: ../src/bar.c:274
+msgid "Run a command on the directory"
+msgstr "Lancer une commande sur le répertoire"
 
-#: ../src/bar.c:228 ../src/bar.c:257
-msgid "S_canner"
-msgstr "S_canner"
+#: ../src/bar.c:276
+msgid "_Collapse Tree"
+msgstr "_Replier l'arborescence"
 
-#: ../src/bar.c:229
-#, fuzzy
-msgid "_Fill Tag(s)…"
-msgstr "_Compléter le(s) Tag(s) ..."
+#: ../src/bar.c:277
+msgid "Collapse directory tree"
+msgstr "Replier l'arborescence de répertoires"
 
-#: ../src/bar.c:229
-#, fuzzy
-msgid "Fill Tag(s)…"
-msgstr "Compléter le(s) Tag(s) ..."
+#: ../src/bar.c:278
+msgid "_Reload Tree"
+msgstr "_Recharger l'arborescence"
 
-#: ../src/bar.c:230
-#, fuzzy
-msgid "_Rename File(s) and Directory…"
-msgstr "Renommer le Fichier et le Répertoire"
+#: ../src/bar.c:279
+msgid "Reload directory tree"
+msgstr "Recharger l'arborescente de répertoires"
 
-#: ../src/bar.c:230
-#, fuzzy
-msgid "Rename File(s) and Directory…"
-msgstr "Renommer le Fichier et le Répertoire"
+#: ../src/bar.c:282
+msgid "S_canner Mode"
+msgstr "Mode de s_canner"
 
-#: ../src/bar.c:231
-#, fuzzy
-msgid "_Process Field(s)…"
-msgstr "_Traiter les Champs ..."
+#: ../src/bar.c:284
+msgid "_Miscellaneous"
+msgstr "_Divers"
 
-#: ../src/bar.c:231
-#, fuzzy
-msgid "Process Fields(s)…"
-msgstr "Traiter les Champs ..."
+#: ../src/bar.c:285
+msgid "_Find…"
+msgstr "_Rechercher…"
 
-#: ../src/bar.c:233
-msgid "_Misc"
-msgstr "_Divers"
+#: ../src/bar.c:286
+msgid "Search filenames and tags"
+msgstr "Rechercher dans les noms de fichier et les étiquettes"
 
-#: ../src/bar.c:234
-#, fuzzy
-msgid "Search _File(s)…"
-msgstr "Rechercher le(s) _fichier(s) ..."
+#: ../src/bar.c:288
+msgid "CDD_B Search…"
+msgstr "Rechercher dans la CDD_B…"
 
-#: ../src/bar.c:234
-#, fuzzy
-msgid "Search File(s)…"
-msgstr "Rechercher le(s) fichier(s) ..."
+#: ../src/bar.c:289
+msgid "CDDB search"
+msgstr "Recherche dans la CDDB"
 
-#: ../src/bar.c:235
-#, fuzzy
-msgid "CD Data _Base Search…"
-msgstr "Recherche Base de Données CD"
+#: ../src/bar.c:291
+msgid "Load Filenames From a Text File…"
+msgstr "Charger les noms de fichiers à partir d'un fichier texte…"
 
-#: ../src/bar.c:235
-#, fuzzy
-msgid "CDDB Search…"
-msgstr "Recherche CDDB ..."
+#: ../src/bar.c:292
+msgid "Load filenames from a text file"
+msgstr "Charger les noms de fichiers à partir d'un fichier texte"
 
-#: ../src/bar.c:236
-#, fuzzy
-msgid "Load Filenames from TXT…"
-msgstr "Charger les Noms des fichiers à partir d'un TXT ..."
+#: ../src/bar.c:294
+msgid "Generate Playlist…"
+msgstr "Générer une liste de lecture…"
 
-#: ../src/bar.c:237
-#, fuzzy
-msgid "Write Playlist…"
-msgstr "Ecrire Liste de Lecture..."
+#: ../src/bar.c:295
+msgid "Generate a playlist"
+msgstr "Générer une liste de lecture"
 
-#: ../src/bar.c:238 ../src/bar.c:258 ../src/bar.c:259 ../src/bar.c:260
+#: ../src/bar.c:297 ../src/bar.c:328 ../src/bar.c:329 ../src/bar.c:330
 msgid "Run Audio Player"
-msgstr "Lancer Lecteur Audio"
+msgstr "Lancer le lecteur audio"
 
-#: ../src/bar.c:240
-msgid "_Settings"
-msgstr "Paramètre_s"
+#: ../src/bar.c:298 ../src/bar.c:328 ../src/bar.c:329 ../src/bar.c:330
+msgid "Run audio player"
+msgstr "Lancer le lecteur audio"
 
-#: ../src/bar.c:241
-#, fuzzy
-msgid "_Preferences…"
-msgstr "_Préférences ..."
+#: ../src/bar.c:301
+msgid "_Edit"
+msgstr "É_dition"
 
-#. Title
-#: ../src/bar.c:241 ../src/prefs.c:117
-#, fuzzy
-msgid "Preferences…"
-msgstr "Préférences..."
+#: ../src/bar.c:302
+msgid "_Preferences"
+msgstr "_Préférences"
+
+#. The window
+#: ../src/bar.c:303 ../src/prefs.c:110
+msgid "Preferences"
+msgstr "Préférences"
 
-#: ../src/bar.c:243
+#: ../src/bar.c:305
+msgid "_View"
+msgstr "_Affichage"
+
+#: ../src/bar.c:306
+msgid "_Go"
+msgstr "A_ller"
+
+#: ../src/bar.c:308
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../src/bar.c:244
+#: ../src/bar.c:311
+msgid "_Contents"
+msgstr "_Sommaire"
+
+#: ../src/bar.c:312
+msgid "Show help"
+msgstr "Afficher l'aide"
+
+#: ../src/bar.c:314
 msgid "_About"
-msgstr "_A Propos"
+msgstr "À _propos"
+
+#: ../src/bar.c:314
+msgid "About"
+msgstr "À propos"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: ../src/bar.c:250
+#: ../src/bar.c:320
 msgid "Stop the current action"
-msgstr "Arrêter l'action courante"
+msgstr "Arrêter l'action actuelle"
 
 #.
 #. * Popup menu's Actions
 #.
-#: ../src/bar.c:256
+#: ../src/bar.c:326
 msgid "_File Operations"
-msgstr "Opérations sur _Fichier"
+msgstr "Opérations sur des _fichiers"
 
-#: ../src/bar.c:261
-#, fuzzy
-msgid "CDDB Search File(s)…"
-msgstr "Rechercher le(s) fichier(s) avec CDDB..."
+#: ../src/bar.c:327
+msgid "S_canner"
+msgstr "S_canner"
+
+#: ../src/bar.c:331
+msgid "CDDB Search Files…"
+msgstr "Rechercher des fichiers dans la CDDB…"
+
+#: ../src/bar.c:331
+msgid "CDDB search files…"
+msgstr "Rechercher des fichiers dans la CDDB…"
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: ../src/bar.c:265
-msgid "Clean Log"
+#: ../src/bar.c:335
+msgid "Clear log"
 msgstr "Effacer le journal"
 
-#. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: ../src/bar.c:272
-msgid "Browse _Sub-directories"
-msgstr "Parcourir les _Sous-répertoires"
+#. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Subdirectories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
+#: ../src/bar.c:342
+msgid "Browse _Subdirectories"
+msgstr "Parcourir les _sous-répertoires"
 
-#. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: ../src/bar.c:275
+#: ../src/bar.c:342
+msgid "Browse subdirectories"
+msgstr "Parcourir les sous-répertoires"
+
+#: ../src/bar.c:346
 msgid "Show Hidden Directories"
 msgstr "Afficher les répertoires cachés"
 
-#: ../src/bar.c:277
-msgid "Show tree browser / Display by Artist and Album"
-msgstr "Afficher l'arborescence / Afficher par Album et Artiste"
+#: ../src/bar.c:346
+msgid "Show hidden directories"
+msgstr "Afficher les répertoires cachés"
 
-#: ../src/bar.c:314
+#: ../src/bar.c:348
+msgid "_Show Scanner"
+msgstr "_Afficher le scanner"
+
+#: ../src/bar.c:349
+msgid "Show scanner"
+msgstr "Afficher le scanner"
+
+#: ../src/bar.c:355
+msgid "Tree Browser"
+msgstr "Navigateur arborescent"
+
+#: ../src/bar.c:356
+msgid "View by directory tree"
+msgstr "Afficher par arborescence de répertoires"
+
+#: ../src/bar.c:358
+msgid "Artist and Album"
+msgstr "Artiste et album"
+
+#: ../src/bar.c:359
+msgid "View by artist and album"
+msgstr "Afficher par artiste et album"
+
+#: ../src/bar.c:364
+msgid "_Fill Tags…"
+msgstr "_Compléter les étiquettes…"
+
+#: ../src/bar.c:365
+msgid "Fill tags"
+msgstr "Compléter les étiquettes"
+
+#: ../src/bar.c:367
+msgid "_Rename Files and Directories…"
+msgstr "_Renommer les fichiers et les répertoires…"
+
+#: ../src/bar.c:368
+msgid "Rename files and directories"
+msgstr "Renommer les fichiers et les répertoires"
+
+#: ../src/bar.c:370
+msgid "_Process Fields…"
+msgstr "_Traiter les champs…"
+
+#: ../src/bar.c:370 ../src/scan.c:182
+msgid "Process Fields"
+msgstr "Traiter les champs"
+
+#: ../src/bar.c:428
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
-msgstr "Impossible de fusionner l'UI, erreur: %s\n"
+msgstr "Impossible de fusionner l'UI, erreur : %s\n"
 
-#: ../src/bar.c:414
-#, fuzzy
-msgid "Ready to start…"
-msgstr "Prêt à  démarrer"
+#: ../src/bar.c:533
+msgid "Ready to start"
+msgstr "Prêt à démarrer"
 
-#: ../src/browser.c:364
+#: ../src/browser.c:376
 msgid "New default path for files selected"
-msgstr "Un nouveau chemin par défaut a été sélectionné"
+msgstr "Sélection d'un nouveau chemin par défaut des fichiers"
 
-#: ../src/browser.c:757 ../src/easytag.c:4911
-#, fuzzy
+#: ../src/browser.c:678 ../src/easytag.c:4561
 msgid "Some files have been modified but not saved"
-msgstr "Tous les fichiers ont été sauvés..."
+msgstr "Certains fichiers ont été modifiés mais pas enregistrés"
 
-#: ../src/browser.c:758
-#, fuzzy
+#: ../src/browser.c:679
 msgid "Do you want to save them before changing the directory?"
-msgstr ""
-"Voulez vous renommer le fichier \n"
-"'%s'\n"
-"par \n"
-"'%s' ?"
+msgstr "Voulez vous les enregistrer avant de changer de répertoire ?"
 
-#: ../src/browser.c:760
+#: ../src/browser.c:683
 msgid "Confirm Directory Change"
-msgstr ""
+msgstr "Confirmer le changement de répertoire"
 
-#: ../src/browser.c:2214
+#: ../src/browser.c:2146
 msgid "<All albums>"
 msgstr "<Tous les albums>"
 
-#: ../src/browser.c:2624
+#: ../src/browser.c:2607
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr ""
-"Erreur: Recherche de %s, impossible de trouver le noeud %s dans l'arbre."
+"Erreur : recherche de %s, impossible de trouver le noeud %s dans "
+"l'arborescence."
 
-#: ../src/browser.c:3033 ../src/browser.c:3161
+#: ../src/browser.c:3101 ../src/browser.c:3179
 msgid "Tree"
 msgstr "Arborescence"
 
-#: ../src/browser.c:3034 ../src/cddb.c:719 ../src/misc.c:1918
-msgid "File Name"
-msgstr "Nom de Fichier"
+#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1902
+msgid "Filename"
+msgstr "Nom du fichier"
 
-#: ../src/browser.c:3034 ../src/cddb.c:720 ../src/misc.c:1919
-#: ../src/prefs.c:665
+#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1903
+#: ../src/prefs.c:643
 msgid "Title"
 msgstr "Titre"
 
-#: ../src/browser.c:3034 ../src/browser.c:3038 ../src/cddb.c:436
-#: ../src/cddb.c:721 ../src/misc.c:1920 ../src/prefs.c:666
+#. 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
 msgid "Artist"
 msgstr "Artiste"
 
-#: ../src/browser.c:3034 ../src/misc.c:1921
-#, fuzzy
+#: ../src/browser.c:3103 ../src/misc.c:1905
 msgid "Album Artist"
-msgstr "Artiste"
+msgstr "Artiste de l'album"
 
-#: ../src/browser.c:3034 ../src/browser.c:3039 ../src/cddb.c:437
-#: ../src/cddb.c:722 ../src/misc.c:1922 ../src/prefs.c:667
+#. 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
 msgid "Album"
 msgstr "Album"
 
-#: ../src/browser.c:3035 ../src/cddb.c:723 ../src/misc.c:1924
+#: ../src/browser.c:3104 ../src/cddb.c:807 ../src/misc.c:1908
 msgid "Year"
 msgstr "Année"
 
-#: ../src/browser.c:3035 ../src/misc.c:1925
+#: ../src/browser.c:3104
+msgid "Disc"
+msgstr "Disque"
+
+#: ../src/browser.c:3105 ../src/misc.c:1909
 msgid "Track"
 msgstr "Piste"
 
-#: ../src/browser.c:3035 ../src/cddb.c:726 ../src/misc.c:1926
-#: ../src/prefs.c:668
+#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1910
+#: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Genre"
 
-#: ../src/browser.c:3036 ../src/misc.c:1928 ../src/picture.c:834
-#: ../src/prefs.c:670
+#: ../src/browser.c:3106 ../src/misc.c:1911 ../src/prefs.c:647
+msgid "Comment"
+msgstr "Commentaire"
+
+#: ../src/browser.c:3106 ../src/misc.c:1912 ../src/picture.c:1059
+#: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Compositeur"
 
-#: ../src/browser.c:3036 ../src/misc.c:1929 ../src/prefs.c:671
-msgid "Orig. Artist"
-msgstr "Artiste Orig."
+#: ../src/browser.c:3107 ../src/misc.c:1913
+msgid "Original Artist"
+msgstr "Artiste original"
 
-#: ../src/browser.c:3036 ../src/misc.c:1930
+#: ../src/browser.c:3108 ../src/misc.c:1914
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../src/browser.c:3037 ../src/misc.c:1931
+#: ../src/browser.c:3108 ../src/misc.c:1915
 msgid "URL"
 msgstr "URL"
 
-#: ../src/browser.c:3037
+#: ../src/browser.c:3109 ../src/misc.c:1916
 msgid "Encoded By"
-msgstr "Encodeur"
+msgstr "Encodé par"
 
-#: ../src/browser.c:3038
+#: ../src/browser.c:3110
 msgid "# Albums"
-msgstr "# Albums"
+msgstr "Nombre d'albums"
 
-#: ../src/browser.c:3038 ../src/browser.c:3039
+#: ../src/browser.c:3111 ../src/browser.c:3112
 msgid "# Files"
-msgstr "# Fichiers"
-
-#: ../src/browser.c:3058
-msgid "Go to parent directory"
-msgstr "Aller dans le Répertoire Parent"
+msgstr "Nombre de fichiers"
 
-#: ../src/browser.c:3076
+#: ../src/browser.c:3137
 msgid "Enter a directory to browse."
-msgstr "Entrer un répertoire à parcourir."
+msgstr "Saisir un répertoire à parcourir."
 
-#: ../src/browser.c:3085
+#: ../src/browser.c:3146
 msgid "Select a directory to browse."
 msgstr "Séléctionner un répertoire à parcourir."
 
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: ../src/browser.c:3091
-#, fuzzy
-msgid "… file(s)"
-msgstr "%u fichier(s)"
+#. Translators: No files, as in "0 files".
+#: ../src/browser.c:3153 ../src/easytag.c:3468
+msgid "No files"
+msgstr "Aucun fichier"
 
-#: ../src/browser.c:3212
+#: ../src/browser.c:3231
 msgid "Artist & Album"
-msgstr "Artiste & Album"
+msgstr "Artiste & album"
 
-#: ../src/browser.c:3695
-msgid "Rename the directory"
-msgstr "Renommer le Répertoire"
+#. Only directories changed
+#: ../src/browser.c:3595 ../src/easytag.c:2880
+msgid "Rename Directory"
+msgstr "Renommer le répertoire"
 
-#: ../src/browser.c:3711
+#: ../src/browser.c:3617
 #, c-format
-msgid "Rename the directory '%s' to : "
-msgstr "Renommer le répertoire '%s' en :"
+msgid "Rename the directory '%s' to:"
+msgstr "Renommer le répertoire « %s » en :"
 
-#: ../src/browser.c:3730 ../src/misc.c:1270
-msgid "Use mask :"
-msgstr "Utiliser le masque :"
+#: ../src/browser.c:3636 ../src/misc.c:1171
+msgid "Use mask:"
+msgstr "Utiliser le masque :"
 
-#: ../src/browser.c:3733
+#: ../src/browser.c:3639
 msgid "If activated, it will use masks to rename directory."
-msgstr "Si activé, les masques seront utilisés pour renommer le répertoire."
+msgstr "Si activé, les masques sont utilisés pour renommer le répertoire."
 
-#: ../src/browser.c:3751
+#: ../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 ""
-"Sélectionner ou taper un masque en utilisant les codes (voir la légende dans "
-"la fenêtre du scanner) pour renommer le répertoire d'après les champs du tag."
-
-#: ../src/browser.c:3771 ../src/misc.c:1291 ../src/misc.c:1389
-#: ../src/scan.c:2487 ../src/scan.c:2554 ../src/scan.c:2921
-msgid "Invalid Scanner Mask"
-msgstr "Masque de Scanner Invalide"
+"Sélectionner ou saisir un masque en utilisant les codes (voir la légende "
+"dans la boîte de dialogue du scanner) pour renommer le répertoire avec les "
+"données de l'étiquette."
 
 #. Preview label
-#: ../src/browser.c:3777
-#, fuzzy
-msgid "Rename directory preview…"
-msgstr "Apercu du renommeur de répertoires..."
+#: ../src/browser.c:3681
+msgid "Rename directory preview"
+msgstr "Aperçu du renommage du répertoire"
 
-#: ../src/browser.c:3898
-#, fuzzy
+#: ../src/browser.c:3773
 msgid "You must type a directory name"
-msgstr "Vous devez saisir un nom de répertoire!"
+msgstr "Vous devez saisir un nom de répertoire"
 
-#: ../src/browser.c:3899 ../src/browser.c:3920
-#, fuzzy
+#: ../src/browser.c:3774 ../src/browser.c:3795
 msgid "Directory Name Error"
-msgstr "Répertoire renommé"
+msgstr "Erreur de nom de répertoire"
 
-#: ../src/browser.c:3917
-#, fuzzy, c-format
+#: ../src/browser.c:3792
+#, c-format
 msgid "Could not convert '%s' into filename encoding."
-msgstr ""
-"Impossible de convertir le nom de fichier '%s' vers l'encodage du système de "
-"fichiers."
+msgstr "Impossible de convertir « %s » dans le codage du nom de fichier."
 
-#: ../src/browser.c:3919
+#: ../src/browser.c:3794
 msgid "Please use another name"
-msgstr ""
+msgstr "Veuillez choisir un autre nom"
 
-#: ../src/browser.c:3989
-#, fuzzy, c-format
+#: ../src/browser.c:3864
+#, c-format
 msgid "The directory name '%s' already exists"
-msgstr ""
-"Le fichier '%s' existe déjà!\n"
-"L'écraser?"
+msgstr "Le nom du répertoire « %s » existe déjà"
 
-#: ../src/browser.c:3990 ../src/easytag.c:2965 ../src/easytag.c:3006
-#: ../src/easytag.c:3033 ../src/easytag.c:3075 ../src/easytag.c:3261
-#, fuzzy
+#: ../src/browser.c:3865 ../src/easytag.c:2963
 msgid "Rename File Error"
-msgstr "Renommer le Fichier et le Répertoire"
+msgstr "Erreur de renommage du fichier"
 
-#: ../src/browser.c:4029
-#, fuzzy
+#: ../src/browser.c:3903 ../src/browser.c:3932
 msgid "Rename Directory Error"
-msgstr "Renommer le Répertoire ..."
+msgstr "Erreur de renommage du répertoire"
 
-#: ../src/browser.c:4059
-#, fuzzy
-msgid "Directory Rename Error"
-msgstr "Répertoire renommé"
-
-#: ../src/browser.c:4099
+#: ../src/browser.c:3970
 msgid "Directory renamed"
 msgstr "Répertoire renommé"
 
-#: ../src/browser.c:4174 ../src/browser.c:4332
-msgid "Program to run :"
-msgstr "Programme à  lancer :"
+#: ../src/browser.c:4006
+msgid "Browse Directory With"
+msgstr "Parcourir le répertoire avec"
+
+#: ../src/browser.c:4022 ../src/browser.c:4148
+msgid "Program to run:"
+msgstr "Programme à lancer :"
 
-#: ../src/browser.c:4187
+#: ../src/browser.c:4034
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
-"Entrez le programme à lancer. Il recevra en paramètre le répertoire courant."
+"Saisissez le programme à lancer. Il aura comme paramètre le répertoire "
+"actuel."
 
-#: ../src/browser.c:4315
-#, fuzzy
-msgid "Open File with…"
-msgstr "Ouvrir le Fichier avec ..."
+#: ../src/browser.c:4128
+msgid "Open Files With"
+msgstr "Ouvrir les fichiers avec"
 
-#: ../src/browser.c:4345
+#: ../src/browser.c:4160
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
-"Entrez le programme à lancer. Il recevra en paramètre le fichier courant."
-
-#: ../src/browser.c:4502
-msgid "You must type a program name!"
-msgstr "Vous devez saisir un nom de programme!"
-
-#: ../src/browser.c:4503 ../src/browser.c:4520
-msgid "Program Name Error"
-msgstr ""
-
-#: ../src/browser.c:4518
-#, fuzzy, c-format
-msgid "The program '%s' cannot be found"
-msgstr "Le programme '%s' n'a pas été trouvé!"
-
-#: ../src/browser.c:4567 ../src/misc.c:919
-#, c-format
-msgid "Can't execute %s (error %d)!\n"
-msgstr "Impossible d'exécuter %s (erreur %d)!\n"
-
-#: ../src/browser.c:4586 ../src/misc.c:958
-msgid "Can't fork another process!\n"
-msgstr "Ne peut lancer un processus fils!\n"
+"Saisissez le programme à lancer. Il aura comme paramètre le fichier actuel."
 
-#: ../src/browser.c:4621
-#, fuzzy, c-format
-msgid "Executed command: '%s %s'"
-msgstr "Commande exécutée : '%s %s'"
-
-#: ../src/cddb.c:227
+#: ../src/cddb.c:313
 msgid "Artist / Album"
 msgstr "Artiste / Album"
 
-#: ../src/cddb.c:227
+#: ../src/cddb.c:313
 msgid "Category"
 msgstr "Catégorie"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: ../src/cddb.c:228 ../src/cddb.c:438
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Track Name".
+#: ../src/cddb.c:314 ../src/cddb.c:489
 msgid "Track Name"
-msgstr "Nom de Piste"
+msgstr "Nom de la piste"
 
-#: ../src/cddb.c:228
-msgid "Time"
+#: ../src/cddb.c:314
+msgid "Duration"
 msgstr "Durée"
 
-#: ../src/cddb.c:239
-msgid "CD Data Base Search"
-msgstr "Recherche Base de Données CD"
+#: ../src/cddb.c:326
+msgid "CDDB Search"
+msgstr "Recherche dans la CDDB"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: ../src/cddb.c:271
+#: ../src/cddb.c:346
 msgid "Automatic Search"
-msgstr "Recherche Automatique"
+msgstr "Recherche automatique"
 
-#: ../src/cddb.c:283
-msgid "Request CD database :"
-msgstr "Interroger la base de CD :"
+#: ../src/cddb.c:356
+msgid "Request CDDB"
+msgstr "Interroger la CDDB"
 
-#: ../src/cddb.c:293
+#: ../src/cddb.c:366
 msgid ""
-"Request automatically the CDDB database using the selected files (the order "
-"is important!) to generate the CddbID."
+"Request automatically the CDDB using the selected files (the order is "
+"important) to generate the CddbID"
 msgstr ""
-"Interroger automatiquement la base CDDB à partir des fichiers sélectionnés "
-"pour générer le CddbID (l'ordre des fichiers est important!)"
+"Interroger automatiquement la base de données CDDB avec les fichiers "
+"sélectionnés pour générer le CddbID (l'ordre des fichiers est important)"
 
-#: ../src/cddb.c:303 ../src/cddb.c:414
-#, fuzzy
-msgid "Stop the search…"
-msgstr "Arrêter la recherche ..."
+#: ../src/cddb.c:377 ../src/cddb.c:457
+msgid "Stop the search"
+msgstr "Arrêter la recherche"
 
 #. Check box to run the scanner
-#: ../src/cddb.c:310
-msgid "Use local Cddb"
-msgstr "Utiliser Cddb local"
+#: ../src/cddb.c:384
+msgid "Use local CDDB"
+msgstr "Utiliser la CDDB locale"
 
-#: ../src/cddb.c:313 ../src/cddb.c:766
+#: ../src/cddb.c:387 ../src/cddb.c:850
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
 msgstr ""
-"En activant cette option, après le chargement des champs, le scanner courant "
-"sera exécuté (la fenêtre des scanners doit être ouverte)."
+"En activant cette option et après le chargement des champs, le scanner "
+"actuellement sélectionné est exécuté (la fenêtre des scanners doit être "
+"ouverte)."
 
 #.
 #. * 2 - Page for manual search
 #.
-#: ../src/cddb.c:358
+#: ../src/cddb.c:404
 msgid "Manual Search"
-msgstr " Recherche Manuelle"
+msgstr " Recherche manuelle"
 
-#: ../src/cddb.c:373
-msgid "Words :"
-msgstr "Mots :"
+#: ../src/cddb.c:416
+msgid "Words:"
+msgstr "Mots :"
 
-#: ../src/cddb.c:386
+#: ../src/cddb.c:429
 msgid "Enter the words to search (separated by a space or '+')"
-msgstr "Entrez les mots à rechercher (séparés par un espace ou un '+')"
+msgstr "Saisissez les mots à rechercher (séparés par une espace ou un +)"
 
 #.
 #. * Search options
 #.
-#: ../src/cddb.c:426
-msgid "Search In :"
-msgstr "Rechercher dans :"
+#: ../src/cddb.c:469
+msgid "Search In:"
+msgstr "Rechercher dans :"
 
-#: ../src/cddb.c:434
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "All fields".
+#: ../src/cddb.c:479
 msgid "All Fields"
-msgstr "Tous les Champs"
+msgstr "Tous les champs"
 
-#: ../src/cddb.c:439 ../src/picture.c:812 ../src/prefs.c:841
+#. 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
 msgid "Other"
 msgstr "Autres"
 
-#: ../src/cddb.c:461
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "All Categories".
+#: ../src/cddb.c:516
 msgid "All Categories"
-msgstr "Toutes les Catégories"
+msgstr "Toutes les catégories"
 
-#: ../src/cddb.c:463
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Blues".
+#: ../src/cddb.c:520
 msgid "Blues"
 msgstr "Blues"
 
-#: ../src/cddb.c:464
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Classical".
+#: ../src/cddb.c:523
 msgid "Classical"
 msgstr "Classique"
 
-#: ../src/cddb.c:465
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Country".
+#: ../src/cddb.c:526
 msgid "Country"
 msgstr "Country"
 
-#: ../src/cddb.c:466
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Folk".
+#: ../src/cddb.c:529
 msgid "Folk"
 msgstr "Folk"
 
-#: ../src/cddb.c:467
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Jazz".
+#: ../src/cddb.c:532
 msgid "Jazz"
 msgstr "Jazz"
 
-#.
-#. * Misc
-#.
-#: ../src/cddb.c:468 ../src/prefs.c:234 ../src/prefs.c:235
-msgid "Misc"
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Misc".
+#: ../src/cddb.c:535
+msgid "Misc."
 msgstr "Divers"
 
-#: ../src/cddb.c:469
-msgid "Newage"
-msgstr "Newage"
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "New age".
+#: ../src/cddb.c:538
+msgid "New Age"
+msgstr "New age"
 
-#: ../src/cddb.c:470
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Reggae".
+#: ../src/cddb.c:541
 msgid "Reggae"
 msgstr "Reggae"
 
-#: ../src/cddb.c:471
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Rock".
+#: ../src/cddb.c:544
 msgid "Rock"
 msgstr "Rock"
 
-#: ../src/cddb.c:472
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Soundtrack".
+#: ../src/cddb.c:547
 msgid "Soundtrack"
-msgstr "Soundtrack"
+msgstr "Bande originale"
 
-#: ../src/cddb.c:509
-msgid "included : funk, soul, rap, pop, industrial, metal, etc."
-msgstr "inclus : funk, soul, rap, pop, industrial, metal, etc."
+#: ../src/cddb.c:587
+msgid "included: funk, soul, rap, pop, industrial, metal, etc."
+msgstr "inclus : funk, soul, rap, pop, industrial, metal, etc."
 
-#: ../src/cddb.c:510
+#: ../src/cddb.c:588
 msgid "movies, shows"
-msgstr "films, shows"
+msgstr "films, spectacles"
 
-#: ../src/cddb.c:511
+#: ../src/cddb.c:589
 msgid "others that do not fit in the above categories"
-msgstr "tous ceux qui ne correspondent pas aux autres catégories"
+msgstr "tous ceux qui n'entrent pas dans les catégories ci-dessus"
 
 #. Button to display/hide the categories
-#: ../src/cddb.c:514
-msgid " Categories "
-msgstr " Catégories "
+#: ../src/cddb.c:592
+msgid "Categories"
+msgstr "Catégories"
 
 #.
 #. * Results command
 #.
-#: ../src/cddb.c:522
-msgid "Results :"
-msgstr "Résultats :"
+#: ../src/cddb.c:600
+msgid "Results:"
+msgstr "Résultats :"
 
-#: ../src/cddb.c:529 ../src/misc.c:1970
-msgid "Search :"
-msgstr "Rechercher :"
+#: ../src/cddb.c:606 ../src/misc.c:1950
+msgid "Search:"
+msgstr "Rechercher :"
 
-#: ../src/cddb.c:543
+#: ../src/cddb.c:620
 msgid "Enter the words to search in the list below"
-msgstr "Entrez les mots à rechercher dans la liste du dessous"
+msgstr "Saisissez les mots à rechercher dans la liste ci-dessous"
 
-#: ../src/cddb.c:555
+#: ../src/cddb.c:632
 msgid "Search Next"
-msgstr " Rechercher le suivant"
+msgstr "Rechercher le suivant"
 
-#: ../src/cddb.c:561
+#: ../src/cddb.c:638
 msgid "Search Previous"
 msgstr "Rechercher le précédent"
 
-#: ../src/cddb.c:572
+#: ../src/cddb.c:649
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Afficher seulement les lignes rouges (ou afficher toutes les lignes) dans la "
-"liste 'Artiste / Album'"
+"liste « Artiste / Album »"
 
-#: ../src/cddb.c:578 ../src/cddb.c:1505
+#: ../src/cddb.c:655
 msgid "Unselect all lines"
 msgstr "Désélectionner toutes les lignes"
 
-#: ../src/cddb.c:584
+#: ../src/cddb.c:661
 msgid "Invert lines selection"
 msgstr "Inverser la sélection des lignes"
 
-#: ../src/cddb.c:590 ../src/cddb.c:1500
+#: ../src/cddb.c:670
 msgid "Select all lines"
 msgstr "Sélectionner toutes les lignes"
 
-#: ../src/cddb.c:703
+#: ../src/cddb.c:788
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
 "You can also reorder lines in this list before using 'apply' button."
 msgstr ""
-"Sélectionner les lignes à 'appliquer' dans la liste des fichiers. Note : "
-"toutes les lignes seront traitées si aucune n'est sélectionnée.\n"
-"Vous pouvez aussi réorganiser les lignes de cette liste avant d'utiliser le "
-"bouton 'Appliquer'."
+"Sélectionner les lignes à appliquer à votre liste de fichiers. Toutes les "
+"lignes seront traitées si aucune n'est sélectionnée.\n"
+"Vous pouvez aussi réorganiser les lignes de cette liste avant d'appuyer sur "
+"« Appliquer »."
 
 #.
 #. * Apply results to fields...
 #.
-#: ../src/cddb.c:710
-msgid "Set Into :"
-msgstr "Mettre dans :"
+#: ../src/cddb.c:795
+msgid "Set Into:"
+msgstr "Définir dans :"
 
-#: ../src/cddb.c:717
+#: ../src/cddb.c:801
 msgid "All"
 msgstr "Tous"
 
-#: ../src/cddb.c:724
+#: ../src/cddb.c:808
 msgid "Track #"
-msgstr "N° Piste"
+msgstr "N° de piste"
 
-#: ../src/cddb.c:725
+#: ../src/cddb.c:809
 msgid "# Tracks"
-msgstr "Nbr Pistes"
+msgstr "Nombre de pistes"
 
 #. Check box to run the scanner
-#: ../src/cddb.c:763 ../src/misc.c:3002
+#: ../src/cddb.c:847 ../src/misc.c:2991
 msgid "Run the current scanner for each file"
-msgstr "Exécuter le scanner courant pour chaque fichier"
+msgstr "Exécuter le scanner actuel sur chaque fichier"
 
 #. Check box to use DLM (also used in the preferences window)
-#: ../src/cddb.c:770
+#: ../src/cddb.c:854
 msgid "Match lines with the Levenshtein algorithm"
-msgstr "Correspondance des lignes avec DLM"
+msgstr "Correspondance des lignes avec l'algorithme 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:775 ../src/prefs.c:1410
+#: ../src/cddb.c:859 ../src/prefs.c:1362
 msgid ""
-"When activating this option, the Levenshtein algorithm (DLM : Damerau-"
-"Levenshtein Metric) will be used to match the CDDB title against every file "
-"name in the current folder, and to select the best match. This will be used "
-"when selecting the corresponding audio file, or applying cddb results, "
+"When activating this option, the Levenshtein algorithm (DLM: Damerau-"
+"Levenshtein Metric) will be used to match the CDDB title against every "
+"filename in the current folder, and to select the best match. This will be "
+"used when selecting the corresponding audio file, or applying CDDB results, "
 "instead of using directly the position order."
 msgstr ""
-"En activant cette option, l'algorithme Levenshtein (DLM : Damerau-"
-"Levenshtein Metric) sera utilisé pour identifier la meilleure correspondance "
-"entre les titres CDDB et les noms de fichier du répertoire courant. Cela "
-"sera utilisé pour sélectionner le fichier audio correspondant, ou lors du "
-"chargement des résultats CDDB au lieu de se baser sur la position."
+"En activant cette option, l'algorithme DLM (Damerau-Levenshtein Metric) est "
+"utilisé pour identifier la meilleure correspondance entre les titres CDDB et "
+"les noms de chaque fichier du dossier actuel. Cela s'applique lors de la "
+"sélection du fichier audio correspondant (ou lors de l'application des "
+"résultats CDDB) en lieu et place de l'utilisation directe de son emplacement."
 
-#: ../src/cddb.c:787
+#: ../src/cddb.c:871
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 "Charger les lignes sélectionnées ou toutes les lignes (si aucune n'est "
 "sélectionnée)"
 
-#: ../src/cddb.c:796 ../src/misc.c:2226
-#, fuzzy
-msgid "Ready to search…"
-msgstr "Prêt à chercher..."
+#: ../src/cddb.c:881
+msgid "Ready to search"
+msgstr "Prêt à rechercher"
 
-#: ../src/cddb.c:1320
+#: ../src/cddb.c:1352
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
-"Album: '%s', artiste: '%s', durée: '%s', année: '%s', genre: '%s', ID: '%s'"
-
-#: ../src/cddb.c:1510
-msgid "Invert selection"
-msgstr "Inverser la sélection"
+"Album : « %s », artiste : « %s », durée : « %s », année : « %s », genre : "
+"« %s », identifiant : « %s »"
 
-#: ../src/cddb.c:1518
-msgid "Sort by Track Number"
-msgstr "Classer par Numéro de Piste"
-
-#: ../src/cddb.c:1523
-msgid "Sort by Track Name"
-msgstr "Classer par Nom de Piste"
-
-#: ../src/cddb.c:1621
-#, fuzzy, c-format
+#: ../src/cddb.c:1588
+#, c-format
 msgid "Resolving host '%s'…"
-msgstr "Obtention de l'hôte '%s' ..."
+msgstr "Recherche de l'hôte « %s »…"
 
 #: ../src/cddb.c:1629
 #, c-format
-msgid "Can't resolve host '%s' (%s)!"
-msgstr "Impossible d'obtenir l'hôte '%s' (%s)!"
+msgid "Cannot create a new socket (%s)"
+msgstr "Impossible de créer une nouvelle connexion (%s)"
 
-#: ../src/cddb.c:1644
-#, c-format
-msgid "Can't create a new socket (%s)!"
-msgstr "ERREUR: Impossible de créer un nouveau socket (%s)!"
+#: ../src/cddb.c:1643
+msgid "Cannot set options on the newly-created socket"
+msgstr "Impossible de confirure les options sur la socket nouvellement créée"
 
-#. Open connection to the server
-#: ../src/cddb.c:1658
-#, fuzzy, c-format
+#. Open connection to the server.
+#: ../src/cddb.c:1647
+#, c-format
 msgid "Connecting to host '%s', port '%d'…"
-msgstr "Connexion en cours sur l'hôte '%s' (port '%d') ..."
+msgstr "Connexion en cours à l'hôte « %s », port « %d »…"
 
-#: ../src/cddb.c:1665
+#: ../src/cddb.c:1660
 #, c-format
-msgid "Can't connect to host '%s' (%s)!"
-msgstr "Impossible de se connecter sur l'hôte '%s' (%s)"
+msgid "Cannot connect to host '%s' (%s)"
+msgstr "Impossible de se connecter à l'hôte « %s » (%s)"
 
-#: ../src/cddb.c:1671
+#: ../src/cddb.c:1684
+#, c-format
+msgid "Cannot resolve host '%s' (%s)"
+msgstr "Impossible de trouver l'hôte « %s » (%s)"
+
+#: ../src/cddb.c:1697
 #, c-format
 msgid "Connected to host '%s'"
-msgstr "Connecté sur l'hôte '%s'"
+msgstr "Connecté à l'hôte « %s »"
 
-#: ../src/cddb.c:1760
-#, fuzzy, c-format
+#: ../src/cddb.c:1778
+#, c-format
+msgid "Error while writing CDDB results to file '%s'"
+msgstr "Erreur lors de l'écriture de l'étiquette ID3v2 du fichier « %s »"
+
+#: ../src/cddb.c:1789
+#, c-format
 msgid "Receiving data (%s)…"
-msgstr "Réception des données (%s) ..."
+msgstr "Réception des données (%s)…"
 
-#: ../src/cddb.c:1772
+#: ../src/cddb.c:1801
 #, c-format
-msgid "Error when reading cddb response (%s)!"
-msgstr "Erreur lors de la lecture de la réponse cddb (%s)!"
+msgid "Error when reading CDDB response (%s)"
+msgstr "Erreur lors de la lecture de la réponse CDDB (%s)"
 
-#: ../src/cddb.c:1778
+#: ../src/cddb.c:1808
 #, c-format
-msgid "Can't create file '%s' (%s)"
-msgstr "Impossible de créer le fichier '%s' (%s)"
+msgid "Cannot create file '%s' (%s)"
+msgstr "Impossible de créer le fichier « %s » (%s)"
 
-#: ../src/cddb.c:1828 ../src/misc.c:3160 ../src/setting.c:1393
+#: ../src/cddb.c:1849 ../src/setting.c:1256
 #, c-format
-msgid "Can't open file '%s' (%s)"
-msgstr "Impossible d'ouvrir le fichier '%s' (%s)"
+msgid "Cannot open file '%s' (%s)"
+msgstr "Impossible d'ouvrir le fichier « %s » (%s)"
 
 #. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
 #. Send the request
@@ -1372,270 +1315,275 @@ msgstr "Impossible d'ouvrir le fichier '%s' (%s)"
 #. Send the request
 #. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: ../src/cddb.c:2270 ../src/cddb.c:2590 ../src/cddb.c:3453
-#, fuzzy
+#: ../src/cddb.c:2314 ../src/cddb.c:2643 ../src/cddb.c:3516
 msgid "Sending request…"
-msgstr "Envoi de la requête ..."
+msgstr "Envoi de la requête…"
 
-#: ../src/cddb.c:2274 ../src/cddb.c:2594 ../src/cddb.c:3158 ../src/cddb.c:3457
+#: ../src/cddb.c:2318 ../src/cddb.c:2647 ../src/cddb.c:3216 ../src/cddb.c:3520
 #, c-format
-msgid "Can't send the request (%s)!"
-msgstr "Impossible d'envoyer la requête (%s)!"
+msgid "Cannot send the request (%s)"
+msgstr "Impossible d'envoyer la requête (%s)"
 
 #.
 #. * Read the answer
 #.
 #. Read the answer
-#: ../src/cddb.c:2296 ../src/cddb.c:3171 ../src/cddb.c:3466
-#, fuzzy
+#: ../src/cddb.c:2344 ../src/cddb.c:3230 ../src/cddb.c:3529
 msgid "Receiving data…"
-msgstr "Réception des données ..."
+msgstr "Réception des données…"
 
-#: ../src/cddb.c:2303 ../src/cddb.c:2623 ../src/cddb.c:3178 ../src/cddb.c:3473
-msgid "The server returned a wrong answer!"
-msgstr "Le serveur a retourné une mauvaise réponse!"
+#: ../src/cddb.c:2351 ../src/cddb.c:2676 ../src/cddb.c:3237 ../src/cddb.c:3536
+msgid "The server returned a bad response"
+msgstr "Le serveur a renvoyé une mauvaise réponse"
 
-#: ../src/cddb.c:2317 ../src/cddb.c:2639 ../src/cddb.c:3193 ../src/cddb.c:3490
-#: ../src/cddb.c:3505
+#: ../src/cddb.c:2365 ../src/cddb.c:2692 ../src/cddb.c:3252 ../src/cddb.c:3553
+#: ../src/cddb.c:3568
 #, c-format
-msgid "The server returned a wrong answer! (%s)"
-msgstr "Le serveur a retourné une mauvaise réponse! (%s)"
+msgid "The server returned a bad response: %s"
+msgstr "Le serveur a renvoyé une mauvaise réponse : %s"
 
-#: ../src/cddb.c:2464
+#: ../src/cddb.c:2512
 #, c-format
-msgid "Sorry, the web-based search is currently down!"
-msgstr "Désolé, mais la recherche web est désactivée pour l'instant"
+msgid "Sorry, the web-based search is currently not available"
+msgstr "Désolé, mais la recherche Web est indisponible pour l'instant"
 
-#: ../src/cddb.c:2466 ../src/cddb.c:2811
+#: ../src/cddb.c:2514 ../src/cddb.c:2863
 #, c-format
-msgid "Found %d matching album(s)"
-msgstr "Trouvé(s) %d album(s) correspondant(s)"
+msgid "Found one matching album"
+msgid_plural "Found %d matching albums"
+msgstr[0] "Trouvé %d album correspondant"
+msgstr[1] "Trouvé %d albums correspondants"
 
-#: ../src/cddb.c:2611
-#, fuzzy, c-format
+#: ../src/cddb.c:2664
+#, c-format
 msgid "Receiving data of page %d (album %d/%d)…"
-msgstr "Réception des données de la page %d (album %d/%d)..."
+msgstr "Réception des données de la page %d (album %d/%d)…"
 
-#: ../src/cddb.c:2613
-#, fuzzy, c-format
+#: ../src/cddb.c:2666
+#, c-format
 msgid "Receiving data of page %d…"
-msgstr "Réception des données de la page %d ..."
+msgstr "Réception des données de la page %d…"
 
-#: ../src/cddb.c:2778
-#, fuzzy, c-format
+#: ../src/cddb.c:2830
+#, c-format
 msgid "More results to load…"
-msgstr "D'autres résultats à charger ..."
+msgstr "D'autres résultats à charger…"
 
-#: ../src/cddb.c:2907
+#: ../src/cddb.c:2959
 #, c-format
-msgid "No file selected!"
-msgstr "Aucun fichier sélectionné!"
+msgid "No file selected"
+msgstr "Aucun fichier sélectionné"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: ../src/cddb.c:2915
+#: ../src/cddb.c:2967
 #, c-format
-msgid "More than 99 files selected! Can't send request!"
-msgstr "Plus de 99 fichiers sélectionnés! Impossible d'envoyer la requête!"
+msgid "More than 99 files selected. Cannot send request"
+msgstr "Plus de 99 fichiers sélectionnés. Impossible d'envoyer la requête"
 
-#: ../src/cddb.c:2921
+#: ../src/cddb.c:2973
 #, c-format
-msgid "%d file(s) selected!"
-msgstr "%d fichier(s) sélectionné(s)!"
+msgid "One file selected"
+msgid_plural "%d files selected"
+msgstr[0] "Un fichier sélectionné"
+msgstr[1] "%d fichiers sélectionnés"
+
+#: ../src/cddb.c:3056
+msgid "The path for 'Local CD Database' was not defined"
+msgstr "Le chemin vers la « base de données CD locale » n'est pas défini"
 
-#: ../src/cddb.c:3001
-msgid "The path for 'Local CD Data Base' was not defined"
+#. Translators: 'it' in this sentence refers to the local CD
+#. * database path.
+#: ../src/cddb.c:3059
+msgid "Enter it in the preferences window before using this search."
 msgstr ""
+"Saisissez-la dans la boîte de dialogue des préférences avant d'utiliser "
+"cette recherche."
 
-#: ../src/cddb.c:3003
-#, fuzzy
-msgid "Local CD search…"
-msgstr "Recherche CD locale ..."
+#: ../src/cddb.c:3061
+msgid "Local CD search"
+msgstr "Recherche locale de CD"
 
 #. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
-#: ../src/cddb.c:3148
-#, fuzzy, c-format
+#: ../src/cddb.c:3206
+#, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"
-msgstr "Envoi de la requête (CddbId: %s, #pistes: %d, Longueur disque: %d) ..."
+msgstr ""
+"Envoi de la requête (CddbId : %s, nb de pistes : %d, durée du disque : %d)…"
 
-#: ../src/cddb.c:3301
+#: ../src/cddb.c:3363
 #, c-format
-msgid "Found %d matching album(s) for DiscID '%s'"
-msgstr "Trouvé(s) %d album(s) correspondant(s) pour le DiscID '%s'"
+msgid "DiscID '%s' gave one matching album"
+msgid_plural "DiscID '%s' gave %d matching albums"
+msgstr[0] "Le DiscID « %s » donne un album correspondant"
+msgstr[1] "Le DiscID « %s » donne %d albums correspondants"
 
-#: ../src/cddb.c:3397
+#: ../src/cddb.c:3460
 #, c-format
-msgid "Can't load file: '%s' (%s)!"
-msgstr "Impossible de charger le fichier '%s' (%s)!"
+msgid "Can't load file: '%s' (%s)."
+msgstr "Impossible de charger le fichier : « %s » (%s)."
 
 #. Load the track list of the album
-#: ../src/cddb.c:3696
-#, fuzzy
+#: ../src/cddb.c:3759
 msgid "Loading album track list…"
-msgstr "Chargement de la liste des pistes de l'album ..."
+msgstr "Chargement de la liste des pistes de l'album…"
 
-#: ../src/cddb.c:3896
-#, fuzzy, c-format
-msgid ""
-"You are applying %d lines of the CDDB results to %d lines in the list of "
-"files"
+#: ../src/cddb.c:3958
+msgid "The number of CDDB results does not match the number of selected files"
 msgstr ""
-"Attention, vous allez faire correspondre %d lignes des résultats CDDB à %d "
-"lignes de la liste des fichiers!\n"
-"\n"
-"Voulez-vous continuer ?"
+"Le nombre de résultats CDDB ne correspond pas au nombre de fichiers "
+"sélectionnés"
 
-#: ../src/cddb.c:3901
-#, fuzzy
-msgid "Write Tag from CDDB…"
-msgstr "Ecriture des Tags à partir de CDDB..."
+#: ../src/cddb.c:3962
+msgid "Write Tag from CDDB"
+msgstr "Écriture de l'étiquette à partir de la CDDB"
 
-#: ../src/charset.c:49
+#: ../src/charset.c:47
 msgid "Arabic (IBM-864)"
 msgstr "Arabe (IBM-864)"
 
-#: ../src/charset.c:50
+#: ../src/charset.c:48
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabe (ISO-8859-6)"
 
-#: ../src/charset.c:51
+#: ../src/charset.c:49
 msgid "Arabic (Windows-1256)"
 msgstr "Arabe (Windows-1256)"
 
-#: ../src/charset.c:52
+#: ../src/charset.c:50
 msgid "Baltic (ISO-8859-13)"
-msgstr "Baltique (ISO-8859-13)"
+msgstr "Balte (ISO-8859-13)"
 
-#: ../src/charset.c:53
+#: ../src/charset.c:51
 msgid "Baltic (ISO-8859-4)"
-msgstr "Baltique (ISO-8859-4)"
+msgstr "Balte (ISO-8859-4)"
 
-#: ../src/charset.c:54
+#: ../src/charset.c:52
 msgid "Baltic (Windows-1257)"
-msgstr "Baltique (Windows-1257)"
+msgstr "Balte (Windows-1257)"
 
-#: ../src/charset.c:55
+#: ../src/charset.c:53
 msgid "Celtic (ISO-8859-14)"
-msgstr "Celtique (ISO-8859-14)"
+msgstr "Celte (ISO-8859-14)"
 
-#: ../src/charset.c:56
+#: ../src/charset.c:54
 msgid "Central European (IBM-852)"
 msgstr "Europe centrale (IBM-852)"
 
-#: ../src/charset.c:57
+#: ../src/charset.c:55
 msgid "Central European (ISO-8859-2)"
 msgstr "Europe centrale (ISO-8859-2)"
 
-#: ../src/charset.c:58
+#: ../src/charset.c:56
 msgid "Central European (Windows-1250)"
 msgstr "Europe centrale (Windows-1250)"
 
-#: ../src/charset.c:59
+#: ../src/charset.c:57
 msgid "Chinese Simplified (GB18030)"
 msgstr "Chinois simplifié (GB18030)"
 
-#: ../src/charset.c:60
+#: ../src/charset.c:58
 msgid "Chinese Simplified (GB2312)"
 msgstr "Chinois simplifié (GB2312)"
 
-#: ../src/charset.c:61
+#: ../src/charset.c:59
 msgid "Chinese Traditional (Big5)"
 msgstr "Chinois traditionnel (Big5)"
 
-#: ../src/charset.c:62
+#: ../src/charset.c:60
 msgid "Chinese Traditional (Big5-HKSCS)"
 msgstr "Chinois traditionnel (Big5-HKSCS)"
 
-#: ../src/charset.c:63
+#: ../src/charset.c:61
 msgid "Cyrillic (IBM-855)"
 msgstr "Cyrillique (IBM-855)"
 
-#: ../src/charset.c:64
+#: ../src/charset.c:62
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillique (ISO-8859-5)"
 
-#: ../src/charset.c:65
+#: ../src/charset.c:63
 msgid "Cyrillic (ISO-IR-111)"
 msgstr "Cyrillique (ISO-IR-111)"
 
-#: ../src/charset.c:66
+#: ../src/charset.c:64
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillique (KOI8-R)"
 
-#: ../src/charset.c:67
+#: ../src/charset.c:65
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillique (Windows-1251)"
 
-#: ../src/charset.c:68
+#: ../src/charset.c:66
 msgid "Cyrillic/Russian (CP-866)"
 msgstr "Cyrillique / Russe (CP-866)"
 
-#: ../src/charset.c:69
+#: ../src/charset.c:67
 msgid "Cyrillic/Ukrainian (KOI8-U)"
 msgstr "Cyrillique / Ukrainien (KOI8-U)"
 
-#: ../src/charset.c:70
+#: ../src/charset.c:68
 msgid "English (US-ASCII)"
 msgstr "Anglais (US-ASCII)"
 
-#: ../src/charset.c:71
+#: ../src/charset.c:69
 msgid "Greek (ISO-8859-7)"
 msgstr "Grec (ISO-8859-7)"
 
-#: ../src/charset.c:72
+#: ../src/charset.c:70
 msgid "Greek (Windows-1253)"
 msgstr "Grec (Windows-1253)"
 
-#: ../src/charset.c:73
+#: ../src/charset.c:71
 msgid "Hebrew (IBM-862)"
 msgstr "Hébreu (IBM-862)"
 
-#: ../src/charset.c:74
+#: ../src/charset.c:72
 msgid "Hebrew (Windows-1255)"
 msgstr "Hébreu (Windows-1255)"
 
-#: ../src/charset.c:75
+#: ../src/charset.c:73
 msgid "Japanese (EUC-JP)"
 msgstr "Japonais (EUC-JP)"
 
-#: ../src/charset.c:76
+#: ../src/charset.c:74
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonais (ISO-2022-JP)"
 
-#: ../src/charset.c:77
+#: ../src/charset.c:75
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonais (Shift_JIS)"
 
-#: ../src/charset.c:78
+#: ../src/charset.c:76
 msgid "Korean (EUC-KR)"
 msgstr "Coréen (EUC-KR)"
 
-#: ../src/charset.c:79
+#: ../src/charset.c:77
 msgid "Nordic (ISO-8859-10)"
 msgstr "Nordique (ISO-8859-10)"
 
-#: ../src/charset.c:80
+#: ../src/charset.c:78
 msgid "South European (ISO-8859-3)"
 msgstr "Europe du sud (ISO-8859-3)"
 
-#: ../src/charset.c:81
+#: ../src/charset.c:79
 msgid "Thai (TIS-620)"
 msgstr "Thaï (TIS-620)"
 
-#: ../src/charset.c:82
+#: ../src/charset.c:80
 msgid "Turkish (IBM-857)"
 msgstr "Turc (IBM-857)"
 
-#: ../src/charset.c:83
+#: ../src/charset.c:81
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turc (ISO-8859-9)"
 
-#: ../src/charset.c:84
+#: ../src/charset.c:82
 msgid "Turkish (Windows-1254)"
 msgstr "Turc (Windows-1254)"
 
 #. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
-#: ../src/charset.c:86
+#: ../src/charset.c:84
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
@@ -1643,1610 +1591,1396 @@ msgstr "Unicode (UTF-8)"
 #. {N_("Unicode (UTF-16LE)"),                "UTF-16LE"      },
 #. {N_("Unicode (UTF-32BE)"),                "UTF-32BE"      },
 #. {N_("Unicode (UTF-32LE)"),                "UTF-32LE"      },
-#: ../src/charset.c:93
+#: ../src/charset.c:91
 msgid "Vietnamese (VISCII)"
 msgstr "Vietnamien (VISCII)"
 
-#: ../src/charset.c:94
+#: ../src/charset.c:92
 msgid "Vietnamese (Windows-1258)"
 msgstr "Vietnamien (Windows-1258)"
 
-#: ../src/charset.c:95
+#: ../src/charset.c:93
 msgid "Visual Hebrew (ISO-8859-8)"
 msgstr "Hébreu visuel (ISO-8859-8)"
 
-#: ../src/charset.c:96
+#: ../src/charset.c:94
 msgid "Western (IBM-850)"
 msgstr "Occidental (IBM-850)"
 
-#: ../src/charset.c:97
+#: ../src/charset.c:95
 msgid "Western (ISO-8859-1)"
 msgstr "Occidental (ISO-8859-1)"
 
-#: ../src/charset.c:98
+#: ../src/charset.c:96
 msgid "Western (ISO-8859-15)"
 msgstr "Occidental (ISO-8859-15)"
 
-#: ../src/charset.c:99
+#: ../src/charset.c:97
 msgid "Western (Windows-1252)"
 msgstr "Occidental (Windows-1252)"
 
-#: ../src/charset.c:544
+#: ../src/charset.c:511
 #, c-format
 msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
-msgstr "Le nom de fichier '%s' n'a pas pu être converti en UTF-8 (%s)."
+msgstr "Le nom de fichier « %s » n'a pas pu être converti en UTF-8 (%s)."
 
-#: ../src/charset.c:545 ../src/charset.c:644 ../src/charset.c:708
+#: ../src/charset.c:512 ../src/charset.c:611 ../src/charset.c:674
 msgid "Invalid UTF-8"
-msgstr "UTF-8 Invalide"
+msgstr "UTF-8 non valide"
 
-#: ../src/charset.c:643
+#: ../src/charset.c:610
 #, c-format
 msgid ""
 "The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
-"La chaine UTF-8 '%s' n'a pas pu être convertie vers l'encodage du fichier "
+"La chaîne UTF-8 « %s » n'a pas pu être convertie vers le codage du fichier "
 "(%s)."
 
-#: ../src/charset.c:707
+#: ../src/charset.c:673
 #, c-format
 msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
-msgstr "La chaîne '%s' n'a pas pu être convertie en UTF-8 (%s)."
+msgstr "La chaîne « %s » n'a pas pu être convertie en UTF-8 (%s)."
 
 #. Starting messages
-#: ../src/easytag.c:195
-#, fuzzy, c-format
-msgid "Starting EasyTAG %s (PId: %d)…"
-msgstr "Démarrage de EasyTAG %s (PId: %d) ..."
-
-#: ../src/easytag.c:197
-#, fuzzy, c-format
-msgid "Currently using libid3tag version %s…"
-msgstr "Version de libid3tag utilisée: %s ..."
+#: ../src/easytag.c:184
+#, c-format
+msgid "Starting EasyTAG version %s (PID: %d)…"
+msgstr "Démarrage de EasyTAG version %s (PID : %d)…"
 
-#: ../src/easytag.c:200
-#, fuzzy, c-format
-msgid "Currently using id3lib version %d.%d.%d…"
-msgstr "Version de id3lib utilisée: %d.%d.%d ..."
+#: ../src/easytag.c:186
+#, c-format
+msgid "Using libid3tag version %s"
+msgstr "Version %s de libid3tag actuellement utilisée"
 
-#: ../src/easytag.c:207
+#: ../src/easytag.c:189
 #, c-format
-msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
-msgstr "Variable EASYTAGLANG non définie. Paramétrage de la locale à : '%s'"
+msgid "Using id3lib version %d.%d.%d"
+msgstr "Version %d.%d.%d de id3lib actuellement utilisée"
 
-#: ../src/easytag.c:209
+#: ../src/easytag.c:195
 #, c-format
-msgid "Setting locale : '%s'"
-msgstr "Paramétrage de la locale à '%s'"
+msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
+msgstr "Variable EASYTAGLANG non définie. Paramétrage de la locale à : « %s »"
 
-#: ../src/easytag.c:213
-#, fuzzy, c-format
-msgid "Currently using locale '%s' (and eventually '%s')…"
-msgstr "Locale utilisée '%s' (et éventuellement '%s')..."
+#: ../src/easytag.c:197
+#, c-format
+msgid "Setting locale: '%s'"
+msgstr "Paramétrage de la locale à : « %s »"
 
-#: ../src/easytag.c:229
+#: ../src/easytag.c:202
 #, c-format
-msgid "%s %s by %s (compiled %s, %s)\n"
-msgstr "%s %s par %s (compilé le %s, %s)\n"
+msgid "Currently using locale '%s' (and eventually '%s')"
+msgstr "Locale « %s » utilisée actuellement (et éventuellement '%s')"
 
-#: ../src/easytag.c:231
+# FIXME setting directories or settings directory?
+#: ../src/easytag.c:209
+msgid "Unable to create setting directories"
+msgstr "Impossible de créer les répertoires de paramètre"
+
+#: ../src/easytag.c:426 ../src/et_core.c:597 ../src/et_core.c:609
 #, c-format
-msgid "Web Page: %s"
-msgstr "Page Web: %s"
+msgid "Error while querying information for file: '%s' (%s)"
+msgstr ""
+"Erreur lors de la requête d'informations de l'étiquette ID3v2 du fichier "
+"« %s » (%s)"
 
-#: ../src/easytag.c:306
+#: ../src/easytag.c:489
 #, c-format
-msgid "Unknown parameter or path '%s'\n"
-msgstr "Paramètre au chemin '%s' inconnu\n"
+msgid "Cannot open path '%s'"
+msgstr "Impossible d'ouvrir le chemin « %s »"
 
 #.
 #. * Browser
 #.
-#: ../src/easytag.c:430 ../src/prefs.c:142 ../src/prefs.c:143
+#: ../src/easytag.c:581 ../src/prefs.c:142
 msgid "Browser"
 msgstr "Sélecteur"
 
-#: ../src/easytag.c:451 ../src/et_core.c:2691
+#: ../src/easytag.c:603 ../src/et_core.c:2817
 msgid "File"
 msgstr "Fichier"
 
-#: ../src/easytag.c:474
-msgid "Read Only File"
-msgstr "Fichier en Lecture Seule"
-
-#: ../src/easytag.c:477
-msgid "File Link Broken"
-msgstr "Fichier Introuvable"
-
 #. Default values are MPs data
-#. MPEG, Layer versions
-#: ../src/easytag.c:491 ../src/easytag.c:4423 ../src/mpeg_header.c:354
-msgid "MPEG"
-msgstr "MPEG"
-
-#: ../src/easytag.c:493 ../src/easytag.c:4424
-msgid "?, Layer ?"
-msgstr "?, Layer ?"
+#. Nothing to display
+#. gtk_label_set_text(GTK_LABEL(VersionLabel),"");
+#. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
+#. Version changed to encoder version
+#. Encoder version
+#: ../src/easytag.c:635 ../src/easytag.c:4231 ../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 "Encodeur :"
 
-#: ../src/easytag.c:498
+#: ../src/easytag.c:643
 msgid "Bitrate:"
-msgstr "Débit:"
-
-#: ../src/easytag.c:500 ../src/easytag.c:4425
-msgid "? kb/s"
-msgstr "? kb/s"
+msgstr "Débit :"
 
-#: ../src/easytag.c:505
-msgid "Freq:"
-msgstr "Fréq:"
-
-#: ../src/easytag.c:507 ../src/easytag.c:4426
-msgid "? Hz"
-msgstr "? Hz"
+#. Translators: Please try to keep this string as short as possible as it
+#. * is shown in a narrow column.
+#: ../src/easytag.c:653
+msgid "Frequency:"
+msgstr "Fréquence :"
 
 #. Mode
-#: ../src/easytag.c:515 ../src/easytag.c:4427 ../src/mpeg_header.c:377
+#: ../src/easytag.c:664 ../src/easytag.c:4235 ../src/mpeg_header.c:216
 msgid "Mode:"
-msgstr "Mode:"
-
-#: ../src/easytag.c:517 ../src/easytag.c:531 ../src/easytag.c:4428
-#: ../src/easytag.c:4429 ../src/easytag.c:4430
-msgid "?"
-msgstr "?"
+msgstr "Mode :"
 
-#: ../src/easytag.c:522
+#: ../src/easytag.c:671
 msgid "Size:"
-msgstr "Taille:"
+msgstr "Taille :"
 
-#: ../src/easytag.c:524
-msgid "? kb"
-msgstr "? ko"
-
-#: ../src/easytag.c:529
-msgid "Time:"
-msgstr "Durée:"
+#: ../src/easytag.c:678
+msgid "Duration:"
+msgstr "Durée :"
 
 #. Main Frame
-#: ../src/easytag.c:571 ../src/et_core.c:2629
+#: ../src/easytag.c:725 ../src/et_core.c:2747
 msgid "Tag"
-msgstr "Tag"
+msgstr "Étiqueter"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: ../src/easytag.c:593
+#: ../src/easytag.c:747
 msgid "Common"
 msgstr "Général"
 
 #. Title
-#: ../src/easytag.c:605
+#: ../src/easytag.c:754
 msgid "Title:"
-msgstr "Titre:"
+msgstr "Titre :"
 
-#: ../src/easytag.c:618
+#: ../src/easytag.c:768
 msgid "Tag selected files with this title"
-msgstr "Les fichiers sélectionnés sont taggés avec ce titre"
+msgstr "Étiquette les fichiers sélectionnés avec ce titre"
 
 #. Artist
-#: ../src/easytag.c:625
+#: ../src/easytag.c:773
 msgid "Artist:"
-msgstr "Artiste:"
+msgstr "Artiste :"
 
-#: ../src/easytag.c:637
+#: ../src/easytag.c:787
 msgid "Tag selected files with this artist"
-msgstr "Les fichiers sélectionnés sont taggés avec cet artiste"
+msgstr "Étiquette les fichiers sélectionnés avec cet artiste"
 
 #. Album Artist
-#: ../src/easytag.c:643
-#, fuzzy
-msgid "Album Artist:"
-msgstr "Artiste:"
+#: ../src/easytag.c:792
+msgid "Album artist:"
+msgstr "Artiste de l'album :"
 
-#: ../src/easytag.c:655
-#, fuzzy
+#: ../src/easytag.c:806
 msgid "Tag selected files with this album artist"
-msgstr "Les fichiers sélectionnés sont taggés avec cet artiste"
+msgstr "Étiquette les fichiers sélectionnés avec cet artiste de l'album"
 
 #. Album
-#: ../src/easytag.c:661
+#: ../src/easytag.c:811
 msgid "Album:"
-msgstr "Album:"
+msgstr "Album :"
 
-#: ../src/easytag.c:674
+#: ../src/easytag.c:825
 msgid "Tag selected files with this album name"
-msgstr "Les fichiers sélectionnés sont taggés avec cet album"
+msgstr "Étiquette les fichiers sélectionnés avec ce nom d'album"
 
 #. Disc Number
-#: ../src/easytag.c:680
+#: ../src/easytag.c:830
 msgid "CD:"
-msgstr "CD:"
+msgstr "CD :"
 
-#: ../src/easytag.c:696
+#: ../src/easytag.c:847
 msgid "Tag selected files with this disc number"
-msgstr "Les fichiers sélectionnés sont taggés avec ce numéro de disque"
+msgstr "Étiquette les fichiers sélectionnés avec ce numéro de disque"
 
 #. Year
-#: ../src/easytag.c:702
+#: ../src/easytag.c:852
 msgid "Year:"
-msgstr "Année:"
+msgstr "Année :"
 
-#: ../src/easytag.c:719
+#: ../src/easytag.c:872
 msgid "Tag selected files with this year"
-msgstr "Les fichiers sélectionnés sont taggés avec cette année"
+msgstr "Étiquette les fichiers sélectionnés avec cette année"
 
-#: ../src/easytag.c:731
+#: ../src/easytag.c:886
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
-"Renumérote les pistes sélectionnées séquentiellement. Et redémarre à 01 dans "
-"chaque répertoire."
+"Numérote les pistes sélectionnées séquentiellement. Redémarre à 01 dans "
+"chaque sous-répertoire."
 
 #. To have enough space to display the icon
 #. To have enough space to display the icon
-#: ../src/easytag.c:740
+#: ../src/easytag.c:895
 msgid "Track #:"
-msgstr "Piste N°:"
+msgstr "Piste N° :"
 
-#: ../src/easytag.c:767
+#: ../src/easytag.c:926
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr ""
-"Mettre le nombre de fichiers, présents dans le répertoire, pour les pistes "
-"sélectionnées"
+"Définit le nombre de fichiers, dans le même répertoire que le fichier "
+"affiché, au nombre de pistes sélectionnées."
 
-#: ../src/easytag.c:786
+#: ../src/easytag.c:946
 msgid "Tag selected files with this number of tracks"
-msgstr "Les fichiers sélectionnés sont taggés avec ce nombre de pistes"
+msgstr "Étiquette les fichiers sélectionnés avec ce nombre de pistes"
 
 #. Genre
-#: ../src/easytag.c:792
+#: ../src/easytag.c:950
 msgid "Genre:"
-msgstr "Genre:"
+msgstr "Genre :"
 
-#: ../src/easytag.c:818
+#: ../src/easytag.c:978
 msgid "Tag selected files with this genre"
-msgstr "Les fichiers sélectionnés sont taggés avec ce genre"
+msgstr "Étiquette les fichiers sélectionnés avec ce genre"
 
 #. Comment
-#: ../src/easytag.c:824
+#: ../src/easytag.c:983
 msgid "Comment:"
-msgstr "Comment.:"
+msgstr "Commentaire :"
 
-#: ../src/easytag.c:849
+#: ../src/easytag.c:1010
 msgid "Tag selected files with this comment"
-msgstr "Les fichiers sélectionnés sont taggés avec ce commentaire"
+msgstr "Étiquette les fichiers sélectionnés avec ce commentaire"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
-#. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: ../src/easytag.c:858
+#: ../src/easytag.c:1017
 msgid "Composer:"
-msgstr "Compositeur:"
+msgstr "Compositeur :"
 
-#: ../src/easytag.c:870
+#: ../src/easytag.c:1031
 msgid "Tag selected files with this composer"
-msgstr "Les fichiers sélectionnés sont taggés avec ce compositeur"
+msgstr "Étiquette les fichiers sélectionnés avec ce compositeur"
 
-#. Original Artist / Performer
-#: ../src/easytag.c:877
-msgid "Orig. Artist:"
-msgstr "Artiste Orig.:"
+#. 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
+msgid "Orig. artist:"
+msgstr "Art. origin. :"
 
-#: ../src/easytag.c:889
+#: ../src/easytag.c:1052
 msgid "Tag selected files with this original artist"
-msgstr "Les fichiers sélectionnés sont taggés avec cet artiste original"
+msgstr "Étiquette les fichiers sélectionnés avec cet artiste original"
 
 #. Copyright
-#: ../src/easytag.c:896
+#: ../src/easytag.c:1058
 msgid "Copyright:"
-msgstr "Copyright:"
+msgstr "Copyright :"
 
-#: ../src/easytag.c:908
+#: ../src/easytag.c:1072
 msgid "Tag selected files with this copyright"
-msgstr "Les fichiers sélectionnés sont taggés avec ce copyright"
+msgstr "Étiquette les fichiers sélectionnés avec ce copyright"
 
 #. URL
-#: ../src/easytag.c:915
+#: ../src/easytag.c:1078
 msgid "URL:"
-msgstr "URL:"
+msgstr "URL :"
 
-#: ../src/easytag.c:927
+#: ../src/easytag.c:1092
 msgid "Tag selected files with this URL"
-msgstr "Les fichiers sélectionnés sont taggés avec cette URL"
+msgstr "Étiquette les fichiers sélectionnés avec cet URL"
 
 #. Encoded by
-#: ../src/easytag.c:934
+#: ../src/easytag.c:1098
 msgid "Encoded by:"
-msgstr "Encodeur:"
+msgstr "Encodé par :"
 
-#: ../src/easytag.c:946
+#: ../src/easytag.c:1112
 msgid "Tag selected files with this encoder name"
-msgstr "Les fichiers sélectionnés sont taggés avec ce nom d'encodeur"
+msgstr "Étiquette les fichiers sélectionnés avec ce nom d'encodeur"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1009
-msgid "Pictures"
+#: ../src/easytag.c:1146 ../src/et_core.c:3189 ../src/et_core.c:3192
+msgid "Images"
 msgstr "Images"
 
-#. Picture
-#: ../src/easytag.c:1020
-msgid "Pictures:"
-msgstr "Images:"
-
-#: ../src/easytag.c:1040
-msgid "You can use drag and drop to add picture."
-msgstr "Vous pouvez utiliser le Drag and Drop pour ajouter des images."
+#: ../src/easytag.c:1170
+msgid "You can use drag and drop to add an image"
+msgstr "Vous pouvez utiliser le glisser-déposer pour ajouter une image."
 
-#: ../src/easytag.c:1078
-msgid "Tag selected files with these pictures"
-msgstr "Les fichiers sélectionnés sont taggés avec ces images"
+#: ../src/easytag.c:1217
+msgid "Add images to the tag"
+msgstr "Ajouter des images à l'étiquette"
 
-#: ../src/easytag.c:1088
-msgid "Add pictures to the tag (drag and drop is also available)."
-msgstr "Ajouter des images au tag (le Drag and Drop est supporté)."
+#: ../src/easytag.c:1235
+msgid "Remove selected images from the tag"
+msgstr "Supprimer les images sélectionnées de l'étiquette"
 
-#: ../src/easytag.c:1094
-msgid "Remove selected pictures, else all pictures."
-msgstr "Effacer les images sélectionnées, sinon toutes."
+#: ../src/easytag.c:1249
+msgid "Save the selected images to files"
+msgstr "Enregistrer les images sélectionnés dans les fichiers"
 
-#: ../src/easytag.c:1104
-msgid "Save the selected pictures on the hard disk."
-msgstr "Sauvegarder les fichiers sélectionnés sur le disque dur."
+#: ../src/easytag.c:1260
+msgid "Edit image properties"
+msgstr "Modifier les propriétés de l'image"
 
-#: ../src/easytag.c:1111
-msgid "Set properties of the selected pictures."
-msgstr "Définir les propriétés des images sélectionnées."
+#: ../src/easytag.c:1274
+msgid "Tag selected files with these images"
+msgstr "Étiquette les fichiers sélectionnés avec ces images"
 
-#: ../src/easytag.c:1191
+#: ../src/easytag.c:1332
 #, c-format
 msgid "Selected files tagged with title '%s'."
-msgstr "Les fichiers sélectionnés sont taggés avec le titre '%s'."
+msgstr "Les fichiers sélectionnés sont étiquetés avec le titre « %s »."
 
-#: ../src/easytag.c:1193
+#: ../src/easytag.c:1334
 msgid "Removed title from selected files."
-msgstr "Le titre a été supprimé dans les fichiers sélectionnés."
+msgstr "Le titre a été supprimé des fichiers sélectionnés."
 
-#: ../src/easytag.c:1210
+#: ../src/easytag.c:1349
 #, c-format
 msgid "Selected files tagged with artist '%s'."
-msgstr "Les fichiers sélectionnés sont taggés avec l'artiste '%s'."
+msgstr "Les fichiers sélectionnés sont étiquetés avec l'artiste « %s »."
 
-#: ../src/easytag.c:1212
+#: ../src/easytag.c:1351
 msgid "Removed artist from selected files."
-msgstr "L'artiste a été supprimé dans les fichiers sélectionnés."
+msgstr "L'artiste a été supprimé des fichiers sélectionnés."
 
-#: ../src/easytag.c:1229
-#, fuzzy, c-format
+#: ../src/easytag.c:1365
+#, c-format
 msgid "Selected files tagged with album artist '%s'."
-msgstr "Les fichiers sélectionnés sont taggés avec l'artiste '%s'."
+msgstr ""
+"Les fichiers sélectionnés sont étiquetés avec l'artiste de l'album « %s »."
 
-#: ../src/easytag.c:1231
-#, fuzzy
+#: ../src/easytag.c:1367
 msgid "Removed album artist from selected files."
-msgstr "L'artiste a été supprimé dans les fichiers sélectionnés."
+msgstr "L'artiste de l'album a été supprimé des fichiers sélectionnés."
 
-#: ../src/easytag.c:1248
+#: ../src/easytag.c:1382
 #, c-format
 msgid "Selected files tagged with album '%s'."
-msgstr "Les fichiers sélectionnés sont taggés avec l'album '%s'."
+msgstr "Les fichiers sélectionnés sont étiquetés avec l'album « %s »."
 
-#: ../src/easytag.c:1250
+#: ../src/easytag.c:1384
 msgid "Removed album name from selected files."
-msgstr "L'album a été supprimé dans les fichiers sélectionnés."
+msgstr "Le nom d'album a été supprimé des fichiers sélectionnés."
+
+#: ../src/easytag.c:1421
+#, c-format
+msgid "Selected files tagged with disc number '%s/%s'."
+msgstr ""
+"Les fichiers sélectionnés sont étiquetés avec le numéro de disque « %s/%s »."
 
-#: ../src/easytag.c:1267
+#: ../src/easytag.c:1426
 #, c-format
-msgid "Selected files tagged with disc number '%s'."
-msgstr "Les fichiers sélectionnés sont taggés avec le numéro de disque '%s'."
+msgid "Selected files tagged with disc number like 'xx'."
+msgstr ""
+"Les fichiers sélectionnés sont étiquetés avec le numéro de disque du type "
+"« xx »."
 
-#: ../src/easytag.c:1269
+#: ../src/easytag.c:1431
 msgid "Removed disc number from selected files."
-msgstr "Le numéro de disque a été supprimé dans les fichiers sélectionnés."
+msgstr "Le numéro de disque a été supprimé des fichiers sélectionnés."
 
-#: ../src/easytag.c:1286
+#: ../src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with year '%s'."
-msgstr "Les fichiers sélectionnés sont taggés avec l'année '%s'."
+msgstr "Les fichiers sélectionnés sont étiquetés avec l'année « %s »."
 
-#: ../src/easytag.c:1288
+#: ../src/easytag.c:1449
 msgid "Removed year from selected files."
-msgstr "L'année a été supprimée dans les fichiers sélectionnés."
+msgstr "L'année a été supprimée des fichiers sélectionnés."
 
-#: ../src/easytag.c:1316 ../src/easytag.c:1412
+#: ../src/easytag.c:1475 ../src/easytag.c:1566
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr ""
-"Les fichiers sélectionnés sont taggés avec un numéro de piste du type 'xx/"
-"%s'."
+"Les fichiers sélectionnés sont étiquetés avec un numéro de piste du type "
+"« xx/%s »."
 
-#: ../src/easytag.c:1319
+#: ../src/easytag.c:1478
 #, c-format
 msgid "Selected files tagged with track like 'xx'."
 msgstr ""
-"Les fichiers sélectionnés sont taggés avec un numéro de piste du type 'xx'."
+"Les fichiers sélectionnés sont étiquetés avec un numéro de piste du type "
+"« xx »."
 
-#: ../src/easytag.c:1323 ../src/easytag.c:1415
+#: ../src/easytag.c:1482 ../src/easytag.c:1569
 msgid "Removed track number from selected files."
-msgstr "La piste a été supprimée dans les fichiers sélectionnés."
+msgstr "La piste a été supprimée des fichiers sélectionnés."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1381
+#: ../src/easytag.c:1539
 #, c-format
 msgid "Selected tracks numbered sequentially."
-msgstr "Les pistes sélectionnées ont été renumérotées!"
+msgstr "Les pistes sélectionnées ont été renumérotées séquentiellement."
 
-#: ../src/easytag.c:1433
+#: ../src/easytag.c:1585
 #, c-format
 msgid "Selected files tagged with genre '%s'."
-msgstr "Les fichiers sélectionnés sont taggés avec le genre '%s'."
+msgstr "Les fichiers sélectionnés sont étiquetés avec le genre « %s »."
 
-#: ../src/easytag.c:1435
+#: ../src/easytag.c:1587
 msgid "Removed genre from selected files."
-msgstr "Le genre a été supprimé dans les fichiers sélectionnés."
+msgstr "Le genre a été supprimé des fichiers sélectionnés."
 
-#: ../src/easytag.c:1459
+#: ../src/easytag.c:1609
 #, c-format
 msgid "Selected files tagged with comment '%s'."
-msgstr "Les fichiers sélectionnés sont taggés avec le commentaire '%s'."
+msgstr "Les fichiers sélectionnés sont étiquetés avec le commentaire « %s »."
 
-#: ../src/easytag.c:1461
+#: ../src/easytag.c:1611
 msgid "Removed comment from selected files."
-msgstr "Le commentaire a été supprimé dans les fichiers sélectionnés."
+msgstr "Le commentaire a été supprimé des fichiers sélectionnés."
 
-#: ../src/easytag.c:1478
+#: ../src/easytag.c:1625
 #, c-format
 msgid "Selected files tagged with composer '%s'."
-msgstr "Les fichiers sélectionnés sont taggés avec le compositeur '%s'."
+msgstr "Les fichiers sélectionnés sont étiquetés avec le compositeur « %s »."
 
-#: ../src/easytag.c:1480
+#: ../src/easytag.c:1627
 msgid "Removed composer from selected files."
-msgstr "Le compositeur a été supprimé dans les fichiers sélectionnés."
+msgstr "Le compositeur a été supprimé des fichiers sélectionnés."
 
-#: ../src/easytag.c:1497
+#: ../src/easytag.c:1642
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
-msgstr "Les fichiers sélectionnés sont taggés avec l'artiste original '%s'."
+msgstr ""
+"Les fichiers sélectionnés sont étiquetés avec l'artiste original « %s »."
 
-#: ../src/easytag.c:1499
+#: ../src/easytag.c:1644
 msgid "Removed original artist from selected files."
-msgstr "L'artiste original a été supprimé dans les fichiers sélectionnés."
+msgstr "L'artiste original a été supprimé des fichiers sélectionnés."
 
-#: ../src/easytag.c:1516
+#: ../src/easytag.c:1659
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
-msgstr "Les fichiers sélectionnés sont taggés avec le copyright '%s'."
+msgstr "Les fichiers sélectionnés sont étiquetés avec le copyright « %s »."
 
-#: ../src/easytag.c:1518
+#: ../src/easytag.c:1661
 msgid "Removed copyright from selected files."
-msgstr "Le copyright a été supprimé dans les fichiers sélectionnés."
+msgstr "Le copyright a été supprimé des fichiers sélectionnés."
 
-#: ../src/easytag.c:1535
+#: ../src/easytag.c:1676
 #, c-format
 msgid "Selected files tagged with URL '%s'."
-msgstr "Les fichiers sélectionnés sont taggés avec l'URL '%s'."
+msgstr "Les fichiers sélectionnés sont étiquetés avec l'URL « %s »."
 
-#: ../src/easytag.c:1537
+#: ../src/easytag.c:1678
 msgid "Removed URL from selected files."
-msgstr "L'URL a été supprimée dans les fichiers sélectionnés."
+msgstr "L'URL a été supprimé des fichiers sélectionnés."
 
-#: ../src/easytag.c:1554
+#: ../src/easytag.c:1693
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
-msgstr "Les fichiers sélectionnés sont taggés avec le nom de l'encodeur '%s'."
+msgstr ""
+"Les fichiers sélectionnés sont étiquetés avec le nom d'encodeur « %s »."
 
-#: ../src/easytag.c:1556
+#: ../src/easytag.c:1695
 msgid "Removed encoder name from selected files."
-msgstr "Le nom de l'encodeur a été supprimé dans les fichiers sélectionnés."
+msgstr "Le nom de l'encodeur a été supprimé des fichiers sélectionnés."
 
-#: ../src/easytag.c:1591
-msgid "Selected files tagged with pictures."
-msgstr "Les fichiers sélectionnés sont taggés avec ces images."
+#: ../src/easytag.c:1727
+msgid "Selected files tagged with images."
+msgstr "Les fichiers sélectionnés sont étiquetés avec ces images."
 
-#: ../src/easytag.c:1593
-msgid "Removed pictures from selected files."
+#: ../src/easytag.c:1729
+msgid "Removed images from selected files."
 msgstr "Les images ont été supprimées des fichiers sélectionnés."
 
-#: ../src/easytag.c:1832
+#: ../src/easytag.c:2010
 msgid "Select Mode and Mask, and redo the same action"
-msgstr "Sélectionner le Mode et le Masque, et refaire la même action"
+msgstr "Sélectionner le mode et le masque et refaire la même action"
 
-#: ../src/easytag.c:1887
+#: ../src/easytag.c:2062
 msgid "All tags have been scanned"
-msgstr "Tous les tags ont été scannés"
+msgstr "Toutes les étiquettes ont été scannées"
 
-#: ../src/easytag.c:1944
+#: ../src/easytag.c:2118
 msgid "All tags have been removed"
-msgstr "Tous les tags ont été supprimés"
+msgstr "Toutes les étiquettes ont été supprimées"
 
-#: ../src/easytag.c:2234
+#: ../src/easytag.c:2423
 #, c-format
 msgid "A file was changed by an external program"
 msgid_plural "%d files were changed by an external program."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Un fichier a été modifié par un programme externe"
+msgstr[1] "%d fichiers ont été modifiés par un programme externe."
+
+#: ../src/easytag.c:2428
+msgid "Do you want to continue saving the file?"
+msgstr "Souhaitez-vous continuer à enregistrer le fichier ?"
 
-#: ../src/easytag.c:2287 ../src/easytag.c:2308
-#, fuzzy
-msgid "Saving files was stopped…"
-msgstr "La sauvegarde des fichiers a été stoppée..."
+#: ../src/easytag.c:2486 ../src/easytag.c:2506
+msgid "Saving files was stopped"
+msgstr "L'enregistrement des fichiers a été arrêté"
 
-#: ../src/easytag.c:2310
-#, fuzzy
-msgid "All files have been saved…"
-msgstr "Tous les fichiers ont été sauvés..."
+#: ../src/easytag.c:2508
+msgid "All files have been saved"
+msgstr "Tous les fichiers ont été enregistrés"
+
+#: ../src/easytag.c:2643
+#, c-format
+msgid "Cannot delete file (%s)"
+msgstr "Impossible de supprimer le fichier (%s)"
 
-#: ../src/easytag.c:2458
-#, fuzzy
-msgid "Files have been partially deleted…"
-msgstr "Les fichiers ont été partiellement effacés..."
+#: ../src/easytag.c:2664
+msgid "Files have been partially deleted"
+msgstr "Les fichiers ont été partiellement supprimés"
 
-#: ../src/easytag.c:2460
-#, fuzzy
-msgid "All files have been deleted…"
-msgstr "Tous les fichiers ont été effacés..."
+#: ../src/easytag.c:2666
+msgid "All files have been deleted"
+msgstr "Tous les fichiers ont été supprimés"
 
-#: ../src/easytag.c:2575
-#, fuzzy, c-format
+#: ../src/easytag.c:2782
+#, c-format
 msgid "Do you want to write the tag of file '%s'?"
-msgstr ""
-"Voulez-vous écrire le tag du fichier\n"
-"'%s' ?"
+msgstr "Voulez-vous écrire l'étiquette du fichier « %s » ?"
 
-#: ../src/easytag.c:2577
-#, fuzzy
+#: ../src/easytag.c:2784
 msgid "Confirm Tag Writing"
-msgstr "Confirmation"
+msgstr "Confirmer l'écriture de l'étiquette"
 
-#: ../src/easytag.c:2582 ../src/easytag.c:2693 ../src/easytag.c:3320
-#, fuzzy
+#: ../src/easytag.c:2789 ../src/easytag.c:2909 ../src/easytag.c:3172
 msgid "Repeat action for the remaining files"
-msgstr "Répéter la même action pour les autres fichiers"
+msgstr "Répéter la même action pour les fichiers restants"
 
 #. Directories and filename changed
-#: ../src/easytag.c:2657
-#, fuzzy
-msgid "Rename File and Directory…"
-msgstr "Renommer le Fichier et le Répertoire"
+#: ../src/easytag.c:2873 ../src/scan.c:181
+msgid "Rename File and Directory"
+msgstr "Renommer le fichier et le répertoire"
 
-#: ../src/easytag.c:2658
+#: ../src/easytag.c:2874
 msgid "File and directory rename confirmation required"
-msgstr ""
+msgstr "Confirmation du renommage du fichier et du répertoire nécessaire"
 
-#: ../src/easytag.c:2659
-#, fuzzy, c-format
+#: ../src/easytag.c:2875
+#, c-format
 msgid "Do you want to rename the file and directory '%s' to '%s'?"
-msgstr ""
-"Voulez vous renommer le fichier et le répertoire \n"
-"'%s'\n"
-"par \n"
-"'%s' ?"
+msgstr "Voulez-vous renommer le fichier et le répertoire « %s » en « %s » ?"
 
-#: ../src/easytag.c:2665
-#, fuzzy
+#: ../src/easytag.c:2881
 msgid "Directory rename confirmation required"
-msgstr "Répertoire renommé"
+msgstr "Confirmation du renommage du répertoire nécessaire"
 
-#: ../src/easytag.c:2666
-#, fuzzy, c-format
+#: ../src/easytag.c:2882
+#, c-format
 msgid "Do you want to rename the directory '%s' to '%s'?"
-msgstr ""
-"Voulez vous renommer le répertoire \n"
-"'%s'\n"
-"par \n"
-"'%s' ?"
+msgstr "Voulez-vous renommer le répertoire « %s » en « %s » ?"
 
 #. Only filename changed
-#: ../src/easytag.c:2672
-#, fuzzy
-msgid "Rename File…"
-msgstr "Renommer le Fichier..."
+#: ../src/easytag.c:2888
+msgid "Rename File"
+msgstr "Renommer le fichier"
 
-#: ../src/easytag.c:2673
+#: ../src/easytag.c:2889
 msgid "File rename confirmation required"
-msgstr ""
-
-#: ../src/easytag.c:2674
-#, fuzzy, c-format
-msgid "Do you want to rename the file '%s' to '%s'?"
-msgstr ""
-"Voulez vous renommer le fichier \n"
-"'%s'\n"
-"par \n"
-"'%s' ?"
+msgstr "Confirmation du renommage du fichier nécessaire"
 
-#: ../src/easytag.c:2766
+#: ../src/easytag.c:2890
 #, c-format
-msgid "Writing tag of '%s'"
-msgstr "Ecriture du tag de '%s'"
-
-#: ../src/easytag.c:2772
-msgid "Tag(s) written"
-msgstr "Tag(s) écrit"
-
-#: ../src/easytag.c:2782 ../src/easytag.c:2790
-#, fuzzy, c-format
-msgid "Cannot write tag in file '%s' (%s)"
-msgstr "Impossible d'écrire le tag du fichier '%s'! (%s)"
-
-#: ../src/easytag.c:2801
-#, fuzzy, c-format
-msgid "Cannot write tag in file '%s'"
-msgstr ""
-"Impossible d'écrire le tag du fichier '%s'!\n"
-"(%s)"
-
-#: ../src/easytag.c:2804
-#, fuzzy
-msgid "Tag Write Error"
-msgstr " Ecrire "
+msgid "Do you want to rename the file '%s' to '%s'?"
+msgstr "Voulez-vous renommer le fichier « %s » en « %s » ?"
 
-#: ../src/easytag.c:2933
+#: ../src/easytag.c:2956
 #, c-format
-msgid "Renaming file '%s'"
-msgstr "Renomme le fichier '%s'"
-
-#. Renaming file to the temporary filename has failed
-#: ../src/easytag.c:2953
-#, fuzzy, c-format
-msgid "Cannot rename file '%s' to '%s' (%s)"
-msgstr "Impossible de renommer le fichier '%s' par: '%s'! (%s)"
-
-#: ../src/easytag.c:2961 ../src/easytag.c:3002 ../src/easytag.c:3030
-#: ../src/easytag.c:3257
-#, fuzzy, c-format
 msgid "Cannot rename file '%s' to '%s'"
-msgstr "Impossible de renommer le fichier '%s' par: '%s'! (%s)"
-
-#: ../src/easytag.c:2973 ../src/easytag.c:3017 ../src/easytag.c:3043
-#: ../src/easytag.c:3272
-#, fuzzy
-msgid "File(s) not renamed…"
-msgstr "Fichier(s) non renommé(s)..."
+msgstr "Impossible de renommer le fichier « %s » en « %s »"
 
-#: ../src/easytag.c:3012
-#, fuzzy, c-format
+#: ../src/easytag.c:2970
+#, c-format
 msgid "Cannot rename file '%s' to '%s': %s"
-msgstr "Impossible de renommer le fichier '%s' par: '%s'! (%s)"
-
-#: ../src/easytag.c:3038
-#, fuzzy, c-format
-msgid "Cannot rename file '%s' because the following file already exists: '%s'"
-msgstr "Impossible de renommer le fichier %s car ce fichier existe déjà : %s"
+msgstr "Impossible de renommer le fichier « %s » en « %s » : %s"
 
-#: ../src/easytag.c:3072
-#, fuzzy, c-format
-msgid "Cannot create target directory '%s'"
-msgstr "Impossible de créer le répertoire cible : '%s' (%s)"
+# FIXME ngettext
+#: ../src/easytag.c:2974
+msgid "File(s) not renamed"
+msgstr "Fichier(s) non renommé(s)"
 
-#: ../src/easytag.c:3080
-#, fuzzy, c-format
-msgid "Cannot create target directory '%s': %s"
-msgstr "Impossible de créer le répertoire cible : '%s' (%s)"
-
-#. Renaming file has succeeded
-#: ../src/easytag.c:3099
+#: ../src/easytag.c:3086
 #, c-format
-msgid "Renamed file '%s' to '%s'"
-msgstr "Fichier '%s' renommé en '%s'"
-
-#: ../src/easytag.c:3105
-#, fuzzy
-msgid "File(s) renamed…"
-msgstr "Fichier(s) non renommé(s)..."
-
-#: ../src/easytag.c:3121 ../src/easytag.c:3181
-#, fuzzy, c-format
-msgid "Cannot remove old directory '%s'"
-msgstr "Impossible d'effacer l'ancien répertoire '%s'! (%s)"
-
-#: ../src/easytag.c:3124 ../src/easytag.c:3184
-#, fuzzy
-msgid "Remove Directory Error"
-msgstr "Renommer le Répertoire ..."
+msgid "Writing tag of '%s'"
+msgstr "Écriture de l'étiquette de « %s »"
 
-#: ../src/easytag.c:3129
-#, fuzzy, c-format
-msgid "Cannot remove old directory '%s': %s"
-msgstr "Impossible d'effacer l'ancien répertoire '%s'! (%s)"
+# FIXME ngettext
+#: ../src/easytag.c:3093
+msgid "Tag(s) written"
+msgstr "Étiquette(s) écrite(s)"
 
-#. Renaming file has succeeded
-#: ../src/easytag.c:3157
+#: ../src/easytag.c:3108
 #, c-format
-msgid "Moved file '%s' to '%s'"
-msgstr "Fichier '%s' déplacé vers '%s'"
-
-#: ../src/easytag.c:3163
-#, fuzzy
-msgid "File(s) moved…"
-msgstr "Fichier(s) déplacé(s)..."
+msgid "Cannot write tag in file '%s' (%s)"
+msgstr "Impossible d'écrire l'étiquette dans le fichier « %s » (%s)"
 
-#: ../src/easytag.c:3173
+#: ../src/easytag.c:3121
 #, c-format
-msgid ""
-"Can't remove old directory\n"
-"'%s'!\n"
-"(%s)"
-msgstr ""
-"Impossible d'effacer l'ancien répertoire\n"
-"'%s'!\n"
-"(%s)"
+msgid "Cannot write tag in file '%s'"
+msgstr "Impossible d'écrire l'étiquette dans le fichier « %s »"
 
-#: ../src/easytag.c:3189
-#, fuzzy, c-format
-msgid "Cannot remove old directory '%s': (%s)"
-msgstr "Impossible d'effacer l'ancien répertoire '%s'! (%s)"
+#: ../src/easytag.c:3124
+msgid "Tag Write Error"
+msgstr "Erreur d'écriture de l'étiquette"
 
-#. Moving file has failed
-#: ../src/easytag.c:3209
+#: ../src/easytag.c:3169 ../src/easytag.c:3183
 #, c-format
-msgid ""
-"Can't move file '%s'\n"
-" to \n"
-"'%s'!\n"
-"(%s)"
-msgstr ""
-"Impossible de déplacer le fichier '%s'\n"
-" vers \n"
-"'%s'!\n"
-"(%s)"
-
-#: ../src/easytag.c:3217
-#, fuzzy, c-format
-msgid "Cannot move file '%s' to '%s'"
-msgstr "Impossible de déplacer le fichier '%s' vers '%s'! (%s)"
-
-#: ../src/easytag.c:3221
-#, fuzzy
-msgid "File Move Error"
-msgstr "Image non chargée..."
-
-#: ../src/easytag.c:3227
-#, fuzzy, c-format
-msgid "Cannot move file '%s' to '%s': (%s)"
-msgstr "Impossible de déplacer le fichier '%s' vers '%s'! (%s)"
-
-#: ../src/easytag.c:3232
-#, fuzzy
-msgid "File(s) not moved…"
-msgstr "Fichier(s) non renommé(s)..."
-
-#: ../src/easytag.c:3249
-#, c-format
-msgid "Can't rename file '%s' to '%s'! (%s)"
-msgstr "Impossible de renommer le fichier '%s' par: '%s'! (%s)"
-
-#: ../src/easytag.c:3267
-#, fuzzy, c-format
-msgid ""
-"Cannot rename file '%s'\n"
-" to \n"
-"'%s': (%s)"
-msgstr ""
-"Impossible de renommer le fichier '%s'\n"
-" par: \n"
-"'%s'!\n"
-"(%s)"
-
-#: ../src/easytag.c:3317 ../src/easytag.c:3331
-#, fuzzy, c-format
 msgid "Do you really want to delete the file '%s'?"
-msgstr ""
-"Voulez-vous réellement effacer définitivement le fichier\n"
-"'%s' ?"
+msgstr "Voulez-vous vraiment supprimer le fichier « %s » ?"
 
-#: ../src/easytag.c:3323 ../src/easytag.c:3333
-#, fuzzy
+#: ../src/easytag.c:3175 ../src/easytag.c:3185
 msgid "Delete File"
-msgstr "Effacer le(s) Fichier(s) ..."
+msgstr "Supprimer le fichier"
 
-#: ../src/easytag.c:3353
+#: ../src/easytag.c:3210
 #, c-format
 msgid "File '%s' deleted"
-msgstr "Fichier: '%s' effacé"
+msgstr "Fichier « %s » supprimé"
 
-#: ../src/easytag.c:3488
+#: ../src/easytag.c:3345
 #, c-format
-msgid ""
-"Can't read directory :\n"
-"'%s'\n"
-"(%s)"
-msgstr ""
-"Impossible de lire le répertoire :\n"
-"'%s'\n"
-"(%s)"
-
-#: ../src/easytag.c:3493
-#, fuzzy, c-format
 msgid "Cannot read directory '%s'"
-msgstr ""
-"Impossible de lire le répertoire :\n"
-"'%s'\n"
-"(%s)"
+msgstr "Impossible de lire le répertoire « %s »"
 
-#: ../src/easytag.c:3496
-#, fuzzy
+#: ../src/easytag.c:3349
 msgid "Directory Read Error"
-msgstr "Répertoire renommé"
+msgstr "Erreur de lecture du répertoire"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3516
-#, fuzzy, c-format
+#: ../src/easytag.c:3370
+#, c-format
 msgid "Search in progress…"
-msgstr "Recherche en cours..."
+msgstr "Recherche en cours…"
 
-#: ../src/easytag.c:3533 ../src/et_core.c:2698
+#: ../src/easytag.c:3393 ../src/et_core.c:2824
 #, c-format
 msgid "File: '%s'"
-msgstr "Fichier: '%s'"
+msgstr "Fichier : « %s »"
 
-#: ../src/easytag.c:3583
+#: ../src/easytag.c:3443
 #, c-format
-msgid "Found %d file(s) in this directory and subdirectories."
-msgstr "Trouvé(s) %d fichier(s) dans ce répertoire et sous répertoires."
+msgid "Found one file in this directory and subdirectories"
+msgid_plural "Found %d files in this directory and subdirectories"
+msgstr[0] "Un fichier trouvé dans ce répertoire et ses sous-répertoires."
+msgstr[1] "%d fichiers trouvés dans ce répertoire et ses sous-répertoires."
 
-#: ../src/easytag.c:3585
+#: ../src/easytag.c:3450
 #, c-format
-msgid "Found %d file(s) in this directory."
-msgstr "Trouvé(s) %d fichier(s) dans ce répertoire."
+msgid "Found one file in this directory"
+msgid_plural "Found %d files in this directory"
+msgstr[0] "Un fichier trouvé dans ce répertoire."
+msgstr[1] "%d fichiers trouvés dans ce répertoire."
 
-#. And refresh the number of files in this directory
-#: ../src/easytag.c:3598 ../src/et_core.c:2782
-#, c-format
-msgid "%u file(s)"
-msgstr "%u fichier(s)"
+#: ../src/easytag.c:3472
+msgid "No file found in this directory and subdirectories"
+msgstr "Aucun fichier trouvé dans ce répertoire et ses sous-répertoires"
 
-#: ../src/easytag.c:3604
-msgid "No file found in this directory and subdirectories!"
-msgstr "Aucun fichier trouvé dans ce répertoire et sous répertoires!"
+#: ../src/easytag.c:3474
+msgid "No file found in this directory"
+msgstr "Aucun fichier trouvé dans ce répertoire"
+
+#: ../src/easytag.c:3542
+#, c-format
+msgid "Error opening directory '%s' (%s)"
+msgstr "Erreur lors de l'ouverture du répertoire « %s » (%s)"
 
-#: ../src/easytag.c:3606
-msgid "No file found in this directory!"
-msgstr "Aucun fichier trouvé dans ce répertoire!"
+#: ../src/easytag.c:3578
+#, c-format
+msgid "Cannot read directory (%s)"
+msgstr "Impossible de lire le répertoire (%s)"
 
-#: ../src/easytag.c:3694
-#, fuzzy
-msgid "Searching…"
-msgstr "Recherche en cours..."
+#: ../src/easytag.c:3598
+msgid "Searching for audio files…"
+msgstr "Recherche de fichiers audio en cours…"
 
-#. Button to stop...
-#: ../src/easytag.c:3714
-msgid "  STOP the search...  "
-msgstr "  ARRETER la recherche...  "
+#: ../src/easytag.c:3599
+msgid "Searching"
+msgstr "Recherche en cours"
 
-#: ../src/easytag.c:4456
-msgid "Select a directory to browse!"
-msgstr "Séléctionner un répertoire à parcourir!"
+#: ../src/easytag.c:4265
+msgid "Select a directory to browse"
+msgstr "Sélectionner un répertoire à parcourir"
 
 #. Menu items
-#: ../src/easytag.c:4587
+#: ../src/easytag.c:4412
 msgid "Tag selected files with this field"
-msgstr "Tagger les fichiers sélectionnés avec ce champ"
+msgstr "Étiqueter les fichiers sélectionnés avec ce champ"
 
-#: ../src/easytag.c:4598
+#: ../src/easytag.c:4424 ../src/scan.c:2318
 msgid "Convert '_' and '%20' to spaces"
-msgstr "Convertir '_' et '%20' par un espace"
+msgstr "Remplacer « _ » et « %20 » par des espaces"
 
-#: ../src/easytag.c:4605 ../src/scan.c:2686
+#: ../src/easytag.c:4431 ../src/scan.c:2320
 msgid "Convert ' ' to '_'"
-msgstr "Convertir ' ' par '_'"
+msgstr "Remplacer «   » par « _ »"
 
-#. Group: capitalize, ...
-#: ../src/easytag.c:4616 ../src/scan.c:2737
+#: ../src/easytag.c:4442
 msgid "All uppercase"
-msgstr "Tout en majuscule"
+msgstr "Tout en majuscules"
 
-#: ../src/easytag.c:4623 ../src/scan.c:2738
-msgid "All downcase"
-msgstr "Tout en minuscule"
+#: ../src/easytag.c:4449
+msgid "All lowercase"
+msgstr "Tout en minuscules"
 
-#: ../src/easytag.c:4630 ../src/scan.c:2739
+#: ../src/easytag.c:4456
 msgid "First letter uppercase"
 msgstr "Première lettre en majuscule"
 
-#: ../src/easytag.c:4637 ../src/scan.c:2740
+#: ../src/easytag.c:4463
 msgid "First letter uppercase of each word"
 msgstr "Première lettre de chaque mot en majuscule"
 
-#. Group: insert/remove spaces
-#: ../src/easytag.c:4648 ../src/prefs.c:1056 ../src/scan.c:2788
+#: ../src/easytag.c:4474 ../src/prefs.c:1023 ../src/scan.c:2418
 msgid "Remove spaces"
-msgstr "Enlever les espaces"
+msgstr "Supprimer les espaces"
 
-#: ../src/easytag.c:4655
+#: ../src/easytag.c:4481
 msgid "Insert space before uppercase letter"
-msgstr "Insérer un espace avant une majuscule"
+msgstr "Insérer une espace avant une majuscule"
 
-#: ../src/easytag.c:4662
+#: ../src/easytag.c:4488
 msgid "Remove duplicate spaces or underscores"
-msgstr "Supprimer les espaces ou underscores dupliqués"
-
-#. gchar commmand[256];
-#. To send messages to the console...
-#: ../src/easytag.c:4682 ../src/easytag.c:4690
-#, c-format
-msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
-msgstr "EasyTAG %s: Sortie anormale! (PId: %d)."
-
-#: ../src/easytag.c:4683 ../src/easytag.c:4692
-#, c-format
-msgid "Received signal %s (%d)\a"
-msgstr "Signal reçu %s (%d)\a"
-
-#: ../src/easytag.c:4685 ../src/easytag.c:4694
-#, fuzzy, c-format
-msgid ""
-"You have probably found a bug in EasyTAG. Please, send a bug report with a "
-"gdb backtrace ('gdb easytag core' then 'bt' and 'l') and information to "
-"reproduce it to easytag at gmail.com"
-msgstr ""
-"Vous avez probablement trouvé un bug dans EasyTAG. Merci d'envoyer un "
-"rapport de bug accompagné de la trace gdb ('gdb easytag core' puis 'bt' et "
-"'l') et des informations pour le reproduire à l'adresse <easytag at gmail.com>"
+msgstr "Supprimer les espaces ou soulignements en double"
 
-#: ../src/easytag.c:4821
-msgid "Unknown signal"
-msgstr "Signal inconnu"
-
-#: ../src/easytag.c:4837
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: easytag [option] \n"
-"   or: easytag [directory]\n"
-"\n"
-"Option:\n"
-"-------\n"
-"-h, --help        Display this text and exit.\n"
-"-v, --version     Print basic information and exit.\n"
-"\n"
-"Directory:\n"
-"----------\n"
-"%s/path_to/files  Use an absolute path to load,\n"
-"path_to/files     Use a relative path.\n"
-"\n"
-msgstr ""
-"\n"
-"Usage: easytag [option] \n"
-"   or: easytag [répertoire]\n"
-"\n"
-"Option:\n"
-"-------\n"
-"-h, --help        Affiche ce texte et quitte.\n"
-"-v, --version     Affiche les informations de base et quitte.\n"
-"\n"
-"Répertoire:\n"
-"-----------\n"
-"%s/path_to/files  Utiliser un chemin absolu à charger,\n"
-"path_to/files     Utiliser un chemin relatif.\n"
-"\n"
+#: ../src/easytag.c:4495
+msgid "Remove all text"
+msgstr "Supprimer tous le texte"
 
-#: ../src/easytag.c:4865
+#: ../src/easytag.c:4514
 msgid "EasyTAG: Normal exit."
-msgstr "EasyTAG: Sortie normale."
+msgstr "EasyTAG : fermeture normale."
 
-#: ../src/easytag.c:4914
-#, fuzzy
+#: ../src/easytag.c:4566
 msgid "Do you want to save them before quitting?"
-msgstr ""
-"Voulez vous renommer le fichier \n"
-"'%s'\n"
-"par \n"
-"'%s' ?"
+msgstr "Voulez vous les enregistrer avant de quitter ?"
 
-#: ../src/easytag.c:4937
-#, fuzzy
+#: ../src/easytag.c:4593
 msgid "Do you really want to quit?"
-msgstr " Voulez-vous réellement quitter le programme ?"
+msgstr "Voulez-vous réellement quitter le programme ?"
+
+#: ../src/et_core.c:510
+#, c-format
+msgid "Error reading tag from ogg file (%s)"
+msgstr "Erreur lors de la lecture de l'étiquette d'un fichier ogg (%s)"
 
-#: ../src/et_core.c:631
+#: ../src/et_core.c:539
+#, c-format
+msgid "Error reading tag from Opus file (%s)"
+msgstr "Erreur lors de la lecture de l'étiquette d'un fichier Opus (%s)"
+
+#: ../src/et_core.c:682
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
-msgstr "Corrections automatiques appliquées sur le fichier '%s'."
+msgstr "Correction automatique appliquée sur le fichier « %s »."
 
-#: ../src/et_core.c:2595
+#: ../src/et_core.c:2707
 msgid "ID3 Tag"
-msgstr "Tag ID3"
+msgstr "Étiquette ID3"
 
-#: ../src/et_core.c:2601
+#: ../src/et_core.c:2713
 msgid "Ogg Vorbis Tag"
-msgstr "Tag Ogg Vorbis"
+msgstr "Étiquette Ogg Vorbis"
 
-#: ../src/et_core.c:2607
+#: ../src/et_core.c:2719
 msgid "FLAC Vorbis Tag"
-msgstr "Tag FLAC Vorbis"
+msgstr "Étiquette FLAC Vorbis"
 
-#: ../src/et_core.c:2612
+#: ../src/et_core.c:2724
 msgid "APE Tag"
-msgstr "Tag APE"
+msgstr "Étiquette APE"
 
-#: ../src/et_core.c:2617
+#: ../src/et_core.c:2729
 msgid "MP4/M4A/AAC Tag"
-msgstr "Tag MP4/M4A/AAC"
+msgstr "Étiquette MP4/M4A/AAC"
 
-#: ../src/et_core.c:2623
+#: ../src/et_core.c:2735
 msgid "Wavpack Tag"
-msgstr "Tag Wavpack"
+msgstr "Étiquette Wavpack"
 
-#: ../src/et_core.c:2643
+#: ../src/et_core.c:2741
+msgid "Opus Tag"
+msgstr "Étiquette Opus"
+
+#: ../src/et_core.c:2761
 msgid "MP3 File"
 msgstr "Fichier MP3"
 
-#: ../src/et_core.c:2647
+#: ../src/et_core.c:2765
 msgid "MP2 File"
 msgstr "Fichier MP2"
 
-#: ../src/et_core.c:2653
+#: ../src/et_core.c:2771
 msgid "Ogg Vorbis File"
 msgstr "Fichier Ogg Vorbis"
 
-#: ../src/et_core.c:2659
+#: ../src/et_core.c:2777
 msgid "Speex File"
 msgstr "Fichier Speex"
 
-#: ../src/et_core.c:2665
+#: ../src/et_core.c:2783
 msgid "FLAC File"
 msgstr "Fichier FLAC"
 
-#: ../src/et_core.c:2670
+#: ../src/et_core.c:2788
 msgid "MusePack File"
 msgstr "Fichier MusePack"
 
-#: ../src/et_core.c:2674
+#: ../src/et_core.c:2792
 msgid "Monkey's Audio File"
 msgstr "Fichier Monkey's Audio"
 
-#: ../src/et_core.c:2679
+#: ../src/et_core.c:2797
 msgid "MP4/AAC File"
 msgstr "Fichier MP4/AAC"
 
-#: ../src/et_core.c:2685
+#: ../src/et_core.c:2803
 msgid "Wavpack File"
 msgstr "Fichier Wavpack"
 
-#: ../src/et_core.c:2968
+#: ../src/et_core.c:2809
+msgid "Opus File"
+msgstr "Fichier Opus"
+
+#: ../src/et_core.c:2868 ../src/et_core.c:2923
+msgid "File not found"
+msgstr "Fichier introuvable"
+
+#: ../src/et_core.c:2873
+#, c-format
+msgid "Cannot query file information (%s)"
+msgstr "Impossible d'obtenir les informations du fichier (%s)"
+
+#: ../src/et_core.c:2907
+msgid "Read-only file"
+msgstr "Fichier en lecture seule"
+
+#. And refresh the number of files in this directory
+#: ../src/et_core.c:2971
+#, c-format
+msgid "One file"
+msgid_plural "%u files"
+msgstr[0] "Un fichier"
+msgstr[1] "%u fichiers"
+
+#: ../src/et_core.c:3175
 #, c-format
-msgid "Pictures (%d)"
+msgid "Images (%d)"
 msgstr "Images (%d)"
 
+# Ce sont des kbits/s, pas des koctets/s
 #. Bitrate
-#: ../src/et_core.c:3007 ../src/flac_header.c:297
-#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:275
-#: ../src/mpeg_header.c:367 ../src/musepack_header.c:88
-#: ../src/ogg_header.c:257 ../src/wavpack_header.c:78
+#: ../src/et_core.c:3217 ../src/flac_header.c:205
+#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
+#: ../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
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: ../src/et_core.c:3012 ../src/flac_header.c:302
-#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:280
-#: ../src/mpeg_header.c:372 ../src/musepack_header.c:93
-#: ../src/ogg_header.c:262 ../src/wavpack_header.c:83
+#: ../src/et_core.c:3222 ../src/flac_header.c:210
+#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
+#: ../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:3155 ../src/scan.c:676
-#, fuzzy, c-format
+#: ../src/et_core.c:3368 ../src/scan.c:686
+#, c-format
 msgid "Could not convert filename '%s' into system filename encoding"
 msgstr ""
-"Impossible de convertir le nom de fichier '%s' vers l'encodage du système de "
-"fichiers."
+"Impossible de convertir le nom du fichier « %s » vers le codage du nom de "
+"fichiers système"
 
-#: ../src/et_core.c:3157
-#, fuzzy
+#: ../src/et_core.c:3370
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr ""
-"Le nom de fichier : '%s'\n"
-"ne peut pas être converti vers l'encodage du système de fichiers\n"
-"(Essayez de définir la variable d'environnement G_FILENAME_ENCODING)."
+"Essai de paramétrage de la variable d'environnement G_FILENAME_ENCODING."
 
-#: ../src/et_core.c:3158 ../src/scan.c:678
+#: ../src/et_core.c:3371 ../src/scan.c:688
 msgid "Filename translation"
 msgstr "Conversion du nom de fichier"
 
-#: ../src/et_core.c:4666 ../src/et_core.c:4674
+#: ../src/et_core.c:4076
 #, c-format
-msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
+msgid "Error writing tag type %d to file %s (%s)"
 msgstr ""
-"Le nom de fichier '%s' est trop long de %d caractères et sera tronqué!\n"
-
-#. Nothing to display
-#. gtk_label_set_text(GTK_LABEL(VersionLabel),"");
-#. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
-#. Version changed to encoder version
-#. Encoder version
-#: ../src/flac_header.c:293 ../src/monkeyaudio_header.c:96
-#: ../src/musepack_header.c:98 ../src/ogg_header.c:245
-#: ../src/wavpack_header.c:72
-#, c-format
-msgid "Encoder:"
-msgstr "Encodeur:"
+"Erreur lors de l'écriture de l'étiquette de type %d dans le fichier %s (%s)"
 
 #. Mode
 #. Mode
 #. mpeg4ip library seems to always return -1
 #. Mode
-#: ../src/flac_header.c:307 ../src/mp4_header.c:286 ../src/ogg_header.c:267
-#: ../src/wavpack_header.c:88
+#: ../src/flac_header.c:215 ../src/mp4_header.c:145 ../src/ogg_header.c:411
+#: ../src/opus_header.c:237 ../src/wavpack_header.c:88
 msgid "Channels:"
-msgstr "Canaux:"
+msgstr "Canaux :"
 
-#: ../src/flac_tag.c:142 ../src/flac_tag.c:863 ../src/flac_tag.c:873
+#: ../src/flac_tag.c:131 ../src/flac_tag.c:850 ../src/flac_tag.c:860
 #, c-format
-msgid "ERROR while opening file: '%s' as FLAC (%s)."
-msgstr "ERREUR lors de l'ouverture du fichier: '%s' comme FLAC (%s)."
+msgid "Error while opening file: '%s' as FLAC (%s)."
+msgstr "Erreur lors de l'ouverture du fichier : « %s » en FLAC (%s)."
 
-#: ../src/flac_tag.c:329 ../src/ogg_tag.c:298
+#: ../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 "
 "be lost while saving tag."
 msgstr ""
-"La valeur de l'année '%s' semble ne pas être valide dans le fichier '%s'. "
-"Cette information sera perdue lors de la sauvegarde du tag."
+"La valeur de l'année « %s » semble non valide dans le fichier « %s ». Cette "
+"information sera perdue lors de l'enregistrement de l'étiquette."
 
-#: ../src/flac_tag.c:1081
+#: ../src/flac_tag.c:1061
 #, c-format
 msgid "Picture block isn't valid: '%s'"
-msgstr "Le bloc image n'est pas valide : '%s'"
+msgstr "Le bloc image n'est pas valide : « %s »"
 
-#: ../src/flac_tag.c:1115 ../src/ogg_tag.c:849
+#: ../src/flac_tag.c:1094
 #, c-format
-msgid "ERROR: Failed to write comments to file '%s' (%s)."
-msgstr "ERREUR: Impossible d'écrire les commentaires du fichier '%s' (%s)."
+msgid "Error: Failed to write comments to file '%s' (%s)."
+msgstr "Erreur : impossible d'écrire les commentaires au fichier « %s » (%s)."
 
-#: ../src/flac_tag.c:1120 ../src/ogg_tag.c:856
+#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1166
 #, c-format
 msgid "Written tag of '%s'"
-msgstr "Le tag de '%s' a été écrit"
+msgstr "L'étiquette de « %s » a été écrite"
 
-#: ../src/id3_tag.c:500
+#: ../src/id3_tag.c:158
+#, c-format
+msgid "Error while reading file: '%s' (%s)"
+msgstr "Erreur lors de l'ouverture du fichier : « %s » (%s)."
+
+#: ../src/id3_tag.c:170
+#, c-format
+msgid ""
+"As the following corrupted file '%s' will cause an error in id3lib, it will "
+"not be processed"
+msgstr ""
+"Comme ce fichier corrompu « %s » va causer une erreur dans id3lib, il ne "
+"sera pas traité."
+
+#: ../src/id3_tag.c:172
+msgid "Corrupted file"
+msgstr "Fichier corrompu"
+
+#: ../src/id3_tag.c:555
 #, c-format
 msgid "Removed tag of '%s'"
-msgstr "Le tag de '%s' a été supprimé"
+msgstr "L'étiquette de « %s » a été supprimée"
 
-#: ../src/id3_tag.c:504 ../src/id3_tag.c:604
+#: ../src/id3_tag.c:559 ../src/id3_tag.c:659
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
-msgstr "Erreur lors de la suppression du tag ID3v1 de '%s' (%s)"
+msgstr "Erreur lors de la suppression de l'étiquette ID3v1 de « %s » (%s)"
 
-#: ../src/id3_tag.c:506 ../src/id3_tag.c:576
+#: ../src/id3_tag.c:561 ../src/id3_tag.c:631
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
-msgstr "Erreur lors de la suppression du tag ID3v2 de '%s' (%s)"
+msgstr "Erreur lors de la suppression de l'étiquette ID3v2 de « %s » (%s)"
 
-#: ../src/id3_tag.c:525
+#: ../src/id3_tag.c:580
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
-msgstr "Erreur lors de la mise à jour du tag ID3v2 de '%s' (%s)"
+msgstr "Erreur lors de la mise à jour de l'étiquette ID3v2 de « %s » (%s)"
 
-#: ../src/id3_tag.c:553
+#: ../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 ""
+"Vous avez essayé d'enregistrer cette étiquette en Unicode, mais il a été "
+"détecté que votre version d'id3lib est buggée."
 
-#: ../src/id3_tag.c:555
-#, fuzzy, c-format
+#: ../src/id3_tag.c:610
+#, c-format
 msgid ""
 "If you reload this file, some characters in the tag may not be displayed "
 "correctly. Please, apply the patch src/id3lib/"
-"patch_id3lib_3.8.3_UTF16_writing_bug.diff to id3lib, which isavailable in "
+"patch_id3lib_3.8.3_UTF16_writing_bug.diff to id3lib, which is available in "
 "the EasyTAG package sources.\n"
 "Note that this message will appear only once.\n"
 "\n"
-"File : %s"
+"File: %s"
 msgstr ""
-"Vous avez essayé de sauver le tag en Unicode mais il a été détecté que votre "
-"version de id3lib est bugguée.\n"
-"Si vous rechargez le fichier, certains caractères dans le tag pourraient ne "
-"pas être affichés correctement...\n"
-"Pour corriger cela : appliquez à id3lib le patch src/id3lib/"
-"patch_id3lib_3.8.3_UTF16_writing_bug.diff\n"
-"disponible dans les sources de EasyTAG.\n"
-"Notez que ce message apparaîtra seulement une fois.\n"
+"Si vous rechargez ce fichier, certains caractères de l'étiquette peuvent ne "
+"pas s'afficher correctement. Veuillez appliquer le patch src/id3lib/"
+"patch_id3lib_3.8.3_UTF16_writing_bug.diff à id3lib. Il est disponible dans "
+"les sources du paquet EasyTAG.\n"
+"Veuillez noter que ce message ne s'affichera qu'une seule fois.\n"
 "\n"
-"Fichier : %s"
+"Fichier : %s"
 
-#: ../src/id3_tag.c:562
+#: ../src/id3_tag.c:617
 msgid "Buggy id3lib"
-msgstr ""
+msgstr "Bug d'id3lib"
 
-#: ../src/id3_tag.c:596
+#: ../src/id3_tag.c:651
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
-msgstr "Erreur lors de la mise à jour du tag ID3v1 de '%s' (%s)"
+msgstr "Erreur lors de la mise à jour de l'étiquette ID3v1 de « %s » (%s)"
 
-#: ../src/id3_tag.c:610 ../src/id3v24_tag.c:1034
+#: ../src/id3_tag.c:665 ../src/id3v24_tag.c:1048
 #, c-format
 msgid "Updated tag of '%s'"
-msgstr "Le tag de '%s' a été mis à jour"
+msgstr "L'étiquette de « %s » a été mise à jour"
 
-#: ../src/id3_tag.c:629
+#: ../src/id3_tag.c:684
 msgid "No error reported"
-msgstr "Aucune erreur reportée"
+msgstr "Aucune erreur n'a été rapportée"
 
-#: ../src/id3_tag.c:631
+#: ../src/id3_tag.c:686
 msgid "No available memory"
 msgstr "Pas de mémoire disponible"
 
-#: ../src/id3_tag.c:633
+#: ../src/id3_tag.c:688
 msgid "No data to parse"
-msgstr "Pas de donnée à analyser"
+msgstr "Aucune donnée à analyser"
 
-#: ../src/id3_tag.c:635
+#: ../src/id3_tag.c:690
 msgid "Improperly formatted data"
-msgstr "Donnée mal formatée"
+msgstr "Données mal formatées"
 
-#: ../src/id3_tag.c:637
+#: ../src/id3_tag.c:692
 msgid "No buffer to write to"
-msgstr "Pas de tampon vers lequel écrire"
+msgstr "Aucun tampon vers lequel écrire"
 
-#: ../src/id3_tag.c:639
+#: ../src/id3_tag.c:694
 msgid "Buffer is too small"
 msgstr "Le tampon est trop petit"
 
-#: ../src/id3_tag.c:641
+#: ../src/id3_tag.c:696
 msgid "Invalid frame ID"
-msgstr "ID du frame invalide"
+msgstr "Identifiant du cadre non valide"
 
-#: ../src/id3_tag.c:643
+#: ../src/id3_tag.c:698
 msgid "Requested field not found"
 msgstr "Le champ demandé n'a pas été trouvé"
 
-#: ../src/id3_tag.c:645
+#: ../src/id3_tag.c:700
 msgid "Unknown field type"
-msgstr "Type du champ inconnu"
+msgstr "Type de champ inconnu"
 
-#: ../src/id3_tag.c:647
+#: ../src/id3_tag.c:702
 msgid "Tag is already attached to a file"
-msgstr "Le tag est déjà attaché à un fichier"
+msgstr "L'étiquette est déjà jointe à un fichier"
 
-#: ../src/id3_tag.c:649
+#: ../src/id3_tag.c:704
 msgid "Invalid tag version"
-msgstr "Version du tag invalide"
+msgstr "Version de l'étiquette non valide"
 
-#: ../src/id3_tag.c:651
+#: ../src/id3_tag.c:706
 msgid "No file to parse"
-msgstr "Pas de fichier à analyser"
+msgstr "Aucun fichier à analyser"
 
-#: ../src/id3_tag.c:653
+#: ../src/id3_tag.c:708
 msgid "Attempting to write to a read-only file"
 msgstr "Tentative d'écriture vers un fichier en lecture seule"
 
-#: ../src/id3_tag.c:655
+#: ../src/id3_tag.c:710
 msgid "Error in compression/uncompression"
 msgstr "Erreur dans la compression/décompression"
 
-#: ../src/id3_tag.c:657
-msgid "Unknown error message!"
-msgstr "Message d'erreur inconnu!"
+#: ../src/id3_tag.c:712
+msgid "Unknown error message"
+msgstr "Message d'erreur inconnu"
 
-#: ../src/id3_tag.c:1235
-#, fuzzy, c-format
-msgid ""
-"As the following corrupted file '%s' will cause an error in id3lib, it will "
-"not be processed"
-msgstr ""
-"Comme le fichier corrompu : '%s'\n"
-"va causer une erreur dans id3lib, il ne sera pas traité par le programme."
+#: ../src/id3_tag.c:1316
+#, c-format
+msgid "Error while creating temporary file: '%s'"
+msgstr "Erreur lors de la création d'un fichier temporaire : « %s »"
 
-#: ../src/id3_tag.c:1237
-#, fuzzy
-msgid "Corrupted file"
-msgstr "Fichier corrompu..."
+#: ../src/id3_tag.c:1323
+msgid "Error while creating temporary file"
+msgstr "Erreur lors de la création du fichier temporaire"
 
-#: ../src/id3v24_tag.c:116
-#, fuzzy, c-format
-msgid ""
-"ERROR while opening file: '%s' (%s).\n"
-"\a"
-msgstr "ERREUR lors de l'ouverture du fichier: '%s' (%s)."
+#: ../src/id3_tag.c:1343
+#, c-format
+msgid "Error while writing to file: '%s' (%s)"
+msgstr "Erreur lors de l'écriture dans le fichier : « %s » (%s)"
 
-#: ../src/id3v24_tag.c:1517
+#. Translators: The first string is a filename, the
+#. * second string is the number of bytes that were
+#. * missing (not read for some reason) while reading from
+#. * the file.
+#.
+#: ../src/id3v24_tag.c:1503
 #, c-format
-msgid "Can't write tag of file '%s' (were read %d bytes instead of %d bytes!)"
-msgstr ""
+msgid "Cannot write tag of file ‘%s’ (a byte was missing)"
+msgid_plural "Cannot write tag of file ‘%s’ (%s bytes were missing)"
+msgstr[0] ""
+"Impossible d'écrire l'étiquette dans le fichier « %s » (un octet manquait)"
+msgstr[1] ""
+"Impossible d'écrire l'étiquette dans le fichier « %s » (%s octets manquaient)"
 
-#: ../src/id3v24_tag.c:1536
-#, fuzzy, c-format
+#: ../src/id3v24_tag.c:1524
+#, c-format
+msgid "Cannot save tag of file '%s'"
+msgstr "Impossible d'enregistrer l'étiquette dans le fichier « %s »"
+
+#: ../src/id3v24_tag.c:1535
+#, c-format
 msgid "Size error while saving tag of '%s'"
-msgstr "Erreur lors de la suppression du tag ID3v1 de '%s' (%s)"
+msgstr "Erreur de taille lors de l'enregistrement de l'étiquette de « %s »"
 
-#: ../src/log.c:95
+#: ../src/log.c:100
 msgid "Log"
 msgstr "Journal"
 
-#: ../src/misc.c:778
-#, fuzzy
-msgid "Select file…"
-msgstr "Sélectionner un fichier..."
-
-#: ../src/misc.c:783
-#, fuzzy
-msgid "Select directory…"
-msgstr "Sélectionner un répertoire..."
+#: ../src/misc.c:719
+msgid "You must type a program name"
+msgstr "Vous devez saisir un nom de programme"
 
-#: ../src/misc.c:862
-#, fuzzy
-msgid "No audio player defined"
-msgstr "Aucun lecteur audio n'a été défini!"
-
-#: ../src/misc.c:863
-#, fuzzy
-msgid "Audio Player Warning"
-msgstr "Lancer Lecteur Audio"
+#: ../src/misc.c:720
+msgid "Program Name Error"
+msgstr "Erreur de nom de programme"
 
-#: ../src/misc.c:873
+#: ../src/misc.c:799
 #, c-format
-msgid "The program '%s' can't be found!"
-msgstr "Le programme '%s' n'a pas été trouvé!"
+msgid "Executed command: %s"
+msgstr "Commande exécutée : %s"
 
-#: ../src/misc.c:964
+#: ../src/misc.c:806
 #, c-format
-msgid "Can't execute %s (%s)!\n"
-msgstr "Impossible d'exécuter %s (%s)!\n"
-
-#. Units Tab of file size (bytes,kilobytes,...)
-#: ../src/misc.c:1129 ../src/misc.c:1148
-msgid "B"
-msgstr "o"
-
-#: ../src/misc.c:1129 ../src/misc.c:1148
-msgid "KB"
-msgstr "Ko"
+msgid "Failed to launch program: %s"
+msgstr "Échec du lancement du programme : %s"
 
-#: ../src/misc.c:1129 ../src/misc.c:1148
-msgid "MB"
-msgstr "Mo"
+#: ../src/misc.c:823
+msgid "Select File"
+msgstr "Sélectionner un fichier"
 
-#: ../src/misc.c:1129 ../src/misc.c:1148
-msgid "GB"
-msgstr "Go"
+#: ../src/misc.c:829
+msgid "Select Directory"
+msgstr "Sélectionner un répertoire"
 
-#: ../src/misc.c:1129 ../src/misc.c:1148
-msgid "TB"
-msgstr "To"
-
-#: ../src/misc.c:1240
-msgid "Generate a playlist"
+#: ../src/misc.c:1141
+msgid "Generate Playlist"
 msgstr "Générer une liste de lecture"
 
-#: ../src/misc.c:1264
+#: ../src/misc.c:1165
 msgid "M3U Playlist Name"
-msgstr "Nom de la Liste de Lecture M3U"
+msgstr "Nom de la liste de lecture M3U"
 
-#: ../src/misc.c:1278
+#: ../src/misc.c:1180
 msgid "Use directory name"
 msgstr "Utiliser le nom du répertoire"
 
-#: ../src/misc.c:1302 ../src/misc.c:1400
-msgid "Edit Masks"
-msgstr "Editer les Masques"
-
 #. Playlist options
-#: ../src/misc.c:1310
+#: ../src/misc.c:1197
 msgid "Playlist Options"
-msgstr "Options de la Liste de Lecture"
+msgstr "Options de la liste de lecture"
 
-#: ../src/misc.c:1316
+#: ../src/misc.c:1203
 msgid "Include only the selected files"
 msgstr "Inclure seulement les fichiers sélectionnés"
 
-#: ../src/misc.c:1319
+#: ../src/misc.c:1206
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
 msgstr ""
-"Si activé, seulement les fichiers sélectionnés seront écrits dans la liste "
-"de lecture. Sinon, tous les fichiers seront pris."
+"Si activé, seuls les fichiers sélectionnés sont écrits dans la liste de "
+"lecture. Si désactivé, tous les fichiers sont écrits."
 
-#: ../src/misc.c:1326
+#: ../src/misc.c:1209
 msgid "Use full path for files in playlist"
-msgstr "Utiliser le chemin complet pour les fichiers"
+msgstr "Utiliser le chemin absolu pour les fichiers de la liste de lecture"
 
-#: ../src/misc.c:1329
+#: ../src/misc.c:1212
 msgid "Use relative path for files in playlist"
-msgstr "Utiliser le chemin relatif pour les fichiers"
+msgstr "Utiliser le chemin relatif pour les fichiers de la liste de lecture"
 
 #. Create playlist in parent directory
-#: ../src/misc.c:1339
+#: ../src/misc.c:1218
 msgid "Create playlist in the parent directory"
-msgstr "Créer la Liste de Lecture dans le rép. supérieur"
+msgstr "Créer la liste de lecture dans le répertoire parent"
 
-#: ../src/misc.c:1342
+#: ../src/misc.c:1221
 msgid "If activated, the playlist will be created in the parent directory."
-msgstr ""
-"Si activé, la Liste de Lecture sera créée dans le répertoire supérieur."
+msgstr "Si activé, la liste de lecture est créée dans le répertoire parent."
 
 #. DOS Separator
-#: ../src/misc.c:1346
+#: ../src/misc.c:1225
 msgid "Use DOS directory separator"
 msgstr "Utiliser le séparateur de répertoires DOS"
 
-#: ../src/misc.c:1351
+#: ../src/misc.c:1231
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
-"Cette option remplace le séparateur de répertoires UNIX '/' par celui de DOS "
-"'\\'."
+"Cette option remplace le séparateur de répertoires UNIX « / » par celui de "
+"DOS « \\ »."
 
-#: ../src/misc.c:1360
+#: ../src/misc.c:1240
 msgid "Playlist Content"
-msgstr "Contenu de la Liste de Lecture"
+msgstr "Contenu de la liste de lecture"
 
-#: ../src/misc.c:1366
+#: ../src/misc.c:1246
 msgid "Write only list of files"
-msgstr "Ecrire seulement la liste des fichiers"
+msgstr "Écrire seulement la liste des fichiers"
 
-#: ../src/misc.c:1370
+#: ../src/misc.c:1250
 msgid "Write info using filename"
-msgstr "Ecrire les infos en utilisant le nom du fichier"
-
-#: ../src/misc.c:1373
-msgid "Write info using :"
-msgstr "Ecrire les infos en utilisant :"
-
-#: ../src/misc.c:1645
-#, fuzzy, c-format
-msgid "Playlist file '%s' already exists"
-msgstr ""
-"Le fichier '%s' existe déjà!\n"
-"L'écraser?"
-
-#: ../src/misc.c:1647
-#, fuzzy
-msgid "Do you want to save the playlist, overwriting the existing file?"
-msgstr ""
-"Voulez-vous écrire le tag du fichier\n"
-"'%s' ?"
+msgstr "Écrire les informations en utilisant le nom du fichier"
 
-#: ../src/misc.c:1649
-#, fuzzy
-msgid "Write Playlist"
-msgstr "Ecrire Liste de Lecture..."
+#: ../src/misc.c:1253
+msgid "Write info using:"
+msgstr "Écrire les informations en utilisant :"
 
-#: ../src/misc.c:1667
-#, fuzzy, c-format
+#: ../src/misc.c:1467
+#, c-format
 msgid "Cannot write playlist file '%s'"
-msgstr ""
-"Impossible d'écrire la liste de lecture '%s'!\n"
-"(%s)"
+msgstr "Impossible d'écrire la liste de lecture « %s »"
 
-#: ../src/misc.c:1670
-#, fuzzy
+#: ../src/misc.c:1471
 msgid "Playlist File Error"
-msgstr "Image non chargée..."
+msgstr "Erreur du fichier liste de lecture"
 
-#: ../src/misc.c:1677
+#: ../src/misc.c:1479
 #, c-format
 msgid "Written playlist file '%s'"
-msgstr "La liste de lecture '%s' a été écrite"
+msgstr "La liste de lecture « %s » a été écrite"
 
-#: ../src/misc.c:1923
+#: ../src/misc.c:1543 ../src/scan.c:2903 ../src/scan.c:2965
+msgid "Invalid scanner mask"
+msgstr "Masque de scanner non valide"
+
+#: ../src/misc.c:1907
 msgid "CD"
 msgstr "CD"
 
-#: ../src/misc.c:1932
-msgid "Encoded by"
-msgstr "Encodeur"
-
-#: ../src/misc.c:1943
-msgid "Search a file"
-msgstr "Rechercher un fichier"
+#: ../src/misc.c:1929
+msgid "Find Files"
+msgstr "Rechercher des fichiers"
 
-#: ../src/misc.c:1981
+#: ../src/misc.c:1961
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
-"Tapez le mot à rechercher dans les fichiers. Ou ne rien taper pour tout "
-"afficher."
+"Saisissez le mot à rechercher dans les fichiers, ou laissez vide pour "
+"afficher tous les fichiers."
 
 #. Where...
-#: ../src/misc.c:1987
-msgid "In :"
-msgstr "Dans :"
-
-#: ../src/misc.c:1990
-msgid "the File Name"
-msgstr "le Nom de fichier"
-
-#. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: ../src/misc.c:1992
+#: ../src/misc.c:1967
+msgid "In:"
+msgstr "Dans :"
+
+#. Translators: This option is for the previous 'in' option. For instance,
+#. * translate this as "Search" "In:" "the Filename".
+#: ../src/misc.c:1972
+msgid "the Filename"
+msgstr "le nom du fichier"
+
+#. Translators: This option is for the previous 'in' option. For instance,
+#. * translate this as "Search" "In:" "the Tag".
+#. * 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
 msgid "the Tag"
-msgstr "le Tag"
+msgstr "l'étiquette"
 
 #. Property of the search
-#: ../src/misc.c:2002 ../src/prefs.c:321
+#: ../src/misc.c:1989 ../src/prefs.c:335
 msgid "Case sensitive"
 msgstr "Sensible à la casse"
 
-#: ../src/misc.c:2454
+#: ../src/misc.c:2216
+msgid "Ready to search…"
+msgstr "Prêt à rechercher…"
+
+#: ../src/misc.c:2436
 #, c-format
-msgid "Found : %d file(s)"
-msgstr "Trouvé(s) : %d fichier(s)"
+msgid "Found one file"
+msgid_plural "Found %d files"
+msgstr[0] "%d fichier trouvé"
+msgstr[1] "%d fichiers trouvés"
 
-#: ../src/misc.c:2729
-msgid "Load the filenames from a TXT file"
-msgstr "Charger les noms des fichiers à partir d'un fichier TXT"
+#: ../src/misc.c:2721
+msgid "Load Filenames From a Text File"
+msgstr "Charger les noms de fichiers à partir d'un fichier texte"
 
-#: ../src/misc.c:2757
-msgid "File :"
-msgstr "Fichier :"
+#: ../src/misc.c:2750
+msgid "File:"
+msgstr "Fichier :"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: ../src/misc.c:2776
+#: ../src/misc.c:2769
 msgid " Load "
 msgstr " Charger "
 
-#: ../src/misc.c:2799
-msgid "Content of TXT file"
-msgstr "Contenu du fichier TXT"
+#: ../src/misc.c:2787
+msgid "Content of Text File"
+msgstr "Contenu du fichier texte"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2820 ../src/misc.c:2914
+#: ../src/misc.c:2808 ../src/misc.c:2903
 msgid "Insert a blank line before the selected line"
-msgstr "Insérer un espace avant la ligne sélectionnée"
+msgstr "Insérer une ligne vide avant la ligne sélectionnée"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2829 ../src/misc.c:2923
+#: ../src/misc.c:2817 ../src/misc.c:2912
 msgid "Delete the selected line"
-msgstr "Effacer la ligne sélectionnée"
+msgstr "Supprimer la ligne sélectionnée"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2838 ../src/misc.c:2932 ../src/misc.c:3408
+#: ../src/misc.c:2826 ../src/misc.c:2921 ../src/misc.c:3407
 msgid "Delete all blank lines"
-msgstr "Effacer toutes les lignes vides"
+msgstr "Supprimer toutes les lignes vides"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2850 ../src/misc.c:2944
+#: ../src/misc.c:2838 ../src/misc.c:2933
 msgid "Move up the selected line"
-msgstr "Monter la ligne sélectionnée"
+msgstr "Remonter la ligne sélectionnée"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2859 ../src/misc.c:2953
+#: ../src/misc.c:2847 ../src/misc.c:2942
 msgid "Move down the selected line"
 msgstr "Descendre la ligne sélectionnée"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2871 ../src/misc.c:2965 ../src/misc.c:3432
+#: ../src/misc.c:2859 ../src/misc.c:2954 ../src/misc.c:3431
 msgid "Reload"
 msgstr "Recharger"
 
-#: ../src/misc.c:2892
-msgid "List of files"
-msgstr "Liste de fichiers"
+#: ../src/misc.c:2881
+msgid "List of Files"
+msgstr "Liste des fichiers"
 
-#: ../src/misc.c:2987
+#: ../src/misc.c:2976
 msgid "Selected line:"
-msgstr "Ligne sélectionnée"
+msgstr "Ligne sélectionnée :"
 
-#: ../src/misc.c:3005
+#: ../src/misc.c:2994
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
 msgstr ""
-"En activant cette option, après le chargement du nom des fichiers, le "
-"scanner courant sera exécuté (la fenêtre des scanners doit être ouverte)."
+"En activant cette option, le scanner actuel sera lancé après le chargement "
+"du nom des fichiers (la boîte de dialogue du scanner doit être ouverte)."
+
+#: ../src/misc.c:3081
+#, c-format
+msgid "Cannot retrieve file info (%s)"
+msgstr "Impossible de récupérer les informations du fichier (%s)"
+
+#: ../src/misc.c:3143
+#, c-format
+msgid "Can't open file '%s' (%s)"
+msgstr "Impossible d'ouvrir le fichier « %s » (%s)"
+
+#: ../src/misc.c:3179
+#, c-format
+msgid "Error reading file (%s)"
+msgstr "Erreur lors de la lecture du fichier (%s)"
 
-#: ../src/misc.c:3396
+#: ../src/misc.c:3395
 msgid "Insert a blank line"
 msgstr "Insérer une ligne vide"
 
-#: ../src/misc.c:3402
+#: ../src/misc.c:3401
 msgid "Delete this line"
-msgstr "Effacer cette ligne"
+msgstr "Supprimer cette ligne"
 
-#: ../src/misc.c:3417
+#: ../src/misc.c:3416
 msgid "Move up this line"
-msgstr "Monter cette ligne"
+msgstr "Remonter cette ligne"
 
-#: ../src/misc.c:3423
+#: ../src/misc.c:3422
 msgid "Move down this line"
 msgstr "Descendre cette ligne"
 
@@ -3254,589 +2988,592 @@ msgstr "Descendre cette ligne"
 #: ../src/monkeyaudio_header.c:78 ../src/musepack_header.c:80
 #, c-format
 msgid "Profile:"
-msgstr "Profil:"
+msgstr "Profil :"
 
-#: ../src/mp4_header.c:130
-msgid "Audio"
-msgstr "Audio"
+#: ../src/mp4_header.c:63 ../src/mp4_tag.c:65 ../src/mp4_tag.c:186
+msgid "MP4 format invalid"
+msgstr "Format MP4 non valide"
 
-#: ../src/mp4_header.c:131
-msgid "Unknown"
-msgstr "Inconnu"
+#: ../src/mp4_header.c:72 ../src/mp4_tag.c:74
+#, c-format
+msgid "File contains no audio track: '%s'"
+msgstr "Le fichier ne contient aucune piste audio : « %s »"
 
-#: ../src/mp4_header.c:211 ../src/mp4_tag.c:109 ../src/mp4_tag.c:118
-#: ../src/mp4_tag.c:290 ../src/mp4_tag.c:297
-msgid "MP4 format invalid"
-msgstr "Format MP4 invalide"
+#: ../src/mp4_header.c:82
+#, c-format
+msgid "Error reading properties from file: '%s'"
+msgstr "Erreur lors de la lecture des propriétés du fichier : « %s »"
 
-#: ../src/mp4_header.c:273 ../src/mpeg_header.c:365
+#: ../src/mp4_header.c:132 ../src/mpeg_header.c:204
 #, c-format
 msgid "~%d kb/s"
 msgstr "~%d kb/s"
 
-#: ../src/mp4_tag.c:118 ../src/mp4_tag.c:297
-#, fuzzy, c-format
-msgid "ERROR reading tags from file: '%s' (%s)."
-msgstr "ERREUR lors de l'ouverture du fichier: '%s' (%s)."
+#: ../src/mp4_tag.c:85 ../src/mp4_tag.c:194
+#, c-format
+msgid "Error reading tags from file: '%s'"
+msgstr "Erreur lors de la lecture de l'étiquette du fichier : « %s »"
 
-#: ../src/mpeg_header.c:78
+#: ../src/mpeg_header.c:64
 msgid "Stereo"
 msgstr "Stéréo"
 
-#: ../src/mpeg_header.c:79
+#: ../src/mpeg_header.c:65
 msgid "Joint stereo"
-msgstr "Stéréo jointe"
+msgstr "Stéréo combinée"
 
-#: ../src/mpeg_header.c:80
+#: ../src/mpeg_header.c:66
 msgid "Dual channel"
-msgstr "Bi-canal"
+msgstr "Deux canaux"
 
-#: ../src/mpeg_header.c:81
+#: ../src/mpeg_header.c:67
 msgid "Single channel"
-msgstr "Mono canal"
+msgstr "Canal unique"
+
+#. MPEG, Layer versions
+#: ../src/mpeg_header.c:194
+msgid "MPEG"
+msgstr "MPEG"
+
+#. FIXME: Pass error back to calling function.
+#: ../src/ogg_header.c:227
+#, c-format
+msgid "Error while opening file: '%s' (%s)"
+msgstr "Erreur lors de l'ouverture du fichier : « %s » (%s)."
 
-#: ../src/ogg_header.c:100
+#: ../src/ogg_header.c:243
 #, c-format
 msgid ""
 "Ogg Vorbis: The specified bitstream does not exist or the file has been "
 "initialized improperly (file: '%s')."
 msgstr ""
-"Ogg Vorbis : Le flux binaire spécifié n'existe pas ou le fichier a été mal "
-"initialisé (fichier : '%s')."
+"Ogg Vorbis : le flux spécifié n'existe pas ou le fichier a été mal "
+"initialisé (fichier : « %s »)."
 
-#: ../src/ogg_header.c:131
+#: ../src/ogg_header.c:279
 #, c-format
 msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
 msgstr ""
-"Ogg Vorbis : La lecture depuis le media a retourné une erreur (fichier : "
-"'%s')."
+"Ogg Vorbis : la lecture du media a retourné une erreur (fichier : « %s »)."
 
-#: ../src/ogg_header.c:134
+#: ../src/ogg_header.c:282
 #, c-format
 msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
 msgstr ""
-"Ogg Vorbis : Le flux binaire ne contient pas de données Vorbis (fichier : "
-"'%s')."
+"Ogg Vorbis : le flux ne contient pas de données Vorbis (fichier : « %s »)."
 
-#: ../src/ogg_header.c:137
+#: ../src/ogg_header.c:285
 #, c-format
 msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
-msgstr "Ogg Vorbis : version Vorbis incorrecte (fichier : '%s')."
+msgstr "Ogg Vorbis : version Vorbis inadaptée (fichier : « %s »)."
 
-#: ../src/ogg_header.c:140
+#: ../src/ogg_header.c:288
 #, c-format
 msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
 msgstr ""
-"Ogg Vorbis : Entête invalide dans le flux binaire Vorbis (fichier : '%s')."
+"Ogg Vorbis : en-tête non valide dans le flux Vorbis (fichier : « %s »)."
 
-#: ../src/ogg_header.c:143
+#: ../src/ogg_header.c:291
 #, c-format
 msgid ""
 "Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack corruption "
 "(file: '%s')."
 msgstr ""
-"Ogg Vorbis : Erreur interne de logique, indocation d'un bug ou d'une "
-"corruption de pile (fichier ; '%s')."
+"Ogg Vorbis : erreur logique interne ; indique un bug ou une corruption de "
+"tas/pile (fichier : « %s »)."
+
+#: ../src/ogg_header.c:337
+#, c-format
+msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
+msgstr "Erreur lors de l'ouverture du fichier : « %s » en Vorbis (%s)."
+
+#: ../src/ogg_tag.c:712 ../src/ogg_tag.c:887
+#, c-format
+msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
+msgstr "Attention : le fichier Ogg Vorbis « %s » contient une étiquette ID3v2."
+
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1257
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr "Erreur de « loader_write » : %s"
+
+#: ../src/ogg_tag.c:1050 ../src/picture.c:1180
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr "Erreur de « loader_close » : %s"
+
+#: ../src/picture.c:104
+#, c-format
+msgid "Image file not saved: %s"
+msgstr "Fichier image non enregistré : %s"
 
-#: ../src/ogg_header.c:195 ../src/ogg_tag.c:188 ../src/ogg_tag.c:697
+#: ../src/picture.c:154
 #, c-format
-msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
-msgstr "ERREUR lors de l'ouverture du fichier: '%s' en tant que vorbis (%s)."
+msgid "Cannot open file: '%s'"
+msgstr "Impossible d'ouvrir le fichier : « %s »"
 
-#: ../src/ogg_tag.c:170
+#: ../src/picture.c:158
+msgid "Image File Error"
+msgstr "Erreur du fichier image"
+
+#: ../src/picture.c:162 ../src/picture.c:424
 #, c-format
-msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
-msgstr "Attention : Le fichier Vorbis Ogg '%s' contient un tag ID3v2."
+msgid "Image file not loaded: %s"
+msgstr "Fichier image non chargé : %s"
+
+#: ../src/picture.c:446
+msgid "Image file loaded"
+msgstr "Fichier image chargé"
 
-#: ../src/picture.c:294
-msgid "Add pictures"
+#: ../src/picture.c:504
+msgid "Add Images"
 msgstr "Ajouter les images"
 
-#: ../src/picture.c:304 ../src/picture.c:645
+#: ../src/picture.c:514 ../src/picture.c:874
 msgid "All Files"
 msgstr "Tous les fichiers"
 
-#: ../src/picture.c:310 ../src/picture.c:651
+#: ../src/picture.c:520 ../src/picture.c:880
 msgid "PNG and JPEG"
 msgstr "PNG et JPEG"
 
-#: ../src/picture.c:427
+#: ../src/picture.c:651
 #, c-format
-msgid "Picture Properties %d/%d"
+msgid "Image Properties %d/%d"
 msgstr "Propriétés de l'image %d/%d"
 
-#: ../src/picture.c:457
-msgid "Picture Type"
-msgstr "Type d'Image:"
+#: ../src/picture.c:675
+msgid "Image Type"
+msgstr "Type d'image"
 
 #. Description of the picture
-#: ../src/picture.c:514
-msgid "Picture Description:"
-msgstr "Description de l'image :"
+#: ../src/picture.c:734
+msgid "Image Description:"
+msgstr "Description de l'image :"
 
-#: ../src/picture.c:633
+#: ../src/picture.c:861
 #, c-format
-msgid "Save picture %d/%d"
-msgstr "Sauvegarder l'image %d/%d"
-
-#: ../src/picture.c:719
-#, fuzzy, c-format
-msgid "The following file already exists: '%s'"
-msgstr ""
-"Le fichier suivant existe déjà :\n"
-"'%s'\n"
-"Voulez vous l'écraser?"
+msgid "Save Image %d/%d"
+msgstr "Enregistrer l'image %d/%d"
 
-#: ../src/picture.c:721
-#, fuzzy
-msgid "Do you want to save anyway, overwriting the file?"
-msgstr ""
-"Voulez-vous écrire le tag du fichier\n"
-"'%s' ?"
-
-#: ../src/picture.c:723
-#, fuzzy
-msgid "Save"
-msgstr " Sauver "
-
-#: ../src/picture.c:799
+#: ../src/picture.c:1021
 msgid "JPEG image"
 msgstr "Image JPEG"
 
-#: ../src/picture.c:801
+#: ../src/picture.c:1023
 msgid "PNG image"
 msgstr "Image PNG"
 
-#: ../src/picture.c:803
+#: ../src/picture.c:1025
+msgid "GIF image"
+msgstr "Image GIF"
+
+#: ../src/picture.c:1027
 msgid "Unknown image"
 msgstr "Image inconnue"
 
-#: ../src/picture.c:814
+#: ../src/picture.c:1039
 msgid "32x32 pixel PNG file icon"
-msgstr "Fichier icone PNG de 32x32 pixels"
+msgstr "Icône PNG de 32x32 pixels"
 
-#: ../src/picture.c:816
+#: ../src/picture.c:1041
 msgid "Other file icon"
-msgstr "Autre fichier icone"
+msgstr "Autre icône"
 
-#: ../src/picture.c:818
+#: ../src/picture.c:1043
 msgid "Cover (front)"
 msgstr "Couverture (face avant)"
 
-#: ../src/picture.c:820
+#: ../src/picture.c:1045
 msgid "Cover (back)"
 msgstr "Couverture (face arrière)"
 
-#: ../src/picture.c:822
+#: ../src/picture.c:1047
 msgid "Leaflet page"
-msgstr "Dépliant intérieur"
+msgstr "Page du livret"
 
-#: ../src/picture.c:824
+#: ../src/picture.c:1049
 msgid "Media (e.g. label side of CD)"
-msgstr "Image de l'album"
+msgstr "Média (p.ex. le côté imprimé du CD)"
 
-#: ../src/picture.c:826
+#: ../src/picture.c:1051
 msgid "Lead artist/lead performer/soloist"
-msgstr "Artiste principal/Soliste"
+msgstr "Artiste principal/interprète principal/soliste"
 
-#: ../src/picture.c:828
+#: ../src/picture.c:1053
 msgid "Artist/performer"
-msgstr "Artiste"
+msgstr "Artiste/interprète"
 
-#: ../src/picture.c:830
+#: ../src/picture.c:1055
 msgid "Conductor"
 msgstr "Chef d'orchestre"
 
-#: ../src/picture.c:832
+#: ../src/picture.c:1057
 msgid "Band/Orchestra"
-msgstr "Groupe/Orchestre"
+msgstr "Groupe/orchestre"
 
-#: ../src/picture.c:836
+#: ../src/picture.c:1061
 msgid "Lyricist/text writer"
-msgstr "Parolier/Ecrivain"
+msgstr "Parolier/écrivain"
 
-#: ../src/picture.c:838
+#: ../src/picture.c:1063
 msgid "Recording location"
 msgstr "Lieu d'enregistrement"
 
-#: ../src/picture.c:840
+#: ../src/picture.c:1065
 msgid "During recording"
-msgstr "Artistes pendant l'enregistrement"
+msgstr "Pendant l'enregistrement"
 
-#: ../src/picture.c:842
+#: ../src/picture.c:1067
 msgid "During performance"
-msgstr "Artistes pendant la représentation"
+msgstr "Pendant l'interprétation"
 
-#: ../src/picture.c:844
+#: ../src/picture.c:1069
 msgid "Movie/video screen capture"
-msgstr "Capture d'écran film/video"
+msgstr "Film/capture d'écran vidéo"
 
-#: ../src/picture.c:846
-msgid "A bright coloured fish"
+#: ../src/picture.c:1071
+msgid "A bright colored fish"
 msgstr "Un poisson aux couleurs vives"
 
-#: ../src/picture.c:848
+#: ../src/picture.c:1073
 msgid "Illustration"
 msgstr "Illustration"
 
-#: ../src/picture.c:850
+#: ../src/picture.c:1075
 msgid "Band/Artist logotype"
 msgstr "Logo du groupe/de l'artiste"
 
-#: ../src/picture.c:852
+#: ../src/picture.c:1077
 msgid "Publisher/studio logotype"
-msgstr "Maison d'édition/Sigle du studio"
+msgstr "Sigle de la maison d'édition/du studio"
 
-#: ../src/picture.c:856
-msgid "Unknown picture type"
+#: ../src/picture.c:1081
+msgid "Unknown image type"
 msgstr "Type d'image inconnu"
 
-#: ../src/picture.c:885 ../src/picture.c:896
+#: ../src/picture.c:1111 ../src/picture.c:1122
 msgid "pixels"
 msgstr "pixels"
 
-#: ../src/picture.c:886 ../src/picture.c:897
+#: ../src/picture.c:1112 ../src/picture.c:1123
 msgid "Type"
 msgstr "Type"
 
-#: ../src/picture.c:898
+#: ../src/picture.c:1124
 msgid "Description"
 msgstr "Description"
 
-#: ../src/picture.c:954
-#, c-format
-msgid "Error with 'loader_close': %s"
-msgstr "Erreur avec 'loader_close' : %s"
-
-#: ../src/picture.c:1011
-#, fuzzy
+#: ../src/picture.c:1240
 msgid ""
-"Cannot display the picutre, as not enough data has been read to determine "
+"Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
 msgstr ""
 "Impossible d'afficher l'image, car il n'y a pas assez de données lues pour "
-"créer le buffer image."
+"déterminer comment créer le tampon de l'image."
 
-#: ../src/picture.c:1018
-msgid "Cannot display the picture"
-msgstr ""
+#: ../src/picture.c:1247
+msgid "Cannot display the image"
+msgstr "Impossible d'afficher l'image"
 
-#: ../src/picture.c:1019
-#, fuzzy
+#: ../src/picture.c:1249
 msgid ""
-"Not enough data has been read to determine how to create the image buffer"
+"Not enough data has been read to determine how to create the image buffer."
 msgstr ""
-"Impossible d'afficher l'image, car il n'y a pas assez de données lues pour "
-"créer le buffer image."
-
-#: ../src/picture.c:1020
-#, fuzzy
-msgid "Load Picture File"
-msgstr "Chargement du fichier image..."
-
-#: ../src/picture.c:1026
-#, c-format
-msgid "Error with 'loader_write': %s"
-msgstr "Erreur avec 'loader_write' : %s"
-
-#: ../src/picture.c:1111 ../src/picture.c:1140 ../src/picture.c:1159
-#, fuzzy, c-format
-msgid "Picture file not loaded (%s)…"
-msgstr "Image non chargée (%s)..."
-
-#: ../src/picture.c:1133
-#, fuzzy, c-format
-msgid "Cannot open file: '%s'"
-msgstr "Impossible d'ouvrir le fichier '%s' (%s)"
-
-#: ../src/picture.c:1136
-#, fuzzy
-msgid "Picture File Error"
-msgstr "Image non chargée..."
-
-#: ../src/picture.c:1171
-#, fuzzy
-msgid "Picture file loaded…"
-msgstr "Image non chargée..."
-
-#: ../src/picture.c:1187 ../src/picture.c:1194
-#, fuzzy, c-format
-msgid "Picture file can't be saved (%s)…"
-msgstr "Le fichier image ne peut pas être sauvé (%s)..."
+"Pas assez de données lues pour déterminer comment créer le tampon de l'image."
 
-#. File Browser frame
-#: ../src/prefs.c:153
-msgid "File Browser"
-msgstr "Sélecteur de Fichiers"
+#: ../src/picture.c:1251
+msgid "Load Image File"
+msgstr "Charger le fichier image"
 
 #. Label
-#: ../src/prefs.c:164
-msgid "Default directory :"
-msgstr "Répertoire par défaut :"
+#: ../src/prefs.c:152
+msgid "Default directory:"
+msgstr "Répertoire par défaut :"
 
-#: ../src/prefs.c:177
+#: ../src/prefs.c:165
 msgid ""
 "Specify the directory where your files are located. This path will be loaded "
 "when EasyTAG starts without parameter."
 msgstr ""
-"Spécifier le répertoire dans lequel se trouvent vos fichiers. Ce chemin sera "
-"chargé au démarrage de EasyTAG sans paramètres."
+"Indique le répertoire dans lequel se trouvent vos fichiers. Ce chemin est "
+"chargé quand EasyTAG démarre sans paramètres."
 
 #. Load directory on startup
-#: ../src/prefs.c:198
+#: ../src/prefs.c:186
 msgid ""
 "Load on startup the default directory or the directory passed as argument"
 msgstr ""
-"Charger au démarrage le répertoire par défaut, ou celui passé en paramètre"
+"Charge le répertoire par défaut au démarrage, ou celui défini comme argument"
 
-#: ../src/prefs.c:201
-#, fuzzy
+#: ../src/prefs.c:189
 msgid ""
 "Automatically search files, when EasyTAG starts, into the default directory. "
 "Note that this path may be overridden by the parameter passed to easytag "
 "(easytag /path_to/mp3_files)."
 msgstr ""
-"Recherche automatique des fichiers dans le répertoire par défaut au "
-"lancement de EasyTAG. Notez que ce chemin ne sera pas pris en compte si on "
-"passe un répertoire en paramètre à EasyTAG (easytag /chemin_vers/fichiers)."
+"Au démarrage, EasyTAG recherche automatiquement des fichiers dans le "
+"répertoire par défaut. Notez que ce chemin n'est pas pris en compte si on "
+"définit un répertoire (easytag /path_to/mp3_files)."
 
 #. Browse subdirectories
-#: ../src/prefs.c:206
+#: ../src/prefs.c:194
 msgid "Search subdirectories"
-msgstr "Parcourir les sous-répertoires"
+msgstr "Rechercher dans les sous-répertoires"
 
-#: ../src/prefs.c:209
+#: ../src/prefs.c:197
 msgid "Search subdirectories for files when reading a directory into the tree."
 msgstr ""
-"Recherche les fichiers également dans les sous-répertoires lors de la "
-"lecture du répertoire"
+"Recherche également les fichiers dans les sous-répertoires lors de la "
+"lecture du répertoire dans l'arborescence."
 
 #. Open the node to show subdirectories
-#: ../src/prefs.c:213
+#: ../src/prefs.c:201
 msgid "Show subdirectories when selecting a directory"
 msgstr "Afficher les sous-répertoires lors de la sélection d'un répertoire"
 
-#: ../src/prefs.c:217
+#: ../src/prefs.c:205
 msgid ""
 "This expands the selected node into the file browser to display the sub-"
 "directories."
 msgstr ""
-"Cette option permet d'ouvrir le noeud sélectionné pour afficher les sous "
-"répertoires."
+"Cette option ouvre le noeud choisi dans le sélecteur de fichiers pour "
+"afficher les sous-répertoires."
 
 #. Browse hidden directories
-#: ../src/prefs.c:221
+#: ../src/prefs.c:209
 msgid "Search hidden directories"
-msgstr "Parcourir les répertoires cachés"
+msgstr "Rechercher dans les répertoires cachés"
 
-#: ../src/prefs.c:226
+#: ../src/prefs.c:214
 msgid "Search hidden directories for files (directories starting by a '.')."
 msgstr ""
-"Recherche les fichiers également dans les répertoires cachés (répertoires "
-"commençants par un '.')."
+"Recherche les fichiers également dans les répertoires cachés (nom de "
+"répertoire commençant par un « . »)."
+
+#.
+#. * Misc
+#.
+#: ../src/prefs.c:222
+msgid "Misc"
+msgstr "Divers"
 
 #. User interface
-#: ../src/prefs.c:245
+#: ../src/prefs.c:228
 msgid "User Interface"
-msgstr "Interface Utilisateur"
+msgstr "Interface utilisateur"
 
 #. Show header infos
-#: ../src/prefs.c:252
-#, fuzzy
+#: ../src/prefs.c:235
 msgid "Show header information of file"
-msgstr "Montrer les informations du fichier"
+msgstr "Afficher les informations de l'en-tête du fichier"
 
-#: ../src/prefs.c:255
-#, fuzzy
+#: ../src/prefs.c:238
 msgid ""
 "If activated, information about the file as the bitrate, the time, the size, "
 "will be displayed under the filename entry."
 msgstr ""
 "Si activé, les informations sur le fichier comme le débit, la durée, la "
-"taille seront affichées au dessous du nom du fichier."
+"taille sont affichées en dessous du nom du fichier."
 
-#: ../src/prefs.c:262
-msgid "Display changed files in list using :"
-msgstr "Afficher les fichiers modifiés dans la liste en :"
+#: ../src/prefs.c:244
+msgid "Display changed files in list using:"
+msgstr "Afficher les fichiers modifiés dans la liste en :"
 
-#: ../src/prefs.c:265
+#: ../src/prefs.c:247
 msgid "Red color"
-msgstr "Rouge"
+msgstr "rouge"
 
-#: ../src/prefs.c:271
+#: ../src/prefs.c:253
 msgid "Bold style"
-msgstr "Gras"
+msgstr "gras"
 
 #. Sorting List Options
-#: ../src/prefs.c:277
+#: ../src/prefs.c:259
 msgid "Sorting List Options"
-msgstr "Options de Classement de la Liste"
+msgstr "Options de tri de la liste"
 
 #. Sorting method
-#: ../src/prefs.c:287
-msgid "Sort the file list by :"
-msgstr "Classer la liste des fichiers par :"
+#: ../src/prefs.c:268
+msgid "Sort the file list by:"
+msgstr "Trier la liste des fichiers par :"
 
-#. Two columns
-#. Items of option menu
-#: ../src/prefs.c:298
-msgid "Ascending file name"
+#: ../src/prefs.c:278
+msgid "Ascending filename"
 msgstr "Ordre croissant des noms de fichiers"
 
-#: ../src/prefs.c:299
-msgid "Descending file name"
+#: ../src/prefs.c:280
+msgid "Descending filename"
 msgstr "Ordre décroissant des noms de fichiers"
 
-#: ../src/prefs.c:300
-msgid "Ascending track number"
-msgstr "Ordre croissant des pistes"
-
-#: ../src/prefs.c:301
-msgid "Descending track number"
-msgstr "Ordre décroissant des pistes"
-
-#: ../src/prefs.c:302
-msgid "Ascending creation date"
-msgstr "Ordre croissant des dates de création"
-
-#: ../src/prefs.c:303
-msgid "Descending creation date"
-msgstr "Ordre décroissant des dates de création"
-
-#: ../src/prefs.c:304
+#: ../src/prefs.c:281
 msgid "Ascending title"
 msgstr "Ordre croissant des titres"
 
-#: ../src/prefs.c:305
+#: ../src/prefs.c:282
 msgid "Descending title"
 msgstr "Ordre décroissant des titres"
 
-#: ../src/prefs.c:306
+#: ../src/prefs.c:283
 msgid "Ascending artist"
 msgstr "Ordre croissant des artistes"
 
-#: ../src/prefs.c:307
+#: ../src/prefs.c:284
 msgid "Descending artist"
 msgstr "Ordre décroissant des artistes"
 
-#: ../src/prefs.c:308
+#: ../src/prefs.c:286
+msgid "Ascending album artist"
+msgstr "Ordre croissant des artistes de l'album"
+
+#: ../src/prefs.c:288
+msgid "Descending album artist"
+msgstr "Ordre décroissant des artistes de l'album"
+
+#: ../src/prefs.c:289
 msgid "Ascending album"
 msgstr "Ordre croissant des albums"
 
-#: ../src/prefs.c:309
+#: ../src/prefs.c:290
 msgid "Descending album"
 msgstr "Ordre décroissant des albums"
 
-#: ../src/prefs.c:310
+#: ../src/prefs.c:291
 msgid "Ascending year"
 msgstr "Ordre croissant des années"
 
-#: ../src/prefs.c:311
+#: ../src/prefs.c:292
 msgid "Descending year"
 msgstr "Ordre décroissant des années"
 
-#: ../src/prefs.c:312
+#: ../src/prefs.c:294
+msgid "Ascending disc number"
+msgstr "Ordre croissant des numéros de disques"
+
+#: ../src/prefs.c:296
+msgid "Descending disc number"
+msgstr "Ordre décroissant des numéros de disques"
+
+#: ../src/prefs.c:298
+msgid "Ascending track number"
+msgstr "Ordre croissant des numéros de pistes"
+
+#: ../src/prefs.c:300
+msgid "Descending track number"
+msgstr "Ordre décroissant des numéros de pistes"
+
+#: ../src/prefs.c:301
 msgid "Ascending genre"
 msgstr "Ordre croissant des genres"
 
-#: ../src/prefs.c:313
+#: ../src/prefs.c:302
 msgid "Descending genre"
 msgstr "Ordre décroissant des genres"
 
-#: ../src/prefs.c:314
+#: ../src/prefs.c:303
 msgid "Ascending comment"
 msgstr "Ordre croissant des commentaires"
 
-#: ../src/prefs.c:315
+#: ../src/prefs.c:304
 msgid "Descending comment"
 msgstr "Ordre décroissant des commentaires"
 
-#: ../src/prefs.c:318
-msgid "Select the type of file sorting when loading a directory."
-msgstr ""
-"Sélectionner le type d'ordonnancement des fichiers après le chargement d'un "
-"répertoire."
+#: ../src/prefs.c:306
+msgid "Ascending composer"
+msgstr "Ordre croissant des compositeurs"
 
-#: ../src/prefs.c:327
-msgid "If activated, the sorting of the list will be dependent on the case."
-msgstr "Si activé, le classement de la liste sera dépendant de la casse."
+#: ../src/prefs.c:308
+msgid "Descending composer"
+msgstr "Ordre décroissant des compositeurs"
 
-#. Message Dialog Position
-#: ../src/prefs.c:331
-msgid "Message Dialog Position"
-msgstr "Position des Boîtes de Dialogue"
+#: ../src/prefs.c:310
+msgid "Ascending original artist"
+msgstr "Ordre croissant des artistes originaux"
 
-#: ../src/prefs.c:339
-msgid "No particular position"
-msgstr "Pas de position particulière"
+#: ../src/prefs.c:312
+msgid "Descending original artist"
+msgstr "Ordre décroissant des artistes originaux"
 
-#: ../src/prefs.c:343
-msgid "Let the Window Manager to place the windows."
-msgstr "Laisser le Gestionnaire de Fenêtres placer les boîtes de messages."
+#: ../src/prefs.c:314
+msgid "Ascending copyright"
+msgstr "Ordre croissant des copyrights"
 
-#: ../src/prefs.c:348
-msgid "Center of the main window"
-msgstr "Centre de la fenêtre principale"
+#: ../src/prefs.c:316
+msgid "Descending copyright"
+msgstr "Ordre décroissant des copyrights"
 
-#: ../src/prefs.c:352
-msgid "Windows should be placed in the center of the main window."
-msgstr ""
-"Les boîtes de messages seront placées au centre de la fenêtre principale."
+#: ../src/prefs.c:318
+msgid "Ascending URL"
+msgstr "Ordre croissant des URL"
 
-#: ../src/prefs.c:357
-msgid "Center of the screen"
-msgstr "Centre de l'écran"
+#: ../src/prefs.c:320
+msgid "Descending URL"
+msgstr "Ordre décroissant des URL"
 
-#: ../src/prefs.c:361
-msgid "Windows should be placed in the center of the screen."
-msgstr "Les boîtes de messages seront placées au centre de l'écran."
+#: ../src/prefs.c:322
+msgid "Ascending encoded by"
+msgstr "Ordre croissant des noms d'encodeurs"
 
-#: ../src/prefs.c:366
-msgid "Mouse position"
-msgstr "Position de la souris"
+#: ../src/prefs.c:324
+msgid "Descending encoded by"
+msgstr "Ordre décroissant des noms d'encodeurs"
+
+#: ../src/prefs.c:326
+msgid "Ascending creation date"
+msgstr "Ordre croissant des dates de création"
+
+#: ../src/prefs.c:328
+msgid "Descending creation date"
+msgstr "Ordre décroissant des dates de création"
+
+#: ../src/prefs.c:332
+msgid "Select the type of file sorting when loading a directory."
+msgstr ""
+"Sélectionner le type de tri des fichiers pendant le chargement d'un "
+"répertoire."
 
-#: ../src/prefs.c:370
-msgid "Windows should be placed at the current mouse position."
-msgstr "Les boîtes de messages seront placées sous le curseur de la souris."
+#: ../src/prefs.c:344
+msgid "If activated, the sorting of the list will be dependent on the case."
+msgstr "Si activé, le tri de la liste est sensible à la casse."
 
 #. File Player
-#: ../src/prefs.c:374
+#: ../src/prefs.c:348
 msgid "File Audio Player"
-msgstr "Lecteur de Fichiers Audio"
+msgstr "Lecteur de fichiers audio"
 
-#: ../src/prefs.c:386
-msgid "Player to run :"
-msgstr "Lecteur à lancer :"
+#: ../src/prefs.c:360
+msgid "Player to run:"
+msgstr "Lecteur à lancer :"
 
-#: ../src/prefs.c:392
+#: ../src/prefs.c:366
 msgid ""
 "Enter the program used to play the files. Some arguments can be passed for "
 "the program (as 'xmms -p') before to receive files as other arguments."
 msgstr ""
-"Entrer le programme à utiliser pour écouter les fichiers. Des arguments "
-"peuvent être passés au programme (ex: 'xmms -p') avant de recevoir les "
+"Saisir le programme à utiliser pour écouter les fichiers. Des arguments "
+"peuvent être passés au programme (comme « xmms -p ») avant qu'il reçoive les "
 "fichiers comme autres arguments."
 
 #. Log options
-#: ../src/prefs.c:410
+#: ../src/prefs.c:384
 msgid "Log Options"
 msgstr "Options du journal"
 
 #. Show / hide log view
-#: ../src/prefs.c:417
+#: ../src/prefs.c:391
 msgid "Show log view in main window"
-msgstr "Afficher le journal sur la fenêtre principale"
+msgstr "Afficher le journal dans la fenêtre principale"
 
-#: ../src/prefs.c:420
+#: ../src/prefs.c:394
 msgid "If activated, the log view would be visible in the main window."
-msgstr "Si activé, le journal sera affiché sur la fenêtre principale."
+msgstr "Si activé, le journal est visible dans la fenêtre principale."
 
-#: ../src/prefs.c:427
-msgid "Max number of lines :"
-msgstr "Nombre maximum de lignes:"
+#: ../src/prefs.c:400
+msgid "Max number of lines:"
+msgstr "Nombre maximum de lignes :"
 
-#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
-#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formatted_Toggled),NULL);
+#. * g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
 #. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
 #. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
 #. "to receive files as other arguments."),NULL);
@@ -3844,87 +3581,85 @@ msgstr "Nombre maximum de lignes:"
 #.
 #. * File Settings
 #.
-#: ../src/prefs.c:446 ../src/prefs.c:447
+#: ../src/prefs.c:418
 msgid "File Settings"
-msgstr "Paramètres du nom des fichiers"
+msgstr "Paramètres du fichier"
 
 #. File (name) Options
-#: ../src/prefs.c:457
+#: ../src/prefs.c:424
 msgid "File Options"
-msgstr "Options pour les Fichiers"
+msgstr "Options du fichier"
 
-#: ../src/prefs.c:463
+#: ../src/prefs.c:430
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr ""
-"Remplacer les caractères illégaux des noms de fichiers (pour Windows et les "
-"CD-Rom)"
+"Remplacer les caractères illégaux dans le nom du fichier (pour Windows et "
+"les CD-Rom)"
 
-#: ../src/prefs.c:466
-#, fuzzy
+#: ../src/prefs.c:433
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
 "problem when renaming the file. This is useful when renaming the file from "
 "the tag with the scanner."
 msgstr ""
-"Convertir les caractères illégaux pour les systêmes de fichiers windows et "
+"Convertir les caractères illégaux pour les systêmes de fichiers FAT32/16 et "
 "ISO9660 + Joliet('\\', ':', ';', '*', '?', '\"', '<', '>', '|') présents "
-"dans le nom des fichiers, pour éviter les problèmes en renommant les "
-"fichiers. Ceci est très utile quand on renomme un fichier à partir du tag "
-"avec le scanner."
+"dans le nom de fichier, pour éviter les problèmes pendant le renommage des "
+"fichiers. Ceci est très utile quand on renomme un fichier à partir de "
+"l'étiquette avec le scanner."
 
 #. Extension case (lower/upper?)
-#: ../src/prefs.c:475
-msgid "Convert filename extension to :"
-msgstr "Convertir l'extension du fichier en :"
+#: ../src/prefs.c:441
+msgid "Convert filename extension to:"
+msgstr "Convertir l'extension du nom de fichier en :"
 
-#: ../src/prefs.c:478
+#: ../src/prefs.c:444
 msgid "Lower Case"
 msgstr "Minuscules"
 
-#: ../src/prefs.c:481
+#: ../src/prefs.c:447
 msgid "For example, the extension will be converted to '.mp3'"
-msgstr "Par exemple, l'extension sera convertie en '.mp3'"
+msgstr "Par exemple, l'extension sera convertie en « .mp3 »"
 
-#: ../src/prefs.c:484
+#: ../src/prefs.c:450
 msgid "Upper Case"
 msgstr "Majuscules"
 
-#: ../src/prefs.c:487
+#: ../src/prefs.c:453
 msgid "For example, the extension will be converted to '.MP3'"
-msgstr "Par exemple, l'extension sera convertie en '.MP3'"
+msgstr "Par exemple, l'extension sera convertie en « .MP3 »"
 
-#: ../src/prefs.c:490
+#: ../src/prefs.c:456
 msgid "No Change"
 msgstr "Pas de Changement"
 
-#: ../src/prefs.c:493
+#: ../src/prefs.c:459
 msgid "The extension will not be converted"
 msgstr "L'extension ne sera pas convertie"
 
 #. Preserve modification time
-#: ../src/prefs.c:496
+#: ../src/prefs.c:462
 msgid "Preserve modification time of the file"
 msgstr "Conserver la date de modification du fichier"
 
-#: ../src/prefs.c:499
+#: ../src/prefs.c:465
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
-"Conserver la date de modification (propriétés du fichier) lors de la "
-"sauvegarde du fichier."
+"Conserver la date de modification (dans les propriétés du fichier) lors de "
+"l'enregistrement du fichier."
 
 #. Change directory modification time
-#: ../src/prefs.c:503
+#: ../src/prefs.c:469
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
-"Changer la date de modification du répertoire parent au fichier (recommandé "
-"si utilisation d'Amarok)"
+"Mettre à jour la date de modification du répertoire parent du fichier "
+"(recommandé avec l'utilisation d'Amarok)"
 
-#: ../src/prefs.c:507
-#, fuzzy
+#: ../src/prefs.c:473
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3933,1788 +3668,1306 @@ msgid ""
 "performance reasons, they refresh file information by detecting changes of "
 "the parent directory."
 msgstr ""
-"La date et heure de modification du répertoire contenant le fichier sera "
-"mise à jour lors de la sauvegarde du fichier. Actuellement, cela est fait "
+"La date et l'heure de modification du répertoire contenant le fichier sera "
+"mise à jour lors de l'enregistrement du fichier. Actuellement, cela est fait "
 "automatiquement mais seulement quand un fichier est renommé.\n"
-"Cette option est intéressante si on utilise des applications comme Amarok. "
-"En effet, pour des raisons de performance, ils rafraichissent les "
-"informations des fichiers en détectant les changements sur le répertoire "
+"Cette fonction est intéressante si on utilise des applications comme Amarok. "
+"En effet, pour des raisons de performance, ils réactualisent les "
+"informations des fichiers en détectant les changements dans le répertoire "
 "parent."
 
-#. Character Set for File Name
-#: ../src/prefs.c:515
-msgid "Character Set for File Name"
+#. Character Set for Filename
+#: ../src/prefs.c:481
+msgid "Character Set for Filename"
 msgstr "Jeu de caractères pour les noms de fichiers"
 
 #. Rules for character set
-#: ../src/prefs.c:531
+#: ../src/prefs.c:493
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
 msgstr ""
 "Règles à appliquer si certains caractères ne peuvent pas être convertis vers "
-"l'encodage du système\n"
-"lors de l'écriture du nom de fichier :"
+"le codage du système lors de l'écriture du nom de fichier :"
 
-#: ../src/prefs.c:539
-#, fuzzy
+#: ../src/prefs.c:499
 msgid "Try another character encoding"
-msgstr "Essayer un autre encodage"
+msgstr "Essayer un autre codage de caractères"
 
-#: ../src/prefs.c:543
+#: ../src/prefs.c:503
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
-"your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
+"your locale (for example: ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
 "for 'ro'). If it fails, it will try the character encoding ISO-8859-1."
 msgstr ""
-"Avec cette option, il essayera la conversion vers l'encodage de votre langue "
-"(par exemple : ISO-8859-1 pour 'fr', KOI8-R pour 'ru', ISO-8859-2 pour "
-"'ro'). Si il échoue, il essayera l'encodage ISO-8859-1."
+"Avec cette option, il va essayer la conversion vers le codage de votre "
+"langue (par exemple : ISO-8859-1 pour « fr », KOI8-R pour « ru », ISO-8859-2 "
+"pour « ro »). S'il échoue, il fera une tentative avec le codage ISO-8859-1."
 
-#: ../src/prefs.c:550
+#: ../src/prefs.c:510
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
-"Forcer l'utilisation de l'encodage du système et activer la transcription"
+"Forcer l'utilisation du codage de caractères du système et activer la "
+"transcription"
 
-#: ../src/prefs.c:553 ../src/prefs.c:875 ../src/prefs.c:944
+#: ../src/prefs.c:514 ../src/prefs.c:844 ../src/prefs.c:913
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
 "looking characters."
 msgstr ""
-"Avec cette option, quand un caractère ne peut pas être représenté dans "
-"l'encodage cible, il pourra être approximé par un ou plusieurs caractères se "
+"Avec cette option, quand un caractère ne peut pas être représenté dans le "
+"codage cible, il peut être approximé par un ou plusieurs caractères se "
 "ressemblant visuellement."
 
-#: ../src/prefs.c:559
+#: ../src/prefs.c:520
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr ""
-"Forcer l'utilisation de l'encodage du système et supprimer certains "
-"caractères"
+"Forcer l'utilisation du codage du système et ignorer certains caractères"
 
-#: ../src/prefs.c:562 ../src/prefs.c:884 ../src/prefs.c:953
+#: ../src/prefs.c:524 ../src/prefs.c:854 ../src/prefs.c:923
 msgid ""
-"With this option, when a characters cannot be represented in the target "
+"With this option, when a character cannot be represented in the target "
 "character set, it will be silently discarded."
 msgstr ""
-"Avec cette option, quand un caractère ne peut pas être représenté dans "
-"l'encodage cible, il pourra être supprimé."
+"Avec cette option, quand un caractère ne peut pas être représenté dans le "
+"codage cible, il est ignoré."
 
 #.
 #. * Tag Settings
 #.
-#: ../src/prefs.c:571 ../src/prefs.c:572
+#: ../src/prefs.c:533
 msgid "Tag Settings"
-msgstr "Paramètres des Tags"
+msgstr "Paramètres des étiquettes"
 
 #. Tag Options
-#: ../src/prefs.c:581
+#: ../src/prefs.c:539
 msgid "Tag Options"
-msgstr "Options de Tag"
+msgstr "Options des étiquettes"
 
-#: ../src/prefs.c:587
+#: ../src/prefs.c:545
 msgid "Auto completion of date if not complete"
 msgstr "Compléter automatiquement la date si elle est incomplète"
 
-#: ../src/prefs.c:590
-#, fuzzy
+#: ../src/prefs.c:548
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
-"1996, 95 => 1995 …)."
+"1996, 95 => 1995…)."
 msgstr ""
-"Compléter automatiquement le champ 'Année' si vous ne tapez que les derniers "
-"chiffres de la date (par exemple, si la date courante est 2005: 5 => 2005, 4 "
-"=> 2004, 6 => 1996, 95 => 1995, ...)."
+"Compléter automatiquement le champ année si vous ne tapez que les derniers "
+"chiffres de la date (par exemple, si l'année actuelle est 2005 : 5 => 2005, "
+"4 => 2004, 6 => 1996, 95 => 1995…)."
 
-#: ../src/prefs.c:597
-msgid "Write the track field with the following number of digits :"
-msgstr "Ecrire le numéro de piste avec le nombre de chiffres suivant :"
+#: ../src/prefs.c:556
+msgid "Write the track field with the following number of digits:"
+msgstr "Écrire le numéro de piste avec le nombre de chiffres suivant :"
 
-#: ../src/prefs.c:600
-#, fuzzy
+#: ../src/prefs.c:559
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
-"obtain a number with 'n' digits (Ex. with two digits : '05', '09', '10' …). "
-"Else it keeps the 'raw' track value."
+"obtain a number with 'n' digits (for example, with two digits: '05', '09', "
+"'10'…). Else it keeps the 'raw' track value."
 msgstr ""
-"Si cette option est activée, le numéro de piste est écrit sur 'n' chiffres "
-"en remplissant à gauche avec le nombre '0' (Ex avec deux chiffres : '05', "
-"'09', '10',...). Sinon, le numéro est laissé tel quel."
+"Si cette option est activée, le numéro de piste est écrit avec « n » "
+"chiffres en remplissant à gauche avec « 0 » (exemple avec deux chiffres : "
+"« 05 », « 09 », « 10 »…). Si désactivée, le numéro est laissé tel quel."
 
-#: ../src/prefs.c:615
-msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
-msgstr "Fichiers Ogg Vorbis : Ecrire aussi le commentaire au format XMMS"
+#: ../src/prefs.c:578
+msgid "Write the disc field with the following number of digits:"
+msgstr "Écrire le numéro de disque avec le nombre de chiffres suivant :"
 
-#: ../src/prefs.c:618
-msgid ""
-"XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
-"files as other apps do. In fact, this field is usually labeled with "
-"'comment=', whereas XMMS uses only `='. Please, uncheck this option if you "
-"don't want other apps to complain about an unknown field. Comments won't be "
-"shown in XMMS, though."
-msgstr ""
-"XMMS n'identifie pas le champ de commentaire correctement pour les fichiers "
-"Ogg Vorbis, au contraire des autres applications. Normalement ce champ est "
-"identifié par la chaîne 'comment=', mais XMMS identifie ce champ seulement "
-"par '='. Par conséquent, désactivez cette option si vous ne voulez pas voir "
-"apparaître un champ inconnu dans Winamp par exemple. Mais le commentaire ne "
-"pourra pas être affiché dans XMMS."
-
-#: ../src/prefs.c:633
+#: ../src/prefs.c:583
+msgid "Whether to pad the disc field with leading zeroes"
+msgstr "Indique s'il faut décaler le contenu du champ disque avec des zéros au début"
+
+#: ../src/prefs.c:613
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr ""
-"Focus du champ du tag lors du changement de fichier avec les raccourcis Page "
-"Haut/Page Bas"
+"Focus du champ de l'étiquette lors du changement de fichier avec les "
+"raccourcis « Page haut/Page bas » :"
 
-#: ../src/prefs.c:642
+#: ../src/prefs.c:619
 msgid "Keep focus to the same tag field"
-msgstr "Garder le focus sur le même champ du tag"
+msgstr "Garder le focus sur le même champ de l'étiquette"
 
-#: ../src/prefs.c:648
-msgid "Return focus to the first tag field (ie 'Title' field)"
-msgstr "Redonner le focus au premier champ du tag (champ 'Titre')"
+#: ../src/prefs.c:625
+msgid "Return focus to the first tag field (i.e. 'Title' field)"
+msgstr ""
+"Redonner le focus au premier champ de l'étiquette (p.ex. champ « Titre »)"
 
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(SetFocusToFirstTagField),SET_FOCUS_TO_FIRST_TAG_FIELD);
 #. Tag Splitting
-#: ../src/prefs.c:653
-#, fuzzy
+#: ../src/prefs.c:630
 msgid "Tag Splitting"
-msgstr "Paramètres des Tags"
+msgstr "Diviser les étiquettes"
 
-#: ../src/prefs.c:660
+#: ../src/prefs.c:639
 msgid ""
-"For Vorbis tags, selected fields will be split atdashes and saved as "
+"For Vorbis tags, selected fields will be split at dashes and saved as "
 "separate tags"
 msgstr ""
+"Pour les étiquettes Vorbis, les champs sélectionnés sont coupés aux tirets "
+"et enregistrés comme étiquettes séparées"
+
+#: ../src/prefs.c:649
+msgid "Original artist"
+msgstr "Artiste original"
 
 #.
 #. * ID3 Tag Settings
 #.
-#: ../src/prefs.c:692 ../src/prefs.c:693
+#: ../src/prefs.c:670
 msgid "ID3 Tag Settings"
-msgstr "Paramètres des Tags ID3"
+msgstr "Paramètres des étiquettes ID3"
 
 #. Tag Rules frame
-#: ../src/prefs.c:705
+#: ../src/prefs.c:679
 msgid "ID3 Tag Rules"
-msgstr "Règles pour les Tags ID3"
-
-#. Write ID3 tags in FLAC files
-#: ../src/prefs.c:717
-msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
-msgstr "Ecrire des tags ID3 dans les fichiers FLAC (en plus du tag FLAC)"
-
-#: ../src/prefs.c:720
-msgid ""
-"If activated, ID3 tags will be also added in the FLAC file (according the "
-"two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
-msgstr ""
-"Si activé, les tags ID3 seront aussi ajoutés dans les fichiers FLAC (d'après "
-"les deux précédentes règles, avec le tag FLAC). Sinon, les tags ID3 seront "
-"supprimés."
+msgstr "Règles pour les étiquettes ID3"
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: ../src/prefs.c:725
+#: ../src/prefs.c:691
 msgid "Strip tags if all fields are set to blank"
-msgstr "Supprimer les tags si tous les champs sont vides"
+msgstr "Supprimer les étiquettes si tous les champs sont laissés vides"
 
-#: ../src/prefs.c:728
-#, fuzzy
+#: ../src/prefs.c:694
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
-"Genre or Comment (as an attached picture, lyrics …), this option allows you "
-"to strip the whole tag when these seven standard data fields have been set "
-"to blank."
+"Genre or Comment (as an attached image, lyrics…), this option allows you to "
+"strip the whole tag when these seven standard data fields have been set to "
+"blank."
 msgstr ""
-"Comme les tags ID3v2 peuvent contenir d'autres informations que le titre, "
-"l'artiste, l'album, l'année, la piste, le genre ou un commentaire (comme une "
-"image attachée, les paroles, ...), cette option permet de supprimer "
-"entièrement le tag lorsque ces sept données sont vides."
+"Comme les étiquettes ID3v2 peuvent contenir d'autres informations que le "
+"titre, l'artiste, l'album, l'année, la piste, le genre ou un commentaire "
+"(comme une image attachée, des paroles…), cette option permet de supprimer "
+"entièrement l'étiquette lorsque ces sept champs sont laissés vides."
 
 #. Convert old ID3v2 tag version
-#: ../src/prefs.c:734
+#: ../src/prefs.c:700
 msgid "Automatically convert old ID3v2 tag versions"
-msgstr "Convertir automatiquement les anciennes versions de tag ID3v2"
+msgstr "Convertir automatiquement les anciennes versions des étiquettes ID3v2"
 
-#: ../src/prefs.c:737
+#: ../src/prefs.c:703
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
 msgstr ""
-"Si activé, une ancienne version de tag ID3v2 (comme ID3v2.2) sera convertie "
-"en version ID3v2.3."
+"Si activé, une ancienne version d'une étiquette ID3v2 (comme ID3v2.2) est "
+"convertie en version ID3v2.3."
 
 #. Use CRC32
-#: ../src/prefs.c:741
+#: ../src/prefs.c:707
 msgid "Use CRC32"
 msgstr "Utiliser CRC32"
 
-#: ../src/prefs.c:744
+#: ../src/prefs.c:710
 msgid "Set CRC32 in the ID3v2 tags"
-msgstr "Utiliser CRC32 dans les tags ID3v2"
+msgstr "Utiliser CRC32 dans les étiquettes ID3v2"
 
 #. Use Compression
-#: ../src/prefs.c:747
+#: ../src/prefs.c:713
 msgid "Use Compression"
 msgstr "Utiliser la compression"
 
-#: ../src/prefs.c:750
+#: ../src/prefs.c:717
 msgid "Set Compression in the ID3v2 tags"
-msgstr "Utiliser la compression dans les tags ID3v2"
+msgstr "Utiliser la compression dans les étiquettes ID3v2"
 
 #. Write Genre in text
-#: ../src/prefs.c:753
+#: ../src/prefs.c:720
 msgid "Write Genre in text only"
-msgstr ""
+msgstr "Écrire le genre en texte seulement"
 
-#: ../src/prefs.c:756
+#: ../src/prefs.c:724
 msgid ""
 "Don't use ID3v1 number references in genre tag. Enable this if you see "
 "numbers as genre in your music player."
 msgstr ""
+"Ne pas utiliser de références numériques dans l'étiquette genre. Activez "
+"cette fonction si vous voyez apparaître des chiffres pour caractériser le "
+"genre dans votre lecteur de musique."
 
 #. Character Set for writing ID3 tag
-#: ../src/prefs.c:759
+#: ../src/prefs.c:727
 msgid "Character Set for writing ID3 tags"
-msgstr "Jeu de caractères pour écrire les tags ID3"
+msgstr "Jeu de caractères pour écrire les étiquettes ID3"
 
 #. ID3v2 tags
-#: ../src/prefs.c:766
+#: ../src/prefs.c:734
 msgid "ID3v2 tags"
-msgstr "Tags ID3v2"
+msgstr "Étiquettes ID3v2"
 
 #. Write ID3v2 tag
-#: ../src/prefs.c:779
+#: ../src/prefs.c:747
 msgid "Write ID3v2 tag"
-msgstr "Ecrire le tag ID3v2"
+msgstr "Écrire l'étiquette ID3v2"
 
-#: ../src/prefs.c:782
+#: ../src/prefs.c:750
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
 msgstr ""
-"Si cette option est activée, un tag à la norme ID3v2.4 sera ajouté ou mis à "
-"jour au début des fichiers MP3. Sinon, il sera supprimé."
+"Si cette option est activée, une étiquette à la norme ID3v2.4 est ajouté ou "
+"mis à jour au début des fichiers MP3. Sinon, il est supprimé."
 
 #. ID3v2 tag version
-#: ../src/prefs.c:789
+#: ../src/prefs.c:757
 msgid "Version:"
-msgstr "Version :"
+msgstr "Version :"
 
-#: ../src/prefs.c:796
+#: ../src/prefs.c:763
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
 " - ID3v2.4 is written using libid3tag (recommended)."
 msgstr ""
-"Sélectionner la version du tag ID3v2 à écrire:\n"
+"Sélectionner la version de l'étiquette ID3v2 à écrire :\n"
 " - ID3v2.3 est écrit en utilisant id3lib,\n"
-" - ID3v2.4 esr écrit en utilisant libid3tag (recommendé)."
+" - ID3v2.4 est écrit en utilisant libid3tag (recommandé)."
 
 #. Charset
 #. Id3V1 writing character set
-#: ../src/prefs.c:810 ../src/prefs.c:912
+#: ../src/prefs.c:778 ../src/prefs.c:882
 msgid "Charset:"
-msgstr "Jeu de charactères :"
+msgstr "Jeu de caractères :"
 
 #. Unicode
-#: ../src/prefs.c:818
+#: ../src/prefs.c:783
 msgid "Unicode "
 msgstr "Unicode"
 
-#: ../src/prefs.c:826
+#: ../src/prefs.c:791
 msgid "Unicode type to use"
 msgstr "Type d'Unicode à utiliser"
 
-#: ../src/prefs.c:849
+#: ../src/prefs.c:815
 msgid "Character set used to write the tag data in the file."
 msgstr ""
-"Jeu de caractères à utiliser pour l'écriture des données du tag dans le "
+"Jeu de caractères utilisé pour l'écriture des données de l'étiquette dans le "
 "fichier."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: ../src/prefs.c:859 ../src/prefs.c:928
+#: ../src/prefs.c:825 ../src/prefs.c:894
 msgid "Additional settings for iconv():"
-msgstr "Paramètres supplémentaires pour iconv() :"
+msgstr "Paramètres supplémentaires pour iconv() :"
 
-#: ../src/prefs.c:864 ../src/prefs.c:933
+#: ../src/prefs.c:831 ../src/prefs.c:900
 msgid "No"
 msgstr "Non"
 
-#: ../src/prefs.c:867 ../src/prefs.c:936
+#: ../src/prefs.c:835 ../src/prefs.c:904
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it isn't changed. But note that an error message will be "
 "displayed for information."
 msgstr ""
-"Avec cette option, quand un caractère ne peut pas être représenté dans "
-"l'encodage cible, il ne sera pas changé. Mais notez qu'un message d'erreur "
-"apparaîtra pour vous informer."
+"Avec cette option, quand un caractère ne peut pas être représenté dans le "
+"codage cible, il n'est pas changé. Mais notez qu'un message d'erreur "
+"apparaît pour vous en informer."
 
-#: ../src/prefs.c:872 ../src/prefs.c:941
+#: ../src/prefs.c:840 ../src/prefs.c:909
 msgid "//TRANSLIT"
 msgstr "//TRANSLIT"
 
-#: ../src/prefs.c:881 ../src/prefs.c:950
+#: ../src/prefs.c:850 ../src/prefs.c:919
 msgid "//IGNORE"
 msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: ../src/prefs.c:889
+#: ../src/prefs.c:859
 msgid "ID3v1 tags"
-msgstr "Tags ID3v1"
+msgstr "Étiquettes ID3v1"
 
 #. Write ID3v1 tag
-#: ../src/prefs.c:903
+#: ../src/prefs.c:873
 msgid "Write ID3v1.x tag"
-msgstr "Ecrire le tag ID3v1.x"
+msgstr "Écrire l'étiquette ID3v1.x"
 
-#: ../src/prefs.c:906
+#: ../src/prefs.c:876
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
 msgstr ""
-"Si cette option est activée, un tag à la norme ID3v1 sera ajouté ou mis à "
-"jour, à la fin des fichiers MP3. Sinon, il sera supprimé."
+"Si cette option est activée, une étiquette à la norme ID3v1 est ajoutée ou "
+"mise à jour à la fin des fichiers MP3. Sinon, elle est supprimée."
 
-#: ../src/prefs.c:923
+#: ../src/prefs.c:890
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr ""
-"Jeu de caractères à utiliser pour l'écriture des données du tag ID3v1 dans "
-"le fichier."
+"Jeu de caractères utilisé pour l'écriture des données de l'étiquette ID3v1 "
+"dans le fichier."
 
 #. Character Set for reading tag
-#: ../src/prefs.c:958
+#: ../src/prefs.c:928
 msgid "Character Set for reading ID3 tags"
-msgstr "Jeu de caractères pour lire les tags ID3"
+msgstr "Jeu de caractères pour lire les étiquettes ID3"
 
-#: ../src/prefs.c:972
-#, fuzzy
+#: ../src/prefs.c:942
 msgid "Non-standard:"
-msgstr "Non standard :"
+msgstr "Non standard :"
 
-#: ../src/prefs.c:977
+#: ../src/prefs.c:948
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
-"For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
-"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
+"For example:\n"
+"  - In previous versions of EasyTAG, you could save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct. To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
-"  - If unicode was not used, Russian people can select the character set "
+"  - If Unicode was not used, Russian people can select the character set "
 "'Windows-1251' to load tags written under Windows. And 'KOI8-R' to load tags "
 "written under Unix systems."
 msgstr ""
-"Cet encodage sera utilisé pour la lecture des données du tag, pour convertir "
+"Ce codage est utilisé pendant la lecture des données du tag, pour convertir "
 "chaque chaîne contenue dans un champ ISO-8859-1 du tag (pour les tags ID3v2 "
 "et/ou ID3v1).\n"
 "\n"
-"Par exemple :\n"
-"  - dans les versions précédentes de EasyTAG, vous pouviez sauver des "
-"chaînes en UTF-8 dans des champs en ISO-8859-1. Cela n'est pas correct! Pour "
-"convertir ces tags en Unicode : activer cette option et sélectionner UTF-8. "
-"Vous devez aussi activer au dessus l'option 'Essayer de sauver les tags avec "
-"l'encodage ISO-8859-1. En cas d'échec, utiliser l'UNICODE (recommandé)' ou "
-"'Toujours sauver les tags avec l'encodage ISO-8859-1'.\n"
-"  - Si l'Unicode n'est pas utilisé, les personnes Russes peuvent "
-"sélectionner l'encodage 'Windows-1251' pour charger des tags écrits sous "
-"Windows. Et 'KOI8-R' pour charger des tags écrits sous un système Unix."
-
-#: ../src/prefs.c:995
+"Par exemple :\n"
+"  - dans les versions précédentes de EasyTAG, vous pouviez enregistrer des "
+"chaînes UTF-8 dans des champs ISO-8859-1. Ceci est incorrect. Pour convertir "
+"ces étiquettes en Unicode : activez cette option et sélectionnez UTF-8. Vous "
+"devez aussi activer au dessus l'option « Essayer d'enregistrer les "
+"étiquettes en ISO-8859-1. En cas d'échec, utiliser UNICODE (recommandé) » ou "
+"« Toujours enregistrer les étiquettes en ISO-8859-1 ».\n"
+"  - si Unicode n'est pas utilisé, les russes peuvent sélectionner "
+"« Windows-1251 » pour charger des étiquettes écrits sous Windows et « KOI8-"
+"R » pour charger des étiquettes écrits sous un système Unix."
+
+#: ../src/prefs.c:966
 msgid "Character set used to read tag data in the file."
 msgstr ""
-"Jeu de caractères à utiliser pour la lecture des données du tag dans le "
+"Jeu de caractères utilisé pour la lecture des données de l'étiquette dans le "
 "fichier."
 
 #.
 #. * Scanner
 #.
-#: ../src/prefs.c:1010 ../src/prefs.c:1011
+#: ../src/prefs.c:980
 msgid "Scanner"
 msgstr "Scanner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: ../src/prefs.c:1023
+#: ../src/prefs.c:990
 msgid "Fill Tag Scanner - Character Conversion"
-msgstr "Scanner Compléter Tag - Conversion de Caractères"
+msgstr "Scanner Compléter l'étiquette - Conversion de caractères"
 
-#: ../src/prefs.c:1029 ../src/prefs.c:1054
+#: ../src/prefs.c:996 ../src/prefs.c:1021
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr ""
-"Convertir le caractère underscore '_' et la chaîne '%20' par un espace ' '"
+"Convertir le soulignement « _ » et la chaîne « %20 » par une espace «   »"
 
-#: ../src/prefs.c:1031 ../src/prefs.c:1055
+#: ../src/prefs.c:998 ../src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
-msgstr "Convertir les espaces ' ' par des underscores '_'"
+msgstr "Convertir les espaces «   » par des soulignements « _ »"
 
-#: ../src/prefs.c:1043 ../src/prefs.c:1045
+#: ../src/prefs.c:1010 ../src/prefs.c:1012
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
 msgstr ""
-"Si activé, cette conversion sera utilisée lors de l'utilisation d'un masque "
-"à partir du scanner de tags."
+"Si activée, cette conversion est utilisée lors de l'application d'un masque "
+"aux étiquettes avec le scanner."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: ../src/prefs.c:1049
+#: ../src/prefs.c:1016
 msgid "Rename File Scanner - Character Conversion"
-msgstr "Scanner Renommer Fichier - Conversion de Caractères"
+msgstr "Scanner Renommer le fichier - Conversion de caractères"
 
-#: ../src/prefs.c:1066 ../src/prefs.c:1068 ../src/prefs.c:1070
+#: ../src/prefs.c:1033 ../src/prefs.c:1035 ../src/prefs.c:1037
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
 msgstr ""
-"Si activé, cette conversion sera utilisée lors de l'utilisation d'un masque "
-"à partir du scanner de fichiers."
+"Si activée, cette conversion est utilisée lors de l'application d'un masque "
+"aux fichiers avec le scanner."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: ../src/prefs.c:1073
+#: ../src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
-msgstr "Scanner Traiter les Champs - Conversion de Caractères"
+msgstr "Scanner Traiter les champs - Conversion de caractères"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: ../src/prefs.c:1080
+#: ../src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 "Ne pas convertir en majuscule la première lettre de certaines prépositions "
 "et articles."
 
-#: ../src/prefs.c:1084
+#: ../src/prefs.c:1051
 msgid ""
-"Don't convert first letter of the words like prepositions, articles and "
-"words like feat., when using the scanner 'First letter uppercase of each "
+"Don't convert first letter of words like prepositions, articles and words "
+"like feat., when using the scanner 'First letter uppercase of each "
 "word' (for example, you will obtain 'Text in an Entry' instead of 'Text In "
 "An Entry')."
 msgstr ""
-"Ne pas convertir la première lettre de certains mots comme les prépositions "
-"'at', 'in', 'on' ou de mots comme 'feat.', lors de l'utilisation du scanner "
-"'Première lettre de chaque mot en majuscule' (par exemple, vous obtiendrez "
-"'Text in an Entry' au lieu de 'Text In An Entry')."
+"Ne pas convertir la première lettre de mots comme les prépositions, les "
+"articles et les fonctions, lors de l'utilisation du scanner « Première "
+"lettre de chaque mot en majuscule » (par exemple, vous obtiendrez « Texte "
+"dans le Champ » au lieu de « Texte Dans Le Champ »)."
 
 #. Properties of the scanner window
-#: ../src/prefs.c:1090
+#: ../src/prefs.c:1057
 msgid "Scanner Window"
-msgstr "Fenêtre du Scanner"
+msgstr "Boîte de dialogue du scanner"
 
-#: ../src/prefs.c:1096
+#: ../src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
-msgstr "Ouvrir la Fenêtre du Scanner au démarrage"
+msgstr "Ouvrir la boîte de dialogue du scanner au démarrage"
 
-#: ../src/prefs.c:1099
+#: ../src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr ""
-"Activer cette option pour ouvrir automatiquement la fenêtre des scanners au "
-"démarrage de EasyTAG."
-
-#: ../src/prefs.c:1102
-msgid "Scanner window always on top"
-msgstr "Fenêtre du scanner toujours au dessus"
-
-#: ../src/prefs.c:1105
-msgid ""
-"If activated, the window which contains the masks will stay always over the "
-"main window."
-msgstr ""
-"Si activé, la fenêtre qui contient les masques sera toujours au dessus de la "
-"fenêtre principale (toujours visible)."
+"Activer cette option pour ouvrir automatiquement la boîte de dialogue du "
+"scanner au démarrage de EasyTAG."
 
 #. Other options
-#: ../src/prefs.c:1110
+#: ../src/prefs.c:1071
 msgid "Fields"
 msgstr "Champs"
 
 #. Overwrite text into tag fields
-#: ../src/prefs.c:1117
-msgid "Overwrite fields when scanning tag"
-msgstr "Ecraser les champs lors d'un Scan du tag"
+#: ../src/prefs.c:1078
+msgid "Overwrite fields when scanning tags"
+msgstr "Écraser les champs lors d'un scan d'étiquettes"
 
-#: ../src/prefs.c:1120
+#: ../src/prefs.c:1081
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
 msgstr ""
-"Si activé, le scanner remplacera le texte contenu dans les différents "
-"champs, par le nouveau. Si désactivé, seulement les champs vides seront "
-"complétés."
+"Si activé, le scanner remplace le texte contenu dans les différents champs "
+"par le nouveau. Si désactivé, seuls les champs vides sont complétés."
 
-#: ../src/prefs.c:1131
-msgid "Set this text as default comment :"
-msgstr "Mettre ce texte en commentaire par défaut :"
+#: ../src/prefs.c:1092
+msgid "Set this text as default comment:"
+msgstr "Mettre ce texte en commentaire par défaut :"
 
-#: ../src/prefs.c:1134
+#: ../src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
 msgstr ""
-"Activer cette option si vous voulez mettre le texte suivant dans le champ "
-"commentaire du tag lors de l'utilisation du scanner 'Compléter le Tag'."
+"Activez cette option si vous voulez mettre le texte suivant dans le champ "
+"commentaire de l'étiquette lors de l'utilisation du scanner « Compléter "
+"l'étiquette »."
 
 #. CRC32 comment
-#: ../src/prefs.c:1152
+#: ../src/prefs.c:1113
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
-"Mettre la valeur CRC32 comme commentaire par défaut (pour fichier avec ID3 "
-"tag)."
+"Mettre CRC32 comme commentaire par défaut (seulement pour fichiers avec "
+"étiquettes ID3)."
 
-#: ../src/prefs.c:1156
+#: ../src/prefs.c:1117
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
 msgstr ""
-"Activer cette option si vous voulez mettre le texte suivant dans le champ "
-"commentaire du tag lors de l'utilisation du scanner 'Compléter le Tag'."
+"Calcule la valeur CRC-32 du fichier et l'écrit dans le champ commentaire "
+"lors de l'utilisation du scanner « Compléter l'étiquette »."
 
 #.
 #. * CDDB
 #.
-#: ../src/prefs.c:1167 ../src/prefs.c:1168
-msgid "CD Data Base"
-msgstr "Base de données CD"
+#: ../src/prefs.c:1128
+msgid "CDDB"
+msgstr "CDDB"
 
 #. CDDB Server Settings (Automatic Search)
-#: ../src/prefs.c:1177
+#: ../src/prefs.c:1134
 msgid "Server Settings for Automatic Search"
-msgstr "Paramètres du Serveur pour la Recherche Automatique"
+msgstr "Paramètres du serveur pour la recherche automatique"
 
-#: ../src/prefs.c:1186 ../src/prefs.c:1225 ../src/prefs.c:1259
-msgid "Name :"
-msgstr "Nom :"
+#: ../src/prefs.c:1143 ../src/prefs.c:1182 ../src/prefs.c:1216
+msgid "Name:"
+msgstr "Nom :"
 
-#: ../src/prefs.c:1205 ../src/prefs.c:1233 ../src/prefs.c:1268
-#: ../src/prefs.c:1357
-msgid "Port :"
-msgstr "Port :"
+#: ../src/prefs.c:1162 ../src/prefs.c:1190 ../src/prefs.c:1225
+#: ../src/prefs.c:1310
+msgid "Port:"
+msgstr "Port :"
 
-#: ../src/prefs.c:1215 ../src/prefs.c:1243 ../src/prefs.c:1278
-msgid "CGI Path :"
-msgstr "Chemin CGI :"
+#: ../src/prefs.c:1172 ../src/prefs.c:1200 ../src/prefs.c:1234
+msgid "CGI Path:"
+msgstr "Chemin CGI :"
 
 #. CDDB Server Settings (Manual Search)
-#: ../src/prefs.c:1251
+#: ../src/prefs.c:1208
 msgid "Server Settings for Manual Search"
-msgstr "Paramètres du Serveur pour la Recherche Manuelle"
+msgstr "Paramètres du serveur pour la recherche manuelle"
 
 #. Local access for CDDB (Automatic Search)
-#: ../src/prefs.c:1286
-msgid "Local CD Data Base"
-msgstr "Base de données CD locale"
+#: ../src/prefs.c:1242
+msgid "Local CDDB"
+msgstr "CDDB locale"
 
-#: ../src/prefs.c:1294
-msgid "Path :"
-msgstr "Chemin :"
+#: ../src/prefs.c:1250
+msgid "Path:"
+msgstr "Chemin :"
 
-#: ../src/prefs.c:1306
+#: ../src/prefs.c:1262
 msgid ""
-"Specify the directory where are located the local cd data base. The local cd "
-"data base contains the eleven following directories 'blues', 'classical', "
+"Specify the directory where the local CD database is located. The local CD "
+"database contains the eleven following directories 'blues', 'classical', "
 "'country', 'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' "
 "and 'misc'."
 msgstr ""
-"Spécifiez le répertoire où est placée la base de donnée de CD. Ce répertoire "
-"contient les onze répertoires suivants 'blues', 'classical', 'country', "
-"'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' et 'misc'."
+"Indiquez le répertoire où se trouve la base de données de CD locale. Elle "
+"contient les onze répertoires suivants : « blues », « classique », "
+"« country », « données », « folk », « jazz », « newage », « reggae », "
+"« rock », « musique de film » et « divers »."
 
 #. CDDB Proxy Settings
-#: ../src/prefs.c:1332
+#: ../src/prefs.c:1288
 msgid "Proxy Settings"
-msgstr "Paramètres du Proxy"
+msgstr "Paramètres du serveur mandataire"
 
-#: ../src/prefs.c:1341
+#: ../src/prefs.c:1297
 msgid "Use a proxy"
-msgstr "Utiliser un proxy"
+msgstr "Utiliser un serveur mandataire"
 
-#: ../src/prefs.c:1344
+#: ../src/prefs.c:1300
 msgid "Set active the settings of the proxy server."
-msgstr "Active les paramètres du serveur proxy."
+msgstr "Activer les paramètres du serveur mandataire."
 
-#: ../src/prefs.c:1349
-msgid "Host Name :"
-msgstr "Nom d'Hôte :"
+#: ../src/prefs.c:1302
+msgid "Host Name:"
+msgstr "Nom d'hôte :"
 
-#: ../src/prefs.c:1356
+#: ../src/prefs.c:1309
 msgid "Name of the proxy server."
-msgstr "Nom du proxy."
+msgstr "Nom du serveur mandataire."
 
-#: ../src/prefs.c:1364
+#: ../src/prefs.c:1317
 msgid "Port of the proxy server."
-msgstr "Port du proxy."
+msgstr "Port du serveur mandataire."
 
-#: ../src/prefs.c:1369
-msgid "User Name :"
-msgstr "Nom d'Utilisateur :"
+#: ../src/prefs.c:1321
+msgid "User Name:"
+msgstr "Nom d'utilisateur :"
 
-#: ../src/prefs.c:1376
+#: ../src/prefs.c:1328
 msgid "Name of user for the the proxy server."
-msgstr "Nom de l'utilisateur sur le serveur proxy."
+msgstr "Nom de l'utilisateur sur le serveur mandataire."
 
-#: ../src/prefs.c:1377
-msgid "User Password :"
-msgstr "Mot de Passe Utilisateur :"
+#: ../src/prefs.c:1329
+msgid "User Password:"
+msgstr "Mot de passe utilisateur :"
 
-#: ../src/prefs.c:1385
+#: ../src/prefs.c:1337
 msgid "Password of user for the the proxy server."
-msgstr "Mot de Passe de l'utilisateur sur le serveur proxy."
+msgstr "Mot de passe de l'utilisateur sur le serveur mandataire."
 
 #. Track Name list (CDDB results)
-#: ../src/prefs.c:1390
+#: ../src/prefs.c:1342
 msgid "Track Name List"
-msgstr "Liste des Noms de Pistes"
+msgstr "Liste des noms de pistes"
 
-#: ../src/prefs.c:1397
+#: ../src/prefs.c:1349
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
-"Sélectionner le fichier audio correspondant (d'après la position ou "
-"l'algorithme DLM si activé en dessous)"
+"Sélectionner le fichier audio correspondant (d'après sa position ou "
+"l'algorithme DLM si activé ci-dessous)"
 
-#: ../src/prefs.c:1401
+#: ../src/prefs.c:1353
 msgid ""
 "If activated, when selecting a line in the list of tracks name, the "
 "corresponding audio file in the main list will be also selected."
 msgstr ""
 "Si activé, lorsque vous sélectionnez une ligne dans la liste des noms de "
-"pistes, le fichier audio correspondant dans la liste principale sera aussi "
+"pistes, le fichier audio correspondant dans la liste principale est aussi "
 "sélectionné."
 
 #. Check box to use DLM (also used in the cddb window)
-#: ../src/prefs.c:1406
+#: ../src/prefs.c:1358
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
 msgstr ""
 "Utiliser l'algorithme Levenshtein (DLM) pour faire correspondre les lignes "
-"(d'après le titre) avec les fichiers\n"
-"audio (d'après le nom de fichier)"
+"(d'après le titre) avec les fichiers audio (d'après le nom de fichier)"
 
 #.
 #. * Confirmation
 #.
-#: ../src/prefs.c:1421 ../src/prefs.c:1422
+#: ../src/prefs.c:1373
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: ../src/prefs.c:1430
+#: ../src/prefs.c:1378
 msgid "Confirm exit from program"
-msgstr "Confirmer la sortie du programme"
+msgstr "Confirmer la fermeture du programme"
 
-#: ../src/prefs.c:1433
+#: ../src/prefs.c:1381
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr ""
-"Si cette option est activée, une boîte de dialogue s'ouvrira pour demander "
+"Si cette option est activée, une boîte de dialogue s'ouvre pour demander "
 "confirmation avant la fermeture de l'application."
 
-#: ../src/prefs.c:1436
+#: ../src/prefs.c:1384
 msgid "Confirm writing of file tag"
-msgstr "Confirmer l'écriture du tag du fichier"
+msgstr "Confirmer l'écriture de l'étiquette du fichier"
 
-#: ../src/prefs.c:1440
+#: ../src/prefs.c:1388
 msgid "Confirm renaming of file"
-msgstr "Confirmer pour renommer les fichiers"
+msgstr "Confirmer le renommage du fichier"
 
-#: ../src/prefs.c:1444
+#: ../src/prefs.c:1392
 msgid "Confirm deleting of file"
-msgstr "Confirmer l'effacement des fichiers"
+msgstr "Confirmer la suppression du fichier"
 
-#: ../src/prefs.c:1448
+#: ../src/prefs.c:1396
 msgid "Confirm writing of playlist"
 msgstr "Confirmer l'écriture de la liste de lecture"
 
-#: ../src/prefs.c:1452
+#: ../src/prefs.c:1400
 msgid "Confirm changing directory when there are unsaved changes"
 msgstr ""
-
-#. Disable temporarily the apply button
-#. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
-#. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
-#. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: ../src/prefs.c:1473
-msgid "Apply changes (but don't save) and close this window"
-msgstr "Appliquer les changements (mais ne pas sauver) et fermer cette fenêtre"
-
-#: ../src/prefs.c:1482
-msgid "Close this window without saving"
-msgstr "Fermer cette fenêtre sans sauver"
-
-#: ../src/prefs.c:1490
-msgid "Save changes and close this window"
-msgstr "Sauver les changements et fermer cette fenêtre"
+"Confirmer la fermeture du répertoire s'il y a des modifications non "
+"enregistrées"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: ../src/prefs.c:1523
+#: ../src/prefs.c:1438
 #, c-format
-msgid "(Example : %.*d_-_Track_name_1.mp3)"
-msgstr "(Exemple : %.*d_-_Piste_1.mp3)"
+msgid "(Example: %.*d_-_Track_name_1.mp3)"
+msgstr "(Exemple : %.*d_-_Piste_1.mp3)"
 
-#: ../src/prefs.c:1682
-msgid "Changes applied"
-msgstr "Changements appliqués"
+#. Translators: please do NOT translate '%.*d' in this string.
+#: ../src/prefs.c:1471
+#, c-format
+msgid "(Example: disc_%.*d_of_10/Track_name_1.mp3)"
+msgstr "(Exemple : disque_%.*d_sur_10/Nom_de_la_piste_1.mp3)"
 
-#: ../src/prefs.c:1701 ../src/setting.c:906
+#: ../src/prefs.c:1613 ../src/setting.c:904
 msgid "Configuration saved"
-msgstr "Configuration sauvée"
+msgstr "Configuration enregistrée"
 
-#: ../src/prefs.c:1708
+#: ../src/prefs.c:1621
 msgid "Configuration unchanged"
 msgstr "Configuration inchangée"
 
-#: ../src/prefs.c:1808
-#, fuzzy
-msgid " The selected path for 'Default path to files' is invalid"
+#: ../src/prefs.c:1712
+msgid "The selected path for 'Default path to files' is invalid"
 msgstr ""
-" Le chemin sélectionné comme 'Chemin par défaut des fichiers' est invalide!\n"
-"'%s'\n"
-"(%s) "
+"Le chemin sélectionné comme « Chemin par défaut des fichiers » n'est pas "
+"valide"
 
-#: ../src/prefs.c:1809
+#: ../src/prefs.c:1714
 #, c-format
 msgid ""
 "Path: '%s'\n"
 "Error: %s"
 msgstr ""
+"Chemin : « %s »\n"
+"Erreur : %s"
 
-#: ../src/prefs.c:1810
-#, fuzzy
+#: ../src/prefs.c:1716
 msgid "Invalid Path Error"
-msgstr "Version du tag invalide"
+msgstr "Erreur de chemin non valide"
 
-#: ../src/prefs.c:1922
-#, fuzzy, c-format
+#: ../src/prefs.c:1830
+#, c-format
 msgid "The audio file player '%s' cannot be found"
-msgstr "Le programme de lecture audio '%s' n'a pas été trouvé!"
+msgstr "Impossible de trouver le lecteur audio « %s »"
 
-#: ../src/prefs.c:1924
-#, fuzzy
+#: ../src/prefs.c:1832
 msgid "Audio Player Error"
-msgstr "Lancer Lecteur Audio"
+msgstr "Erreur du lecteur audio"
 
 #: ../src/scan.c:180
 msgid "Fill Tag"
-msgstr "Compléter Tag"
-
-#: ../src/scan.c:181
-msgid "Rename File and Directory"
-msgstr "Renommer le Fichier et le Répertoire"
+msgstr "Compléter l'étiquette"
 
-#: ../src/scan.c:182
-msgid "Process Fields"
-msgstr "Traiter Champs"
+#: ../src/scan.c:354
+#, c-format
+msgid "Cannot calculate CRC value of file (%s)"
+msgstr "Impossible de calculer la valeur CRC du fichier (%s)"
 
-#: ../src/scan.c:362
-#, fuzzy
-msgid "Tag successfully scanned…"
-msgstr "Tag scanné avec succès..."
+#: ../src/scan.c:369
+msgid "Tag successfully scanned"
+msgstr "Étiquette scannée avec succès"
 
-#: ../src/scan.c:364
-#, fuzzy, c-format
-msgid "Tag successfully scanned…(%s)"
-msgstr "Tag scanné avec succès...(%s)"
+#: ../src/scan.c:371
+#, c-format
+msgid "Tag successfully scanned: %s"
+msgstr "Étiquette scannée avec succès : %s"
 
-#: ../src/scan.c:404
-#, fuzzy, c-format
-msgid ""
-"Tag scanner: strange… the extension '%s' was not found in filename '%s'!"
+#: ../src/scan.c:412
+#, c-format
+msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
 msgstr ""
-"Scanner de tags : étrange..., l'extension '%s' n'a pas été trouvée dans le "
-"nom de fichier '%s'!"
+"Scanner d'étiquettes : étrange… l'extension « %s » n'a pas été trouvée dans "
+"le nom de fichier « %s »"
 
-#: ../src/scan.c:486 ../src/scan.c:515
+#: ../src/scan.c:494 ../src/scan.c:523
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
-msgstr "Erreur de scanner: Impossible de trouver le séparateur '%s' dans '%s'"
+msgstr ""
+"Erreur de scanner : impossible de trouver le séparateur « %s » dans « %s »"
 
-#: ../src/scan.c:700
-#, fuzzy
-msgid "New file name successfully scanned…"
-msgstr "Nouveau nom de fichier scanné avec succès..."
+#: ../src/scan.c:710
+msgid "New filename successfully scanned"
+msgstr "Nouveau nom de fichier scanné avec succès"
 
-#: ../src/scan.c:703
-#, fuzzy, c-format
-msgid "New file name successfully scanned…(%s)"
-msgstr "Nouveau nom de fichier scanné avec succès...(%s)"
+#: ../src/scan.c:713
+#, c-format
+msgid "New filename successfully scanned: %s"
+msgstr "Nouveau nom de fichier scanné avec succès : %s"
 
-#. The init position is define below, cause the scanner window must be showed before
-#. * to be able to move it.
-#. Title
-#: ../src/scan.c:2347
-msgid "Tag and File Name scan"
-msgstr "Scanner de Tag et de Nom du Fichier"
+#: ../src/scan.c:1822
+#, c-format
+msgid "Error while processing fields: %s"
+msgstr "Erreur lors du traitement des champs : %s"
+
+#. The window
+#: ../src/scan.c:1992
+msgid "Tag and Filename Scan"
+msgstr "Scanner l'étiquette et le nom de fichier"
+
+#. TODO: Set related action to match AM_SCAN_FILES.
+#: ../src/scan.c:2001
+msgid "Scan Files"
+msgstr "Scanner les fichiers"
 
 #. Option Menu
-#: ../src/scan.c:2366
+#: ../src/scan.c:2029
 msgid "Scanner:"
-msgstr "Scanner : "
+msgstr "Scanner : "
 
-#. Selection of the item made at the end of the function
-#: ../src/scan.c:2388
+#: ../src/scan.c:2050
 msgid "Select the type of scanner to use"
-msgstr "Sélectionner le type du scanner à utiliser"
+msgstr "Sélectionner le type de scanner à utiliser"
 
-#: ../src/scan.c:2397
-msgid "Open scanner window / Scan selected files"
-msgstr "Ouvrir fenêtre de Scan / Scanner le(s) fichier(s) sélectionné(s)"
+#: ../src/scan.c:2059
+msgid "Scanner Preferences"
+msgstr "Préférences du scanner"
 
-#: ../src/scan.c:2410
-msgid "Scanner Options"
-msgstr "Options du Scanner"
-
-#: ../src/scan.c:2419
+#: ../src/scan.c:2068
 msgid "Show / Hide Masks Editor"
-msgstr "Montrer / Cacher l'Editeur de Masques"
+msgstr "Montrer / Masquer l'éditeur de masques"
 
-#: ../src/scan.c:2429
+#: ../src/scan.c:2078
 msgid "Show / Hide Legend"
-msgstr "Montrer / Cacher la Légende"
-
-#: ../src/scan.c:2439
-msgid "Close this window"
-msgstr "Fermer cette fenêtre"
+msgstr "Montrer / Masquer la légende"
 
-#: ../src/scan.c:2467
+#: ../src/scan.c:2108
 msgid ""
-"Select or type in a mask using codes (see Legend) to parse file name and "
-"path. Used to fill in tag fields."
+"Select or type in a mask using codes (see Legend) to parse filename and "
+"path. Used to fill in tag fields"
 msgstr ""
-"Sélectionner ou taper un masque en utilisant les codes (voir Légende) pour "
-"analyser le nom du fichier et le chemin, afin de compléter les champs du tag."
+"Sélectionner ou saisir un masque en utilisant les codes (voir la légende) "
+"pour analyser le nom du fichier et son chemin, afin de compléter les champs "
+"de l'étiquette."
 
 #. Preview label
-#: ../src/scan.c:2493
-#, fuzzy
-msgid "Fill tag preview…"
-msgstr "Apercu du scanner de tag..."
+#: ../src/scan.c:2132
+msgid "Fill tag preview"
+msgstr "Aperçu du remplissage de l'étiquette"
 
-#: ../src/scan.c:2520
+#: ../src/scan.c:2162
 msgid "Prefix mask with current path"
-msgstr "Préfixer le masque avec le chemin courant"
+msgstr "Préfixer le masque avec le chemin actuel"
 
-#: ../src/scan.c:2533
+#: ../src/scan.c:2176
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
 "Use / to make directories. If the first character is /, it's a absolute "
 "path, otherwise is relative to the old path."
 msgstr ""
-"Sélectionner ou saisir un masque en utilisant les codes (voir légende) pour "
-"analyser les champs du tag et renommer le fichier. Utiliser / pour créer des "
-"répertoires. Si le premier caractère est /, il s'agit d'un chemin absolu, "
-"sinon d'un chemin relatif par rapport à l'ancien."
+"Sélectionner ou saisir un masque en utilisant les codes (voir la légende) "
+"pour analyser les champs de l'étiquette et renommer le fichier.\n"
+"Utiliser « / » pour créer des répertoires. Si le premier caractère est /, il "
+"s'agit d'un chemin absolu, sinon d'un chemin relatif par rapport à l'ancien."
 
 #. Preview label
-#: ../src/scan.c:2560
-#, fuzzy
-msgid "Rename file preview…"
-msgstr "Apercu du renommeur de fichiers..."
+#: ../src/scan.c:2201
+msgid "Rename file preview"
+msgstr "Aperçu du renommage du fichier"
 
-#: ../src/scan.c:2580
+#: ../src/scan.c:2220
 msgid "Select fields:"
-msgstr "Champs:"
+msgstr "Sélectionner les champs :"
 
-#: ../src/scan.c:2583
+#: ../src/scan.c:2223
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
-"those who interest you."
+"those which interest you"
 msgstr ""
-"Les boutons sur la droite représentent les champs qui peuvent être traités. "
+"Les boutons à droite représentent les champs qui peuvent être traités. "
 "Sélectionnez ceux qui vous intéressent."
 
-#. Advice for Translators : set the first letter of filename translated
-#: ../src/scan.c:2586
+#. Advice for Translators: set the first letter of filename translated
+#: ../src/scan.c:2227
 msgid "F"
 msgstr "F"
 
-#: ../src/scan.c:2587
-msgid "Process file name field"
-msgstr "Traiter le champ du nom de fichier"
+#: ../src/scan.c:2229
+msgid "Process filename field"
+msgstr "Traiter le champ nom de fichier"
 
-#. Advice for Translators : set the first letter of title translated
-#: ../src/scan.c:2589
+#. Advice for Translators: set the first letter of title translated
+#: ../src/scan.c:2231
 msgid "T"
 msgstr "T"
 
-#: ../src/scan.c:2590
+#: ../src/scan.c:2232
 msgid "Process title field"
-msgstr "Traiter le champ du titre"
+msgstr "Traiter le champ titre"
 
-#. Advice for Translators : set the first letter of artist translated
-#: ../src/scan.c:2592
+#. Advice for Translators: set the first letter of artist translated
+#: ../src/scan.c:2234
 msgid "Ar"
 msgstr "Ar"
 
-#: ../src/scan.c:2593
+#: ../src/scan.c:2235
 msgid "Process file artist field"
-msgstr "Traiter le champ de l'artiste"
+msgstr "Traiter le champ artiste"
 
-#. Advice for Translators : set the first letter of album artist translated
-#: ../src/scan.c:2595
+#. Advice for Translators: set the first letter of album artist translated
+#: ../src/scan.c:2237
 msgid "AA"
-msgstr ""
+msgstr "AA"
 
-#: ../src/scan.c:2596
-#, fuzzy
+#: ../src/scan.c:2238
 msgid "Process album artist field"
-msgstr "Traiter le champ de l'artiste"
+msgstr "Traiter le champ artiste de l'album"
 
-#. Advice for Translators : set the first letter of album translated
-#: ../src/scan.c:2598
+#. Advice for Translators: set the first letter of album translated
+#: ../src/scan.c:2240
 msgid "Al"
 msgstr "Al"
 
-#: ../src/scan.c:2599
+#: ../src/scan.c:2241
 msgid "Process album field"
-msgstr "Traiter le champ de l'album"
+msgstr "Traiter le champ album"
 
-#. Advice for Translators : set the first letter of genre translated
-#: ../src/scan.c:2601
+#. Advice for Translators: set the first letter of genre translated
+#: ../src/scan.c:2243
 msgid "G"
 msgstr "G"
 
-#: ../src/scan.c:2602
+#: ../src/scan.c:2244
 msgid "Process genre field"
-msgstr "Traiter le champ du genre"
+msgstr "Traiter le champ genre"
 
-#. Advice for Translators : set the first letter of comment translated
-#: ../src/scan.c:2604
+#. Advice for Translators: set the first letter of comment translated
+#: ../src/scan.c:2246
 msgid "Cm"
 msgstr "Cm"
 
-#: ../src/scan.c:2605
+#: ../src/scan.c:2247
 msgid "Process comment field"
-msgstr "Traiter le champ du commentaire"
+msgstr "Traiter le champ commentaire"
 
-#. Advice for Translators : set the first letter of composer translated
-#: ../src/scan.c:2607
+#. Advice for Translators: set the first letter of composer translated
+#: ../src/scan.c:2249
 msgid "Cp"
 msgstr "Cp"
 
-#: ../src/scan.c:2608
+#: ../src/scan.c:2250
 msgid "Process composer field"
-msgstr "Traiter le champ du compositeur"
+msgstr "Traiter le champ compositeur"
 
-#. Advice for Translators : set the first letter of orig artist translated
-#: ../src/scan.c:2610
+#. Advice for Translators: set the first letter of orig artist translated
+#: ../src/scan.c:2252
 msgid "O"
-msgstr "Ao"
+msgstr "O"
 
-#: ../src/scan.c:2611
+#: ../src/scan.c:2253
 msgid "Process original artist field"
-msgstr "Traiter le champ de l'artiste originel"
+msgstr "Traiter le champ artiste original"
 
-#. Advice for Translators : set the first letter of copyright translated
-#: ../src/scan.c:2613
+#. Advice for Translators: set the first letter of copyright translated
+#: ../src/scan.c:2255
 msgid "Cr"
 msgstr "Cr"
 
-#: ../src/scan.c:2614
+#: ../src/scan.c:2256
 msgid "Process copyright field"
-msgstr "Traiter le champ du copyright"
+msgstr "Traiter le champ copyright"
 
-#. Advice for Translators : set the first letter of URL translated
-#: ../src/scan.c:2616
+#. Advice for Translators: set the first letter of URL translated
+#: ../src/scan.c:2258
 msgid "U"
 msgstr "U"
 
-#: ../src/scan.c:2617
+#: ../src/scan.c:2259
 msgid "Process URL field"
-msgstr "Traiter le champ de l'URL"
+msgstr "Traiter le champ URL"
 
-#. Advice for Translators : set the first letter of encoder name translated
-#: ../src/scan.c:2619
+#. Advice for Translators: set the first letter of encoder name translated
+#: ../src/scan.c:2261
 msgid "E"
-msgstr "E"
+msgstr "N"
 
-#: ../src/scan.c:2620
+#: ../src/scan.c:2262
 msgid "Process encoder name field"
-msgstr "Traiter le champ du nom de l'encodeur"
+msgstr "Traiter le champ nom de l'encodeur"
 
-#: ../src/scan.c:2669
-msgid "Invert Selection"
+#: ../src/scan.c:2306
+msgid "Invert selection"
 msgstr "Inverser la sélection"
 
-#: ../src/scan.c:2678
-msgid "Select/Unselect All."
-msgstr "Tout (Dé)Sélectionner."
+#: ../src/scan.c:2313
+msgid "Select/Unselect all"
+msgstr "Tout sélectionner/désélectionner."
 
-#. Group: character conversion
-#: ../src/scan.c:2685
-msgid "Convert '_' and '%20' to ' '"
-msgstr "Convertir '_' et '%20' par ' '"
-
-#: ../src/scan.c:2691
+#: ../src/scan.c:2328
 msgid "Convert:"
-msgstr "Convertir :"
+msgstr "Convertir :"
 
-#: ../src/scan.c:2693
+#: ../src/scan.c:2330
 msgid "to: "
-msgstr "par : "
+msgstr "en : "
+
+#: ../src/scan.c:2337
+msgid "Do not convert"
+msgstr "Ne pas convertir"
 
-#: ../src/scan.c:2722
+#: ../src/scan.c:2356
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
 msgstr ""
-"Le caractère underscore ou la chaîne %20 seront remplacés par un espace "
-"(exemple, avant : 'Text%20In%20An_Entry', après : 'Text In An Entry')."
+"Le caractère soulignement ou la chaîne « %20 » sont remplacés par une "
+"espace. Exemple avant : « Texte%20Dans%20Un_Champ », après : « Texte Dans Un "
+"Champ »."
 
-#: ../src/scan.c:2725
+#: ../src/scan.c:2359
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
 msgstr ""
-"Le caractère espace est remplacé par un caractère underscore (exemple, "
-"avant : 'Text In An Entry', après : 'Text_In_An_Entry')."
+"Remplace le caractère espace par un caractère soulignement. Exemple avant : "
+"« Texte Dans Un Chame », après : « Texte_Dans_Un_Champ »."
 
-#: ../src/scan.c:2728
-#, fuzzy
+#: ../src/scan.c:2362
 msgid ""
 "Replace a string by another one. Note that the search is case sensitive."
 msgstr ""
 "Remplace une chaine par une autre. Notez que la recherche est sensible à la "
 "casse."
 
-#: ../src/scan.c:2741
+#: ../src/scan.c:2369
+msgid "Capitalize all"
+msgstr "Tout en majuscules"
+
+#: ../src/scan.c:2371
+msgid "Lowercase all"
+msgstr "Tout en minuscules"
+
+#: ../src/scan.c:2373
+msgid "Capitalize first letter"
+msgstr "Première lettre en majuscule"
+
+#: ../src/scan.c:2375
+msgid "Capitalize the first letter of each word"
+msgstr "Première lettre de chaque mot en majuscules"
+
+#: ../src/scan.c:2376
 msgid "Detect Roman numerals"
 msgstr "Détecter les chiffres romains"
 
-#: ../src/scan.c:2768
+#: ../src/scan.c:2378
+msgid "Do not change capitalization"
+msgstr "Ne pas changer la casse"
+
+#: ../src/scan.c:2400
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
 msgstr ""
-"Toutes les lettres sont mises en majuscules (exemple, avant : 'Text IN AN "
-"entry', après : 'TEXT IN AN ENTRY')."
+"Convertit toutes les lettres de tous les champs en majuscules. Exemple "
+"avant : « Texte DANS UN champ », après : « TEXTE DANS UN CHAMP »."
 
-#: ../src/scan.c:2771
+#: ../src/scan.c:2403
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
 msgstr ""
-"Toutes les lettres sont mises en minuscules (exemple, avant : 'Text IN AN "
-"entry', après : 'text in an entry')."
+"Convertit toutes les lettres de tous les champs en minuscules. Exemple "
+"avant : « Texte DANS UN champ », après : « texte dans un champ."
 
-#: ../src/scan.c:2774
+#: ../src/scan.c:2406
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
 msgstr ""
-"La première lettre du texte et les suivantes sont respectivement mises en "
-"majuscule et minuscules (exemple, avant : 'text IN An ENTRY', après : 'Text "
-"in an entry')."
+"Convertit la première lettre de tous les champs en majuscule. Exemple "
+"avant : « texte DANS Un CHAMP », après : « Texte dans un champ »."
 
-#: ../src/scan.c:2777
+#: ../src/scan.c:2409
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
 msgstr ""
-"La première lettre de chaque mot est mise en majuscule et les autres en "
-"minuscules (exemple, avant : 'Text in an ENTRY', après : 'Text In An Entry')."
+"Convertit la première lettre de chaque mot de tous les champs en majuscule. "
+"Exemple avant : « texte DANS Un CHAMP », après : « Texte Dans Un Champ »."
 
-#: ../src/scan.c:2780
+#: ../src/scan.c:2412
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
 msgstr ""
-"Forcer la conversion en majuscules des chiffres Romains (exemple, avant : "
-"'ix. text in an entry', après : 'IX. Text In An Entry')."
+"Force la conversion des chiffres romains en majuscules. Exemple avant : "
+"« ix. texte dans un champ », après : « IX. Texte Dans Un Champ »."
 
-#: ../src/scan.c:2789
-msgid "Insert a space before an uppercase letter"
-msgstr "Insérer un espace avant une majuscule"
+#: ../src/scan.c:2420
+msgid "Insert a space before uppercase letters"
+msgstr "Insérer une espace avant une majuscule"
 
-#: ../src/scan.c:2790
-msgid "Remove duplicates of space or underscore"
-msgstr "Effacer les espaces ou underscores dupliqués"
+#: ../src/scan.c:2422
+msgid "Remove duplicate spaces and underscores"
+msgstr "Supprimer les espaces et soulignements en double"
 
-#: ../src/scan.c:2808
+#: ../src/scan.c:2424
+msgid "Do not change word separators"
+msgstr "Ne pas changer les séparateurs de mots"
+
+#: ../src/scan.c:2438
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
-"Tous les espaces sont supprimés (exemple, avant: 'Text In An Entry', après: "
-"'TextInAnEntry')."
+"Supprime tous les espaces entre les mots. Exemple avant : « Texte Dans Un "
+"Champ », après : « TexteDansUnChamp »."
 
-#: ../src/scan.c:2811
+#: ../src/scan.c:2441
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
-"Avec cette option, vous pouvez ajouter un espace avant chaque lettre en "
-"majuscule (exemple, avant : 'TextInAnEntry', après : 'Text In An Entry')."
+"Insère une espace devant chaque lettre majuscule. Exemple avant : "
+"« TexteDansUnChamp », après : « Texte Dans Un Champ »."
 
-#: ../src/scan.c:2814
+#: ../src/scan.c:2444
 msgid ""
-"Duplicated spaces or underscores are removed. Example, before: "
+"Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
 msgstr ""
-"Cette option supprime les espaces ou underscores dupliqués (exemple, avant : "
-"'Text__In__An   Entry', après : 'Text_In_An Entry')."
+"Supprime les espaces et soulignements en double. Exemple avant : "
+"« Texte__Dans__Un   Champ », après : « Texte_Dans_Un Champ »."
 
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2821
+#: ../src/scan.c:2451
 msgid "Legend"
 msgstr "Légende"
 
-#: ../src/scan.c:2827
+#: ../src/scan.c:2457
 #, c-format
-msgid "%a : artist"
-msgstr "%a : artiste"
+msgid "%a: artist"
+msgstr "%a : artiste"
 
-#: ../src/scan.c:2830
-#, fuzzy
-msgid "%z : album artist"
-msgstr "%a : artiste"
+#: ../src/scan.c:2460
+msgid "%z: album artist"
+msgstr "%a : artiste de l'album"
 
-#: ../src/scan.c:2833
-msgid "%b : album"
-msgstr "%b : album"
+#: ../src/scan.c:2463
+msgid "%b: album"
+msgstr "%b : album"
 
-#: ../src/scan.c:2836
+#: ../src/scan.c:2466
 #, c-format
-msgid "%c : comment"
-msgstr "%c : commentaire"
+msgid "%c: comment"
+msgstr "%c : commentaire"
 
-#: ../src/scan.c:2839
+#: ../src/scan.c:2469
 #, c-format
-msgid "%p : composer"
-msgstr "%p : compositeur"
+msgid "%p: composer"
+msgstr "%p : compositeur"
 
-#: ../src/scan.c:2842
-msgid "%r : copyright"
-msgstr "%r : copyright:"
+#: ../src/scan.c:2472
+msgid "%r: copyright"
+msgstr "%r : copyright"
 
-#: ../src/scan.c:2845
+#: ../src/scan.c:2475
 #, c-format
-msgid "%d : disc number"
-msgstr "%d : n° disque"
+msgid "%d: disc number"
+msgstr "%d : N° du disque"
 
-#: ../src/scan.c:2848
+#: ../src/scan.c:2478
 #, c-format
-msgid "%e : encoded by"
-msgstr "%e : encodé par"
+msgid "%e: encoded by"
+msgstr "%e : encodé en"
 
-#: ../src/scan.c:2851
+#: ../src/scan.c:2481
 #, c-format
-msgid "%g : genre"
-msgstr "%g : genre"
+msgid "%g: genre"
+msgstr "%g : genre"
 
-#: ../src/scan.c:2854
+#: ../src/scan.c:2484
 #, c-format
-msgid "%i : ignored"
-msgstr "%i : ignoré"
+msgid "%i: ignored"
+msgstr "%i : ignoré"
 
-#: ../src/scan.c:2857
-msgid "%l : number of tracks"
-msgstr "%l : nombre de pistes"
+#: ../src/scan.c:2487
+msgid "%l: number of tracks"
+msgstr "%l : nombre de pistes"
 
-#: ../src/scan.c:2860
+#: ../src/scan.c:2490
 #, c-format
-msgid "%o : orig. artist"
-msgstr "%o : artiste orig."
+msgid "%o: orig. artist"
+msgstr "%o : artiste original"
 
-#: ../src/scan.c:2863
+#: ../src/scan.c:2493
 #, c-format
-msgid "%n : track"
-msgstr "%n : piste"
+msgid "%n: track"
+msgstr "%n : piste"
 
-#: ../src/scan.c:2866
-msgid "%t : title"
-msgstr "%t : titre"
+#: ../src/scan.c:2496
+msgid "%t: title"
+msgstr "%t : titre"
 
-#: ../src/scan.c:2869
+#: ../src/scan.c:2499
 #, c-format
-msgid "%u : URL"
-msgstr "%u : URL"
+msgid "%u: URL"
+msgstr "%u : URL"
 
-#: ../src/scan.c:2872
-msgid "%y : year"
-msgstr "%y : année"
+#: ../src/scan.c:2502
+#, c-format
+msgid "%x: number of discs"
+msgstr "%x : nombre de disques"
+
+#: ../src/scan.c:2505
+msgid "%y: year"
+msgstr "%y : année"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2879
+#: ../src/scan.c:2512
 msgid "Mask Editor"
-msgstr "Editeur de Masque"
+msgstr "Éditeur de masques"
 
-#: ../src/scan.c:2936
+#: ../src/scan.c:2566
 msgid "Create New Mask"
-msgstr "Créer un Nouveau Masque"
+msgstr "Créer un nouveau masque"
 
-#: ../src/scan.c:2946
+#: ../src/scan.c:2576
 msgid "Move Up this Mask"
-msgstr "Monter ce Masque"
+msgstr "Remonter ce masque"
 
-#: ../src/scan.c:2956
+#: ../src/scan.c:2586
 msgid "Move Down this Mask"
-msgstr "Descendre ce Masque"
+msgstr "Descendre ce masque"
 
-#: ../src/scan.c:2966
+#: ../src/scan.c:2596
 msgid "Duplicate Mask"
-msgstr "Dupliquer le Masque"
+msgstr "Dupliquer le masque"
 
-#: ../src/scan.c:2976
+#: ../src/scan.c:2606
 msgid "Add Default Masks"
-msgstr "Ajouter les Masques par Défaut"
+msgstr "Ajouter les masques par défaut"
 
-#: ../src/scan.c:2986
+#: ../src/scan.c:2616
 msgid "Remove Mask"
-msgstr "Effacer le Masque"
+msgstr "Supprimer le masque"
 
-#: ../src/scan.c:2996
+#: ../src/scan.c:2626
 msgid "Save Masks"
-msgstr "Sauver les Masques"
+msgstr "Enregistrer les masques"
 
-#: ../src/scan.c:3589
+#: ../src/scan.c:3206
 msgid "New_mask"
 msgstr "Nouveau_masque"
 
-#: ../src/scan.c:3627
-msgid "Copy: No row selected!"
-msgstr "Copier: Ancune ligne sélectionnée!"
+#: ../src/scan.c:3245
+msgid "Copy: No row selected"
+msgstr "Copier : aucune ligne sélectionnée"
+
+#: ../src/scan.c:3338
+msgid "Remove: No row selected"
+msgstr "Supprimer : aucune ligne sélectionnée"
 
-#: ../src/scan.c:3733
-msgid "Remove: No row selected!"
-msgstr "Effacer: Ancune ligne sélectionnée!"
+#: ../src/scan.c:3385
+msgid "Move Up: No row selected"
+msgstr "Remonter : aucune ligne sélectionnée"
 
-#: ../src/scan.c:3780
-msgid "Move Up: No row selected!"
-msgstr "Monter: Ancune ligne sélectionnée!"
+#: ../src/scan.c:3429
+msgid "Move Down: No row selected"
+msgstr "Descendre : aucune ligne sélectionnée"
 
-#: ../src/scan.c:3833
-msgid "Move Down: No row selected!"
-msgstr "Descendre: Ancune ligne sélectionnée!"
+#: ../src/setting.c:924
+#, c-format
+msgid "Error: Cannot write configuration file: %s (%s)"
+msgstr "Erreur : impossible d'écrire le fichier de configuration : %s (%s)"
 
-#: ../src/setting.c:933
+#: ../src/setting.c:944 ../src/setting.c:961 ../src/setting.c:981
 #, c-format
-msgid "ERROR: Can't write config file: %s (%s)"
-msgstr "ERREUR: Impossible d'écrire le fichier de configuration: %s (%s)"
+msgid "Error while writing configuration file: %s"
+msgstr "Erreur lors de l'écriture du fichier de configuration : %s"
 
-#: ../src/setting.c:1082 ../src/setting.c:1125
+#: ../src/setting.c:1100
 #, c-format
-msgid "Can't open configuration file '%s' (%s)"
-msgstr "Impossible d'ouvrir le fichier de configuration '%s' (%s)"
+msgid "Cannot open configuration file '%s' (%s)"
+msgstr "Impossible d'ouvrir le fichier de configuration « %s » (%s)"
+
+#: ../src/setting.c:1102
+msgid "Loading default configuration"
+msgstr "Chargement de la configuration par défaut"
 
-#: ../src/setting.c:1083
-#, fuzzy
-msgid "Loading default configuration…"
-msgstr "Chargement de la configuration par défaut..."
+#: ../src/setting.c:1143
+#, c-format
+msgid "Cannot create or open file '%s' (%s)"
+msgstr "Impossible de créer ni d'ouvrir le fichier « %s » (%s)"
 
-#: ../src/setting.c:1196 ../src/setting.c:1203 ../src/setting.c:1210
-#: ../src/setting.c:1217 ../src/setting.c:1224 ../src/setting.c:1231
-#: ../src/setting.c:1238 ../src/setting.c:1245 ../src/setting.c:1252
-#: ../src/setting.c:1259 ../src/setting.c:1266 ../src/setting.c:1273
-#: ../src/setting.c:1280 ../src/setting.c:1287 ../src/setting.c:1294
-#: ../src/setting.c:1301 ../src/setting.c:1308
+#: ../src/setting.c:1203
 #, c-format
-msgid "Can't create or open file '%s' (%s)"
-msgstr "Impossible de créer ou d'ouvrir le fichier '%s' (%s)"
+msgid "Error: Cannot write list to file: %s (%s)"
+msgstr "Erreur : impossible d'écrire la liste dans le fichier : %s (%s)"
 
-#: ../src/setting.c:1347
+#: ../src/setting.c:1221
 #, c-format
-msgid "ERROR: Can't write list to file: %s (%s)"
-msgstr "ERREUR: Impossible d'écrire la liste vers le fichier: %s (%s)"
+msgid "Error while writing list file: %s"
+msgstr "Erreur lors de l'écriture du fichier liste : %s"
 
 #. Fall back to defaults
-#: ../src/setting.c:1435
-#, fuzzy
+#: ../src/setting.c:1301
 msgid "Loading default 'Fill Tag' masks…"
-msgstr "Chargement des masques par défaut pour 'Compléter les Tags' ..."
+msgstr "Chargement des masques par défaut pour « Compléter l'étiquette »…"
 
 #. Fall back to defaults
-#: ../src/setting.c:1463
-#, fuzzy
+#: ../src/setting.c:1331
 msgid "Loading default 'Rename File' masks…"
-msgstr "Chargement des masques par défaut pour 'Renommer Fichier' ..."
+msgstr "Chargement des masques par défaut pour « Renommer le fichier »…"
 
 #. Fall back to defaults
-#: ../src/setting.c:1490
-#, fuzzy
+#: ../src/setting.c:1357
 msgid "Loading default 'Rename Directory' masks…"
-msgstr "Chargement des masques par défaut pour 'Renommer le Répertoire' ..."
-
-#: ../src/setting.c:1684
-msgid "ERROR: The environment variable HOME is not defined!"
-msgstr "ERREUR: La variable d'environnement HOME n'est pas définie!"
-
-#: ../src/setting.c:1705
-#, c-format
-msgid "ERROR: Can't create directory '%s' (%s)!"
-msgstr "ERREUR: Impossible de créer le répertoire '%s' (%s)!"
+msgstr "Chargement des masques par défaut pour « Renommer le répertoire »…"
 
-#: ../src/vcedit.c:287
-msgid "Input truncated or empty."
-msgstr "Entrée tronquée ou vide."
-
-#: ../src/vcedit.c:289
-msgid "Input is not an Ogg bitstream."
-msgstr "L'entrée n'est pas un flux binaire Ogg."
-
-#: ../src/vcedit.c:307
-msgid "Error reading first page of Ogg bitstream."
-msgstr "Erreur lors de la lecture de la première page du flux binaire Ogg."
-
-#: ../src/vcedit.c:313
-msgid "Error reading initial header packet."
-msgstr "Erreur lors de la lecture de l'entête du paquet initial."
-
-#: ../src/vcedit.c:341
-msgid "Ogg bitstream contains neither speex or vorbis data."
-msgstr "Le flux binaire Ogg ne contient pas de données Vorbis."
-
-#: ../src/vcedit.c:375
-msgid "Corrupt secondary header."
-msgstr "Second entête corrompue."
-
-#: ../src/vcedit.c:405
-msgid "Need to save extra headers - TODO!!"
-msgstr "Besoin de sauver les entêtes supplémentaires - A FAIRE!"
-
-#: ../src/vcedit.c:419
-msgid "EOF before end of vorbis headers."
-msgstr "EOF avant la fin des entêtes vorbis."
-
-#: ../src/vcedit.c:584
-#, fuzzy
-msgid "Corrupt or missing data, continuing…"
-msgstr "Donnée corrompue ou manquante, continu..."
-
-#: ../src/vcedit.c:621
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr ""
-"Erreur lors de l'écriture du flus vers la sortie. Il se peut que le flux de "
-"sortie soit corrompu ou tronqué."
-
-#. Log_Print(_("DLL '%s' not already loaded. Try loading it..."), dllname);
-#: ../src/win32/win32dep.c:122
-#, c-format
-msgid "DLL '%s' not already loaded. Try loading it..."
-msgstr "La DLL '%s' n'a pas été encore chargée. Tentative de chargement ..."
-
-#. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: ../src/win32/win32dep.c:126
-#, c-format
-msgid "DLL '%s' could not be loaded"
-msgstr "La DLL '%s' ne peut été chargée"
-
-#. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: ../src/win32/win32dep.c:136
+#: ../src/setting.c:1568
 #, c-format
-msgid "This version of '%s' contains '%s'"
-msgstr "Cette version de '%s' contient '%s'"
+msgid "Migrating configuration from directory '%s' to '%s'"
+msgstr "Déplacement de la configuration du répertoire « %s » vers « %s »"
 
-#. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: ../src/win32/win32dep.c:142
+#: ../src/setting.c:1592
 #, c-format
-msgid "Function '%s' not found in dll '%s'"
-msgstr "La fonction '%s' n'a pas été trouvée dans la DLL '%s'"
+msgid "Failed to migrate configuration file '%s'"
+msgstr "Impossible de déplacer le fichier de configuration « %s »"
 
-#. ET_Win32_Path_Replace_Backslashes(app_data_dir);
-#. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: ../src/win32/win32dep.c:278
+#: ../src/setting.c:1629
 #, c-format
-msgid "EasyTAG settings dir: '%s'"
-msgstr "Répertoire pour les paramètres EasyTAG : '%s'"
-
-#. Log_Print(_("weasytag_init start..."));
-#: ../src/win32/win32dep.c:469
-#, c-format
-msgid "weasytag_init start..."
-msgstr "Début de weasytag_init..."
-
-#. Log_Print(_("EasyTAG version: %s"),VERSION);
-#. g_print(_("EasyTAG version: %s"),VERSION);
-#. g_print("\n");
-#: ../src/win32/win32dep.c:475
-#, c-format
-msgid "Glib version: %u.%u.%u\n"
-msgstr "Glib version: %u.%u.%u\n"
-
-#. Set Environmental Variables
-#. Log_Print(_("weasytag_init end..."));
-#: ../src/win32/win32dep.c:493
-#, c-format
-msgid "weasytag_init end..."
-msgstr "Fin de weasytag_init..."
-
-#. Log_Print(_("Audio player: '%s'"), player);
-#: ../src/win32/win32dep.c:614
-#, c-format
-msgid "Audio player: '%s'"
-msgstr "Lecteur Audio : '%s'"
-
-#~ msgid "About..."
-#~ msgstr "A Propos..."
-
-#~ msgid "Rename Directory ..."
-#~ msgstr "Renommer le Répertoire ..."
-
-#~ msgid "_Rename File(s) and Directory ..."
-#~ msgstr "_Renommer le(s) Fichier(s) et Répertoire(s) ..."
-
-#~ msgid "Rename File(s) and Directory ..."
-#~ msgstr "Renommer le(s) Fichier(s) et Répertoire(s) ..."
-
-#~ msgid "CD Data _Base Search ..."
-#~ msgstr "Recherche CDD_B ..."
-
-#~ msgid "Write Playlist ..."
-#~ msgstr "Ecrire Liste de Lecture ..."
-
-#~ msgid "Preferences ..."
-#~ msgstr "Préférences ..."
-
-#~ msgid "... file(s)"
-#~ msgstr "... fichier(s)"
-
-#~ msgid "File(s) not renamed..."
-#~ msgstr "Fichier(s) non renommé(s)..."
-
-#~ msgid "File(s) renamed..."
-#~ msgstr "Fichier(s) renommé(s)..."
-
-#~ msgid "File(s) not moved..."
-#~ msgstr "Fichier(s) non déplacé(s)..."
-
-#~ msgid "Picture file not loaded (%s)..."
-#~ msgstr "Image non chargée (%s)..."
-
-#~ msgid "Confirm..."
-#~ msgstr "Confirmer..."
-
-#~ msgid ""
-#~ "Some files have been modified but not saved...\n"
-#~ "Do you want to save them before changing the directory?"
-#~ msgstr ""
-#~ "Des fichiers ont été modifiés mais pas sauvés...\n"
-#~ "Voulez-vous les sauver avant de changer de répertoire?"
-
-#~ msgid "Error..."
-#~ msgstr "Erreur..."
-
-#~ msgid ""
-#~ "Could not convert '%s' into filename encoding. Please use another name."
-#~ msgstr ""
-#~ "Impossible de convertir '%s' vers l'encodage du fichier. Utilisez un "
-#~ "autre nom."
-
-#~ msgid ""
-#~ "Can't rename because this directory name already exists!\n"
-#~ "(%s)"
-#~ msgstr ""
-#~ "Impossible de renommer car ce répertoire existe déjà !\n"
-#~ "(%s)"
-
-#~ msgid ""
-#~ "Can't rename directory \n"
-#~ "'%s'\n"
-#~ " to \n"
-#~ "'%s'!\n"
-#~ "(%s)"
-#~ msgstr ""
-#~ "Impossible de renommer le répertoire \n"
-#~ "'%s'\n"
-#~ " par: \n"
-#~ "'%s'!\n"
-#~ "(%s)"
-
-#~ msgid "Write Tag..."
-#~ msgstr "Ecriture des Tags..."
-
-#~ msgid "Rename File and Directory..."
-#~ msgstr "Renommer le Fichier et le Répertoire..."
-
-#~ msgid ""
-#~ "Can't rename file \n"
-#~ "'%s'\n"
-#~ "because the following file already exists:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "Impossible de renommer le fichier \n"
-#~ "%s\n"
-#~ "car ce fichier existe déjà :\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Can't create target directory\n"
-#~ "'%s'!\n"
-#~ "(%s)"
-#~ msgstr ""
-#~ "Impossible de créer le répertoire cible :\n"
-#~ "'%s'\n"
-#~ "(%s)"
-
-#~ msgid "Delete File..."
-#~ msgstr "Effacer le Fichier..."
-
-#~ msgid "Not a directory"
-#~ msgstr "Ce n'est pas un répertoire"
-
-#~ msgid "Warning..."
-#~ msgstr "Attention..."
-
-#~ msgid ""
-#~ "The path for 'Local CD Data Base' wasn't defined!\n"
-#~ "Fill it in the preferences window before to use this search."
-#~ msgstr ""
-#~ "Le répertoire pour la 'Base de CD locale' n'a pas été définie!\n"
-#~ "Renseignez le dans la fenêtre des préférences pour utiliser cette "
-#~ "recherche."
-
-#, fuzzy
-#~ msgid ""
-#~ "Be careful, several files (%d file(s)) were changed by an external "
-#~ "program.\n"
-#~ "Do you want to continue anyway?"
-#~ msgstr ""
-#~ "Attention, plusieurs fichiers (%d fichier(s)) ont été modifiés par une "
-#~ "application externe.\n"
-#~ "Voulez-vous continuer quand même?"
-
-#~ msgid "Saving File(s)..."
-#~ msgstr "Sauvegarde de(s) fichier(s) ..."
-
-#~ msgid ""
-#~ "Some files have been modified but not saved...\n"
-#~ "Do you want to save them before exiting the program?"
-#~ msgstr ""
-#~ "Des fichiers ont été modifiés mais pas sauvés...\n"
-#~ "Voulez-vous les sauver avant de quitter le programme?"
-
-#~ msgid "Save file..."
-#~ msgstr "Sauvegarder le fichier..."
-
-#~ msgid ""
-#~ "Can't open file :\n"
-#~ "'%s'!\n"
-#~ "(%s)"
-#~ msgstr ""
-#~ "Impossible d'ouvrir le fichier :\n"
-#~ "'%s'\n"
-#~ "(%s)"
-
-#~ msgid "Files have been partially saved..."
-#~ msgstr "Les fichiers ont été partiellement sauvés..."
-
-#~ msgid "libid3tag %s"
-#~ msgstr "libid3tag %s"
-
-#~ msgid "id3lib %d.%d.%d"
-#~ msgstr "id3lib %d.%d.%d"
-
-#~ msgid " OK "
-#~ msgstr " OK "
-
-#~ msgid " Yes "
-#~ msgstr " Oui "
-
-#~ msgid " No "
-#~ msgstr " Non "
-
-#~ msgid " Apply "
-#~ msgstr " Appliquer "
-
-#~ msgid " Cancel "
-#~ msgstr " Annuler "
-
-#~ msgid " Close "
-#~ msgstr " Fermer "
-
-#~ msgid " Execute "
-#~ msgstr " Exécuter "
-
-#~ msgid " Search "
-#~ msgstr " Rechercher "
-
-#~ msgid " Browse... "
-#~ msgstr "Parcourir..."
-
-#~ msgid ""
-#~ "The entered path is invalid!:\n"
-#~ "%s\n"
-#~ "(%s)"
-#~ msgstr ""
-#~ "Le chemin donné est incorrect!:\n"
-#~ "%s\n"
-#~ "(%s)"
-
-#, fuzzy
-#~ msgid "(case sensitive)"
-#~ msgstr "Sensible à la casse"
-
-#~ msgid "Replace a character by an other one."
-#~ msgstr "Remplacer un caractère par un autre"
-
-#~ msgid "Loaded File Content :"
-#~ msgstr "Contenu du Fichier Chargé :"
-
-#~ msgid "Files Name List :"
-#~ msgstr "Liste des Noms des Fichiers :"
-
-#~ msgid "(MP3 file support enabled using: libid3tag %s)"
-#~ msgstr "(Support des fichiers MP3 activé en utilisant : libid3tag %s)"
-
-#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-#~ msgstr "(Support des tags ID3v2.3 activé en utilisant : id3lib %d.%d.%d)"
-
-#~ msgid "ID3V2 tag Version"
-#~ msgstr "Version du tag invalide"
-
-#~ msgid "Unicode (UTF-7)"
-#~ msgstr "Unicode (UTF-7)"
-
-#~ msgid "Unicode (UTF-16BE)"
-#~ msgstr "Unicode (UTF-16BE)"
-
-#~ msgid "Unicode (UTF-16LE)"
-#~ msgstr "Unicode (UTF-16LE)"
-
-#~ msgid "Use padding"
-#~ msgstr "Utiliser le padding"
-
-#~ msgid ""
-#~ "Set padding in the ID3v2 tags for faster writing during next changes in "
-#~ "the tag."
-#~ msgstr ""
-#~ "Utilise le padding dans les tags ID3v2 pour améliorer la vitesse de "
-#~ "sauvegarde des prochains changements dans le tag."
-
-#~ msgid "Always save tags to ISO-8859-1 character set"
-#~ msgstr "Toujours sauver les tags avec l'encodage ISO-8859-1"
-
-#~ msgid ""
-#~ "Use the ISO-8859-1 character set (single byte character set) to write the "
-#~ "tag. This character set can be used for the ID3v2 and the ID3v1 tags, but "
-#~ "note that non-ISO-8859-1 characters will be lost.\n"
-#~ "\n"
-#~ "If a different charset is selected with 'Use non standard character set "
-#~ "for writing ID3 tags', it will be used instead of ISO-8859-1.\n"
-#~ "Also some rules can be defined if some characters can't be converted."
-#~ msgstr ""
-#~ "Utiliser l'encodage ISO-8859-1 (encodage utilisant un octet par "
-#~ "caractère) pour écrire le tag. Cet encodage peut être utilisé pour les "
-#~ "tags ID3v2 et ID3v1, mais notez que les caractères qui n'existent pas "
-#~ "dans l'encodage ISO-8859-1 seront perdus.\n"
-#~ "\n"
-#~ "Si un encodage différent est sélectionné avec 'Utiliser un encodage non "
-#~ "standard pour écrire les tags ID3', celui-ci sera utilisé au lieu de "
-#~ "l'ISO-8859-1.\n"
-#~ "Des règles peuvent également être définies si certains caractères ne "
-#~ "peuvent pas être convertis."
-
-#~ msgid ""
-#~ "Try to save tags to ISO-8859-1. If it isn't possible then use UNICODE "
-#~ "(recommended)"
-#~ msgstr ""
-#~ "Essayer de sauver les tags avec l'encodage ISO-8859-1. En cas d'échec, "
-#~ "utiliser l'UNICODE (recommandé)"
-
-#~ msgid ""
-#~ "The UNICODE character set will be used if conversion to ISO-8859-1 fails. "
-#~ "Unicode can be used for ID3v2 but not for the ID3v1 tags which use only a "
-#~ "single byte character set (by default ISO-8859-1).\n"
-#~ "\n"
-#~ "If a different charset is selected with 'Use non standard character set "
-#~ "for writing ID3 tags', it will be used instead of ISO-8859-1.\n"
-#~ "Also some rules can be defined if some characters can't be converted."
-#~ msgstr ""
-#~ "L'encodage UNICODE sera utilisé si la conversion en ISO-8859-1 échoue. "
-#~ "L'unicode peut être utilisé pour les tags ID3v2 mais pas les tags ID3v1 "
-#~ "qui supportent seulement les encodages sur un seul octet (ISO-8859-1 par "
-#~ "défaut).\n"
-#~ "\n"
-#~ "Si un encodage différent est sélectionné avec 'Utiliser un encodage non "
-#~ "standard pour écrire les tags ID3', celui-ci sera utilisé au lieu de "
-#~ "ISO-8859-1.\n"
-#~ "Des règles peuvent également être définies si certains caractères ne "
-#~ "peuvent pas être convertis."
-
-#~ msgid "Always save tags to UNICODE character set"
-#~ msgstr "Toujours sauver les tags avec l'encodage UNICODE"
-
-#~ msgid ""
-#~ "Use UNICODE character set for ID3v2 tags. The ID3v1 tags are always saved "
-#~ "with a single byte character set (by default ISO-8859-1).\n"
-#~ "\n"
-#~ "If a different charset is selected with 'Use non standard character set "
-#~ "for writing ID3 tags', it will be used instead of ISO-8859-1."
-#~ msgstr ""
-#~ "Utiliser l'encodage UNICODE pour les tags ID3v2. Les tags ID3v1 sont "
-#~ "toujours sauvés avec un encodage sur un seul octet (ISO-8859-1 par "
-#~ "défaut).\n"
-#~ "\n"
-#~ "Si un encodage différent est sélectionné avec 'Utiliser un encodage non "
-#~ "standard pour écrire les tags ID3', celui-ci sera utilisé au lieu de "
-#~ "ISO-8859-1."
-
-#~ msgid ""
-#~ "For ISO-8859-1 fields, override with the following character encodings "
-#~ "(for expert users only!): "
-#~ msgstr ""
-#~ "Pour les champs ISO-8859-1, utiliser les encodages suivants (utilisateurs "
-#~ "experts seulement!) :"
-
-#~ msgid "Use non standard character set for reading ID3 tags: "
-#~ msgstr "Utiliser un encodage non standard pour lire les tags ID3 :"
-
-#~ msgid "Use non standard character set for writing ID3 tags: "
-#~ msgstr "Utiliser un encodage non standard pour écrire les tags ID3 : "
-
-#~ msgid ""
-#~ "This character set will be used when writing the tag data, to convert "
-#~ "each string saved in an ISO-8859-1 field in the tag (for ID3v2 or/and "
-#~ "ID3v1 tag)."
-#~ msgstr ""
-#~ "Cet encodage sera utilisé lors de l'écriture des données du tag, pour "
-#~ "convertir chaque chaîne sauvée dans un champ ISO-8859-1 du tag (pour les "
-#~ "tags ID3v2 et/ou ID3v1)."
-
-#~ msgid ""
-#~ "For ISO-8859-1 fields, apply also these rules if some characters can't be "
-#~ "converted when writing tags:"
-#~ msgstr ""
-#~ "Pour les champs ISO-8859-1, utiliser également ces règles si certains "
-#~ "caractères ne peuvent pas\n"
-#~ "être convertis lors de l'écriture du tag :"
-
-#~ msgid "Do nothing"
-#~ msgstr "Ne rien faire"
-
-#~ msgid "Force using the character encoding and activate the transliteration"
-#~ msgstr "Forcer l'utilisation de l'encodage et activer la transcription"
-
-#~ msgid ""
-#~ "Force using the character encoding and silently discard some characters"
-#~ msgstr "Forcer l'utilisation de l'encodage et supprimer certains caractères"
-
-#~ msgid ""
-#~ "The character set translation from '%s'\n"
-#~ "to '%s' isn't supported!"
-#~ msgstr ""
-#~ "La conversion du jeu de caractères de '%s'\n"
-#~ "vers '%s' n'est pas supportée!"
-
-#~ msgid "ERROR while opening file: '%s' (%s)"
-#~ msgstr "ERREUR lors de l'ouverture du fichier: '%s' (%s)"
-
-#~ msgid "Load on startup the directory"
-#~ msgstr "Charger le répertoire au démarrage"
+msgid "Error: Cannot create directory '%s' (%s)"
+msgstr "Erreur : impossible de créer le répertoire « %s » (%s)"
diff --git a/po/hu.po b/po/hu.po
index ea4fc10..9ec7b72 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,23 +5,47 @@
 # Szél Miklós <mukka at freemail.hu>, 2001.
 # 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.
+# Balázs Úr <urbalazs at gmail dot com>, 2013, 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: 2013-08-19 22:43+0000\n"
-"PO-Revision-Date: 2013-08-26 19:15+0200\n"
-"Last-Translator: Balázs Úr <urbalazs at gmail dot com>\n"
+"POT-Creation-Date: 2014-03-07 22:43+0000\n"
+"PO-Revision-Date: 2014-03-08 07:07+0100\n"
+"Last-Translator: \n"
 "Language-Team: Hungarian <kde-i18n-doc at kde.org>\n"
-"Language: \n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Poedit 1.5.4\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."
+msgstr ""
+"Címkék megtekintése és szerkesztése MP3, MP2, MP4/AAC, FLAC, Ogg Vorbis, "
+"MusePack, Monkey hang és WavPack fájlokhoz."
+
+#: ../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 ""
+"Albumok keresése az online adatbázisokban, címkék tömeges szerkesztése, "
+"lejátszólisták létrehozása és fájlok gyűjteményének átnevezése."
+
+#: ../data/easytag.appdata.xml.in.h:3
+msgid ""
+"A simple and nice GTK+ interface makes tagging easier under GNU/Linux and "
+"Windows."
+msgstr ""
+"Egy egyszerű és helyes GTK+ felület, amely megkönnyíti a címkézést GNU/Linux "
+"és Windows alatt."
+
 #: ../data/easytag.desktop.in.h:1
 msgid "Sound File Metadata Editor"
 msgstr "Hangfájl metaadat szerkesztő"
@@ -92,7 +116,6 @@ msgid "Website: %s"
 msgstr "Weboldal: %s"
 
 #: ../src/application.c:98
-#| msgid "View and edit tags in audio files"
 msgid "- Tag and rename audio files"
 msgstr "- Hangfájlok címkézése és átnevezése"
 
@@ -106,13 +129,11 @@ msgstr "_Fájl"
 
 # Fájl menü
 #: ../src/bar.c:155
-#| msgid "Sort list by tag"
 msgid "Sort List by Tag"
 msgstr "Lista rendezése címke szerint"
 
 # Fájl menü
 #: ../src/bar.c:158
-#| msgid "Sort list by property"
 msgid "Sort List by Property"
 msgstr "Lista rendezése tulajdonság szerint"
 
@@ -285,34 +306,28 @@ msgid "Open Files With…"
 msgstr "Fájlok megnyitás ezzel…"
 
 #: ../src/bar.c:205
-#| msgid "Include only the selected files"
 msgid "Run a command on the selected files"
 msgstr "Parancs futtatása a kijelölt fájlokon"
 
 #: ../src/bar.c:208
-#| msgid "Select all files"
 msgid "Select all"
 msgstr "Összes kijelölése"
 
 # Fájl menü és bubble help egyben
 #: ../src/bar.c:209
-#| msgid "Unselect All Files"
 msgid "Unselect All"
 msgstr "Kijelölés megszüntetése"
 
 #: ../src/bar.c:210
-#| msgid "Stop the current action"
 msgid "Clear the current selection"
 msgstr "A jelenlegi kijelölés törlése"
 
 # Fájl menü
 #: ../src/bar.c:213
-#| msgid "Invert Files Selection"
 msgid "Invert File Selection"
 msgstr "Fájlkijelölés megfordítása"
 
 #: ../src/bar.c:214
-#| msgid "Invert files selection"
 msgid "Invert file selection"
 msgstr "Fájlkijelölés megfordítása"
 
@@ -368,13 +383,11 @@ msgstr "Utolsó fájl"
 
 # Fájl menü
 #: ../src/bar.c:223
-#| msgid "S_can Files…"
 msgid "S_can Files"
 msgstr "Fájlok _vizsgálata"
 
 # Fájl menü
-#: ../src/bar.c:224 ../src/scan.c:2353
-#| msgid "Delete files"
+#: ../src/bar.c:224 ../src/scan.c:2344
 msgid "Scan selected files"
 msgstr "A kijelölt fájlok vizsgálata"
 
@@ -395,7 +408,6 @@ msgstr "_Utolsó fájlmódosítások visszavonása"
 
 # Fájl menü
 #: ../src/bar.c:228
-#| msgid "Undo last Files changes"
 msgid "Undo last files changes"
 msgstr "Utolsó fájlmódosítások visszavonása"
 
@@ -415,13 +427,11 @@ msgid "_Save Files"
 msgstr "Fájlok _mentése"
 
 #: ../src/bar.c:234
-#| msgid "Removed genre from selected files."
 msgid "Save changes to selected files"
 msgstr "Változtatások mentése a kijelölt fájlokba"
 
 # Fájl menü
 #: ../src/bar.c:236
-#| msgid "_Force Saving Files"
 msgid "_Force Save Files"
 msgstr "Fájlok ké_nyszerített mentése"
 
@@ -456,8 +466,8 @@ msgid "_Quit"
 msgstr "_Kilépés"
 
 # ikon megjegyzés
-#: ../src/bar.c:241 ../src/easytag.c:2424 ../src/easytag.c:4574
-#: ../src/easytag.c:4602
+#: ../src/bar.c:241 ../src/easytag.c:2430 ../src/easytag.c:4531
+#: ../src/easytag.c:4563
 msgid "Quit"
 msgstr "Kilépés"
 
@@ -468,7 +478,6 @@ msgstr "_Böngésző"
 
 # Böngésző menü
 #: ../src/bar.c:245
-#| msgid "Go to _Home Directory"
 msgid "_Home Directory"
 msgstr "_Saját könyvtár"
 
@@ -479,7 +488,6 @@ msgstr "Ugrás a kezdő könyvtárra"
 
 # Ikon megjegyzés
 #: ../src/bar.c:248
-#| msgid "Go to Desktop Directory"
 msgid "Desktop Directory"
 msgstr "Asztal könyvtár"
 
@@ -490,7 +498,6 @@ msgstr "Ugrás az asztal könyvtárra"
 
 # ikon megjegyzés
 #: ../src/bar.c:251
-#| msgid "Go to Documents Directory"
 msgid "Documents Directory"
 msgstr "Dokumentumok könyvtár"
 
@@ -501,7 +508,6 @@ msgstr "Ugrás a dokumentumok könyvtárra"
 
 # ikon megjegyzés
 #: ../src/bar.c:254
-#| msgid "Go to Downloads Directory"
 msgid "Downloads Directory"
 msgstr "Letöltések könyvtár"
 
@@ -512,7 +518,6 @@ msgstr "Ugrás a letöltések könyvtárra"
 
 # ikon megjegyzés
 #: ../src/bar.c:257
-#| msgid "Go to Music Directory"
 msgid "Music Directory"
 msgstr "Zene könyvtár"
 
@@ -522,7 +527,6 @@ msgid "Go to music directory"
 msgstr "Ugrás a zene könyvtárra"
 
 #: ../src/bar.c:260
-#| msgid "Go to parent directory"
 msgid "_Parent Directory"
 msgstr "S_zülő könyvtár"
 
@@ -532,7 +536,6 @@ msgstr "Ugrás a szülő könyvtárba"
 
 # Ikon megjegyzés
 #: ../src/bar.c:263
-#| msgid "Default directory:"
 msgid "_Default Directory"
 msgstr "_Alapértelmezett könyvtár"
 
@@ -571,12 +574,10 @@ msgstr "Könyvtár újratöltése"
 
 # böngésző menü
 #: ../src/bar.c:272
-#| msgid "Browse Directory with…"
 msgid "Browse Directory With…"
 msgstr "Könyvtár böngészése ezzel…"
 
 #: ../src/bar.c:273
-#| msgid "Rename the directory"
 msgid "Run a command on the directory"
 msgstr "Parancs futtatása a könyvtáron"
 
@@ -587,24 +588,20 @@ msgstr "Fa össze_csukása"
 
 # böngésző menü
 #: ../src/bar.c:276
-#| msgid "_Collapse tree"
 msgid "Collapse directory tree"
 msgstr "Könyvtárfa összecsukása"
 
 #: ../src/bar.c:277
-#| msgid "Reload"
 msgid "_Reload Tree"
 msgstr "Fa új_ratöltése"
 
 # böngésző menü
 #: ../src/bar.c:278
-#| msgid "Reload directory"
 msgid "Reload directory tree"
 msgstr "Könyvtárfa újratöltése"
 
 # Menüsor
 #: ../src/bar.c:281
-#| msgid "S_canner"
 msgid "S_canner Mode"
 msgstr "Fel_dolgozó mód"
 
@@ -613,7 +610,6 @@ msgid "_Miscellaneous"
 msgstr "_Egyebek"
 
 #: ../src/bar.c:284
-#| msgid "Find _Files…"
 msgid "_Find…"
 msgstr "_Keresés…"
 
@@ -622,7 +618,6 @@ msgid "Search filenames and tags"
 msgstr "Fájlnevek és címkék keresése"
 
 #: ../src/bar.c:287
-#| msgid "CDDB Search Files…"
 msgid "CDD_B Search…"
 msgstr "CD-adat_bázis keresés…"
 
@@ -633,17 +628,14 @@ msgstr "CD-adatbázis keresés"
 
 # egyéb menü
 #: ../src/bar.c:290
-#| msgid "Load Filenames From Text File…"
 msgid "Load Filenames From a Text File…"
 msgstr "Fájlnevek betöltése szövegfájlból…"
 
 #: ../src/bar.c:291
-#| msgid "Load filenames from text file"
 msgid "Load filenames from a text file"
 msgstr "Fájlnevek betöltése szövegfájlból"
 
 #: ../src/bar.c:293
-#| msgid "Generate a playlist"
 msgid "Generate Playlist…"
 msgstr "Lejátszólista előállítása…"
 
@@ -652,12 +644,12 @@ msgid "Generate a playlist"
 msgstr "Lejátszólista előállítása"
 
 # egyéb menü
-#: ../src/bar.c:296 ../src/bar.c:322 ../src/bar.c:323 ../src/bar.c:324
+#: ../src/bar.c:296 ../src/bar.c:327 ../src/bar.c:328 ../src/bar.c:329
 msgid "Run Audio Player"
 msgstr "Zenelejátszó futtatása"
 
 # egyéb menü
-#: ../src/bar.c:297 ../src/bar.c:322 ../src/bar.c:323 ../src/bar.c:324
+#: ../src/bar.c:297 ../src/bar.c:327 ../src/bar.c:328 ../src/bar.c:329
 msgid "Run audio player"
 msgstr "Zenelejátszó futtatása"
 
@@ -688,242 +680,243 @@ msgstr "_Ugrás"
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:310
+msgid "_Contents"
+msgstr "_Tartalom"
+
+#: ../src/bar.c:311
+msgid "Show help"
+msgstr "Súgó megjelenítése"
+
+#: ../src/bar.c:313
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:313
 msgid "About"
 msgstr "Névjegy"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: ../src/bar.c:314
+#: ../src/bar.c:319
 msgid "Stop the current action"
 msgstr "Jelenlegi művelet leállítása"
 
 #.
 #. * Popup menu's Actions
 #.
-#: ../src/bar.c:320
+#: ../src/bar.c:325
 msgid "_File Operations"
 msgstr "_Fájlműveletek"
 
 # Menüsor
-#: ../src/bar.c:321
+#: ../src/bar.c:326
 msgid "S_canner"
 msgstr "Fel_dolgozó"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:330
 msgid "CDDB Search Files…"
 msgstr "Fájl keresése CD-adatbázisban…"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:330
 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:329
+#: ../src/bar.c:334
 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:336
+#: ../src/bar.c:341
 msgid "Browse _Subdirectories"
 msgstr "_Alkönyvtárak böngészése"
 
 # böngésző menü
-#: ../src/bar.c:336
+#: ../src/bar.c:341
 msgid "Browse subdirectories"
 msgstr "Alkönyvtárak böngészése"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:345
 msgid "Show Hidden Directories"
 msgstr "Rejtett könyvtárak megjelenítése"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:345
 msgid "Show hidden directories"
 msgstr "Rejtett könyvtárak megjelenítése"
 
-#: ../src/bar.c:342
-#| msgid "Scanner"
+#: ../src/bar.c:347
 msgid "_Show Scanner"
 msgstr "Feldolgozó _megjelenítése"
 
-#: ../src/bar.c:343
-#| msgid "Scanner"
+#: ../src/bar.c:348
 msgid "Show scanner"
 msgstr "Feldolgozó megjelenítése"
 
-#: ../src/bar.c:349
-#| msgid "File Browser"
+#: ../src/bar.c:354
 msgid "Tree Browser"
 msgstr "Fa böngésző"
 
-#: ../src/bar.c:350
-#| msgid "Use directory name"
+#: ../src/bar.c:355
 msgid "View by directory tree"
 msgstr "Könyvtárfa szerinti nézet"
 
-#: ../src/bar.c:352
-#| msgid "Artist & Album"
+#: ../src/bar.c:357
 msgid "Artist and Album"
 msgstr "Előadó és album"
 
-#: ../src/bar.c:353
+#: ../src/bar.c:358
 msgid "View by artist and album"
 msgstr "Előadó és album szerinti nézet"
 
 # feldolgozó menü
-#: ../src/bar.c:358
+#: ../src/bar.c:363
 msgid "_Fill Tags…"
 msgstr "Címkék _kitöltése…"
 
-#: ../src/bar.c:359
+#: ../src/bar.c:364
 msgid "Fill tags"
 msgstr "Címkék kitöltése"
 
-#: ../src/bar.c:361
+#: ../src/bar.c:366
 msgid "_Rename Files and Directories…"
 msgstr "Fájlok és könyvtárak át_nevezése…"
 
-#: ../src/bar.c:362
+#: ../src/bar.c:367
 msgid "Rename files and directories"
 msgstr "Fájlok és könyvtárak átnevezése"
 
-#: ../src/bar.c:364
+#: ../src/bar.c:369
 msgid "_Process Fields…"
 msgstr "Mezök fel_dolgozása…"
 
-#: ../src/bar.c:364 ../src/scan.c:183
+#: ../src/bar.c:369 ../src/scan.c:182
 msgid "Process Fields"
 msgstr "Mezök feldolgozása"
 
-#: ../src/bar.c:421
+#: ../src/bar.c:427
 #, 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:527
-#| msgid "Ready to start…"
+#: ../src/bar.c:532
 msgid "Ready to start"
 msgstr "Indításra kész"
 
-#: ../src/browser.c:369
+#: ../src/browser.c:376
 msgid "New default path for files selected"
 msgstr "Új alapértelmezett útvonal kiválasztva a fájlokhoz"
 
-#: ../src/browser.c:670 ../src/easytag.c:4570
+#: ../src/browser.c:678 ../src/easytag.c:4527
 msgid "Some files have been modified but not saved"
 msgstr "Néhány fájl módosult de nincs elmentve"
 
-#: ../src/browser.c:671
+#: ../src/browser.c:679
 msgid "Do you want to save them before changing the directory?"
 msgstr "El szeretné menteni azokat, mielőtt könyvtárat vált?"
 
-#: ../src/browser.c:675
+#: ../src/browser.c:683
 msgid "Confirm Directory Change"
 msgstr "Könyvtárváltás megerősítése"
 
-#: ../src/browser.c:2121
+#: ../src/browser.c:2141
 msgid "<All albums>"
 msgstr "<Minden album>"
 
-#: ../src/browser.c:2566
+#: ../src/browser.c:2602
 #, 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:3058 ../src/browser.c:3136
+#: ../src/browser.c:3096 ../src/browser.c:3174
 msgid "Tree"
 msgstr "Fa"
 
-#: ../src/browser.c:3059 ../src/cddb.c:716 ../src/misc.c:1899
-#| msgid "File Name"
+#: ../src/browser.c:3097 ../src/cddb.c:803 ../src/misc.c:1902
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: ../src/browser.c:3059 ../src/cddb.c:717 ../src/misc.c:1900
+#: ../src/browser.c:3097 ../src/cddb.c:804 ../src/misc.c:1903
 #: ../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:3060 ../src/browser.c:3067 ../src/cddb.c:396
-#: ../src/cddb.c:718 ../src/misc.c:1901 ../src/prefs.c:644
+#: ../src/browser.c:3098 ../src/browser.c:3105 ../src/cddb.c:483
+#: ../src/cddb.c:805 ../src/misc.c:1904 ../src/prefs.c:644
 msgid "Artist"
 msgstr "Előadó"
 
-#: ../src/browser.c:3060 ../src/misc.c:1902
+#: ../src/browser.c:3098 ../src/misc.c:1905
 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:3061 ../src/browser.c:3069 ../src/cddb.c:399
-#: ../src/cddb.c:719 ../src/misc.c:1903 ../src/prefs.c:645
+#: ../src/browser.c:3099 ../src/browser.c:3107 ../src/cddb.c:486
+#: ../src/cddb.c:806 ../src/misc.c:1906 ../src/prefs.c:645
 msgid "Album"
 msgstr "Album"
 
-#: ../src/browser.c:3061 ../src/cddb.c:720 ../src/misc.c:1905
+#: ../src/browser.c:3099 ../src/cddb.c:807 ../src/misc.c:1908
 msgid "Year"
 msgstr "Év"
 
-#: ../src/browser.c:3061
+#: ../src/browser.c:3099
 msgid "Disc"
 msgstr "Lemez"
 
-#: ../src/browser.c:3062 ../src/misc.c:1906
+#: ../src/browser.c:3100 ../src/misc.c:1909
 msgid "Track"
 msgstr "Szám"
 
-#: ../src/browser.c:3062 ../src/cddb.c:723 ../src/misc.c:1907
+#: ../src/browser.c:3100 ../src/cddb.c:810 ../src/misc.c:1910
 #: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Műfaj"
 
-#: ../src/browser.c:3063 ../src/misc.c:1908 ../src/prefs.c:647
+#: ../src/browser.c:3101 ../src/misc.c:1911 ../src/prefs.c:647
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: ../src/browser.c:3063 ../src/misc.c:1909 ../src/picture.c:863
+#: ../src/browser.c:3101 ../src/misc.c:1912 ../src/picture.c:1058
 #: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Zeneszerző"
 
-#: ../src/browser.c:3064 ../src/misc.c:1910
+#: ../src/browser.c:3102 ../src/misc.c:1913
 msgid "Original Artist"
 msgstr "Eredeti előadó"
 
-#: ../src/browser.c:3065 ../src/misc.c:1911
+#: ../src/browser.c:3103 ../src/misc.c:1914
 msgid "Copyright"
 msgstr "Szerzői jog"
 
-#: ../src/browser.c:3065 ../src/misc.c:1912
+#: ../src/browser.c:3103 ../src/misc.c:1915
 msgid "URL"
 msgstr "URL"
 
-#: ../src/browser.c:3066 ../src/misc.c:1913
+#: ../src/browser.c:3104 ../src/misc.c:1916
 msgid "Encoded By"
 msgstr "Kódolta"
 
-#: ../src/browser.c:3067
+#: ../src/browser.c:3105
 msgid "# Albums"
 msgstr "# Albumok"
 
-#: ../src/browser.c:3068 ../src/browser.c:3069
+#: ../src/browser.c:3106 ../src/browser.c:3107
 msgid "# Files"
 msgstr "# Fájlok"
 
-#: ../src/browser.c:3094
+#: ../src/browser.c:3132
 msgid "Enter a directory to browse."
 msgstr "Adja meg az átvizsgálandó könyvtárat."
 
-#: ../src/browser.c:3103
+#: ../src/browser.c:3141
 msgid "Select a directory to browse."
 msgstr "Válassza ki az átvizsgálandó könyvtárat."
 
@@ -931,36 +924,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:3110 ../src/easytag.c:3446
+#: ../src/browser.c:3148 ../src/easytag.c:3469
 msgid "No files"
 msgstr "Nincsenek fájlok"
 
-#: ../src/browser.c:3188
+#: ../src/browser.c:3226
 msgid "Artist & Album"
 msgstr "Előadó és album"
 
 #. Only directories changed
-#: ../src/browser.c:3553 ../src/easytag.c:2864
-#| msgid "Rename directory"
+#: ../src/browser.c:3590 ../src/easytag.c:2881
 msgid "Rename Directory"
 msgstr "Könyvtár átnevezése"
 
-#: ../src/browser.c:3575
+#: ../src/browser.c:3612
 #, c-format
 msgid "Rename the directory '%s' to:"
 msgstr "A(z) „%s” könyvtár átnevezése erre:"
 
-#: ../src/browser.c:3594 ../src/misc.c:1163
+#: ../src/browser.c:3631 ../src/misc.c:1171
 msgid "Use mask:"
 msgstr "Használandó maszk:"
 
 # bubblehelp
-#: ../src/browser.c:3597
+#: ../src/browser.c:3634
 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:3615
+#: ../src/browser.c:3652
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -970,146 +962,110 @@ msgstr ""
 "címkemezőkből."
 
 #. Preview label
-#: ../src/browser.c:3639
-#| msgid "Rename directory preview…"
+#: ../src/browser.c:3676
 msgid "Rename directory preview"
 msgstr "Könyvtár átnevezés előnézet"
 
-#: ../src/browser.c:3731
+#: ../src/browser.c:3768
 msgid "You must type a directory name"
 msgstr "Meg kell adnia egy könyvtárnevet"
 
-#: ../src/browser.c:3732 ../src/browser.c:3753
+#: ../src/browser.c:3769 ../src/browser.c:3790
 msgid "Directory Name Error"
 msgstr "Könyvtárnév hiba"
 
-#: ../src/browser.c:3750
+#: ../src/browser.c:3787
 #, 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:3752
+#: ../src/browser.c:3789
 msgid "Please use another name"
 msgstr "Kérem használjon egy másik nevet"
 
-#: ../src/browser.c:3822
+#: ../src/browser.c:3859
 #, c-format
 msgid "The directory name '%s' already exists"
 msgstr "Már létezik „%s” nevű könyvtár"
 
-#: ../src/browser.c:3823 ../src/easytag.c:2947
+#: ../src/browser.c:3860 ../src/easytag.c:2964
 msgid "Rename File Error"
 msgstr "Fájl átnevezési hiba"
 
 # böngésző menü
-#: ../src/browser.c:3861 ../src/browser.c:3891
+#: ../src/browser.c:3898 ../src/browser.c:3927
 msgid "Rename Directory Error"
 msgstr "Könyvtár átnevezési hiba"
 
-#: ../src/browser.c:3931
+#: ../src/browser.c:3965
 msgid "Directory renamed"
 msgstr "Könyvtár átnevezve"
 
 # böngésző menü
-#: ../src/browser.c:3967
-#| msgid "Browse Directory with…"
+#: ../src/browser.c:4001
 msgid "Browse Directory With"
 msgstr "Könyvtár böngészése ezzel"
 
-#: ../src/browser.c:3983 ../src/browser.c:4109
+#: ../src/browser.c:4017 ../src/browser.c:4143
 msgid "Program to run:"
 msgstr "Futtatandó program:"
 
 # bubble help?
-#: ../src/browser.c:3995
+#: ../src/browser.c:4029
 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:4089
-#| msgid "Open Files With…"
+#: ../src/browser.c:4123
 msgid "Open Files With"
 msgstr "Fájlok megnyitás ezzel"
 
-#: ../src/browser.c:4121
+#: ../src/browser.c:4155
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Adja meg a futtatandó programot. Az aktuális fájlt fogja megkapni "
 "paraméterként."
 
-#: ../src/browser.c:4248
-msgid "You must type a program name"
-msgstr "Meg kell adnia egy programnevet"
-
-#: ../src/browser.c:4249 ../src/browser.c:4266
-msgid "Program Name Error"
-msgstr "Programnév hiba"
-
-#: ../src/browser.c:4264 ../src/misc.c:786
-#, c-format
-msgid "The program '%s' cannot be found"
-msgstr "A(z) „%s” program nem található"
-
-#: ../src/browser.c:4312 ../src/misc.c:828
-#, c-format
-msgid "Cannot execute %s (error %d)\n"
-msgstr "A(z) „%s” nem hajtható végre (hiba %d)\n"
-
-#: ../src/browser.c:4331
-msgid "Cannot fork another process\n"
-msgstr "Nem ágaztatható el másik folyamat\n"
-
-#: ../src/browser.c:4365
-#, c-format
-#| msgid "Executed command: '%s %s'"
-msgid "Executed command: %s"
-msgstr "Végrehajtott parancs: %s"
-
-#: ../src/cddb.c:226
+#: ../src/cddb.c:313
 msgid "Artist / Album"
 msgstr "Előadó / Album"
 
-#: ../src/cddb.c:226
+#: ../src/cddb.c:313
 msgid "Category"
 msgstr "Kategória"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Track Name".
-#: ../src/cddb.c:227 ../src/cddb.c:402
+#: ../src/cddb.c:314 ../src/cddb.c:489
 msgid "Track Name"
 msgstr "Szám neve"
 
-#: ../src/cddb.c:227
+#: ../src/cddb.c:314
 msgid "Duration"
 msgstr "Időtartam"
 
 # ikon megjegyzés
-#: ../src/cddb.c:239
-#| msgid "CDDB search"
+#: ../src/cddb.c:326
 msgid "CDDB Search"
 msgstr "CDDB keresés"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: ../src/cddb.c:259
+#: ../src/cddb.c:346
 msgid "Automatic Search"
 msgstr "Automatikus keresés"
 
-#: ../src/cddb.c:269
-#| msgid "Request CD database:"
+#: ../src/cddb.c:356
 msgid "Request CDDB"
 msgstr "CDDB kérése"
 
 # bubble help
-#: ../src/cddb.c:279
-#| msgid ""
-#| "Request automatically the CDDB database using the selected files (the "
-#| "order is important) to generate the CddbID"
+#: ../src/cddb.c:366
 msgid ""
 "Request automatically the CDDB using the selected files (the order is "
 "important) to generate the CddbID"
@@ -1117,18 +1073,17 @@ msgstr ""
 "A CD-adatbázis automatikus kérése a kijelölt fájlok használatával (a sorrend "
 "fontos) a CddbID előállításához"
 
-#: ../src/cddb.c:290 ../src/cddb.c:370
-#| msgid "Stop the search…"
+#: ../src/cddb.c:377 ../src/cddb.c:457
 msgid "Stop the search"
 msgstr "A keresés leállítása"
 
 #. Check box to run the scanner
-#: ../src/cddb.c:297
+#: ../src/cddb.c:384
 msgid "Use local CDDB"
 msgstr "Helyi CD-adatbázis használata"
 
 # bubble help
-#: ../src/cddb.c:300 ../src/cddb.c:763
+#: ../src/cddb.c:387 ../src/cddb.c:850
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -1140,164 +1095,164 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: ../src/cddb.c:317
+#: ../src/cddb.c:404
 msgid "Manual Search"
 msgstr "Kézi keresés"
 
-#: ../src/cddb.c:329
+#: ../src/cddb.c:416
 msgid "Words:"
 msgstr "Szavak:"
 
-#: ../src/cddb.c:342
+#: ../src/cddb.c:429
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr "Írja be a keresendő szavakat (szóközzel vagy „+” jellel elválasztva)"
 
 #.
 #. * Search options
 #.
-#: ../src/cddb.c:382
+#: ../src/cddb.c:469
 msgid "Search In:"
 msgstr "Keresés helye:"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "All fields".
-#: ../src/cddb.c:392
+#: ../src/cddb.c:479
 msgid "All Fields"
 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:405 ../src/picture.c:841 ../src/prefs.c:807
+#: ../src/cddb.c:492 ../src/picture.c:1036 ../src/prefs.c:807
 msgid "Other"
 msgstr "Egyéb"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "All Categories".
-#: ../src/cddb.c:429
+#: ../src/cddb.c:516
 msgid "All Categories"
 msgstr "Minden kategóriában"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Blues".
-#: ../src/cddb.c:433
+#: ../src/cddb.c:520
 msgid "Blues"
 msgstr "Blues"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Classical".
-#: ../src/cddb.c:436
+#: ../src/cddb.c:523
 msgid "Classical"
 msgstr "Klasszikus"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Country".
-#: ../src/cddb.c:439
+#: ../src/cddb.c:526
 msgid "Country"
 msgstr "Country"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Folk".
-#: ../src/cddb.c:442
+#: ../src/cddb.c:529
 msgid "Folk"
 msgstr "Folk"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Jazz".
-#: ../src/cddb.c:445
+#: ../src/cddb.c:532
 msgid "Jazz"
 msgstr "Jazz"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Misc".
-#: ../src/cddb.c:448
+#: ../src/cddb.c:535
 msgid "Misc."
 msgstr "Egyéb"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "New age".
-#: ../src/cddb.c:451
+#: ../src/cddb.c:538
 msgid "New Age"
 msgstr "Új kor"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Reggae".
-#: ../src/cddb.c:454
+#: ../src/cddb.c:541
 msgid "Reggae"
 msgstr "Reggae"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Rock".
-#: ../src/cddb.c:457
+#: ../src/cddb.c:544
 msgid "Rock"
 msgstr "Rock"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Soundtrack".
-#: ../src/cddb.c:460
+#: ../src/cddb.c:547
 msgid "Soundtrack"
 msgstr "Filmzene"
 
-#: ../src/cddb.c:500
+#: ../src/cddb.c:587
 msgid "included: funk, soul, rap, pop, industrial, metal, etc."
 msgstr "beleértve: funk, soul, rap, pop, industrial, metal, stb."
 
-#: ../src/cddb.c:501
+#: ../src/cddb.c:588
 msgid "movies, shows"
 msgstr "filmek, tv műsorok"
 
-#: ../src/cddb.c:502
+#: ../src/cddb.c:589
 msgid "others that do not fit in the above categories"
 msgstr "egyéb fel nem sorolt kategóriák"
 
 #. Button to display/hide the categories
-#: ../src/cddb.c:505
+#: ../src/cddb.c:592
 msgid "Categories"
 msgstr "Kategóriák"
 
 #.
 #. * Results command
 #.
-#: ../src/cddb.c:513
+#: ../src/cddb.c:600
 msgid "Results:"
 msgstr "Eredmények:"
 
-#: ../src/cddb.c:519 ../src/misc.c:1947
+#: ../src/cddb.c:606 ../src/misc.c:1950
 msgid "Search:"
 msgstr "Keresés:"
 
 # bubble help
-#: ../src/cddb.c:533
+#: ../src/cddb.c:620
 msgid "Enter the words to search in the list below"
 msgstr "Írja be a keresendő szavakat a lenti listába"
 
-#: ../src/cddb.c:545
+#: ../src/cddb.c:632
 msgid "Search Next"
 msgstr "Következő keresése"
 
-#: ../src/cddb.c:551
+#: ../src/cddb.c:638
 msgid "Search Previous"
 msgstr "Előző keresése"
 
-#: ../src/cddb.c:562
+#: ../src/cddb.c:649
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 "Csak a piros sorokat (vagy mindegyik sort) jelenítse meg az „Előadó / Album” "
 "listában"
 
-#: ../src/cddb.c:568
+#: ../src/cddb.c:655
 msgid "Unselect all lines"
 msgstr "Minden sor kijelölésének megszüntetése"
 
-#: ../src/cddb.c:574
+#: ../src/cddb.c:661
 msgid "Invert lines selection"
 msgstr "Sorok kijelölésének megfordítása"
 
-#: ../src/cddb.c:583
+#: ../src/cddb.c:670
 msgid "Select all lines"
 msgstr "Minden sor kijelölése"
 
 # bubble help
-#: ../src/cddb.c:701
+#: ../src/cddb.c:788
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1311,42 +1266,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: ../src/cddb.c:708
+#: ../src/cddb.c:795
 msgid "Set Into:"
 msgstr "Beállítás ebbe:"
 
-#: ../src/cddb.c:714
+#: ../src/cddb.c:801
 msgid "All"
 msgstr "MInden mező"
 
-#: ../src/cddb.c:721
+#: ../src/cddb.c:808
 msgid "Track #"
 msgstr "Szám #"
 
-#: ../src/cddb.c:722
+#: ../src/cddb.c:809
 msgid "# Tracks"
 msgstr "# Számok"
 
 #. Check box to run the scanner
-#: ../src/cddb.c:760 ../src/misc.c:2988
+#: ../src/cddb.c:847 ../src/misc.c:2991
 msgid "Run the current scanner for each file"
 msgstr "Az jelenlegi feldolgozó futtatása minden fájlra"
 
 #. Check box to use DLM (also used in the preferences window)
-#: ../src/cddb.c:767
+#: ../src/cddb.c:854
 msgid "Match lines with the Levenshtein algorithm"
 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:772 ../src/prefs.c:1362
-#| msgid ""
-#| "When activating this option, the Levenshtein algorithm (DLM: Damerau-"
-#| "Levenshtein Metric) will be used to match the CDDB title against every "
-#| "file name in the current folder, and to select the best match. This will "
-#| "be used when selecting the corresponding audio file, or applying CDDB "
-#| "results, instead of using directly the position order."
+#: ../src/cddb.c:859 ../src/prefs.c:1362
 msgid ""
 "When activating this option, the Levenshtein algorithm (DLM: Damerau-"
 "Levenshtein Metric) will be used to match the CDDB title against every "
@@ -1357,20 +1306,19 @@ msgstr ""
 "Ha aktiválja ezt a beállítást, a Levenshtein algoritmus (DLM: Damerau-"
 "Levenshtein Metric) használatával kerül párosításra a CD-adatbázis címe "
 "minden fájlnévvel a jelenlegi mappában és a legjobb találat kerül "
-"kiválasztásra. Ez "
-"lesz felhasználva a megfelelő hangfájl kiválasztásakor vagy a CD-adatbázis "
-"eredmények elfogadásakor közvetlenül a pozíciósorrend használata helyett."
+"kiválasztásra. Ez lesz felhasználva a megfelelő hangfájl kiválasztásakor "
+"vagy a CD-adatbázis eredmények elfogadásakor közvetlenül a pozíciósorrend "
+"használata helyett."
 
-#: ../src/cddb.c:784
+#: ../src/cddb.c:871
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr "A kijelölt sorok vagy minden sor (ha nincs kjelölés) betöltése."
 
-#: ../src/cddb.c:794
-#| msgid "Ready to search…"
+#: ../src/cddb.c:881
 msgid "Ready to search"
 msgstr "Keresésre kész"
 
-#: ../src/cddb.c:1265
+#: ../src/cddb.c:1352
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
@@ -1378,64 +1326,62 @@ msgstr ""
 "Album: „%s”, előadó: „%s”, hossz: „%s”, év: „%s”, műfaj: „%s”, azonosító: "
 "„%s”"
 
-#: ../src/cddb.c:1501
+#: ../src/cddb.c:1588
 #, c-format
 msgid "Resolving host '%s'…"
 msgstr "A(z) „%s” név feloldása…"
 
-#: ../src/cddb.c:1542
+#: ../src/cddb.c:1629
 #, c-format
 msgid "Cannot create a new socket (%s)"
 msgstr "Nem hozható létre új foglalat (%s)"
 
-#: ../src/cddb.c:1556
+#: ../src/cddb.c:1643
 msgid "Cannot set options on the newly-created socket"
 msgstr "Nem lehet beállítani a kapcsolókat az újonnan létrehozott foglalathoz"
 
 #. Open connection to the server.
-#: ../src/cddb.c:1560
+#: ../src/cddb.c:1647
 #, c-format
 msgid "Connecting to host '%s', port '%d'…"
 msgstr "Kapcsolódás a(z) „%s” géphez a „%d” porton…"
 
-#: ../src/cddb.c:1573
+#: ../src/cddb.c:1660
 #, c-format
 msgid "Cannot connect to host '%s' (%s)"
 msgstr "Nem lehet kapcsolódni a(z) „%s” géphez (%s)"
 
-#: ../src/cddb.c:1597
+#: ../src/cddb.c:1684
 #, c-format
-#| msgid "Can't resolve host '%s' (%s)."
 msgid "Cannot resolve host '%s' (%s)"
 msgstr "Nem oldható fel a(z) „%s” gép (%s)"
 
-#: ../src/cddb.c:1610
+#: ../src/cddb.c:1697
 #, c-format
 msgid "Connected to host '%s'"
 msgstr "Kapcsolódva a(z) „%s” géphez"
 
-#: ../src/cddb.c:1691
+#: ../src/cddb.c:1778
 #, c-format
-#| msgid "Error while writing to file: '%s' (%s)"
 msgid "Error while writing CDDB results to file '%s'"
 msgstr "Hiba a CD-adatbázis eredményeinek fájlba írása közben: „%s”"
 
-#: ../src/cddb.c:1702
+#: ../src/cddb.c:1789
 #, c-format
 msgid "Receiving data (%s)…"
 msgstr "Adatok fogadása (%s)…"
 
-#: ../src/cddb.c:1714
+#: ../src/cddb.c:1801
 #, c-format
 msgid "Error when reading CDDB response (%s)"
 msgstr "Hiba történt a CDDB válasz olvasásakor (%s)"
 
-#: ../src/cddb.c:1721
+#: ../src/cddb.c:1808
 #, c-format
 msgid "Cannot create file '%s' (%s)"
 msgstr "Nem hozható létre a(z) „%s” fájl (%s)"
 
-#: ../src/cddb.c:1762 ../src/setting.c:1260
+#: ../src/cddb.c:1849 ../src/setting.c:1256
 #, c-format
 msgid "Cannot open file '%s' (%s)"
 msgstr "Nem nyitható meg a(z) „%s” fájl (%s)"
@@ -1446,11 +1392,11 @@ msgstr "Nem nyitható meg a(z) „%s” fájl (%s)"
 #. Send the request
 #. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: ../src/cddb.c:2227 ../src/cddb.c:2556 ../src/cddb.c:3429
+#: ../src/cddb.c:2314 ../src/cddb.c:2643 ../src/cddb.c:3516
 msgid "Sending request…"
 msgstr "Kérés küldése…"
 
-#: ../src/cddb.c:2231 ../src/cddb.c:2560 ../src/cddb.c:3129 ../src/cddb.c:3433
+#: ../src/cddb.c:2318 ../src/cddb.c:2647 ../src/cddb.c:3216 ../src/cddb.c:3520
 #, c-format
 msgid "Cannot send the request (%s)"
 msgstr "Nem küldhető el a kérés (%s)"
@@ -1459,111 +1405,109 @@ msgstr "Nem küldhető el a kérés (%s)"
 #. * Read the answer
 #.
 #. Read the answer
-#: ../src/cddb.c:2257 ../src/cddb.c:3143 ../src/cddb.c:3442
+#: ../src/cddb.c:2344 ../src/cddb.c:3230 ../src/cddb.c:3529
 msgid "Receiving data…"
 msgstr "Adatok fogadása…"
 
-#: ../src/cddb.c:2264 ../src/cddb.c:2589 ../src/cddb.c:3150 ../src/cddb.c:3449
+#: ../src/cddb.c:2351 ../src/cddb.c:2676 ../src/cddb.c:3237 ../src/cddb.c:3536
 msgid "The server returned a bad response"
 msgstr "A kiszolgáló rossz választ adott vissza"
 
-#: ../src/cddb.c:2278 ../src/cddb.c:2605 ../src/cddb.c:3165 ../src/cddb.c:3466
-#: ../src/cddb.c:3481
+#: ../src/cddb.c:2365 ../src/cddb.c:2692 ../src/cddb.c:3252 ../src/cddb.c:3553
+#: ../src/cddb.c:3568
 #, c-format
 msgid "The server returned a bad response: %s"
 msgstr "A kiszolgáló rossz választ adott vissza: %s"
 
-#: ../src/cddb.c:2425
+#: ../src/cddb.c:2512
 #, c-format
 msgid "Sorry, the web-based search is currently not available"
 msgstr "Sajnáljuk, de a web-alapú keresés jelenleg nem érhető el"
 
-#: ../src/cddb.c:2427 ../src/cddb.c:2776
+#: ../src/cddb.c:2514 ../src/cddb.c:2863
 #, c-format
 msgid "Found one matching album"
 msgid_plural "Found %d matching albums"
 msgstr[0] "Egy egyező album található"
 msgstr[1] "%d egyező album található"
 
-#: ../src/cddb.c:2577
+#: ../src/cddb.c:2664
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)…"
 msgstr "A(z) %d. oldal adatainak fogadása (album %d/%d)…"
 
-#: ../src/cddb.c:2579
+#: ../src/cddb.c:2666
 #, c-format
 msgid "Receiving data of page %d…"
 msgstr "A(z) %d. oldal adatainak fogadása…"
 
-#: ../src/cddb.c:2743
+#: ../src/cddb.c:2830
 #, c-format
 msgid "More results to load…"
 msgstr "További betöltendő eredmények…"
 
-#: ../src/cddb.c:2872
+#: ../src/cddb.c:2959
 #, c-format
 msgid "No file selected"
 msgstr "Nincs fájl kiválasztva"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: ../src/cddb.c:2880
+#: ../src/cddb.c:2967
 #, c-format
 msgid "More than 99 files selected. Cannot send request"
 msgstr "Több mint 99 fájl van kijelölve. A kérés nem küldhető el"
 
-#: ../src/cddb.c:2886
+#: ../src/cddb.c:2973
 #, c-format
 msgid "One file selected"
 msgid_plural "%d files selected"
 msgstr[0] "Egy kijelölt fájl"
 msgstr[1] "%d kijelölt fájl"
 
-#: ../src/cddb.c:2969
+#: ../src/cddb.c:3056
 msgid "The path for 'Local CD Database' was not defined"
 msgstr "A „Helyi CD-adatbázis” útvonala nem volt meghatározva"
 
 #. Translators: 'it' in this sentence refers to the local CD
 #. * database path.
-#: ../src/cddb.c:2972
+#: ../src/cddb.c:3059
 msgid "Enter it in the preferences window before using this search."
 msgstr "Írja be azt a tulajdonságok ablakba, mielőtt ezt a keresést használja."
 
-#: ../src/cddb.c:2974
-#| msgid "Local CD search…"
+#: ../src/cddb.c:3061
 msgid "Local CD search"
 msgstr "Helyi CD keresés"
 
 #. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
-#: ../src/cddb.c:3119
+#: ../src/cddb.c:3206
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"
 msgstr "Kérés küldése (CddbId: %s, #számok: %d, Lemez hossz: %d)…"
 
-#: ../src/cddb.c:3276
+#: ../src/cddb.c:3363
 #, c-format
 msgid "DiscID '%s' gave one matching album"
 msgid_plural "DiscID '%s' gave %d matching albums"
 msgstr[0] "A(z) „%s” lemezazonosító egy illeszkedő albumot adott"
 msgstr[1] "A(z) „%s” lemezazonosító %d illeszkedő albumot adott"
 
-#: ../src/cddb.c:3373
+#: ../src/cddb.c:3460
 #, c-format
 msgid "Can't load file: '%s' (%s)."
 msgstr "Nem tölthető be a fájl: „%s” (%s)."
 
 #. Load the track list of the album
-#: ../src/cddb.c:3672
+#: ../src/cddb.c:3759
 msgid "Loading album track list…"
 msgstr "Az album számlistájának betöltése…"
 
-#: ../src/cddb.c:3871
+#: ../src/cddb.c:3958
 msgid "The number of CDDB results does not match the number of selected files"
 msgstr ""
 "A CD-adatbázis eredményeinek száma nem egyezik a kijelölt fájlok számával"
 
-#: ../src/cddb.c:3875
-#| msgid "Write Tag from CDDB…"
+#: ../src/cddb.c:3962
 msgid "Write Tag from CDDB"
 msgstr "Címke írása a CD-adatbázisból"
 
@@ -1813,64 +1757,59 @@ 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:181
+#: ../src/easytag.c:184
 #, c-format
 msgid "Starting EasyTAG version %s (PID: %d)…"
 msgstr "Az EasyTAG %s verziójának indítása (PID: %d)…"
 
-#: ../src/easytag.c:183
+#: ../src/easytag.c:186
 #, c-format
-#| msgid "Currently using libid3tag version %s…"
 msgid "Using libid3tag version %s"
 msgstr "A(z) %s verziójú libid3tag használata"
 
-#: ../src/easytag.c:186
+#: ../src/easytag.c:189
 #, c-format
-#| msgid "Currently using id3lib version %d.%d.%d…"
 msgid "Using id3lib version %d.%d.%d"
 msgstr "A(z) %d.%d.%d verziójú id3lib használata"
 
-#: ../src/easytag.c:192
+#: ../src/easytag.c:195
 #, 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:194
+#: ../src/easytag.c:197
 #, c-format
 msgid "Setting locale: '%s'"
 msgstr "Területi beállítás beállítása: „%s”"
 
-#: ../src/easytag.c:199
+#: ../src/easytag.c:202
 #, c-format
-#| msgid "Currently using locale '%s' (and eventually '%s')…"
 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:206
+#: ../src/easytag.c:209
 msgid "Unable to create setting directories"
 msgstr "Nem lehet létrehozni a beállítás könyvtárakat"
 
-#: ../src/easytag.c:422 ../src/et_core.c:583
+#: ../src/easytag.c:426 ../src/et_core.c:582
 #, c-format
-#| msgid "Error while writing to file: '%s' (%s)"
 msgid "Error while querying information for file: '%s' (%s)"
 msgstr "Hiba a fájl információinak lekérése közben: „%s” (%s)"
 
-#: ../src/easytag.c:487
+#: ../src/easytag.c:490
 #, c-format
-#| msgid "Cannot open file: '%s'"
 msgid "Cannot open path '%s'"
 msgstr "Nem nyitható meg az útvonal: „%s”"
 
 #.
 #. * Browser
 #.
-#: ../src/easytag.c:593 ../src/prefs.c:142
+#: ../src/easytag.c:582 ../src/prefs.c:142
 msgid "Browser"
 msgstr "Böngésző"
 
-#: ../src/easytag.c:615 ../src/et_core.c:2727
+#: ../src/easytag.c:604 ../src/et_core.c:2774
 msgid "File"
 msgstr "Fájl"
 
@@ -1880,118 +1819,117 @@ msgstr "Fájl"
 #. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
 #. Version changed to encoder version
 #. Encoder version
-#: ../src/easytag.c:647 ../src/easytag.c:4202 ../src/flac_header.c:201
+#: ../src/easytag.c:636 ../src/easytag.c:4197 ../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
 #, c-format
 msgid "Encoder:"
 msgstr "Kódoló:"
 
-#: ../src/easytag.c:655
+#: ../src/easytag.c:644
 msgid "Bitrate:"
 msgstr "Bitsebesség:"
 
 #. Translators: Please try to keep this string as short as possible as it
 #. * is shown in a narrow column.
-#: ../src/easytag.c:665
-#| msgid "Freq.:"
+#: ../src/easytag.c:654
 msgid "Frequency:"
 msgstr "Frekvencia:"
 
 #. Mode
-#: ../src/easytag.c:676 ../src/easytag.c:4206 ../src/mpeg_header.c:216
+#: ../src/easytag.c:665 ../src/easytag.c:4201 ../src/mpeg_header.c:216
 msgid "Mode:"
 msgstr "Mód:"
 
-#: ../src/easytag.c:683
+#: ../src/easytag.c:672
 msgid "Size:"
 msgstr "Méret:"
 
-#: ../src/easytag.c:690
+#: ../src/easytag.c:679
 msgid "Duration:"
 msgstr "Időtartam:"
 
 #. Main Frame
-#: ../src/easytag.c:736 ../src/et_core.c:2665
+#: ../src/easytag.c:726 ../src/et_core.c:2712
 msgid "Tag"
 msgstr "Címke"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: ../src/easytag.c:758
+#: ../src/easytag.c:748
 msgid "Common"
 msgstr "Közös"
 
 #. Title
-#: ../src/easytag.c:765
+#: ../src/easytag.c:755
 msgid "Title:"
 msgstr "Cím:"
 
 # bubble help
-#: ../src/easytag.c:779
+#: ../src/easytag.c:769
 msgid "Tag selected files with this title"
 msgstr "A kijelölt fájlok címkézése ezzel a címmel"
 
 #. Artist
-#: ../src/easytag.c:784
+#: ../src/easytag.c:774
 msgid "Artist:"
 msgstr "Előadó:"
 
 # bubble help
-#: ../src/easytag.c:798
+#: ../src/easytag.c:788
 msgid "Tag selected files with this artist"
 msgstr "A kijelölt fájlok címkézése ezzel az előadóval"
 
 #. Album Artist
-#: ../src/easytag.c:803
+#: ../src/easytag.c:793
 msgid "Album artist:"
 msgstr "Album előadója:"
 
 # bubble help
-#: ../src/easytag.c:817
+#: ../src/easytag.c:807
 msgid "Tag selected files with this album artist"
 msgstr "A kijelölt fájlok címkézése ezzel az album előadóval"
 
 #. Album
-#: ../src/easytag.c:822
+#: ../src/easytag.c:812
 msgid "Album:"
 msgstr "Album:"
 
-#: ../src/easytag.c:836
+#: ../src/easytag.c:826
 msgid "Tag selected files with this album name"
 msgstr "A kijelölt fájlok címkézése ezzel az albumnévvel"
 
 #. Disc Number
-#: ../src/easytag.c:841
+#: ../src/easytag.c:831
 msgid "CD:"
 msgstr "CD:"
 
-#: ../src/easytag.c:858
+#: ../src/easytag.c:848
 msgid "Tag selected files with this disc number"
 msgstr "A kijelölt fájlok címkézése ezzel a lemezszámmal"
 
 #. Year
-#: ../src/easytag.c:863
+#: ../src/easytag.c:853
 msgid "Year:"
 msgstr "Év:"
 
-#: ../src/easytag.c:883
+#: ../src/easytag.c:873
 msgid "Tag selected files with this year"
 msgstr "A kijelölt fájlok címkézése ezzel az évszámmal"
 
-#: ../src/easytag.c:897
+#: ../src/easytag.c:887
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "A kijelölt számok számozása egymás után. 01-től kezdi minden alkönyvtárban."
 
 #. To have enough space to display the icon
 #. To have enough space to display the icon
-#: ../src/easytag.c:906
+#: ../src/easytag.c:896
 msgid "Track #:"
 msgstr "Szám #:"
 
-#: ../src/easytag.c:937
+#: ../src/easytag.c:927
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1999,673 +1937,622 @@ msgstr ""
 "A fájlok számának beállítása a megjelenített fájl könyvtárában a kijelölt "
 "számokhoz."
 
-#: ../src/easytag.c:957
+#: ../src/easytag.c:947
 msgid "Tag selected files with this number of tracks"
 msgstr "A kijelölt fájlok címkézése a számok számával"
 
 #. Genre
-#: ../src/easytag.c:961
+#: ../src/easytag.c:951
 msgid "Genre:"
 msgstr "Műfaj:"
 
-#: ../src/easytag.c:989
+#: ../src/easytag.c:979
 msgid "Tag selected files with this genre"
 msgstr "A kijelölt fájlok címkézése ezzel a műfajjal"
 
 #. Comment
-#: ../src/easytag.c:994
+#: ../src/easytag.c:984
 msgid "Comment:"
 msgstr "Megjegyzés:"
 
-#: ../src/easytag.c:1021
+#: ../src/easytag.c:1011
 msgid "Tag selected files with this comment"
 msgstr "A kijelölt fájlok címkézése ezzel a megjegyzéssel"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. Composer (name of the composers)
-#: ../src/easytag.c:1028
+#: ../src/easytag.c:1018
 msgid "Composer:"
 msgstr "Zeneszerző:"
 
-#: ../src/easytag.c:1042
+#: ../src/easytag.c:1032
 msgid "Tag selected files with this composer"
 msgstr "A kijelölt fájlok címkézése ezzel a zeneszerzővel "
 
 #. 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:1049
+#: ../src/easytag.c:1039
 msgid "Orig. artist:"
 msgstr "Eredeti előadó:"
 
-#: ../src/easytag.c:1063
+#: ../src/easytag.c:1053
 msgid "Tag selected files with this original artist"
 msgstr "A kijelölt fájlok címkézése ezzel az eredeti előadóval"
 
 #. Copyright
-#: ../src/easytag.c:1069
+#: ../src/easytag.c:1059
 msgid "Copyright:"
 msgstr "Szerzői jog:"
 
-#: ../src/easytag.c:1083
+#: ../src/easytag.c:1073
 msgid "Tag selected files with this copyright"
 msgstr "A kijelölt fájlok címkézése ezzel a szerzői joggal"
 
 #. URL
-#: ../src/easytag.c:1089
+#: ../src/easytag.c:1079
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/easytag.c:1103
+#: ../src/easytag.c:1093
 msgid "Tag selected files with this URL"
 msgstr "A kijelölt fájlok címkézése ezzel az URL-lel"
 
 #. Encoded by
-#: ../src/easytag.c:1109
+#: ../src/easytag.c:1099
 msgid "Encoded by:"
 msgstr "Kódolta:"
 
-#: ../src/easytag.c:1123
+#: ../src/easytag.c:1113
 msgid "Tag selected files with this encoder name"
 msgstr "A kijelölt fájlok címkézése a kódoló nevével"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1157 ../src/et_core.c:3100 ../src/et_core.c:3103
+#: ../src/easytag.c:1147 ../src/et_core.c:3146 ../src/et_core.c:3149
 msgid "Images"
 msgstr "Képek"
 
-#: ../src/easytag.c:1181
-#| msgid "You can use drag and drop to add picture."
+#: ../src/easytag.c:1171
 msgid "You can use drag and drop to add an image"
 msgstr "Fogja meg és húzza ide a képet a hozzáadáshoz"
 
-#: ../src/easytag.c:1228
+#: ../src/easytag.c:1218
 msgid "Add images to the tag"
 msgstr "Képek hozzáadása a címkéhez"
 
-#: ../src/easytag.c:1246
+#: ../src/easytag.c:1236
 msgid "Remove selected images from the tag"
 msgstr "A kijelölt képek eltávolítása a címkéből"
 
-#: ../src/easytag.c:1260
-#| msgid "Save the selected pictures on the hard disk."
+#: ../src/easytag.c:1250
 msgid "Save the selected images to files"
 msgstr "A kijelölt képek mentése fájlokba"
 
-#: ../src/easytag.c:1271
+#: ../src/easytag.c:1261
 msgid "Edit image properties"
 msgstr "Képtulajdonságok szerkesztése"
 
-#: ../src/easytag.c:1285
-#| msgid "Tag selected files with these pictures"
+#: ../src/easytag.c:1275
 msgid "Tag selected files with these images"
 msgstr "A kijelölt fájlok címkézése ezekkel a képekkel"
 
-#: ../src/easytag.c:1343
+#: ../src/easytag.c:1333
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "A kijelölt fájlok megcímkézve a címmel: „%s”."
 
-#: ../src/easytag.c:1345
+#: ../src/easytag.c:1335
 msgid "Removed title from selected files."
 msgstr "A cím eltávolítva a kijelölt fájlokból."
 
-#: ../src/easytag.c:1360
+#: ../src/easytag.c:1350
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "A kijelölt fájlok megcímkézve az előadóval: „%s”."
 
-#: ../src/easytag.c:1362
+#: ../src/easytag.c:1352
 msgid "Removed artist from selected files."
 msgstr "Az előadó eltávolítva a kijelölt fájlokból."
 
-#: ../src/easytag.c:1376
+#: ../src/easytag.c:1366
 #, c-format
 msgid "Selected files tagged with album artist '%s'."
 msgstr "A kijelölt fájlok megcímkézve az album előadóval: „%s”."
 
-#: ../src/easytag.c:1378
+#: ../src/easytag.c:1368
 msgid "Removed album artist from selected files."
 msgstr "Az album előadó eltávolítva a kijelölt fájlokból."
 
-#: ../src/easytag.c:1393
+#: ../src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "A kijelölt fájlok megcímkézve az albummal: „%s”."
 
-#: ../src/easytag.c:1395
+#: ../src/easytag.c:1385
 msgid "Removed album name from selected files."
 msgstr "Az albumnév eltávolítva a kijelölt fájlokból."
 
-#: ../src/easytag.c:1432
+#: ../src/easytag.c:1422
 #, c-format
-#| msgid "Selected files tagged with disc number '%s'."
 msgid "Selected files tagged with disc number '%s/%s'."
 msgstr "A kijelölt fájlok megcímkézve a lemezszámmal: „%s/%s”."
 
-#: ../src/easytag.c:1437
+#: ../src/easytag.c:1427
 #, c-format
-#| msgid "Selected files tagged with disc number '%s'."
 msgid "Selected files tagged with disc number like 'xx'."
 msgstr "A kijelölt fájlok megcímkézve a lemezszámmal úgymint „xx”."
 
-#: ../src/easytag.c:1442
+#: ../src/easytag.c:1432
 msgid "Removed disc number from selected files."
 msgstr "A lemezszám eltávolítva a kijelölt fájlokból."
 
-#: ../src/easytag.c:1458
+#: ../src/easytag.c:1448
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "A kijelölt fájlok megcímkézve az évszámmal: „%s”."
 
-#: ../src/easytag.c:1460
+#: ../src/easytag.c:1450
 msgid "Removed year from selected files."
 msgstr "Az évszám eltávolítva a kijelölt fájlokból."
 
-#: ../src/easytag.c:1486 ../src/easytag.c:1576
+#: ../src/easytag.c:1476 ../src/easytag.c:1567
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "A kijelölt fájlok megcímkézve a megadott számmal mint „xx/%s”."
 
-#: ../src/easytag.c:1489
+#: ../src/easytag.c:1479
 #, c-format
 msgid "Selected files tagged with track like 'xx'."
 msgstr "A kijelölt fájlok megcímkézve a megadott számmal mint „xx”."
 
-#: ../src/easytag.c:1493 ../src/easytag.c:1579
+#: ../src/easytag.c:1483 ../src/easytag.c:1570
 msgid "Removed track number from selected files."
 msgstr "A szám sorszáma eltávolítva a kijelölt fájlokból."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1549
+#: ../src/easytag.c:1540
 #, c-format
 msgid "Selected tracks numbered sequentially."
 msgstr "A kijelölt számok növekvően sorszámozva."
 
-#: ../src/easytag.c:1595
+#: ../src/easytag.c:1586
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "A kijelölt fájlok megcímkézve a műfajjal: „%s”."
 
-#: ../src/easytag.c:1597
+#: ../src/easytag.c:1588
 msgid "Removed genre from selected files."
 msgstr "A műfaj eltávolítva a kijelölt fájlokból."
 
-#: ../src/easytag.c:1619
+#: ../src/easytag.c:1610
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "A kijelölt fájlok megcímkézve a megjegyzéssel: „%s”."
 
-#: ../src/easytag.c:1621
+#: ../src/easytag.c:1612
 msgid "Removed comment from selected files."
 msgstr "A megjegyzés eltávolítva a kijelölt fájlokból."
 
-#: ../src/easytag.c:1635
+#: ../src/easytag.c:1626
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "A kijelölt fájlok megcímkézve a zeneszerzővel: „%s”."
 
-#: ../src/easytag.c:1637
+#: ../src/easytag.c:1628
 msgid "Removed composer from selected files."
 msgstr "A zeneszerző eltávolítva a kijelölt fájlokból."
 
-#: ../src/easytag.c:1652
+#: ../src/easytag.c:1643
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "A kijelölt fájlok megcímkézve az eredeti előadóval: „%s”."
 
-#: ../src/easytag.c:1654
+#: ../src/easytag.c:1645
 msgid "Removed original artist from selected files."
 msgstr "Az eredeti előadó eltávolítva a kijelölt fájlokból."
 
-#: ../src/easytag.c:1669
+#: ../src/easytag.c:1660
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "A kijelölt fájlok megcímkézve a szerzői joggal: „%s”."
 
-#: ../src/easytag.c:1671
+#: ../src/easytag.c:1662
 msgid "Removed copyright from selected files."
 msgstr "A szerzői jog eltávolítva a kijelölt fájlokból."
 
-#: ../src/easytag.c:1686
+#: ../src/easytag.c:1677
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "A kijelölt fájlok megcímkézve az URL-lel: „%s”."
 
-#: ../src/easytag.c:1688
+#: ../src/easytag.c:1679
 msgid "Removed URL from selected files."
 msgstr "Az URL eltávolítva a kijelölt fájlokból."
 
-#: ../src/easytag.c:1703
+#: ../src/easytag.c:1694
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "A kijelölt fájlok megcímkézve a kódoló nevével: „%s”."
 
-#: ../src/easytag.c:1705
+#: ../src/easytag.c:1696
 msgid "Removed encoder name from selected files."
 msgstr "A kodoló neve eltávolítva a kijelölt fájlokból."
 
-#: ../src/easytag.c:1737
-#| msgid "Selected files tagged with pictures."
+#: ../src/easytag.c:1728
 msgid "Selected files tagged with images."
 msgstr "A kijelölt fájlok megcímkézve a képekkel."
 
-#: ../src/easytag.c:1739
-#| msgid "Removed title from selected files."
+#: ../src/easytag.c:1730
 msgid "Removed images from selected files."
 msgstr "A képek eltávolítva a kijelölt fájlokból."
 
-#: ../src/easytag.c:2020
+#: ../src/easytag.c:2011
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Válasszon módot és maszkot, és ismételje meg a műveletet"
 
-#: ../src/easytag.c:2072
+#: ../src/easytag.c:2063
 msgid "All tags have been scanned"
 msgstr "Minden címke feldolgozva"
 
-#: ../src/easytag.c:2128
+#: ../src/easytag.c:2119
 msgid "All tags have been removed"
 msgstr "Minden címke eltávolítva"
 
-#: ../src/easytag.c:2418
+#: ../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] "Egy fájlt egy külső program módosított"
 msgstr[1] "%d fájlt egy külső program módosított"
 
-#: ../src/easytag.c:2423
+#: ../src/easytag.c:2429
 msgid "Do you want to continue saving the file?"
 msgstr "Szeretné folytatni a fájl mentését?"
 
-#: ../src/easytag.c:2478 ../src/easytag.c:2498
-#| msgid "Saving files was stopped…"
+#: ../src/easytag.c:2487 ../src/easytag.c:2507
 msgid "Saving files was stopped"
 msgstr "A fájlok mentése le lett állítva"
 
-#: ../src/easytag.c:2500
-#| msgid "All files have been saved…"
+#: ../src/easytag.c:2509
 msgid "All files have been saved"
 msgstr "Minden fájl elmentve"
 
-#: ../src/easytag.c:2631
+#: ../src/easytag.c:2644
 #, c-format
-#| msgid "Cannot create file '%s' (%s)"
 msgid "Cannot delete file (%s)"
 msgstr "Nem törölhető a fájl (%s)"
 
-#: ../src/easytag.c:2651
-#| msgid "Files have been partially deleted…"
+#: ../src/easytag.c:2665
 msgid "Files have been partially deleted"
 msgstr "A fájlok részlegesen törölve"
 
-#: ../src/easytag.c:2653
-#| msgid "All files have been deleted…"
+#: ../src/easytag.c:2667
 msgid "All files have been deleted"
 msgstr "Minden fájl törölve"
 
-#: ../src/easytag.c:2769
+#: ../src/easytag.c:2783
 #, c-format
 msgid "Do you want to write the tag of file '%s'?"
 msgstr "Szeretné beírni a(z) „%s” fájl címkéjét?"
 
-#: ../src/easytag.c:2771
+#: ../src/easytag.c:2785
 msgid "Confirm Tag Writing"
 msgstr "Címke írásának megerősítése"
 
-#: ../src/easytag.c:2776 ../src/easytag.c:2893 ../src/easytag.c:3153
+#: ../src/easytag.c:2790 ../src/easytag.c:2910 ../src/easytag.c:3173
 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:2857 ../src/scan.c:182
+#: ../src/easytag.c:2874 ../src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Fájl és könyvtár átnevezése"
 
-#: ../src/easytag.c:2858
+#: ../src/easytag.c:2875
 msgid "File and directory rename confirmation required"
 msgstr "A fájl és könyvtár átnevezése megerősítést igényel"
 
-#: ../src/easytag.c:2859
+#: ../src/easytag.c:2876
 #, c-format
 msgid "Do you want to rename the file and directory '%s' to '%s'?"
 msgstr "Szeretné átnevezni a fájlt és a könyvtárat („%s”) erre: „%s”?"
 
-#: ../src/easytag.c:2865
+#: ../src/easytag.c:2882
 msgid "Directory rename confirmation required"
 msgstr "A könyvtár átnevezése megerősítést igényel"
 
-#: ../src/easytag.c:2866
+#: ../src/easytag.c:2883
 #, c-format
 msgid "Do you want to rename the directory '%s' to '%s'?"
 msgstr "Szeretné átnevezni a könyvtárat („%s”) erre: „%s”?"
 
 #. Only filename changed
-#: ../src/easytag.c:2872
-#| msgid "Rename File…"
+#: ../src/easytag.c:2889
 msgid "Rename File"
 msgstr "Fájl átnevezése"
 
-#: ../src/easytag.c:2873
+#: ../src/easytag.c:2890
 msgid "File rename confirmation required"
 msgstr "A fájl átnevezése megerősítést igényel"
 
-#: ../src/easytag.c:2874
+#: ../src/easytag.c:2891
 #, c-format
 msgid "Do you want to rename the file '%s' to '%s'?"
 msgstr "Szeretné átnevezni a fájlt („%s”) erre: „%s”?"
 
-#: ../src/easytag.c:2940
+#: ../src/easytag.c:2957
 #, c-format
 msgid "Cannot rename file '%s' to '%s'"
 msgstr "Nem nevezhető át a(z) „%s” fájl erre: „%s”"
 
-#: ../src/easytag.c:2954
+#: ../src/easytag.c:2971
 #, c-format
 msgid "Cannot rename file '%s' to '%s': %s"
 msgstr "Nem nevezhető át a(z) „%s” fájl erre: „%s”: %s"
 
-#: ../src/easytag.c:2958
-#| msgid "File(s) not renamed…"
+#: ../src/easytag.c:2975
 msgid "File(s) not renamed"
 msgstr "A fájlok nem lettek átnevezve"
 
-#: ../src/easytag.c:3067
+#: ../src/easytag.c:3087
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "„%s” címkéjének írása"
 
-#: ../src/easytag.c:3074
+#: ../src/easytag.c:3094
 msgid "Tag(s) written"
 msgstr "Címkék kiírva"
 
-#: ../src/easytag.c:3089
+#: ../src/easytag.c:3109
 #, c-format
 msgid "Cannot write tag in file '%s' (%s)"
 msgstr "Nem írható címke a(z) „%s” fájlba (%s)"
 
-#: ../src/easytag.c:3102
+#: ../src/easytag.c:3122
 #, c-format
 msgid "Cannot write tag in file '%s'"
 msgstr "Nem írható címke a(z) „%s” fájlba"
 
-#: ../src/easytag.c:3105
+#: ../src/easytag.c:3125
 msgid "Tag Write Error"
 msgstr "Címkeírási hiba"
 
-#: ../src/easytag.c:3150 ../src/easytag.c:3164
+#: ../src/easytag.c:3170 ../src/easytag.c:3184
 #, c-format
 msgid "Do you really want to delete the file '%s'?"
 msgstr "Biztosan törölni szeretné a(z) „%s” fájlt?"
 
 # Fájl menü
-#: ../src/easytag.c:3156 ../src/easytag.c:3166
+#: ../src/easytag.c:3176 ../src/easytag.c:3186
 msgid "Delete File"
 msgstr "Fájl törlése"
 
-#: ../src/easytag.c:3191
+#: ../src/easytag.c:3211
 #, c-format
 msgid "File '%s' deleted"
 msgstr "A(z) „%s” fájl törölve"
 
-#: ../src/easytag.c:3323
+#: ../src/easytag.c:3346
 #, c-format
 msgid "Cannot read directory '%s'"
 msgstr "A(z) „%s” könyvtár nem olvasható"
 
-#: ../src/easytag.c:3327
+#: ../src/easytag.c:3350
 msgid "Directory Read Error"
 msgstr "Könyvtárolvasási hiba"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3348
+#: ../src/easytag.c:3371
 #, c-format
 msgid "Search in progress…"
 msgstr "Keresés folyamatban…"
 
-#: ../src/easytag.c:3371 ../src/et_core.c:2734
+#: ../src/easytag.c:3394 ../src/et_core.c:2781
 #, c-format
 msgid "File: '%s'"
 msgstr "Fájl: „%s”"
 
-#: ../src/easytag.c:3421
+#: ../src/easytag.c:3444
 #, c-format
-#| msgid "Found %d file(s) in this directory and subdirectories."
 msgid "Found one file in this directory and subdirectories"
 msgid_plural "Found %d files in this directory and subdirectories"
 msgstr[0] "Ebben a könyvtárban és az alkönyvtárakban egy fájl található"
 msgstr[1] "Ebben a könyvtárban és az alkönyvtárakban %d fájl található"
 
-#: ../src/easytag.c:3428
+#: ../src/easytag.c:3451
 #, c-format
-#| msgid "Found %d file(s) in this directory."
 msgid "Found one file in this directory"
 msgid_plural "Found %d files in this directory"
 msgstr[0] "Ebben a könyvtárban egy fájl található"
 msgstr[1] "Ebben a könyvtárban %d fájl található"
 
-#: ../src/easytag.c:3450
+#: ../src/easytag.c:3473
 msgid "No file found in this directory and subdirectories"
 msgstr "Ebben a könyvtárban és az alkönyvtárakban nem található fájl"
 
-#: ../src/easytag.c:3452
+#: ../src/easytag.c:3475
 msgid "No file found in this directory"
 msgstr "Ebben a könyvtárban nem található fájl"
 
-#: ../src/easytag.c:3520
+#: ../src/easytag.c:3543
 #, c-format
-#| msgid "Error: Cannot create directory '%s' (%s)"
 msgid "Error opening directory '%s' (%s)"
 msgstr "Hiba a könyvtár megnyitása közben: „%s” (%s)"
 
-#: ../src/easytag.c:3556
+#: ../src/easytag.c:3579
 #, c-format
-#| msgid "Cannot read directory '%s'"
 msgid "Cannot read directory (%s)"
 msgstr "A könyvtár nem olvasható (%s)"
 
-#: ../src/easytag.c:3576
-#| msgid "Search in progress…"
+#: ../src/easytag.c:3599
 msgid "Searching for audio files…"
 msgstr "Hangfájlok keresése…"
 
-#: ../src/easytag.c:3577
-#| msgid "Searching…"
+#: ../src/easytag.c:3600
 msgid "Searching"
 msgstr "Keresés"
 
-#: ../src/easytag.c:4236
+#: ../src/easytag.c:4231
 msgid "Select a directory to browse"
 msgstr "Válassza ki az átvizsgálandó könyvtárat"
 
 #. Menu items
-#: ../src/easytag.c:4383
+#: ../src/easytag.c:4378
 msgid "Tag selected files with this field"
 msgstr "A kijelölt fájlok címkézése ezzel a mezővel"
 
-#: ../src/easytag.c:4395 ../src/scan.c:2663
+#: ../src/easytag.c:4390 ../src/scan.c:2654
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Az „_” és a „%20” átalakítása szóközre"
 
-#: ../src/easytag.c:4402 ../src/scan.c:2665
+#: ../src/easytag.c:4397 ../src/scan.c:2656
 msgid "Convert ' ' to '_'"
 msgstr "A „ ” átalakítása erre: „_”"
 
-#: ../src/easytag.c:4413
+#: ../src/easytag.c:4408
 msgid "All uppercase"
 msgstr "MINDENT NAGYBETŰSRE"
 
-#: ../src/easytag.c:4420
+#: ../src/easytag.c:4415
 msgid "All lowercase"
 msgstr "mindent kisbetűsre"
 
-#: ../src/easytag.c:4427
+#: ../src/easytag.c:4422
 msgid "First letter uppercase"
 msgstr "Első betű legyen nagybetű"
 
-#: ../src/easytag.c:4434
+#: ../src/easytag.c:4429
 msgid "First letter uppercase of each word"
 msgstr "Minden Szó Első Betűje Legyen Nagybetű"
 
-#: ../src/easytag.c:4445 ../src/prefs.c:1023 ../src/scan.c:2763
+#: ../src/easytag.c:4440 ../src/prefs.c:1023 ../src/scan.c:2754
 msgid "Remove spaces"
 msgstr "Szóközök eltávolítása"
 
-#: ../src/easytag.c:4452
+#: ../src/easytag.c:4447
 msgid "Insert space before uppercase letter"
 msgstr "Szóköz beszúrása minden nagybetű elé"
 
-#: ../src/easytag.c:4459
+#: ../src/easytag.c:4454
 msgid "Remove duplicate spaces or underscores"
 msgstr "Dupla szóközök vagy alsóvonások eltávolítása"
 
-#: ../src/easytag.c:4466
+#: ../src/easytag.c:4461
 msgid "Remove all text"
 msgstr "Minden szöveg eltávolítása"
 
-#. gchar commmand[256];
-#: ../src/easytag.c:4489
-#, c-format
-msgid "EasyTAG version %s: Abnormal exit (PID: %d)"
-msgstr "EasyTAG verzió %s: Rendellenes kilépés (PID: %d)"
-
-#: ../src/easytag.c:4490 ../src/easytag.c:4501
-#, c-format
-#| msgid "Received signal %s (%d)"
-msgid "Received signal '%s' (%d)"
-msgstr "„%s” szignál fogadva (%d)"
-
-#: ../src/easytag.c:4493 ../src/easytag.c:4504
-#, 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 ""
-"Valószínűleg egy hibát talált az EasyTAG programban. Kérjük küldje el a "
-"hibajelentést egy GDB visszavezetéssel („gdb easytag core” majd „bt” és „l”) "
-"és a hiba újra előidézéséhez szükséges információkkal erre a címre: %s"
-
-#. To send messages to the console...
-#: ../src/easytag.c:4499
-#, c-format
-msgid "EasyTAG version %s: Abnormal exit (PID: %d)."
-msgstr "EasyTAG verzió %s: Rendellenes kilépés (PID: %d)."
-
-#: ../src/easytag.c:4523
+#: ../src/easytag.c:4480
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normális kilépés."
 
-#: ../src/easytag.c:4575
+#: ../src/easytag.c:4532
 msgid "Do you want to save them before quitting?"
 msgstr "El szeretné menteni azokat kilépés előtt?"
 
-#: ../src/easytag.c:4598
+#: ../src/easytag.c:4559
 msgid "Do you really want to quit?"
 msgstr "Biztosan ki szeretne lépni?"
 
-#: ../src/et_core.c:505
+#: ../src/et_core.c:504
 #, c-format
-#| msgid "Error reading tags from file: '%s'"
 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:639
+#: ../src/et_core.c:656
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr "Automatikus javítások alkalmazva a(z) „%s” fájlhoz."
 
-#: ../src/et_core.c:2631
+#: ../src/et_core.c:2678
 msgid "ID3 Tag"
 msgstr "ID3 címke"
 
-#: ../src/et_core.c:2637
+#: ../src/et_core.c:2684
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis címke"
 
-#: ../src/et_core.c:2643
+#: ../src/et_core.c:2690
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis címke"
 
-#: ../src/et_core.c:2648
+#: ../src/et_core.c:2695
 msgid "APE Tag"
 msgstr "APE címke"
 
-#: ../src/et_core.c:2653
+#: ../src/et_core.c:2700
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC címke"
 
-#: ../src/et_core.c:2659
+#: ../src/et_core.c:2706
 msgid "Wavpack Tag"
 msgstr "Wavpack címke"
 
-#: ../src/et_core.c:2679
+#: ../src/et_core.c:2726
 msgid "MP3 File"
 msgstr "MP3 fájl"
 
-#: ../src/et_core.c:2683
+#: ../src/et_core.c:2730
 msgid "MP2 File"
 msgstr "MP2 fájl"
 
-#: ../src/et_core.c:2689
+#: ../src/et_core.c:2736
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis fájl"
 
 # ikon megjegyzés
-#: ../src/et_core.c:2695
+#: ../src/et_core.c:2742
 msgid "Speex File"
 msgstr "Speex fájl"
 
-#: ../src/et_core.c:2701
+#: ../src/et_core.c:2748
 msgid "FLAC File"
 msgstr "FLAC fájl"
 
-#: ../src/et_core.c:2706
+#: ../src/et_core.c:2753
 msgid "MusePack File"
 msgstr "MusePack fájl"
 
-#: ../src/et_core.c:2710
+#: ../src/et_core.c:2757
 msgid "Monkey's Audio File"
 msgstr "Monkey's hangfájl"
 
-#: ../src/et_core.c:2715
+#: ../src/et_core.c:2762
 msgid "MP4/AAC File"
 msgstr "MP4/AAC fájl"
 
-#: ../src/et_core.c:2721
+#: ../src/et_core.c:2768
 msgid "Wavpack File"
 msgstr "Wavpack fájl"
 
-#: ../src/et_core.c:2778 ../src/et_core.c:2833
+#: ../src/et_core.c:2825 ../src/et_core.c:2880
 msgid "File not found"
 msgstr "A fájl nem található"
 
-#: ../src/et_core.c:2783
+#: ../src/et_core.c:2830
 #, c-format
-#| msgid "Cannot open file '%s' (%s)"
 msgid "Cannot query file information (%s)"
 msgstr "Nem kérdezhetők le a fájlinformációk (%s)"
 
-#: ../src/et_core.c:2817
+#: ../src/et_core.c:2864
 msgid "Read-only file"
 msgstr "Csak olvasható fájl"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2881
+#: ../src/et_core.c:2928
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
 msgstr[0] "Egy fájl"
 msgstr[1] "%u fájl"
 
-#: ../src/et_core.c:3086
+#: ../src/et_core.c:3132
 #, c-format
 msgid "Images (%d)"
 msgstr "Képek (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3128 ../src/flac_header.c:205
+#: ../src/et_core.c:3174 ../src/flac_header.c:205
 #: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
 #: ../src/mpeg_header.c:206 ../src/musepack_header.c:88
 #: ../src/ogg_header.c:401 ../src/wavpack_header.c:78
@@ -2674,7 +2561,7 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: ../src/et_core.c:3133 ../src/flac_header.c:210
+#: ../src/et_core.c:3179 ../src/flac_header.c:210
 #: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
 #: ../src/mpeg_header.c:211 ../src/musepack_header.c:93
 #: ../src/ogg_header.c:406 ../src/wavpack_header.c:83
@@ -2682,28 +2569,21 @@ msgstr "%d kb/s"
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/et_core.c:3276 ../src/scan.c:691
+#: ../src/et_core.c:3322 ../src/scan.c:690
 #, 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:3278
+#: ../src/et_core.c:3324
 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:3279 ../src/scan.c:693
+#: ../src/et_core.c:3325 ../src/scan.c:692
 msgid "Filename translation"
 msgstr "Fájlnév fordítások"
 
-#: ../src/et_core.c:3940
+#: ../src/et_core.c:4025
 #, c-format
-#| msgid "Cannot create or open file '%s' (%s)"
-msgid "Cannot change the permissions of file '%s' (%s)"
-msgstr "Nem változtathatók meg a(z) „%s” fájl jogosultságai (%s)"
-
-#: ../src/et_core.c:3978
-#, c-format
-#| msgid "Error while writing to file: '%s' (%s)"
 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)"
 
@@ -2721,7 +2601,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:347
+#: ../src/flac_tag.c:352 ../src/ogg_tag.c:411
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
@@ -2740,14 +2620,13 @@ 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:922
+#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1151
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "A(z) „%s” címkéje kiírva"
 
 #: ../src/id3_tag.c:158
 #, c-format
-#| msgid "Error while opening file: '%s' (%s)."
 msgid "Error while reading file: '%s' (%s)"
 msgstr "Hiba a fájl olvasása közben: „%s” (%s)"
 
@@ -2764,27 +2643,27 @@ msgstr ""
 msgid "Corrupted file"
 msgstr "Sérült fájl"
 
-#: ../src/id3_tag.c:540
+#: ../src/id3_tag.c:555
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "A(z) „%s” címkéje eltávolítva"
 
-#: ../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 "Hiba történt a(z) „%s” ID3v1 címkéjének eltávolításakor (%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 "Hiba történt a(z) „%s” ID3v2 címkéjének eltávolításakor (%s)"
 
-#: ../src/id3_tag.c:565
+#: ../src/id3_tag.c:580
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Hiba történt a(z) „%s” ID3v1 címkéjének frissítésekor (%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"
@@ -2792,7 +2671,7 @@ msgstr ""
 "Ezt a címkét Unicode formátumban próbálta meg elmenteni, de azt észleltük, "
 "hogy az id3lib verziója hibás"
 
-#: ../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 "
@@ -2811,90 +2690,90 @@ msgstr ""
 "\n"
 "File: %s"
 
-#: ../src/id3_tag.c:602
+#: ../src/id3_tag.c:617
 msgid "Buggy id3lib"
 msgstr "Hibás id3lib"
 
-#: ../src/id3_tag.c:636
+#: ../src/id3_tag.c:651
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Hiba történt a(z) „%s” ID3v2 címkéjének frissítésekor (%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 "A(z) „%s” címkéje frissítve"
 
-#: ../src/id3_tag.c:669
+#: ../src/id3_tag.c:684
 msgid "No error reported"
 msgstr "Nem történt hiba"
 
-#: ../src/id3_tag.c:671
+#: ../src/id3_tag.c:686
 msgid "No available memory"
 msgstr "Nincs elérhető memória"
 
-#: ../src/id3_tag.c:673
+#: ../src/id3_tag.c:688
 msgid "No data to parse"
 msgstr "Nincs feldolgozandó adat"
 
-#: ../src/id3_tag.c:675
+#: ../src/id3_tag.c:690
 msgid "Improperly formatted data"
 msgstr "Helytelenül formázott adatok"
 
-#: ../src/id3_tag.c:677
+#: ../src/id3_tag.c:692
 msgid "No buffer to write to"
 msgstr "Nincs írható puffer"
 
-#: ../src/id3_tag.c:679
+#: ../src/id3_tag.c:694
 msgid "Buffer is too small"
 msgstr "A puffer túl kicsi"
 
-#: ../src/id3_tag.c:681
+#: ../src/id3_tag.c:696
 msgid "Invalid frame ID"
 msgstr "Érvénytelen keret azonosító"
 
-#: ../src/id3_tag.c:683
+#: ../src/id3_tag.c:698
 msgid "Requested field not found"
 msgstr "A kért mező nem található"
 
-#: ../src/id3_tag.c:685
+#: ../src/id3_tag.c:700
 msgid "Unknown field type"
 msgstr "Ismeretlen mezőtípus"
 
-#: ../src/id3_tag.c:687
+#: ../src/id3_tag.c:702
 msgid "Tag is already attached to a file"
 msgstr "A címke már csatolva van egy fájlhoz"
 
-#: ../src/id3_tag.c:689
+#: ../src/id3_tag.c:704
 msgid "Invalid tag version"
 msgstr "Érvénytelen címke verzió"
 
-#: ../src/id3_tag.c:691
+#: ../src/id3_tag.c:706
 msgid "No file to parse"
 msgstr "Nincs feldolgozandó fájl"
 
-#: ../src/id3_tag.c:693
+#: ../src/id3_tag.c:708
 msgid "Attempting to write to a read-only file"
 msgstr "Írási kísérlet csak olvasható fájlba"
 
-#: ../src/id3_tag.c:695
+#: ../src/id3_tag.c:710
 msgid "Error in compression/uncompression"
 msgstr "Hiba a tömörítésben/kibontásban"
 
-#: ../src/id3_tag.c:697
+#: ../src/id3_tag.c:712
 msgid "Unknown error message"
 msgstr "Ismeretlen hibaüzenet"
 
-#: ../src/id3_tag.c:1301
+#: ../src/id3_tag.c:1316
 #, c-format
 msgid "Error while creating temporary file: '%s'"
 msgstr "Hiba az átmeneti fájl létrehozása közben: „%s”"
 
-#: ../src/id3_tag.c:1308
+#: ../src/id3_tag.c:1323
 msgid "Error while creating temporary file"
 msgstr "Hiba az átmeneti fájl létrehozása közben"
 
-#: ../src/id3_tag.c:1328
+#: ../src/id3_tag.c:1343
 #, c-format
 msgid "Error while writing to file: '%s' (%s)"
 msgstr "Hiba a fájl írása közben: „%s” (%s)"
@@ -2904,21 +2783,19 @@ msgstr "Hiba a fájl írása közben: „%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 in file '%s' (%s)"
 msgid "Cannot write tag of file ‘%s’ (a byte was missing)"
 msgid_plural "Cannot write tag of file ‘%s’ (%s bytes were missing)"
 msgstr[0] "Nem írható a(z) „%s” fájl címkéje (egy bájt hiányzik)"
 msgstr[1] "Nem írható a(z) „%s” fájl címkéje (%s bájt hiányzik)"
 
-#: ../src/id3v24_tag.c:1525
+#: ../src/id3v24_tag.c:1524
 #, c-format
-#| msgid "Cannot write tag in file '%s'"
 msgid "Cannot save tag of file '%s'"
 msgstr "Nem menthető a(z) „%s” fájl címkéje"
 
-#: ../src/id3v24_tag.c:1536
+#: ../src/id3v24_tag.c:1535
 #, c-format
 msgid "Size error while saving tag of '%s'"
 msgstr "Mérethiba a(z) „%s” címkéjének mentése közben"
@@ -2927,81 +2804,55 @@ msgstr "Mérethiba a(z) „%s” címkéjének mentése közben"
 msgid "Log"
 msgstr "Napló"
 
-# Fájl menü
-#: ../src/misc.c:686
-#| msgid "Delete File"
-msgid "Select File"
-msgstr "Fájl kiválasztása"
-
-#: ../src/misc.c:692
-#| msgid "Select directory…"
-msgid "Select Directory"
-msgstr "Könyvtár kiválasztása"
-
-#: ../src/misc.c:775
-msgid "No audio player defined"
-msgstr "Nincs hanglejátszó meghatározva"
-
-# egyéb menü
-#: ../src/misc.c:776
-msgid "Audio Player Warning"
-msgstr "Hanglejátszó figyelmeztetés"
+#: ../src/misc.c:719
+msgid "You must type a program name"
+msgstr "Meg kell adnia egy programnevet"
 
-#: ../src/misc.c:867
-msgid "Cannot fork another process"
-msgstr "Nem ágaztatható el másik folyamat"
+#: ../src/misc.c:720
+msgid "Program Name Error"
+msgstr "Programnév hiba"
 
-#: ../src/misc.c:873
+#: ../src/misc.c:799
 #, c-format
-msgid "Cannot execute %s (%s)"
-msgstr "A(z) %s nem hajtható végre (%s)"
-
-#. Translators: file size (bytes, kilobytes, megabytes, gigabytes,
-#. * terabytes).
-#: ../src/misc.c:1034 ../src/misc.c:1054
-msgid "B"
-msgstr "B"
-
-#: ../src/misc.c:1034 ../src/misc.c:1054
-#| msgid "B"
-msgid "kB"
-msgstr "kB"
+msgid "Executed command: %s"
+msgstr "Végrehajtott parancs: %s"
 
-#: ../src/misc.c:1034 ../src/misc.c:1054
-msgid "MB"
-msgstr "MB"
+#: ../src/misc.c:806
+#, c-format
+msgid "Failed to launch program: %s"
+msgstr "Nem sikerült indítani a programot: %s"
 
-#: ../src/misc.c:1034 ../src/misc.c:1054
-msgid "GB"
-msgstr "GB"
+# Fájl menü
+#: ../src/misc.c:823
+msgid "Select File"
+msgstr "Fájl kiválasztása"
 
-#: ../src/misc.c:1034 ../src/misc.c:1054
-msgid "TB"
-msgstr "TB"
+#: ../src/misc.c:829
+msgid "Select Directory"
+msgstr "Könyvtár kiválasztása"
 
-#: ../src/misc.c:1133
-#| msgid "Generate a playlist"
+#: ../src/misc.c:1141
 msgid "Generate Playlist"
 msgstr "Lejátszólista előállítása"
 
-#: ../src/misc.c:1157
+#: ../src/misc.c:1165
 msgid "M3U Playlist Name"
 msgstr "M3U lejátszólista neve"
 
-#: ../src/misc.c:1172
+#: ../src/misc.c:1180
 msgid "Use directory name"
 msgstr "Könyvtár nevének használata"
 
 #. Playlist options
-#: ../src/misc.c:1189
+#: ../src/misc.c:1197
 msgid "Playlist Options"
 msgstr "Lejátszólista beállításai"
 
-#: ../src/misc.c:1195
+#: ../src/misc.c:1203
 msgid "Include only the selected files"
 msgstr "Csak a kijelölt fájlokat tartalmazza"
 
-#: ../src/misc.c:1198
+#: ../src/misc.c:1206
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -3009,29 +2860,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:1201
+#: ../src/misc.c:1209
 msgid "Use full path for files in playlist"
 msgstr "Teljes elérési út használata a lejátszólistában"
 
-#: ../src/misc.c:1204
+#: ../src/misc.c:1212
 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:1210
+#: ../src/misc.c:1218
 msgid "Create playlist in the parent directory"
 msgstr "Lejátszólista létrehozása a szülő könyvtárban"
 
-#: ../src/misc.c:1213
+#: ../src/misc.c:1221
 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:1217
+#: ../src/misc.c:1225
 msgid "Use DOS directory separator"
 msgstr "DOS könyvtárelválasztó használata"
 
-#: ../src/misc.c:1223
+#: ../src/misc.c:1231
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -3039,50 +2890,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:1232
+#: ../src/misc.c:1240
 msgid "Playlist Content"
 msgstr "Lejátszólista tartalma"
 
-#: ../src/misc.c:1238
+#: ../src/misc.c:1246
 msgid "Write only list of files"
 msgstr "Csak fájlok listájának írása"
 
-#: ../src/misc.c:1242
+#: ../src/misc.c:1250
 msgid "Write info using filename"
 msgstr "Információk írása a fájlnév használatával"
 
-#: ../src/misc.c:1245
+#: ../src/misc.c:1253
 msgid "Write info using:"
 msgstr "Információk írása ezek használatával:"
 
-#: ../src/misc.c:1464
+#: ../src/misc.c:1467
 #, c-format
 msgid "Cannot write playlist file '%s'"
 msgstr "A(z) „%s” lejátszólista fájl nem írható"
 
-#: ../src/misc.c:1468
+#: ../src/misc.c:1471
 msgid "Playlist File Error"
 msgstr "Lejátszólista fájl hiba"
 
-#: ../src/misc.c:1476
+#: ../src/misc.c:1479
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "A(z) „%s” lejátszólista fájl kiírva"
 
-#: ../src/misc.c:1540 ../src/scan.c:3248 ../src/scan.c:3310
-#| msgid "Invalid Scanner Mask"
+#: ../src/misc.c:1543 ../src/scan.c:3239 ../src/scan.c:3301
 msgid "Invalid scanner mask"
 msgstr "Érvénytelen feldolgozómaszk"
 
-#: ../src/misc.c:1904
+#: ../src/misc.c:1907
 msgid "CD"
 msgstr "CD"
 
-#: ../src/misc.c:1926
+#: ../src/misc.c:1929
 msgid "Find Files"
 msgstr "Fájlok keresése"
 
-#: ../src/misc.c:1958
+#: ../src/misc.c:1961
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -3090,13 +2940,13 @@ msgstr ""
 "megjelenítéséhez."
 
 #. Where...
-#: ../src/misc.c:1964
+#: ../src/misc.c:1967
 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:1969
+#: ../src/misc.c:1972
 msgid "the Filename"
 msgstr "a fájlnévben"
 
@@ -3105,90 +2955,86 @@ 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:1975
+#: ../src/misc.c:1978
 msgid "the Tag"
 msgstr "a címkében"
 
 #. Property of the search
-#: ../src/misc.c:1986 ../src/prefs.c:335
+#: ../src/misc.c:1989 ../src/prefs.c:335
 msgid "Case sensitive"
 msgstr "Kis- és nagybetűs"
 
-#: ../src/misc.c:2213
+#: ../src/misc.c:2216
 msgid "Ready to search…"
 msgstr "Keresésre kész…"
 
-#: ../src/misc.c:2433
+#: ../src/misc.c:2436
 #, c-format
-#| msgid "Found: %d file(s)"
 msgid "Found one file"
 msgid_plural "Found %d files"
 msgstr[0] "Egy fájl található"
 msgstr[1] "%d fájl található"
 
 # egyéb menü
-#: ../src/misc.c:2718
-#| msgid "Load Filenames From Text File…"
+#: ../src/misc.c:2721
 msgid "Load Filenames From a Text File"
 msgstr "Fájlnevek betöltése szövegfájlból"
 
-#: ../src/misc.c:2747
+#: ../src/misc.c:2750
 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:2766
+#: ../src/misc.c:2769
 msgid " Load "
 msgstr " Betöltés "
 
-#: ../src/misc.c:2784
-#| msgid "Content of TXT file"
+#: ../src/misc.c:2787
 msgid "Content of Text File"
 msgstr "A szövegfájl tartalma"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2805 ../src/misc.c:2900
+#: ../src/misc.c:2808 ../src/misc.c:2903
 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:2814 ../src/misc.c:2909
+#: ../src/misc.c:2817 ../src/misc.c:2912
 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:2823 ../src/misc.c:2918 ../src/misc.c:3404
+#: ../src/misc.c:2826 ../src/misc.c:2921 ../src/misc.c:3407
 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:2835 ../src/misc.c:2930
+#: ../src/misc.c:2838 ../src/misc.c:2933
 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:2844 ../src/misc.c:2939
+#: ../src/misc.c:2847 ../src/misc.c:2942
 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:2856 ../src/misc.c:2951 ../src/misc.c:3428
+#: ../src/misc.c:2859 ../src/misc.c:2954 ../src/misc.c:3431
 msgid "Reload"
 msgstr "Újratöltés"
 
-#: ../src/misc.c:2878
-#| msgid "List of files"
+#: ../src/misc.c:2881
 msgid "List of Files"
 msgstr "Fájlok listája"
 
-#: ../src/misc.c:2973
+#: ../src/misc.c:2976
 msgid "Selected line:"
 msgstr "Kijelölt sor:"
 
 # bubble help
-#: ../src/misc.c:2991
+#: ../src/misc.c:2994
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -3197,36 +3043,34 @@ msgstr ""
 "kiválasztott feldolgozó lesz futtatva (a feldolgozóablaknak nyitva kell "
 "lennie)."
 
-#: ../src/misc.c:3078
+#: ../src/misc.c:3081
 #, c-format
-#| msgid "Cannot create file '%s' (%s)"
 msgid "Cannot retrieve file info (%s)"
 msgstr "Nem fogadhatók a fájlinformációk (%s)"
 
-#: ../src/misc.c:3140
+#: ../src/misc.c:3143
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Nem nyitható meg a(z) „%s” fájl (%s)"
 
-#: ../src/misc.c:3176
+#: ../src/misc.c:3179
 #, c-format
-#| msgid "Error reading tags from file: '%s'"
 msgid "Error reading file (%s)"
 msgstr "Hiba a fájl olvasása közben (%s)"
 
-#: ../src/misc.c:3392
+#: ../src/misc.c:3395
 msgid "Insert a blank line"
 msgstr "Üres sor beszúrása"
 
-#: ../src/misc.c:3398
+#: ../src/misc.c:3401
 msgid "Delete this line"
 msgstr "Aktuális sor törlése"
 
-#: ../src/misc.c:3413
+#: ../src/misc.c:3416
 msgid "Move up this line"
 msgstr "Aktuális sor mozgatása fel"
 
-#: ../src/misc.c:3419
+#: ../src/misc.c:3422
 msgid "Move down this line"
 msgstr "Aktuális sor mozgatása le"
 
@@ -3284,7 +3128,6 @@ msgstr "MPEG"
 #. FIXME: Pass error back to calling function.
 #: ../src/ogg_header.c:227
 #, c-format
-#| msgid "Error while opening file: '%s' (%s)."
 msgid "Error while opening file: '%s' (%s)"
 msgstr "Hiba a(z) „%s” fájl megnyitása közben (%s)"
 
@@ -3331,186 +3174,185 @@ 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:186 ../src/ogg_tag.c:739
+#: ../src/ogg_tag.c:249 ../src/ogg_tag.c:872
 #, 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/picture.c:244 ../src/picture.c:269
+#: ../src/ogg_tag.c:1020 ../src/picture.c:1256
 #, c-format
-#| msgid "Picture file not loaded (%s)…"
-msgid "Image file not loaded: %s"
-msgstr "A képfájl nincs betöltve: %s"
+msgid "Error with 'loader_write': %s"
+msgstr "Hiba a „loader_write” közben: %s"
 
-#: ../src/picture.c:261
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1179
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr "Hiba a „loader_close” közben: %s"
+
+#: ../src/picture.c:104
+#, c-format
+msgid "Image file not saved: %s"
+msgstr "A képfájl nincs mentve: %s"
+
+#: ../src/picture.c:154
 #, c-format
 msgid "Cannot open file: '%s'"
 msgstr "Nem nyitható meg a fájl: „%s”"
 
-#: ../src/picture.c:265
-#| msgid "Rename File Error"
+#: ../src/picture.c:158
 msgid "Image File Error"
 msgstr "Képfájl hiba"
 
-#: ../src/picture.c:276
-#| msgid "Picture file loaded…"
+#: ../src/picture.c:162 ../src/picture.c:424
+#, c-format
+msgid "Image file not loaded: %s"
+msgstr "A képfájl nincs betöltve: %s"
+
+#: ../src/picture.c:446
 msgid "Image file loaded"
 msgstr "A képfájl betöltve"
 
-#: ../src/picture.c:334
+#: ../src/picture.c:503
 msgid "Add Images"
 msgstr "Képek hozzáadása"
 
-#: ../src/picture.c:344 ../src/picture.c:700
+#: ../src/picture.c:513 ../src/picture.c:873
 msgid "All Files"
 msgstr "Minden fájl"
 
-#: ../src/picture.c:350 ../src/picture.c:706
+#: ../src/picture.c:519 ../src/picture.c:879
 msgid "PNG and JPEG"
 msgstr "PNG és JPEG"
 
-#: ../src/picture.c:477
+#: ../src/picture.c:650
 #, c-format
-#| msgid "Picture Properties %d/%d"
 msgid "Image Properties %d/%d"
 msgstr "Képtulajdonságok %d/%d"
 
-#: ../src/picture.c:501
+#: ../src/picture.c:674
 msgid "Image Type"
 msgstr "Képtípus"
 
 #. Description of the picture
-#: ../src/picture.c:560
-#| msgid "Description:"
+#: ../src/picture.c:733
 msgid "Image Description:"
 msgstr "Kép leírása:"
 
-#: ../src/picture.c:687
+#: ../src/picture.c:860
 #, c-format
-#| msgid "Save picture %d/%d"
 msgid "Save Image %d/%d"
 msgstr "Kép mentése %d/%d"
 
-#: ../src/picture.c:759
-#, c-format
-#| msgid "Picture file not loaded (%s)…"
-msgid "Image file not saved: %s"
-msgstr "A képfájl nincs mentve: %s"
-
-#: ../src/picture.c:827
+#: ../src/picture.c:1020
 msgid "JPEG image"
 msgstr "JPEG-kép"
 
-#: ../src/picture.c:829
+#: ../src/picture.c:1022
 msgid "PNG image"
 msgstr "PNG-kép"
 
-#: ../src/picture.c:831
+#: ../src/picture.c:1024
+#| msgid "PNG image"
+msgid "GIF image"
+msgstr "GIF-kép"
+
+#: ../src/picture.c:1026
 msgid "Unknown image"
 msgstr "Ismeretlen kép"
 
-#: ../src/picture.c:843
+#: ../src/picture.c:1038
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32 képpontos PNG fájl ikon"
 
-#: ../src/picture.c:845
+#: ../src/picture.c:1040
 msgid "Other file icon"
 msgstr "Egyéb fájl ikon"
 
-#: ../src/picture.c:847
+#: ../src/picture.c:1042
 msgid "Cover (front)"
 msgstr "Borító (első)"
 
-#: ../src/picture.c:849
+#: ../src/picture.c:1044
 msgid "Cover (back)"
 msgstr "Borító (hátsó)"
 
-#: ../src/picture.c:851
+#: ../src/picture.c:1046
 msgid "Leaflet page"
 msgstr "Szórólap oldal"
 
-#: ../src/picture.c:853
+#: ../src/picture.c:1048
 msgid "Media (e.g. label side of CD)"
 msgstr "Média (például a CD címke oldala)"
 
-#: ../src/picture.c:855
+#: ../src/picture.c:1050
 msgid "Lead artist/lead performer/soloist"
 msgstr "Vezető szerző / vezető előadó / szólista"
 
-#: ../src/picture.c:857
+#: ../src/picture.c:1052
 msgid "Artist/performer"
 msgstr "Szerző / előadó"
 
-#: ../src/picture.c:859
+#: ../src/picture.c:1054
 msgid "Conductor"
 msgstr "Karmester"
 
-#: ../src/picture.c:861
+#: ../src/picture.c:1056
 msgid "Band/Orchestra"
 msgstr "Banda / Zenekar"
 
-#: ../src/picture.c:865
+#: ../src/picture.c:1060
 msgid "Lyricist/text writer"
 msgstr "Dalszövegíró / szövegíró"
 
-#: ../src/picture.c:867
+#: ../src/picture.c:1062
 msgid "Recording location"
 msgstr "Felvétel helyszíne"
 
-#: ../src/picture.c:869
+#: ../src/picture.c:1064
 msgid "During recording"
 msgstr "Felvétel közben"
 
-#: ../src/picture.c:871
+#: ../src/picture.c:1066
 msgid "During performance"
 msgstr "Előadás közben"
 
-#: ../src/picture.c:873
+#: ../src/picture.c:1068
 msgid "Movie/video screen capture"
 msgstr "Film / videófelvétel"
 
-#: ../src/picture.c:875
+#: ../src/picture.c:1070
 msgid "A bright colored fish"
 msgstr "Egy világos színes hal"
 
-#: ../src/picture.c:877
+#: ../src/picture.c:1072
 msgid "Illustration"
 msgstr "Illusztráció"
 
-#: ../src/picture.c:879
+#: ../src/picture.c:1074
 msgid "Band/Artist logotype"
 msgstr "Banda / Előadó logója"
 
-#: ../src/picture.c:881
+#: ../src/picture.c:1076
 msgid "Publisher/studio logotype"
 msgstr "Kiadó / stúdió logója"
 
-#: ../src/picture.c:885
-#| msgid "Unknown image"
+#: ../src/picture.c:1080
 msgid "Unknown image type"
 msgstr "Ismeretlen képtípus"
 
-#: ../src/picture.c:915 ../src/picture.c:926
+#: ../src/picture.c:1110 ../src/picture.c:1121
 msgid "pixels"
 msgstr "képpont"
 
-#: ../src/picture.c:916 ../src/picture.c:927
+#: ../src/picture.c:1111 ../src/picture.c:1122
 msgid "Type"
 msgstr "Típus"
 
-#: ../src/picture.c:928
+#: ../src/picture.c:1123
 msgid "Description"
 msgstr "Leírás"
 
-#: ../src/picture.c:984
-#, c-format
-msgid "Error with 'loader_close': %s"
-msgstr "Hiba a „loader_close” közben: %s"
-
-#: ../src/picture.c:1044
-#| msgid ""
-#| "Cannot display the picture, as not enough data has been read to determine "
-#| "how to create the image buffer."
+#: ../src/picture.c:1239
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
@@ -3518,30 +3360,21 @@ 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:1051
-#| msgid "Cannot display the picture"
+#: ../src/picture.c:1246
 msgid "Cannot display the image"
 msgstr "Nem jeleníthető meg a kép"
 
-#: ../src/picture.c:1053
-#| msgid ""
-#| "Not enough data has been read to determine how to create the image buffer"
+#: ../src/picture.c:1248
 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:1055
-#| msgid "Load Picture File"
+#: ../src/picture.c:1250
 msgid "Load Image File"
 msgstr "Képfájl betöltése"
 
-#: ../src/picture.c:1061
-#, c-format
-msgid "Error with 'loader_write': %s"
-msgstr "Hiba a „loader_write” közben: %s"
-
 # Ikon megjegyzés
 #. Label
 #: ../src/prefs.c:152
@@ -3661,12 +3494,10 @@ msgid "Sort the file list by:"
 msgstr "Fájllista rendezése:"
 
 #: ../src/prefs.c:278
-#| msgid "Ascending file name"
 msgid "Ascending filename"
 msgstr "Fájlnév szerint növekvően"
 
 #: ../src/prefs.c:280
-#| msgid "Descending file name"
 msgid "Descending filename"
 msgstr "Fájlnév szerint csökkenően"
 
@@ -3687,12 +3518,10 @@ msgid "Descending artist"
 msgstr "Előadó szerint csökkenően"
 
 #: ../src/prefs.c:286
-#| msgid "Ascending by album artist"
 msgid "Ascending album artist"
 msgstr "Album előadó szerint növekvően"
 
 #: ../src/prefs.c:288
-#| msgid "Descending by album artist"
 msgid "Descending album artist"
 msgstr "Album előadó szerint csökkenően"
 
@@ -3713,12 +3542,10 @@ msgid "Descending year"
 msgstr "Év szerint csökkenően"
 
 #: ../src/prefs.c:294
-#| msgid "Ascending track number"
 msgid "Ascending disc number"
 msgstr "Lemezszám szerint növekvően"
 
 #: ../src/prefs.c:296
-#| msgid "Descending track number"
 msgid "Descending disc number"
 msgstr "Lemezszám szerint csökkenően"
 
@@ -3747,52 +3574,42 @@ msgid "Descending comment"
 msgstr "Megjegyzés szerint csökkenően"
 
 #: ../src/prefs.c:306
-#| msgid "Ascending by composer"
 msgid "Ascending composer"
 msgstr "Zeneszerző szerint növekvően"
 
 #: ../src/prefs.c:308
-#| msgid "Descending by composer"
 msgid "Descending composer"
 msgstr "Zeneszerző szerint csökkenően"
 
 #: ../src/prefs.c:310
-#| msgid "Ascending by original artist"
 msgid "Ascending original artist"
 msgstr "Eredeti előadó szerint növekvően"
 
 #: ../src/prefs.c:312
-#| msgid "Descending by original artist"
 msgid "Descending original artist"
 msgstr "Eredeti előadó szerint csökkenően"
 
 #: ../src/prefs.c:314
-#| msgid "Ascending by copyright"
 msgid "Ascending copyright"
 msgstr "Szerzői jog szerint növekvően"
 
 #: ../src/prefs.c:316
-#| msgid "Descending by copyright"
 msgid "Descending copyright"
 msgstr "Szerzői jog szerint csökkenően"
 
 #: ../src/prefs.c:318
-#| msgid "Ascending by URL"
 msgid "Ascending URL"
 msgstr "URL szerint növekvően"
 
 #: ../src/prefs.c:320
-#| msgid "Descending by URL"
 msgid "Descending URL"
 msgstr "URL szerint csökkenően"
 
 #: ../src/prefs.c:322
-#| msgid "Ascending by encoder name"
 msgid "Ascending encoded by"
 msgstr "Kódoló neve szerint növekvően"
 
 #: ../src/prefs.c:324
-#| msgid "Descending by encoder name"
 msgid "Descending encoded by"
 msgstr "Kódoló neve szerint csökkenően"
 
@@ -3959,7 +3776,6 @@ msgstr ""
 
 #. Character Set for Filename
 #: ../src/prefs.c:481
-#| msgid "Character Set for File Name"
 msgid "Character Set for Filename"
 msgstr "Karakterkészlet a fájlnévhez"
 
@@ -4062,7 +3878,6 @@ msgstr ""
 "Egyébként megtartja a „nyers” szám értéket."
 
 #: ../src/prefs.c:578
-#| msgid "Write the track field with the following number of digits:"
 msgid "Write the disc field with the following number of digits:"
 msgstr "A szám mező írása a következő számú számjegyekkel:"
 
@@ -4123,11 +3938,6 @@ msgstr "Címkék törlése, ha minden mező üresre van állítva"
 
 # bubble help
 #: ../src/prefs.c:694
-#| msgid ""
-#| "As ID3v2 tags may contain other data than Title, Artist, Album, Year, "
-#| "Track, Genre or Comment (as an attached picture, lyrics…), this option "
-#| "allows you to strip the whole tag when these seven standard data fields "
-#| "have been set to blank."
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached image, lyrics…), this option allows you to "
@@ -4508,7 +4318,6 @@ msgstr "Kiszolgáló beállítások a kézi kereséshez"
 
 #. Local access for CDDB (Automatic Search)
 #: ../src/prefs.c:1242
-#| msgid "Use local CDDB"
 msgid "Local CDDB"
 msgstr "Helyi CD-adatbázis"
 
@@ -4517,21 +4326,16 @@ msgid "Path:"
 msgstr "Útvonal:"
 
 #: ../src/prefs.c:1262
-#| msgid ""
-#| "Specify the directory where the local CD database is located. The local "
-#| "CD data base contains the eleven following directories 'blues', "
-#| "'classical', 'country', 'data', 'folk', 'jazz', 'newage', 'reggae', "
-#| "'rock', 'soundtrack' and 'misc'."
 msgid ""
 "Specify the directory where the local CD database is located. The local CD "
 "database contains the eleven following directories 'blues', 'classical', "
 "'country', 'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' "
 "and 'misc'."
 msgstr ""
-"Adja meg azt a könyvtárat, ahol a helyi CD-adatbázis található. A helyi "
-"CD-adatbázis tartalmazza a következő tizenegy könyvtárat: „blues”, "
-"„classical”, „country”, „data”, „folk”, „jazz”, „newage”, „reggae”, „rock”, "
-"„soundtrack” és „misc”."
+"Adja meg azt a könyvtárat, ahol a helyi CD-adatbázis található. A helyi CD-"
+"adatbázis tartalmazza a következő tizenegy könyvtárat: „blues”, „classical”, "
+"„country”, „data”, „folk”, „jazz”, „newage”, „reggae”, „rock”, „soundtrack” "
+"és „misc”."
 
 #. CDDB Proxy Settings
 #: ../src/prefs.c:1288
@@ -4659,7 +4463,6 @@ msgstr "(Például: %.*d_-_Szam_neve_1.mp3)"
 #. Translators: please do NOT translate '%.*d' in this string.
 #: ../src/prefs.c:1471
 #, c-format
-#| msgid "(Example: %.*d_-_Track_name_1.mp3)"
 msgid "(Example: disc_%.*d_of_10/Track_name_1.mp3)"
 msgstr "(Például: lemez_%.*d_of_10/Szam_neve_1.mp3)"
 
@@ -4671,13 +4474,13 @@ msgstr "A beállítások elmentve"
 msgid "Configuration unchanged"
 msgstr "A beállítások nem változtak"
 
-#: ../src/prefs.c:1707
+#: ../src/prefs.c:1712
 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:1708
+#: ../src/prefs.c:1714
 #, c-format
 msgid ""
 "Path: '%s'\n"
@@ -4686,106 +4489,97 @@ msgstr ""
 "Útvonal: „%s”\n"
 "Hiba: %s"
 
-#: ../src/prefs.c:1709
+#: ../src/prefs.c:1716
 msgid "Invalid Path Error"
 msgstr "Érvénytelen útvonal hiba"
 
-#: ../src/prefs.c:1823
+#: ../src/prefs.c:1830
 #, 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:1825
+#: ../src/prefs.c:1832
 msgid "Audio Player Error"
 msgstr "Zenelejátszó hiba"
 
-#: ../src/scan.c:181
+#: ../src/scan.c:180
 msgid "Fill Tag"
 msgstr "Címke kitöltése"
 
-#: ../src/scan.c:359
+#: ../src/scan.c:358
 #, c-format
-#| msgid "Cannot create or open file '%s' (%s)"
 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:374
-#| msgid "Tag successfully scanned…"
+#: ../src/scan.c:373
 msgid "Tag successfully scanned"
 msgstr "A címke sikeresen feldolgozva"
 
-#: ../src/scan.c:376
+#: ../src/scan.c:375
 #, c-format
-#| msgid "Tag successfully scanned…(%s)"
 msgid "Tag successfully scanned: %s"
 msgstr "A címke sikeresen feldolgozva: %s"
 
-#: ../src/scan.c:417
+#: ../src/scan.c:416
 #, 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:499 ../src/scan.c:528
+#: ../src/scan.c:498 ../src/scan.c:527
 #, 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:715
-#| msgid "New file name successfully scanned…"
+#: ../src/scan.c:714
 msgid "New filename successfully scanned"
 msgstr "Az új fájlnév sikeresen feldolgozva"
 
-#: ../src/scan.c:718
+#: ../src/scan.c:717
 #, c-format
-#| msgid "New file name successfully scanned…(%s)"
 msgid "New filename successfully scanned: %s"
 msgstr "Az új fájlnév sikeresen feldolgozva: %s"
 
-#: ../src/scan.c:1818
+#: ../src/scan.c:1821
 #, c-format
 msgid "Error while processing fields: %s"
 msgstr "Hiba a mezők feldolgozása közben: %s"
 
 #. The window
-#: ../src/scan.c:2337
+#: ../src/scan.c:2328
 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:2346
-#| msgid "Scan files"
+#: ../src/scan.c:2337
 msgid "Scan Files"
 msgstr "Fájlok vizsgálata"
 
 #. Option Menu
-#: ../src/scan.c:2374
+#: ../src/scan.c:2365
 msgid "Scanner:"
 msgstr "Feldolgozó: "
 
-#: ../src/scan.c:2395
+#: ../src/scan.c:2386
 msgid "Select the type of scanner to use"
 msgstr "A használandó feldolgozó típusának kiválasztása"
 
-#: ../src/scan.c:2404
+#: ../src/scan.c:2395
 msgid "Scanner Preferences"
 msgstr "Feldolgozó beállítások"
 
-#: ../src/scan.c:2413
+#: ../src/scan.c:2404
 msgid "Show / Hide Masks Editor"
 msgstr "Maszkszerkesztő megjelenítése / elrejtése"
 
-#: ../src/scan.c:2423
+#: ../src/scan.c:2414
 msgid "Show / Hide Legend"
 msgstr "Jelmagyarázat megjelenítése / elrejtése"
 
-#: ../src/scan.c:2453
-#| msgid ""
-#| "Select or type in a mask using codes (see Legend) to parse file name and "
-#| "path. Used to fill in tag fields."
+#: ../src/scan.c:2444
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse filename and "
 "path. Used to fill in tag fields"
@@ -4795,17 +4589,16 @@ msgstr ""
 "a címkemezők kitöltéséhez."
 
 #. Preview label
-#: ../src/scan.c:2477
-#| msgid "Fill tag preview…"
+#: ../src/scan.c:2468
 msgid "Fill tag preview"
 msgstr "Címke kitöltése előnézet"
 
 # bubble help
-#: ../src/scan.c:2507
+#: ../src/scan.c:2498
 msgid "Prefix mask with current path"
 msgstr "Előtag maszk a jelenlegi útvonallal"
 
-#: ../src/scan.c:2521
+#: ../src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4819,17 +4612,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:2546
-#| msgid "Rename file preview…"
+#: ../src/scan.c:2537
 msgid "Rename file preview"
 msgstr "Fájl átnevezése előnézet"
 
-#: ../src/scan.c:2565
+#: ../src/scan.c:2556
 msgid "Select fields:"
 msgstr "Mezők kijelölése:"
 
 # bubble help
-#: ../src/scan.c:2568
+#: ../src/scan.c:2559
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those which interest you"
@@ -4838,148 +4630,147 @@ msgstr ""
 "dolgozni. Válassza ki azokat, amelyek érdeklik."
 
 #. Advice for Translators: set the first letter of filename translated
-#: ../src/scan.c:2572
+#: ../src/scan.c:2563
 msgid "F"
 msgstr "F"
 
 # bubble help
-#: ../src/scan.c:2574
-#| msgid "Process file name field"
+#: ../src/scan.c:2565
 msgid "Process filename field"
 msgstr "Fájlnév mező feldolgozása"
 
 #. Advice for Translators: set the first letter of title translated
-#: ../src/scan.c:2576
+#: ../src/scan.c:2567
 msgid "T"
 msgstr "C"
 
 # bubble help
-#: ../src/scan.c:2577
+#: ../src/scan.c:2568
 msgid "Process title field"
 msgstr "A cím mező feldolgozása"
 
 #. Advice for Translators: set the first letter of artist translated
-#: ../src/scan.c:2579
+#: ../src/scan.c:2570
 msgid "Ar"
 msgstr "E"
 
 # bubble help
-#: ../src/scan.c:2580
+#: ../src/scan.c:2571
 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:2582
+#: ../src/scan.c:2573
 msgid "AA"
 msgstr "AE"
 
 # bubble help
-#: ../src/scan.c:2583
+#: ../src/scan.c:2574
 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:2585
+#: ../src/scan.c:2576
 msgid "Al"
 msgstr "A"
 
 # bubble help
-#: ../src/scan.c:2586
+#: ../src/scan.c:2577
 msgid "Process album field"
 msgstr "Az album mező feldolgozása"
 
 #. Advice for Translators: set the first letter of genre translated
-#: ../src/scan.c:2588
+#: ../src/scan.c:2579
 msgid "G"
 msgstr "M"
 
 # bubble help
-#: ../src/scan.c:2589
+#: ../src/scan.c:2580
 msgid "Process genre field"
 msgstr "A műfaj mező feldolgozása"
 
 #. Advice for Translators: set the first letter of comment translated
-#: ../src/scan.c:2591
+#: ../src/scan.c:2582
 msgid "Cm"
 msgstr "MJ"
 
 # bubble help
-#: ../src/scan.c:2592
+#: ../src/scan.c:2583
 msgid "Process comment field"
 msgstr "A megjegyzés mező feldolgozása"
 
 #. Advice for Translators: set the first letter of composer translated
-#: ../src/scan.c:2594
+#: ../src/scan.c:2585
 msgid "Cp"
 msgstr "Z"
 
 # bubble help
-#: ../src/scan.c:2595
+#: ../src/scan.c:2586
 msgid "Process composer field"
 msgstr "A zeneszerző mező feldolgozása"
 
 #. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan.c:2597
+#: ../src/scan.c:2588
 msgid "O"
 msgstr "EE"
 
 # bubble help
-#: ../src/scan.c:2598
+#: ../src/scan.c:2589
 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:2600
+#: ../src/scan.c:2591
 msgid "Cr"
 msgstr "Sz"
 
 # bubble help
-#: ../src/scan.c:2601
+#: ../src/scan.c:2592
 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:2603
+#: ../src/scan.c:2594
 msgid "U"
 msgstr "U"
 
 # bubble help
-#: ../src/scan.c:2604
+#: ../src/scan.c:2595
 msgid "Process URL field"
 msgstr "Az URL mező feldolgozása"
 
 #. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan.c:2606
+#: ../src/scan.c:2597
 msgid "E"
 msgstr "K"
 
 # bubble help
-#: ../src/scan.c:2607
+#: ../src/scan.c:2598
 msgid "Process encoder name field"
 msgstr "A kódoló neve mező feldolgozása"
 
-#: ../src/scan.c:2651
+#: ../src/scan.c:2642
 msgid "Invert selection"
 msgstr "Kijelölés megfordítása"
 
-#: ../src/scan.c:2658
+#: ../src/scan.c:2649
 msgid "Select/Unselect all"
 msgstr "Összes kijelölése / Kijelölés megszüntetése"
 
-#: ../src/scan.c:2673
+#: ../src/scan.c:2664
 msgid "Convert:"
 msgstr "Átalakítás:"
 
-#: ../src/scan.c:2675
+#: ../src/scan.c:2666
 msgid "to: "
 msgstr "ebbe: "
 
-#: ../src/scan.c:2682
+#: ../src/scan.c:2673
 msgid "Do not convert"
 msgstr "Ne alakítsa át"
 
 # bubble help
-#: ../src/scan.c:2701
+#: ../src/scan.c:2692
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4989,7 +4780,7 @@ msgstr ""
 "bejegyzés tartalmában”."
 
 # bubble help
-#: ../src/scan.c:2704
+#: ../src/scan.c:2695
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4997,41 +4788,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:2707
+#: ../src/scan.c:2698
 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:2714
+#: ../src/scan.c:2705
 msgid "Capitalize all"
 msgstr "Összes nagy kezdőbetűsre"
 
-#: ../src/scan.c:2716
-#| msgid "Lower Case"
+#: ../src/scan.c:2707
 msgid "Lowercase all"
 msgstr "Összes kisbetűsre"
 
-#: ../src/scan.c:2718
+#: ../src/scan.c:2709
 msgid "Capitalize first letter"
 msgstr "Első betű nagybetűsre"
 
-#: ../src/scan.c:2720
-#| msgid "First letter uppercase of each word"
+#: ../src/scan.c:2711
 msgid "Capitalize the first letter of each word"
 msgstr "Minden szó első betűje legyen nagybetű"
 
-#: ../src/scan.c:2721
+#: ../src/scan.c:2712
 msgid "Detect Roman numerals"
 msgstr "Római számok felismerése"
 
-#: ../src/scan.c:2723
+#: ../src/scan.c:2714
 msgid "Do not change capitalization"
 msgstr "Ne változtassa meg a kis- és nagybetűket"
 
 # bubble help
-#: ../src/scan.c:2745
+#: ../src/scan.c:2736
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -5040,7 +4829,7 @@ msgstr ""
 "EGY bejegyzésben”, utána: „SZÖVEG EGY BEJEGYZÉSBEN”."
 
 # bubble help
-#: ../src/scan.c:2748
+#: ../src/scan.c:2739
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -5049,7 +4838,7 @@ msgstr ""
 "EGY bejegyzésben”, utána: „szöveg egy bejegyzésben”."
 
 # bubble help
-#: ../src/scan.c:2751
+#: ../src/scan.c:2742
 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'."
@@ -5058,7 +4847,7 @@ msgstr ""
 "„Szöveg EGY Bejegyzésben”, utána: „Szöveg egy bejegyzésben”."
 
 # bubble help
-#: ../src/scan.c:2754
+#: ../src/scan.c:2745
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -5067,7 +4856,7 @@ msgstr ""
 "előtte: „Szöveg egy BEJEGYZÉSBEN”, utána: „Szöveg Egy Bejegyzésben”."
 
 # bubble help
-#: ../src/scan.c:2757
+#: ../src/scan.c:2748
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -5075,22 +4864,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:2765
-#| msgid "Insert space before uppercase letter"
+#: ../src/scan.c:2756
 msgid "Insert a space before uppercase letters"
 msgstr "Szóköz beszúrása minden nagybetű elé"
 
-#: ../src/scan.c:2767
-#| msgid "Remove duplicate spaces or underscores"
+#: ../src/scan.c:2758
 msgid "Remove duplicate spaces and underscores"
 msgstr "Dupla szóközök és alsóvonások eltávolítása"
 
-#: ../src/scan.c:2769
+#: ../src/scan.c:2760
 msgid "Do not change word separators"
 msgstr "Ne változtassa meg a szóelválasztókat"
 
 # bubble help
-#: ../src/scan.c:2783
+#: ../src/scan.c:2774
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -5099,7 +4886,7 @@ msgstr ""
 "Bejegyzésben”, utána: „SzövegEgyBejegyzésben”."
 
 # bubble help
-#: ../src/scan.c:2786
+#: ../src/scan.c:2777
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -5108,10 +4895,7 @@ msgstr ""
 "„SzövegEgyBejegyzésben”, utána: „Szöveg Egy Bejegyzésben”."
 
 # bubble help
-#: ../src/scan.c:2789
-#| msgid ""
-#| "Duplicated spaces or underscores are removed. Example, before: "
-#| "'Text__In__An   Entry', after: 'Text_In_An Entry'."
+#: ../src/scan.c:2780
 msgid ""
 "Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -5122,142 +4906,141 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2796
+#: ../src/scan.c:2787
 msgid "Legend"
 msgstr "Jelmagyarázat"
 
-#: ../src/scan.c:2802
+#: ../src/scan.c:2793
 #, c-format
 msgid "%a: artist"
 msgstr "%a: előadó"
 
-#: ../src/scan.c:2805
+#: ../src/scan.c:2796
 msgid "%z: album artist"
 msgstr "%z: album előadó"
 
-#: ../src/scan.c:2808
+#: ../src/scan.c:2799
 msgid "%b: album"
 msgstr "%b: album"
 
-#: ../src/scan.c:2811
+#: ../src/scan.c:2802
 #, c-format
 msgid "%c: comment"
 msgstr "%c: megjegyzés"
 
-#: ../src/scan.c:2814
+#: ../src/scan.c:2805
 #, c-format
 msgid "%p: composer"
 msgstr "%p: zeneszerző"
 
-#: ../src/scan.c:2817
+#: ../src/scan.c:2808
 msgid "%r: copyright"
 msgstr "%r: szerzői jog"
 
-#: ../src/scan.c:2820
+#: ../src/scan.c:2811
 #, c-format
 msgid "%d: disc number"
 msgstr "%d: lemez száma"
 
-#: ../src/scan.c:2823
+#: ../src/scan.c:2814
 #, c-format
 msgid "%e: encoded by"
 msgstr "%e: kódoló neve"
 
-#: ../src/scan.c:2826
+#: ../src/scan.c:2817
 #, c-format
 msgid "%g: genre"
 msgstr "%g: műfaj"
 
-#: ../src/scan.c:2829
+#: ../src/scan.c:2820
 #, c-format
 msgid "%i: ignored"
 msgstr "%i: mellőzött"
 
-#: ../src/scan.c:2832
+#: ../src/scan.c:2823
 msgid "%l: number of tracks"
 msgstr "%l: sávok száma"
 
-#: ../src/scan.c:2835
+#: ../src/scan.c:2826
 #, c-format
 msgid "%o: orig. artist"
 msgstr "%o: eredeti előadó"
 
-#: ../src/scan.c:2838
+#: ../src/scan.c:2829
 #, c-format
 msgid "%n: track"
 msgstr "%n: szám"
 
-#: ../src/scan.c:2841
+#: ../src/scan.c:2832
 msgid "%t: title"
 msgstr "%t: cím"
 
-#: ../src/scan.c:2844
+#: ../src/scan.c:2835
 #, c-format
 msgid "%u: URL"
 msgstr "%u: URL"
 
-#: ../src/scan.c:2847
+#: ../src/scan.c:2838
 #, c-format
-#| msgid "%l: number of tracks"
 msgid "%x: number of discs"
 msgstr "%x: lemezek száma"
 
-#: ../src/scan.c:2850
+#: ../src/scan.c:2841
 msgid "%y: year"
 msgstr "%y: év"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2857
+#: ../src/scan.c:2848
 msgid "Mask Editor"
 msgstr "Maszkszerkesztő"
 
-#: ../src/scan.c:2911
+#: ../src/scan.c:2902
 msgid "Create New Mask"
 msgstr "Új maszk létrehozása"
 
-#: ../src/scan.c:2921
+#: ../src/scan.c:2912
 msgid "Move Up this Mask"
 msgstr "Maszk felfelé mozgatása"
 
-#: ../src/scan.c:2931
+#: ../src/scan.c:2922
 msgid "Move Down this Mask"
 msgstr "Maszk lefelé mozgatása"
 
-#: ../src/scan.c:2941
+#: ../src/scan.c:2932
 msgid "Duplicate Mask"
 msgstr "Maszk kettőzése"
 
-#: ../src/scan.c:2951
+#: ../src/scan.c:2942
 msgid "Add Default Masks"
 msgstr "Alapértelmezett maszkok hozzáadása"
 
-#: ../src/scan.c:2961
+#: ../src/scan.c:2952
 msgid "Remove Mask"
 msgstr "Maszk eltávolítása"
 
-#: ../src/scan.c:2971
+#: ../src/scan.c:2962
 msgid "Save Masks"
 msgstr "Maszkok mentése"
 
-#: ../src/scan.c:3551
+#: ../src/scan.c:3542
 msgid "New_mask"
 msgstr "Új_maszk"
 
-#: ../src/scan.c:3590
+#: ../src/scan.c:3581
 msgid "Copy: No row selected"
 msgstr "Másolás: Nincs kijelölt sor"
 
-#: ../src/scan.c:3683
+#: ../src/scan.c:3674
 msgid "Remove: No row selected"
 msgstr "Eltávolítás: Nincs kijelölt sor"
 
-#: ../src/scan.c:3730
+#: ../src/scan.c:3721
 msgid "Move Up: No row selected"
 msgstr "Felfelé mozgatás: Nincs kijelölt sor"
 
-#: ../src/scan.c:3774
+#: ../src/scan.c:3765
 msgid "Move Down: No row selected"
 msgstr "Lefelé mozgatás: Nincs kijelölt sor"
 
@@ -5268,123 +5051,152 @@ msgstr "Hiba: A beállító fájl nem írható: %s (%s)"
 
 #: ../src/setting.c:944 ../src/setting.c:961 ../src/setting.c:981
 #, c-format
-#| msgid "Error while writing to file: '%s' (%s)"
 msgid "Error while writing configuration file: %s"
 msgstr "Hiba a beállítófájl írása közben: %s"
 
-#: ../src/setting.c:1104
+#: ../src/setting.c:1100
 #, c-format
 msgid "Cannot open configuration file '%s' (%s)"
 msgstr "A(z) „%s” beállító fájl nem nyitható meg (%s)"
 
-#: ../src/setting.c:1106
+#: ../src/setting.c:1102
 msgid "Loading default configuration"
 msgstr "Alapértelmezett beállítások betöltése"
 
-#: ../src/setting.c:1147
+#: ../src/setting.c:1143
 #, c-format
 msgid "Cannot create or open file '%s' (%s)"
 msgstr "Nem hozható létre vagy nem nyitható meg a fájl: „%s” (%s)"
 
-#: ../src/setting.c:1207
+#: ../src/setting.c:1203
 #, c-format
 msgid "Error: Cannot write list to file: %s (%s)"
 msgstr "Hiba: A lista nem írható fájlba: %s (%s)"
 
-#: ../src/setting.c:1225
+#: ../src/setting.c:1221
 #, c-format
-#| msgid "Error while writing to file: '%s' (%s)"
 msgid "Error while writing list file: %s"
 msgstr "Hiba a listafájl írása közben: %s"
 
 #. Fall back to defaults
-#: ../src/setting.c:1305
+#: ../src/setting.c:1301
 msgid "Loading default 'Fill Tag' masks…"
 msgstr "Alapértelmezett „Címke kitöltése” maszkok betöltése…"
 
 #. Fall back to defaults
-#: ../src/setting.c:1335
+#: ../src/setting.c:1331
 msgid "Loading default 'Rename File' masks…"
 msgstr "Alapértelmezett „Fájl átnevezése” maszkok betöltése…"
 
 #. Fall back to defaults
-#: ../src/setting.c:1361
+#: ../src/setting.c:1357
 msgid "Loading default 'Rename Directory' masks…"
 msgstr "Alapértelmezett „Könyvtár átnevezése” maszkok betöltése…"
 
-#: ../src/setting.c:1572
+#: ../src/setting.c:1568
 #, c-format
 msgid "Migrating configuration from directory '%s' to '%s'"
 msgstr "A beállítások költöztetése a(z) „%s” könyvtárból ide: „%s”"
 
-#: ../src/setting.c:1596
+#: ../src/setting.c:1592
 #, c-format
 msgid "Failed to migrate configuration file '%s'"
 msgstr "A(z) „%s” beállítófájl költöztetése nem sikerült"
 
-#: ../src/setting.c:1633
+#: ../src/setting.c:1629
 #, c-format
 msgid "Error: Cannot create directory '%s' (%s)"
 msgstr "Hiba: Nem lehet létrehozni a könyvtárat: „%s” (%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 "A(z) „%s” DLL még nincs betöltve. Betöltés megpróbálása…"
+#~ 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…"
 
-#. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: ../src/win32/win32dep.c:130
-#, c-format
-msgid "DLL '%s' could not be loaded"
-msgstr "A(z) „%s” DLL nem tölthető be"
+#~ msgid "DLL '%s' could not be loaded"
+#~ msgstr "A(z) „%s” DLL nem tölthető be"
 
-#. 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 "A(z) „%s” ezen verziója tartalmazza ezt: „%s”"
+#~ msgid "This version of '%s' contains '%s'"
+#~ msgstr "A(z) „%s” ezen verziója tartalmazza ezt: „%s”"
 
-#. 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 "A(z) „%s” függvény nem található a(z) „%s” DLL-ben"
+#~ msgid "Function '%s' not found in DLL '%s'"
+#~ msgstr "A(z) „%s” függvény nem található a(z) „%s” DLL-ben"
 
-#. 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 "Az EasyTAG beállítási könyvtára: „%s”"
+#~ msgid "EasyTAG settings directory: '%s'"
+#~ msgstr "Az EasyTAG beállítási könyvtára: „%s”"
 
-#. Log_Print(_("weasytag_init start..."));
-#: ../src/win32/win32dep.c:472
-#, c-format
-msgid "weasytag_init start..."
-msgstr "weasytag_init indul…"
+#~ msgid "weasytag_init start..."
+#~ msgstr "weasytag_init indul…"
 
-#. 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 "GLib verzió: %u.%u.%u\n"
+#~ msgid "GLib version: %u.%u.%u\n"
+#~ msgstr "GLib verzió: %u.%u.%u\n"
 
-#. Set Environmental Variables
-#. Log_Print(_("weasytag_init end..."));
-#: ../src/win32/win32dep.c:496
-#, c-format
-msgid "weasytag_init end..."
-msgstr "weasytag_init vége…"
+#~ msgid "weasytag_init end..."
+#~ msgstr "weasytag_init vége…"
 
 # egyéb menü
-#. Log_Print(_("Audio player: '%s'"), player);
-#: ../src/win32/win32dep.c:620
-#, c-format
-msgid "Audio player: '%s'"
-msgstr "Zenelejátszó: „%s”"
+#~ msgid "Audio player: '%s'"
+#~ msgstr "Zenelejátszó: „%s”"
+
+#~ msgid "The program '%s' cannot be found"
+#~ msgstr "A(z) „%s” program nem található"
+
+#~ msgid "Cannot execute %s (error %d)\n"
+#~ msgstr "A(z) „%s” nem hajtható végre (hiba %d)\n"
+
+#~ msgid "Cannot fork another process\n"
+#~ msgstr "Nem ágaztatható el másik folyamat\n"
+
+#~ msgid "EasyTAG version %s: Abnormal exit (PID: %d)"
+#~ msgstr "EasyTAG verzió %s: Rendellenes kilépés (PID: %d)"
+
+#~| msgid "Received signal %s (%d)"
+#~ msgid "Received signal '%s' (%d)"
+#~ msgstr "„%s” szignál fogadva (%d)"
+
+#~ 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 ""
+#~ "Valószínűleg egy hibát talált az EasyTAG programban. Kérjük küldje el a "
+#~ "hibajelentést egy GDB visszavezetéssel („gdb easytag core” majd „bt” és "
+#~ "„l”) és a hiba újra előidézéséhez szükséges információkkal erre a címre: "
+#~ "%s"
+
+#~ msgid "EasyTAG version %s: Abnormal exit (PID: %d)."
+#~ msgstr "EasyTAG verzió %s: Rendellenes kilépés (PID: %d)."
+
+#~| msgid "Cannot create or open file '%s' (%s)"
+#~ msgid "Cannot change the permissions of file '%s' (%s)"
+#~ msgstr "Nem változtathatók meg a(z) „%s” fájl jogosultságai (%s)"
+
+#~ msgid "No audio player defined"
+#~ msgstr "Nincs hanglejátszó meghatározva"
+
+# egyéb menü
+#~ msgid "Audio Player Warning"
+#~ msgstr "Hanglejátszó figyelmeztetés"
+
+#~ msgid "Cannot fork another process"
+#~ msgstr "Nem ágaztatható el másik folyamat"
+
+#~ msgid "Cannot execute %s (%s)"
+#~ msgstr "A(z) %s nem hajtható végre (%s)"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~| msgid "B"
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB"
+#~ msgstr "MB"
+
+#~ msgid "GB"
+#~ msgstr "GB"
+
+#~ msgid "TB"
+#~ msgstr "TB"
 
 #~ msgid ""
 #~ "\n"
diff --git a/po/it.po b/po/it.po
index 1658cfc..85f38a5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,1394 +1,1312 @@
-# translation of easytag-2.0.2it.po to italiano
-# translation of EasyTAG to italiano
-# Copyright (C) 2001-2005, 2006, 2007 Free Software Foundation, Inc.
-# Lorenzo Cappelletti <lorenzo.cappellettiATemail.it>, 2001, 2002, 2003.
-# Michele G. <micheleATmr-miky.com>, 2005.
-# Grazie a  Vincenzo Reale <smart2128ATbaslug.org> per i suoi suggerimenti.
-# Kostantino <ciclope10ATalice.it>, 2006, 2007.
-# Kostantino <ciclope10ATalice.it>, 2007.
+# Italian translation of easytag.
+# Copyright (C) 2014
+# This file is distributed under the same license as the easytag package.
+# Gianvito Cavasoli <gianvito at gmx.it>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: easytag-2.0.2it\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 21:49+0000\n"
-"PO-Revision-Date: 2007-05-04 19:37+0200\n"
-"Last-Translator: Kostantino <ciclope10ATalice.it>\n"
-"Language-Team: italiano <it at li.org>\n"
-"Language: \n"
+"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-08 03:19+0000\n"
+"PO-Revision-Date: 2014-04-08 16:07+0200\n"
+"Last-Translator: Gianvito Cavasoli <gianvito at gmx.it>\n"
+"Language-Team: Italiano <gnome-it-list at gnome.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"First-Translator: Lorenzo Cappelletti <lorenzo.cappellettiATemail.it>\n"
-"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 
-#: ../easytag.desktop.in.h:1
-msgid "Sound File Metadata Editor"
-msgstr "Compositore di Metadati di File Sono"
-
-#: ../easytag.desktop.in.h:2
-msgid "Edit sound file metadata"
-msgstr "Modificare i metadati di file sono"
-
-#: ../easytag.desktop.in.h:3
-msgid "mp3;tag;audio;"
+#: ../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 ""
+"Visualizza e modifica le etichette per i file MP3, MP2, MP4/AAC, FLAC, Ogg "
+"Opus, Ogg Speex, Ogg Vorbis, MusePack, Monkey's Audio e WavPack."
 
-#: ../src/about.c:139
+#: ../data/easytag.appdata.xml.in.h:2
 msgid ""
-"    EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, "
-"Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple and nice "
-"GTK+ interface makes tagging easier under GNU/Linux."
-msgstr ""
-"    EasyTAG è programma per vedere, modificare e scrivere le etichette dei  "
-"file MP3, MP2, FLAC, Ogg Vorbis, MP4/AAC, MusePack e Monkey's Audio. La sua "
-"semplice e stuzzicante interfaccia GTK+ rende più facile mettere le "
-"etichette in ambiente GNU/Linux."
-
-#: ../src/about.c:147 ../src/about.c:148 ../src/about.c:149 ../src/about.c:150
-#: ../src/about.c:181
-msgid "(German translation)"
-msgstr "(traduzione tedesca)"
-
-#: ../src/about.c:151 ../src/about.c:152
-msgid "(Russian translation)"
-msgstr "(traduzione russa)"
-
-#: ../src/about.c:153 ../src/about.c:154
-msgid "(Dutch translation)"
-msgstr "(traduzione olandese)"
-
-#: ../src/about.c:155 ../src/about.c:156 ../src/about.c:157
-msgid "(Swedish translation)"
-msgstr "(traduzione svedese)"
-
-#: ../src/about.c:158 ../src/about.c:159 ../src/about.c:160
-msgid "(Hungarian translation)"
-msgstr "(traduzione ungherese)"
-
-#: ../src/about.c:161 ../src/about.c:162
-msgid "(Italian translation)"
-msgstr "(traduzione italiana)"
-
-#: ../src/about.c:163
-msgid "(Japanese translation)"
-msgstr "(traduzione giapponese)"
-
-#: ../src/about.c:164 ../src/about.c:165
-msgid "(Ukrainian translation)"
-msgstr "(traduzione ucraina)"
-
-#: ../src/about.c:166 ../src/about.c:167
-msgid "(Czech translation)"
-msgstr "(traduzione ceca)"
-
-#: ../src/about.c:168 ../src/about.c:169 ../src/about.c:170
-msgid "(Spanish translation)"
-msgstr "(traduzione spagnola)"
-
-#: ../src/about.c:171
-msgid "(Polish translation)"
-msgstr "(traduzione polacca)"
-
-#: ../src/about.c:172
-msgid "(Romanian translation)"
-msgstr "(traduzione rumena)"
-
-#: ../src/about.c:173
-msgid "(Danish translation)"
-msgstr "(traduzione danese)"
-
-#: ../src/about.c:174
-msgid "(Greek translation)"
-msgstr "(traduzione greca)"
-
-#: ../src/about.c:175
-msgid "(Brazilian Portuguese translation)"
-msgstr "(traduzione portoghese brasiliana)"
-
-#: ../src/about.c:176
-msgid "(Bulgarian translation)"
-msgstr "(traduzione bulgara)"
-
-#: ../src/about.c:177
-msgid "(Chinese translation)"
-msgstr "(traduzione cinese)"
-
-#: ../src/about.c:178
-#, fuzzy
-msgid "(Chinese (Taiwan) translation)"
-msgstr "(traduzione cinese)"
-
-#: ../src/about.c:179
-#, fuzzy
-msgid "(Hebrew translation)"
-msgstr "(traduzione greca)"
-
-#: ../src/about.c:180
-#, fuzzy
-msgid "(Serbian translation)"
-msgstr "(traduzione tedesca)"
-
-#: ../src/about.c:182
-#, fuzzy
-msgid "(Lithuanian translation)"
-msgstr "(traduzione italiana)"
-
-#: ../src/about.c:241
-msgid "Extension Name"
+"Look up albums in online databases, bulk edit tags, create playlists and "
+"rename a collection of files."
 msgstr ""
+"Cerca album nei database in rete, modifica in massa le etichette, crea "
+"scalette e rinomina una collezione di file."
 
-#: ../src/about.c:242
-msgid "Status"
+#: ../data/easytag.appdata.xml.in.h:3
+msgid ""
+"A simple and nice GTK+ interface makes tagging easier under GNU/Linux and "
+"Windows."
 msgstr ""
+"Una semplice e piacevole interfaccia GTK+ che rende facile l'inserimento di "
+"etichette su GNU/Linux e Windows."
 
-#: ../src/about.c:243 ../src/browser.c:3035 ../src/misc.c:1927
-#: ../src/prefs.c:669
-msgid "Comment"
-msgstr "Commento"
-
-#. Config
-#: ../src/about.c:260
-#, fuzzy
-msgid "About…"
-msgstr "Informazioni"
-
-#.
-#. * Tab for common information
-#.
-#: ../src/about.c:278 ../src/bar.c:244
-msgid "About"
-msgstr "Informazioni"
-
-#: ../src/about.c:312
-#, c-format
-msgid "(compiled: %s)"
-msgstr "(compilato il: %s)"
-
-#: ../src/about.c:316
-#, fuzzy, c-format
-msgid "(using: GTK+ %d.%d.%d)"
-msgstr "(usando: GTK+ %d.%d.%d e id3lib %d.%d.%d)"
-
-#: ../src/about.c:324
-#, c-format
-msgid "Author: %s"
-msgstr "Autore: %s"
-
-#: ../src/about.c:328 ../src/easytag.c:230
-#, c-format
-msgid "E-mail: %s"
-msgstr "Posta elettronica: %s"
-
-#: ../src/about.c:334
-msgid "Web Page: "
-msgstr "Pagina web: "
-
-#: ../src/about.c:347
-msgid "Description:"
-msgstr "Descrizione:"
-
-#.
-#. * Tab for extensions
-#.
-#: ../src/about.c:363
-msgid "Extensions"
-msgstr ""
+#: ../data/easytag.desktop.in.h:1
+msgid "Sound File Metadata Editor"
+msgstr "Editor metadati di file sonori"
 
-#: ../src/about.c:429
-#, fuzzy
-msgid "MP3 file support"
-msgstr "(il supporto per i file MP3 è stato disabilitato)"
+#: ../data/easytag.desktop.in.h:2
+msgid "Edit sound file metadata"
+msgstr "Modifica i metadati di file sonori"
 
-#: ../src/about.c:432 ../src/about.c:462 ../src/about.c:474 ../src/about.c:490
-#: ../src/about.c:503 ../src/about.c:515
-msgid "enabled"
-msgstr ""
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: ../data/easytag.desktop.in.h:4
+msgid "mp3;tag;audio;"
+msgstr "mp3;etichetta;audio;"
 
-#: ../src/about.c:436 ../src/about.c:452 ../src/about.c:465 ../src/about.c:477
-#: ../src/about.c:494 ../src/about.c:506 ../src/about.c:518
-msgid "disabled"
+#: ../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 "
+"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 ""
+"Questo programma è software libero; è possibile ridistribuirlo e/o "
+"modificarlo secondo i termini della GNU General Public License come "
+"pubblicato dalla Free Software Foundation; sia la versione 2 della licenza, "
+"o (a propria scelta) una versione successiva.\n"
+"\n"
+"Questo programma è distribuito nella speranza che sia utile, ma SENZA ALCUNA "
+"GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN "
+"PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori "
+"dettagli.\n"
+"\n"
+"Dovreste aver ricevuto una copia della GNU General Public License con questo "
+"programma. In caso contrario, vedere <http://www.gnu.org/licenses/>."
 
-#: ../src/about.c:445
-#, fuzzy
-msgid "ID3v2.3 tags writting support"
-msgstr "(il supporto per i file MP3 è stato disabilitato)"
-
-#: ../src/about.c:448
-#, fuzzy
-msgid "available"
-msgstr "Non c'è più memoria disponibile"
-
-#: ../src/about.c:459
-#, fuzzy
-msgid "Ogg Vorbis file support"
-msgstr "(il supporto per i file Ogg Vorbis è stato disabilitato)"
-
-#: ../src/about.c:471
-#, fuzzy
-msgid "Speex file support"
-msgstr "(il supporto per i file MP3 è stato disabilitato)"
-
-#: ../src/about.c:487
-#, fuzzy
-msgid "FLAC file support"
-msgstr "(il supporto per i file FLAC è stato disabilitato)"
-
-#: ../src/about.c:500
-#, fuzzy
-msgid "MP4/AAC file support"
-msgstr "(il supporto per i file MP4/AAC è stato disabilitato)"
-
-#: ../src/about.c:512
-#, fuzzy
-msgid "WavPack file support"
-msgstr "(il supporto per i file MP3 è stato disabilitato)"
-
-#.
-#. * Tab for thanks
-#.
-#: ../src/about.c:527
-msgid "Thanks"
-msgstr "Ringraziamenti"
+#. Translators: put your own name here to appear in the about dialog.
+#: ../src/about.c:106
+msgid "translator-credits"
+msgstr "Gianvito Cavasoli <gianvito at gmx.it>"
 
-#: ../src/about.c:547
-msgid "Translations:\n"
-msgstr "Traduzioni:\n"
+#: ../src/about.c:116
+msgid "View and edit tags in audio files"
+msgstr "Visualizza e modifica le etichette nei file audio"
 
-#: ../src/about.c:577
-msgid "General:\n"
-msgstr "Generale:\n"
+#. 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
+#, c-format
+msgid "Error while opening file: '%s' (%s)."
+msgstr "Errore durante l'apertura del file: \"%s\" (%s)."
 
-#: ../src/about.c:594
-msgid "Changes"
-msgstr "Modifiche"
+#: ../src/application.c:37
+msgid "Print the version and exit"
+msgstr "Stampa la versione ed esce"
 
-#: ../src/about.c:616
+#: ../src/application.c:89
 #, c-format
-msgid "Can't open file '%s' (%s)\n"
-msgstr "Non posso aprire il file '%s' (%s)\n"
+msgid "Website: %s"
+msgstr "Sito web: %s"
 
-#. g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: ../src/ape_tag.c:74 ../src/et_core.c:4515 ../src/flac_header.c:126
-#: ../src/id3_tag.c:145 ../src/id3_tag.c:1205 ../src/id3_tag.c:1284
-#: ../src/misc.c:1770 ../src/mp4_header.c:211 ../src/mp4_header.c:220
-#: ../src/mp4_tag.c:98 ../src/mp4_tag.c:109 ../src/mp4_tag.c:281
-#: ../src/mp4_tag.c:290 ../src/mpeg_header.c:209 ../src/ogg_header.c:82
-#: ../src/ogg_header.c:186 ../src/ogg_tag.c:146 ../src/ogg_tag.c:657
-#, c-format
-msgid "ERROR while opening file: '%s' (%s)."
-msgstr "Si è verificato un errore aprendo il file '%s' (%s)."
+#: ../src/application.c:98
+msgid "- Tag and rename audio files"
+msgstr "- Etichetta e rinomina i file audio"
 
 #.
 #. * Main Menu Actions
 #.
-#: ../src/bar.c:148
+#: ../src/bar.c:155
 msgid "_File"
-msgstr "_File "
+msgstr "_File"
 
-#: ../src/bar.c:149
-msgid "Sort list by tag"
-msgstr "Ordina la lista per etichetta"
+#: ../src/bar.c:156
+msgid "Sort List by Tag"
+msgstr "Ordina elenco per etichetta"
 
-#: ../src/bar.c:150
-msgid "Sort list by property"
-msgstr "Ordina la lista per proprietà"
+#: ../src/bar.c:159
+msgid "Sort List by Property"
+msgstr "Ordina elenco per proprietà"
 
-#: ../src/bar.c:151
+#: ../src/bar.c:160
 msgid "Ascending by filename"
-msgstr "Crescente per nome file"
+msgstr "Crescente per nome del file"
 
-#: ../src/bar.c:152
+#: ../src/bar.c:161
 msgid "Descending by filename"
-msgstr "Decrescente per nome file"
+msgstr "Decrescente per nome del file"
 
-#: ../src/bar.c:153
+#: ../src/bar.c:162
 msgid "Ascending by creation date"
 msgstr "Crescente per data di creazione"
 
-#: ../src/bar.c:154
+#: ../src/bar.c:163
 msgid "Descending by creation date"
 msgstr "Decrescente per data di creazione"
 
-#: ../src/bar.c:155
+#: ../src/bar.c:164
 msgid "Ascending by track number"
 msgstr "Crescente per numero di traccia"
 
-#: ../src/bar.c:156
+#: ../src/bar.c:165
 msgid "Descending by track number"
 msgstr "Decrescente per numero di traccia"
 
-#: ../src/bar.c:157
+#: ../src/bar.c:166
 msgid "Ascending by title"
 msgstr "Crescente per titolo"
 
-#: ../src/bar.c:158
+#: ../src/bar.c:167
 msgid "Descending by title"
 msgstr "Decrescente per titolo"
 
-#: ../src/bar.c:159
+#: ../src/bar.c:168
 msgid "Ascending by artist"
 msgstr "Crescente per artista"
 
-#: ../src/bar.c:160
+#: ../src/bar.c:169
 msgid "Descending by artist"
 msgstr "Decrescente per artista"
 
-#: ../src/bar.c:161
-#, fuzzy
+#: ../src/bar.c:170
 msgid "Ascending by album artist"
-msgstr "Crescente per artista"
+msgstr "Crescente per artista dell'album"
 
-#: ../src/bar.c:162
-#, fuzzy
+#: ../src/bar.c:171
 msgid "Descending by album artist"
-msgstr "Decrescente per artista"
+msgstr "Decrescente per artista dell'album"
 
-#: ../src/bar.c:163
+#: ../src/bar.c:172
 msgid "Ascending by album"
 msgstr "Crescente per album"
 
-#: ../src/bar.c:164
+#: ../src/bar.c:173
 msgid "Descending by album"
 msgstr "Decrescente per album"
 
-#: ../src/bar.c:165
+#: ../src/bar.c:174
 msgid "Ascending by year"
 msgstr "Crescente per anno"
 
-#: ../src/bar.c:166
+#: ../src/bar.c:175
 msgid "Descending by year"
 msgstr "Decrescente per anno"
 
-#: ../src/bar.c:167
+#: ../src/bar.c:176
 msgid "Ascending by genre"
 msgstr "Crescente per genere"
 
-#: ../src/bar.c:168
+#: ../src/bar.c:177
 msgid "Descending by genre"
 msgstr "Decrescente per genere"
 
-#: ../src/bar.c:169
+#: ../src/bar.c:178
 msgid "Ascending by comment"
 msgstr "Crescente per commento"
 
-#: ../src/bar.c:170
+#: ../src/bar.c:179
 msgid "Descending by comment"
 msgstr "Decrescente per commento"
 
-#: ../src/bar.c:171
+#: ../src/bar.c:180
 msgid "Ascending by composer"
 msgstr "Crescente per compositore"
 
-#: ../src/bar.c:172
+#: ../src/bar.c:181
 msgid "Descending by composer"
 msgstr "Decrescente per compositore"
 
-#: ../src/bar.c:173
+#: ../src/bar.c:182
 msgid "Ascending by original artist"
 msgstr "Crescente per artista originale"
 
-#: ../src/bar.c:174
+#: ../src/bar.c:183
 msgid "Descending by original artist"
 msgstr "Decrescente per artista originale"
 
-#: ../src/bar.c:175
+#: ../src/bar.c:184
 msgid "Ascending by copyright"
-msgstr "Crescente per diritti d'autore"
+msgstr "Crescente per copyright"
 
-#: ../src/bar.c:176
+#: ../src/bar.c:185
 msgid "Descending by copyright"
-msgstr "Decrescente per diritti d'autore"
+msgstr "Decrescente per copyright"
 
-#: ../src/bar.c:177
+#: ../src/bar.c:186
 msgid "Ascending by URL"
 msgstr "Crescente per URL"
 
-#: ../src/bar.c:178
+#: ../src/bar.c:187
 msgid "Descending by URL"
 msgstr "Decrescente per URL"
 
-#: ../src/bar.c:179
+#. 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:190
 msgid "Ascending by encoder name"
-msgstr "Crescente per nome codificatore"
+msgstr "Crescente per nome del codificatore"
 
-#: ../src/bar.c:180
+#. 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:193
 msgid "Descending by encoder name"
-msgstr "Decrescente per nome codificatore"
+msgstr "Decrescente per nome del codificatore"
 
-#: ../src/bar.c:181
+#: ../src/bar.c:194
 msgid "Ascending by file type"
-msgstr "Crescente per tipo file"
+msgstr "Crescente per tipo di file"
 
-#: ../src/bar.c:182
+#: ../src/bar.c:195
 msgid "Descending by file type"
-msgstr "Decrescente per tipo file"
+msgstr "Decrescente per tipo di file"
 
-#: ../src/bar.c:183
+#: ../src/bar.c:196
 msgid "Ascending by file size"
-msgstr "Crescente per dimensione file"
+msgstr "Crescente per dimensione del file"
 
-#: ../src/bar.c:184
+#: ../src/bar.c:197
 msgid "Descending by file size"
-msgstr "Decrescente per dimensione file"
+msgstr "Decrescente per dimensione del file"
 
-#: ../src/bar.c:185
+#: ../src/bar.c:198
 msgid "Ascending by duration"
 msgstr "Crescente per durata"
 
-#: ../src/bar.c:186
+#: ../src/bar.c:199
 msgid "Descending by duration"
 msgstr "Decrescente per durata"
 
-#: ../src/bar.c:187
+#: ../src/bar.c:200
 msgid "Ascending by bitrate"
 msgstr "Crescente per bitrate"
 
-#: ../src/bar.c:188
+#: ../src/bar.c:201
 msgid "Descending by bitrate"
 msgstr "Decrescente per bitrate"
 
-#: ../src/bar.c:189
+#: ../src/bar.c:202
 msgid "Ascending by samplerate"
-msgstr "Crescente per campionamento"
+msgstr "Crescente per campionatura"
 
-#: ../src/bar.c:190
+#: ../src/bar.c:203
 msgid "Descending by samplerate"
-msgstr "Decrescente per campionamento"
+msgstr "Decrescente per campionatura"
 
-#: ../src/bar.c:192
-#, fuzzy
-msgid "Open File(s) with…"
+#: ../src/bar.c:205
+msgid "Open Files With…"
 msgstr "Apri file con..."
 
-#: ../src/bar.c:193 ../src/cddb.c:324
-msgid "Select All Files"
-msgstr "Seleziona tutti i file"
+#: ../src/bar.c:206
+msgid "Run a command on the selected files"
+msgstr "Esegue un comando sui file selezionati"
 
-#: ../src/bar.c:194
-msgid "Unselect All Files"
-msgstr "Deseleziona tutti i file"
+#: ../src/bar.c:209
+msgid "Select all"
+msgstr "Seleziona tutto"
 
-#: ../src/bar.c:195 ../src/cddb.c:331
-msgid "Invert Files Selection"
-msgstr "Inverti la selezione dei file"
+#: ../src/bar.c:210
+msgid "Unselect All"
+msgstr "Deseleziona tutto"
 
-#: ../src/bar.c:196
-msgid "Delete File(s)"
-msgstr "Cancella file"
+#: ../src/bar.c:211
+msgid "Clear the current selection"
+msgstr "Pulisce l'attuale selezione"
 
-#: ../src/bar.c:197
+#: ../src/bar.c:214
+msgid "Invert File Selection"
+msgstr "Inverti selezione file"
+
+#: ../src/bar.c:215
+msgid "Invert file selection"
+msgstr "Inverte la selezione dei file"
+
+#: ../src/bar.c:217
+msgid "Delete Files"
+msgstr "Elimina file"
+
+#: ../src/bar.c:217
+msgid "Delete files"
+msgstr "Elimina i file"
+
+#: ../src/bar.c:218
 msgid "_First File"
 msgstr "_Primo file"
 
-#: ../src/bar.c:197
-msgid "First File"
+#: ../src/bar.c:219
+msgid "First file"
 msgstr "Primo file"
 
-#: ../src/bar.c:198
+#: ../src/bar.c:220
 msgid "_Previous File"
-msgstr "File _precedente"
+msgstr "_File precedente"
 
-#: ../src/bar.c:198
-msgid "Previous File"
+#: ../src/bar.c:220
+msgid "Previous file"
 msgstr "File precedente"
 
-#: ../src/bar.c:199
+#: ../src/bar.c:221
 msgid "_Next File"
-msgstr "File _successivo"
+msgstr "_File successivo"
 
-#: ../src/bar.c:199
-msgid "Next File"
+#: ../src/bar.c:221
+msgid "Next file"
 msgstr "File successivo"
 
-#: ../src/bar.c:200
+#: ../src/bar.c:222
 msgid "_Last File"
 msgstr "_Ultimo file"
 
-#: ../src/bar.c:200
-msgid "Last File"
+#: ../src/bar.c:223
+msgid "Last file"
 msgstr "Ultimo file"
 
-#. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
-#. and binding Ctrl+C effectively stops the user copying text..
-#: ../src/bar.c:203
-msgid "S_can File(s)"
-msgstr "Proc_essa  file"
+#: ../src/bar.c:224
+msgid "S_can Files"
+msgstr "S_cansiona file"
 
-#: ../src/bar.c:203
-msgid "Scan File(s)"
-msgstr "Processa  file"
+#: ../src/bar.c:225 ../src/scan_dialog.c:1808
+msgid "Scan selected files"
+msgstr "Scansiona i file selezionati"
 
-#: ../src/bar.c:204
-msgid "_Remove Tag(s)"
+#: ../src/bar.c:226
+msgid "_Remove Tags"
 msgstr "_Rimuovi etichette"
 
-#: ../src/bar.c:204
-msgid "Remove Tag(s)"
-msgstr "Rimuovi etichette"
+#: ../src/bar.c:227
+msgid "Remove tags"
+msgstr "Rimuove le etichette"
 
-#: ../src/bar.c:205
-msgid "_Undo Last File(s) Changes"
-msgstr "_Annulla le modifiche all'ultimo file"
+#: ../src/bar.c:228
+msgid "_Undo Last Files Changes"
+msgstr "Ann_ulla ultime modifiche ai file"
 
-#: ../src/bar.c:205
-msgid "Undo Last File(s) Changes"
-msgstr "Annulla le modifiche all'ultimo file"
+#: ../src/bar.c:229
+msgid "Undo last files changes"
+msgstr "Annulla le ultime modifiche ai file"
 
-#: ../src/bar.c:206
-msgid "R_edo Last File(s) Changes"
-msgstr "Rip_eti le modifiche all'ultimo file"
+#: ../src/bar.c:231
+msgid "R_edo Last Files Changes"
+msgstr "R_ipeti ultime modifiche ai file"
 
-#: ../src/bar.c:206
-msgid "Redo Last File(s) Changes"
-msgstr "Ripeti le modifiche all'ultimo file"
+#: ../src/bar.c:232
+msgid "Redo last files changes"
+msgstr "Ripete le ultime modifiche ai file"
 
-#: ../src/bar.c:207
-msgid "_Save File(s)"
+#: ../src/bar.c:234
+msgid "_Save Files"
 msgstr "_Salva file"
 
-#: ../src/bar.c:207
-msgid "Save File(s)"
-msgstr "Salva file"
+#: ../src/bar.c:235
+msgid "Save changes to selected files"
+msgstr "Salva le modifiche ai file selezionati"
 
-#: ../src/bar.c:208
-msgid "_Force Saving File(s)"
+#: ../src/bar.c:237
+msgid "_Force Save Files"
 msgstr "_Forza salvataggio file"
 
-#: ../src/bar.c:208
-msgid "Force Saving File(s)"
+#: ../src/bar.c:238
+msgid "Force saving files"
 msgstr "Forza il salvataggio dei file"
 
-#: ../src/bar.c:209
+#: ../src/bar.c:240
 msgid "Undo Last Changes"
+msgstr "Annulla ultime modifiche"
+
+#: ../src/bar.c:240
+msgid "Undo last changes"
 msgstr "Annulla le ultime modifiche"
 
-#: ../src/bar.c:210
+#: ../src/bar.c:241
 msgid "Redo Last Changes"
-msgstr "Ripeti le ultime modifiche"
+msgstr "Ripeti ultime modifiche"
 
-#: ../src/bar.c:211
+#: ../src/bar.c:241
+msgid "Redo last changes"
+msgstr "Ripete le ultime modifiche"
+
+#: ../src/bar.c:242
 msgid "_Quit"
 msgstr "_Esci"
 
-#: ../src/bar.c:211 ../src/easytag.c:2238 ../src/easytag.c:4913
-#: ../src/easytag.c:4939
+#: ../src/bar.c:242 ../src/easytag.c:2430 ../src/easytag.c:4565
+#: ../src/easytag.c:4597
 msgid "Quit"
-msgstr "Esci"
+msgstr "Esce"
 
-#: ../src/bar.c:213
+#: ../src/bar.c:245
 msgid "_Browser"
-msgstr "_Navigatore"
+msgstr "_Esploratore"
 
-#: ../src/bar.c:214
-msgid "Go to _Home Directory"
-msgstr "Vai alla cartella _home"
+#: ../src/bar.c:246
+msgid "_Home Directory"
+msgstr "Directory _Home"
 
-#: ../src/bar.c:214
-msgid "Go to Home Directory"
-msgstr "Vai alla cartella home"
+#: ../src/bar.c:247
+msgid "Go to home directory"
+msgstr "Va alla directory della home"
 
-#: ../src/bar.c:215
-#, fuzzy
-msgid "Go to Desktop Directory"
-msgstr "Vai alla cartella predefinita"
+#: ../src/bar.c:249
+msgid "Desktop Directory"
+msgstr "Directory Scrivania"
 
-#: ../src/bar.c:216
-#, fuzzy
-msgid "Go to Documents Directory"
-msgstr "Vai alla cartella home"
+#: ../src/bar.c:250
+msgid "Go to desktop directory"
+msgstr "Va alla directory della scrivania"
 
-#: ../src/bar.c:217
-#, fuzzy
-msgid "Go to Downloads Directory"
-msgstr "Vai alla cartella home"
+#: ../src/bar.c:252
+msgid "Documents Directory"
+msgstr "Directory Documenti"
 
-#: ../src/bar.c:218
-#, fuzzy
-msgid "Go to Music Directory"
-msgstr "Vai alla cartella home"
+#: ../src/bar.c:253
+msgid "Go to documents directory"
+msgstr "Va alla directory dei documenti"
 
-#: ../src/bar.c:219
-msgid "Go to _Default Directory"
-msgstr "Vai alla cartella pre_definita"
+#: ../src/bar.c:255
+msgid "Downloads Directory"
+msgstr "Directory Scaricati"
 
-#: ../src/bar.c:219
-msgid "Go to Default Directory"
-msgstr "Vai alla cartella predefinita"
+#: ../src/bar.c:256
+msgid "Go to downloads directory"
+msgstr "Va alla directory degli scaricati"
 
-#: ../src/bar.c:220
-msgid "Set _Current Path as Default"
-msgstr "Imposta il percorso _corrente come predefinito"
+#: ../src/bar.c:258
+msgid "Music Directory"
+msgstr "Directory Musica"
 
-#: ../src/bar.c:220
-msgid "Set Current Path as Default"
-msgstr "Imposta il percorso corrente come predefinito"
+#: ../src/bar.c:259
+msgid "Go to music directory"
+msgstr "Va alla directory della musica"
 
-#: ../src/bar.c:221
-msgid "Tree View | Artist-Album View"
-msgstr "Vista ad albero | Vista artista - album"
+#: ../src/bar.c:261
+msgid "_Parent Directory"
+msgstr "Directory _superiore"
 
-#. Only directories changed
-#: ../src/bar.c:222 ../src/easytag.c:2664
-#, fuzzy
+#: ../src/bar.c:262
+msgid "Go to parent directory"
+msgstr "Va alla directory superiore"
+
+#: ../src/bar.c:264
+msgid "_Default Directory"
+msgstr "Directory _predefinita"
+
+#: ../src/bar.c:265
+msgid "Go to default directory"
+msgstr "Va alla directory predefinita"
+
+#: ../src/bar.c:267
+msgid "Set _Current Path as Default"
+msgstr "Imposta _attuale percorso come predefinito"
+
+#: ../src/bar.c:267
+msgid "Set current path as default"
+msgstr "Imposta l'attuale percorso come predefinito"
+
+#: ../src/bar.c:268
 msgid "Rename Directory…"
-msgstr "Rinomina Cartella..."
+msgstr "Rinomina directory..."
 
-#: ../src/bar.c:223
+#: ../src/bar.c:268
+msgid "Rename directory"
+msgstr "Rinomina la directory"
+
+#: ../src/bar.c:269
 msgid "Reload Directory"
-msgstr "Ricarica cartella"
+msgstr "Ricarica directory"
 
-#: ../src/bar.c:224 ../src/browser.c:4157
-#, fuzzy
-msgid "Browse Directory with…"
-msgstr "Sfoglia cartella con..."
+#: ../src/bar.c:270
+msgid "Reload directory"
+msgstr "Ricarica la directory"
 
-#: ../src/bar.c:225
-msgid "_Collapse Tree"
-msgstr "_Riduci albero"
+#: ../src/bar.c:273
+msgid "Browse Directory With…"
+msgstr "Esplora directory con..."
 
-#: ../src/bar.c:226
-msgid "_Refresh Tree"
-msgstr "_Aggiorna albero"
+#: ../src/bar.c:274
+msgid "Run a command on the directory"
+msgstr "Esegue un comando sulla directory"
 
-#: ../src/bar.c:228 ../src/bar.c:257
-msgid "S_canner"
-msgstr "A_nalizzatore"
+#: ../src/bar.c:276
+msgid "_Collapse Tree"
+msgstr "Ripie_ga albero"
 
-#: ../src/bar.c:229
-#, fuzzy
-msgid "_Fill Tag(s)…"
-msgstr "R_iempi etichette..."
+#: ../src/bar.c:277
+msgid "Collapse directory tree"
+msgstr "Ripiega l'albero delle directory"
 
-#: ../src/bar.c:229
-#, fuzzy
-msgid "Fill Tag(s)…"
-msgstr "Riempi etichette..."
+#: ../src/bar.c:278
+msgid "_Reload Tree"
+msgstr "_Ricarica albero"
 
-#: ../src/bar.c:230
-#, fuzzy
-msgid "_Rename File(s) and Directory…"
-msgstr "Rinomina File e Cartella"
+#: ../src/bar.c:279
+msgid "Reload directory tree"
+msgstr "Ricarica l'albero delle directory"
 
-#: ../src/bar.c:230
-#, fuzzy
-msgid "Rename File(s) and Directory…"
-msgstr "Rinomina File e Cartella"
+#: ../src/bar.c:282
+msgid "S_canner Mode"
+msgstr "Modalità s_canner"
 
-#: ../src/bar.c:231
-#, fuzzy
-msgid "_Process Field(s)…"
-msgstr "Proces_sa campi..."
+#: ../src/bar.c:284
+msgid "_Miscellaneous"
+msgstr "_Varie"
 
-#: ../src/bar.c:231
-#, fuzzy
-msgid "Process Fields(s)…"
-msgstr "Processa campi..."
+#: ../src/bar.c:285
+msgid "_Find…"
+msgstr "_Trova..."
 
-#: ../src/bar.c:233
-msgid "_Misc"
-msgstr "_Varie"
+#: ../src/bar.c:286
+msgid "Search filenames and tags"
+msgstr "Cerca nomi dei file ed etichette"
 
-#: ../src/bar.c:234
-#, fuzzy
-msgid "Search _File(s)…"
-msgstr "Cerca _file..."
+#: ../src/bar.c:288
+msgid "CDD_B Search…"
+msgstr "Ricerca CDD_B..."
 
-#: ../src/bar.c:234
-#, fuzzy
-msgid "Search File(s)…"
-msgstr "Cerca file..."
+#: ../src/bar.c:289
+msgid "CDDB search"
+msgstr "Ricerca CDDB"
 
-#: ../src/bar.c:235
-#, fuzzy
-msgid "CD Data _Base Search…"
-msgstr "Ricerca Database CD"
+#: ../src/bar.c:291
+msgid "Load Filenames From a Text File…"
+msgstr "Carica nomi dei file da un file di testo..."
 
-#: ../src/bar.c:235
-#, fuzzy
-msgid "CDDB Search…"
-msgstr "Ricerca CDDB..."
+#: ../src/bar.c:292
+msgid "Load filenames from a text file"
+msgstr "Carica dei nomi dei file da un file di testo"
 
-#: ../src/bar.c:236
-#, fuzzy
-msgid "Load Filenames from TXT…"
-msgstr "Carica nomi file da TXT..."
+#: ../src/bar.c:294
+msgid "Generate Playlist…"
+msgstr "Genera scaletta..."
 
-#: ../src/bar.c:237
-#, fuzzy
-msgid "Write Playlist…"
-msgstr "Scrivi Playlist..."
+#: ../src/bar.c:295
+msgid "Generate a playlist"
+msgstr "Genera una scaletta"
 
-#: ../src/bar.c:238 ../src/bar.c:258 ../src/bar.c:259 ../src/bar.c:260
+#: ../src/bar.c:297 ../src/bar.c:328 ../src/bar.c:329 ../src/bar.c:330
 msgid "Run Audio Player"
-msgstr "Esegui il riproduttore audio"
+msgstr "Avvia riproduttore audio"
 
-#: ../src/bar.c:240
-msgid "_Settings"
-msgstr "_Impostazioni"
+#: ../src/bar.c:298 ../src/bar.c:328 ../src/bar.c:329 ../src/bar.c:330
+msgid "Run audio player"
+msgstr "Avvia il riproduttore dell'audio"
 
-#: ../src/bar.c:241
-#, fuzzy
-msgid "_Preferences…"
-msgstr "_Preferenze..."
+#: ../src/bar.c:301
+msgid "_Edit"
+msgstr "_Modifica"
 
-#. Title
-#: ../src/bar.c:241 ../src/prefs.c:117
-#, fuzzy
-msgid "Preferences…"
-msgstr "Preferenze..."
+#: ../src/bar.c:302
+msgid "_Preferences"
+msgstr "_Preferenze"
+
+#. The window
+#: ../src/bar.c:303 ../src/prefs.c:110
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: ../src/bar.c:305
+msgid "_View"
+msgstr "_Visualizza"
 
-#: ../src/bar.c:243
+#: ../src/bar.c:306
+msgid "_Go"
+msgstr "V_ai"
+
+#: ../src/bar.c:308
 msgid "_Help"
-msgstr "_Aiuto"
+msgstr "A_iuto"
+
+#: ../src/bar.c:311
+msgid "_Contents"
+msgstr "_Sommario"
+
+#: ../src/bar.c:312
+msgid "Show help"
+msgstr "Mostra l'aiuto"
 
-#: ../src/bar.c:244
+#: ../src/bar.c:314
 msgid "_About"
-msgstr "_Informazioni"
+msgstr "I_nformazioni"
+
+#: ../src/bar.c:314
+msgid "About"
+msgstr "Informazioni"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: ../src/bar.c:250
+#: ../src/bar.c:320
 msgid "Stop the current action"
-msgstr "Termina azione corrente"
+msgstr "Interrompe l'attuale azione"
 
 #.
 #. * Popup menu's Actions
 #.
-#: ../src/bar.c:256
+#: ../src/bar.c:326
 msgid "_File Operations"
-msgstr "_Operazioni sul file"
+msgstr "Operazioni _file"
 
-#: ../src/bar.c:261
-#, fuzzy
-msgid "CDDB Search File(s)…"
-msgstr "Ricerca file CDDB..."
+#: ../src/bar.c:327
+msgid "S_canner"
+msgstr "S_canner"
+
+#: ../src/bar.c:331
+msgid "CDDB Search Files…"
+msgstr "Ricerca file su CDDB..."
+
+#: ../src/bar.c:331
+msgid "CDDB search files…"
+msgstr "Ricerca file su CDDB..."
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: ../src/bar.c:265
-msgid "Clean Log"
-msgstr "Azzera registro"
+#: ../src/bar.c:335
+msgid "Clear log"
+msgstr "Pulisci registro"
 
-#. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Sub-directories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: ../src/bar.c:272
-msgid "Browse _Sub-directories"
-msgstr "Soglia _sottocartelle"
+#. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Subdirectories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
+#: ../src/bar.c:342
+msgid "Browse _Subdirectories"
+msgstr "Esplora _sottodirectory"
 
-#. { AM_BROWSER_HIDDEN_DIR, NULL,                   _("Show Hidden Directories"),                         NULL, _("Show Hidden Directories"),                         G_CALLBACK(Browser_Tree_Rebuild),     FALSE },
-#: ../src/bar.c:275
+#: ../src/bar.c:342
+msgid "Browse subdirectories"
+msgstr "Esplora le sottodirectory"
+
+#: ../src/bar.c:346
 msgid "Show Hidden Directories"
-msgstr "Mostra cartelle nascoste"
+msgstr "Mostra directory nascoste"
 
-#: ../src/bar.c:277
-msgid "Show tree browser / Display by Artist and Album"
-msgstr "Mostra navigatore ad albero / Visualizza per Artista ed Album"
+#: ../src/bar.c:346
+msgid "Show hidden directories"
+msgstr "Mostra le directory nascoste"
 
-#: ../src/bar.c:314
+#: ../src/bar.c:348
+msgid "_Show Scanner"
+msgstr "_Mostra scanner"
+
+#: ../src/bar.c:349
+msgid "Show scanner"
+msgstr "Mostra lo scanner"
+
+#: ../src/bar.c:355
+msgid "Tree Browser"
+msgstr "Esploratore ad albero"
+
+#: ../src/bar.c:356
+msgid "View by directory tree"
+msgstr "Visualizza per albero delle directory"
+
+#: ../src/bar.c:358
+msgid "Artist and Album"
+msgstr "Artista e album"
+
+#: ../src/bar.c:359
+msgid "View by artist and album"
+msgstr "Visualizza per artista e album"
+
+#: ../src/bar.c:364
+msgid "_Fill Tags…"
+msgstr "_Riempi etichette..."
+
+#: ../src/bar.c:365
+msgid "Fill tags"
+msgstr "Riempie le etichette"
+
+#: ../src/bar.c:367
+msgid "_Rename Files and Directories…"
+msgstr "R_inomina file e directory..."
+
+#: ../src/bar.c:368
+msgid "Rename files and directories"
+msgstr "Rinomina i file e le directory"
+
+#: ../src/bar.c:370
+msgid "_Process Fields…"
+msgstr "_Elabora campi..."
+
+#: ../src/bar.c:370 ../src/scan_dialog.c:184
+msgid "Process Fields"
+msgstr "Elabora i campi"
+
+#: ../src/bar.c:428
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
-msgstr "Non riesco ad incorporare lo UI. L'errore è stato: %s\n"
+msgstr "Impossibile unire l'interfaccia grafica, l'errore era: %s\n"
 
-#: ../src/bar.c:414
-#, fuzzy
-msgid "Ready to start…"
-msgstr "Pronto a partire..."
+#: ../src/bar.c:533
+msgid "Ready to start"
+msgstr "Pronto ad avviarsi"
 
-#: ../src/browser.c:364
+#: ../src/browser.c:376
 msgid "New default path for files selected"
-msgstr "È stato selezionato un nuovo percorso predefinito per i file"
+msgstr "Nuovo percorso predefinito per i file selezionati"
 
-#: ../src/browser.c:757 ../src/easytag.c:4911
-#, fuzzy
+#: ../src/browser.c:678 ../src/easytag.c:4561
 msgid "Some files have been modified but not saved"
-msgstr "Tutti i file sono stati salvati..."
+msgstr "Alcuni file sono stati modificati ma non salvati"
 
-#: ../src/browser.c:758
-#, fuzzy
+#: ../src/browser.c:679
 msgid "Do you want to save them before changing the directory?"
-msgstr ""
-"Vuoi rinominare il file \n"
-"'%s'\n"
-"in \n"
-"'%s' ?"
+msgstr "Salvarli prima di cambiare directory?"
 
-#: ../src/browser.c:760
+#: ../src/browser.c:683
 msgid "Confirm Directory Change"
-msgstr ""
+msgstr "Conferma cambio directory"
 
-#: ../src/browser.c:2214
+#: ../src/browser.c:2146
 msgid "<All albums>"
 msgstr "<Tutti gli album>"
 
-#: ../src/browser.c:2624
+#: ../src/browser.c:2607
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
-msgstr ""
-"Errore: non sono riuscito a trovare nell'albero il nodo %s mentre cercavo %s."
+msgstr "Errore: ricerca di %s, impossibile trovare il nodo %s nell'albero."
 
-#: ../src/browser.c:3033 ../src/browser.c:3161
+#: ../src/browser.c:3101 ../src/browser.c:3179
 msgid "Tree"
 msgstr "Albero"
 
-#: ../src/browser.c:3034 ../src/cddb.c:719 ../src/misc.c:1918
-msgid "File Name"
-msgstr "Nome File"
+#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1903
+msgid "Filename"
+msgstr "Nome del file"
 
-#: ../src/browser.c:3034 ../src/cddb.c:720 ../src/misc.c:1919
-#: ../src/prefs.c:665
+#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1904
+#: ../src/prefs.c:643
 msgid "Title"
 msgstr "Titolo"
 
-#: ../src/browser.c:3034 ../src/browser.c:3038 ../src/cddb.c:436
-#: ../src/cddb.c:721 ../src/misc.c:1920 ../src/prefs.c:666
+#. 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:1905 ../src/prefs.c:644
 msgid "Artist"
 msgstr "Artista"
 
-#: ../src/browser.c:3034 ../src/misc.c:1921
-#, fuzzy
+#: ../src/browser.c:3103 ../src/misc.c:1906
 msgid "Album Artist"
-msgstr "Artista"
+msgstr "Artista album"
 
-#: ../src/browser.c:3034 ../src/browser.c:3039 ../src/cddb.c:437
-#: ../src/cddb.c:722 ../src/misc.c:1922 ../src/prefs.c:667
+#. 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:1907 ../src/prefs.c:645
 msgid "Album"
 msgstr "Album"
 
-#: ../src/browser.c:3035 ../src/cddb.c:723 ../src/misc.c:1924
+#: ../src/browser.c:3104 ../src/cddb.c:807 ../src/misc.c:1909
 msgid "Year"
 msgstr "Anno"
 
-#: ../src/browser.c:3035 ../src/misc.c:1925
+#: ../src/browser.c:3104
+msgid "Disc"
+msgstr "Disco"
+
+#: ../src/browser.c:3105 ../src/misc.c:1910
 msgid "Track"
 msgstr "Traccia"
 
-#: ../src/browser.c:3035 ../src/cddb.c:726 ../src/misc.c:1926
-#: ../src/prefs.c:668
+#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1911
+#: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Genere"
 
-#: ../src/browser.c:3036 ../src/misc.c:1928 ../src/picture.c:834
-#: ../src/prefs.c:670
+#: ../src/browser.c:3106 ../src/misc.c:1912 ../src/prefs.c:647
+msgid "Comment"
+msgstr "Commento"
+
+#: ../src/browser.c:3106 ../src/misc.c:1913 ../src/picture.c:1059
+#: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Compositore"
 
-#: ../src/browser.c:3036 ../src/misc.c:1929 ../src/prefs.c:671
-msgid "Orig. Artist"
-msgstr "Artista Originale"
+#: ../src/browser.c:3107 ../src/misc.c:1914
+msgid "Original Artist"
+msgstr "Artista originale"
 
-#: ../src/browser.c:3036 ../src/misc.c:1930
+#: ../src/browser.c:3108 ../src/misc.c:1915
 msgid "Copyright"
-msgstr "Diritti d'autore"
+msgstr "Copyright"
 
-#: ../src/browser.c:3037 ../src/misc.c:1931
+#: ../src/browser.c:3108 ../src/misc.c:1916
 msgid "URL"
 msgstr "URL"
 
-#: ../src/browser.c:3037
-#, fuzzy
+#: ../src/browser.c:3109 ../src/misc.c:1917
 msgid "Encoded By"
 msgstr "Codificato da"
 
-#: ../src/browser.c:3038
+#: ../src/browser.c:3110
 msgid "# Albums"
-msgstr "# Album"
+msgstr "Nr. album"
 
-#: ../src/browser.c:3038 ../src/browser.c:3039
+#: ../src/browser.c:3111 ../src/browser.c:3112
 msgid "# Files"
-msgstr "# File"
-
-#: ../src/browser.c:3058
-msgid "Go to parent directory"
-msgstr "Vai alla cartella genitrice"
+msgstr "Nr. file"
 
-#: ../src/browser.c:3076
+#: ../src/browser.c:3137
 msgid "Enter a directory to browse."
-msgstr "Immetti una cartella da sfogliare."
+msgstr "Immettere una directory da esplorare."
 
-#: ../src/browser.c:3085
-#, fuzzy
+#: ../src/browser.c:3146
 msgid "Select a directory to browse."
-msgstr "Seleziona una cartella da sfogliare!"
+msgstr "Seleziona una directory da esplorare."
 
 #.
 #. * The label for displaying number of files in path (without subdirs)
 #.
-#: ../src/browser.c:3091
-#, fuzzy
-msgid "… file(s)"
-msgstr "%u file"
+#. Translators: No files, as in "0 files".
+#: ../src/browser.c:3153 ../src/easytag.c:3469
+msgid "No files"
+msgstr "Nessun file"
 
-#: ../src/browser.c:3212
+#: ../src/browser.c:3231
 msgid "Artist & Album"
-msgstr "Artista & Album"
+msgstr "Artista e album"
 
-#: ../src/browser.c:3695
-msgid "Rename the directory"
-msgstr "Rinomina la cartella"
+#. Only directories changed
+#: ../src/browser.c:3595 ../src/easytag.c:2881
+msgid "Rename Directory"
+msgstr "Rinomina directory"
 
-#: ../src/browser.c:3711
+#: ../src/browser.c:3617
 #, c-format
-msgid "Rename the directory '%s' to : "
-msgstr "Rinomina la cartella '%s' in: "
+msgid "Rename the directory '%s' to:"
+msgstr "Rinomina la directory «%s» in:"
 
-#: ../src/browser.c:3730 ../src/misc.c:1270
-msgid "Use mask :"
-msgstr "Usa maschera:"
+#: ../src/browser.c:3636 ../src/misc.c:1172
+msgid "Use mask:"
+msgstr "Usare maschera:"
 
-#: ../src/browser.c:3733
+#: ../src/browser.c:3639
 msgid "If activated, it will use masks to rename directory."
-msgstr ""
-"Saranno usate delle maschere per rinominare le cartelle se questa opzione è "
-"attivata."
+msgstr "Se attivata, userà le maschere per rinominare la directory."
 
-#: ../src/browser.c:3751
+#: ../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 ""
-"Seleziona o scrivi in un una maschera utilizzando i codici (vedi Legenda "
-"nella Finestra Analizzatore) per rinominare la cartella dai campi "
-"dell'etichetta."
-
-#: ../src/browser.c:3771 ../src/misc.c:1291 ../src/misc.c:1389
-#: ../src/scan.c:2487 ../src/scan.c:2554 ../src/scan.c:2921
-msgid "Invalid Scanner Mask"
-msgstr "La Maschera Analizzatore non è valida"
+"Selezionare o digitare in una maschera usando i codici (vedere la legenda "
+"nella finestra dello scanner) per rinominare la directory dai campi delle "
+"etichette."
 
 #. Preview label
-#: ../src/browser.c:3777
-#, fuzzy
-msgid "Rename directory preview…"
-msgstr "Anteprima di rinomina cartella..."
+#: ../src/browser.c:3681
+msgid "Rename directory preview"
+msgstr "Anteprima directory rinominata"
 
-#: ../src/browser.c:3898
-#, fuzzy
+#: ../src/browser.c:3773
 msgid "You must type a directory name"
-msgstr "Devi scrivere il nome di una cartella!"
+msgstr "Digitare un nome directory"
 
-#: ../src/browser.c:3899 ../src/browser.c:3920
-#, fuzzy
+#: ../src/browser.c:3774 ../src/browser.c:3795
 msgid "Directory Name Error"
-msgstr "Cartella rinominata"
+msgstr "Errore nome directory"
 
-#: ../src/browser.c:3917
-#, fuzzy, c-format
+#: ../src/browser.c:3792
+#, c-format
 msgid "Could not convert '%s' into filename encoding."
-msgstr "Non posso convertire il nome del file '%s' nella codifica di sistema."
+msgstr "Impossibile convertire «%s» nella codifica nome del file"
 
-#: ../src/browser.c:3919
+#: ../src/browser.c:3794
 msgid "Please use another name"
-msgstr ""
+msgstr "Usare un altro nome"
 
-#: ../src/browser.c:3989
-#, fuzzy, c-format
+#: ../src/browser.c:3864
+#, c-format
 msgid "The directory name '%s' already exists"
-msgstr ""
-"Il file della playlist '%s' esiste già!\n"
-"Sovrascrivo?"
+msgstr "Il nome directory «%s» esiste già."
 
-#: ../src/browser.c:3990 ../src/easytag.c:2965 ../src/easytag.c:3006
-#: ../src/easytag.c:3033 ../src/easytag.c:3075 ../src/easytag.c:3261
-#, fuzzy
+#: ../src/browser.c:3865 ../src/easytag.c:2964
 msgid "Rename File Error"
-msgstr "Rinomina File e Cartella"
+msgstr "Errore rinomina file"
 
-#: ../src/browser.c:4029
-#, fuzzy
+#: ../src/browser.c:3903 ../src/browser.c:3932
 msgid "Rename Directory Error"
-msgstr "Rinomina cartella..."
+msgstr "Errore rinomina directory"
 
-#: ../src/browser.c:4059
-#, fuzzy
-msgid "Directory Rename Error"
-msgstr "Cartella rinominata"
-
-#: ../src/browser.c:4099
+#: ../src/browser.c:3970
 msgid "Directory renamed"
-msgstr "Cartella rinominata"
+msgstr "Directory rinominata"
+
+#: ../src/browser.c:4006
+msgid "Browse Directory With"
+msgstr "Esplora directory con"
 
-#: ../src/browser.c:4174 ../src/browser.c:4332
-msgid "Program to run :"
-msgstr "Programma da eseguire:"
+#: ../src/browser.c:4022 ../src/browser.c:4148
+msgid "Program to run:"
+msgstr "Programma da avviare:"
 
-#: ../src/browser.c:4187
+#: ../src/browser.c:4034
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
-"Immetti il programma da eseguire e che riceverà la cartella corrente come "
+"Inserire il programma da avviare. Riceverà l'attuale directory come "
 "parametro."
 
-#: ../src/browser.c:4315
-#, fuzzy
-msgid "Open File with…"
-msgstr "Apri file con..."
+#: ../src/browser.c:4128
+msgid "Open Files With"
+msgstr "Apri file con"
 
-#: ../src/browser.c:4345
+#: ../src/browser.c:4160
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
-"Immetti il programma da eseguire che riceverà il file corrente come "
-"parametro."
-
-#: ../src/browser.c:4502
-msgid "You must type a program name!"
-msgstr "Devi immettere il nome di un programma!"
-
-#: ../src/browser.c:4503 ../src/browser.c:4520
-msgid "Program Name Error"
-msgstr ""
-
-#: ../src/browser.c:4518
-#, fuzzy, c-format
-msgid "The program '%s' cannot be found"
-msgstr "Non ho potuto trovare il programma '%s'!"
-
-#: ../src/browser.c:4567 ../src/misc.c:919
-#, c-format
-msgid "Can't execute %s (error %d)!\n"
-msgstr "Non è possibile eseguire %s (errore %d)!\n"
-
-#: ../src/browser.c:4586 ../src/misc.c:958
-msgid "Can't fork another process!\n"
-msgstr "Non posso eseguire una nuova istanza di un altro processo!\n"
+"Inserire il programma da avviare. Riceverà l'attuale file come parametro."
 
-#: ../src/browser.c:4621
-#, fuzzy, c-format
-msgid "Executed command: '%s %s'"
-msgstr "Comando eseguito:  '%s %s'"
-
-#: ../src/cddb.c:227
+#: ../src/cddb.c:313
 msgid "Artist / Album"
 msgstr "Artista / Album"
 
-#: ../src/cddb.c:227
+#: ../src/cddb.c:313
 msgid "Category"
 msgstr "Categoria"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
-#: ../src/cddb.c:228 ../src/cddb.c:438
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Track Name".
+#: ../src/cddb.c:314 ../src/cddb.c:489
 msgid "Track Name"
-msgstr "Nome Traccia"
+msgstr "Nome traccia"
 
-#: ../src/cddb.c:228
-msgid "Time"
-msgstr "Tempo"
+#: ../src/cddb.c:314
+msgid "Duration"
+msgstr "Durata"
 
-#: ../src/cddb.c:239
-msgid "CD Data Base Search"
-msgstr "Ricerca Database CD"
+#: ../src/cddb.c:326
+msgid "CDDB Search"
+msgstr "Ricerca CDDB"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: ../src/cddb.c:271
+#: ../src/cddb.c:346
 msgid "Automatic Search"
-msgstr "Ricerca Automatica"
+msgstr "Ricerca automatica"
 
-#: ../src/cddb.c:283
-msgid "Request CD database :"
-msgstr "Richiesta Database CD:"
+#: ../src/cddb.c:356
+msgid "Request CDDB"
+msgstr "Richiesta CDDB"
 
-#: ../src/cddb.c:293
+#: ../src/cddb.c:366
 msgid ""
-"Request automatically the CDDB database using the selected files (the order "
-"is important!) to generate the CddbID."
+"Request automatically the CDDB using the selected files (the order is "
+"important) to generate the CddbID"
 msgstr ""
-"Ricerca automaticamente il database CDDB usando il file selezionato "
-"(l'ordine è importante!) per generare il CddbID."
+"Richiede automaticamente CDDB usando i file selezionati (l'ordine è "
+"importante) per generare il CddbID."
 
-#: ../src/cddb.c:303 ../src/cddb.c:414
-#, fuzzy
-msgid "Stop the search…"
-msgstr "Interrompi la ricerca...  "
+#: ../src/cddb.c:377 ../src/cddb.c:457
+msgid "Stop the search"
+msgstr "Interrompe la ricerca"
 
 #. Check box to run the scanner
-#: ../src/cddb.c:310
-msgid "Use local Cddb"
-msgstr "Usa Cddb locale"
+#: ../src/cddb.c:384
+msgid "Use local CDDB"
+msgstr "Usare CDDB locale"
 
-#: ../src/cddb.c:313 ../src/cddb.c:766
+#: ../src/cddb.c:387 ../src/cddb.c:850
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
 msgstr ""
-"Verrà eseguita l'analisi selezionata in quel momento (la finestra "
-"dell'analizzatore deve essere aperta) quando questa opzione è attiva e dopo "
-"che i campi sono stati caricati."
+"Quando si attiva l'opzione, dopo il caricamento dei campi, l'attuale scanner "
+"selezionato sarà avviato (la finestra dello scanner deve essere aperta)."
 
 #.
 #. * 2 - Page for manual search
 #.
-#: ../src/cddb.c:358
+#: ../src/cddb.c:404
 msgid "Manual Search"
-msgstr "Ricerca Manuale"
+msgstr "Ricerca manuale"
 
-#: ../src/cddb.c:373
-msgid "Words :"
+#: ../src/cddb.c:416
+msgid "Words:"
 msgstr "Parole:"
 
-#: ../src/cddb.c:386
+#: ../src/cddb.c:429
 msgid "Enter the words to search (separated by a space or '+')"
-msgstr ""
-"Immetti le parole da cercare (separate da uno spazio o da un segno '+')"
+msgstr "Inserire le parole da cercare (separate da uno spazio o da «+»)"
 
 #.
 #. * Search options
 #.
-#: ../src/cddb.c:426
-msgid "Search In :"
-msgstr "Cerca In:"
+#: ../src/cddb.c:469
+msgid "Search In:"
+msgstr "Cerca in:"
 
-#: ../src/cddb.c:434
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "All fields".
+#: ../src/cddb.c:479
 msgid "All Fields"
-msgstr "Ogni Campo"
+msgstr "Tutti i campi"
 
-#: ../src/cddb.c:439 ../src/picture.c:812 ../src/prefs.c:841
+#. 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
 msgid "Other"
 msgstr "Altro"
 
-#: ../src/cddb.c:461
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "All Categories".
+#: ../src/cddb.c:516
 msgid "All Categories"
-msgstr "Ogni Categoria"
+msgstr "Tutte le categorie"
 
-#: ../src/cddb.c:463
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Blues".
+#: ../src/cddb.c:520
 msgid "Blues"
 msgstr "Blues"
 
-#: ../src/cddb.c:464
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Classical".
+#: ../src/cddb.c:523
 msgid "Classical"
 msgstr "Classica"
 
-#: ../src/cddb.c:465
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Country".
+#: ../src/cddb.c:526
 msgid "Country"
 msgstr "Country"
 
-#: ../src/cddb.c:466
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Folk".
+#: ../src/cddb.c:529
 msgid "Folk"
 msgstr "Folk"
 
-#: ../src/cddb.c:467
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Jazz".
+#: ../src/cddb.c:532
 msgid "Jazz"
 msgstr "Jazz"
 
-#.
-#. * Misc
-#.
-#: ../src/cddb.c:468 ../src/prefs.c:234 ../src/prefs.c:235
-msgid "Misc"
-msgstr "Varie"
-
-#: ../src/cddb.c:469
-msgid "Newage"
-msgstr "Newage"
-
-#: ../src/cddb.c:470
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Misc".
+#: ../src/cddb.c:535
+msgid "Misc."
+msgstr "Varia"
+
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "New age".
+#: ../src/cddb.c:538
+msgid "New Age"
+msgstr "New age"
+
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Reggae".
+#: ../src/cddb.c:541
 msgid "Reggae"
 msgstr "Reggae"
 
-#: ../src/cddb.c:471
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Rock".
+#: ../src/cddb.c:544
 msgid "Rock"
 msgstr "Rock"
 
-#: ../src/cddb.c:472
+#. Translators: This option is for the previous 'search in' option. For
+#. * instance, translate this as "Search in:" "Soundtrack".
+#: ../src/cddb.c:547
 msgid "Soundtrack"
 msgstr "Colonna sonora"
 
-#: ../src/cddb.c:509
-msgid "included : funk, soul, rap, pop, industrial, metal, etc."
+#: ../src/cddb.c:587
+msgid "included: funk, soul, rap, pop, industrial, metal, etc."
 msgstr "inclusi: funk, soul, rap, pop, industrial, metal, ecc."
 
-#: ../src/cddb.c:510
+#: ../src/cddb.c:588
 msgid "movies, shows"
-msgstr "film, spettacoli"
+msgstr "filmati, show"
 
-#: ../src/cddb.c:511
+#: ../src/cddb.c:589
 msgid "others that do not fit in the above categories"
-msgstr "altre che non rientrano nelle categorie precedenti"
+msgstr "altri che non rientrano nelle categorie sopra"
 
 #. Button to display/hide the categories
-#: ../src/cddb.c:514
-msgid " Categories "
-msgstr "Categorie "
+#: ../src/cddb.c:592
+msgid "Categories"
+msgstr "Categorie"
 
 #.
 #. * Results command
 #.
-#: ../src/cddb.c:522
-msgid "Results :"
+#: ../src/cddb.c:600
+msgid "Results:"
 msgstr "Risultati:"
 
-#: ../src/cddb.c:529 ../src/misc.c:1970
-msgid "Search :"
-msgstr "Cerca:"
+#: ../src/cddb.c:606 ../src/misc.c:1951
+msgid "Search:"
+msgstr "Ricerca:"
 
-#: ../src/cddb.c:543
+#: ../src/cddb.c:620
 msgid "Enter the words to search in the list below"
-msgstr "Immetti le parole da cercare nella lista seguente"
+msgstr "Inserire le parole da cercare nell'elenco qui sotto"
 
-#: ../src/cddb.c:555
+#: ../src/cddb.c:632
 msgid "Search Next"
-msgstr "Cerca Successivo"
+msgstr "Cerca successivo"
 
-#: ../src/cddb.c:561
+#: ../src/cddb.c:638
 msgid "Search Previous"
-msgstr "Cerca Precedente"
+msgstr "Cerca precedente"
 
-#: ../src/cddb.c:572
+#: ../src/cddb.c:649
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
-"Mostra solo linee rosse (o mostra tutte le linee) nella lista 'Artista / "
-"Album'"
+"Mostra solo le righe rosse (o mostra tutte le righe) nell'elenco «Artista / "
+"Album»"
 
-#: ../src/cddb.c:578 ../src/cddb.c:1505
+#: ../src/cddb.c:655
 msgid "Unselect all lines"
-msgstr "Deseleziona tutte le linee"
+msgstr "Deseleziona tutte le righe"
 
-#: ../src/cddb.c:584
+#: ../src/cddb.c:661
 msgid "Invert lines selection"
-msgstr "Inverti la selezione delle linee"
+msgstr "Inverte la selezione delle righe"
 
-#: ../src/cddb.c:590 ../src/cddb.c:1500
+#: ../src/cddb.c:670
 msgid "Select all lines"
-msgstr "Seleziona tutte le linee"
+msgstr "Seleziona tutte le righe"
 
-#: ../src/cddb.c:703
+#: ../src/cddb.c:788
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
 "You can also reorder lines in this list before using 'apply' button."
 msgstr ""
-"Seleziona le righe da 'applicare' alla propria lista di file. Saranno "
-"processate tutte le righe se non ne viene selezionata alcuna. Puoi anche "
-"riordinare le linee in questa lista prima di usare il pulsante 'Applica'."
+"Seleziona le righe da «applicare» all'elenco dei file. Tutte le righe "
+"saranno elaborate se nessuna riga è selezionata.\n"
+"È possibile riordinare le righe in questo elenco prima di usare il pulsante "
+"«applica»."
 
 #.
 #. * Apply results to fields...
 #.
-#: ../src/cddb.c:710
-msgid "Set Into :"
-msgstr "Imposta A:"
+#: ../src/cddb.c:795
+msgid "Set Into:"
+msgstr "Imposta dentro:"
 
-#: ../src/cddb.c:717
+#: ../src/cddb.c:801
 msgid "All"
 msgstr "Tutto"
 
-#: ../src/cddb.c:724
+#: ../src/cddb.c:808
 msgid "Track #"
-msgstr "Traccia #"
+msgstr "Traccia nr."
 
-#: ../src/cddb.c:725
+#: ../src/cddb.c:809
 msgid "# Tracks"
-msgstr "# Tracce"
+msgstr "Nr. tracce"
 
 #. Check box to run the scanner
-#: ../src/cddb.c:763 ../src/misc.c:3002
+#: ../src/cddb.c:847 ../src/misc.c:2992
 msgid "Run the current scanner for each file"
-msgstr "Esegui l'analisi corrente per ogni file"
+msgstr "Eseguire l'attuale scanner per ogni file"
 
 #. Check box to use DLM (also used in the preferences window)
-#: ../src/cddb.c:770
+#: ../src/cddb.c:854
 msgid "Match lines with the Levenshtein algorithm"
-msgstr "Corrispondi linee con l'algoritmo Levenshtein"
+msgstr "Confrontare le righe con l'algoritmo Levenshtein"
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: ../src/cddb.c:775 ../src/prefs.c:1410
+#: ../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 file "
-"name in the current folder, and to select the best match. This will be used "
-"when selecting the corresponding audio file, or applying cddb results, "
+"When activating this option, the Levenshtein algorithm (DLM: Damerau-"
+"Levenshtein Metric) will be used to match the CDDB title against every "
+"filename in the current folder, and to select the best match. This will be "
+"used when selecting the corresponding audio file, or applying CDDB results, "
 "instead of using directly the position order."
 msgstr ""
-"Verrà usato l'algoritmo Levenshtein (DLM: Metrica Damerau - Levenshtein) per "
-"far corrispondere il titolo CDDB con ogni nome di file nella cartella "
-"corrente e perselezionare il risultato migliore, se questa opzione è "
-"attivata. Sarà usato per selezionare il file audio corrispondente, o per "
-"applicare i risultati cddb, invece di usare direttamente l'ordine della "
-"posizione."
-
-#: ../src/cddb.c:787
+"Quando si attiva questa opzione, l'algoritmo di Levenshtein (DLM: Damerau-"
+"Levenshtein Metric) sarà usato per confrontare il titolo CDDB rispetto a "
+"ogni nome di file nell'attuale cartella, e selezionare la migliore "
+"corrispondenza. Questo sarà usato quando si seleziona il file audio "
+"corrispondente, o applicando i risultati CDDB, invece di usare direttamente "
+"l'ordine di posizione."
+
+#: ../src/cddb.c:871
 msgid "Load the selected lines or all lines (if no line selected)."
-msgstr "Carica le righe selezionate o tutte le righe (se non c'è selezione)."
+msgstr ""
+"Carica le righe selezionate oppure tutte le righe (se nessuna riga è "
+"selezionata)."
 
-#: ../src/cddb.c:796 ../src/misc.c:2226
-#, fuzzy
-msgid "Ready to search…"
-msgstr "Pronto a cercare..."
+#: ../src/cddb.c:881
+msgid "Ready to search"
+msgstr "Pronto a cercare"
 
-#: ../src/cddb.c:1320
+#: ../src/cddb.c:1352
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
-"Album: '%s', artista: '%s', lunghezza: '%s', anno: '%s', genere: '%s', ID: "
-"'%s'"
-
-#: ../src/cddb.c:1510
-msgid "Invert selection"
-msgstr "Inverti selezione"
-
-#: ../src/cddb.c:1518
-msgid "Sort by Track Number"
-msgstr "Ordina per Numero Traccia"
+"Album: «%s», artista: «%s», lunghezza: «%s», anno: «%s», genere: «%s», ID: "
+"«%s»"
 
-#: ../src/cddb.c:1523
-msgid "Sort by Track Name"
-msgstr "Ordina per Nome Traccia"
-
-#: ../src/cddb.c:1621
-#, fuzzy, c-format
+#: ../src/cddb.c:1588
+#, c-format
 msgid "Resolving host '%s'…"
-msgstr "Risolvo il nodo '%s'..."
+msgstr "Risoluzione host «%s»..."
 
 #: ../src/cddb.c:1629
 #, c-format
-msgid "Can't resolve host '%s' (%s)!"
-msgstr "Non riesco a risolvere il nodo '%s' (%s)!"
+msgid "Cannot create a new socket (%s)"
+msgstr "Impossibile creare un nuovo socket (%s)"
 
-#: ../src/cddb.c:1644
-#, c-format
-msgid "Can't create a new socket (%s)!"
-msgstr "Non riesco a creare un nuovo socket (%s)!"
+#: ../src/cddb.c:1643
+msgid "Cannot set options on the newly-created socket"
+msgstr "Impossibile impostare le opzioni sul nuovo socket creato"
 
-#. Open connection to the server
-#: ../src/cddb.c:1658
-#, fuzzy, c-format
+#. Open connection to the server.
+#: ../src/cddb.c:1647
+#, c-format
 msgid "Connecting to host '%s', port '%d'…"
-msgstr "Connessione al nodo '%s', porta '%d'..."
+msgstr "Connessione all'host «%s», porta «%d»..."
+
+#: ../src/cddb.c:1660
+#, c-format
+msgid "Cannot connect to host '%s' (%s)"
+msgstr "Impossibile connettersi all'host «%s» (%s)"
 
-#: ../src/cddb.c:1665
+#: ../src/cddb.c:1684
 #, c-format
-msgid "Can't connect to host '%s' (%s)!"
-msgstr "Non riesco a connettermi al nodo '%s' (%s)!"
+msgid "Cannot resolve host '%s' (%s)"
+msgstr "Impossibile risolvere l'host «%s» (%s)"
 
-#: ../src/cddb.c:1671
+#: ../src/cddb.c:1697
 #, c-format
 msgid "Connected to host '%s'"
-msgstr "Connesso al nodo '%s'"
+msgstr "Connesso all'host «%s»"
 
-#: ../src/cddb.c:1760
-#, fuzzy, c-format
+#: ../src/cddb.c:1778
+#, c-format
+msgid "Error while writing CDDB results to file '%s'"
+msgstr ""
+"Si è verificato un errore nello scrivere i risultati di CDDB nel file «%s»"
+
+#: ../src/cddb.c:1789
+#, c-format
 msgid "Receiving data (%s)…"
 msgstr "Ricezione dati (%s)..."
 
-#: ../src/cddb.c:1772
+#: ../src/cddb.c:1801
 #, c-format
-msgid "Error when reading cddb response (%s)!"
-msgstr "Si è verificato un errore leggendo la risposta cddb (%s)!"
+msgid "Error when reading CDDB response (%s)"
+msgstr "Si è verificato un errore nella lettura della risposta CDDB (%s)"
 
-#: ../src/cddb.c:1778
+#: ../src/cddb.c:1808
 #, c-format
-msgid "Can't create file '%s' (%s)"
-msgstr "Non riesco a creare il file '%s' (%s)"
+msgid "Cannot create file '%s' (%s)"
+msgstr "Impossibile creare il file «%s» (%s)"
 
-#: ../src/cddb.c:1828 ../src/misc.c:3160 ../src/setting.c:1393
+#: ../src/cddb.c:1849 ../src/setting.c:1256
 #, c-format
-msgid "Can't open file '%s' (%s)"
-msgstr "Non posso aprire il file '%s' (%s)"
+msgid "Cannot open file '%s' (%s)"
+msgstr "Impossibile aprire il file «%s» (%s)"
 
 #. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
 #. Send the request
@@ -1396,270 +1314,271 @@ msgstr "Non posso aprire il file '%s' (%s)"
 #. Send the request
 #. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: ../src/cddb.c:2270 ../src/cddb.c:2590 ../src/cddb.c:3453
-#, fuzzy
+#: ../src/cddb.c:2314 ../src/cddb.c:2643 ../src/cddb.c:3516
 msgid "Sending request…"
 msgstr "Invio richiesta..."
 
-#: ../src/cddb.c:2274 ../src/cddb.c:2594 ../src/cddb.c:3158 ../src/cddb.c:3457
+#: ../src/cddb.c:2318 ../src/cddb.c:2647 ../src/cddb.c:3216 ../src/cddb.c:3520
 #, c-format
-msgid "Can't send the request (%s)!"
-msgstr "Non riesco ad inviare la richiesta (%s)!"
+msgid "Cannot send the request (%s)"
+msgstr "Impossibile inviare la richiesta (%s)"
 
 #.
 #. * Read the answer
 #.
 #. Read the answer
-#: ../src/cddb.c:2296 ../src/cddb.c:3171 ../src/cddb.c:3466
-#, fuzzy
+#: ../src/cddb.c:2344 ../src/cddb.c:3230 ../src/cddb.c:3529
 msgid "Receiving data…"
 msgstr "Ricezione dati..."
 
-#: ../src/cddb.c:2303 ../src/cddb.c:2623 ../src/cddb.c:3178 ../src/cddb.c:3473
-msgid "The server returned a wrong answer!"
-msgstr "Il server ha fornito una risposta sbagliata!"
+#: ../src/cddb.c:2351 ../src/cddb.c:2676 ../src/cddb.c:3237 ../src/cddb.c:3536
+msgid "The server returned a bad response"
+msgstr "Il server ha restituito un responso d'errore"
 
-#: ../src/cddb.c:2317 ../src/cddb.c:2639 ../src/cddb.c:3193 ../src/cddb.c:3490
-#: ../src/cddb.c:3505
+#: ../src/cddb.c:2365 ../src/cddb.c:2692 ../src/cddb.c:3252 ../src/cddb.c:3553
+#: ../src/cddb.c:3568
 #, c-format
-msgid "The server returned a wrong answer! (%s)"
-msgstr "Il server ha fornito una risposta sbagliata! (%s)"
+msgid "The server returned a bad response: %s"
+msgstr "Il server ha restituito un responso d'errore: %s"
 
-#: ../src/cddb.c:2464
+#: ../src/cddb.c:2512
 #, c-format
-msgid "Sorry, the web-based search is currently down!"
-msgstr "Mi dispiace ma la ricerca basata sul web non è al momento disponibile!"
+msgid "Sorry, the web-based search is currently not available"
+msgstr "La ricerca basata sul web è attualmente non disponibile"
 
-#: ../src/cddb.c:2466 ../src/cddb.c:2811
+#: ../src/cddb.c:2514 ../src/cddb.c:2863
 #, c-format
-msgid "Found %d matching album(s)"
-msgstr "Sono stati trovati %d album corrispondenti"
+msgid "Found one matching album"
+msgid_plural "Found %d matching albums"
+msgstr[0] "Trovata un album corrispondente"
+msgstr[1] "Trovati %d album corrispondenti"
 
-#: ../src/cddb.c:2611
-#, fuzzy, c-format
+#: ../src/cddb.c:2664
+#, c-format
 msgid "Receiving data of page %d (album %d/%d)…"
-msgstr "Sto ricevendo i dati della pagina %d..."
+msgstr "Ricezione dati di pagina %d (album %d/%d)..."
 
-#: ../src/cddb.c:2613
-#, fuzzy, c-format
+#: ../src/cddb.c:2666
+#, c-format
 msgid "Receiving data of page %d…"
-msgstr "Sto ricevendo i dati della pagina %d..."
+msgstr "Ricezione dati di pagina %d..."
 
-#: ../src/cddb.c:2778
-#, fuzzy, c-format
+#: ../src/cddb.c:2830
+#, c-format
 msgid "More results to load…"
 msgstr "Altri risultati da caricare..."
 
-#: ../src/cddb.c:2907
+#: ../src/cddb.c:2959
 #, c-format
-msgid "No file selected!"
-msgstr "Non è stato selezionato alcun file!"
+msgid "No file selected"
+msgstr "Nessun file selezionato"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: ../src/cddb.c:2915
+#: ../src/cddb.c:2967
 #, c-format
-msgid "More than 99 files selected! Can't send request!"
-msgstr ""
+msgid "More than 99 files selected. Cannot send request"
+msgstr "Più di 99 file selezionati. Impossibile inviare la richiesta"
 
-#: ../src/cddb.c:2921
+#: ../src/cddb.c:2973
 #, c-format
-msgid "%d file(s) selected!"
-msgstr "%d file selezionati!"
+msgid "One file selected"
+msgid_plural "%d files selected"
+msgstr[0] "Un file selezionato"
+msgstr[1] "%d file selezionati"
 
-#: ../src/cddb.c:3001
-msgid "The path for 'Local CD Data Base' was not defined"
-msgstr ""
+#: ../src/cddb.c:3056
+msgid "The path for 'Local CD Database' was not defined"
+msgstr "Il percorso per il «Database CD locale» non è stato definito"
 
-#: ../src/cddb.c:3003
-#, fuzzy
-msgid "Local CD search…"
-msgstr "Ricerca CD locale..."
+#. Translators: 'it' in this sentence refers to the local CD
+#. * database path.
+#: ../src/cddb.c:3059
+msgid "Enter it in the preferences window before using this search."
+msgstr "Inserirlo nella finestra delle preferenze prima di usare la ricerca."
+
+#: ../src/cddb.c:3061
+msgid "Local CD search"
+msgstr "Ricerca CD locale"
 
 #. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
-#: ../src/cddb.c:3148
-#, fuzzy, c-format
+#: ../src/cddb.c:3206
+#, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"
-msgstr "Invio richiesta (CddbId: %s, #tracce: %d, Lunghezza disco: %d)..."
+msgstr "Invio richiesta (CddbId: %s, nr. tracce: %d, lunghezza disco: %d)..."
 
-#: ../src/cddb.c:3301
+#: ../src/cddb.c:3363
 #, c-format
-msgid "Found %d matching album(s) for DiscID '%s'"
-msgstr "Sono stati trovati %d album corrispondenti per DiscID '%s'"
+msgid "DiscID '%s' gave one matching album"
+msgid_plural "DiscID '%s' gave %d matching albums"
+msgstr[0] "DiscID «%s» ha un album che corrisponde"
+msgstr[1] "DiscID «%s» ha %d album che corrispondono"
 
-#: ../src/cddb.c:3397
+#: ../src/cddb.c:3460
 #, c-format
-msgid "Can't load file: '%s' (%s)!"
-msgstr "Non posso caricare il file: '%s' (%s)!"
+msgid "Can't load file: '%s' (%s)."
+msgstr "Impossibile caricare il file: «%s» (%s)."
 
 #. Load the track list of the album
-#: ../src/cddb.c:3696
-#, fuzzy
+#: ../src/cddb.c:3759
 msgid "Loading album track list…"
-msgstr "Sto caricando l'elenco delle tracce dell'album..."
+msgstr "Caricamento elenco tracce dell'album..."
 
-#: ../src/cddb.c:3896
-#, fuzzy, c-format
-msgid ""
-"You are applying %d lines of the CDDB results to %d lines in the list of "
-"files"
+#: ../src/cddb.c:3958
+msgid "The number of CDDB results does not match the number of selected files"
 msgstr ""
-"Attento! Stai per applicare %d linee di risultati CDDB a %d linee nella "
-"lista dei file!\n"
-"\n"
-"Vuoi davvero continuare?"
+"Il numero di risultati CDDB non corrisponde al numero di file selezionati"
 
-#: ../src/cddb.c:3901
-#, fuzzy
-msgid "Write Tag from CDDB…"
-msgstr "Scrivi Etichette da CDDB..."
+#: ../src/cddb.c:3962
+msgid "Write Tag from CDDB"
+msgstr "Scrivere etichette da CDDB"
 
-#: ../src/charset.c:49
+#: ../src/charset.c:47
 msgid "Arabic (IBM-864)"
 msgstr "Arabo (IBM-864)"
 
-#: ../src/charset.c:50
+#: ../src/charset.c:48
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabo (ISO-8859-6)"
 
-#: ../src/charset.c:51
+#: ../src/charset.c:49
 msgid "Arabic (Windows-1256)"
 msgstr "Arabo (Windows-1256)"
 
-#: ../src/charset.c:52
+#: ../src/charset.c:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltico (ISO-8859-13)"
 
-#: ../src/charset.c:53
+#: ../src/charset.c:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltico (ISO-8859-4)"
 
-#: ../src/charset.c:54
+#: ../src/charset.c:52
 msgid "Baltic (Windows-1257)"
 msgstr "Baltico (Windows-1257)"
 
-#: ../src/charset.c:55
+#: ../src/charset.c:53
 msgid "Celtic (ISO-8859-14)"
 msgstr "Celtico (ISO-8859-14)"
 
-#: ../src/charset.c:56
+#: ../src/charset.c:54
 msgid "Central European (IBM-852)"
-msgstr "Europeo Centrale (IBM-852)"
+msgstr "Europeo centrale (IBM-852)"
 
-#: ../src/charset.c:57
+#: ../src/charset.c:55
 msgid "Central European (ISO-8859-2)"
-msgstr "Europeo Centrale (ISO-8859-2)"
+msgstr "Europeo centrale (ISO-8859-2)"
 
-#: ../src/charset.c:58
+#: ../src/charset.c:56
 msgid "Central European (Windows-1250)"
-msgstr "Europeo Centrale (Windows-1250)"
+msgstr "Europeo centrale (Windows-1250)"
 
-#: ../src/charset.c:59
+#: ../src/charset.c:57
 msgid "Chinese Simplified (GB18030)"
-msgstr "Cinese Semplificato (GB18030)"
+msgstr "Cinese semplificato (GB18030)"
 
-#: ../src/charset.c:60
+#: ../src/charset.c:58
 msgid "Chinese Simplified (GB2312)"
-msgstr "Cinese Semplificato (GB2312)"
+msgstr "Cinese semplificato (GB2312)"
 
-#: ../src/charset.c:61
+#: ../src/charset.c:59
 msgid "Chinese Traditional (Big5)"
-msgstr "Cinese Tradizionale (Big5)"
+msgstr "Cinese tradizionale (Big5)"
 
-#: ../src/charset.c:62
+#: ../src/charset.c:60
 msgid "Chinese Traditional (Big5-HKSCS)"
-msgstr "Cinese Tradizionale (Big5-HKSCS)"
+msgstr "Cinese tradizionale (Big5-HKSCS)"
 
-#: ../src/charset.c:63
+#: ../src/charset.c:61
 msgid "Cyrillic (IBM-855)"
 msgstr "Cirillico (IBM-855)"
 
-#: ../src/charset.c:64
+#: ../src/charset.c:62
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirillico (ISO-8859-5)"
 
-#: ../src/charset.c:65
+#: ../src/charset.c:63
 msgid "Cyrillic (ISO-IR-111)"
 msgstr "Cirillico (ISO-IR-111)"
 
-#: ../src/charset.c:66
+#: ../src/charset.c:64
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirillico (KOI8-R)"
 
-#: ../src/charset.c:67
+#: ../src/charset.c:65
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirillico (Windows-1251)"
 
-#: ../src/charset.c:68
+#: ../src/charset.c:66
 msgid "Cyrillic/Russian (CP-866)"
-msgstr "Cirillico/Russo (CP-866)"
+msgstr "Cirillico/Russo (IBM-866)"
 
-#: ../src/charset.c:69
+#: ../src/charset.c:67
 msgid "Cyrillic/Ukrainian (KOI8-U)"
 msgstr "Cirillico/Ucraino (KOI8-U)"
 
-#: ../src/charset.c:70
+#: ../src/charset.c:68
 msgid "English (US-ASCII)"
 msgstr "Inglese (US-ASCII)"
 
-#: ../src/charset.c:71
+#: ../src/charset.c:69
 msgid "Greek (ISO-8859-7)"
 msgstr "Greco (ISO-8859-7)"
 
-#: ../src/charset.c:72
+#: ../src/charset.c:70
 msgid "Greek (Windows-1253)"
 msgstr "Greco (Windows-1253)"
 
-#: ../src/charset.c:73
+#: ../src/charset.c:71
 msgid "Hebrew (IBM-862)"
-msgstr "Ebreo (IBM-862)"
+msgstr "Ebraico (IBM-862)"
 
-#: ../src/charset.c:74
+#: ../src/charset.c:72
 msgid "Hebrew (Windows-1255)"
-msgstr "Ebreo (Windows-1255)"
+msgstr "Ebraico (Windows-1255)"
 
-#: ../src/charset.c:75
+#: ../src/charset.c:73
 msgid "Japanese (EUC-JP)"
 msgstr "Giapponese (EUC-JP)"
 
-#: ../src/charset.c:76
+#: ../src/charset.c:74
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Giapponese (ISO-2022-JP)"
 
-#: ../src/charset.c:77
+#: ../src/charset.c:75
 msgid "Japanese (Shift_JIS)"
-msgstr "Giapponese (Shift_JIS)"
+msgstr "Giapponese (Shift-JIS)"
 
-#: ../src/charset.c:78
+#: ../src/charset.c:76
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: ../src/charset.c:79
+#: ../src/charset.c:77
 msgid "Nordic (ISO-8859-10)"
 msgstr "Nordico (ISO-8859-10)"
 
-#: ../src/charset.c:80
+#: ../src/charset.c:78
 msgid "South European (ISO-8859-3)"
 msgstr "Sud europeo (ISO-8859-3)"
 
-#: ../src/charset.c:81
+#: ../src/charset.c:79
 msgid "Thai (TIS-620)"
-msgstr "Thai (TIS-620)"
+msgstr "Tailandese (TIS-620)"
 
-#: ../src/charset.c:82
+#: ../src/charset.c:80
 msgid "Turkish (IBM-857)"
 msgstr "Turco (IBM-857)"
 
-#: ../src/charset.c:83
+#: ../src/charset.c:81
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: ../src/charset.c:84
+#: ../src/charset.c:82
 msgid "Turkish (Windows-1254)"
 msgstr "Turco (Windows-1254)"
 
 #. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
-#: ../src/charset.c:86
+#: ../src/charset.c:84
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
@@ -1667,1682 +1586,1381 @@ msgstr "Unicode (UTF-8)"
 #. {N_("Unicode (UTF-16LE)"),                "UTF-16LE"      },
 #. {N_("Unicode (UTF-32BE)"),                "UTF-32BE"      },
 #. {N_("Unicode (UTF-32LE)"),                "UTF-32LE"      },
-#: ../src/charset.c:93
+#: ../src/charset.c:91
 msgid "Vietnamese (VISCII)"
 msgstr "Vietnamita (VISCII)"
 
-#: ../src/charset.c:94
+#: ../src/charset.c:92
 msgid "Vietnamese (Windows-1258)"
 msgstr "Vietnamita (Windows-1258)"
 
-#: ../src/charset.c:95
+#: ../src/charset.c:93
 msgid "Visual Hebrew (ISO-8859-8)"
-msgstr "Ebreo visuale (ISO-8859-8)"
+msgstr "Ebraico visuale (ISO-8859-8)"
 
-#: ../src/charset.c:96
+#: ../src/charset.c:94
 msgid "Western (IBM-850)"
 msgstr "Occidentale (IBM-850)"
 
-#: ../src/charset.c:97
+#: ../src/charset.c:95
 msgid "Western (ISO-8859-1)"
 msgstr "Occidentale (ISO-8859-1)"
 
-#: ../src/charset.c:98
+#: ../src/charset.c:96
 msgid "Western (ISO-8859-15)"
 msgstr "Occidentale (ISO-8859-15)"
 
-#: ../src/charset.c:99
+#: ../src/charset.c:97
 msgid "Western (Windows-1252)"
 msgstr "Occidentale (Windows-1252)"
 
-#: ../src/charset.c:544
-#, fuzzy, c-format
+#: ../src/charset.c:511
+#, c-format
 msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
-msgstr ""
-"Il nome del file '%s' non ha potuto essere convertito nel formato UTF-8 "
-"(%s).\n"
+msgstr "Impossibile convertire il nome del file «%s» in UTF-8 (%s)."
 
-#: ../src/charset.c:545 ../src/charset.c:644 ../src/charset.c:708
+#: ../src/charset.c:512 ../src/charset.c:611 ../src/charset.c:674
 msgid "Invalid UTF-8"
 msgstr "UTF-8 non valido"
 
-#: ../src/charset.c:643
-#, fuzzy, c-format
+#: ../src/charset.c:610
+#, c-format
 msgid ""
 "The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
-"La stringa UTF-8 '%s' potrebbe non venir convertita nella codifica del file "
-"(%s)\n"
+"Impossibile convertire la stringa UTF-8 «%s» nella codifica del nome del "
+"file (%s)."
 
-#: ../src/charset.c:707
-#, fuzzy, c-format
+#: ../src/charset.c:673
+#, c-format
 msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
-msgstr ""
-"La stringa '%s' non ha potuto essere convertito nel formato UTF-8 (%s).\n"
+msgstr "Impossibile convertire la stringa «%s» in UTF-8 (%s)."
 
 #. Starting messages
-#: ../src/easytag.c:195
-#, fuzzy, c-format
-msgid "Starting EasyTAG %s (PId: %d)…"
-msgstr "Avvio EasyTAG %s (PId: %d) ..."
-
-#: ../src/easytag.c:197
-#, fuzzy, c-format
-msgid "Currently using libid3tag version %s…"
-msgstr "Attualmente sto utilizzando la versione %d.%d.%d di id3lib..."
+#: ../src/easytag.c:185
+#, c-format
+msgid "Starting EasyTAG version %s (PID: %d)…"
+msgstr "Avvio EasyTAG versione %s (PID: %d)..."
 
-#: ../src/easytag.c:200
-#, fuzzy, c-format
-msgid "Currently using id3lib version %d.%d.%d…"
-msgstr "Attualmente sto utilizzando la versione %d.%d.%d di id3lib..."
+#: ../src/easytag.c:187
+#, c-format
+msgid "Using libid3tag version %s"
+msgstr "Usa libid3tag versione %s"
 
-#: ../src/easytag.c:207
+#: ../src/easytag.c:190
 #, c-format
-msgid "Variable EASYTAGLANG defined. Setting locale : '%s'"
-msgstr ""
-"La variabile EASYTAGLANG è stata definita. Imposto la localizzazione: '%s' "
+msgid "Using id3lib version %d.%d.%d"
+msgstr "Usa id3lib versione %d.%d.%d"
 
-#: ../src/easytag.c:209
+#: ../src/easytag.c:196
 #, c-format
-msgid "Setting locale : '%s'"
-msgstr "Imposto localizzazione : '%s'"
+msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
+msgstr "Variabile EASYTAGLANG definita. Impostazione localizzazione: «%s»"
 
-#: ../src/easytag.c:213
-#, fuzzy, c-format
-msgid "Currently using locale '%s' (and eventually '%s')…"
-msgstr ""
-"Attualmente sto usando la localizzazione '%s' (ed eventualmente '%s')..."
+#: ../src/easytag.c:198
+#, c-format
+msgid "Setting locale: '%s'"
+msgstr "Impostazione localizzazione: «%s»"
 
-#: ../src/easytag.c:229
+#: ../src/easytag.c:203
 #, c-format
-msgid "%s %s by %s (compiled %s, %s)\n"
-msgstr "%s %s da %s (compilato %s, %s)\n"
+msgid "Currently using locale '%s' (and eventually '%s')"
+msgstr "Attualmente usa la localizzazione «%s» (ed eventualmente «%s»)"
+
+#: ../src/easytag.c:210
+msgid "Unable to create setting directories"
+msgstr "Impossibile creare le directory di impostazioni"
 
-#: ../src/easytag.c:231
+#: ../src/easytag.c:427 ../src/et_core.c:597 ../src/et_core.c:609
 #, c-format
-msgid "Web Page: %s"
-msgstr "Pagina Web: %s"
+msgid "Error while querying information for file: '%s' (%s)"
+msgstr ""
+"Si è verificato un errore cercando le informazioni per il file: «%s» (%s)"
 
-#: ../src/easytag.c:306
+#: ../src/easytag.c:490
 #, c-format
-msgid "Unknown parameter or path '%s'\n"
-msgstr "Parametro o percorso sconosciuto '%s'\n"
+msgid "Cannot open path '%s'"
+msgstr "Impossibile aprire il percorso «%s»"
 
 #.
 #. * Browser
 #.
-#: ../src/easytag.c:430 ../src/prefs.c:142 ../src/prefs.c:143
+#: ../src/easytag.c:582 ../src/prefs.c:142
 msgid "Browser"
-msgstr "Navigatore"
+msgstr "Esploratore"
 
-#: ../src/easytag.c:451 ../src/et_core.c:2691
+#: ../src/easytag.c:604 ../src/et_core.c:2817
 msgid "File"
 msgstr "File"
 
-#: ../src/easytag.c:474
-msgid "Read Only File"
-msgstr "File in sola lettura"
-
-#: ../src/easytag.c:477
-msgid "File Link Broken"
-msgstr "Il collegamento del file è interrotto"
-
 #. Default values are MPs data
-#. MPEG, Layer versions
-#: ../src/easytag.c:491 ../src/easytag.c:4423 ../src/mpeg_header.c:354
-msgid "MPEG"
-msgstr "MPEG"
-
-#: ../src/easytag.c:493 ../src/easytag.c:4424
-msgid "?, Layer ?"
-msgstr "?, Livello ?"
+#. Nothing to display
+#. gtk_label_set_text(GTK_LABEL(VersionLabel),"");
+#. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
+#. Version changed to encoder version
+#. Encoder version
+#: ../src/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 "Codificatore:"
 
-#: ../src/easytag.c:498
+#: ../src/easytag.c:644
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: ../src/easytag.c:500 ../src/easytag.c:4425
-msgid "? kb/s"
-msgstr "? kb/s"
-
-#: ../src/easytag.c:505
-msgid "Freq:"
-msgstr "Freq:"
-
-#: ../src/easytag.c:507 ../src/easytag.c:4426
-msgid "? Hz"
-msgstr "? Hz"
+#. Translators: Please try to keep this string as short as possible as it
+#. * is shown in a narrow column.
+#: ../src/easytag.c:654
+msgid "Frequency:"
+msgstr "Frequenza:"
 
 #. Mode
-#: ../src/easytag.c:515 ../src/easytag.c:4427 ../src/mpeg_header.c:377
+#: ../src/easytag.c:665 ../src/easytag.c:4236 ../src/mpeg_header.c:216
 msgid "Mode:"
 msgstr "Modalità:"
 
-#: ../src/easytag.c:517 ../src/easytag.c:531 ../src/easytag.c:4428
-#: ../src/easytag.c:4429 ../src/easytag.c:4430
-msgid "?"
-msgstr "?"
-
-#: ../src/easytag.c:522
+#: ../src/easytag.c:672
 msgid "Size:"
 msgstr "Dimensione:"
 
-#: ../src/easytag.c:524
-msgid "? kb"
-msgstr "? kb"
-
-#: ../src/easytag.c:529
-msgid "Time:"
-msgstr "Tempo:"
+#: ../src/easytag.c:679
+msgid "Duration:"
+msgstr "Durata:"
 
 #. Main Frame
-#: ../src/easytag.c:571 ../src/et_core.c:2629
+#: ../src/easytag.c:726 ../src/et_core.c:2747
 msgid "Tag"
 msgstr "Etichetta"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: ../src/easytag.c:593
+#: ../src/easytag.c:748
 msgid "Common"
 msgstr "Comune"
 
 #. Title
-#: ../src/easytag.c:605
+#: ../src/easytag.c:755
 msgid "Title:"
 msgstr "Titolo:"
 
-#: ../src/easytag.c:618
+#: ../src/easytag.c:769
 msgid "Tag selected files with this title"
 msgstr "Etichetta i file selezionati con questo titolo"
 
 #. Artist
-#: ../src/easytag.c:625
+#: ../src/easytag.c:774
 msgid "Artist:"
 msgstr "Artista:"
 
-#: ../src/easytag.c:637
+#: ../src/easytag.c:788
 msgid "Tag selected files with this artist"
-msgstr "Etichetta i file selezionati con questo artista"
+msgstr "Etichetta i file selezionati con quest'artista"
 
 #. Album Artist
-#: ../src/easytag.c:643
-#, fuzzy
-msgid "Album Artist:"
-msgstr "Artista:"
+#: ../src/easytag.c:793
+msgid "Album artist:"
+msgstr "Artista dell'album:"
 
-#: ../src/easytag.c:655
-#, fuzzy
+#: ../src/easytag.c:807
 msgid "Tag selected files with this album artist"
-msgstr "Etichetta i file selezionati con questo artista"
+msgstr "Etichetta i file selezionati con questo artista dell'album"
 
 #. Album
-#: ../src/easytag.c:661
+#: ../src/easytag.c:812
 msgid "Album:"
 msgstr "Album:"
 
-#: ../src/easytag.c:674
+#: ../src/easytag.c:826
 msgid "Tag selected files with this album name"
-msgstr "Etichetta i file selezionati con questo nome d'album"
+msgstr "Etichetta i file selezionati con questo nome dell'album"
 
 #. Disc Number
-#: ../src/easytag.c:680
+#: ../src/easytag.c:831
 msgid "CD:"
 msgstr "CD:"
 
-#: ../src/easytag.c:696
+#: ../src/easytag.c:848
 msgid "Tag selected files with this disc number"
 msgstr "Etichetta i file selezionati con questo numero di disco"
 
 #. Year
-#: ../src/easytag.c:702
+#: ../src/easytag.c:853
 msgid "Year:"
 msgstr "Anno:"
 
-#: ../src/easytag.c:719
+#: ../src/easytag.c:873
 msgid "Tag selected files with this year"
 msgstr "Etichetta i file selezionati con questo anno"
 
-#: ../src/easytag.c:731
+#: ../src/easytag.c:887
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
-"Numera tutte le tracce in sequenza. Inizia con 01 in ogni sottocartella."
+"Numera le tracce selezionate in sequenza. Inizia con 01 in ogni "
+"sottodirectory."
 
 #. To have enough space to display the icon
 #. To have enough space to display the icon
-#: ../src/easytag.c:740
+#: ../src/easytag.c:896
 msgid "Track #:"
-msgstr "Traccia #:"
+msgstr "Traccia nr.:"
 
-#: ../src/easytag.c:767
+#: ../src/easytag.c:927
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr ""
-"Imposta il numero di file alle tracce selezionate, nella stessa cartella del "
-"file visualizzato."
+"Imposta il numero dei file, nella stessa directory del file mostrato, alle "
+"tracce selezionate."
 
-#: ../src/easytag.c:786
+#: ../src/easytag.c:947
 msgid "Tag selected files with this number of tracks"
 msgstr "Etichetta i file selezionati con questo numero di tracce"
 
 #. Genre
-#: ../src/easytag.c:792
+#: ../src/easytag.c:951
 msgid "Genre:"
 msgstr "Genere:"
 
-#: ../src/easytag.c:818
+#: ../src/easytag.c:979
 msgid "Tag selected files with this genre"
 msgstr "Etichetta i file selezionati con questo genere"
 
 #. Comment
-#: ../src/easytag.c:824
+#: ../src/easytag.c:984
 msgid "Comment:"
 msgstr "Commento:"
 
-#: ../src/easytag.c:849
+#: ../src/easytag.c:1011
 msgid "Tag selected files with this comment"
 msgstr "Etichetta i file selezionati con questo commento"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
-#. g_object_set_data(G_OBJECT(CommentView),"MButtonName",CommentMButton);
 #. Composer (name of the composers)
-#: ../src/easytag.c:858
+#: ../src/easytag.c:1018
 msgid "Composer:"
 msgstr "Compositore:"
 
-#: ../src/easytag.c:870
+#: ../src/easytag.c:1032
 msgid "Tag selected files with this composer"
 msgstr "Etichetta i file selezionati con questo compositore"
 
-#. Original Artist / Performer
-#: ../src/easytag.c:877
-msgid "Orig. Artist:"
-msgstr "Artista Originale:"
+#. 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:1039
+msgid "Orig. artist:"
+msgstr "Artista originale:"
 
-#: ../src/easytag.c:889
+#: ../src/easytag.c:1053
 msgid "Tag selected files with this original artist"
 msgstr "Etichetta i file selezionati con questo artista originale"
 
 #. Copyright
-#: ../src/easytag.c:896
+#: ../src/easytag.c:1059
 msgid "Copyright:"
-msgstr "Diritti d'autore:"
+msgstr "Copyright:"
 
-#: ../src/easytag.c:908
+#: ../src/easytag.c:1073
 msgid "Tag selected files with this copyright"
-msgstr "Etichetta i file selezionati con questi diritti d'autore"
+msgstr "Etichetta i file selezionati con questo copyright"
 
 #. URL
-#: ../src/easytag.c:915
+#: ../src/easytag.c:1079
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/easytag.c:927
+#: ../src/easytag.c:1093
 msgid "Tag selected files with this URL"
-msgstr "Etichetta i file selezionati con questa URL"
+msgstr "Etichetta i file selezionati con questo URL"
 
 #. Encoded by
-#: ../src/easytag.c:934
+#: ../src/easytag.c:1099
 msgid "Encoded by:"
-msgstr "Codificato da:"
+msgstr "Codificato con:"
 
-#: ../src/easytag.c:946
+#: ../src/easytag.c:1113
 msgid "Tag selected files with this encoder name"
-msgstr "Etichetta i file codificati con questo nome di codificatore"
+msgstr "Etichetta i file selezionati con questo codificatore"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1009
-msgid "Pictures"
+#: ../src/easytag.c:1147 ../src/et_core.c:3189 ../src/et_core.c:3192
+msgid "Images"
 msgstr "Immagini"
 
-#. Picture
-#: ../src/easytag.c:1020
-msgid "Pictures:"
-msgstr "Immagini:"
-
-#: ../src/easytag.c:1040
-msgid "You can use drag and drop to add picture."
-msgstr "Puoi usare il trascina e rilascia per aggiungere delle immagini."
+#: ../src/easytag.c:1171
+msgid "You can use drag and drop to add an image"
+msgstr "È possibile usare il trascina e rilascia per aggiungere un'immagine"
 
-#: ../src/easytag.c:1078
-msgid "Tag selected files with these pictures"
-msgstr "Etichetta i file selezionati con queste immagini"
+#: ../src/easytag.c:1218
+msgid "Add images to the tag"
+msgstr "Aggiunge le immagini all'etichetta"
 
-#: ../src/easytag.c:1088
-msgid "Add pictures to the tag (drag and drop is also available)."
-msgstr ""
-"Aggiungi le immagini all'etichetta (è disponibile anche il trascina e "
-"rilascia). "
+#: ../src/easytag.c:1236
+msgid "Remove selected images from the tag"
+msgstr "Rimuove le immagini selezionate dall'etichetta"
 
-#: ../src/easytag.c:1094
-msgid "Remove selected pictures, else all pictures."
-msgstr "Rimuovi le immagini selezionate o tutte le immagini."
+#: ../src/easytag.c:1250
+msgid "Save the selected images to files"
+msgstr "Salva le immagini selezionate nei file"
 
-#: ../src/easytag.c:1104
-msgid "Save the selected pictures on the hard disk."
-msgstr "Salva le immagini selezionate sul disco rigido."
+#: ../src/easytag.c:1261
+msgid "Edit image properties"
+msgstr "Modifica le proprietà dell'immagine"
 
-#: ../src/easytag.c:1111
-msgid "Set properties of the selected pictures."
-msgstr "Imposta le proprietà delle immagini selezionate."
+#: ../src/easytag.c:1275
+msgid "Tag selected files with these images"
+msgstr "Etichetta i file selezionati con queste immagini"
 
-#: ../src/easytag.c:1191
+#: ../src/easytag.c:1333
 #, c-format
 msgid "Selected files tagged with title '%s'."
-msgstr "I file selezionati sono stati etichettati con il titolo '%s'."
+msgstr "File selezionati etichettati con il titolo «%s»."
 
-#: ../src/easytag.c:1193
+#: ../src/easytag.c:1335
 msgid "Removed title from selected files."
-msgstr "Il titolo è stato rimosso dai file selezionati."
+msgstr "Titolo rimosso dai file selezionati."
 
-#: ../src/easytag.c:1210
+#: ../src/easytag.c:1350
 #, c-format
 msgid "Selected files tagged with artist '%s'."
-msgstr "I file selezionati sono stati etichettati con l'artista '%s'."
+msgstr "File selezionati etichettati con l'artista «%s»."
 
-#: ../src/easytag.c:1212
+#: ../src/easytag.c:1352
 msgid "Removed artist from selected files."
-msgstr "L'artista è stato rimosso dai file selezionati."
+msgstr "Artista rimosso dai file selezionati."
 
-#: ../src/easytag.c:1229
-#, fuzzy, c-format
+#: ../src/easytag.c:1366
+#, c-format
 msgid "Selected files tagged with album artist '%s'."
-msgstr "I file selezionati sono stati etichettati con l'artista '%s'."
+msgstr "File selezionati etichettati con artista dell'album «%s»."
 
-#: ../src/easytag.c:1231
-#, fuzzy
+#: ../src/easytag.c:1368
 msgid "Removed album artist from selected files."
-msgstr "L'artista è stato rimosso dai file selezionati."
+msgstr "Artista dell'album rimosso dai file selezionati."
 
-#: ../src/easytag.c:1248
+#: ../src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with album '%s'."
-msgstr ""
-"I file selezionati sono stati etichettati con con il nome d'album '%s'."
+msgstr "File selezionati etichettati con l'album «%s»."
 
-#: ../src/easytag.c:1250
+#: ../src/easytag.c:1385
 msgid "Removed album name from selected files."
-msgstr "Il nome dell'album è stato rimosso dai file selezionati."
+msgstr "Nome dell'album rimosso dai file selezionati."
+
+#: ../src/easytag.c:1422
+#, c-format
+msgid "Selected files tagged with disc number '%s/%s'."
+msgstr "File selezionati etichettati con il numero di disco «%s/%s»."
 
-#: ../src/easytag.c:1267
+#: ../src/easytag.c:1427
 #, c-format
-msgid "Selected files tagged with disc number '%s'."
-msgstr "I file selezionati sono stati etichettati con il numero di disco '%s'."
+msgid "Selected files tagged with disc number like 'xx'."
+msgstr "File selezionati etichettati con il numero di disco come «xx»."
 
-#: ../src/easytag.c:1269
+#: ../src/easytag.c:1432
 msgid "Removed disc number from selected files."
-msgstr "Il numero di disco è stato rimosso dai file selezionati."
+msgstr "Numero del disco rimosso dai file selezionati."
 
-#: ../src/easytag.c:1286
+#: ../src/easytag.c:1448
 #, c-format
 msgid "Selected files tagged with year '%s'."
-msgstr "I file selezionati sono stati etichettati con l'anno '%s'."
+msgstr "File selezionati etichettati con l'anno «%s»."
 
-#: ../src/easytag.c:1288
+#: ../src/easytag.c:1450
 msgid "Removed year from selected files."
-msgstr "L'anno è stato rimosso dai file selezionati."
+msgstr "Anno rimosso dai file selezionati."
 
-#: ../src/easytag.c:1316 ../src/easytag.c:1412
+#: ../src/easytag.c:1476 ../src/easytag.c:1567
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
-msgstr ""
-"I file selezionati sono stati etichettati con una traccia tipo 'xx/%s'."
+msgstr "File selezionati etichettati con la traccia come «xx/%s»."
 
-#: ../src/easytag.c:1319
+#: ../src/easytag.c:1479
 #, c-format
 msgid "Selected files tagged with track like 'xx'."
-msgstr "I file selezionati sono stati etichettati con una traccia tipo 'xx'."
+msgstr "File selezionati etichettati con la traccia come «xx»."
 
-#: ../src/easytag.c:1323 ../src/easytag.c:1415
+#: ../src/easytag.c:1483 ../src/easytag.c:1570
 msgid "Removed track number from selected files."
-msgstr "Il numero di traccia è stato rimosso dai file selezionati."
+msgstr "Numero di traccia rimosso dai file selezionati."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1381
+#: ../src/easytag.c:1540
 #, c-format
 msgid "Selected tracks numbered sequentially."
-msgstr "Le tracce selezionate sono state numerate in sequenza."
+msgstr "Tracce selezionate numerate in sequenza."
 
-#: ../src/easytag.c:1433
+#: ../src/easytag.c:1586
 #, c-format
 msgid "Selected files tagged with genre '%s'."
-msgstr "I file selezionati sono stati etichettati con il genere '%s'."
+msgstr "File selezionati etichettati con il genere «%s»."
 
-#: ../src/easytag.c:1435
+#: ../src/easytag.c:1588
 msgid "Removed genre from selected files."
-msgstr "Il genere è stato rimosso dai file selezionati."
+msgstr "Genere rimosso dai file selezionati."
 
-#: ../src/easytag.c:1459
+#: ../src/easytag.c:1610
 #, c-format
 msgid "Selected files tagged with comment '%s'."
-msgstr "I file selezionati sono stati etichettati con il commento '%s'."
+msgstr "File selezionati etichettati con il commento «%s»."
 
-#: ../src/easytag.c:1461
+#: ../src/easytag.c:1612
 msgid "Removed comment from selected files."
-msgstr "Il commento è stato rimosso dai file selezionati."
+msgstr "Commento rimosso dai file selezionati."
 
-#: ../src/easytag.c:1478
+#: ../src/easytag.c:1626
 #, c-format
 msgid "Selected files tagged with composer '%s'."
-msgstr "I file selezionati sono stati etichettati con il compositore '%s'."
+msgstr "File selezionati etichettati con il compositore «%s»."
 
-#: ../src/easytag.c:1480
+#: ../src/easytag.c:1628
 msgid "Removed composer from selected files."
-msgstr "Il compositore è stato rimosso dai file selezionati."
+msgstr "Compositore rimosso dai file selezionati."
 
-#: ../src/easytag.c:1497
+#: ../src/easytag.c:1643
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
-msgstr ""
-"I file selezionati sono stati etichettati con l'artista originale '%s'."
+msgstr "File selezionati etichettati con l'artista originale «%s»."
 
-#: ../src/easytag.c:1499
+#: ../src/easytag.c:1645
 msgid "Removed original artist from selected files."
-msgstr "L'artista originale è stato rimosso dai file selezionati."
+msgstr "Artista originale rimosso dai file selezionati."
 
-#: ../src/easytag.c:1516
+#: ../src/easytag.c:1660
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
-msgstr "I file selezionati sono stati etichettati con i diritti d'autore '%s'."
+msgstr "File selezionati etichettati con il copyright «%s»."
 
-#: ../src/easytag.c:1518
+#: ../src/easytag.c:1662
 msgid "Removed copyright from selected files."
-msgstr "I diritti d'autore sono stati rimossi dai file selezionati."
+msgstr "Copyright rimosso dai file selezionati."
 
-#: ../src/easytag.c:1535
+#: ../src/easytag.c:1677
 #, c-format
 msgid "Selected files tagged with URL '%s'."
-msgstr "I file selezionati sono stati etichettati con l'URL '%s'."
+msgstr "File selezionati etichettati con l'URL «%s»."
 
-#: ../src/easytag.c:1537
+#: ../src/easytag.c:1679
 msgid "Removed URL from selected files."
-msgstr "L'URL è stata rimossa dai file selezionati."
+msgstr "URL rimosso dai file selezionati."
 
-#: ../src/easytag.c:1554
+#: ../src/easytag.c:1694
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
-msgstr ""
-"I file selezionati sono stati etichettati con il nome del codificatore '%s'."
+msgstr "File selezionati etichettati con il codificatore «%s»."
 
-#: ../src/easytag.c:1556
+#: ../src/easytag.c:1696
 msgid "Removed encoder name from selected files."
-msgstr "Il nome del codificatore è stato rimosso dai file selezionati."
+msgstr "Codificatore rimosso dai file selezionati."
 
-#: ../src/easytag.c:1591
-msgid "Selected files tagged with pictures."
-msgstr "I file selezionati sono stati etichettati con le immagini."
+#: ../src/easytag.c:1728
+msgid "Selected files tagged with images."
+msgstr "File selezionati etichettati con le immagini."
 
-#: ../src/easytag.c:1593
-msgid "Removed pictures from selected files."
-msgstr "Le immagini sono state rimosse dai file selezionati."
+#: ../src/easytag.c:1730
+msgid "Removed images from selected files."
+msgstr "Immagini rimosse dai file selezionati."
 
-#: ../src/easytag.c:1832
+#: ../src/easytag.c:2011
 msgid "Select Mode and Mask, and redo the same action"
-msgstr "Seleziona Modalità e Maschera e ripeti la stessa azione"
+msgstr "Seleziona modalità e maschera, e ripete la stessa azione"
 
-#: ../src/easytag.c:1887
+#: ../src/easytag.c:2063
 msgid "All tags have been scanned"
-msgstr "Tutte le etichette sono state analizzate"
+msgstr "Tutte le etichette sono state scansionate"
 
-#: ../src/easytag.c:1944
+#: ../src/easytag.c:2119
 msgid "All tags have been removed"
 msgstr "Tutte le etichette sono state rimosse"
 
-#: ../src/easytag.c:2234
+#: ../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] ""
-msgstr[1] ""
+msgstr[0] "Un file è stato modificato da un programma esterno."
+msgstr[1] "%d file sono stati modificati da un programma esterno."
 
-#: ../src/easytag.c:2287 ../src/easytag.c:2308
-msgid "Saving files was stopped…"
-msgstr ""
+#: ../src/easytag.c:2429
+msgid "Do you want to continue saving the file?"
+msgstr "Salvare il file?"
 
-#: ../src/easytag.c:2310
-#, fuzzy
-msgid "All files have been saved…"
-msgstr "Tutti i file sono stati salvati..."
+#: ../src/easytag.c:2487 ../src/easytag.c:2507
+msgid "Saving files was stopped"
+msgstr "Salvataggio del file interrotto"
 
-#: ../src/easytag.c:2458
-#, fuzzy
-msgid "Files have been partially deleted…"
-msgstr "I file sono stati in parte eliminati..."
+#: ../src/easytag.c:2509
+msgid "All files have been saved"
+msgstr "Tutti i file sono stati salvati"
 
-#: ../src/easytag.c:2460
-#, fuzzy
-msgid "All files have been deleted…"
-msgstr "Tutti i file sono stati eliminati..."
+#: ../src/easytag.c:2644
+#, c-format
+msgid "Cannot delete file (%s)"
+msgstr "Impossibile eliminare il file (%s)"
+
+#: ../src/easytag.c:2665
+msgid "Files have been partially deleted"
+msgstr "I file sono stati parzialmente eliminati"
+
+#: ../src/easytag.c:2667
+msgid "All files have been deleted"
+msgstr "Tutti i file sono stati eliminati"
 
-#: ../src/easytag.c:2575
-#, fuzzy, c-format
+#: ../src/easytag.c:2783
+#, c-format
 msgid "Do you want to write the tag of file '%s'?"
-msgstr ""
-"Vuoi scrivere l'etichetta del file\n"
-" '%s'?"
+msgstr "Scrivere l'etichetta del file «%s»?"
 
-#: ../src/easytag.c:2577
-#, fuzzy
+#: ../src/easytag.c:2785
 msgid "Confirm Tag Writing"
-msgstr "Conferma"
+msgstr "Conferma scrittura etichetta"
 
-#: ../src/easytag.c:2582 ../src/easytag.c:2693 ../src/easytag.c:3320
-#, fuzzy
+#: ../src/easytag.c:2790 ../src/easytag.c:2910 ../src/easytag.c:3173
 msgid "Repeat action for the remaining files"
-msgstr "Ripeti l'azione per i file rimanenti"
+msgstr "Ripetere l'azione per i file rimanenti"
 
 #. Directories and filename changed
-#: ../src/easytag.c:2657
-#, fuzzy
-msgid "Rename File and Directory…"
-msgstr "Rinomina File e Cartella"
+#: ../src/easytag.c:2874 ../src/scan_dialog.c:183
+msgid "Rename File and Directory"
+msgstr "Rinomina file e directory"
 
-#: ../src/easytag.c:2658
+#: ../src/easytag.c:2875
 msgid "File and directory rename confirmation required"
-msgstr ""
+msgstr "Richiesta conferma per rinominare il file e la directory"
 
-#: ../src/easytag.c:2659
-#, fuzzy, c-format
+#: ../src/easytag.c:2876
+#, c-format
 msgid "Do you want to rename the file and directory '%s' to '%s'?"
-msgstr ""
-"Vuoi rinominare il file e la cartella \n"
-"'%s'\n"
-"in \n"
-"'%s' ?"
+msgstr "Rinominare il file e la directory da «%s» a «%s»?"
 
-#: ../src/easytag.c:2665
-#, fuzzy
+#: ../src/easytag.c:2882
 msgid "Directory rename confirmation required"
-msgstr "Cartella rinominata"
+msgstr "Richiesta conferma per rinominare la directory"
 
-#: ../src/easytag.c:2666
-#, fuzzy, c-format
+#: ../src/easytag.c:2883
+#, c-format
 msgid "Do you want to rename the directory '%s' to '%s'?"
-msgstr ""
-"Vuoi rinominare la cartella \n"
-"'%s'\n"
-"in \n"
-"'%s' ?"
+msgstr "Rinominare la directory da «%s» a «%s»?"
 
 #. Only filename changed
-#: ../src/easytag.c:2672
-#, fuzzy
-msgid "Rename File…"
-msgstr "Rinomina File..."
+#: ../src/easytag.c:2889
+msgid "Rename File"
+msgstr "Rinomina file"
 
-#: ../src/easytag.c:2673
+#: ../src/easytag.c:2890
 msgid "File rename confirmation required"
-msgstr ""
+msgstr "Richiesta conferma per rinominare il file"
 
-#: ../src/easytag.c:2674
-#, fuzzy, c-format
+#: ../src/easytag.c:2891
+#, c-format
 msgid "Do you want to rename the file '%s' to '%s'?"
-msgstr ""
-"Vuoi rinominare il file \n"
-"'%s'\n"
-"in \n"
-"'%s' ?"
+msgstr "Rinominare il file da «%s» a «%s»?"
 
-#: ../src/easytag.c:2766
+#: ../src/easytag.c:2957
 #, c-format
-msgid "Writing tag of '%s'"
-msgstr "Scrittura dell'etichetta di '%s'"
-
-#: ../src/easytag.c:2772
-msgid "Tag(s) written"
-msgstr "Etichette scritte"
-
-#: ../src/easytag.c:2782 ../src/easytag.c:2790
-#, fuzzy, c-format
-msgid "Cannot write tag in file '%s' (%s)"
-msgstr ""
-"Non posso scrivere l'etichetta nel file '%s'!\n"
-"(%s)"
-
-#: ../src/easytag.c:2801
-#, fuzzy, c-format
-msgid "Cannot write tag in file '%s'"
-msgstr ""
-"Non posso scrivere l'etichetta nel file '%s'!\n"
-"(%s)"
-
-#: ../src/easytag.c:2804
-#, fuzzy
-msgid "Tag Write Error"
-msgstr " Scrivi "
+msgid "Cannot rename file '%s' to '%s'"
+msgstr "Impossibile rinominare il file da «%s» a «%s»"
 
-#: ../src/easytag.c:2933
+#: ../src/easytag.c:2971
 #, c-format
-msgid "Renaming file '%s'"
-msgstr "Rinomino il file '%s'"
-
-#. Renaming file to the temporary filename has failed
-#: ../src/easytag.c:2953
-#, fuzzy, c-format
-msgid "Cannot rename file '%s' to '%s' (%s)"
-msgstr ""
-"Non è possibile rinominare il file  '%s'\n"
-" in \n"
-"'%s'! \n"
-"(%s) "
-
-#: ../src/easytag.c:2961 ../src/easytag.c:3002 ../src/easytag.c:3030
-#: ../src/easytag.c:3257
-#, fuzzy, c-format
-msgid "Cannot rename file '%s' to '%s'"
-msgstr ""
-"Non è possibile rinominare il file  '%s'\n"
-" in \n"
-"'%s'! \n"
-"(%s) "
-
-#: ../src/easytag.c:2973 ../src/easytag.c:3017 ../src/easytag.c:3043
-#: ../src/easytag.c:3272
-#, fuzzy
-msgid "File(s) not renamed…"
-msgstr "File non rinominato/i..."
-
-#: ../src/easytag.c:3012
-#, fuzzy, c-format
 msgid "Cannot rename file '%s' to '%s': %s"
-msgstr ""
-"Non è possibile rinominare il file  '%s'\n"
-" in \n"
-"'%s'! \n"
-"(%s) "
-
-#: ../src/easytag.c:3038
-#, fuzzy, c-format
-msgid "Cannot rename file '%s' because the following file already exists: '%s'"
-msgstr ""
-"Non è possibile rinominare il file \n"
-" '%s'\n"
-"perché il file seguente esiste già:\n"
-" '%s'"
-
-#: ../src/easytag.c:3072
-#, fuzzy, c-format
-msgid "Cannot create target directory '%s'"
-msgstr ""
-"Non è possibile creare la cartella\n"
-"'%s'!\n"
-"(%s)"
+msgstr "Impossibile rinominare il file da «%s» a «%s»: %s"
 
-#: ../src/easytag.c:3080
-#, fuzzy, c-format
-msgid "Cannot create target directory '%s': %s"
-msgstr ""
-"Non è possibile creare la cartella\n"
-"'%s'!\n"
-"(%s)"
+#: ../src/easytag.c:2975
+msgid "File(s) not renamed"
+msgstr "File non rinominati"
 
-#. Renaming file has succeeded
-#: ../src/easytag.c:3099
+#: ../src/easytag.c:3087
 #, c-format
-msgid "Renamed file '%s' to '%s'"
-msgstr "Il file '%s' è stato rinominato in '%s'"
-
-#: ../src/easytag.c:3105
-#, fuzzy
-msgid "File(s) renamed…"
-msgstr "File non rinominato/i..."
+msgid "Writing tag of '%s'"
+msgstr "Scrittura etichetta di «%s»"
 
-#: ../src/easytag.c:3121 ../src/easytag.c:3181
-#, fuzzy, c-format
-msgid "Cannot remove old directory '%s'"
-msgstr ""
-"Non posso rimuovere la vecchia cartella\n"
-"'%s'!\n"
-"(%s)"
-
-#: ../src/easytag.c:3124 ../src/easytag.c:3184
-#, fuzzy
-msgid "Remove Directory Error"
-msgstr "Rinomina cartella..."
-
-#: ../src/easytag.c:3129
-#, fuzzy, c-format
-msgid "Cannot remove old directory '%s': %s"
-msgstr ""
-"Non posso rimuovere la vecchia cartella\n"
-"'%s'!\n"
-"(%s)"
+#: ../src/easytag.c:3094
+msgid "Tag(s) written"
+msgstr "Etichette scritte"
 
-#. Renaming file has succeeded
-#: ../src/easytag.c:3157
+#: ../src/easytag.c:3109
 #, c-format
-msgid "Moved file '%s' to '%s'"
-msgstr "Ho spostato il file '%s' su '%s'"
-
-#: ../src/easytag.c:3163
-#, fuzzy
-msgid "File(s) moved…"
-msgstr "File spostato/i..."
+msgid "Cannot write tag in file '%s' (%s)"
+msgstr "Impossibile scrivere l'etichetta nel file «%s» (%s)"
 
-#: ../src/easytag.c:3173
+#: ../src/easytag.c:3122
 #, c-format
-msgid ""
-"Can't remove old directory\n"
-"'%s'!\n"
-"(%s)"
-msgstr ""
-"Non posso rimuovere la vecchia cartella\n"
-"'%s'!\n"
-"(%s)"
+msgid "Cannot write tag in file '%s'"
+msgstr "Impossibile scrivere l'etichetta nel file «%s»"
 
-#: ../src/easytag.c:3189
-#, fuzzy, c-format
-msgid "Cannot remove old directory '%s': (%s)"
-msgstr ""
-"Non posso rimuovere la vecchia cartella\n"
-"'%s'!\n"
-"(%s)"
+#: ../src/easytag.c:3125
+msgid "Tag Write Error"
+msgstr "Errore scrittura etichetta"
 
-#. Moving file has failed
-#: ../src/easytag.c:3209
+#: ../src/easytag.c:3170 ../src/easytag.c:3184
 #, c-format
-msgid ""
-"Can't move file '%s'\n"
-" to \n"
-"'%s'!\n"
-"(%s)"
-msgstr ""
-"Non è possibile spostare il file '%s'\n"
-" in \n"
-"'%s'!\n"
-"(%s)"
-
-#: ../src/easytag.c:3217
-#, fuzzy, c-format
-msgid "Cannot move file '%s' to '%s'"
-msgstr ""
-"Non è possibile spostare il file '%s'\n"
-" in \n"
-"'%s'!\n"
-"(%s)"
-
-#: ../src/easytag.c:3221
-#, fuzzy
-msgid "File Move Error"
-msgstr "L'immagine non è stata caricata..."
-
-#: ../src/easytag.c:3227
-#, fuzzy, c-format
-msgid "Cannot move file '%s' to '%s': (%s)"
-msgstr ""
-"Non è possibile spostare il file '%s'\n"
-" in \n"
-"'%s'!\n"
-"(%s)"
-
-#: ../src/easytag.c:3232
-#, fuzzy
-msgid "File(s) not moved…"
-msgstr "File non rinominato/i..."
-
-#: ../src/easytag.c:3249
-#, fuzzy, c-format
-msgid "Can't rename file '%s' to '%s'! (%s)"
-msgstr ""
-"Non è possibile rinominare il file  '%s'\n"
-" in \n"
-"'%s'! \n"
-"(%s) "
-
-#: ../src/easytag.c:3267
-#, fuzzy, c-format
-msgid ""
-"Cannot rename file '%s'\n"
-" to \n"
-"'%s': (%s)"
-msgstr ""
-"Non è possibile rinominare il file  '%s'\n"
-" in \n"
-"'%s'! \n"
-"(%s) "
-
-#: ../src/easytag.c:3317 ../src/easytag.c:3331
-#, fuzzy, c-format
 msgid "Do you really want to delete the file '%s'?"
-msgstr ""
-"Vuoi davvero eliminare definitivamente il file\n"
-"'%s' ?"
+msgstr "Eliminare veramente il file «%s»?"
 
-#: ../src/easytag.c:3323 ../src/easytag.c:3333
-#, fuzzy
+#: ../src/easytag.c:3176 ../src/easytag.c:3186
 msgid "Delete File"
-msgstr "Cancella file"
+msgstr "Elimina file"
 
-#: ../src/easytag.c:3353
+#: ../src/easytag.c:3211
 #, c-format
 msgid "File '%s' deleted"
-msgstr "Il file '%s' è stato eliminato"
+msgstr "File «%s» eliminato"
 
-#: ../src/easytag.c:3488
+#: ../src/easytag.c:3346
 #, c-format
-msgid ""
-"Can't read directory :\n"
-"'%s'\n"
-"(%s)"
-msgstr ""
-"Non è possibile leggere la cartella:\n"
-"'%s'\n"
-"(%s)"
-
-#: ../src/easytag.c:3493
-#, fuzzy, c-format
 msgid "Cannot read directory '%s'"
-msgstr ""
-"Non è possibile leggere la cartella:\n"
-"'%s'\n"
-"(%s)"
+msgstr "Impossibile leggere directory «%s»"
 
-#: ../src/easytag.c:3496
-#, fuzzy
+#: ../src/easytag.c:3350
 msgid "Directory Read Error"
-msgstr "Cartella rinominata"
+msgstr "Errore lettura directory"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3516
-#, fuzzy, c-format
+#: ../src/easytag.c:3371
+#, c-format
 msgid "Search in progress…"
 msgstr "Ricerca in corso..."
 
-#: ../src/easytag.c:3533 ../src/et_core.c:2698
+#: ../src/easytag.c:3394 ../src/et_core.c:2824
 #, c-format
 msgid "File: '%s'"
-msgstr "File: '%s'"
+msgstr "File: «%s»"
 
-#: ../src/easytag.c:3583
+#: ../src/easytag.c:3444
 #, c-format
-msgid "Found %d file(s) in this directory and subdirectories."
-msgstr ""
-"Sono stati trovati %d file in questa cartella e nelle relative sottocartelle."
+msgid "Found one file in this directory and subdirectories"
+msgid_plural "Found %d files in this directory and subdirectories"
+msgstr[0] "Trovato un file in questa directory e sottodirectory"
+msgstr[1] "Trovati %d file in questa directory e sottodirectory"
 
-#: ../src/easytag.c:3585
+#: ../src/easytag.c:3451
 #, c-format
-msgid "Found %d file(s) in this directory."
-msgstr "Sono stati trovati %d file in questa cartella."
+msgid "Found one file in this directory"
+msgid_plural "Found %d files in this directory"
+msgstr[0] "Trovato un file in questa directory"
+msgstr[1] "Trovati %d file in questa directory"
 
-#. And refresh the number of files in this directory
-#: ../src/easytag.c:3598 ../src/et_core.c:2782
-#, c-format
-msgid "%u file(s)"
-msgstr "%u file"
+#: ../src/easytag.c:3473
+msgid "No file found in this directory and subdirectories"
+msgstr "Nessun file trovato in questa directory e sottodirectory"
 
-#: ../src/easytag.c:3604
-msgid "No file found in this directory and subdirectories!"
-msgstr ""
-"Non è stato trovato alcun file in questa cartella e nelle sue sottocartelle!"
+#: ../src/easytag.c:3475
+msgid "No file found in this directory"
+msgstr "Nessun file trovato in questa directory"
+
+#: ../src/easytag.c:3543
+#, c-format
+msgid "Error opening directory '%s' (%s)"
+msgstr "Errore durante l'apertura della directory: «%s» (%s)"
 
-#: ../src/easytag.c:3606
-msgid "No file found in this directory!"
-msgstr "Non è stato trovato alcun file in questa cartella!"
+#: ../src/easytag.c:3579
+#, c-format
+msgid "Cannot read directory (%s)"
+msgstr "Impossibile leggere la directory (%s)"
 
-#: ../src/easytag.c:3694
-#, fuzzy
-msgid "Searching…"
-msgstr "Ricerca..."
+#: ../src/easytag.c:3599
+msgid "Searching for audio files…"
+msgstr "Ricerca di file audio..."
 
-#. Button to stop...
-#: ../src/easytag.c:3714
-msgid "  STOP the search...  "
-msgstr "  INTERROMPI la ricerca...  "
+#: ../src/easytag.c:3600
+msgid "Searching"
+msgstr "Ricerca"
 
-#: ../src/easytag.c:4456
-msgid "Select a directory to browse!"
-msgstr "Seleziona una cartella da sfogliare!"
+#: ../src/easytag.c:4266
+msgid "Select a directory to browse"
+msgstr "Seleziona una directory da esplorare"
 
 #. Menu items
-#: ../src/easytag.c:4587
+#: ../src/easytag.c:4412
 msgid "Tag selected files with this field"
 msgstr "Etichetta i file selezionati con questo campo"
 
-#: ../src/easytag.c:4598
+#: ../src/easytag.c:4424 ../src/scan_dialog.c:2118
 msgid "Convert '_' and '%20' to spaces"
-msgstr "Converti '_' e '%20' in spazi"
+msgstr "Convertire «_» e «%20» con spazi"
 
-#: ../src/easytag.c:4605 ../src/scan.c:2686
+#: ../src/easytag.c:4431 ../src/scan_dialog.c:2120
 msgid "Convert ' ' to '_'"
-msgstr "Converti ' ' in '_'"
+msgstr "Convertire « » in «_»"
 
-#. Group: capitalize, ...
-#: ../src/easytag.c:4616 ../src/scan.c:2737
+#: ../src/easytag.c:4442
 msgid "All uppercase"
 msgstr "Tutto maiuscolo"
 
-#: ../src/easytag.c:4623 ../src/scan.c:2738
-msgid "All downcase"
+#: ../src/easytag.c:4449
+msgid "All lowercase"
 msgstr "Tutto minuscolo"
 
-#: ../src/easytag.c:4630 ../src/scan.c:2739
+#: ../src/easytag.c:4456
 msgid "First letter uppercase"
-msgstr "Prima lettera maiuscola"
+msgstr "Prima lettera in maiuscolo"
 
-#: ../src/easytag.c:4637 ../src/scan.c:2740
+#: ../src/easytag.c:4463
 msgid "First letter uppercase of each word"
-msgstr "Prima lettera maiuscola per ogni parola"
+msgstr "Prima lettera di ogni parola in maiuscolo"
 
-#. Group: insert/remove spaces
-#: ../src/easytag.c:4648 ../src/prefs.c:1056 ../src/scan.c:2788
+#: ../src/easytag.c:4474 ../src/prefs.c:1023 ../src/scan_dialog.c:2218
 msgid "Remove spaces"
-msgstr "Rimuovi spazi"
+msgstr "Rimuovere spazi"
 
-#: ../src/easytag.c:4655
+#: ../src/easytag.c:4481
 msgid "Insert space before uppercase letter"
-msgstr "Inserisci degli spazi prima delle lettere maiuscole"
+msgstr "Inserire lo spazio prima della lettera maiuscola"
 
-#: ../src/easytag.c:4662
+#: ../src/easytag.c:4488
 msgid "Remove duplicate spaces or underscores"
-msgstr "Rimuovi spazi o trattini duplicati"
-
-#. gchar commmand[256];
-#. To send messages to the console...
-#: ../src/easytag.c:4682 ../src/easytag.c:4690
-#, c-format
-msgid "EasyTAG %s: Abnormal exit! (PId: %d)."
-msgstr "EasyTAG %s: uscita anomala! (PId: %d)."
-
-#: ../src/easytag.c:4683 ../src/easytag.c:4692
-#, c-format
-msgid "Received signal %s (%d)\a"
-msgstr "Ricevuto segnale %s (%d) "
+msgstr "Rimuovere spazi o trattini bassi duplicati"
 
-#: ../src/easytag.c:4685 ../src/easytag.c:4694
-#, fuzzy, c-format
-msgid ""
-"You have probably found a bug in EasyTAG. Please, send a bug report with a "
-"gdb backtrace ('gdb easytag core' then 'bt' and 'l') and information to "
-"reproduce it to easytag at gmail.com"
-msgstr ""
-"Probabilmente hai scoperto un baco in EasyTAG. Per favore, invia un rapporto "
-"via backtrace gdb ('gdb easytag core' poi 'bt' and 'l') a easytag at gmail.com"
-
-#: ../src/easytag.c:4821
-msgid "Unknown signal"
-msgstr "Segnale sconosciuto"
-
-#: ../src/easytag.c:4837
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: easytag [option] \n"
-"   or: easytag [directory]\n"
-"\n"
-"Option:\n"
-"-------\n"
-"-h, --help        Display this text and exit.\n"
-"-v, --version     Print basic information and exit.\n"
-"\n"
-"Directory:\n"
-"----------\n"
-"%s/path_to/files  Use an absolute path to load,\n"
-"path_to/files     Use a relative path.\n"
-"\n"
-msgstr ""
-"\n"
-"Uso:  easytag [opzioni] \n"
-"     o: easytag [cartella]\n"
-"\n"
-"Opzioni:\n"
-"--------\n"
-"-h, --help                Mostra questo testo ed esce.\n"
-"-v, --version            Stampa le informazioni di base ed esce.\n"
-"\n"
-"Cartella:\n"
-"--------\n"
-"c:/path_to/files           Usa un percorso assoluto per caricare.\n"
-"/path_to/files             Usa un percorso assoluto per caricare.\n"
-"path_to/files              Usa un percorso relativo.\n"
-"\n"
+#: ../src/easytag.c:4495
+msgid "Remove all text"
+msgstr "Rimuovere tutto il testo"
 
-#: ../src/easytag.c:4865
+#: ../src/easytag.c:4514
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: uscita normale."
 
-#: ../src/easytag.c:4914
-#, fuzzy
+#: ../src/easytag.c:4566
 msgid "Do you want to save them before quitting?"
-msgstr ""
-"Vuoi rinominare il file \n"
-"'%s'\n"
-"in \n"
-"'%s' ?"
+msgstr "Salvare prima di uscire?"
 
-#: ../src/easytag.c:4937
-#, fuzzy
+#: ../src/easytag.c:4593
 msgid "Do you really want to quit?"
-msgstr "Vuoi veramente uscire dal programma?"
+msgstr "Uscire veramente?"
+
+#: ../src/et_core.c:510
+#, c-format
+msgid "Error reading tag from ogg file (%s)"
+msgstr "Errore nella lettura dell'etichetta dal file ogg (%s)"
+
+#: ../src/et_core.c:539
+#, c-format
+msgid "Error reading tag from Opus file (%s)"
+msgstr "Errore nella lettura dell'etichetta dal file Opus (%s)"
 
-#: ../src/et_core.c:631
+#: ../src/et_core.c:682
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
-msgstr ""
+msgstr "Correzioni automatiche applicate per il file «%s»."
 
-#: ../src/et_core.c:2595
+#: ../src/et_core.c:2707
 msgid "ID3 Tag"
 msgstr "Etichetta ID3"
 
-#: ../src/et_core.c:2601
+#: ../src/et_core.c:2713
 msgid "Ogg Vorbis Tag"
 msgstr "Etichetta Ogg Vorbis"
 
-#: ../src/et_core.c:2607
+#: ../src/et_core.c:2719
 msgid "FLAC Vorbis Tag"
-msgstr "Etichetta Vorbis FLAC"
+msgstr "Etichetta FLAC Vorbis"
 
-#: ../src/et_core.c:2612
+#: ../src/et_core.c:2724
 msgid "APE Tag"
 msgstr "Etichetta APE"
 
-#: ../src/et_core.c:2617
+#: ../src/et_core.c:2729
 msgid "MP4/M4A/AAC Tag"
 msgstr "Etichetta MP4/M4A/AAC"
 
-#: ../src/et_core.c:2623
+#: ../src/et_core.c:2735
 msgid "Wavpack Tag"
 msgstr "Etichetta Wavpack"
 
-#: ../src/et_core.c:2643
+#: ../src/et_core.c:2741
+msgid "Opus Tag"
+msgstr "Etichetta Opus"
+
+#: ../src/et_core.c:2761
 msgid "MP3 File"
-msgstr "File MP3"
+msgstr "Etichetta MP3"
 
-#: ../src/et_core.c:2647
+#: ../src/et_core.c:2765
 msgid "MP2 File"
-msgstr "File MP2"
+msgstr "Etichetta MP2"
 
-#: ../src/et_core.c:2653
+#: ../src/et_core.c:2771
 msgid "Ogg Vorbis File"
 msgstr "File Ogg Vorbis"
 
-#: ../src/et_core.c:2659
-#, fuzzy
+#: ../src/et_core.c:2777
 msgid "Speex File"
-msgstr "File successivo"
+msgstr "File Speex"
 
-#: ../src/et_core.c:2665
+#: ../src/et_core.c:2783
 msgid "FLAC File"
 msgstr "File FLAC"
 
-#: ../src/et_core.c:2670
+#: ../src/et_core.c:2788
 msgid "MusePack File"
 msgstr "File MusePack"
 
-#: ../src/et_core.c:2674
+#: ../src/et_core.c:2792
 msgid "Monkey's Audio File"
 msgstr "File Monkey's Audio"
 
-#: ../src/et_core.c:2679
+#: ../src/et_core.c:2797
 msgid "MP4/AAC File"
 msgstr "File MP4/AAC"
 
-#: ../src/et_core.c:2685
+#: ../src/et_core.c:2803
 msgid "Wavpack File"
 msgstr "File Wavpack"
 
-#: ../src/et_core.c:2968
-#, fuzzy, c-format
-msgid "Pictures (%d)"
-msgstr "Immagini"
+#: ../src/et_core.c:2809
+msgid "Opus File"
+msgstr "File Opus"
+
+#: ../src/et_core.c:2868 ../src/et_core.c:2923
+msgid "File not found"
+msgstr "File non trovato"
+
+#: ../src/et_core.c:2873
+#, c-format
+msgid "Cannot query file information (%s)"
+msgstr "Impossibile interrogare le informazioni del file (%s)"
+
+#: ../src/et_core.c:2907
+msgid "Read-only file"
+msgstr "File in sola lettura"
+
+#. And refresh the number of files in this directory
+#: ../src/et_core.c:2971
+#, c-format
+msgid "One file"
+msgid_plural "%u files"
+msgstr[0] "Un file"
+msgstr[1] "%u file"
+
+#: ../src/et_core.c:3175
+#, c-format
+msgid "Images (%d)"
+msgstr "Immagini (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3007 ../src/flac_header.c:297
-#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:275
-#: ../src/mpeg_header.c:367 ../src/musepack_header.c:88
-#: ../src/ogg_header.c:257 ../src/wavpack_header.c:78
+#: ../src/et_core.c:3217 ../src/flac_header.c:205
+#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
+#: ../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
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: ../src/et_core.c:3012 ../src/flac_header.c:302
-#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:280
-#: ../src/mpeg_header.c:372 ../src/musepack_header.c:93
-#: ../src/ogg_header.c:262 ../src/wavpack_header.c:83
+#: ../src/et_core.c:3222 ../src/flac_header.c:210
+#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
+#: ../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:3155 ../src/scan.c:676
-#, fuzzy, c-format
+#: ../src/et_core.c:3368 ../src/scan_dialog.c:688
+#, c-format
 msgid "Could not convert filename '%s' into system filename encoding"
-msgstr "Non posso convertire il nome del file '%s' nella codifica di sistema."
+msgstr ""
+"Impossibile convertire il nome del file «%s» nella codifica di sistema per i "
+"nomi di file"
 
-#: ../src/et_core.c:3157
-#, fuzzy
+#: ../src/et_core.c:3370
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
-msgstr ""
-"Non posso convertire il nome del file: '%s'\n"
-"nella codifica del sistema\n"
-"(Prova impostando la variabile d'ambiente G_FILENAME_ENCODING)."
+msgstr "Provare a impostare la variabile d'ambiente G_FILENAME_ENCODING."
 
-#: ../src/et_core.c:3158 ../src/scan.c:678
+#: ../src/et_core.c:3371 ../src/scan_dialog.c:690
 msgid "Filename translation"
-msgstr "Traduzione del nome file"
+msgstr "Traduzione nome del file"
 
-#: ../src/et_core.c:4666 ../src/et_core.c:4674
-#, c-format
-msgid "The filename '%s' exceeds %d characters and will be truncated!\n"
-msgstr "Il nome file '%s' eccede di %d caratteri e sarà quindi troncato!\n"
-
-#. Nothing to display
-#. gtk_label_set_text(GTK_LABEL(VersionLabel),"");
-#. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
-#. Version changed to encoder version
-#. Encoder version
-#: ../src/flac_header.c:293 ../src/monkeyaudio_header.c:96
-#: ../src/musepack_header.c:98 ../src/ogg_header.c:245
-#: ../src/wavpack_header.c:72
+#: ../src/et_core.c:4076
 #, c-format
-msgid "Encoder:"
-msgstr "Codificatore:"
+msgid "Error writing tag type %d to file %s (%s)"
+msgstr "Errore nella scrittura del tipo di etichetta %d nel file %s (%s)"
 
 #. Mode
 #. Mode
 #. mpeg4ip library seems to always return -1
 #. Mode
-#: ../src/flac_header.c:307 ../src/mp4_header.c:286 ../src/ogg_header.c:267
-#: ../src/wavpack_header.c:88
+#: ../src/flac_header.c:215 ../src/mp4_header.c:145 ../src/ogg_header.c:411
+#: ../src/opus_header.c:237 ../src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Canali:"
 
-#: ../src/flac_tag.c:142 ../src/flac_tag.c:863 ../src/flac_tag.c:873
-#, fuzzy, c-format
-msgid "ERROR while opening file: '%s' as FLAC (%s)."
-msgstr "Si è verificato un errore aprendo il file '%s' (%s).\a"
+#: ../src/flac_tag.c:131 ../src/flac_tag.c:850 ../src/flac_tag.c:860
+#, c-format
+msgid "Error while opening file: '%s' as FLAC (%s)."
+msgstr "Errore durante l'apertura del file: «%s» come FLAC (%s)."
 
-#: ../src/flac_tag.c:329 ../src/ogg_tag.c:298
+#: ../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 "
 "be lost while saving tag."
 msgstr ""
+"Il valore anno «%s» nel file «%s» sembra essere non valido. Le informazioni "
+"saranno perse durante il salvataggio dell'etichetta."
 
-#: ../src/flac_tag.c:1081
+#: ../src/flac_tag.c:1061
 #, c-format
 msgid "Picture block isn't valid: '%s'"
-msgstr ""
+msgstr "Il blocco immagine non è valido: «%s»"
 
-#: ../src/flac_tag.c:1115 ../src/ogg_tag.c:849
+#: ../src/flac_tag.c:1094
 #, c-format
-msgid "ERROR: Failed to write comments to file '%s' (%s)."
-msgstr "ERRORE: non è possibile scrivere i commenti sul file '%s' (%s)."
+msgid "Error: Failed to write comments to file '%s' (%s)."
+msgstr "Errore: scrittura dei commenti nel file «%s» non riuscita (%s)."
 
-#: ../src/flac_tag.c:1120 ../src/ogg_tag.c:856
+#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1166
 #, c-format
 msgid "Written tag of '%s'"
-msgstr "L'etichetta di '%s' è stata scritta"
+msgstr "Etichetta di «%s» scritta"
+
+#: ../src/id3_tag.c:158
+#, c-format
+msgid "Error while reading file: '%s' (%s)"
+msgstr "Errore durante la lettura del file: «%s» (%s)"
+
+#: ../src/id3_tag.c:170
+#, c-format
+msgid ""
+"As the following corrupted file '%s' will cause an error in id3lib, it will "
+"not be processed"
+msgstr ""
+"Il seguente file corrotto «%s» causerà un errore in id3lib e non sarà "
+"elaborato"
+
+#: ../src/id3_tag.c:172
+msgid "Corrupted file"
+msgstr "File corrotto"
 
-#: ../src/id3_tag.c:500
+#: ../src/id3_tag.c:555
 #, c-format
 msgid "Removed tag of '%s'"
-msgstr "L'etichetta di '%s' è stata rimossa"
+msgstr "Etichetta di «%s» rimossa"
 
-#: ../src/id3_tag.c:504 ../src/id3_tag.c:604
+#: ../src/id3_tag.c:559 ../src/id3_tag.c:659
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
-msgstr ""
-"Si è verificato un errore durante la rimozione dell'etichetta ID3v1 di "
-"'%s' (%s)"
+msgstr "Errore durante la rimozione dell'etichetta ID3v1 di «%s» (%s)"
 
-#: ../src/id3_tag.c:506 ../src/id3_tag.c:576
+#: ../src/id3_tag.c:561 ../src/id3_tag.c:631
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
-msgstr ""
-"Si è verificato un errore durante la rimozione dell'etichetta ID3v2 di "
-"'%s' (%s)"
+msgstr "Errore durante la rimozione dell'etichetta ID3v2 di «%s» (%s)"
 
-#: ../src/id3_tag.c:525
+#: ../src/id3_tag.c:580
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
-msgstr ""
-"Si è verificato un errore durante l'aggiornamento dell'etichetta ID3v2 di "
-"'%s' (%s)"
+msgstr "Errore durante l'aggiornamento dell'etichetta ID3v2 di «%s» (%s)"
 
-#: ../src/id3_tag.c:553
+#: ../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 ""
+"Si è tentato di salvare questa etichetta in Unicode ma è stato rilevato che "
+"la versione di id3lib è difettosa"
 
-#: ../src/id3_tag.c:555
-#, fuzzy, c-format
+#: ../src/id3_tag.c:610
+#, c-format
 msgid ""
 "If you reload this file, some characters in the tag may not be displayed "
 "correctly. Please, apply the patch src/id3lib/"
-"patch_id3lib_3.8.3_UTF16_writing_bug.diff to id3lib, which isavailable in "
+"patch_id3lib_3.8.3_UTF16_writing_bug.diff to id3lib, which is available in "
 "the EasyTAG package sources.\n"
 "Note that this message will appear only once.\n"
 "\n"
-"File : %s"
+"File: %s"
 msgstr ""
-"Hai cercato di salvare questa etichetta in formato Unicode ma si è scoperto "
-"che la tua versione di id3lib è bacata.\n"
-"Alcuni caratteri nell'etichetta potrebbero venir visualizzati in modo "
-"scorretto se cerchi di ricaricare questo file...\n"
-"Per favore, applica alla tua versione di id3lib la patch src/id3lib/"
-"patch_id3lib_3.8.3_UTF16_writing_bug.diff\n"
-"disponibile nel pacchetto sorgente di EasyTAG. Ricordati che questo "
-"messaggio comparirà una volta soltanto.\n"
+"Se si ricarica questo file, alcuni caratteri nell'etichetta potrebbero "
+"essere non mostrati correttamente. Applicare la patch \"src/id3lib/"
+"patch_id3lib_3.8.3_UTF16_writing_bug.diff\" a id3lib, che è disponibile nel "
+"pacchetto dei sorgenti di EasyTAG.\n"
+"Notare che questo messaggio apparirà una sola volta.\n"
 "\n"
 "File: %s"
 
-#: ../src/id3_tag.c:562
+#: ../src/id3_tag.c:617
 msgid "Buggy id3lib"
-msgstr ""
+msgstr "id3lib è difettosa"
 
-#: ../src/id3_tag.c:596
+#: ../src/id3_tag.c:651
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
-msgstr ""
-"Si è verificato un errore durante l'aggiornamento dell'etichetta ID3v1 di "
-"'%s' (%s)"
+msgstr "Errore durante l'aggiornamento dell'etichetta ID3v1 di «%s» (%s)"
 
-#: ../src/id3_tag.c:610 ../src/id3v24_tag.c:1034
+#: ../src/id3_tag.c:665 ../src/id3v24_tag.c:1048
 #, c-format
 msgid "Updated tag of '%s'"
-msgstr "L'etichetta di '%s' è stata aggiornata"
+msgstr "Etichetta di «%s» aggiornata"
 
-#: ../src/id3_tag.c:629
+#: ../src/id3_tag.c:684
 msgid "No error reported"
-msgstr "Non ci sono errori da riportare"
+msgstr "Nessun errore riportato"
 
-#: ../src/id3_tag.c:631
+#: ../src/id3_tag.c:686
 msgid "No available memory"
-msgstr "Non c'è più memoria disponibile"
+msgstr "Nessuna memoria disponibile"
 
-#: ../src/id3_tag.c:633
+#: ../src/id3_tag.c:688
 msgid "No data to parse"
-msgstr "Non ci sono dati da elaborare"
+msgstr "Nessun dato da analizzare"
 
-#: ../src/id3_tag.c:635
+#: ../src/id3_tag.c:690
 msgid "Improperly formatted data"
-msgstr "Dati formattati impropriamente"
+msgstr "Dati non correttamente formattati"
 
-#: ../src/id3_tag.c:637
+#: ../src/id3_tag.c:692
 msgid "No buffer to write to"
-msgstr "Non c'è un buffer sul quale scrivere"
+msgstr "Nessun buffer su cui scrivere"
 
-#: ../src/id3_tag.c:639
+#: ../src/id3_tag.c:694
 msgid "Buffer is too small"
-msgstr "Il buffer è troppo piccolo"
+msgstr "Buffer troppo piccolo"
 
-#: ../src/id3_tag.c:641
+#: ../src/id3_tag.c:696
 msgid "Invalid frame ID"
-msgstr "L'identificatore ID del frame non è valido"
+msgstr "Frame ID non valido"
 
-#: ../src/id3_tag.c:643
+#: ../src/id3_tag.c:698
 msgid "Requested field not found"
-msgstr "Il campo richiesto non è stato trovato"
+msgstr "Campo richiesto non trovato"
 
-#: ../src/id3_tag.c:645
+#: ../src/id3_tag.c:700
 msgid "Unknown field type"
-msgstr "Il tipo di campo è sconosciuto"
+msgstr "Tipo di campo sconosciuto"
 
-#: ../src/id3_tag.c:647
+#: ../src/id3_tag.c:702
 msgid "Tag is already attached to a file"
-msgstr "L'etichetta è già allegata al file"
+msgstr "Etichetta già allegata a un file"
 
-#: ../src/id3_tag.c:649
+#: ../src/id3_tag.c:704
 msgid "Invalid tag version"
-msgstr "La versione dell'etichetta non è valida"
+msgstr "Versione etichetta non valida"
 
-#: ../src/id3_tag.c:651
+#: ../src/id3_tag.c:706
 msgid "No file to parse"
-msgstr "Non ci sono file da elaborare"
+msgstr "Nessun file da analizzare"
 
-#: ../src/id3_tag.c:653
+#: ../src/id3_tag.c:708
 msgid "Attempting to write to a read-only file"
-msgstr "Si è cercato di scrivere su un file a sola lettura"
+msgstr "Tentativo di scrittura in un file in sola lettura"
 
-#: ../src/id3_tag.c:655
+#: ../src/id3_tag.c:710
 msgid "Error in compression/uncompression"
-msgstr "Errore nella compressione/decompressione"
+msgstr "Errore in compressione/decompressione"
 
-#: ../src/id3_tag.c:657
-msgid "Unknown error message!"
-msgstr "Messaggio d'errore sconosciuto!"
+#: ../src/id3_tag.c:712
+msgid "Unknown error message"
+msgstr "Messaggio di errore sconosciuto"
 
-#: ../src/id3_tag.c:1235
-#, fuzzy, c-format
-msgid ""
-"As the following corrupted file '%s' will cause an error in id3lib, it will "
-"not be processed"
-msgstr ""
-"Il seguente file danneggiato: '%s'\n"
-"non verrà processato dal programma perché causerebbe un errore in id3lib."
+#: ../src/id3_tag.c:1316
+#, c-format
+msgid "Error while creating temporary file: '%s'"
+msgstr "Errore durante la creazione del file temporaneo: «%s»"
 
-#: ../src/id3_tag.c:1237
-#, fuzzy
-msgid "Corrupted file"
-msgstr "File danneggiato..."
+#: ../src/id3_tag.c:1323
+msgid "Error while creating temporary file"
+msgstr "Errore durante la creazione del file temporaneo"
 
-#: ../src/id3v24_tag.c:116
-#, fuzzy, c-format
-msgid ""
-"ERROR while opening file: '%s' (%s).\n"
-"\a"
-msgstr "Si è verificato un errore aprendo il file '%s' (%s)."
+#: ../src/id3_tag.c:1343
+#, c-format
+msgid "Error while writing to file: '%s' (%s)"
+msgstr "Errore durante la scrittura del file: «%s» (%s)"
 
-#: ../src/id3v24_tag.c:1517
+#. Translators: The first string is a filename, the
+#. * second string is the number of bytes that were
+#. * missing (not read for some reason) while reading from
+#. * the file.
+#.
+#: ../src/id3v24_tag.c:1503
 #, c-format
-msgid "Can't write tag of file '%s' (were read %d bytes instead of %d bytes!)"
-msgstr ""
+msgid "Cannot write tag of file ‘%s’ (a byte was missing)"
+msgid_plural "Cannot write tag of file ‘%s’ (%s bytes were missing)"
+msgstr[0] "Impossibile scrivere l'etichetta del file «%s» (un byte è mancante)"
+msgstr[1] ""
+"Impossibile scrivere l'etichetta del file «%s» (%s byte sono mancanti)"
+
+#: ../src/id3v24_tag.c:1524
+#, c-format
+msgid "Cannot save tag of file '%s'"
+msgstr "Impossibile salvare l'etichetta del file «%s»"
 
-#: ../src/id3v24_tag.c:1536
-#, fuzzy, c-format
+#: ../src/id3v24_tag.c:1535
+#, c-format
 msgid "Size error while saving tag of '%s'"
-msgstr ""
-"Si è verificato un errore durante la rimozione dell'etichetta ID3v1 di "
-"'%s' (%s)"
+msgstr "Errore di dimensione durante il salvataggio dell'etichetta di «%s»"
 
-#: ../src/log.c:95
+#: ../src/log.c:100
 msgid "Log"
 msgstr "Registro"
 
-#: ../src/misc.c:778
-#, fuzzy
-msgid "Select file…"
-msgstr "Seleziona file..."
-
-#: ../src/misc.c:783
-#, fuzzy
-msgid "Select directory…"
-msgstr "Seleziona cartella..."
+#: ../src/misc.c:720
+msgid "You must type a program name"
+msgstr "Digitare un nome di programma"
 
-#: ../src/misc.c:862
-#, fuzzy
-msgid "No audio player defined"
-msgstr "Nessun riproduttore audio definito!"
-
-#: ../src/misc.c:863
-#, fuzzy
-msgid "Audio Player Warning"
-msgstr "Esegui il riproduttore audio"
+#: ../src/misc.c:721
+msgid "Program Name Error"
+msgstr "Errore nome di programma"
 
-#: ../src/misc.c:873
+#: ../src/misc.c:800
 #, c-format
-msgid "The program '%s' can't be found!"
-msgstr "Non ho potuto trovare il programma '%s'!"
+msgid "Executed command: %s"
+msgstr "Comando eseguito: %s"
 
-#: ../src/misc.c:964
+#: ../src/misc.c:807
 #, c-format
-msgid "Can't execute %s (%s)!\n"
-msgstr "Non è possibile eseguire %s (%s)!\n"
-
-#. Units Tab of file size (bytes,kilobytes,...)
-#: ../src/misc.c:1129 ../src/misc.c:1148
-msgid "B"
-msgstr "B"
-
-#: ../src/misc.c:1129 ../src/misc.c:1148
-msgid "KB"
-msgstr "KB"
+msgid "Failed to launch program: %s"
+msgstr "Avvio del programma non riuscito: %s"
 
-#: ../src/misc.c:1129 ../src/misc.c:1148
-msgid "MB"
-msgstr "MB"
+#: ../src/misc.c:824
+msgid "Select File"
+msgstr "Seleziona file"
 
-#: ../src/misc.c:1129 ../src/misc.c:1148
-msgid "GB"
-msgstr "GB"
+#: ../src/misc.c:830
+msgid "Select Directory"
+msgstr "Seleziona directory"
 
-#: ../src/misc.c:1129 ../src/misc.c:1148
-msgid "TB"
-msgstr "TB"
+#: ../src/misc.c:1142
+msgid "Generate Playlist"
+msgstr "Genera scaletta"
 
-#: ../src/misc.c:1240
-msgid "Generate a playlist"
-msgstr "Genera una playlist"
-
-#: ../src/misc.c:1264
+#: ../src/misc.c:1166
 msgid "M3U Playlist Name"
-msgstr "Nome della playlist M3U"
+msgstr "Nome scaletta M3U"
 
-#: ../src/misc.c:1278
+#: ../src/misc.c:1181
 msgid "Use directory name"
-msgstr "Usa il nome di una cartella"
-
-#: ../src/misc.c:1302 ../src/misc.c:1400
-msgid "Edit Masks"
-msgstr "Modifica Maschere"
+msgstr "Usare nome della directory"
 
 #. Playlist options
-#: ../src/misc.c:1310
+#: ../src/misc.c:1198
 msgid "Playlist Options"
-msgstr "Opzioni Playlist"
+msgstr "Opzioni scaletta"
 
-#: ../src/misc.c:1316
+#: ../src/misc.c:1204
 msgid "Include only the selected files"
-msgstr "Includi solo i file selezionati"
+msgstr "Includere solo i file selezionati"
 
-#: ../src/misc.c:1319
+#: ../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 ""
-"Solo il file selezionato sarà scritto sulla playlist, se questa opzione è "
-"attivata. In caso contrario vi saranno scritti tutti i file."
+"Se attivata, solo i file selezionati saranno scritti nel file della "
+"scaletta. Altrimenti, saranno scritti tutti i file."
 
-#: ../src/misc.c:1326
+#: ../src/misc.c:1210
 msgid "Use full path for files in playlist"
-msgstr "Usa un percorso completo per i file nella playlist"
+msgstr "Usare percorso completo dei file nella scaletta"
 
-#: ../src/misc.c:1329
+#: ../src/misc.c:1213
 msgid "Use relative path for files in playlist"
-msgstr "Usa un percorso relativo per i file nella playlist"
+msgstr "Usare percorso relativo dei file nella scaletta"
 
 #. Create playlist in parent directory
-#: ../src/misc.c:1339
+#: ../src/misc.c:1219
 msgid "Create playlist in the parent directory"
-msgstr "Crea la playlist nella cartella genitrice"
+msgstr "Creare scaletta nella directory superiore"
 
-#: ../src/misc.c:1342
+#: ../src/misc.c:1222
 msgid "If activated, the playlist will be created in the parent directory."
-msgstr ""
-"Se questa opzione è attivata, la playlist sarà creata nella cartella "
-"genitrice."
+msgstr "Se attivata, la scaletta sarà creata nella cartella superiore."
 
 #. DOS Separator
-#: ../src/misc.c:1346
+#: ../src/misc.c:1226
 msgid "Use DOS directory separator"
-msgstr "Usa il separatore delle cartelle in stile DOS"
+msgstr "Usare il separatore directory DOS"
 
-#: ../src/misc.c:1351
+#: ../src/misc.c:1232
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
-"Questa opzione sostituisce il separatore di cartelle UNIX  '/' con quello "
-"DOS '\\'."
+"Questa opzione sostituisce il separatore di directory UNIX «/» con il "
+"separatore DOS «\\»."
 
-#: ../src/misc.c:1360
+#: ../src/misc.c:1241
 msgid "Playlist Content"
-msgstr "Contenuto Playlist"
+msgstr "Contenuto scaletta"
 
-#: ../src/misc.c:1366
+#: ../src/misc.c:1247
 msgid "Write only list of files"
-msgstr "Scrivi solo la lista dei file"
+msgstr "Scrivere solo l'elenco dei file"
 
-#: ../src/misc.c:1370
+#: ../src/misc.c:1251
 msgid "Write info using filename"
-msgstr "Scrivi le informazioni usando il nome del file"
-
-#: ../src/misc.c:1373
-msgid "Write info using :"
-msgstr "Scrivi le informazioni usando:"
-
-#: ../src/misc.c:1645
-#, fuzzy, c-format
-msgid "Playlist file '%s' already exists"
-msgstr ""
-"Il file della playlist '%s' esiste già!\n"
-"Sovrascrivo?"
-
-#: ../src/misc.c:1647
-#, fuzzy
-msgid "Do you want to save the playlist, overwriting the existing file?"
-msgstr ""
-"Vuoi scrivere l'etichetta del file\n"
-" '%s'?"
+msgstr "Scrivere informazioni usando il nome del file"
 
-#: ../src/misc.c:1649
-#, fuzzy
-msgid "Write Playlist"
-msgstr "Scrivi Playlist..."
+#: ../src/misc.c:1254
+msgid "Write info using:"
+msgstr "Scrivere informazioni usando:"
 
-#: ../src/misc.c:1667
-#, fuzzy, c-format
+#: ../src/misc.c:1468
+#, c-format
 msgid "Cannot write playlist file '%s'"
-msgstr ""
-"Non è possibile scrivere la playlist nel file '%s'!\n"
-"(%s)"
+msgstr "Impossibile scrivere il file di scaletta «%s»"
 
-#: ../src/misc.c:1670
-#, fuzzy
+#: ../src/misc.c:1472
 msgid "Playlist File Error"
-msgstr "L'immagine non è stata caricata..."
+msgstr "Errore file di scaletta"
 
-#: ../src/misc.c:1677
+#: ../src/misc.c:1480
 #, c-format
 msgid "Written playlist file '%s'"
-msgstr "È stato scritto il file della playlist '%s'"
+msgstr "File di scaletta «%s» scritto"
+
+#: ../src/misc.c:1544 ../src/scan_dialog.c:2703 ../src/scan_dialog.c:2765
+msgid "Invalid scanner mask"
+msgstr "Maschera dello scanner non valida"
 
-#: ../src/misc.c:1923
+#: ../src/misc.c:1908
 msgid "CD"
 msgstr "CD"
 
-#: ../src/misc.c:1932
-msgid "Encoded by"
-msgstr "Codificato da"
-
-#: ../src/misc.c:1943
-msgid "Search a file"
-msgstr "Cerca file"
+#: ../src/misc.c:1930
+msgid "Find Files"
+msgstr "Trova file"
 
-#: ../src/misc.c:1981
+#: ../src/misc.c:1962
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
-"Immetti la parola da cercare nei file o non scrivere nulla per mostrare "
-"tutti i file."
+"Digitare la parola da cercare nei file. Oppure non digitare niente per "
+"mostrare tutti i file."
 
 #. Where...
-#: ../src/misc.c:1987
-msgid "In :"
-msgstr "In:"
-
-#: ../src/misc.c:1990
-msgid "the File Name"
-msgstr "è il Nome File"
-
-#. Note : label changed to "the Tag" (to be the only one) to fix a Hungarian grammatical problem (which uses one word to say "in the tag" like here)
-#: ../src/misc.c:1992
+#: ../src/misc.c:1968
+msgid "In:"
+msgstr "Dentro:"
+
+#. Translators: This option is for the previous 'in' option. For instance,
+#. * translate this as "Search" "In:" "the Filename".
+#: ../src/misc.c:1973
+msgid "the Filename"
+msgstr "il nome del file"
+
+#. Translators: This option is for the previous 'in' option. For instance,
+#. * translate this as "Search" "In:" "the Tag".
+#. * 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:1979
 msgid "the Tag"
-msgstr "è l'Etichetta"
+msgstr "l'etichetta"
 
 #. Property of the search
-#: ../src/misc.c:2002 ../src/prefs.c:321
+#: ../src/misc.c:1990 ../src/prefs.c:335
 msgid "Case sensitive"
-msgstr "Maiuscolo e minuscolo"
+msgstr "Maiuscole/minuscole"
+
+#: ../src/misc.c:2217
+msgid "Ready to search…"
+msgstr "Pronto a cercare..."
 
-#: ../src/misc.c:2454
+#: ../src/misc.c:2437
 #, c-format
-msgid "Found : %d file(s)"
-msgstr "Trovati: %d file"
+msgid "Found one file"
+msgid_plural "Found %d files"
+msgstr[0] "Trovato un file"
+msgstr[1] "Trovati %d file"
 
-#: ../src/misc.c:2729
-msgid "Load the filenames from a TXT file"
-msgstr "Carica i nomi dei file da un file di testo"
+#: ../src/misc.c:2722
+msgid "Load Filenames From a Text File"
+msgstr "Carica nomi dei file da un file di testo"
 
-#: ../src/misc.c:2757
-msgid "File :"
+#: ../src/misc.c:2751
+msgid "File:"
 msgstr "File:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: ../src/misc.c:2776
+#: ../src/misc.c:2770
 msgid " Load "
-msgstr "Carica "
+msgstr " Carica "
 
-#: ../src/misc.c:2799
-#, fuzzy
-msgid "Content of TXT file"
-msgstr "Conferma il cambio del nome dei file"
+#: ../src/misc.c:2788
+msgid "Content of Text File"
+msgstr "Contenuto del file di testo"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2820 ../src/misc.c:2914
-#, fuzzy
+#: ../src/misc.c:2809 ../src/misc.c:2904
 msgid "Insert a blank line before the selected line"
-msgstr "Inserisci uno spazio prima di una lettera maiuscola"
+msgstr "Inserisce una riga vuota prima della riga selezionata"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2829 ../src/misc.c:2923
-#, fuzzy
+#: ../src/misc.c:2818 ../src/misc.c:2913
 msgid "Delete the selected line"
-msgstr "Elimina questa linea"
+msgstr "Elimina la riga selezionata"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2838 ../src/misc.c:2932 ../src/misc.c:3408
+#: ../src/misc.c:2827 ../src/misc.c:2922 ../src/misc.c:3408
 msgid "Delete all blank lines"
-msgstr "Elimina tutte le linee vuote"
+msgstr "Elimina tutte le righe vuote"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2850 ../src/misc.c:2944
-#, fuzzy
+#: ../src/misc.c:2839 ../src/misc.c:2934
 msgid "Move up the selected line"
-msgstr "Includi solo i file selezionati"
+msgstr "Sposta in su la riga selezionata"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2859 ../src/misc.c:2953
-#, fuzzy
+#: ../src/misc.c:2848 ../src/misc.c:2943
 msgid "Move down the selected line"
-msgstr "Includi solo i file selezionati"
+msgstr "Sposta in giù la riga selezionata"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2871 ../src/misc.c:2965 ../src/misc.c:3432
+#: ../src/misc.c:2860 ../src/misc.c:2955 ../src/misc.c:3432
 msgid "Reload"
 msgstr "Ricarica"
 
-#: ../src/misc.c:2892
-#, fuzzy
-msgid "List of files"
-msgstr "Scrivi solo la lista dei file"
+#: ../src/misc.c:2882
+msgid "List of Files"
+msgstr "Elenco dei file"
 
-#: ../src/misc.c:2987
-#, fuzzy
+#: ../src/misc.c:2977
 msgid "Selected line:"
-msgstr "Seleziona tutte le linee"
+msgstr "Riga selezionata:"
 
-#: ../src/misc.c:3005
+#: ../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 ""
-"Sarà eseguita l'analisi selezionata in quel momento quando questa opzione è "
-"attiva e dopo che i nomi dei file sono stati caricati (la finestra "
-"dell'analizzatore deve essere aperta)."
+"Quando si attiva questa opzione, dopo aver caricato i nomi dei file, lo "
+"scanner attualmente selezionato sarà avviato (la finestra dello scanner deve "
+"essere aperta)."
+
+#: ../src/misc.c:3082
+#, c-format
+msgid "Cannot retrieve file info (%s)"
+msgstr "Impossibile recuperare le informazioni del file (%s)"
+
+#: ../src/misc.c:3144
+#, c-format
+msgid "Can't open file '%s' (%s)"
+msgstr "Impossibile aprire il file «%s» (%s)"
+
+#: ../src/misc.c:3180
+#, c-format
+msgid "Error reading file (%s)"
+msgstr "Errore nella lettura del file (%s)"
 
 #: ../src/misc.c:3396
 msgid "Insert a blank line"
-msgstr "Inserisci una linea vuota"
+msgstr "Inserisce una riga vuota"
 
 #: ../src/misc.c:3402
 msgid "Delete this line"
-msgstr "Elimina questa linea"
+msgstr "Elimina questa riga"
 
 #: ../src/misc.c:3417
-#, fuzzy
 msgid "Move up this line"
-msgstr "Sposta Su questa Maschera"
+msgstr "Sposta su questa riga"
 
 #: ../src/misc.c:3423
-#, fuzzy
 msgid "Move down this line"
-msgstr "Sposta Giù questa Maschera"
+msgstr "Sposta giù questa riga"
 
 #. Mode changed to profile name
 #: ../src/monkeyaudio_header.c:78 ../src/musepack_header.c:80
@@ -3350,584 +2968,591 @@ msgstr "Sposta Giù questa Maschera"
 msgid "Profile:"
 msgstr "Profilo:"
 
-#: ../src/mp4_header.c:130
-msgid "Audio"
-msgstr "Audio"
-
-#: ../src/mp4_header.c:131
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: ../src/mp4_header.c:211 ../src/mp4_tag.c:109 ../src/mp4_tag.c:118
-#: ../src/mp4_tag.c:290 ../src/mp4_tag.c:297
+#: ../src/mp4_header.c:63 ../src/mp4_tag.c:65 ../src/mp4_tag.c:186
 msgid "MP4 format invalid"
 msgstr "Formato MP4 non valido"
 
-#: ../src/mp4_header.c:273 ../src/mpeg_header.c:365
+#: ../src/mp4_header.c:72 ../src/mp4_tag.c:74
+#, c-format
+msgid "File contains no audio track: '%s'"
+msgstr "Il file non contiene alcuna traccia audio: «%s»"
+
+#: ../src/mp4_header.c:82
+#, c-format
+msgid "Error reading properties from file: '%s'"
+msgstr "Errore nella lettura delle proprietà dal file: «%s»"
+
+#: ../src/mp4_header.c:132 ../src/mpeg_header.c:204
 #, c-format
 msgid "~%d kb/s"
 msgstr "~%d kb/s"
 
-#: ../src/mp4_tag.c:118 ../src/mp4_tag.c:297
-#, fuzzy, c-format
-msgid "ERROR reading tags from file: '%s' (%s)."
-msgstr "Si è verificato un errore aprendo il file '%s' (%s)."
+#: ../src/mp4_tag.c:85 ../src/mp4_tag.c:194
+#, c-format
+msgid "Error reading tags from file: '%s'"
+msgstr "Errore nella lettura delle etichette dal file: «%s»"
 
-#: ../src/mpeg_header.c:78
+#: ../src/mpeg_header.c:64
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../src/mpeg_header.c:79
+#: ../src/mpeg_header.c:65
 msgid "Joint stereo"
-msgstr "Aggiungi stereo"
+msgstr "Joint stereo"
 
-#: ../src/mpeg_header.c:80
+#: ../src/mpeg_header.c:66
 msgid "Dual channel"
-msgstr "Canale doppio "
+msgstr "Doppio canale"
 
-#: ../src/mpeg_header.c:81
+#: ../src/mpeg_header.c:67
 msgid "Single channel"
-msgstr "Canale singolo"
+msgstr "Singolo canale"
+
+#. MPEG, Layer versions
+#: ../src/mpeg_header.c:194
+msgid "MPEG"
+msgstr "MPEG"
+
+#. FIXME: Pass error back to calling function.
+#: ../src/ogg_header.c:227
+#, c-format
+msgid "Error while opening file: '%s' (%s)"
+msgstr "Errore durante l'apertura del file: «%s» (%s)"
 
-#: ../src/ogg_header.c:100
+#: ../src/ogg_header.c:243
 #, c-format
 msgid ""
 "Ogg Vorbis: The specified bitstream does not exist or the file has been "
 "initialized improperly (file: '%s')."
 msgstr ""
+"Ogg Vorbis: il bitstream specificato non esiste o il file è stato "
+"inizializzato non correttamente (file: «%s»)."
 
-#: ../src/ogg_header.c:131
+#: ../src/ogg_header.c:279
 #, c-format
 msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
 msgstr ""
+"Ogg Vorbis: la lettura dal supporto ha riportato un errore (file: «%s»)."
 
-#: ../src/ogg_header.c:134
-#, fuzzy, c-format
+#: ../src/ogg_header.c:282
+#, c-format
 msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
-msgstr "Il flusso di dati Ogg non contiene dati vorbis."
+msgstr "Ogg Vorbis: il bitstream non è un dato Vorbis (file: «%s»)."
 
-#: ../src/ogg_header.c:137
+#: ../src/ogg_header.c:285
 #, c-format
 msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
-msgstr ""
+msgstr "Ogg Vorbis: la versione Vorbis non corrisponde (file: «%s»)."
 
-#: ../src/ogg_header.c:140
+#: ../src/ogg_header.c:288
 #, c-format
 msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
-msgstr ""
+msgstr "Ogg Vorbis: intestazione bitstream Vorbis non valida (file: «%s»)."
 
-#: ../src/ogg_header.c:143
+#: ../src/ogg_header.c:291
 #, c-format
 msgid ""
 "Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack corruption "
 "(file: '%s')."
 msgstr ""
+"Ogg Vorbis: errore di logica interno, indicante un bug o una corruzione heap/"
+"stack (file: «%s»)."
+
+#: ../src/ogg_header.c:337
+#, c-format
+msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
+msgstr "Errore: apertura del file non riuscita: «%s» come Vorbis (%s)."
+
+#: ../src/ogg_tag.c:712 ../src/ogg_tag.c:887
+#, c-format
+msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
+msgstr "Attenzione: il file Ogg Vorbis «%s» contiene un'etichetta ID3v2."
+
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1257
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr "Errore con «loader_write»: %s"
+
+#: ../src/ogg_tag.c:1050 ../src/picture.c:1180
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr "Errore con «loader_close»: %s"
+
+#: ../src/picture.c:104
+#, c-format
+msgid "Image file not saved: %s"
+msgstr "File immagine non salvato: %s"
 
-#: ../src/ogg_header.c:195 ../src/ogg_tag.c:188 ../src/ogg_tag.c:697
+#: ../src/picture.c:154
 #, c-format
-msgid "ERROR: Failed to open file: '%s' as vorbis (%s)."
-msgstr "ERRORE: non è possibile aprire il file '%s' come vorbis (%s)."
+msgid "Cannot open file: '%s'"
+msgstr "Impossibile aprire il file: «%s»"
 
-#: ../src/ogg_tag.c:170
+#: ../src/picture.c:158
+msgid "Image File Error"
+msgstr "Errore file immagine"
+
+#: ../src/picture.c:162 ../src/picture.c:424
 #, c-format
-msgid "Warning : The Ogg Vorbis file '%s' contains an ID3v2 tag."
-msgstr "Attenzione: il file Ogg Vorbis '%s' contiene un'etichetta ID3v2."
+msgid "Image file not loaded: %s"
+msgstr "File immagine non caricato: %s"
+
+#: ../src/picture.c:446
+msgid "Image file loaded"
+msgstr "File immagine caricato"
 
-#: ../src/picture.c:294
-msgid "Add pictures"
+#: ../src/picture.c:504
+msgid "Add Images"
 msgstr "Aggiungi immagini"
 
-#: ../src/picture.c:304 ../src/picture.c:645
+#: ../src/picture.c:514 ../src/picture.c:874
 msgid "All Files"
-msgstr "Ogni File"
+msgstr "Tutti i file"
 
-#: ../src/picture.c:310 ../src/picture.c:651
+#: ../src/picture.c:520 ../src/picture.c:880
 msgid "PNG and JPEG"
 msgstr "PNG e JPEG"
 
-#: ../src/picture.c:427
+#: ../src/picture.c:651
 #, c-format
-msgid "Picture Properties %d/%d"
-msgstr "Proprietà Immagine %d/%d"
+msgid "Image Properties %d/%d"
+msgstr "Proprietà dell'immagine %d/%d"
 
-#: ../src/picture.c:457
-msgid "Picture Type"
-msgstr "Tipo Immagine"
+#: ../src/picture.c:675
+msgid "Image Type"
+msgstr "Tipo d'immagine"
 
 #. Description of the picture
-#: ../src/picture.c:514
-msgid "Picture Description:"
-msgstr "Descrizione Immagine:"
+#: ../src/picture.c:734
+msgid "Image Description:"
+msgstr "Descrizione dell'immagine:"
 
-#: ../src/picture.c:633
+#: ../src/picture.c:861
 #, c-format
-msgid "Save picture %d/%d"
+msgid "Save Image %d/%d"
 msgstr "Salva immagine %d/%d"
 
-#: ../src/picture.c:719
-#, fuzzy, c-format
-msgid "The following file already exists: '%s'"
-msgstr ""
-"Il file seguente esiste già:\n"
-"'%s'\n"
-"Vuoi davvero sovrascriverlo?"
-
-#: ../src/picture.c:721
-#, fuzzy
-msgid "Do you want to save anyway, overwriting the file?"
-msgstr ""
-"Vuoi scrivere l'etichetta del file\n"
-" '%s'?"
-
-#: ../src/picture.c:723
-#, fuzzy
-msgid "Save"
-msgstr " Salva "
-
-#: ../src/picture.c:799
+#: ../src/picture.c:1021
 msgid "JPEG image"
 msgstr "Immagine JPEG"
 
-#: ../src/picture.c:801
+#: ../src/picture.c:1023
 msgid "PNG image"
 msgstr "Immagine PNG"
 
-#: ../src/picture.c:803
+#: ../src/picture.c:1025
+msgid "GIF image"
+msgstr "Immagine GIF"
+
+#: ../src/picture.c:1027
 msgid "Unknown image"
 msgstr "Immagine sconosciuta"
 
-#: ../src/picture.c:814
+#: ../src/picture.c:1039
 msgid "32x32 pixel PNG file icon"
-msgstr "File icona PNG a 32x32 pixel"
+msgstr "File icona PNG 32x32 pixel"
 
-#: ../src/picture.c:816
+#: ../src/picture.c:1041
 msgid "Other file icon"
-msgstr "Altro file icona"
+msgstr "Altri file icona"
 
-#: ../src/picture.c:818
+#: ../src/picture.c:1043
 msgid "Cover (front)"
 msgstr "Copertina (fronte)"
 
-#: ../src/picture.c:820
+#: ../src/picture.c:1045
 msgid "Cover (back)"
 msgstr "Copertina (retro)"
 
-#: ../src/picture.c:822
+#: ../src/picture.c:1047
 msgid "Leaflet page"
-msgstr "Pagina di volantino"
+msgstr "Pagina opuscolo"
 
-#: ../src/picture.c:824
+#: ../src/picture.c:1049
 msgid "Media (e.g. label side of CD)"
-msgstr "Mezzo (cioè il lato dell'etichetta di un CD)"
+msgstr "Supporto (es. costola laterale del CD)"
 
-#: ../src/picture.c:826
+#: ../src/picture.c:1051
 msgid "Lead artist/lead performer/soloist"
-msgstr "Carica artista/carica esecutore/solista"
+msgstr "Artista principale/musicista principale/solista"
 
-#: ../src/picture.c:828
+#: ../src/picture.c:1053
 msgid "Artist/performer"
-msgstr "Artista/esecutore"
+msgstr "Artista/musicista"
 
-#: ../src/picture.c:830
+#: ../src/picture.c:1055
 msgid "Conductor"
-msgstr "Conduttore"
+msgstr "Direttore"
 
-#: ../src/picture.c:832
+#: ../src/picture.c:1057
 msgid "Band/Orchestra"
-msgstr "Gruppo/Orchestra"
+msgstr "Gruppo/orchestra"
 
-#: ../src/picture.c:836
+#: ../src/picture.c:1061
 msgid "Lyricist/text writer"
-msgstr "Lirico/scrittore testo"
+msgstr "Paroliere/scrittore"
 
-#: ../src/picture.c:838
+#: ../src/picture.c:1063
 msgid "Recording location"
-msgstr "Località di registrazione"
+msgstr "Luogo di registrazione"
 
-#: ../src/picture.c:840
+#: ../src/picture.c:1065
 msgid "During recording"
 msgstr "Durante la registrazione"
 
-#: ../src/picture.c:842
+#: ../src/picture.c:1067
 msgid "During performance"
-msgstr "Durante l'esecuzione"
+msgstr "Durante l'esibizione"
 
-#: ../src/picture.c:844
+#: ../src/picture.c:1069
 msgid "Movie/video screen capture"
-msgstr "Cattura schermo film/video"
+msgstr "Cattura dello schermo di filmati/video"
 
-#: ../src/picture.c:846
-msgid "A bright coloured fish"
-msgstr "Un pesce di colore intenso"
+#: ../src/picture.c:1071
+msgid "A bright colored fish"
+msgstr "Un brillante pesce colorato"
 
-#: ../src/picture.c:848
+#: ../src/picture.c:1073
 msgid "Illustration"
 msgstr "Illustrazione"
 
-#: ../src/picture.c:850
+#: ../src/picture.c:1075
 msgid "Band/Artist logotype"
-msgstr "Logo gruppo/artista"
+msgstr "Logotipo gruppo/artista"
 
-#: ../src/picture.c:852
+#: ../src/picture.c:1077
 msgid "Publisher/studio logotype"
-msgstr "Logo editore/studio"
+msgstr "Logotipo editore/studio"
 
-#: ../src/picture.c:856
-msgid "Unknown picture type"
-msgstr "Tipo d'immagine sconosciuta"
+#: ../src/picture.c:1081
+msgid "Unknown image type"
+msgstr "Tipo immagine sconosciuto"
 
-#: ../src/picture.c:885 ../src/picture.c:896
+#: ../src/picture.c:1111 ../src/picture.c:1122
 msgid "pixels"
 msgstr "pixel"
 
-#: ../src/picture.c:886 ../src/picture.c:897
+#: ../src/picture.c:1112 ../src/picture.c:1123
 msgid "Type"
 msgstr "Tipo"
 
-#: ../src/picture.c:898
+#: ../src/picture.c:1124
 msgid "Description"
 msgstr "Descrizione"
 
-#: ../src/picture.c:954
-#, c-format
-msgid "Error with 'loader_close': %s"
-msgstr ""
-
-#: ../src/picture.c:1011
-#, fuzzy
+#: ../src/picture.c:1240
 msgid ""
-"Cannot display the picutre, as not enough data has been read to determine "
+"Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
 msgstr ""
-"Non posso mostrare l'immagine visto che non sono stati letti abbastanza dati "
-"per determinare come creare il buffer dell'immagine."
+"Impossibile mostrare l'immagine perché non sono stati letti dati sufficienti "
+"a determinare come creare il buffer di immagine."
 
-#: ../src/picture.c:1018
-msgid "Cannot display the picture"
-msgstr ""
+#: ../src/picture.c:1247
+msgid "Cannot display the image"
+msgstr "Impossibile mostrare l'immagine"
 
-#: ../src/picture.c:1019
-#, fuzzy
+#: ../src/picture.c:1249
 msgid ""
-"Not enough data has been read to determine how to create the image buffer"
-msgstr ""
-"Non posso mostrare l'immagine visto che non sono stati letti abbastanza dati "
-"per determinare come creare il buffer dell'immagine."
-
-#: ../src/picture.c:1020
-#, fuzzy
-msgid "Load Picture File"
-msgstr "Sto caricando l'immagine..."
-
-#: ../src/picture.c:1026
-#, c-format
-msgid "Error with 'loader_write': %s"
+"Not enough data has been read to determine how to create the image buffer."
 msgstr ""
+"Non sono stati letti dati sufficienti a determinare come creare il buffer di "
+"immagine."
 
-#: ../src/picture.c:1111 ../src/picture.c:1140 ../src/picture.c:1159
-#, fuzzy, c-format
-msgid "Picture file not loaded (%s)…"
-msgstr "L'immagine non è stata caricata..."
-
-#: ../src/picture.c:1133
-#, fuzzy, c-format
-msgid "Cannot open file: '%s'"
-msgstr "Non posso aprire il file '%s' (%s)"
-
-#: ../src/picture.c:1136
-#, fuzzy
-msgid "Picture File Error"
-msgstr "L'immagine non è stata caricata..."
-
-#: ../src/picture.c:1171
-#, fuzzy
-msgid "Picture file loaded…"
-msgstr "L'immagine non è stata caricata..."
-
-#: ../src/picture.c:1187 ../src/picture.c:1194
-#, fuzzy, c-format
-msgid "Picture file can't be saved (%s)…"
-msgstr "L'immagine non è stata caricata..."
-
-#. File Browser frame
-#: ../src/prefs.c:153
-msgid "File Browser"
-msgstr "Navigatore File"
+#: ../src/picture.c:1251
+msgid "Load Image File"
+msgstr "Carica file immagine"
 
 #. Label
-#: ../src/prefs.c:164
-#, fuzzy
-msgid "Default directory :"
-msgstr "Vai alla cartella predefinita"
+#: ../src/prefs.c:152
+msgid "Default directory:"
+msgstr "Directory predefinita:"
 
-#: ../src/prefs.c:177
+#: ../src/prefs.c:165
 msgid ""
 "Specify the directory where your files are located. This path will be loaded "
 "when EasyTAG starts without parameter."
 msgstr ""
-"Specifica la cartella in cui risiedono i tuoi file. Questo percorso verrà "
-"caricato quando EasyTAG viene lanciato senza parametri."
+"Specifica la directory in cui si trovano i file. Questo percorso sarà "
+"caricato quando si avvia EasyTAG senza parametro."
 
 #. Load directory on startup
-#: ../src/prefs.c:198
+#: ../src/prefs.c:186
 msgid ""
 "Load on startup the default directory or the directory passed as argument"
 msgstr ""
+"Caricare all'avvio la directory predefinita o la directory passata come "
+"argomento"
 
-#: ../src/prefs.c:201
-#, fuzzy
+#: ../src/prefs.c:189
 msgid ""
 "Automatically search files, when EasyTAG starts, into the default directory. "
 "Note that this path may be overridden by the parameter passed to easytag "
 "(easytag /path_to/mp3_files)."
 msgstr ""
-"Cerca automaticamente file all'avvio di EasyTAG nella seguente cartella. "
-"Nota che questo percorso può essere sovrascritto dal parametro passato ad "
-"EasyTAG: easytag  /percorso_per/file_mp3."
+"Cerca i file automaticamente nella directory predefinita quando si avvia "
+"EasyTAG. Notare che questo percorso potrebbe essere sovrascritto dal "
+"parametro passato all'applicazione (es. easytag /percorso/file_mp3)."
 
 #. Browse subdirectories
-#: ../src/prefs.c:206
+#: ../src/prefs.c:194
 msgid "Search subdirectories"
-msgstr "Ricerca nelle sottocartelle"
+msgstr "Cercare nelle sottodirectory"
 
-#: ../src/prefs.c:209
+#: ../src/prefs.c:197
 msgid "Search subdirectories for files when reading a directory into the tree."
 msgstr ""
-"Ricerca i file nelle sottocartelle durante la lettura di una cartella "
-"dell'albero"
+"Cerca i file nelle sottodirectory quando si legge una directory nell'albero."
 
 #. Open the node to show subdirectories
-#: ../src/prefs.c:213
-#, fuzzy
+#: ../src/prefs.c:201
 msgid "Show subdirectories when selecting a directory"
-msgstr "Mostra le sottocartelle durante la selezione di una cartella"
+msgstr "Mostrare le sottodirectory quando si seleziona una directory"
 
-#: ../src/prefs.c:217
+#: ../src/prefs.c:205
 msgid ""
 "This expands the selected node into the file browser to display the sub-"
 "directories."
 msgstr ""
-"Questo espande il nodo selezionato nel navigatore per mostrare le "
-"sottocartelle."
+"Questo espande il nodo selezionato nell'esploratore dei file per mostrare le "
+"sottodirectory."
 
 #. Browse hidden directories
-#: ../src/prefs.c:221
+#: ../src/prefs.c:209
 msgid "Search hidden directories"
-msgstr "Ricerca nelle cartelle nascoste"
+msgstr "Cercare directory nascoste"
 
-#: ../src/prefs.c:226
+#: ../src/prefs.c:214
 msgid "Search hidden directories for files (directories starting by a '.')."
 msgstr ""
-"Cerca file nelle cartelle nascoste (sono le cartelle che iniziano per '.')."
+"Cerca i file nelle directory nascoste (le directory che iniziano con «.»)."
+
+#.
+#. * Misc
+#.
+#: ../src/prefs.c:222
+msgid "Misc"
+msgstr "Varie"
 
 #. User interface
-#: ../src/prefs.c:245
+#: ../src/prefs.c:228
 msgid "User Interface"
-msgstr "Interfaccia Utente"
+msgstr "Interfaccia utente"
 
 #. Show header infos
-#: ../src/prefs.c:252
-#, fuzzy
+#: ../src/prefs.c:235
 msgid "Show header information of file"
-msgstr "Mostra le informazioni dell'intestazione del file"
+msgstr "Mostrare le informazioni d'intestazione del file"
 
-#: ../src/prefs.c:255
-#, fuzzy
+#: ../src/prefs.c:238
 msgid ""
 "If activated, information about the file as the bitrate, the time, the size, "
 "will be displayed under the filename entry."
 msgstr ""
-"Verranno mostrate sotto il nome del file informazioni quali bitrate, durata, "
-"dimensione, se questa opzione è attivata."
+"Se attivata, le informazioni sul file come bitrate, la durata, la "
+"dimensione, saranno mostrate sotto la voce del nome del file."
 
-#: ../src/prefs.c:262
-msgid "Display changed files in list using :"
-msgstr "Mostra i file modificati nella lista usando:"
+#: ../src/prefs.c:244
+msgid "Display changed files in list using:"
+msgstr "Mostrare le modifiche ai file usando nell'elenco:"
 
-#: ../src/prefs.c:265
+#: ../src/prefs.c:247
 msgid "Red color"
 msgstr "Colore rosso"
 
-#: ../src/prefs.c:271
+#: ../src/prefs.c:253
 msgid "Bold style"
-msgstr "Stile grassetto"
+msgstr "Stile in grassetto"
 
 #. Sorting List Options
-#: ../src/prefs.c:277
+#: ../src/prefs.c:259
 msgid "Sorting List Options"
-msgstr "Opzioni Ordinamento Lista"
+msgstr "Opzioni di ordinamento dell'elenco"
 
 #. Sorting method
-#: ../src/prefs.c:287
-msgid "Sort the file list by :"
-msgstr "Lista file ordinata per:"
-
-#. Two columns
-#. Items of option menu
-#: ../src/prefs.c:298
-msgid "Ascending file name"
-msgstr "Nome file crescente"
-
-#: ../src/prefs.c:299
-msgid "Descending file name"
-msgstr "Nome file decrescente"
-
-#: ../src/prefs.c:300
-msgid "Ascending track number"
-msgstr "Numeri di traccia crescenti"
+#: ../src/prefs.c:268
+msgid "Sort the file list by:"
+msgstr "Ordinare l'elenco dei file per:"
 
-#: ../src/prefs.c:301
-msgid "Descending track number"
-msgstr "Numeri di traccia decrescenti"
-
-#: ../src/prefs.c:302
-msgid "Ascending creation date"
-msgstr "Data di creazione crescente"
+#: ../src/prefs.c:278
+msgid "Ascending filename"
+msgstr "Nome del file crescente"
 
-#: ../src/prefs.c:303
-msgid "Descending creation date"
-msgstr "Data di creazione decrescente"
+#: ../src/prefs.c:280
+msgid "Descending filename"
+msgstr "Nome del file decrescente"
 
-#: ../src/prefs.c:304
+#: ../src/prefs.c:281
 msgid "Ascending title"
 msgstr "Titolo crescente"
 
-#: ../src/prefs.c:305
+#: ../src/prefs.c:282
 msgid "Descending title"
 msgstr "Titolo decrescente"
 
-#: ../src/prefs.c:306
+#: ../src/prefs.c:283
 msgid "Ascending artist"
 msgstr "Artista crescente"
 
-#: ../src/prefs.c:307
+#: ../src/prefs.c:284
 msgid "Descending artist"
 msgstr "Artista decrescente"
 
-#: ../src/prefs.c:308
+#: ../src/prefs.c:286
+msgid "Ascending album artist"
+msgstr "Artista dell'album crescente"
+
+#: ../src/prefs.c:288
+msgid "Descending album artist"
+msgstr "Artista dell'album decrescente"
+
+#: ../src/prefs.c:289
 msgid "Ascending album"
-msgstr "Album crescenti"
+msgstr "Album crescente"
 
-#: ../src/prefs.c:309
+#: ../src/prefs.c:290
 msgid "Descending album"
-msgstr "Album decrescenti"
+msgstr "Album decrescente"
 
-#: ../src/prefs.c:310
+#: ../src/prefs.c:291
 msgid "Ascending year"
 msgstr "Anno crescente"
 
-#: ../src/prefs.c:311
+#: ../src/prefs.c:292
 msgid "Descending year"
 msgstr "Anno decrescente"
 
-#: ../src/prefs.c:312
+#: ../src/prefs.c:294
+msgid "Ascending disc number"
+msgstr "Numero del disco crescente"
+
+#: ../src/prefs.c:296
+msgid "Descending disc number"
+msgstr "Numero del disco decrescente"
+
+#: ../src/prefs.c:298
+msgid "Ascending track number"
+msgstr "Numero di traccia crescente"
+
+#: ../src/prefs.c:300
+msgid "Descending track number"
+msgstr "Numero di traccia decrescente"
+
+#: ../src/prefs.c:301
 msgid "Ascending genre"
 msgstr "Genere crescente"
 
-#: ../src/prefs.c:313
+#: ../src/prefs.c:302
 msgid "Descending genre"
 msgstr "Genere decrescente"
 
-#: ../src/prefs.c:314
+#: ../src/prefs.c:303
 msgid "Ascending comment"
 msgstr "Commento crescente"
 
-#: ../src/prefs.c:315
+#: ../src/prefs.c:304
 msgid "Descending comment"
 msgstr "Commento decrescente"
 
-#: ../src/prefs.c:318
-msgid "Select the type of file sorting when loading a directory."
-msgstr "Seleziona il tipo di ordinamento del file quando carichi una cartella."
+#: ../src/prefs.c:306
+msgid "Ascending composer"
+msgstr "Compositore crescente"
 
-#: ../src/prefs.c:327
-msgid "If activated, the sorting of the list will be dependent on the case."
-msgstr ""
-"L'ordinamento della lista terrà conto delle lettere maiuscole e minuscole, "
-"se questa opzione è attivata."
+#: ../src/prefs.c:308
+msgid "Descending composer"
+msgstr "Compositore decrescente"
 
-#. Message Dialog Position
-#: ../src/prefs.c:331
-msgid "Message Dialog Position"
-msgstr "Posizione delle finestre di dialogo"
+#: ../src/prefs.c:310
+msgid "Ascending original artist"
+msgstr "Artista originale crescente"
 
-#: ../src/prefs.c:339
-msgid "No particular position"
-msgstr "Nessuna posizione particolare"
+#: ../src/prefs.c:312
+msgid "Descending original artist"
+msgstr "Artista originale decrescente"
 
-#: ../src/prefs.c:343
-msgid "Let the Window Manager to place the windows."
-msgstr "Lascia che sia il Gestore Finestre a posizionarle."
+#: ../src/prefs.c:314
+msgid "Ascending copyright"
+msgstr "Copyright crescente"
 
-#: ../src/prefs.c:348
-msgid "Center of the main window"
-msgstr "Centro della finestra principale"
+#: ../src/prefs.c:316
+msgid "Descending copyright"
+msgstr "Copyright decrescente"
 
-#: ../src/prefs.c:352
-msgid "Windows should be placed in the center of the main window."
-msgstr ""
-"Le finestre dovrebbero venir posizionate al centro della finestra principale."
+#: ../src/prefs.c:318
+msgid "Ascending URL"
+msgstr "URL crescente"
 
-#: ../src/prefs.c:357
-msgid "Center of the screen"
-msgstr "Centro dello schermo"
+#: ../src/prefs.c:320
+msgid "Descending URL"
+msgstr "URL decrescente"
 
-#: ../src/prefs.c:361
-msgid "Windows should be placed in the center of the screen."
-msgstr "Le finestre devono venir posizionate al centro dello schermo."
+#: ../src/prefs.c:322
+msgid "Ascending encoded by"
+msgstr "Codificato da crescente"
 
-#: ../src/prefs.c:366
-msgid "Mouse position"
-msgstr "Posizione mouse"
+#: ../src/prefs.c:324
+msgid "Descending encoded by"
+msgstr "Codificato da decrescente"
+
+#: ../src/prefs.c:326
+msgid "Ascending creation date"
+msgstr "Data di creazione crescente"
+
+#: ../src/prefs.c:328
+msgid "Descending creation date"
+msgstr "Data di creazione decrescente"
 
-#: ../src/prefs.c:370
-msgid "Windows should be placed at the current mouse position."
+#: ../src/prefs.c:332
+msgid "Select the type of file sorting when loading a directory."
+msgstr ""
+"Seleziona il tipo di ordinamento dei file quando si carica una directory."
+
+#: ../src/prefs.c:344
+msgid "If activated, the sorting of the list will be dependent on the case."
 msgstr ""
-"Le finestre devono venir posizionate alla posizione corrente del mouse."
+"Se attivata, l'ordinamento dell'elenco sarà dipendente dal maiuscolo e "
+"minuscolo."
 
 #. File Player
-#: ../src/prefs.c:374
+#: ../src/prefs.c:348
 msgid "File Audio Player"
-msgstr "Riproduttore File Audio"
+msgstr "Riproduttore file audio"
 
-#: ../src/prefs.c:386
-msgid "Player to run :"
+#: ../src/prefs.c:360
+msgid "Player to run:"
 msgstr "Riproduttore da eseguire:"
 
-#: ../src/prefs.c:392
+#: ../src/prefs.c:366
 msgid ""
 "Enter the program used to play the files. Some arguments can be passed for "
 "the program (as 'xmms -p') before to receive files as other arguments."
 msgstr ""
-"Immetti il programma usato per riprodurre i file. Si possono passare al "
-"programma alcuni argomenti (ad esempio \"xmms -p\") prima di ottenere i "
-"file, come pure altri argomenti."
+"Inserire il programma usato per riprodurre i file. Alcuni argomenti possono "
+"essere passati per il programma (come «xmms -p) prima di ricevere i file "
+"come altri argomenti."
 
 #. Log options
-#: ../src/prefs.c:410
-#, fuzzy
+#: ../src/prefs.c:384
 msgid "Log Options"
-msgstr "Opzioni Etichetta"
+msgstr "Opzioni registro"
 
 #. Show / hide log view
-#: ../src/prefs.c:417
-#, fuzzy
+#: ../src/prefs.c:391
 msgid "Show log view in main window"
-msgstr "Centro della finestra principale"
+msgstr "Mostrare il registro nella finestra principale"
 
-#: ../src/prefs.c:420
-#, fuzzy
+#: ../src/prefs.c:394
 msgid "If activated, the log view would be visible in the main window."
 msgstr ""
-"Se questa opzione è attivata, la playlist sarà creata nella cartella "
-"genitrice."
+"Se attivata, la visualizzazione del registro sarà visibile nella finestra "
+"principale."
 
-#: ../src/prefs.c:427
-msgid "Max number of lines :"
-msgstr ""
+#: ../src/prefs.c:400
+msgid "Max number of lines:"
+msgstr "Numero massimo di righe:"
 
-#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formated_Toggled),NULL);
-#. g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
+#. g_signal_connect(G_OBJECT(NumberTrackFormated),"toggled",G_CALLBACK(Number_Track_Formatted_Toggled),NULL);
+#. * g_signal_emit_by_name(G_OBJECT(NumberTrackFormated),"toggled");
 #. gtk_tooltips_set_tip(Tips,GTK_BIN(FilePlayerCombo)->child,_("Enter the program used to "
 #. "play the files. Some arguments can be passed for the program (as 'xmms -p') before "
 #. "to receive files as other arguments."),NULL);
@@ -3935,81 +3560,83 @@ msgstr ""
 #.
 #. * File Settings
 #.
-#: ../src/prefs.c:446 ../src/prefs.c:447
+#: ../src/prefs.c:418
 msgid "File Settings"
-msgstr "Impostazioni File"
+msgstr "Impostazioni file"
 
 #. File (name) Options
-#: ../src/prefs.c:457
+#: ../src/prefs.c:424
 msgid "File Options"
-msgstr "Opzioni File"
+msgstr "Opzioni dei file"
 
-#: ../src/prefs.c:463
+#: ../src/prefs.c:430
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr ""
-"Sostituisci i caratteri illegali nel nome del file (per Windows e CD-ROM)"
+"Sostituire i caratteri non leciti nel nome del file (per Windows e i CD-Rom)"
 
-#: ../src/prefs.c:466
-#, fuzzy
+#: ../src/prefs.c:433
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
 "problem when renaming the file. This is useful when renaming the file from "
 "the tag with the scanner."
 msgstr ""
-"Converte i caratteri illegali ('\\', ':', ';', '*', '?', '\"', '<', '>', "
-"'|') presenti nel nome file per i file system di tipo FAT32/16 e ISO9660 e "
-"Joliet in modo da evitare problemi quando il file stesso viene rinominato. "
-"Utile quando si rinomina file dall'etichetta usando l'analizzatore."
+"Converte i caratteri non leciti per i filesystem FAT32/16 e ISO9660 + Joliet "
+"(«\\», «:», «;», «*», «?», «\"», «<», «>», «|») dei nomi dei file per "
+"evitare problemi quando si rinomina il file. Questo è utile quando si "
+"rinomina il file dall'etichetta con lo scanner."
 
 #. Extension case (lower/upper?)
-#: ../src/prefs.c:475
-msgid "Convert filename extension to :"
-msgstr "Converti l'estensione del nome file in:"
+#: ../src/prefs.c:441
+msgid "Convert filename extension to:"
+msgstr "Convertire l'estensione del nome del file in:"
 
-#: ../src/prefs.c:478
+#: ../src/prefs.c:444
 msgid "Lower Case"
 msgstr "Minuscolo"
 
-#: ../src/prefs.c:481
+#: ../src/prefs.c:447
 msgid "For example, the extension will be converted to '.mp3'"
-msgstr "Per esempio, l'estensione sarà convertita in '.mp3'"
+msgstr "Per esempio, l'estensione sarà convertita in «.mp3»"
 
-#: ../src/prefs.c:484
+#: ../src/prefs.c:450
 msgid "Upper Case"
 msgstr "Maiuscolo"
 
-#: ../src/prefs.c:487
+#: ../src/prefs.c:453
 msgid "For example, the extension will be converted to '.MP3'"
-msgstr "Per esempio, l'estensione sarà convertita in '.MP3'"
+msgstr "Per esempio, l'estensione sarà convertita in «.MP3»"
 
-#: ../src/prefs.c:490
+#: ../src/prefs.c:456
 msgid "No Change"
-msgstr "Nessuna Modifica"
+msgstr "Nessuna modifica"
 
-#: ../src/prefs.c:493
+#: ../src/prefs.c:459
 msgid "The extension will not be converted"
-msgstr "L'estensione non sarà convertita"
+msgstr "L'estensione non sarà convertita."
 
 #. Preserve modification time
-#: ../src/prefs.c:496
+#: ../src/prefs.c:462
 msgid "Preserve modification time of the file"
-msgstr "Mantieni la data di modifica del file"
+msgstr "Preservare la data di modifica del file"
 
-#: ../src/prefs.c:499
+#: ../src/prefs.c:465
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
-"Mantieni la data di modifica (nelle proprietà file) quando salvi il file."
+"Preserva la data di modifica (nelle proprietà del file) quando si salva il "
+"file."
 
 #. Change directory modification time
-#: ../src/prefs.c:503
+#: ../src/prefs.c:469
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
+"Aggiornare la data di modifica della directory superiore del file "
+"(consigliato quando si usa Amarok)"
 
-#: ../src/prefs.c:507
+#: ../src/prefs.c:473
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -4018,1774 +3645,1295 @@ msgid ""
 "performance reasons, they refresh file information by detecting changes of "
 "the parent directory."
 msgstr ""
+"La data di modifica della directory superiore del file sarà aggiornata "
+"quando si salva l'etichetta del file. Al momento viene fatto automaticamente "
+"solo quando si rinomina un file.\n"
+"Questa funzionalità è interessante quando si usano applicazioni come Amarok. "
+"Per motivi di prestazioni aggiornano le informazioni sul file rilevando le "
+"modifiche della directory superiore."
 
-#. Character Set for File Name
-#: ../src/prefs.c:515
-msgid "Character Set for File Name"
-msgstr "Gruppo di caratteri per i nomi dei file"
+#. Character Set for Filename
+#: ../src/prefs.c:481
+msgid "Character Set for Filename"
+msgstr "Set di caratteri per il nome del file"
 
 #. Rules for character set
-#: ../src/prefs.c:531
+#: ../src/prefs.c:493
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
 msgstr ""
 "Regole da applicare se alcuni caratteri non possono essere convertiti nella "
-"codifica di sistema quando venga scritto il nome del file:"
+"codifica di caratteri di sistema quando si scrive il nome del file:"
 
-#: ../src/prefs.c:539
-#, fuzzy
+#: ../src/prefs.c:499
 msgid "Try another character encoding"
-msgstr "Prova un'altra codifica di caratteri"
+msgstr "Provare un'altra codifica dei caratteri"
 
-#: ../src/prefs.c:543
+#: ../src/prefs.c:503
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
-"your locale (for example : ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
+"your locale (for example: ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
 "for 'ro'). If it fails, it will try the character encoding ISO-8859-1."
 msgstr ""
-"Con questa opzione, verrà provata la conversione nella codifica associata "
-"alla tua localizzazione (per esempio: ISO-8859-1 per 'fr', KOI8-R per 'ru', "
-"ISO-8859-2 per 'ro'). Il sistema proverà la codifica ISO-8859-1 se ciò "
-"dovesse fallire."
+"Con questa opzione, si cercherà la conversione alla codifica associata "
+"all'attuale localizzazione (per esempio: ISO-8859-1 per «fr», KOI8-R per "
+"«ru», ISO-8859-2 per «ro»). Se fallisce, proverà la codifica di caratteri "
+"ISO-8859-1."
 
-#: ../src/prefs.c:550
+#: ../src/prefs.c:510
 msgid ""
 "Force using the system character encoding and activate the transliteration"
-msgstr "Forza l'uso della codifica di sistema ed attiva la traslitterazione"
+msgstr ""
+"Forzare l'uso della codifica dei caratteri del sistema e attivare la "
+"traslitterazione"
 
-#: ../src/prefs.c:553 ../src/prefs.c:875 ../src/prefs.c:944
+#: ../src/prefs.c:514 ../src/prefs.c:844 ../src/prefs.c:913
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
 "looking characters."
 msgstr ""
-"Con questa opzione, un carattere che non possa essere rappresentato nella "
-"codifica scelta potrà venire approssimato ad uno o più caratteri somiglianti."
+"Con questa opzione, quando un carattere non può essere rappresentato nel set "
+"di caratteri di destinazione, può essere approssimato tramite uno o più "
+"caratteri visivamente simili."
 
-#: ../src/prefs.c:559
+#: ../src/prefs.c:520
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr ""
-"Forza l'uso della codifica di sistema e rifiuta silenziosamente alcuni "
-"caratteri"
+"Forzare l'uso della codifica dei caratteri del sistema e silenziosamente "
+"scartare alcuni caratteri"
 
-#: ../src/prefs.c:562 ../src/prefs.c:884 ../src/prefs.c:953
+#: ../src/prefs.c:524 ../src/prefs.c:854 ../src/prefs.c:923
 msgid ""
-"With this option, when a characters cannot be represented in the target "
+"With this option, when a character cannot be represented in the target "
 "character set, it will be silently discarded."
 msgstr ""
-"Con questa opzione, un carattere sarà rigettato silenziosamente quando non "
-"possa essere rappresentato nella codifica di sistema."
+"Con questa opzione, quando un carattere non può essere rappresentato nel set "
+"di caratteri di destinazione, sarà silenziosamente scartato."
 
 #.
 #. * Tag Settings
 #.
-#: ../src/prefs.c:571 ../src/prefs.c:572
+#: ../src/prefs.c:533
 msgid "Tag Settings"
-msgstr "Impostazioni Etichetta"
+msgstr "Impostazioni etichetta"
 
 #. Tag Options
-#: ../src/prefs.c:581
+#: ../src/prefs.c:539
 msgid "Tag Options"
-msgstr "Opzioni Etichetta"
+msgstr "Opzioni dell'etichetta"
 
-#: ../src/prefs.c:587
+#: ../src/prefs.c:545
 msgid "Auto completion of date if not complete"
-msgstr "Completamento automatico della data se incompleta"
+msgstr "Completare automaticamente la data se non è completa"
 
-#: ../src/prefs.c:590
-#, fuzzy
+#: ../src/prefs.c:548
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
-"1996, 95 => 1995 …)."
+"1996, 95 => 1995…)."
 msgstr ""
-"Prova a completare il campo dell'anno se si immettono solo le ultime cifre "
-"della data (per esempio, se l'anno corrente è 2005: 5 => 2005, 4 => 2004, 6 "
-"=> 1996, 95 => 1995, etc.)."
+"Prova a completare il campo dell'anno se si inseriscono solo le ultime cifre "
+"della data (ad esempio, se l'attuale anno è il 2005: 5 => 2005, 4 => 2004, 6 "
+"=> 1996, 95 => 1995...)."
 
-#: ../src/prefs.c:597
-msgid "Write the track field with the following number of digits :"
-msgstr "Scrivi il campo della traccia con il seguente numero di cifre:"
+#: ../src/prefs.c:556
+msgid "Write the track field with the following number of digits:"
+msgstr "Scrivere il campo della traccia con il seguente numero di cifre:"
 
-#: ../src/prefs.c:600
-#, fuzzy
+#: ../src/prefs.c:559
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
-"obtain a number with 'n' digits (Ex. with two digits : '05', '09', '10' …). "
-"Else it keeps the 'raw' track value."
+"obtain a number with 'n' digits (for example, with two digits: '05', '09', "
+"'10'…). Else it keeps the 'raw' track value."
 msgstr ""
-"Se questa opzione è attivata, il campo della traccia sarà scritto usando il "
-"numero '0' come riempimento per ottenere un numero con 'n' cifre (esempio "
-"con due cifre: '05', '09', '10',...). Altrimenti sarà mantenuto il valore "
-"'grezzo' della traccia."
+"Se attivata, il campo della traccia è scritto usando il numero «0» come "
+"riempimento per ottenere un numero con «n»​ cifre (ad esempio, con due cifre: "
+"«05», «09», «10»...). Altrimenti mantiene l'originale valore della traccia."
 
-#: ../src/prefs.c:615
-msgid "Ogg Vorbis Files : Write also the comment to the XMMS format"
-msgstr "File Ogg Vorbis: scrivi il commento anche nel formato XMMS"
+#: ../src/prefs.c:578
+msgid "Write the disc field with the following number of digits:"
+msgstr "Scrivere il campo del disco con il seguente numero di cifre:"
 
-#: ../src/prefs.c:618
-msgid ""
-"XMMS doesn't make use of the right way to identify a comment in Ogg Vorbis "
-"files as other apps do. In fact, this field is usually labeled with "
-"'comment=', whereas XMMS uses only `='. Please, uncheck this option if you "
-"don't want other apps to complain about an unknown field. Comments won't be "
-"shown in XMMS, though."
-msgstr ""
-"XMMS non usa il modo giusto per identificare un commento nei file Ogg Vorbis "
-"come fanno altre applicazioni. Infatti questo campo è normalmente "
-"etichettato con 'commento=', mentre XMMS usa solo `='. Per favore, non "
-"selezionare questa opzione se non vuoi che altre applicazioni si lamentino "
-"per un campo sconosciuto! I commenti, però, non saranno mostrati in XMMS."
+#: ../src/prefs.c:583
+msgid "Whether to pad the disc field with leading zeroes"
+msgstr "Indica se riempire il campo del disco con zeri iniziali"
 
-#: ../src/prefs.c:633
+#: ../src/prefs.c:613
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr ""
-"Focalizza il campo dell'etichetta quando scorri i file nella lista usando le "
-"scorciatoie PaginaSu/PaginaGiù."
+"Focus dei campi dell'etichetta quando si cambia file nell'elenco con le "
+"scorciatoie PagSu/PagGiù:"
 
-#: ../src/prefs.c:642
+#: ../src/prefs.c:619
 msgid "Keep focus to the same tag field"
-msgstr "Focalizza sulle stesso campo dell'etichetta"
+msgstr "Mantenere il focus sullo stesso campo dell'etichetta"
 
-#: ../src/prefs.c:648
-msgid "Return focus to the first tag field (ie 'Title' field)"
+#: ../src/prefs.c:625
+msgid "Return focus to the first tag field (i.e. 'Title' field)"
 msgstr ""
-"Riporta l'attenzione al primo campo dell'etichetta (cioè il campo 'Titolo')"
+"Riportare il focus al primo campo dell'etichetta (cioè al campo «Titolo»)"
 
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(SetFocusToFirstTagField),SET_FOCUS_TO_FIRST_TAG_FIELD);
 #. Tag Splitting
-#: ../src/prefs.c:653
-#, fuzzy
+#: ../src/prefs.c:630
 msgid "Tag Splitting"
-msgstr "Impostazioni Etichetta"
+msgstr "Divisione etichetta"
 
-#: ../src/prefs.c:660
+#: ../src/prefs.c:639
 msgid ""
-"For Vorbis tags, selected fields will be split atdashes and saved as "
+"For Vorbis tags, selected fields will be split at dashes and saved as "
 "separate tags"
 msgstr ""
+"Per le etichette Vorbis, i campi selezionati saranno divisi in "
+"corrispondenza dei trattini e salvati come etichette separate"
+
+#: ../src/prefs.c:649
+msgid "Original artist"
+msgstr "Artista originale"
 
 #.
 #. * ID3 Tag Settings
 #.
-#: ../src/prefs.c:692 ../src/prefs.c:693
+#: ../src/prefs.c:670
 msgid "ID3 Tag Settings"
-msgstr "Impostazioni Etichetta ID3"
+msgstr "Impostazioni etichetta ID3"
 
 #. Tag Rules frame
-#: ../src/prefs.c:705
+#: ../src/prefs.c:679
 msgid "ID3 Tag Rules"
-msgstr "Regole Etichetta ID3"
-
-#. Write ID3 tags in FLAC files
-#: ../src/prefs.c:717
-#, fuzzy
-msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
-msgstr "Scrivi etichette ID3 nei file FLAC con l'etichetta FLAC"
-
-#: ../src/prefs.c:720
-msgid ""
-"If activated, ID3 tags will be also added in the FLAC file (according the "
-"two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
-msgstr ""
-"Le etichette ID3 verranno aggiunte nel file FLAC (in accordo con le due "
-"regole di cui sopra più l'etichetta FLAC), se questa opzione è attivata. In "
-"caso contrario le etichetta ID3 verranno tolte."
+msgstr "Regole etichetta ID3"
 
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: ../src/prefs.c:725
+#: ../src/prefs.c:691
 msgid "Strip tags if all fields are set to blank"
-msgstr "Togli le etichette se tutti i campi sono vuoti"
+msgstr "Togliere le etichette se tutti i campi sono impostati vuoti"
 
-#: ../src/prefs.c:728
-#, fuzzy
+#: ../src/prefs.c:694
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
-"Genre or Comment (as an attached picture, lyrics …), this option allows you "
-"to strip the whole tag when these seven standard data fields have been set "
-"to blank."
+"Genre or Comment (as an attached image, lyrics…), this option allows you to "
+"strip the whole tag when these seven standard data fields have been set to "
+"blank."
 msgstr ""
-"Poiché le etichette ID3v2 possono contenere altre informazioni oltre a "
-"titolo, artista, album, anno, traccia, genere e commento (come un'immagine "
-"allegata, il testo della canzone, ...) questa opzione permette di eliminare "
-"l'intera etichetta qualora questi sette campi risultino tutti vuoti."
+"Le etichette ID3v2 possono contenere altri dati quali titolo, artista, "
+"album, anno, traccia, genere o commento (un'immagine allegata, testi...), "
+"questa opzione consente di togliere l'intera etichetta quando questi sette "
+"campi di dati standard sono stati impostati vuoti."
 
 #. Convert old ID3v2 tag version
-#: ../src/prefs.c:734
+#: ../src/prefs.c:700
 msgid "Automatically convert old ID3v2 tag versions"
-msgstr "Converti automaticamente le vecchie versioni delle etichette ID3v2"
+msgstr "Convertire automaticamente le vecchie versioni dell'etichetta ID3v2"
 
-#: ../src/prefs.c:737
+#: ../src/prefs.c:703
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
 msgstr ""
-"Una vecchia versione dell'etichetta ID3v2 (come ID3v2.2) sarà aggiornata "
-"allaversione ID3v2.3, se questa opzione è attivata."
+"Se attivata, una vecchia versione dell'etichetta ID3v2 (come ID3v2.2) sarà "
+"aggiornata alla versione ID3v2.3."
 
 #. Use CRC32
-#: ../src/prefs.c:741
+#: ../src/prefs.c:707
 msgid "Use CRC32"
-msgstr ""
+msgstr "Usare CRC32"
 
-#: ../src/prefs.c:744
-#, fuzzy
+#: ../src/prefs.c:710
 msgid "Set CRC32 in the ID3v2 tags"
-msgstr "Scrivi etichetta ID3v2"
+msgstr "Imposta il CRC32 nelle etichette ID3v2"
 
 #. Use Compression
-#: ../src/prefs.c:747
+#: ../src/prefs.c:713
 msgid "Use Compression"
-msgstr ""
+msgstr "Usare compressione"
 
-#: ../src/prefs.c:750
+#: ../src/prefs.c:717
 msgid "Set Compression in the ID3v2 tags"
-msgstr ""
+msgstr "Imposta la compressione nelle etichette ID3v2"
 
 #. Write Genre in text
-#: ../src/prefs.c:753
+#: ../src/prefs.c:720
 msgid "Write Genre in text only"
-msgstr ""
+msgstr "Scrivere il genere in solo testo"
 
-#: ../src/prefs.c:756
+#: ../src/prefs.c:724
 msgid ""
 "Don't use ID3v1 number references in genre tag. Enable this if you see "
 "numbers as genre in your music player."
 msgstr ""
+"Non usa il numero di referimento ID3v1 nell'etichetta genere. Attivare "
+"questa opzione se si vedeono i numeri come genere nel riproduttore musicale."
 
 #. Character Set for writing ID3 tag
-#: ../src/prefs.c:759
-#, fuzzy
+#: ../src/prefs.c:727
 msgid "Character Set for writing ID3 tags"
-msgstr "Gruppo di caratteri per le etichette ID3"
+msgstr "Set di caratteri per la scrittura delle etichette ID3"
 
 #. ID3v2 tags
-#: ../src/prefs.c:766
-#, fuzzy
+#: ../src/prefs.c:734
 msgid "ID3v2 tags"
-msgstr "Scrivi etichetta ID3v2"
+msgstr "Etichette ID3v2"
 
 #. Write ID3v2 tag
-#: ../src/prefs.c:779
+#: ../src/prefs.c:747
 msgid "Write ID3v2 tag"
-msgstr "Scrivi etichetta ID3v2"
+msgstr "Scrivere etichetta ID3v2"
 
-#: ../src/prefs.c:782
-#, fuzzy
+#: ../src/prefs.c:750
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
 msgstr ""
-"Verrà aggiunta o aggiornata un'etichetta di tipo ID3v2 all'inizio dei file "
-"MP3, se questa opzione è attivata. Sarà invece tolta in caso contrario."
+"Se attivata, un'etichetta ID3v2.4 sarà aggiunta o aggiornata all'inizio dei "
+"file MP3. Altrimenti sarà tolta."
 
 #. ID3v2 tag version
-#: ../src/prefs.c:789
-#, fuzzy
+#: ../src/prefs.c:757
 msgid "Version:"
-msgstr "Descrizione:"
+msgstr "Versione:"
 
-#: ../src/prefs.c:796
+#: ../src/prefs.c:763
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
 " - ID3v2.4 is written using libid3tag (recommended)."
 msgstr ""
+"Selezionare la versione dell'etichetta ID3v2 da scrivere:\n"
+" - ID3v2.3 è scritta usando id3lib,\n"
+" - ID3v2.4 è scritta usando libid3tag (consigliata)."
 
 #. Charset
 #. Id3V1 writing character set
-#: ../src/prefs.c:810 ../src/prefs.c:912
+#: ../src/prefs.c:778 ../src/prefs.c:882
 msgid "Charset:"
-msgstr ""
+msgstr "Set di caratteri:"
 
 #. Unicode
-#: ../src/prefs.c:818
-#, fuzzy
+#: ../src/prefs.c:783
 msgid "Unicode "
-msgstr "Unicode (UTF-8)"
+msgstr "Unicode "
 
-#: ../src/prefs.c:826
-#, fuzzy
+#: ../src/prefs.c:791
 msgid "Unicode type to use"
-msgstr "Codificato da"
+msgstr "Tipo di Unicode da usare"
 
-#: ../src/prefs.c:849
+#: ../src/prefs.c:815
 msgid "Character set used to write the tag data in the file."
-msgstr "Gruppo di caratteri usato per scrivere i dati dell'etichetta nel file."
+msgstr "Set di caratteri usati per scrivere i dati dell'etichetta nel file."
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: ../src/prefs.c:859 ../src/prefs.c:928
+#: ../src/prefs.c:825 ../src/prefs.c:894
 msgid "Additional settings for iconv():"
-msgstr ""
+msgstr "Impostazioni aggiuntive per iconv():"
 
-#: ../src/prefs.c:864 ../src/prefs.c:933
-#, fuzzy
+#: ../src/prefs.c:831 ../src/prefs.c:900
 msgid "No"
-msgstr " No "
+msgstr "Nessuna"
 
-#: ../src/prefs.c:867 ../src/prefs.c:936
-#, fuzzy
+#: ../src/prefs.c:835 ../src/prefs.c:904
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it isn't changed. But note that an error message will be "
 "displayed for information."
 msgstr ""
-"Con questa opzione, un carattere che non possa essere rappresentato nella "
-"codifica scelta potrà venire approssimato ad uno o più caratteri somiglianti."
+"Con questa opzione, quando un carattere non può essere rappresentato nel set "
+"di caratteri di destinazione, non viene cambiato. Notare che un messaggio di "
+"errore sarà mostrato per informazione."
 
-#: ../src/prefs.c:872 ../src/prefs.c:941
+#: ../src/prefs.c:840 ../src/prefs.c:909
 msgid "//TRANSLIT"
-msgstr ""
+msgstr "//TRANSLIT"
 
-#: ../src/prefs.c:881 ../src/prefs.c:950
+#: ../src/prefs.c:850 ../src/prefs.c:919
 msgid "//IGNORE"
-msgstr ""
+msgstr "//IGNORE"
 
 #. ID3v1 tags
-#: ../src/prefs.c:889
-#, fuzzy
+#: ../src/prefs.c:859
 msgid "ID3v1 tags"
-msgstr "Etichetta ID3"
+msgstr "Etichette ID3v1"
 
 #. Write ID3v1 tag
-#: ../src/prefs.c:903
+#: ../src/prefs.c:873
 msgid "Write ID3v1.x tag"
-msgstr "Scrivi etichetta ID3v1.x"
+msgstr "Scrivere etichetta ID3v1.x"
 
-#: ../src/prefs.c:906
+#: ../src/prefs.c:876
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
 msgstr ""
-"Verrà aggiunta o aggiornata un'etichetta di tipo ID3v1 in fondo ai file MP3, "
-"se questa opzione è attivata. Sarà invece tolta in caso contrario."
+"Se attivata, un'etichetta ID3v1 sarà aggiunta o aggiornata alla fine dei "
+"file MP3. Altrimenti sarà tolta."
 
-#: ../src/prefs.c:923
-#, fuzzy
+#: ../src/prefs.c:890
 msgid "Character set used to write ID3v1 tag data in the file."
-msgstr "Gruppo di caratteri usato per scrivere i dati dell'etichetta nel file."
+msgstr ""
+"Set di caratteri usati per scrivere i dati dell'etichetta ID3v1 nel file."
 
 #. Character Set for reading tag
-#: ../src/prefs.c:958
-#, fuzzy
+#: ../src/prefs.c:928
 msgid "Character Set for reading ID3 tags"
-msgstr "Gruppo di caratteri per le etichette ID3"
+msgstr "Set di caratteri per la lettura delle etichette ID3"
 
-#: ../src/prefs.c:972
+#: ../src/prefs.c:942
 msgid "Non-standard:"
-msgstr ""
+msgstr "Non-standard:"
 
-#: ../src/prefs.c:977
+#: ../src/prefs.c:948
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
 "tag).\n"
 "\n"
-"For example :\n"
-"  - in previous versions of EasyTAG, you can save UTF-8 strings in an "
-"ISO-8859-1 field. This is not correct! To convert these tags to Unicode: "
+"For example:\n"
+"  - In previous versions of EasyTAG, you could save UTF-8 strings in an "
+"ISO-8859-1 field. This is not correct. To convert these tags to Unicode: "
 "activate this option and select UTF-8. You must also activate above the "
 "option 'Try to save tags to ISO-8859-1. If it isn't possible then use "
 "UNICODE (recommended)' or 'Always save tags to UNICODE character set'.\n"
-"  - If unicode was not used, Russian people can select the character set "
+"  - If Unicode was not used, Russian people can select the character set "
 "'Windows-1251' to load tags written under Windows. And 'KOI8-R' to load tags "
 "written under Unix systems."
 msgstr ""
-"Questa codifica verrà usata quando si leggono i dati dell'etichetta, per "
-"convertire ogni stringa trovata in un campo ISO-8859-1 dell'etichetta (per "
-"etichette ID3v2 e/o ID3v1).\n"
+"Questo set di caratteri verrà usato durante la lettura dei dati "
+"dell'etichetta, per convertire ogni stringa trovata in un campo ISO-8859-1 "
+"dell'etichetta (per l'etichetta ID3v2 o/e ID3v1).\n"
 "\n"
-"Per esempio:\n"
-" - nelle precedenti versioni di EasyTag, si poteva salvare stringhe UTF-8 in "
-"un campo ISO-8859-1. Questo non è corretto! Per convertire queste etichette "
-"nella codifica UNICODE, attiva questa opzione e seleziona UTF-8. Devi anche "
-"attivare l'opzione 'Cerca di salvare le etichette in formato ISO-8859-1. Se "
-"non è possibile allora usa la codifica UNICODE (raccomandata)' oppure 'Salva "
-"sempre le etichette nella codifica  UNICODÈ.\n"
-" - Se non viene usata la codifica UNICODE, le genti russe possono "
-"selezionare la codifica 'Windows-1251' per caricare etichette scritte sotto "
-"Windows e 'KOI8-R' per caricare etichette scritte sotto sistemi Unix."
-
-#: ../src/prefs.c:995
+"Per esempio: \n"
+"   - Nelle versioni precedenti di EasyTAG, si possono salvare le stringhe "
+"UTF-8 in un campo ISO-8859-1. Questo non è corretto. Per convertire queste "
+"etichette in Unicode: attivare questa opzione e selezionare UTF-8. È "
+"necessario attivare anche sopra l'opzione «Provare a salvare le etichette in "
+"ISO-8859-1. Se non è possibile, allora usare UNICODE (consigliato)» oppure "
+"«Salvate sempre le etichette in un set di caratteri UNICODE».\n"
+"   - Se Unicode non è stato usato, gli utenti russi possono selezionare il "
+"set di caratteri «Windows-1251» per caricare le etichette scritte sotto "
+"Windows, e «KOI8-R» per caricare le etichette scritte su sistemi Unix."
+
+#: ../src/prefs.c:966
 msgid "Character set used to read tag data in the file."
-msgstr "Gruppo di caratteri usato per leggere i dati dell'etichetta nel file."
+msgstr "Set di caratteri usati per leggere i dati delle etichette nel file."
 
 #.
 #. * Scanner
 #.
-#: ../src/prefs.c:1010 ../src/prefs.c:1011
+#: ../src/prefs.c:980
 msgid "Scanner"
-msgstr "Analizzatore"
+msgstr "Scanner"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: ../src/prefs.c:1023
+#: ../src/prefs.c:990
 msgid "Fill Tag Scanner - Character Conversion"
-msgstr "Analizzatore Riempi etichetta - Conversione Caratteri"
+msgstr "Scanner riempimento etichetta - conversione caratteri"
 
-#: ../src/prefs.c:1029 ../src/prefs.c:1054
+#: ../src/prefs.c:996 ../src/prefs.c:1021
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr ""
-"Converti il carattere trattino-basso '_' e la stringa '%20' nello spazio ' '"
+"Convertire il carattere trattino basso «_» e la stringa «%20» in spazio « »"
 
-#: ../src/prefs.c:1031 ../src/prefs.c:1055
+#: ../src/prefs.c:998 ../src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
-msgstr "Converti lo spazio ' ' nel trattino-basso '_'"
+msgstr "Convertire lo spazio « » in trattino basso «_»"
 
-#: ../src/prefs.c:1043 ../src/prefs.c:1045
+#: ../src/prefs.c:1010 ../src/prefs.c:1012
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
 msgstr ""
-"La conversione avrà luogo durante l'applicazione di una maschera "
-"dall'analizzatore per etichette, se questa opzione è attivata."
+"Se attivata, questa conversione sarà usata quando si applica una maschera "
+"dallo scanner per le etichette."
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: ../src/prefs.c:1049
+#: ../src/prefs.c:1016
 msgid "Rename File Scanner - Character Conversion"
-msgstr "Analizzatore Rinomina File - Conversione Caratteri"
+msgstr "Scanner rinomina file - conversione caratteri"
 
-#: ../src/prefs.c:1066 ../src/prefs.c:1068 ../src/prefs.c:1070
+#: ../src/prefs.c:1033 ../src/prefs.c:1035 ../src/prefs.c:1037
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
 msgstr ""
-"La conversione avrà luogo durante l'applicazione di una maschera "
-"dall'analizzatore per nomi di file, se questa opzione è attivata."
+"Se attivata, questa conversione sarà usata quando si applica una maschera "
+"dallo scanner per i nomi dei file."
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: ../src/prefs.c:1073
+#: ../src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
-msgstr "Analizzatore Processa Campi - Conversione Caratteri"
+msgstr "Scanner elaborazione campi - conversione caratteri"
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: ../src/prefs.c:1080
+#: ../src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
-"Non scrivere maiuscola la prima lettera per alcune preposizioni ed articoli."
+"Nessun maiuscolo per la prima lettera di parole come alcune preposizioni e "
+"articoli"
 
-#: ../src/prefs.c:1084
+#: ../src/prefs.c:1051
 msgid ""
-"Don't convert first letter of the words like prepositions, articles and "
-"words like feat., when using the scanner 'First letter uppercase of each "
+"Don't convert first letter of words like prepositions, articles and words "
+"like feat., when using the scanner 'First letter uppercase of each "
 "word' (for example, you will obtain 'Text in an Entry' instead of 'Text In "
 "An Entry')."
 msgstr ""
-"Non convertire la prima lettera di parole quali preposizioni, articoli e "
-"parole quali 'carat.', quando venga usata la maschera 'Prima lettera "
-"maiuscola di ogni parola' (per esempio, otterrai così 'Testo in una "
-"Voce'invece di 'Testo In Una Voce')."
+"Non converte la prima lettera di parole come preposizioni, articoli e parole "
+"come «una»., quando si usa lo scanner «Prima lettera maiuscola di ogni "
+"parola» (per esempio, si otterrà «Testo di una Voce» invece di «Testo Di Una "
+"Voce»)."
 
 #. Properties of the scanner window
-#: ../src/prefs.c:1090
+#: ../src/prefs.c:1057
 msgid "Scanner Window"
-msgstr "Finestra Analizzatore"
+msgstr "Finestra scanner"
 
-#: ../src/prefs.c:1096
+#: ../src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
-msgstr "Apri la Finestra Analizzatore all'avvio"
+msgstr "Aprire la finestra dello scanner all'avvio"
 
-#: ../src/prefs.c:1099
+#: ../src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr ""
-"Attiva questa opzione per aprire automaticamente la finestra "
-"dell'analizzatore all'avvio di EasyTAG."
-
-#: ../src/prefs.c:1102
-msgid "Scanner window always on top"
-msgstr "Finestra dell'analizzatore sempre in primo piano"
-
-#: ../src/prefs.c:1105
-msgid ""
-"If activated, the window which contains the masks will stay always over the "
-"main window."
-msgstr ""
-"La finestra contenente le maschere rimarrà sempre sopra a quella principale, "
-"se questa opzione è attivata."
+"Attivare questa opzione per aprire automaticamente la finestra dello scanner "
+"quando si avvia l'applicazione."
 
 #. Other options
-#: ../src/prefs.c:1110
+#: ../src/prefs.c:1071
 msgid "Fields"
 msgstr "Campi"
 
 #. Overwrite text into tag fields
-#: ../src/prefs.c:1117
-msgid "Overwrite fields when scanning tag"
-msgstr "Sovrascrivi i campi durante la scansione dell'etichetta"
+#: ../src/prefs.c:1078
+msgid "Overwrite fields when scanning tags"
+msgstr "Sovrascrivere i campi durante la scansione delle etichette"
 
-#: ../src/prefs.c:1120
+#: ../src/prefs.c:1081
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
 msgstr ""
-"L'analizzatore sostituirà il testo già presente nei campi con quello nuovo. "
-"Verranno riempiti solo i campi vuoti se disattivata, se questa opzione è "
-"attivata."
+"Se attivata, lo scanner sostituirà il testo esistente nei campi con uno "
+"nuovo. Se disattivata, solo i campi vuoti dell'etichetta saranno riempiti."
 
-#: ../src/prefs.c:1131
-msgid "Set this text as default comment :"
-msgstr "Imposta questo testo come commento predefinito:"
+#: ../src/prefs.c:1092
+msgid "Set this text as default comment:"
+msgstr "Impostare questo testo come commento predefinito:"
 
-#: ../src/prefs.c:1134
+#: ../src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
 msgstr ""
-"Attiva questa opzione se vuoi mettere la seguente stringa nel campo di "
-"commento quando usi l'analizzatore 'Riempi Etichetta'."
+"Attivare questa opzione se si vuole mettere la seguente stringa nel campo "
+"del commento quando si utilizza lo scanner «Riempi etichetta»."
 
 #. CRC32 comment
-#: ../src/prefs.c:1152
+#: ../src/prefs.c:1113
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
-"Usa CRC32 come commento predefinito (solo per file con le etichette ID3)."
+"Usare CRC32 come commento predefinito (solo per i file con etichette ID3)"
 
-#: ../src/prefs.c:1156
+#: ../src/prefs.c:1117
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
 msgstr ""
-"Calcola il valore di CRC32 del file e lo scrive nel campo dedicato al "
-"commento quando si usa l'analizzatore 'Riempi Etichetta'."
+"Calcola il valore CRC-32 del file e lo scrive nel campo del commento quando "
+"si usa lo scanner «Riempi etichetta»."
 
 #.
 #. * CDDB
 #.
-#: ../src/prefs.c:1167 ../src/prefs.c:1168
-msgid "CD Data Base"
-msgstr "Database CD"
+#: ../src/prefs.c:1128
+msgid "CDDB"
+msgstr "CDDB"
 
 #. CDDB Server Settings (Automatic Search)
-#: ../src/prefs.c:1177
+#: ../src/prefs.c:1134
 msgid "Server Settings for Automatic Search"
-msgstr "Impostazioni Server per Ricerca Automatica"
+msgstr "Impostazioni server per la ricerca automatica"
 
-#: ../src/prefs.c:1186 ../src/prefs.c:1225 ../src/prefs.c:1259
-msgid "Name :"
+#: ../src/prefs.c:1143 ../src/prefs.c:1182 ../src/prefs.c:1216
+msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/prefs.c:1205 ../src/prefs.c:1233 ../src/prefs.c:1268
-#: ../src/prefs.c:1357
-msgid "Port :"
+#: ../src/prefs.c:1162 ../src/prefs.c:1190 ../src/prefs.c:1225
+#: ../src/prefs.c:1310
+msgid "Port:"
 msgstr "Porta:"
 
-#: ../src/prefs.c:1215 ../src/prefs.c:1243 ../src/prefs.c:1278
-msgid "CGI Path :"
+#: ../src/prefs.c:1172 ../src/prefs.c:1200 ../src/prefs.c:1234
+msgid "CGI Path:"
 msgstr "Percorso CGI:"
 
 #. CDDB Server Settings (Manual Search)
-#: ../src/prefs.c:1251
+#: ../src/prefs.c:1208
 msgid "Server Settings for Manual Search"
-msgstr "Impostazioni Server per Ricerca Manuale"
+msgstr "Impostazioni server per la ricerca manuale"
 
 #. Local access for CDDB (Automatic Search)
-#: ../src/prefs.c:1286
-msgid "Local CD Data Base"
-msgstr "Database Locale CD"
+#: ../src/prefs.c:1242
+msgid "Local CDDB"
+msgstr "CDDB locale"
 
-#: ../src/prefs.c:1294
-msgid "Path :"
+#: ../src/prefs.c:1250
+msgid "Path:"
 msgstr "Percorso:"
 
-#: ../src/prefs.c:1306
+#: ../src/prefs.c:1262
 msgid ""
-"Specify the directory where are located the local cd data base. The local cd "
-"data base contains the eleven following directories 'blues', 'classical', "
+"Specify the directory where the local CD database is located. The local CD "
+"database contains the eleven following directories 'blues', 'classical', "
 "'country', 'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' "
 "and 'misc'."
 msgstr ""
-"Specifica la cartella dove sono localizzati i database cd locali. Il "
-"database cd locale contiene le undici seguenti cartelle: 'blues', "
-"'classical', 'country', 'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', "
-"'soundtrack' e 'misc'."
+"Specificare la directory dove si trova il database CD locale. Il database CD "
+"locale contiene le undici seguenti directory «blues», «classica», «country», "
+"«dati», «folk», «jazz», «newage», «reggae», «rock», «colonna sonora» e "
+"«varia»."
 
 #. CDDB Proxy Settings
-#: ../src/prefs.c:1332
+#: ../src/prefs.c:1288
 msgid "Proxy Settings"
-msgstr "Impostazioni Proxy"
+msgstr "Impostazioni proxy"
 
-#: ../src/prefs.c:1341
+#: ../src/prefs.c:1297
 msgid "Use a proxy"
-msgstr "Utilizza un proxy"
+msgstr "Usare un proxy"
 
-#: ../src/prefs.c:1344
+#: ../src/prefs.c:1300
 msgid "Set active the settings of the proxy server."
-msgstr "Imposta come attive le impostazioni del server proxy."
+msgstr "Impostandola si attivano le impostazioni del server proxy."
 
-#: ../src/prefs.c:1349
-msgid "Host Name :"
-msgstr "Nome Nodo:"
+#: ../src/prefs.c:1302
+msgid "Host Name:"
+msgstr "Nome host:"
 
-#: ../src/prefs.c:1356
+#: ../src/prefs.c:1309
 msgid "Name of the proxy server."
-msgstr "Nome del server proxy."
+msgstr "Il nome del server proxy."
 
-#: ../src/prefs.c:1364
+#: ../src/prefs.c:1317
 msgid "Port of the proxy server."
-msgstr "Porta del server proxy."
+msgstr "La porta del server proxy."
 
-#: ../src/prefs.c:1369
-msgid "User Name :"
-msgstr "Nome Utente:"
+#: ../src/prefs.c:1321
+msgid "User Name:"
+msgstr "Nome utente:"
 
-#: ../src/prefs.c:1376
+# FIXME:
+#: ../src/prefs.c:1328
 msgid "Name of user for the the proxy server."
-msgstr "Nome dell'utente per il server proxy."
+msgstr "Il nome dell'utente per il server proxy."
 
-#: ../src/prefs.c:1377
-msgid "User Password :"
-msgstr "Password Ptente:"
+#: ../src/prefs.c:1329
+msgid "User Password:"
+msgstr "Password utente:"
 
-#: ../src/prefs.c:1385
-msgid "Password of user for the the proxy server."
-msgstr "Password dell'utente per il proxy server."
+#: ../src/prefs.c:1338
+msgid "Password of user for the proxy server."
+msgstr "La password dell'utente per il server proxy."
 
 #. Track Name list (CDDB results)
-#: ../src/prefs.c:1390
+#: ../src/prefs.c:1343
 msgid "Track Name List"
-msgstr "Elenco Nomi Traccia"
+msgstr "Elenco nome della traccia"
 
-#: ../src/prefs.c:1397
+#: ../src/prefs.c:1350
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
-"Seleziona il file audio corrispondente (concordemente alla posizione o al "
-"DLM se attivato più sotto)"
+"Selezionare il file audio corrispondente (seconda la posizione o DLM se "
+"attivato qui sotto)"
 
-#: ../src/prefs.c:1401
+#: ../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 ""
-"Il file corrispondente nella lista principale sarà selezionato qualora venga "
-"selezionata una linea nell'elenco dei nomi delle tracce, se questa opzione è "
-"attivata."
+"Se attivata, quando si seleziona una riga nell'elenco del nome delle tracce, "
+"sarà selezionato anche il file audio corrispondente nell'elenco principale."
 
 #. Check box to use DLM (also used in the cddb window)
-#: ../src/prefs.c:1406
+#: ../src/prefs.c:1359
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
 msgstr ""
-"Usa l'algoritmo Levenshtein (DLM) per far corrispondere linee (usando il "
-"loro titolo) con file audio (usando il loro nome)"
+"Usare l'algoritmo Levenshtein (DLM) per confrontare le righe (usando il "
+"titolo) con i file audio (usando il nome del file)"
 
 #.
 #. * Confirmation
 #.
-#: ../src/prefs.c:1421 ../src/prefs.c:1422
+#: ../src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Conferma"
 
-#: ../src/prefs.c:1430
+#: ../src/prefs.c:1379
 msgid "Confirm exit from program"
-msgstr "Conferma l'uscita dal programma"
+msgstr "Confermare l'uscita dall'applicazione"
 
-#: ../src/prefs.c:1433
+#: ../src/prefs.c:1382
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr ""
-"Apre una finestra di dialogo per chiedere conferma prima di uscire dal "
-"programma, se questa opzione è attivata."
+"Se attivata, aprirà una finestra di dialogo per chiedere la conferma prima "
+"di uscire dall'applicazione."
 
-#: ../src/prefs.c:1436
+#: ../src/prefs.c:1385
 msgid "Confirm writing of file tag"
-msgstr "Conferma la scrittura delle etichette"
+msgstr "Confermare la scrittura dell'etichetta del file"
 
-#: ../src/prefs.c:1440
+#: ../src/prefs.c:1389
 msgid "Confirm renaming of file"
-msgstr "Conferma il cambio del nome dei file"
+msgstr "Confermare la rinomina del file"
 
-#: ../src/prefs.c:1444
+#: ../src/prefs.c:1393
 msgid "Confirm deleting of file"
-msgstr "Conferma l'eliminazione dei file"
+msgstr "Confermare l'eliminazione del file"
 
-#: ../src/prefs.c:1448
+#: ../src/prefs.c:1397
 msgid "Confirm writing of playlist"
-msgstr "Conferma la scrittura della playlist"
+msgstr "Confermare la scrittura della scaletta"
 
-#: ../src/prefs.c:1452
+#: ../src/prefs.c:1401
 msgid "Confirm changing directory when there are unsaved changes"
-msgstr ""
-
-#. Disable temporarily the apply button
-#. //gtk_container_add(GTK_CONTAINER(ButtonBox),Button);
-#. //g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(OptionsWindow_Apply_Button),NULL);
-#. //GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
-#: ../src/prefs.c:1473
-msgid "Apply changes (but don't save) and close this window"
-msgstr "Applica le modifiche (senza salvare) e chiudi questa finestra"
-
-#: ../src/prefs.c:1482
-msgid "Close this window without saving"
-msgstr "Chiudi questa finestra senza salvare"
-
-#: ../src/prefs.c:1490
-msgid "Save changes and close this window"
-msgstr "Salva le modifiche e chiudi questa finestra"
+msgstr "Confermare il cambio di directory quando ci sono modifiche non salvate"
 
 #. For translators : be aware to NOT translate '%.*d' in this string
-#: ../src/prefs.c:1523
+#: ../src/prefs.c:1439
 #, c-format
-msgid "(Example : %.*d_-_Track_name_1.mp3)"
+msgid "(Example: %.*d_-_Track_name_1.mp3)"
 msgstr "(Esempio: %.*d_-_Nome_traccia_1.mp3)"
 
-#: ../src/prefs.c:1682
-msgid "Changes applied"
-msgstr "Le modifiche sono state applicate"
+#. Translators: please do NOT translate '%.*d' in this string.
+#: ../src/prefs.c:1472
+#, c-format
+msgid "(Example: disc_%.*d_of_10/Track_name_1.mp3)"
+msgstr "(Esempio: disco_%.*d_di_10/Nome_traccia_1.mp3)"
 
-#: ../src/prefs.c:1701 ../src/setting.c:906
+#: ../src/prefs.c:1614 ../src/setting.c:904
 msgid "Configuration saved"
-msgstr "La configurazione è stata salvata"
+msgstr "Configurazione salvata"
 
-#: ../src/prefs.c:1708
+#: ../src/prefs.c:1622
 msgid "Configuration unchanged"
-msgstr "La configurazione è rimasta invariata"
+msgstr "Configurazione non modificata"
 
-#: ../src/prefs.c:1808
-#, fuzzy
-msgid " The selected path for 'Default path to files' is invalid"
+#: ../src/prefs.c:1713
+msgid "The selected path for 'Default path to files' is invalid"
 msgstr ""
-" Il percorso selezionato come 'Percorso predefinito file' non è valido!\n"
-"'%s'\n"
-"(%s) "
+"Il percorso selezionato per «Percorso predefinito dei file» non è valido"
 
-#: ../src/prefs.c:1809
+#: ../src/prefs.c:1715
 #, c-format
 msgid ""
 "Path: '%s'\n"
 "Error: %s"
 msgstr ""
+"Percorso: «%s»\n"
+"Errore: %s"
 
-#: ../src/prefs.c:1810
-#, fuzzy
+#: ../src/prefs.c:1717
 msgid "Invalid Path Error"
-msgstr "La versione dell'etichetta non è valida"
+msgstr "Errore percorso non valido"
 
-#: ../src/prefs.c:1922
-#, fuzzy, c-format
+#: ../src/prefs.c:1831
+#, c-format
 msgid "The audio file player '%s' cannot be found"
-msgstr "Il riproduttore audio '%s' non può essere trovato!"
+msgstr "Impossibile trovare il riproduttore di file audio «%s»"
 
-#: ../src/prefs.c:1924
-#, fuzzy
+#: ../src/prefs.c:1833
 msgid "Audio Player Error"
-msgstr "Esegui il riproduttore audio"
+msgstr "Errore riproduttore audio"
 
-#: ../src/scan.c:180
+#: ../src/scan_dialog.c:182
 msgid "Fill Tag"
-msgstr "Riempi Etichetta"
-
-#: ../src/scan.c:181
-msgid "Rename File and Directory"
-msgstr "Rinomina File e Cartella"
+msgstr "Riempi etichetta"
 
-#: ../src/scan.c:182
-msgid "Process Fields"
-msgstr "Processa Campi"
+#: ../src/scan_dialog.c:356
+#, c-format
+msgid "Cannot calculate CRC value of file (%s)"
+msgstr "Impossibile calcolare il valore CRC del file (%s)"
 
-#: ../src/scan.c:362
-#, fuzzy
-msgid "Tag successfully scanned…"
-msgstr "L'etichetta è stata analizzata con successo..."
+#: ../src/scan_dialog.c:371
+msgid "Tag successfully scanned"
+msgstr "Etichetta scansionata con successo"
 
-#: ../src/scan.c:364
-#, fuzzy, c-format
-msgid "Tag successfully scanned…(%s)"
-msgstr "L'etichetta è stata analizzata con successo... (%s)"
+#: ../src/scan_dialog.c:373
+#, c-format
+msgid "Tag successfully scanned: %s"
+msgstr "Etichetta scansionata con successo: %s"
 
-#: ../src/scan.c:404
-#, fuzzy, c-format
-msgid ""
-"Tag scanner: strange… the extension '%s' was not found in filename '%s'!"
+#: ../src/scan_dialog.c:414
+#, c-format
+msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
 msgstr ""
-"Analizzatore Etichetta: strano.... l'estensione '%s' non è stata trovata nel "
-"nome file '%s'!"
+"Scanner etichetta: l'estensione «%s» non è stata trovata nel nome del file "
+"«%s»"
 
-#: ../src/scan.c:486 ../src/scan.c:515
+#: ../src/scan_dialog.c:496 ../src/scan_dialog.c:525
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr ""
-"Errore Scansione: non è possibile trovare il separatore '%s' all'interno di "
-"'%s'"
+"Errore scansione: impossibile trovare il separatore «%s» all'interno di «%s»"
 
-#: ../src/scan.c:700
-#, fuzzy
-msgid "New file name successfully scanned…"
-msgstr "Il nuovo nome del file è stato processato con successo..."
+#: ../src/scan_dialog.c:712
+msgid "New filename successfully scanned"
+msgstr "Nome del file nuovo scansionato con successo"
 
-#: ../src/scan.c:703
-#, fuzzy, c-format
-msgid "New file name successfully scanned…(%s)"
-msgstr "Il nuovo nome del file è stato processato con successo... (%s)"
+#: ../src/scan_dialog.c:715
+#, c-format
+msgid "New filename successfully scanned: %s"
+msgstr "Nome del file nuovo scansionato con successo: %s"
 
-#. The init position is define below, cause the scanner window must be showed before
-#. * to be able to move it.
-#. Title
-#: ../src/scan.c:2347
-msgid "Tag and File Name scan"
-msgstr "Scansione Etichetta e Nome File"
+#: ../src/scan_dialog.c:1622
+#, c-format
+msgid "Error while processing fields: %s"
+msgstr "Errore durante l'elaborazione dei campi: %s"
+
+#. The window
+#: ../src/scan_dialog.c:1792
+msgid "Tag and Filename Scan"
+msgstr "Scansione etichetta e nome del file"
+
+#. TODO: Set related action to match AM_SCAN_FILES.
+#: ../src/scan_dialog.c:1801
+msgid "Scan Files"
+msgstr "Scansiona file"
 
 #. Option Menu
-#: ../src/scan.c:2366
+#: ../src/scan_dialog.c:1829
 msgid "Scanner:"
-msgstr "Analizzatore: "
+msgstr "Scanner:"
 
-#. Selection of the item made at the end of the function
-#: ../src/scan.c:2388
+#: ../src/scan_dialog.c:1850
 msgid "Select the type of scanner to use"
-msgstr "Seleziona il tipo di analizzatore da usare"
-
-#: ../src/scan.c:2397
-msgid "Open scanner window / Scan selected files"
-msgstr "Apri la finestra dell'analizzatore / Scansiona i file selezionati"
+msgstr "Seleziona il tipo di scanner da usare"
 
-#: ../src/scan.c:2410
-msgid "Scanner Options"
-msgstr "Opzioni Analizzatore"
+#: ../src/scan_dialog.c:1859
+msgid "Scanner Preferences"
+msgstr "Preferenze dello scanner"
 
-#: ../src/scan.c:2419
+#: ../src/scan_dialog.c:1868
 msgid "Show / Hide Masks Editor"
-msgstr "Mostra/Nascondi Modificatore Maschere"
+msgstr "Mostra / nasconde l'editor di maschere"
 
-#: ../src/scan.c:2429
+#: ../src/scan_dialog.c:1878
 msgid "Show / Hide Legend"
-msgstr "Mostra/Nascondi Legenda"
+msgstr "Mostra / nasconde la legenda"
 
-#: ../src/scan.c:2439
-msgid "Close this window"
-msgstr "Chiudi questa finestra"
-
-#: ../src/scan.c:2467
+#: ../src/scan_dialog.c:1908
 msgid ""
-"Select or type in a mask using codes (see Legend) to parse file name and "
-"path. Used to fill in tag fields."
+"Select or type in a mask using codes (see Legend) to parse filename and "
+"path. Used to fill in tag fields"
 msgstr ""
-"Scegli o immetti una maschera utilizzando i codici (vedi legenda) per "
-"processare nome di file e percorso. Viene usato per riempire i campi delle "
+"Selezionare o digitare in una maschera usando i codici (vedere legenda) per "
+"analizzare il nome del file e il percorso. Usato per riempire i campi delle "
 "etichette."
 
 #. Preview label
-#: ../src/scan.c:2493
-#, fuzzy
-msgid "Fill tag preview…"
-msgstr "Anteprima riempimento etichette..."
+#: ../src/scan_dialog.c:1932
+msgid "Fill tag preview"
+msgstr "Anteprima riempimento etichetta"
 
-#: ../src/scan.c:2520
+#: ../src/scan_dialog.c:1962
 msgid "Prefix mask with current path"
-msgstr "Anticipa la maschera con il percorso corrente"
+msgstr "Anteporre alla maschera il percorso attuale"
 
-#: ../src/scan.c:2533
+#: ../src/scan_dialog.c:1976
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
 "Use / to make directories. If the first character is /, it's a absolute "
 "path, otherwise is relative to the old path."
 msgstr ""
-"Scegli o immetti una maschera utilizzando i codici (vedi legenda) per "
-"processare i campi delle etichette. Viene usato per rinominare i file.\n"
-"Usa / per creare le cartelle. Avrai un percorso assoluto se il primo "
-"carattere è /, altrimenti è relativo al vecchio percorso."
+"Selezionare o digitare in una maschera usando i codici (vedere legenda) per "
+"analizzare i campi dell'etichetta. Usato per rinominare il file.\n"
+"Usare «/» per creare directory. Se il primo carattere è «/», è un percorso "
+"assoluto, altrimenti è relativo al vecchio percorso."
 
 #. Preview label
-#: ../src/scan.c:2560
-#, fuzzy
-msgid "Rename file preview…"
-msgstr "Anteprima rinomina file..."
+#: ../src/scan_dialog.c:2001
+msgid "Rename file preview"
+msgstr "Anteprima rinomina file"
 
-#: ../src/scan.c:2580
+#: ../src/scan_dialog.c:2020
 msgid "Select fields:"
-msgstr "Seleziona i campi:"
+msgstr "Selezionare i campi:"
 
-#: ../src/scan.c:2583
+#: ../src/scan_dialog.c:2023
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
-"those who interest you."
+"those which interest you"
 msgstr ""
-"I bottoni sulla destra rappresentano i campi che possono venir processati. "
-"Scegli quelli di tuo proprio interesse."
+"I pulsanti sulla destra rappresentano i campi che possono essere elaborati. "
+"Selezionare quali interessano."
 
-#. Advice for Translators : set the first letter of filename translated
-#: ../src/scan.c:2586
+#. Advice for Translators: set the first letter of filename translated
+#: ../src/scan_dialog.c:2027
 msgid "F"
-msgstr "F"
+msgstr "N"
 
-#: ../src/scan.c:2587
-msgid "Process file name field"
-msgstr "Processa il campo nome"
+#: ../src/scan_dialog.c:2029
+msgid "Process filename field"
+msgstr "Elabora il campo nome del file"
 
-#. Advice for Translators : set the first letter of title translated
-#: ../src/scan.c:2589
+#. Advice for Translators: set the first letter of title translated
+#: ../src/scan_dialog.c:2031
 msgid "T"
 msgstr "T"
 
-#: ../src/scan.c:2590
+#: ../src/scan_dialog.c:2032
 msgid "Process title field"
-msgstr "Processa il campo titolo"
+msgstr "Elabora il campo titolo"
 
-#. Advice for Translators : set the first letter of artist translated
-#: ../src/scan.c:2592
+#. Advice for Translators: set the first letter of artist translated
+#: ../src/scan_dialog.c:2034
 msgid "Ar"
 msgstr "Ar"
 
-#: ../src/scan.c:2593
+#: ../src/scan_dialog.c:2035
 msgid "Process file artist field"
-msgstr "Processa il campo artista"
+msgstr "Elabora il campo artista del file"
 
-#. Advice for Translators : set the first letter of album artist translated
-#: ../src/scan.c:2595
+#. Advice for Translators: set the first letter of album artist translated
+#: ../src/scan_dialog.c:2037
 msgid "AA"
-msgstr ""
+msgstr "AA"
 
-#: ../src/scan.c:2596
-#, fuzzy
+#: ../src/scan_dialog.c:2038
 msgid "Process album artist field"
-msgstr "Processa il campo artista"
+msgstr "Elabora il campo artista dell'album"
 
-#. Advice for Translators : set the first letter of album translated
-#: ../src/scan.c:2598
+#. Advice for Translators: set the first letter of album translated
+#: ../src/scan_dialog.c:2040
 msgid "Al"
 msgstr "Al"
 
-#: ../src/scan.c:2599
+#: ../src/scan_dialog.c:2041
 msgid "Process album field"
-msgstr "Processa il campo album"
+msgstr "Elabora il campo album"
 
-#. Advice for Translators : set the first letter of genre translated
-#: ../src/scan.c:2601
+#. Advice for Translators: set the first letter of genre translated
+#: ../src/scan_dialog.c:2043
 msgid "G"
 msgstr "G"
 
-#: ../src/scan.c:2602
+#: ../src/scan_dialog.c:2044
 msgid "Process genre field"
-msgstr "Processa il campo genere"
+msgstr "Elabora il campo genere"
 
-#. Advice for Translators : set the first letter of comment translated
-#: ../src/scan.c:2604
+#. Advice for Translators: set the first letter of comment translated
+#: ../src/scan_dialog.c:2046
 msgid "Cm"
 msgstr "Cm"
 
-#: ../src/scan.c:2605
+#: ../src/scan_dialog.c:2047
 msgid "Process comment field"
-msgstr "Processa il campo commento"
+msgstr "Elabora il campo commento"
 
-#. Advice for Translators : set the first letter of composer translated
-#: ../src/scan.c:2607
+#. Advice for Translators: set the first letter of composer translated
+#: ../src/scan_dialog.c:2049
 msgid "Cp"
 msgstr "Cp"
 
-#: ../src/scan.c:2608
+#: ../src/scan_dialog.c:2050
 msgid "Process composer field"
-msgstr "Processa il campo compositore"
+msgstr "Elabora il campo compositore"
 
-#. Advice for Translators : set the first letter of orig artist translated
-#: ../src/scan.c:2610
+#. Advice for Translators: set the first letter of orig artist translated
+#: ../src/scan_dialog.c:2052
 msgid "O"
-msgstr "O"
+msgstr "A"
 
-#: ../src/scan.c:2611
+#: ../src/scan_dialog.c:2053
 msgid "Process original artist field"
-msgstr "Processa il campo artista originale"
+msgstr "Elabora il campo artista originale"
 
-#. Advice for Translators : set the first letter of copyright translated
-#: ../src/scan.c:2613
+#. Advice for Translators: set the first letter of copyright translated
+#: ../src/scan_dialog.c:2055
 msgid "Cr"
 msgstr "Cr"
 
-#: ../src/scan.c:2614
+#: ../src/scan_dialog.c:2056
 msgid "Process copyright field"
-msgstr "Processa il campo diritti d'autore"
+msgstr "Elabora il campo copyright"
 
-#. Advice for Translators : set the first letter of URL translated
-#: ../src/scan.c:2616
+#. Advice for Translators: set the first letter of URL translated
+#: ../src/scan_dialog.c:2058
 msgid "U"
 msgstr "U"
 
-#: ../src/scan.c:2617
+#: ../src/scan_dialog.c:2059
 msgid "Process URL field"
-msgstr "Processa il campo URL"
+msgstr "Elabora il campo URL"
 
-#. Advice for Translators : set the first letter of encoder name translated
-#: ../src/scan.c:2619
+#. Advice for Translators: set the first letter of encoder name translated
+#: ../src/scan_dialog.c:2061
 msgid "E"
-msgstr "E"
+msgstr "C"
 
-#: ../src/scan.c:2620
+#: ../src/scan_dialog.c:2062
 msgid "Process encoder name field"
-msgstr "Processa il campo nome del codificatore"
+msgstr "Elabora il campo codificatore"
 
-#: ../src/scan.c:2669
-msgid "Invert Selection"
-msgstr "Inverti Selezione"
-
-#: ../src/scan.c:2678
-msgid "Select/Unselect All."
-msgstr "Seleziona/Deseleziona Tutto."
+#: ../src/scan_dialog.c:2106
+msgid "Invert selection"
+msgstr "Inverte selezione"
 
-#. Group: character conversion
-#: ../src/scan.c:2685
-msgid "Convert '_' and '%20' to ' '"
-msgstr "Converti '_' e '%20' in ' '"
+#: ../src/scan_dialog.c:2113
+msgid "Select/Unselect all"
+msgstr "Seleziona/deseleziona tutto"
 
-#: ../src/scan.c:2691
+#: ../src/scan_dialog.c:2128
 msgid "Convert:"
-msgstr "Converti:"
+msgstr "Convertire:"
 
-#: ../src/scan.c:2693
+#: ../src/scan_dialog.c:2130
 msgid "to: "
 msgstr "a:"
 
-#: ../src/scan.c:2722
+#: ../src/scan_dialog.c:2137
+msgid "Do not convert"
+msgstr "Non convertire"
+
+#: ../src/scan_dialog.c:2156
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
 msgstr ""
-"Il carattere di trattino-basso o la stringa  '%20'  sono sostituiti con uno "
-"spazio. Esempio, prima: 'Testo%20In%20Una_Voce', dopo: 'Testo In Una Voce'."
+"Il carattere trattino basso o la stringa «%20» sono sostituiti da uno "
+"spazio. Esempio, prima: «Testo%20di%20una_voce», dopo: «Testo di una voce»."
 
-#: ../src/scan.c:2725
+#: ../src/scan_dialog.c:2159
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
 msgstr ""
-"Il carattere spazio è sostituito con un trattino-basso. Esempio, prima: "
-"'Testo in una voce', dopo: 'Testo_in_una_voce'."
+"Il carattere spazio è sostituito da un carattere trattino basso. Esempio, "
+"prima: «Testo di una voce», dopo: «Testo_di_una_voce»."
 
-#: ../src/scan.c:2728
+#: ../src/scan_dialog.c:2162
 msgid ""
 "Replace a string by another one. Note that the search is case sensitive."
 msgstr ""
+"Sostituisce una stringa con un'altra. Notare che la ricerca è maiuscolo/"
+"minuscolo."
+
+#: ../src/scan_dialog.c:2169
+msgid "Capitalize all"
+msgstr "Tutto in maiuscolo"
+
+#: ../src/scan_dialog.c:2171
+msgid "Lowercase all"
+msgstr "Tutto in minuscolo"
+
+#: ../src/scan_dialog.c:2173
+msgid "Capitalize first letter"
+msgstr "Prima lettera maiuscola"
+
+#: ../src/scan_dialog.c:2175
+msgid "Capitalize the first letter of each word"
+msgstr "La prima lettera di ogni parola in maiuscolo"
 
-#: ../src/scan.c:2741
+#: ../src/scan_dialog.c:2176
 msgid "Detect Roman numerals"
-msgstr ""
+msgstr "Rilevare numeri romani"
+
+#: ../src/scan_dialog.c:2178
+msgid "Do not change capitalization"
+msgstr "Non modificare il maiuscolo/minuscolo"
 
-#: ../src/scan.c:2768
+#: ../src/scan_dialog.c:2200
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
 msgstr ""
-"Converti tutte le parole di tutti i campi in maiuscolo. Esempio, prima: "
-"'Testo IN UNA voce', dopo: 'TESTO IN UNA VOCÈ."
+"Converte tutte le parole in tutti i campi al maiuscolo. Esempio, prima: "
+"«Testo DI UNA voce», dopo: «TESTO DI UNA VOCE»."
 
-#: ../src/scan.c:2771
+#: ../src/scan_dialog.c:2203
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
 msgstr ""
-"Converti tutte le parole di tutti i campi in minuscolo. Esempio, prima: "
-"'TESTO IN una voce', dopo: 'testo in una voce'."
+"Converte tutte le parole in tutti i campi al minuscolo. Esempio, prima: "
+"«TESTO DI una voce», dopo: «testo di una voce»."
 
-#: ../src/scan.c:2774
+#: ../src/scan_dialog.c:2206
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
 msgstr ""
-"Converti la lettera iniziale della prima parola di tutti i campi in "
-"maiuscolo. Esempio, prima: 'testo IN una VOCE', dopo: 'Testo in una voce'."
+"Converte l'iniziale della prima parola in tutti i campi al maiuscolo. "
+"Esempio, prima: «testo DI Una VOCE», dopo: «Testo di una voce»."
 
-#: ../src/scan.c:2777
+#: ../src/scan_dialog.c:2209
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
 msgstr ""
-"Converti la lettera iniziale di ogni parola di tutti i campi in maiuscolo. "
-"Esempio, prima: 'Testo in una VOCE', dopo: 'Testo In Una Voce'."
+"Converte l'iniziale di ogni parola in tutti i campi al maiuscolo. Esempio, "
+"prima: «Testo di una VOCE», dopo: «Testo Di Una Voce»."
 
-#: ../src/scan.c:2780
-#, fuzzy
+#: ../src/scan_dialog.c:2212
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
 msgstr ""
-"Viene inserito uno spazio prima di ogni lettera maiuscola. Esempio, prima:  "
-"'TestoInUnaVoce', dopo:  'Testo In Una Voce'."
+"Forza la conversione in maiuscolo dei numeri romani. Esempio, prima: «ix. "
+"testo di una voce», dopo: «IX. Testo Di Una Voce»."
 
-#: ../src/scan.c:2789
-msgid "Insert a space before an uppercase letter"
-msgstr "Inserisci uno spazio prima di una lettera maiuscola"
+#: ../src/scan_dialog.c:2220
+msgid "Insert a space before uppercase letters"
+msgstr "Inserire uno spazio prima delle lettere maiuscole"
 
-#: ../src/scan.c:2790
-msgid "Remove duplicates of space or underscore"
-msgstr "Rimuovi i duplicati di spazi ed i trattini-bassi"
+#: ../src/scan_dialog.c:2222
+msgid "Remove duplicate spaces and underscores"
+msgstr "Rimuovere spazi e trattini bassi duplicati"
 
-#: ../src/scan.c:2808
+#: ../src/scan_dialog.c:2224
+msgid "Do not change word separators"
+msgstr "Non modificare i separatori della parola"
+
+#: ../src/scan_dialog.c:2238
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
-"Rimuovi tutti gli spazi fra le parole. Esempio, prima: 'Testo In Una Voce', "
-"dopo:  'TestoInUnaVoce'."
+"Tutti gli spazi fra le parole sono rimossi. Esempio, prima: «Testo Di Una "
+"Voce», dopo: «TestoDiUnaVoce»."
 
-#: ../src/scan.c:2811
+#: ../src/scan_dialog.c:2241
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
-"Viene inserito uno spazio prima di ogni lettera maiuscola. Esempio, prima:  "
-"'TestoInUnaVoce', dopo:  'Testo In Una Voce'."
+"Uno spazio è inserito prima di ogni lettera in maiuscolo. Esempio, prima: "
+"«TestoDiUnaVoce», dopo: «Testo Di Una Voce»."
 
-#: ../src/scan.c:2814
+#: ../src/scan_dialog.c:2244
 msgid ""
-"Duplicated spaces or underscores are removed. Example, before: "
+"Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
 msgstr ""
-"Rimuovi spazi e trattini-bassi doppi. Esempio, prima: 'Testo__In__Una   "
-"Voce', dopo: 'Testo_In_Una Voce'."
+"Gli spazi e i trattini bassi duplicati sono rimossi. Esempio, prima: "
+"«Testo__Di__Una   Voce», dopo: «Testo_Di_Una Voce»."
 
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2821
+#: ../src/scan_dialog.c:2251
 msgid "Legend"
 msgstr "Legenda"
 
-#: ../src/scan.c:2827
+#: ../src/scan_dialog.c:2257
 #, c-format
-msgid "%a : artist"
-msgstr "%a : artista"
+msgid "%a: artist"
+msgstr "%a: artista"
 
-#: ../src/scan.c:2830
-#, fuzzy
-msgid "%z : album artist"
-msgstr "%a : artista"
+#: ../src/scan_dialog.c:2260
+msgid "%z: album artist"
+msgstr "%z: artista dell'album"
 
-#: ../src/scan.c:2833
-msgid "%b : album"
-msgstr "%b : album"
+#: ../src/scan_dialog.c:2263
+msgid "%b: album"
+msgstr "%b: album"
 
-#: ../src/scan.c:2836
+#: ../src/scan_dialog.c:2266
 #, c-format
-msgid "%c : comment"
-msgstr "%c : commento"
+msgid "%c: comment"
+msgstr "%c: commento"
 
-#: ../src/scan.c:2839
+#: ../src/scan_dialog.c:2269
 #, c-format
-msgid "%p : composer"
-msgstr "%p : compositore"
+msgid "%p: composer"
+msgstr "%p: compositore"
 
-#: ../src/scan.c:2842
-msgid "%r : copyright"
-msgstr "%r : diritti d'autore"
+#: ../src/scan_dialog.c:2272
+msgid "%r: copyright"
+msgstr "%r: copyright"
 
-#: ../src/scan.c:2845
+#: ../src/scan_dialog.c:2275
 #, c-format
-msgid "%d : disc number"
-msgstr "%d: numero disco"
+msgid "%d: disc number"
+msgstr "%d: numero del disco"
 
-#: ../src/scan.c:2848
+#: ../src/scan_dialog.c:2278
 #, c-format
-msgid "%e : encoded by"
-msgstr "%e : codificato da"
+msgid "%e: encoded by"
+msgstr "%e: codificato da"
 
-#: ../src/scan.c:2851
+#: ../src/scan_dialog.c:2281
 #, c-format
-msgid "%g : genre"
-msgstr "%g : genere"
+msgid "%g: genre"
+msgstr "%g: genere"
 
-#: ../src/scan.c:2854
+#: ../src/scan_dialog.c:2284
 #, c-format
-msgid "%i : ignored"
-msgstr "%i : ignorato"
+msgid "%i: ignored"
+msgstr "%i: ignorato"
 
-#: ../src/scan.c:2857
-msgid "%l : number of tracks"
-msgstr "%l : numero di tracce"
+#: ../src/scan_dialog.c:2287
+msgid "%l: number of tracks"
+msgstr "%l: numero delle tracce"
 
-#: ../src/scan.c:2860
+#: ../src/scan_dialog.c:2290
 #, c-format
-msgid "%o : orig. artist"
-msgstr "%o : artista originale"
+msgid "%o: orig. artist"
+msgstr "%o: artista originale"
 
-#: ../src/scan.c:2863
+#: ../src/scan_dialog.c:2293
 #, c-format
-msgid "%n : track"
-msgstr "%n : traccia"
+msgid "%n: track"
+msgstr "%n: traccia"
+
+#: ../src/scan_dialog.c:2296
+msgid "%t: title"
+msgstr "%t: titolo"
 
-#: ../src/scan.c:2866
-msgid "%t : title"
-msgstr "%t : titolo"
+#: ../src/scan_dialog.c:2299
+#, c-format
+msgid "%u: URL"
+msgstr "%u: URL"
 
-#: ../src/scan.c:2869
+#: ../src/scan_dialog.c:2302
 #, c-format
-msgid "%u : URL"
-msgstr "%u : URL"
+msgid "%x: number of discs"
+msgstr "%x: numero di dischi"
 
-#: ../src/scan.c:2872
-msgid "%y : year"
-msgstr "%y : anno"
+#: ../src/scan_dialog.c:2305
+msgid "%y: year"
+msgstr "%y: anno"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2879
+#: ../src/scan_dialog.c:2312
 msgid "Mask Editor"
-msgstr "Modificatore Maschera"
+msgstr "Editor di maschera"
 
-#: ../src/scan.c:2936
+#: ../src/scan_dialog.c:2366
 msgid "Create New Mask"
-msgstr "Crea Nuova Maschera"
+msgstr "Crea nuova maschera"
 
-#: ../src/scan.c:2946
+#: ../src/scan_dialog.c:2376
 msgid "Move Up this Mask"
-msgstr "Sposta Su questa Maschera"
+msgstr "Sposta su questa maschera"
 
-#: ../src/scan.c:2956
+#: ../src/scan_dialog.c:2386
 msgid "Move Down this Mask"
-msgstr "Sposta Giù questa Maschera"
+msgstr "Sposta giù questa maschera"
 
-#: ../src/scan.c:2966
+#: ../src/scan_dialog.c:2396
 msgid "Duplicate Mask"
-msgstr "Duplica Maschera"
+msgstr "Duplica maschera"
 
-#: ../src/scan.c:2976
+#: ../src/scan_dialog.c:2406
 msgid "Add Default Masks"
-msgstr "Aggiungi Maschere Predefinite"
+msgstr "Aggiungi maschere predefinite"
 
-#: ../src/scan.c:2986
+#: ../src/scan_dialog.c:2416
 msgid "Remove Mask"
-msgstr "Rimuovi Maschera"
+msgstr "Rimuovi maschera"
 
-#: ../src/scan.c:2996
+#: ../src/scan_dialog.c:2426
 msgid "Save Masks"
-msgstr "Salva Maschere"
+msgstr "Salva maschere"
 
-#: ../src/scan.c:3589
+#: ../src/scan_dialog.c:3006
 msgid "New_mask"
 msgstr "Nuova_maschera"
 
-#: ../src/scan.c:3627
-msgid "Copy: No row selected!"
-msgstr "Copia: nessuna riga selezionata!"
+#: ../src/scan_dialog.c:3045
+msgid "Copy: No row selected"
+msgstr "Copia: nessuna riga selezionata"
+
+#: ../src/scan_dialog.c:3138
+msgid "Remove: No row selected"
+msgstr "Rimuovi: nessuna riga selezionata"
 
-#: ../src/scan.c:3733
-msgid "Remove: No row selected!"
-msgstr "Rimuovi: nessuna riga selezionata!"
+#: ../src/scan_dialog.c:3185
+msgid "Move Up: No row selected"
+msgstr "Sposta su: nessuna riga selezionata"
 
-#: ../src/scan.c:3780
-msgid "Move Up: No row selected!"
-msgstr "Sposta su: nessuna riga selezionata!"
+#: ../src/scan_dialog.c:3229
+msgid "Move Down: No row selected"
+msgstr "Sposta giù: nessuna riga selezionata"
 
-#: ../src/scan.c:3833
-msgid "Move Down: No row selected!"
-msgstr "Sposta giù: nessuna riga selezionata!"
+#: ../src/setting.c:924
+#, c-format
+msgid "Error: Cannot write configuration file: %s (%s)"
+msgstr "Errore: impossibile scrivere il file di configurazione: %s (%s)"
 
-#: ../src/setting.c:933
-#, fuzzy, c-format
-msgid "ERROR: Can't write config file: %s (%s)"
-msgstr "ERRORE: non riesco a scrivere il file di configurazione %s (%s)\a"
+#: ../src/setting.c:944 ../src/setting.c:961 ../src/setting.c:981
+#, c-format
+msgid "Error while writing configuration file: %s"
+msgstr "Errore durante la scrittura del file di configurazione: %s"
 
-#: ../src/setting.c:1082 ../src/setting.c:1125
+#: ../src/setting.c:1100
 #, c-format
-msgid "Can't open configuration file '%s' (%s)"
-msgstr "Non riesco ad aprire il file di configurazione '%s' (%s)"
+msgid "Cannot open configuration file '%s' (%s)"
+msgstr "Impossibile aprire il file di configurazione «%s» (%s)"
 
-#: ../src/setting.c:1083
-#, fuzzy
-msgid "Loading default configuration…"
-msgstr "Carico la configurazione predefinita..."
+#: ../src/setting.c:1102
+msgid "Loading default configuration"
+msgstr "Caricamento configurazione predefinita"
 
-#: ../src/setting.c:1196 ../src/setting.c:1203 ../src/setting.c:1210
-#: ../src/setting.c:1217 ../src/setting.c:1224 ../src/setting.c:1231
-#: ../src/setting.c:1238 ../src/setting.c:1245 ../src/setting.c:1252
-#: ../src/setting.c:1259 ../src/setting.c:1266 ../src/setting.c:1273
-#: ../src/setting.c:1280 ../src/setting.c:1287 ../src/setting.c:1294
-#: ../src/setting.c:1301 ../src/setting.c:1308
+#: ../src/setting.c:1143
 #, c-format
-msgid "Can't create or open file '%s' (%s)"
-msgstr "Non riesco a creare o ad aprire il file '%s' (%s)"
+msgid "Cannot create or open file '%s' (%s)"
+msgstr "Impossibile creare o aprire il file «%s» (%s)"
 
-#: ../src/setting.c:1347
-#, fuzzy, c-format
-msgid "ERROR: Can't write list to file: %s (%s)"
-msgstr "ERRORE: non riesco a scrivere la lista nel file %s (%s)\a"
+#: ../src/setting.c:1203
+#, c-format
+msgid "Error: Cannot write list to file: %s (%s)"
+msgstr "Errore: impossibile scrivere l'elenco nel file: %s (%s)"
+
+#: ../src/setting.c:1221
+#, c-format
+msgid "Error while writing list file: %s"
+msgstr "Errore durante la scrittura dell'elenco file: %s"
 
 #. Fall back to defaults
-#: ../src/setting.c:1435
-#, fuzzy
+#: ../src/setting.c:1301
 msgid "Loading default 'Fill Tag' masks…"
-msgstr "Carico le maschere preimpostate di 'Riempi Etichetta'..."
+msgstr "Caricamento maschera predefinita «Riempi etichetta»..."
 
 #. Fall back to defaults
-#: ../src/setting.c:1463
-#, fuzzy
+#: ../src/setting.c:1331
 msgid "Loading default 'Rename File' masks…"
-msgstr "Carico le maschere preimpostate di 'Rinomina File'..."
+msgstr "Caricamento maschera predefinita «Rinomina file»..."
 
 #. Fall back to defaults
-#: ../src/setting.c:1490
-#, fuzzy
+#: ../src/setting.c:1357
 msgid "Loading default 'Rename Directory' masks…"
-msgstr "Carico le maschere preimpostate di 'Rinomina Cartella'..."
-
-#: ../src/setting.c:1684
-msgid "ERROR: The environment variable HOME is not defined!"
-msgstr "ERRORE: la variabile d'ambiente HOME non è definita!"
-
-#: ../src/setting.c:1705
-#, c-format
-msgid "ERROR: Can't create directory '%s' (%s)!"
-msgstr "ERRORE: non riesco a creare la cartella '%s' (%s)!"
-
-#: ../src/vcedit.c:287
-msgid "Input truncated or empty."
-msgstr "Input troncato o vuoto."
-
-#: ../src/vcedit.c:289
-msgid "Input is not an Ogg bitstream."
-msgstr "Input non è un flusso di dati Ogg."
-
-#: ../src/vcedit.c:307
-msgid "Error reading first page of Ogg bitstream."
-msgstr ""
-"Si è verificato un errore nella lettura della prima pagina del flusso di "
-"dati Ogg."
-
-#: ../src/vcedit.c:313
-msgid "Error reading initial header packet."
-msgstr ""
-"Si è verificato un errore nella lettura del pacchetto d'intestazione "
-"iniziale."
-
-#: ../src/vcedit.c:341
-#, fuzzy
-msgid "Ogg bitstream contains neither speex or vorbis data."
-msgstr "Il flusso di dati Ogg non contiene dati vorbis."
-
-#: ../src/vcedit.c:375
-msgid "Corrupt secondary header."
-msgstr "L'intestazione secondaria è daneggiata."
-
-#: ../src/vcedit.c:405
-msgid "Need to save extra headers - TODO!!"
-msgstr ""
+msgstr "Caricamento maschera predefinita «Rinomina directory»..."
 
-#: ../src/vcedit.c:419
-msgid "EOF before end of vorbis headers."
-msgstr "EOF prima della fine delle intestazioni Vorbis."
-
-#: ../src/vcedit.c:584
-#, fuzzy
-msgid "Corrupt or missing data, continuing…"
-msgstr "Dati danneggiati o mancanti, continuo..."
-
-#: ../src/vcedit.c:621
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr ""
-"Si è verificato un errore nella scrittura del flusso sull'uscita. Il flusso "
-"d'uscita potrebbe risultare danneggiato o troncato."
-
-#. Log_Print(_("DLL '%s' not already loaded. Try loading it..."), dllname);
-#: ../src/win32/win32dep.c:122
-#, fuzzy, c-format
-msgid "DLL '%s' not already loaded. Try loading it..."
-msgstr "DLL '%s' non trovata. Provo a caricarla..."
-
-#. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: ../src/win32/win32dep.c:126
-#, c-format
-msgid "DLL '%s' could not be loaded"
-msgstr "Non è stato possibili caricare la DLL '%s'"
-
-#. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: ../src/win32/win32dep.c:136
+#: ../src/setting.c:1568
 #, c-format
-msgid "This version of '%s' contains '%s'"
-msgstr "Questa versione di '%s' contiene '%s'"
+msgid "Migrating configuration from directory '%s' to '%s'"
+msgstr "Migrazione configurazione dalla directory «%s» alla «%s»"
 
-#. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: ../src/win32/win32dep.c:142
+#: ../src/setting.c:1592
 #, c-format
-msgid "Function '%s' not found in dll '%s'"
-msgstr "La funzione '%s' non è stata trovata nella dll '%s'"
+msgid "Failed to migrate configuration file '%s'"
+msgstr "Migrazione del file di configurazione «%s» non riuscita"
 
-#. ET_Win32_Path_Replace_Backslashes(app_data_dir);
-#. Log_Print(_("EasyTAG settings dir: '%s'"), app_data_dir);
-#: ../src/win32/win32dep.c:278
+#: ../src/setting.c:1629
 #, c-format
-msgid "EasyTAG settings dir: '%s'"
-msgstr "Cartella delle impostazioni EasyTAG: '%s'"
-
-#. Log_Print(_("weasytag_init start..."));
-#: ../src/win32/win32dep.c:469
-#, fuzzy, c-format
-msgid "weasytag_init start..."
-msgstr "Pronto a partire..."
-
-#. Log_Print(_("EasyTAG version: %s"),VERSION);
-#. g_print(_("EasyTAG version: %s"),VERSION);
-#. g_print("\n");
-#: ../src/win32/win32dep.c:475
-#, c-format
-msgid "Glib version: %u.%u.%u\n"
-msgstr ""
-
-#. Set Environmental Variables
-#. Log_Print(_("weasytag_init end..."));
-#: ../src/win32/win32dep.c:493
-#, c-format
-msgid "weasytag_init end..."
-msgstr ""
-
-#. Log_Print(_("Audio player: '%s'"), player);
-#: ../src/win32/win32dep.c:614
-#, c-format
-msgid "Audio player: '%s'"
-msgstr "Riproduttore Audio: '%s'"
-
-#~ msgid "About..."
-#~ msgstr "Informazioni..."
-
-#~ msgid "Rename Directory ..."
-#~ msgstr "Rinomina cartella..."
-
-#~ msgid "_Rename File(s) and Directory ..."
-#~ msgstr "_Rinomina file e cartelle..."
-
-#~ msgid "Rename File(s) and Directory ..."
-#~ msgstr "Rinomina file e cartelle..."
-
-#~ msgid "CD Data _Base Search ..."
-#~ msgstr "Ricerca archivio CD..."
-
-#~ msgid "Write Playlist ..."
-#~ msgstr "Scrivi playlist..."
-
-#~ msgid "Preferences ..."
-#~ msgstr "Preferenze..."
-
-#, fuzzy
-#~ msgid "... file(s)"
-#~ msgstr "%u file"
-
-#~ msgid "File(s) not renamed..."
-#~ msgstr "File non rinominato/i..."
-
-#~ msgid "File(s) renamed..."
-#~ msgstr "File rinominato/i..."
-
-#~ msgid "File(s) not moved..."
-#~ msgstr "File non spostato/i..."
-
-#, fuzzy
-#~ msgid "Picture file not loaded (%s)..."
-#~ msgstr "L'immagine non è stata caricata..."
-
-#~ msgid "Confirm..."
-#~ msgstr "Conferma..."
-
-#~ msgid ""
-#~ "Some files have been modified but not saved...\n"
-#~ "Do you want to save them before changing the directory?"
-#~ msgstr ""
-#~ "Alcuni file sono stati modificati ma non salvati.\n"
-#~ "Vuoi salvarli prima di cambiare cartella?"
-
-#~ msgid "Error..."
-#~ msgstr "Errore..."
-
-#~ msgid ""
-#~ "Could not convert '%s' into filename encoding. Please use another name."
-#~ msgstr ""
-#~ "Non posso convertire '%s' nel nome file da codificare. Per favore, usa un "
-#~ "altro nome."
-
-#~ msgid ""
-#~ "Can't rename because this directory name already exists!\n"
-#~ "(%s)"
-#~ msgstr ""
-#~ "Non posso rinominare nulla perché il nome della cartella esiste già!\n"
-#~ "(%s)"
-
-#~ msgid ""
-#~ "Can't rename directory \n"
-#~ "'%s'\n"
-#~ " to \n"
-#~ "'%s'!\n"
-#~ "(%s)"
-#~ msgstr ""
-#~ "Non posso rinominare la cartella \n"
-#~ "'%s'\n"
-#~ " in \n"
-#~ "'%s'!\n"
-#~ "(%s)"
-
-#~ msgid "Write Tag..."
-#~ msgstr "Scrivi Etichetta..."
-
-#~ msgid "Rename File and Directory..."
-#~ msgstr "Rinomina File e Cartella..."
-
-#~ msgid ""
-#~ "Can't rename file \n"
-#~ "'%s'\n"
-#~ "because the following file already exists:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "Non è possibile rinominare il file \n"
-#~ " '%s'\n"
-#~ "perché il file seguente esiste già:\n"
-#~ " '%s'"
-
-#~ msgid ""
-#~ "Can't create target directory\n"
-#~ "'%s'!\n"
-#~ "(%s)"
-#~ msgstr ""
-#~ "Non è possibile creare la cartella\n"
-#~ "'%s'!\n"
-#~ "(%s)"
-
-#~ msgid "Delete File..."
-#~ msgstr "Elimina File..."
-
-#~ msgid "Not a directory"
-#~ msgstr "Non una cartella"
-
-#~ msgid "Warning..."
-#~ msgstr "Attenzione..."
-
-#, fuzzy
-#~ msgid ""
-#~ "The path for 'Local CD Data Base' wasn't defined!\n"
-#~ "Fill it in the preferences window before to use this search."
-#~ msgstr ""
-#~ "Il percorso per 'Database Locale CD' non è stato definito!\n"
-#~ "Impostalo nella finestra delle preferenze."
-
-#, fuzzy
-#~ msgid "Saving File(s)..."
-#~ msgstr "Cerca file..."
-
-#~ msgid ""
-#~ "Some files have been modified but not saved...\n"
-#~ "Do you want to save them before exiting the program?"
-#~ msgstr ""
-#~ "Alcuni file sono stati modificati ma non salvati...\n"
-#~ "Vuoi salvarli prima di uscire dal programma?"
-
-#~ msgid "Save file..."
-#~ msgstr "Salva file..."
-
-#~ msgid ""
-#~ "Can't open file :\n"
-#~ "'%s'!\n"
-#~ "(%s)"
-#~ msgstr ""
-#~ "Non posso aprire il file:\n"
-#~ "'%s'!\n"
-#~ "(%s)"
-
-#~ msgid "Files have been partially saved..."
-#~ msgstr "I file sono stati parzialmente salvati..."
-
-#~ msgid " OK "
-#~ msgstr " OK"
-
-#~ msgid " Yes "
-#~ msgstr " Sì "
-
-#~ msgid " No "
-#~ msgstr " No "
-
-#~ msgid " Apply "
-#~ msgstr " Applica "
-
-#~ msgid " Cancel "
-#~ msgstr " Annulla "
-
-#~ msgid " Close "
-#~ msgstr " Chiudi "
-
-#~ msgid " Execute "
-#~ msgstr " Esegui "
-
-#~ msgid " Search "
-#~ msgstr " Ricerca "
-
-#~ msgid " Browse... "
-#~ msgstr " Sfoglia... "
-
-#~ msgid ""
-#~ "The entered path is invalid!:\n"
-#~ "%s\n"
-#~ "(%s)"
-#~ msgstr ""
-#~ "Il percorso indicato non è valido!\n"
-#~ "%s\n"
-#~ "(%s)"
-
-#, fuzzy
-#~ msgid "(case sensitive)"
-#~ msgstr "Maiuscolo e minuscolo"
-
-#~ msgid "Replace a character by an other one."
-#~ msgstr "Sostituisci un carattere con un altro."
-
-#~ msgid "Loaded File Content :"
-#~ msgstr "Caricato Contenuto File:"
-
-#~ msgid "Files Name List :"
-#~ msgstr "Lista Nomi File:"
-
-#, fuzzy
-#~ msgid "(MP3 file support enabled using: libid3tag %s)"
-#~ msgstr "(il supporto per i file MP3 è stato disabilitato)"
-
-#, fuzzy
-#~ msgid "(ID3v2.3 tags support enabled using: id3lib %d.%d.%d)"
-#~ msgstr "(il supporto per i file MP3 è stato disabilitato)"
-
-#, fuzzy
-#~ msgid "ID3V2 tag Version"
-#~ msgstr "La versione dell'etichetta non è valida"
-
-#~ msgid "Unicode (UTF-7)"
-#~ msgstr "Unicode (UTF-7)"
-
-#~ msgid "Unicode (UTF-16BE)"
-#~ msgstr "Unicode (UTF-16BE)"
-
-#~ msgid "Unicode (UTF-16LE)"
-#~ msgstr "Unicode (UTF-16LE)"
-
-#~ msgid "Use padding"
-#~ msgstr "Usa riempimento"
-
-#~ msgid ""
-#~ "Set padding in the ID3v2 tags for faster writing during next changes in "
-#~ "the tag."
-#~ msgstr ""
-#~ "Imposta il riempimento nelle etichette ID3v2 per una scrittura più veloce "
-#~ "durante le loro future modifiche."
-
-#~ msgid "Always save tags to ISO-8859-1 character set"
-#~ msgstr "Salva sempre le etichette nella codifica ISO-8859-1"
-
-#~ msgid ""
-#~ "Use the ISO-8859-1 character set (single byte character set) to write the "
-#~ "tag. This character set can be used for the ID3v2 and the ID3v1 tags, but "
-#~ "note that non-ISO-8859-1 characters will be lost.\n"
-#~ "\n"
-#~ "If a different charset is selected with 'Use non standard character set "
-#~ "for writing ID3 tags', it will be used instead of ISO-8859-1.\n"
-#~ "Also some rules can be defined if some characters can't be converted."
-#~ msgstr ""
-#~ "Usa la codifica ISO-8859-1 (codifica a singolo byte) per scrivere "
-#~ "l'etichetta. Questa codifica può essere usata per le etichette ID3v2 e "
-#~ "ID3v1 ma nota che i caratteri non ISO-8859-1 verranno persi.\n"
-#~ "\n"
-#~ "Se una codifica differente è selezionata con 'Usa codifica non standard "
-#~ "per scrivere le etichette ID3', verrà usata invece di ISO-8859-1.\n"
-#~ "Inoltre, possono venir definite alcune regole se dei caratteri non "
-#~ "possono essere convertiti."
-
-#~ msgid ""
-#~ "Try to save tags to ISO-8859-1. If it isn't possible then use UNICODE "
-#~ "(recommended)"
-#~ msgstr ""
-#~ "Cerca di salvare le etichette nella codifica ISO-8859-1. Se non fosse "
-#~ "possibile usa la codifica UNICODE (raccomandato)"
-
-#~ msgid ""
-#~ "The UNICODE character set will be used if conversion to ISO-8859-1 fails. "
-#~ "Unicode can be used for ID3v2 but not for the ID3v1 tags which use only a "
-#~ "single byte character set (by default ISO-8859-1).\n"
-#~ "\n"
-#~ "If a different charset is selected with 'Use non standard character set "
-#~ "for writing ID3 tags', it will be used instead of ISO-8859-1.\n"
-#~ "Also some rules can be defined if some characters can't be converted."
-#~ msgstr ""
-#~ "La codifica UNICODE verrà usata se fallirà la codifica ISO-8859-1. La "
-#~ "codifica UNICODE può essere usata per ID3v2 ma non per quella ID3v1 che "
-#~ "usa solo un gruppo di caratteri a singolo byte (di default ISO-8859-1).\n"
-#~ "\n"
-#~ "Verrà usata una codifica diversa dalla ISO-8859-1 se selezionata con il "
-#~ "comando 'Usa codifica non standard per scrivere etichette ID3'.\n"
-#~ "Inoltre possono venire definite alcune regole se dei caratteri non "
-#~ "possono essere convertiti."
-
-#~ msgid "Always save tags to UNICODE character set"
-#~ msgstr "Salva sempre le etichette nella codifica UNICODE"
-
-#~ msgid ""
-#~ "Use UNICODE character set for ID3v2 tags. The ID3v1 tags are always saved "
-#~ "with a single byte character set (by default ISO-8859-1).\n"
-#~ "\n"
-#~ "If a different charset is selected with 'Use non standard character set "
-#~ "for writing ID3 tags', it will be used instead of ISO-8859-1."
-#~ msgstr ""
-#~ "Usa la codifica UNICODE per le etichette. Le etichette ID3v2 sono sempre "
-#~ "salvate in una codifica di caratteri a singolo byte (di default "
-#~ "ISO-8859-1).\n"
-#~ "\n"
-#~ "Verrà usata una codifica diversa da ISO-8850-1 se selezionata con il "
-#~ "comando  'Usa codifica non standard per scrivere le etichette ID3'."
-
-#~ msgid ""
-#~ "For ISO-8859-1 fields, override with the following character encodings "
-#~ "(for expert users only!): "
-#~ msgstr ""
-#~ "Per i campi ISO-8859-1 sovrascrivi con la seguente codifica (per utenti "
-#~ "esperti solamente!):"
-
-#~ msgid "Use non standard character set for reading ID3 tags: "
-#~ msgstr ""
-#~ "Usa il gruppo di caratteri non standard per leggere le etichette ID3:"
-
-#~ msgid "Use non standard character set for writing ID3 tags: "
-#~ msgstr ""
-#~ "Usa il gruppo di caratteri non standard ISO-8859-1 per scrivere le "
-#~ "etichette ID3:"
-
-#~ msgid ""
-#~ "This character set will be used when writing the tag data, to convert "
-#~ "each string saved in an ISO-8859-1 field in the tag (for ID3v2 or/and "
-#~ "ID3v1 tag)."
-#~ msgstr ""
-#~ "Questa codifica sarà usata per scrivere i dati dell'etichetta, per "
-#~ "convertire ogni stringa salvata in un campo ISO-8859-1 nell'etichetta "
-#~ "(per ID3v2 e/o ID3v1)."
-
-#~ msgid ""
-#~ "For ISO-8859-1 fields, apply also these rules if some characters can't be "
-#~ "converted when writing tags:"
-#~ msgstr ""
-#~ "Per i campi ISO-8859-1 applica anche queste regole se alcuni caratteri "
-#~ "non possono essere convertiti quando le etichette vengono scritte:"
-
-#~ msgid "Do nothing"
-#~ msgstr "Non fare nulla"
-
-#~ msgid "Force using the character encoding and activate the transliteration"
-#~ msgstr "Forza usando la codifica di sistema ed attiva la traslitterazione"
-
-#~ msgid ""
-#~ "Force using the character encoding and silently discard some characters"
-#~ msgstr ""
-#~ "Forza usando la codifica di sistema e rigetta silenziosamente alcuni "
-#~ "caratteri"
-
-#~ msgid ""
-#~ "The character set translation from '%s'\n"
-#~ "to '%s' isn't supported!"
-#~ msgstr ""
-#~ "La traduzione del gruppo di caratteri da '%s'\n"
-#~ "a '%s' non è supportata!"
-
-#~ msgid "ERROR while opening file: '%s' (%s)\a"
-#~ msgstr "Si è verificato un errore aprendo il file '%s' (%s)\a"
-
-#~ msgid "Load on startup the directory"
-#~ msgstr "Carica la cartella all'avvio"
+msgid "Error: Cannot create directory '%s' (%s)"
+msgstr "Errore: impossibile creare la directory «%s» (%s)"
diff --git a/po/lt.po b/po/lt.po
index 6eb417d..c330836 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-02-11 19:30+0000\n"
-"PO-Revision-Date: 2014-02-15 19:15+0200\n"
+"POT-Creation-Date: 2014-03-07 22:43+0000\n"
+"PO-Revision-Date: 2014-03-11 16:25+0200\n"
 "Last-Translator: Aurimas Černius <aurisc4 at gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt at lists.akl.lt>\n"
 "Language: lt\n"
@@ -431,8 +431,8 @@ msgstr "Pakartoti paskutinius pakeitimus"
 msgid "_Quit"
 msgstr "I_šeiti"
 
-#: ../src/bar.c:241 ../src/easytag.c:2403 ../src/easytag.c:4487
-#: ../src/easytag.c:4515
+#: ../src/bar.c:241 ../src/easytag.c:2430 ../src/easytag.c:4531
+#: ../src/easytag.c:4563
 msgid "Quit"
 msgstr "Išeiti"
 
@@ -584,11 +584,11 @@ msgstr "Generuoti grojaraštį…"
 msgid "Generate a playlist"
 msgstr "Generuoti grojaraštį"
 
-#: ../src/bar.c:296 ../src/bar.c:322 ../src/bar.c:323 ../src/bar.c:324
+#: ../src/bar.c:296 ../src/bar.c:327 ../src/bar.c:328 ../src/bar.c:329
 msgid "Run Audio Player"
 msgstr "Paleisti audio grotuvą"
 
-#: ../src/bar.c:297 ../src/bar.c:322 ../src/bar.c:323 ../src/bar.c:324
+#: ../src/bar.c:297 ../src/bar.c:327 ../src/bar.c:328 ../src/bar.c:329
 msgid "Run audio player"
 msgstr "Paleisti muzikos grotuvą"
 
@@ -617,231 +617,239 @@ msgstr "_Eiti"
 msgid "_Help"
 msgstr "Ž_inynas"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:310
+msgid "_Contents"
+msgstr "_Turinys"
+
+#: ../src/bar.c:311
+msgid "Show help"
+msgstr "Rodyti žinyną"
+
+#: ../src/bar.c:313
 msgid "_About"
 msgstr "_Apie"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:313
 msgid "About"
 msgstr "Apie"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: ../src/bar.c:314
+#: ../src/bar.c:319
 msgid "Stop the current action"
 msgstr "Sustabdyti dabartinį veiksmą"
 
 #.
 #. * Popup menu's Actions
 #.
-#: ../src/bar.c:320
+#: ../src/bar.c:325
 msgid "_File Operations"
 msgstr "_Failų operacijos"
 
-#: ../src/bar.c:321
+#: ../src/bar.c:326
 msgid "S_canner"
 msgstr "_Skeneris"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:330
 msgid "CDDB Search Files…"
 msgstr "CDDB failų paieška…"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:330
 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:329
+#: ../src/bar.c:334
 msgid "Clear log"
 msgstr "Išvalyti žurnalą"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Subdirectories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: ../src/bar.c:336
+#: ../src/bar.c:341
 msgid "Browse _Subdirectories"
 msgstr "Naršyti _poaplankius"
 
-#: ../src/bar.c:336
+#: ../src/bar.c:341
 msgid "Browse subdirectories"
 msgstr "Naršyti poaplankius"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:345
 msgid "Show Hidden Directories"
 msgstr "Rodyti paslėptus aplankus"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:345
 msgid "Show hidden directories"
 msgstr "Rodyti paslėptus aplankus"
 
-#: ../src/bar.c:342
+#: ../src/bar.c:347
 msgid "_Show Scanner"
 msgstr "_Rodyti skenerį"
 
-#: ../src/bar.c:343
+#: ../src/bar.c:348
 msgid "Show scanner"
 msgstr "Rodyti skenerį"
 
-#: ../src/bar.c:349
+#: ../src/bar.c:354
 msgid "Tree Browser"
 msgstr "Medžio naršyklė"
 
-#: ../src/bar.c:350
+#: ../src/bar.c:355
 msgid "View by directory tree"
 msgstr "Rodyti katalogų medį"
 
-#: ../src/bar.c:352
+#: ../src/bar.c:357
 msgid "Artist and Album"
 msgstr "Atlikėjas ir albumas"
 
-#: ../src/bar.c:353
+#: ../src/bar.c:358
 msgid "View by artist and album"
 msgstr "Rodyti pagal atlikėją ir albumą"
 
-#: ../src/bar.c:358
+#: ../src/bar.c:363
 msgid "_Fill Tags…"
 msgstr "_Užpildyti žymas…"
 
-#: ../src/bar.c:359
+#: ../src/bar.c:364
 msgid "Fill tags"
 msgstr "Užpildyti žymas"
 
-#: ../src/bar.c:361
+#: ../src/bar.c:366
 msgid "_Rename Files and Directories…"
 msgstr "_Pervadinti failus ir aplankus…"
 
-#: ../src/bar.c:362
+#: ../src/bar.c:367
 msgid "Rename files and directories"
 msgstr "Pervadinti failus ir aplankus"
 
-#: ../src/bar.c:364
+#: ../src/bar.c:369
 msgid "_Process Fields…"
 msgstr "_Apdoroti laukus…"
 
-#: ../src/bar.c:364 ../src/scan.c:182
+#: ../src/bar.c:369 ../src/scan.c:182
 msgid "Process Fields"
 msgstr "Apdoroti laukelius"
 
-#: ../src/bar.c:422
+#: ../src/bar.c:427
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Sulieti UI nepavyko, įvyko klaida: %s\n"
 
-#: ../src/bar.c:527
+#: ../src/bar.c:532
 msgid "Ready to start"
 msgstr "Pasiruošęs paleidimui"
 
-#: ../src/browser.c:369
+#: ../src/browser.c:376
 msgid "New default path for files selected"
 msgstr "Naujas numatytasis kelias pasirinktiems failams"
 
-#: ../src/browser.c:670 ../src/easytag.c:4483
+#: ../src/browser.c:678 ../src/easytag.c:4527
 msgid "Some files have been modified but not saved"
 msgstr "Kai kurie failai buvo pakeisti bet neįrašyti"
 
-#: ../src/browser.c:671
+#: ../src/browser.c:679
 msgid "Do you want to save them before changing the directory?"
 msgstr "Ar norite juos įrašyti prieš pakeisdami aplanką?"
 
-#: ../src/browser.c:675
+#: ../src/browser.c:683
 msgid "Confirm Directory Change"
 msgstr "Patvirtinkite aplanko pakeitimą"
 
-#: ../src/browser.c:2127
+#: ../src/browser.c:2141
 msgid "<All albums>"
 msgstr "<Visi albumai>"
 
-#: ../src/browser.c:2588
+#: ../src/browser.c:2602
 #, 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:3082 ../src/browser.c:3160
+#: ../src/browser.c:3096 ../src/browser.c:3174
 msgid "Tree"
 msgstr "Medis"
 
-#: ../src/browser.c:3083 ../src/cddb.c:803 ../src/misc.c:1883
+#: ../src/browser.c:3097 ../src/cddb.c:803 ../src/misc.c:1902
 msgid "Filename"
 msgstr "Failo pavadinimas"
 
-#: ../src/browser.c:3083 ../src/cddb.c:804 ../src/misc.c:1884
+#: ../src/browser.c:3097 ../src/cddb.c:804 ../src/misc.c:1903
 #: ../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:3084 ../src/browser.c:3091 ../src/cddb.c:483
-#: ../src/cddb.c:805 ../src/misc.c:1885 ../src/prefs.c:644
+#: ../src/browser.c:3098 ../src/browser.c:3105 ../src/cddb.c:483
+#: ../src/cddb.c:805 ../src/misc.c:1904 ../src/prefs.c:644
 msgid "Artist"
 msgstr "Atlikėjas"
 
-#: ../src/browser.c:3084 ../src/misc.c:1886
+#: ../src/browser.c:3098 ../src/misc.c:1905
 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:3085 ../src/browser.c:3093 ../src/cddb.c:486
-#: ../src/cddb.c:806 ../src/misc.c:1887 ../src/prefs.c:645
+#: ../src/browser.c:3099 ../src/browser.c:3107 ../src/cddb.c:486
+#: ../src/cddb.c:806 ../src/misc.c:1906 ../src/prefs.c:645
 msgid "Album"
 msgstr "Albumas"
 
-#: ../src/browser.c:3085 ../src/cddb.c:807 ../src/misc.c:1889
+#: ../src/browser.c:3099 ../src/cddb.c:807 ../src/misc.c:1908
 msgid "Year"
 msgstr "Metai"
 
-#: ../src/browser.c:3085
+#: ../src/browser.c:3099
 msgid "Disc"
 msgstr "Diskas"
 
-#: ../src/browser.c:3086 ../src/misc.c:1890
+#: ../src/browser.c:3100 ../src/misc.c:1909
 msgid "Track"
 msgstr "Takelis"
 
-#: ../src/browser.c:3086 ../src/cddb.c:810 ../src/misc.c:1891
+#: ../src/browser.c:3100 ../src/cddb.c:810 ../src/misc.c:1910
 #: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Žanras"
 
-#: ../src/browser.c:3087 ../src/misc.c:1892 ../src/prefs.c:647
+#: ../src/browser.c:3101 ../src/misc.c:1911 ../src/prefs.c:647
 msgid "Comment"
 msgstr "Komentaras"
 
-#: ../src/browser.c:3087 ../src/misc.c:1893 ../src/picture.c:863
+#: ../src/browser.c:3101 ../src/misc.c:1912 ../src/picture.c:1058
 #: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Kompozitorius"
 
-#: ../src/browser.c:3088 ../src/misc.c:1894
+#: ../src/browser.c:3102 ../src/misc.c:1913
 msgid "Original Artist"
 msgstr "Originalus atlikėjas"
 
-#: ../src/browser.c:3089 ../src/misc.c:1895
+#: ../src/browser.c:3103 ../src/misc.c:1914
 msgid "Copyright"
 msgstr "Autorinės teisės"
 
-#: ../src/browser.c:3089 ../src/misc.c:1896
+#: ../src/browser.c:3103 ../src/misc.c:1915
 msgid "URL"
 msgstr "URL"
 
-#: ../src/browser.c:3090 ../src/misc.c:1897
+#: ../src/browser.c:3104 ../src/misc.c:1916
 msgid "Encoded By"
 msgstr "Kodavo"
 
-#: ../src/browser.c:3091
+#: ../src/browser.c:3105
 msgid "# Albums"
 msgstr "# Albumai"
 
-#: ../src/browser.c:3092 ../src/browser.c:3093
+#: ../src/browser.c:3106 ../src/browser.c:3107
 msgid "# Files"
 msgstr "# Failai"
 
-#: ../src/browser.c:3118
+#: ../src/browser.c:3132
 msgid "Enter a directory to browse."
 msgstr "Įveskite kurį aplanką naršyti."
 
-#: ../src/browser.c:3127
+#: ../src/browser.c:3141
 msgid "Select a directory to browse."
 msgstr "Pasirinkite kurį aplanką naršyti."
 
@@ -849,33 +857,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:3134 ../src/easytag.c:3425
+#: ../src/browser.c:3148 ../src/easytag.c:3469
 msgid "No files"
 msgstr "Nėra failų"
 
-#: ../src/browser.c:3212
+#: ../src/browser.c:3226
 msgid "Artist & Album"
 msgstr "Atlikėjas ir albumas"
 
 #. Only directories changed
-#: ../src/browser.c:3576 ../src/easytag.c:2843
+#: ../src/browser.c:3590 ../src/easytag.c:2881
 msgid "Rename Directory"
 msgstr "Pervadinti aplanką"
 
-#: ../src/browser.c:3598
+#: ../src/browser.c:3612
 #, c-format
 msgid "Rename the directory '%s' to:"
 msgstr "Pervadinti aplanką „%s“ į:"
 
-#: ../src/browser.c:3617 ../src/misc.c:1152
+#: ../src/browser.c:3631 ../src/misc.c:1171
 msgid "Use mask:"
 msgstr "Naudoti kaukę:"
 
-#: ../src/browser.c:3620
+#: ../src/browser.c:3634
 msgid "If activated, it will use masks to rename directory."
 msgstr "Jei aktyvuota, aplanko pervadinimui bus naudojami šablonai...."
 
-#: ../src/browser.c:3638
+#: ../src/browser.c:3652
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -884,97 +892,68 @@ msgstr ""
 "pasirinkite arba įveskite šablono kodą (žiūrėkite legendą skenerio lange)."
 
 #. Preview label
-#: ../src/browser.c:3662
+#: ../src/browser.c:3676
 msgid "Rename directory preview"
 msgstr "Pervadinamo aplanko peržiūra"
 
-#: ../src/browser.c:3754
+#: ../src/browser.c:3768
 msgid "You must type a directory name"
 msgstr "Turite nurodyti aplanko pavadinimą"
 
-#: ../src/browser.c:3755 ../src/browser.c:3776
+#: ../src/browser.c:3769 ../src/browser.c:3790
 msgid "Directory Name Error"
 msgstr "Aplanko pavadinimo klaida"
 
-#: ../src/browser.c:3773
+#: ../src/browser.c:3787
 #, c-format
 msgid "Could not convert '%s' into filename encoding."
 msgstr "Nepavyko konvertuoti „%s“ į failo pavadinimo koduotę."
 
-#: ../src/browser.c:3775
+#: ../src/browser.c:3789
 msgid "Please use another name"
 msgstr "Naudokite kitą pavadinimą"
 
-#: ../src/browser.c:3845
+#: ../src/browser.c:3859
 #, c-format
 msgid "The directory name '%s' already exists"
 msgstr "Aplankas „%s“ jau yra"
 
-#: ../src/browser.c:3846 ../src/easytag.c:2926
+#: ../src/browser.c:3860 ../src/easytag.c:2964
 msgid "Rename File Error"
 msgstr "Failo pervadinimo klaida"
 
-#: ../src/browser.c:3884 ../src/browser.c:3913
+#: ../src/browser.c:3898 ../src/browser.c:3927
 msgid "Rename Directory Error"
 msgstr "Aplanko pervadinimo klaida"
 
-#: ../src/browser.c:3951
+#: ../src/browser.c:3965
 msgid "Directory renamed"
 msgstr "Aplankas pervadintas"
 
-#: ../src/browser.c:3987
+#: ../src/browser.c:4001
 msgid "Browse Directory With"
 msgstr "Naršyti aplanką su"
 
-#: ../src/browser.c:4003 ../src/browser.c:4129
+#: ../src/browser.c:4017 ../src/browser.c:4143
 msgid "Program to run:"
 msgstr "Paleisti programą:"
 
-#: ../src/browser.c:4015
+#: ../src/browser.c:4029
 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:4109
+#: ../src/browser.c:4123
 msgid "Open Files With"
 msgstr "Atverti failus su"
 
-#: ../src/browser.c:4141
+#: ../src/browser.c:4155
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Pasirinkite kurią programą vykdyti. JI kaip parametrą gaus esamą failą."
 
-#: ../src/browser.c:4272
-msgid "You must type a program name"
-msgstr "Turite nurodyti programą"
-
-#: ../src/browser.c:4273 ../src/browser.c:4290
-msgid "Program Name Error"
-msgstr "Programos pavadinimo klaida"
-
-#: ../src/browser.c:4288 ../src/misc.c:794
-#, c-format
-msgid "The program '%s' cannot be found"
-msgstr "Programa „%s“ nerasta"
-
-#: ../src/browser.c:4340 ../src/misc.c:840
-#, c-format
-#| msgid "Cannot execute %s (%s)"
-msgid "Cannot execute ‘%s’ (%s)"
-msgstr "Nepavyko įvykdyti „%s“ (%s)"
-
-#: ../src/browser.c:4384 ../src/misc.c:885
-#, c-format
-msgid "Executed command: %s"
-msgstr "Vykdyta komanda: %s"
-
-#: ../src/browser.c:4390 ../src/misc.c:891
-#, c-format
-msgid "Failed to launch program: %s"
-msgstr "Nepavyko paleisti programos: %s"
-
 #: ../src/cddb.c:313
 msgid "Artist / Album"
 msgstr "Atlikėjas / Albumas"
@@ -1064,7 +1043,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:841 ../src/prefs.c:807
+#: ../src/cddb.c:492 ../src/picture.c:1036 ../src/prefs.c:807
 msgid "Other"
 msgstr "Kita"
 
@@ -1158,7 +1137,7 @@ msgstr "Kategorijos"
 msgid "Results:"
 msgstr "Rezultatai:"
 
-#: ../src/cddb.c:606 ../src/misc.c:1931
+#: ../src/cddb.c:606 ../src/misc.c:1950
 msgid "Search:"
 msgstr "Ieškoti:"
 
@@ -1222,7 +1201,7 @@ msgid "# Tracks"
 msgstr "Takelių nr."
 
 #. Check box to run the scanner
-#: ../src/cddb.c:847 ../src/misc.c:2972
+#: ../src/cddb.c:847 ../src/misc.c:2991
 msgid "Run the current scanner for each file"
 msgstr "Dabartinį skenerį vykdyti kiekvienam failui"
 
@@ -1655,46 +1634,46 @@ 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:173
+#: ../src/easytag.c:184
 #, c-format
 msgid "Starting EasyTAG version %s (PID: %d)…"
 msgstr "Paleidžiama EasyTAG versija %s (Pid: %d)…"
 
-#: ../src/easytag.c:175
+#: ../src/easytag.c:186
 #, c-format
 msgid "Using libid3tag version %s"
 msgstr "Naudojama libid3tag versija %s"
 
-#: ../src/easytag.c:178
+#: ../src/easytag.c:189
 #, c-format
 msgid "Using id3lib version %d.%d.%d"
 msgstr "Naudojama id3lib versija %d.%d.%d"
 
-#: ../src/easytag.c:184
+#: ../src/easytag.c:195
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
 msgstr "Kintamasis EASYTAGLANG nustatytas. Nustatoma kalba: „%s“"
 
-#: ../src/easytag.c:186
+#: ../src/easytag.c:197
 #, c-format
 msgid "Setting locale: '%s'"
 msgstr "Nustatoma lokalė: „%s“"
 
-#: ../src/easytag.c:191
+#: ../src/easytag.c:202
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')"
 msgstr "Naudojama lokalė „%s“ (ir galiausiai „%s“)"
 
-#: ../src/easytag.c:198
+#: ../src/easytag.c:209
 msgid "Unable to create setting directories"
 msgstr "Nepavyko paskirties aplankų sukurti"
 
-#: ../src/easytag.c:415 ../src/et_core.c:584
+#: ../src/easytag.c:426 ../src/et_core.c:582
 #, c-format
 msgid "Error while querying information for file: '%s' (%s)"
 msgstr "Klaida užklausiant failo informacijos: „%s“ (%s)"
 
-#: ../src/easytag.c:479
+#: ../src/easytag.c:490
 #, c-format
 msgid "Cannot open path '%s'"
 msgstr "Nepavyko atverti kelio „%s“"
@@ -1702,11 +1681,11 @@ msgstr "Nepavyko atverti kelio „%s“"
 #.
 #. * Browser
 #.
-#: ../src/easytag.c:571 ../src/prefs.c:142
+#: ../src/easytag.c:582 ../src/prefs.c:142
 msgid "Browser"
 msgstr "Naršyklė"
 
-#: ../src/easytag.c:593 ../src/et_core.c:2728
+#: ../src/easytag.c:604 ../src/et_core.c:2774
 msgid "File"
 msgstr "Failas"
 
@@ -1716,381 +1695,381 @@ msgstr "Failas"
 #. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
 #. Version changed to encoder version
 #. Encoder version
-#: ../src/easytag.c:625 ../src/easytag.c:4153 ../src/flac_header.c:201
+#: ../src/easytag.c:636 ../src/easytag.c:4197 ../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
 #, c-format
 msgid "Encoder:"
 msgstr "Kodavimas:"
 
-#: ../src/easytag.c:633
+#: ../src/easytag.c:644
 msgid "Bitrate:"
 msgstr "Bitų dažnis:"
 
 #. Translators: Please try to keep this string as short as possible as it
 #. * is shown in a narrow column.
-#: ../src/easytag.c:643
+#: ../src/easytag.c:654
 msgid "Frequency:"
 msgstr "Dažnis:"
 
 #. Mode
-#: ../src/easytag.c:654 ../src/easytag.c:4157 ../src/mpeg_header.c:216
+#: ../src/easytag.c:665 ../src/easytag.c:4201 ../src/mpeg_header.c:216
 msgid "Mode:"
 msgstr "Režimas:"
 
-#: ../src/easytag.c:661
+#: ../src/easytag.c:672
 msgid "Size:"
 msgstr "Dydis:"
 
-#: ../src/easytag.c:668
+#: ../src/easytag.c:679
 msgid "Duration:"
 msgstr "Trukmė:"
 
 #. Main Frame
-#: ../src/easytag.c:715 ../src/et_core.c:2666
+#: ../src/easytag.c:726 ../src/et_core.c:2712
 msgid "Tag"
 msgstr "Žyma"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: ../src/easytag.c:737
+#: ../src/easytag.c:748
 msgid "Common"
 msgstr "Bendra"
 
 #. Title
-#: ../src/easytag.c:744
+#: ../src/easytag.c:755
 msgid "Title:"
 msgstr "Pavadinimas:"
 
-#: ../src/easytag.c:758
+#: ../src/easytag.c:769
 msgid "Tag selected files with this title"
 msgstr "Žymėti pasirinktus failus su šiuo pavadinimu"
 
 #. Artist
-#: ../src/easytag.c:763
+#: ../src/easytag.c:774
 msgid "Artist:"
 msgstr "Atlikėjas:"
 
-#: ../src/easytag.c:777
+#: ../src/easytag.c:788
 msgid "Tag selected files with this artist"
 msgstr "Žymėti pasirinktus failus su šiuo atlikėju"
 
 #. Album Artist
-#: ../src/easytag.c:782
+#: ../src/easytag.c:793
 msgid "Album artist:"
 msgstr "Albumo atlikėjas:"
 
-#: ../src/easytag.c:796
+#: ../src/easytag.c:807
 msgid "Tag selected files with this album artist"
 msgstr "Žymėti pasirinktus failus su šiuo albumo atlikėju"
 
 #. Album
-#: ../src/easytag.c:801
+#: ../src/easytag.c:812
 msgid "Album:"
 msgstr "Albumas:"
 
-#: ../src/easytag.c:815
+#: ../src/easytag.c:826
 msgid "Tag selected files with this album name"
 msgstr "Žymėti pasirinktus failus su šiuo albumo pavadinimu"
 
 #. Disc Number
-#: ../src/easytag.c:820
+#: ../src/easytag.c:831
 msgid "CD:"
 msgstr "CD:"
 
-#: ../src/easytag.c:837
+#: ../src/easytag.c:848
 msgid "Tag selected files with this disc number"
 msgstr "Žymėti pasirinktus failus su šiuo disko numeriu"
 
 #. Year
-#: ../src/easytag.c:842
+#: ../src/easytag.c:853
 msgid "Year:"
 msgstr "Metai:"
 
-#: ../src/easytag.c:862
+#: ../src/easytag.c:873
 msgid "Tag selected files with this year"
 msgstr "Žymėti pasirinktus failus su šiais metais"
 
-#: ../src/easytag.c:876
+#: ../src/easytag.c:887
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr "Sunumeruoti pasirinktus takelius. Prasideda 01 kiekviename aplanke."
 
 #. To have enough space to display the icon
 #. To have enough space to display the icon
-#: ../src/easytag.c:885
+#: ../src/easytag.c:896
 msgid "Track #:"
 msgstr "Takelio nr.:"
 
-#: ../src/easytag.c:916
+#: ../src/easytag.c:927
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr "Nustatykite failų skaičių tame pačiame aplanke kaip ir rodomas failas."
 
-#: ../src/easytag.c:936
+#: ../src/easytag.c:947
 msgid "Tag selected files with this number of tracks"
 msgstr "Žymėti pasirinktus failus su šiuo takelių numeriu"
 
 #. Genre
-#: ../src/easytag.c:940
+#: ../src/easytag.c:951
 msgid "Genre:"
 msgstr "Žanras:"
 
-#: ../src/easytag.c:968
+#: ../src/easytag.c:979
 msgid "Tag selected files with this genre"
 msgstr "Žymėti pasirinktus failus su šiuo žanru"
 
 #. Comment
-#: ../src/easytag.c:973
+#: ../src/easytag.c:984
 msgid "Comment:"
 msgstr "Komentaras:"
 
-#: ../src/easytag.c:1000
+#: ../src/easytag.c:1011
 msgid "Tag selected files with this comment"
 msgstr "Žymėti pasirinktus failus su šiuo komentaru"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. Composer (name of the composers)
-#: ../src/easytag.c:1007
+#: ../src/easytag.c:1018
 msgid "Composer:"
 msgstr "Kompozitorius:"
 
-#: ../src/easytag.c:1021
+#: ../src/easytag.c:1032
 msgid "Tag selected files with this composer"
 msgstr "Žymėti pasirinktus failus su šiuo kompozitoriumi"
 
 #. 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:1028
+#: ../src/easytag.c:1039
 msgid "Orig. artist:"
 msgstr "Orig. atlikėjas:"
 
-#: ../src/easytag.c:1042
+#: ../src/easytag.c:1053
 msgid "Tag selected files with this original artist"
 msgstr "Žymėti pasirinktus failus su šiuo originaliu atlikėju"
 
 #. Copyright
-#: ../src/easytag.c:1048
+#: ../src/easytag.c:1059
 msgid "Copyright:"
 msgstr "Autorinės teisės:"
 
-#: ../src/easytag.c:1062
+#: ../src/easytag.c:1073
 msgid "Tag selected files with this copyright"
 msgstr "Žymėti pasirinktus failus su šiomis autorinėmis teisėmis"
 
 #. URL
-#: ../src/easytag.c:1068
+#: ../src/easytag.c:1079
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/easytag.c:1082
+#: ../src/easytag.c:1093
 msgid "Tag selected files with this URL"
 msgstr "Žymėti pasirinktus failus su šiuo URL"
 
 #. Encoded by
-#: ../src/easytag.c:1088
+#: ../src/easytag.c:1099
 msgid "Encoded by:"
 msgstr "Kodavimas:"
 
-#: ../src/easytag.c:1102
+#: ../src/easytag.c:1113
 msgid "Tag selected files with this encoder name"
 msgstr "Žymėti pasirinktus failus su šiuo kodavimu"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1136 ../src/et_core.c:3101 ../src/et_core.c:3104
+#: ../src/easytag.c:1147 ../src/et_core.c:3146 ../src/et_core.c:3149
 msgid "Images"
 msgstr "Paveikslėliai"
 
-#: ../src/easytag.c:1160
+#: ../src/easytag.c:1171
 msgid "You can use drag and drop to add an image"
 msgstr "Norėdami pridėti paveikslėlį galite atvilkti ir numesti jį"
 
-#: ../src/easytag.c:1207
+#: ../src/easytag.c:1218
 msgid "Add images to the tag"
 msgstr "Pridėti paveikslėlius žymai"
 
-#: ../src/easytag.c:1225
+#: ../src/easytag.c:1236
 msgid "Remove selected images from the tag"
 msgstr "Pašalinti pasirinktus paveikslėlius iš žymos"
 
-#: ../src/easytag.c:1239
+#: ../src/easytag.c:1250
 msgid "Save the selected images to files"
 msgstr "Įrašyti pasirinktus paveikslėlius į failus"
 
-#: ../src/easytag.c:1250
+#: ../src/easytag.c:1261
 msgid "Edit image properties"
 msgstr "Keisti paveikslėlio savybes"
 
-#: ../src/easytag.c:1264
+#: ../src/easytag.c:1275
 msgid "Tag selected files with these images"
 msgstr "Žymėti pasirinktus failus su šiais paveikslėliais"
 
-#: ../src/easytag.c:1322
+#: ../src/easytag.c:1333
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Pasirinkti failai sužymėti su pavadinimu „%s“."
 
-#: ../src/easytag.c:1324
+#: ../src/easytag.c:1335
 msgid "Removed title from selected files."
 msgstr "Iš pasirinktų failų pašalintas pavadinimas."
 
-#: ../src/easytag.c:1339
+#: ../src/easytag.c:1350
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Pasirinkti failai sužymėti su atlikėju „%s“."
 
-#: ../src/easytag.c:1341
+#: ../src/easytag.c:1352
 msgid "Removed artist from selected files."
 msgstr "Iš pasirinktų failų pašalintas atlikėjas."
 
-#: ../src/easytag.c:1355
+#: ../src/easytag.c:1366
 #, c-format
 msgid "Selected files tagged with album artist '%s'."
 msgstr "Pasirinkti failai sužymėti su albumo atlikėju „%s“."
 
-#: ../src/easytag.c:1357
+#: ../src/easytag.c:1368
 msgid "Removed album artist from selected files."
 msgstr "Iš pasirinktų failų pašalintas albumo atlikėjas."
 
-#: ../src/easytag.c:1372
+#: ../src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Pasirinkti failai sužymėti su albumu „%s“."
 
-#: ../src/easytag.c:1374
+#: ../src/easytag.c:1385
 msgid "Removed album name from selected files."
 msgstr "Iš pasirinktų failų pašalintas albumas."
 
-#: ../src/easytag.c:1411
+#: ../src/easytag.c:1422
 #, c-format
 msgid "Selected files tagged with disc number '%s/%s'."
 msgstr "Pasirinkti failai sužymėti su disko numeriu „%s/%s“."
 
-#: ../src/easytag.c:1416
+#: ../src/easytag.c:1427
 #, c-format
 msgid "Selected files tagged with disc number like 'xx'."
 msgstr "Pasirinkti failai sužymėti su disko numeriu „xx“."
 
-#: ../src/easytag.c:1421
+#: ../src/easytag.c:1432
 msgid "Removed disc number from selected files."
 msgstr "Iš pasirinktų failų pašalintas disko numeris."
 
-#: ../src/easytag.c:1437
+#: ../src/easytag.c:1448
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Pasirinkti failai sužymėti su metais „%s“."
 
-#: ../src/easytag.c:1439
+#: ../src/easytag.c:1450
 msgid "Removed year from selected files."
 msgstr "Iš pasirinktų failų pašalinti metai."
 
-#: ../src/easytag.c:1465 ../src/easytag.c:1555
+#: ../src/easytag.c:1476 ../src/easytag.c:1567
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Pasirinkti failai sužymėti su takeliu „xx/%s“."
 
-#: ../src/easytag.c:1468
+#: ../src/easytag.c:1479
 #, c-format
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Pasirinkti failai sužymėti su takeliu „xx“."
 
-#: ../src/easytag.c:1472 ../src/easytag.c:1558
+#: ../src/easytag.c:1483 ../src/easytag.c:1570
 msgid "Removed track number from selected files."
 msgstr "Iš pasirinktų failų pašalintas takelio numeris."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1528
+#: ../src/easytag.c:1540
 #, c-format
 msgid "Selected tracks numbered sequentially."
 msgstr "Pasirinkti failai sunumeruoti iš eilės."
 
-#: ../src/easytag.c:1574
+#: ../src/easytag.c:1586
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Pasirinkti failai sužymėti su žanru „%s“."
 
-#: ../src/easytag.c:1576
+#: ../src/easytag.c:1588
 msgid "Removed genre from selected files."
 msgstr "Iš pasirinktų failų pašalintas žanras."
 
-#: ../src/easytag.c:1598
+#: ../src/easytag.c:1610
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Pasirinkti failai sužymėti su komentaru „%s“."
 
-#: ../src/easytag.c:1600
+#: ../src/easytag.c:1612
 msgid "Removed comment from selected files."
 msgstr "Iš pasirinktų failų pašalintas komentaras."
 
-#: ../src/easytag.c:1614
+#: ../src/easytag.c:1626
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Pasirinkti failai sužymėti su kompozitoriumi „%s“."
 
-#: ../src/easytag.c:1616
+#: ../src/easytag.c:1628
 msgid "Removed composer from selected files."
 msgstr "Iš pasirinktų failų pašalintas kompozitorius."
 
-#: ../src/easytag.c:1631
+#: ../src/easytag.c:1643
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Pasirinkti failai sužymėti su originaliu atlikėju „%s“."
 
-#: ../src/easytag.c:1633
+#: ../src/easytag.c:1645
 msgid "Removed original artist from selected files."
 msgstr "Iš pasirinktų failų pašalintas originalus atlikėjas."
 
-#: ../src/easytag.c:1648
+#: ../src/easytag.c:1660
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Pasirinkti failai sužymėti su autorinėmis teisėmis „%s“."
 
-#: ../src/easytag.c:1650
+#: ../src/easytag.c:1662
 msgid "Removed copyright from selected files."
 msgstr "Iš pasirinktų failų pašalintos autorinės teisės."
 
-#: ../src/easytag.c:1665
+#: ../src/easytag.c:1677
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Pasirinkti failai sužymėti su URL „%s“."
 
-#: ../src/easytag.c:1667
+#: ../src/easytag.c:1679
 msgid "Removed URL from selected files."
 msgstr "Iš pasirinktų failų pašalintas URL."
 
-#: ../src/easytag.c:1682
+#: ../src/easytag.c:1694
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Pasirinkti failai sužymėti su kodavimu „%s“."
 
-#: ../src/easytag.c:1684
+#: ../src/easytag.c:1696
 msgid "Removed encoder name from selected files."
 msgstr "Iš pasirinktų failų pašalintas kodavimas."
 
-#: ../src/easytag.c:1716
+#: ../src/easytag.c:1728
 msgid "Selected files tagged with images."
 msgstr "Pasirinkti failai sužymėti su paveikslėliais."
 
-#: ../src/easytag.c:1718
+#: ../src/easytag.c:1730
 msgid "Removed images from selected files."
 msgstr "Iš pasirinktų failų pašalinti paveikslėliai."
 
-#: ../src/easytag.c:1999
+#: ../src/easytag.c:2011
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Pasirinkite režimą ir šabloną ir pakartokite tą patį veiksmą"
 
-#: ../src/easytag.c:2051
+#: ../src/easytag.c:2063
 msgid "All tags have been scanned"
 msgstr "Visos žymos nuskaitytos"
 
-#: ../src/easytag.c:2107
+#: ../src/easytag.c:2119
 msgid "All tags have been removed"
 msgstr "Visos žymos pašalintos"
 
-#: ../src/easytag.c:2397
+#: ../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."
@@ -2098,153 +2077,153 @@ msgstr[0] "%d failas buvo pakeistas išorinės programos."
 msgstr[1] "%d failai buvo pakeisti išorinės programos."
 msgstr[2] "%d failų buvo pakeista išorinės programos."
 
-#: ../src/easytag.c:2402
+#: ../src/easytag.c:2429
 msgid "Do you want to continue saving the file?"
 msgstr "Ar norite tęsti failo įrašymą?"
 
-#: ../src/easytag.c:2457 ../src/easytag.c:2477
+#: ../src/easytag.c:2487 ../src/easytag.c:2507
 msgid "Saving files was stopped"
 msgstr "Failų įrašymas sustabdytas"
 
-#: ../src/easytag.c:2479
+#: ../src/easytag.c:2509
 msgid "All files have been saved"
 msgstr "Visi failai įrašyti"
 
-#: ../src/easytag.c:2610
+#: ../src/easytag.c:2644
 #, c-format
 msgid "Cannot delete file (%s)"
 msgstr "Nepavyko ištrinti failo (%s)"
 
-#: ../src/easytag.c:2630
+#: ../src/easytag.c:2665
 msgid "Files have been partially deleted"
 msgstr "Failai buvo iš dalies ištrinti"
 
-#: ../src/easytag.c:2632
+#: ../src/easytag.c:2667
 msgid "All files have been deleted"
 msgstr "Visi failai pašalinti"
 
-#: ../src/easytag.c:2748
+#: ../src/easytag.c:2783
 #, c-format
 msgid "Do you want to write the tag of file '%s'?"
 msgstr "Ar norite įrašyti failo „%s“ žymą?"
 
-#: ../src/easytag.c:2750
+#: ../src/easytag.c:2785
 msgid "Confirm Tag Writing"
 msgstr "Patvirtinkite žymos įrašymą"
 
-#: ../src/easytag.c:2755 ../src/easytag.c:2872 ../src/easytag.c:3132
+#: ../src/easytag.c:2790 ../src/easytag.c:2910 ../src/easytag.c:3173
 msgid "Repeat action for the remaining files"
 msgstr "Kartoti veiksmą ir likusiems failams"
 
 #. Directories and filename changed
-#: ../src/easytag.c:2836 ../src/scan.c:181
+#: ../src/easytag.c:2874 ../src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Pervadinti failą ir aplanką"
 
-#: ../src/easytag.c:2837
+#: ../src/easytag.c:2875
 msgid "File and directory rename confirmation required"
 msgstr "Reikia patvirtinti failo ir aplanko pervadinimą"
 
-#: ../src/easytag.c:2838
+#: ../src/easytag.c:2876
 #, c-format
 msgid "Do you want to rename the file and directory '%s' to '%s'?"
 msgstr "Ar norite pervadinti failą ir aplanką „%s“ į „%s“?"
 
-#: ../src/easytag.c:2844
+#: ../src/easytag.c:2882
 msgid "Directory rename confirmation required"
 msgstr "Reikia patvirtinti aplanko pervadinimą"
 
-#: ../src/easytag.c:2845
+#: ../src/easytag.c:2883
 #, c-format
 msgid "Do you want to rename the directory '%s' to '%s'?"
 msgstr "Ar norite pervadinti aplanką „%s“ į „%s“?"
 
 #. Only filename changed
-#: ../src/easytag.c:2851
+#: ../src/easytag.c:2889
 msgid "Rename File"
 msgstr "Pervadinti failą"
 
-#: ../src/easytag.c:2852
+#: ../src/easytag.c:2890
 msgid "File rename confirmation required"
 msgstr "Reikia patvirtinti failo pervadinimą"
 
-#: ../src/easytag.c:2853
+#: ../src/easytag.c:2891
 #, c-format
 msgid "Do you want to rename the file '%s' to '%s'?"
 msgstr "Ar norite pervadinti failą „%s“ į „%s“?"
 
-#: ../src/easytag.c:2919
+#: ../src/easytag.c:2957
 #, c-format
 msgid "Cannot rename file '%s' to '%s'"
 msgstr "Nepavyko pervadinti failo „%s“ į „%s“"
 
-#: ../src/easytag.c:2933
+#: ../src/easytag.c:2971
 #, c-format
 msgid "Cannot rename file '%s' to '%s': %s"
 msgstr "Nepavyko pervadinti failo „%s“ į „%s“: %s"
 
-#: ../src/easytag.c:2937
+#: ../src/easytag.c:2975
 msgid "File(s) not renamed"
 msgstr "Failas(-ai) nepervadinti"
 
-#: ../src/easytag.c:3046
+#: ../src/easytag.c:3087
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Įrašoma „%s“ žyma"
 
-#: ../src/easytag.c:3053
+#: ../src/easytag.c:3094
 msgid "Tag(s) written"
 msgstr "Žyma(-os) įrašyta"
 
-#: ../src/easytag.c:3068
+#: ../src/easytag.c:3109
 #, c-format
 msgid "Cannot write tag in file '%s' (%s)"
 msgstr "Faile „%s“ įrašyti žymos nepavyko (%s)"
 
-#: ../src/easytag.c:3081
+#: ../src/easytag.c:3122
 #, c-format
 msgid "Cannot write tag in file '%s'"
 msgstr "Įrašyti žymų faile „%s“ nepavyko"
 
-#: ../src/easytag.c:3084
+#: ../src/easytag.c:3125
 msgid "Tag Write Error"
 msgstr "Žymų rašymo klaida"
 
-#: ../src/easytag.c:3129 ../src/easytag.c:3143
+#: ../src/easytag.c:3170 ../src/easytag.c:3184
 #, c-format
 msgid "Do you really want to delete the file '%s'?"
 msgstr "Ar tikrai norite ištrinti failą „%s“?"
 
-#: ../src/easytag.c:3135 ../src/easytag.c:3145
+#: ../src/easytag.c:3176 ../src/easytag.c:3186
 msgid "Delete File"
 msgstr "Ištrinti failą"
 
-#: ../src/easytag.c:3170
+#: ../src/easytag.c:3211
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Failas „%s“ pašalintas"
 
-#: ../src/easytag.c:3302
+#: ../src/easytag.c:3346
 #, c-format
 msgid "Cannot read directory '%s'"
 msgstr "Nepavyko perskaityti aplanko „%s“"
 
-#: ../src/easytag.c:3306
+#: ../src/easytag.c:3350
 msgid "Directory Read Error"
 msgstr "Aplanko skaitymo klaida"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3327
+#: ../src/easytag.c:3371
 #, c-format
 msgid "Search in progress…"
 msgstr "Ieškoma…"
 
-#: ../src/easytag.c:3350 ../src/et_core.c:2735
+#: ../src/easytag.c:3394 ../src/et_core.c:2781
 #, c-format
 msgid "File: '%s'"
 msgstr "Failas: „%s“"
 
-#: ../src/easytag.c:3400
+#: ../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"
@@ -2252,7 +2231,7 @@ msgstr[0] "Šiame aplanke ir poaplankiuose rastas %d failas."
 msgstr[1] "Šiame aplanke ir poaplankiuose rasti %d failai."
 msgstr[2] "Šiame aplanke ir poaplankiuose rasta %d failų."
 
-#: ../src/easytag.c:3407
+#: ../src/easytag.c:3451
 #, c-format
 msgid "Found one file in this directory"
 msgid_plural "Found %d files in this directory"
@@ -2260,178 +2239,178 @@ msgstr[0] "Šiame aplanke rastas %d failas."
 msgstr[1] "Šiame aplanke rasti %d failai."
 msgstr[2] "Šiame aplanke rasta %d failų."
 
-#: ../src/easytag.c:3429
+#: ../src/easytag.c:3473
 msgid "No file found in this directory and subdirectories"
 msgstr "Šiame aplanke ir poaplankiuose failų nerasta"
 
-#: ../src/easytag.c:3431
+#: ../src/easytag.c:3475
 msgid "No file found in this directory"
 msgstr "Šiame aplanke failų nerasta"
 
-#: ../src/easytag.c:3499
+#: ../src/easytag.c:3543
 #, c-format
 msgid "Error opening directory '%s' (%s)"
 msgstr "Klaida atveriant aplanką „%s“ (%s)"
 
-#: ../src/easytag.c:3535
+#: ../src/easytag.c:3579
 #, c-format
 msgid "Cannot read directory (%s)"
 msgstr "Nepavyko perskaityti aplanko (%s)"
 
-#: ../src/easytag.c:3555
+#: ../src/easytag.c:3599
 msgid "Searching for audio files…"
 msgstr "Ieškoma garso failų…"
 
-#: ../src/easytag.c:3556
+#: ../src/easytag.c:3600
 msgid "Searching"
 msgstr "Ieškoma"
 
-#: ../src/easytag.c:4187
+#: ../src/easytag.c:4231
 msgid "Select a directory to browse"
 msgstr "Pasirinkite, kurį aplanką naršyti"
 
 #. Menu items
-#: ../src/easytag.c:4334
+#: ../src/easytag.c:4378
 msgid "Tag selected files with this field"
 msgstr "Pažymėti pasirinktus failus su šiuo laukeliu"
 
-#: ../src/easytag.c:4346 ../src/scan.c:2654
+#: ../src/easytag.c:4390 ../src/scan.c:2654
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Konvertuoti „_“ ir „%20“ į tarpus"
 
-#: ../src/easytag.c:4353 ../src/scan.c:2656
+#: ../src/easytag.c:4397 ../src/scan.c:2656
 msgid "Convert ' ' to '_'"
 msgstr "Konvertuoti „ “ į „_“"
 
-#: ../src/easytag.c:4364
+#: ../src/easytag.c:4408
 msgid "All uppercase"
 msgstr "Visos didžiosios"
 
-#: ../src/easytag.c:4371
+#: ../src/easytag.c:4415
 msgid "All lowercase"
 msgstr "Visos mažosios"
 
-#: ../src/easytag.c:4378
+#: ../src/easytag.c:4422
 msgid "First letter uppercase"
 msgstr "Pirma raidė – didžioji"
 
-#: ../src/easytag.c:4385
+#: ../src/easytag.c:4429
 msgid "First letter uppercase of each word"
 msgstr "Kiekvieno žodžio pirma raidė – didžioji"
 
-#: ../src/easytag.c:4396 ../src/prefs.c:1023 ../src/scan.c:2754
+#: ../src/easytag.c:4440 ../src/prefs.c:1023 ../src/scan.c:2754
 msgid "Remove spaces"
 msgstr "Pašalinti tarpus"
 
-#: ../src/easytag.c:4403
+#: ../src/easytag.c:4447
 msgid "Insert space before uppercase letter"
 msgstr "Prieš didžiąją raidę įterpti tarpą"
 
-#: ../src/easytag.c:4410
+#: ../src/easytag.c:4454
 msgid "Remove duplicate spaces or underscores"
 msgstr "Pašalinti dvigubus tarpus ar pabraukimo simbolius"
 
-#: ../src/easytag.c:4417
+#: ../src/easytag.c:4461
 msgid "Remove all text"
 msgstr "Pašalinti visą tekstą"
 
-#: ../src/easytag.c:4436
+#: ../src/easytag.c:4480
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Normalus išėjimas."
 
-#: ../src/easytag.c:4488
+#: ../src/easytag.c:4532
 msgid "Do you want to save them before quitting?"
 msgstr "Ar norite juos įrašyti prieš išeidami?"
 
-#: ../src/easytag.c:4511
+#: ../src/easytag.c:4559
 msgid "Do you really want to quit?"
 msgstr "Ar tikrai norite palikti programą?"
 
-#: ../src/et_core.c:506
+#: ../src/et_core.c:504
 #, c-format
 msgid "Error reading tag from ogg file (%s)"
 msgstr "Klaida skaitant žymą iš ogg failo (%s)"
 
-#: ../src/et_core.c:640
+#: ../src/et_core.c:656
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr "Failui „%s“ pritaikyti automatiniai pataisymai."
 
-#: ../src/et_core.c:2632
+#: ../src/et_core.c:2678
 msgid "ID3 Tag"
 msgstr "ID3 žyma"
 
-#: ../src/et_core.c:2638
+#: ../src/et_core.c:2684
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis žyma"
 
-#: ../src/et_core.c:2644
+#: ../src/et_core.c:2690
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis žyma"
 
-#: ../src/et_core.c:2649
+#: ../src/et_core.c:2695
 msgid "APE Tag"
 msgstr "APE žyma"
 
-#: ../src/et_core.c:2654
+#: ../src/et_core.c:2700
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC žyma"
 
-#: ../src/et_core.c:2660
+#: ../src/et_core.c:2706
 msgid "Wavpack Tag"
 msgstr "Wavpack žyma"
 
-#: ../src/et_core.c:2680
+#: ../src/et_core.c:2726
 msgid "MP3 File"
 msgstr "MP3 failas"
 
-#: ../src/et_core.c:2684
+#: ../src/et_core.c:2730
 msgid "MP2 File"
 msgstr "MP2 failas"
 
-#: ../src/et_core.c:2690
+#: ../src/et_core.c:2736
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis failas"
 
-#: ../src/et_core.c:2696
+#: ../src/et_core.c:2742
 msgid "Speex File"
 msgstr "Speex failas"
 
-#: ../src/et_core.c:2702
+#: ../src/et_core.c:2748
 msgid "FLAC File"
 msgstr "FLAC failas"
 
-#: ../src/et_core.c:2707
+#: ../src/et_core.c:2753
 msgid "MusePack File"
 msgstr "MusePack failas"
 
-#: ../src/et_core.c:2711
+#: ../src/et_core.c:2757
 msgid "Monkey's Audio File"
 msgstr "Monkey's Audio failas"
 
-#: ../src/et_core.c:2716
+#: ../src/et_core.c:2762
 msgid "MP4/AAC File"
 msgstr "MP4/AAC failas"
 
-#: ../src/et_core.c:2722
+#: ../src/et_core.c:2768
 msgid "Wavpack File"
 msgstr "Wavpack failas"
 
-#: ../src/et_core.c:2779 ../src/et_core.c:2834
+#: ../src/et_core.c:2825 ../src/et_core.c:2880
 msgid "File not found"
 msgstr "Failas nerastas"
 
-#: ../src/et_core.c:2784
+#: ../src/et_core.c:2830
 #, c-format
 msgid "Cannot query file information (%s)"
 msgstr "Nepavyko užklausti failo informacijos (%s)"
 
-#: ../src/et_core.c:2818
+#: ../src/et_core.c:2864
 msgid "Read-only file"
 msgstr "Failas tik skaitymui"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2882
+#: ../src/et_core.c:2928
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
@@ -2439,13 +2418,13 @@ msgstr[0] "%u failas"
 msgstr[1] "%u failai"
 msgstr[2] "%u failų"
 
-#: ../src/et_core.c:3087
+#: ../src/et_core.c:3132
 #, c-format
 msgid "Images (%d)"
 msgstr "Paveikslėliai (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3129 ../src/flac_header.c:205
+#: ../src/et_core.c:3174 ../src/flac_header.c:205
 #: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
 #: ../src/mpeg_header.c:206 ../src/musepack_header.c:88
 #: ../src/ogg_header.c:401 ../src/wavpack_header.c:78
@@ -2454,7 +2433,7 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: ../src/et_core.c:3134 ../src/flac_header.c:210
+#: ../src/et_core.c:3179 ../src/flac_header.c:210
 #: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
 #: ../src/mpeg_header.c:211 ../src/musepack_header.c:93
 #: ../src/ogg_header.c:406 ../src/wavpack_header.c:83
@@ -2462,27 +2441,22 @@ msgstr "%d kb/s"
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/et_core.c:3277 ../src/scan.c:690
+#: ../src/et_core.c:3322 ../src/scan.c:690
 #, 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:3279
+#: ../src/et_core.c:3324
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Pabandykite nustatyti aplinkos kintamąjį G_FILENAME_ENCODING."
 
-#: ../src/et_core.c:3280 ../src/scan.c:692
+#: ../src/et_core.c:3325 ../src/scan.c:692
 msgid "Filename translation"
 msgstr "Failo vardo vertimas"
 
-#: ../src/et_core.c:3941
-#, c-format
-msgid "Cannot change the permissions of file '%s' (%s)"
-msgstr "Nepavyko pakeisti failo „%s“ leidimų (%s)"
-
-#: ../src/et_core.c:3979
+#: ../src/et_core.c:4025
 #, c-format
 msgid "Error writing tag type %d to file %s (%s)"
 msgstr "Klaida rašant %d tipo žymą į failą %s (%s)"
@@ -2501,7 +2475,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:347
+#: ../src/flac_tag.c:352 ../src/ogg_tag.c:411
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
@@ -2520,7 +2494,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:922
+#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1151
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Žyma „%s“ įrašyta"
@@ -2543,27 +2517,27 @@ msgstr ""
 msgid "Corrupted file"
 msgstr "Sugadintas failas"
 
-#: ../src/id3_tag.c:540
+#: ../src/id3_tag.c:555
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "„%s“ žyma pašalinta"
 
-#: ../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 "Klaida šalinant „%s“ ID3v1 žymę (%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 "Klaida šalinant „%s“ ID3v2 žymę (%s)"
 
-#: ../src/id3_tag.c:565
+#: ../src/id3_tag.c:580
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Klaida atnaujinat „%s“ ID3v2 žymę (%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"
@@ -2571,7 +2545,7 @@ msgstr ""
 "Bandėte įrašyti šią žymą kaip unikodą, bet buvo aptikta, kad jūsų id3lib "
 "versija yra su klaidomis"
 
-#: ../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 "
@@ -2590,90 +2564,90 @@ msgstr ""
 "\n"
 "Failas: %s"
 
-#: ../src/id3_tag.c:602
+#: ../src/id3_tag.c:617
 msgid "Buggy id3lib"
 msgstr "Klaidinga id3lib"
 
-#: ../src/id3_tag.c:636
+#: ../src/id3_tag.c:651
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Klaida atnaujinant ID3v1 „%s“ žymę (%s)"
 
-#: ../src/id3_tag.c:650 ../src/id3v24_tag.c:1050
+#: ../src/id3_tag.c:665 ../src/id3v24_tag.c:1048
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Atnaujinta „%s“ žyma"
 
-#: ../src/id3_tag.c:669
+#: ../src/id3_tag.c:684
 msgid "No error reported"
 msgstr "Neaptikta jokių klaidų"
 
-#: ../src/id3_tag.c:671
+#: ../src/id3_tag.c:686
 msgid "No available memory"
 msgstr "Nėra prieinamos atminties"
 
-#: ../src/id3_tag.c:673
+#: ../src/id3_tag.c:688
 msgid "No data to parse"
 msgstr "Nėra duomenų apdrojimui"
 
-#: ../src/id3_tag.c:675
+#: ../src/id3_tag.c:690
 msgid "Improperly formatted data"
 msgstr "Netinkamai suformuoti duomenys"
 
-#: ../src/id3_tag.c:677
+#: ../src/id3_tag.c:692
 msgid "No buffer to write to"
 msgstr "Nėra buferio rašymui"
 
-#: ../src/id3_tag.c:679
+#: ../src/id3_tag.c:694
 msgid "Buffer is too small"
 msgstr "Buferis per mažas"
 
-#: ../src/id3_tag.c:681
+#: ../src/id3_tag.c:696
 msgid "Invalid frame ID"
 msgstr "Netinkamas kadro ID"
 
-#: ../src/id3_tag.c:683
+#: ../src/id3_tag.c:698
 msgid "Requested field not found"
 msgstr "Pageidaujamas laukelis nerastas"
 
-#: ../src/id3_tag.c:685
+#: ../src/id3_tag.c:700
 msgid "Unknown field type"
 msgstr "Nežinomas laukelio tipas"
 
-#: ../src/id3_tag.c:687
+#: ../src/id3_tag.c:702
 msgid "Tag is already attached to a file"
 msgstr "Žyma jau susieta su failu"
 
-#: ../src/id3_tag.c:689
+#: ../src/id3_tag.c:704
 msgid "Invalid tag version"
 msgstr "Netinkama žymos versija"
 
-#: ../src/id3_tag.c:691
+#: ../src/id3_tag.c:706
 msgid "No file to parse"
 msgstr "Nėra failo apdorojimui"
 
-#: ../src/id3_tag.c:693
+#: ../src/id3_tag.c:708
 msgid "Attempting to write to a read-only file"
 msgstr "Bandoma rašyti į tik skaitomą failą"
 
-#: ../src/id3_tag.c:695
+#: ../src/id3_tag.c:710
 msgid "Error in compression/uncompression"
 msgstr "Klaida suspaudime/išskleidime"
 
-#: ../src/id3_tag.c:697
+#: ../src/id3_tag.c:712
 msgid "Unknown error message"
 msgstr "Nežinomas klaidos pranešimas"
 
-#: ../src/id3_tag.c:1301
+#: ../src/id3_tag.c:1316
 #, c-format
 msgid "Error while creating temporary file: '%s'"
 msgstr "Klaida kuriant laikiną failą: „%s“"
 
-#: ../src/id3_tag.c:1308
+#: ../src/id3_tag.c:1323
 msgid "Error while creating temporary file"
 msgstr "Klaida kuriant laikiną failą"
 
-#: ../src/id3_tag.c:1328
+#: ../src/id3_tag.c:1343
 #, c-format
 msgid "Error while writing to file: '%s' (%s)"
 msgstr "Klaida rašant į failą: „%s“ (%s)"
@@ -2683,7 +2657,7 @@ msgstr "Klaida rašant į failą: „%s“ (%s)"
 #. * missing (not read for some reason) while reading from
 #. * the file.
 #.
-#: ../src/id3v24_tag.c:1505
+#: ../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)"
@@ -2691,12 +2665,12 @@ msgstr[0] "Faile „%s“ įrašyti žymos nepavyko (trūksta %s baito)"
 msgstr[1] "Faile „%s“ įrašyti žymos nepavyko (trūksta %s baitų)"
 msgstr[2] "Faile „%s“ įrašyti žymos nepavyko (trūksta %s baitų)"
 
-#: ../src/id3v24_tag.c:1526
+#: ../src/id3v24_tag.c:1524
 #, c-format
 msgid "Cannot save tag of file '%s'"
 msgstr "Nepavyko įrašyti failo „%s“ žymos"
 
-#: ../src/id3v24_tag.c:1537
+#: ../src/id3v24_tag.c:1535
 #, c-format
 msgid "Size error while saving tag of '%s'"
 msgstr "Dydžio klaida įrašant „%s“ žymą"
@@ -2705,44 +2679,54 @@ msgstr "Dydžio klaida įrašant „%s“ žymą"
 msgid "Log"
 msgstr "Žurnalas"
 
-#: ../src/misc.c:692
+#: ../src/misc.c:719
+msgid "You must type a program name"
+msgstr "Turite nurodyti programą"
+
+#: ../src/misc.c:720
+msgid "Program Name Error"
+msgstr "Programos pavadinimo klaida"
+
+#: ../src/misc.c:799
+#, c-format
+msgid "Executed command: %s"
+msgstr "Vykdyta komanda: %s"
+
+#: ../src/misc.c:806
+#, c-format
+msgid "Failed to launch program: %s"
+msgstr "Nepavyko paleisti programos: %s"
+
+#: ../src/misc.c:823
 msgid "Select File"
 msgstr "Pasirinkite failą"
 
-#: ../src/misc.c:698
+#: ../src/misc.c:829
 msgid "Select Directory"
 msgstr "Parinkite aplanką"
 
-#: ../src/misc.c:783
-msgid "No audio player defined"
-msgstr "Nenurodytas garso grotuvas"
-
-#: ../src/misc.c:784
-msgid "Audio Player Warning"
-msgstr "Garso grotuvo klaida"
-
-#: ../src/misc.c:1122
+#: ../src/misc.c:1141
 msgid "Generate Playlist"
 msgstr "Generuoti grojaraštį"
 
-#: ../src/misc.c:1146
+#: ../src/misc.c:1165
 msgid "M3U Playlist Name"
 msgstr "M3U grojaraščio vardas"
 
-#: ../src/misc.c:1161
+#: ../src/misc.c:1180
 msgid "Use directory name"
 msgstr "Naudoti aplanko vardą"
 
 #. Playlist options
-#: ../src/misc.c:1178
+#: ../src/misc.c:1197
 msgid "Playlist Options"
 msgstr "Grojaraščio nustatymai"
 
-#: ../src/misc.c:1184
+#: ../src/misc.c:1203
 msgid "Include only the selected files"
 msgstr "Įtraukti tik pasirinktus failus"
 
-#: ../src/misc.c:1187
+#: ../src/misc.c:1206
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2750,77 +2734,77 @@ msgstr ""
 "Jei aktyvuota, į grojaraščio failą bus įrašyti tik pasirinkti failai. Kitu "
 "atveju bus įrašyti visi failai."
 
-#: ../src/misc.c:1190
+#: ../src/misc.c:1209
 msgid "Use full path for files in playlist"
 msgstr "Grojaraštyje naudoti pilnus kelius"
 
-#: ../src/misc.c:1193
+#: ../src/misc.c:1212
 msgid "Use relative path for files in playlist"
 msgstr "Grojaraštyje naudoti reliatyvius kelius"
 
 #. Create playlist in parent directory
-#: ../src/misc.c:1199
+#: ../src/misc.c:1218
 msgid "Create playlist in the parent directory"
 msgstr "Grojraštį sukurti esamame aplanke"
 
-#: ../src/misc.c:1202
+#: ../src/misc.c:1221
 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:1206
+#: ../src/misc.c:1225
 msgid "Use DOS directory separator"
 msgstr "Naudoti DOS aplankų skirtuką"
 
-#: ../src/misc.c:1212
+#: ../src/misc.c:1231
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr "Ši parinktis pakeičia UNIX aplanko skirtuką „/“ į DOS skirtuką „\\“."
 
-#: ../src/misc.c:1221
+#: ../src/misc.c:1240
 msgid "Playlist Content"
 msgstr "Grojaraščio turinys"
 
-#: ../src/misc.c:1227
+#: ../src/misc.c:1246
 msgid "Write only list of files"
 msgstr "Rašyti tik failų sąrašą"
 
-#: ../src/misc.c:1231
+#: ../src/misc.c:1250
 msgid "Write info using filename"
 msgstr "Informaciją rašyti naudojant failo vardą"
 
-#: ../src/misc.c:1234
+#: ../src/misc.c:1253
 msgid "Write info using:"
 msgstr "Rašyti informaciją naudojant:"
 
-#: ../src/misc.c:1448
+#: ../src/misc.c:1467
 #, c-format
 msgid "Cannot write playlist file '%s'"
 msgstr "Įrašyti grojaraščio failo „%s“ nepavyko"
 
-#: ../src/misc.c:1452
+#: ../src/misc.c:1471
 msgid "Playlist File Error"
 msgstr "Grojaraščio failo klaida"
 
-#: ../src/misc.c:1460
+#: ../src/misc.c:1479
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Grojaraščio failas „%s“ įrašytas"
 
-#: ../src/misc.c:1524 ../src/scan.c:3239 ../src/scan.c:3301
+#: ../src/misc.c:1543 ../src/scan.c:3239 ../src/scan.c:3301
 msgid "Invalid scanner mask"
 msgstr "Netinkama skenerio kaukė"
 
-#: ../src/misc.c:1888
+#: ../src/misc.c:1907
 msgid "CD"
 msgstr "CD"
 
-#: ../src/misc.c:1910
+#: ../src/misc.c:1929
 msgid "Find Files"
 msgstr "Rasti failus"
 
-#: ../src/misc.c:1942
+#: ../src/misc.c:1961
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2828,13 +2812,13 @@ msgstr ""
 "rodomi visi failai."
 
 #. Where...
-#: ../src/misc.c:1948
+#: ../src/misc.c:1967
 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:1953
+#: ../src/misc.c:1972
 msgid "the Filename"
 msgstr "failo pavadinime"
 
@@ -2843,20 +2827,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:1959
+#: ../src/misc.c:1978
 msgid "the Tag"
 msgstr "žymoje"
 
 #. Property of the search
-#: ../src/misc.c:1970 ../src/prefs.c:335
+#: ../src/misc.c:1989 ../src/prefs.c:335
 msgid "Case sensitive"
 msgstr "Skirti mažąsias ir didžiąsias raides"
 
-#: ../src/misc.c:2197
+#: ../src/misc.c:2216
 msgid "Ready to search…"
 msgstr "Paieškai pasirengta…"
 
-#: ../src/misc.c:2417
+#: ../src/misc.c:2436
 #, c-format
 msgid "Found one file"
 msgid_plural "Found %d files"
@@ -2864,63 +2848,63 @@ msgstr[0] "Rastas %d failas"
 msgstr[1] "Rasti %d failai"
 msgstr[2] "Rasta %d failų"
 
-#: ../src/misc.c:2702
+#: ../src/misc.c:2721
 msgid "Load Filenames From a Text File"
 msgstr "Įkelti failų pavadinimus iš tekstinio failo"
 
-#: ../src/misc.c:2731
+#: ../src/misc.c:2750
 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:2750
+#: ../src/misc.c:2769
 msgid " Load "
 msgstr " Įkelti "
 
-#: ../src/misc.c:2768
+#: ../src/misc.c:2787
 msgid "Content of Text File"
 msgstr "Tekstinio failo turinys"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2789 ../src/misc.c:2884
+#: ../src/misc.c:2808 ../src/misc.c:2903
 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:2798 ../src/misc.c:2893
+#: ../src/misc.c:2817 ../src/misc.c:2912
 msgid "Delete the selected line"
 msgstr "Pašalinti pasirinktą eilutę"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2807 ../src/misc.c:2902 ../src/misc.c:3388
+#: ../src/misc.c:2826 ../src/misc.c:2921 ../src/misc.c:3407
 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:2819 ../src/misc.c:2914
+#: ../src/misc.c:2838 ../src/misc.c:2933
 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:2828 ../src/misc.c:2923
+#: ../src/misc.c:2847 ../src/misc.c:2942
 msgid "Move down the selected line"
 msgstr "Pasirinktą eilutę perkelti žemyn"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2840 ../src/misc.c:2935 ../src/misc.c:3412
+#: ../src/misc.c:2859 ../src/misc.c:2954 ../src/misc.c:3431
 msgid "Reload"
 msgstr "Įkelti iš naujo"
 
-#: ../src/misc.c:2862
+#: ../src/misc.c:2881
 msgid "List of Files"
 msgstr "Failų sąrašas"
 
-#: ../src/misc.c:2957
+#: ../src/misc.c:2976
 msgid "Selected line:"
 msgstr "Pasirinkta eilutė:"
 
-#: ../src/misc.c:2975
+#: ../src/misc.c:2994
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2928,34 +2912,34 @@ msgstr ""
 "Aktyvavus šią parinkty, įkėlus failus, bus paleistas pasirinktas skeneris "
 "(skenerio langas turi būt atvertas)."
 
-#: ../src/misc.c:3062
+#: ../src/misc.c:3081
 #, c-format
 msgid "Cannot retrieve file info (%s)"
 msgstr "Nepavyko gauti failo informacijos (%s)"
 
-#: ../src/misc.c:3124
+#: ../src/misc.c:3143
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Atverti failo „%s“ nepavyko (%s)"
 
-#: ../src/misc.c:3160
+#: ../src/misc.c:3179
 #, c-format
 msgid "Error reading file (%s)"
 msgstr "Klaida skaitant failą (%s)"
 
-#: ../src/misc.c:3376
+#: ../src/misc.c:3395
 msgid "Insert a blank line"
 msgstr "Įterpti tuščią eilutę"
 
-#: ../src/misc.c:3382
+#: ../src/misc.c:3401
 msgid "Delete this line"
 msgstr "Pašalinti šią eilutę"
 
-#: ../src/misc.c:3397
+#: ../src/misc.c:3416
 msgid "Move up this line"
 msgstr "Perkelti eilutę aukštyn"
 
-#: ../src/misc.c:3403
+#: ../src/misc.c:3422
 msgid "Move down this line"
 msgstr "Perkelti eilutę žemyn"
 
@@ -3059,175 +3043,185 @@ msgstr ""
 msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
 msgstr "Klaida: nepavyko atverti failo: „%s“ kaip vorbis (%s)."
 
-#: ../src/ogg_tag.c:186 ../src/ogg_tag.c:739
+#: ../src/ogg_tag.c:249 ../src/ogg_tag.c:872
 #, c-format
 msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Įspėjimas: Ogg Vorbis failas „%s“ turi ID3v2 žymę."
 
-#: ../src/picture.c:244 ../src/picture.c:269
+#: ../src/ogg_tag.c:1020 ../src/picture.c:1256
 #, c-format
-msgid "Image file not loaded: %s"
-msgstr "Paveikslėlio failas neįkeltas: %s"
+msgid "Error with 'loader_write': %s"
+msgstr "Klaida su „loader_write“: %s"
 
-#: ../src/picture.c:261
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1179
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr "Klaida su „loader_close“: %s"
+
+#: ../src/picture.c:104
+#, c-format
+msgid "Image file not saved: %s"
+msgstr "Paveikslėlio failas neįrašytas: %s"
+
+#: ../src/picture.c:154
 #, c-format
 msgid "Cannot open file: '%s'"
 msgstr "Nepavyko atverti failo: „%s“"
 
-#: ../src/picture.c:265
+#: ../src/picture.c:158
 msgid "Image File Error"
 msgstr "Failo pervadinimo klaida"
 
-#: ../src/picture.c:276
+#: ../src/picture.c:162 ../src/picture.c:424
+#, c-format
+msgid "Image file not loaded: %s"
+msgstr "Paveikslėlio failas neįkeltas: %s"
+
+#: ../src/picture.c:446
 msgid "Image file loaded"
 msgstr "Paveikslėlio failas įkeltas"
 
-#: ../src/picture.c:334
+#: ../src/picture.c:503
 msgid "Add Images"
 msgstr "Pridėti paveikslėlius"
 
-#: ../src/picture.c:344 ../src/picture.c:700
+#: ../src/picture.c:513 ../src/picture.c:873
 msgid "All Files"
 msgstr "Visi failai"
 
-#: ../src/picture.c:350 ../src/picture.c:706
+#: ../src/picture.c:519 ../src/picture.c:879
 msgid "PNG and JPEG"
 msgstr "PNG ir JPEG"
 
-#: ../src/picture.c:477
+#: ../src/picture.c:650
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Paveikslėlio savybės %d/%d"
 
-#: ../src/picture.c:501
+#: ../src/picture.c:674
 msgid "Image Type"
 msgstr "Paveikslėlio tipas"
 
 #. Description of the picture
-#: ../src/picture.c:560
+#: ../src/picture.c:733
 msgid "Image Description:"
 msgstr "Paveikslėlio aprašymas:"
 
-#: ../src/picture.c:687
+#: ../src/picture.c:860
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Įrašyti paveikslėlį %d/%d"
 
-#: ../src/picture.c:759
-#, c-format
-msgid "Image file not saved: %s"
-msgstr "Paveikslėlio failas neįrašytas: %s"
-
-#: ../src/picture.c:827
+#: ../src/picture.c:1020
 msgid "JPEG image"
 msgstr "JPEG paveikslėlis"
 
-#: ../src/picture.c:829
+#: ../src/picture.c:1022
 msgid "PNG image"
 msgstr "PNG paveikslėlis"
 
-#: ../src/picture.c:831
+#: ../src/picture.c:1024
+#| msgid "PNG image"
+msgid "GIF image"
+msgstr "GIF paveikslėlis"
+
+#: ../src/picture.c:1026
 msgid "Unknown image"
 msgstr "Nežinomas paveikslėlis"
 
-#: ../src/picture.c:843
+#: ../src/picture.c:1038
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32 pikselių PNG failo piktograma"
 
-#: ../src/picture.c:845
+#: ../src/picture.c:1040
 msgid "Other file icon"
 msgstr "Kita failo piktograma"
 
-#: ../src/picture.c:847
+#: ../src/picture.c:1042
 msgid "Cover (front)"
 msgstr "Viršelis (priekis)"
 
-#: ../src/picture.c:849
+#: ../src/picture.c:1044
 msgid "Cover (back)"
 msgstr "Viršelis (galas)"
 
-#: ../src/picture.c:851
+#: ../src/picture.c:1046
 msgid "Leaflet page"
 msgstr "Leaflet puslapis"
 
-#: ../src/picture.c:853
+#: ../src/picture.c:1048
 msgid "Media (e.g. label side of CD)"
 msgstr "Laikmena (pvz. CD užrašo pusė)"
 
-#: ../src/picture.c:855
+#: ../src/picture.c:1050
 msgid "Lead artist/lead performer/soloist"
 msgstr "Pagrindinis atlikėjas/solistas"
 
-#: ../src/picture.c:857
+#: ../src/picture.c:1052
 msgid "Artist/performer"
 msgstr "Atlikėjas"
 
-#: ../src/picture.c:859
+#: ../src/picture.c:1054
 msgid "Conductor"
 msgstr "Dirigentas"
 
-#: ../src/picture.c:861
+#: ../src/picture.c:1056
 msgid "Band/Orchestra"
 msgstr "Grupė/orkestras"
 
-#: ../src/picture.c:865
+#: ../src/picture.c:1060
 msgid "Lyricist/text writer"
 msgstr "Žodžių autorius"
 
-#: ../src/picture.c:867
+#: ../src/picture.c:1062
 msgid "Recording location"
 msgstr "Įrašo vieta"
 
-#: ../src/picture.c:869
+#: ../src/picture.c:1064
 msgid "During recording"
 msgstr "Įrašymo metu"
 
-#: ../src/picture.c:871
+#: ../src/picture.c:1066
 msgid "During performance"
 msgstr "Atlikimo metu"
 
-#: ../src/picture.c:873
+#: ../src/picture.c:1068
 msgid "Movie/video screen capture"
 msgstr "Filmo/video ekrano įrašas"
 
-#: ../src/picture.c:875
+#: ../src/picture.c:1070
 msgid "A bright colored fish"
 msgstr "Ryški spalvota žuvis"
 
-#: ../src/picture.c:877
+#: ../src/picture.c:1072
 msgid "Illustration"
 msgstr "Iliustracija"
 
-#: ../src/picture.c:879
+#: ../src/picture.c:1074
 msgid "Band/Artist logotype"
 msgstr "Grupės/Atlikėjo logotipas"
 
-#: ../src/picture.c:881
+#: ../src/picture.c:1076
 msgid "Publisher/studio logotype"
 msgstr "Leidėjo/studijos logotipas"
 
-#: ../src/picture.c:885
+#: ../src/picture.c:1080
 msgid "Unknown image type"
 msgstr "Nežinomas paveikslėlio tipas"
 
-#: ../src/picture.c:915 ../src/picture.c:926
+#: ../src/picture.c:1110 ../src/picture.c:1121
 msgid "pixels"
 msgstr "pikseliai"
 
-#: ../src/picture.c:916 ../src/picture.c:927
+#: ../src/picture.c:1111 ../src/picture.c:1122
 msgid "Type"
 msgstr "Tipas"
 
-#: ../src/picture.c:928
+#: ../src/picture.c:1123
 msgid "Description"
 msgstr "Aprašymas"
 
-#: ../src/picture.c:984
-#, c-format
-msgid "Error with 'loader_close': %s"
-msgstr "Klaida su „loader_close“: %s"
-
-#: ../src/picture.c:1044
+#: ../src/picture.c:1239
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
@@ -3235,25 +3229,20 @@ msgstr ""
 "Parodyti paveikslėlio neįmanoma, nes nenuskaityta pakankamai duomenų, kad "
 "būtų galima sukurti paveikslėlio buferį."
 
-#: ../src/picture.c:1051
+#: ../src/picture.c:1246
 msgid "Cannot display the image"
 msgstr "Nepavyko parodyti paveikslėlio"
 
-#: ../src/picture.c:1053
+#: ../src/picture.c:1248
 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:1055
+#: ../src/picture.c:1250
 msgid "Load Image File"
 msgstr "Įkelti paveikslėlio failą"
 
-#: ../src/picture.c:1061
-#, c-format
-msgid "Error with 'loader_write': %s"
-msgstr "Klaida su „loader_write“: %s"
-
 #. Label
 #: ../src/prefs.c:152
 msgid "Default directory:"
@@ -4291,11 +4280,11 @@ msgstr "Konfigūraciją išsaugota"
 msgid "Configuration unchanged"
 msgstr "Konfigūracija nepakeista"
 
-#: ../src/prefs.c:1707
+#: ../src/prefs.c:1712
 msgid "The selected path for 'Default path to files' is invalid"
 msgstr "Pasirinktas kelias „Numatytasis kelias iki failų“ nėra tinkamas"
 
-#: ../src/prefs.c:1708
+#: ../src/prefs.c:1714
 #, c-format
 msgid ""
 "Path: '%s'\n"
@@ -4304,16 +4293,16 @@ msgstr ""
 "Kelias: „%s“\n"
 "Klaida: %s"
 
-#: ../src/prefs.c:1709
+#: ../src/prefs.c:1716
 msgid "Invalid Path Error"
 msgstr "Netinkamo kelio klaida"
 
-#: ../src/prefs.c:1823
+#: ../src/prefs.c:1830
 #, c-format
 msgid "The audio file player '%s' cannot be found"
 msgstr "Garso failų grotuvas „%s“ nerastas"
 
-#: ../src/prefs.c:1825
+#: ../src/prefs.c:1832
 msgid "Audio Player Error"
 msgstr "Garso grotuvo klaida"
 
@@ -4890,60 +4879,3 @@ msgstr "Nepavyko migruoti konfigūracijos failo „%s“"
 msgid "Error: Cannot create directory '%s' (%s)"
 msgstr "Klaida: Nepavyko sukurti aplanko „%s“ (%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“ dar neįkelta. Bandoma įkelti..."
-
-#. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: ../src/win32/win32dep.c:130
-#, c-format
-msgid "DLL '%s' could not be loaded"
-msgstr "Įkelti DLL „%s“ nepavyko"
-
-#. 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 "Ši „%s“ versija turi „%s“"
-
-#. 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 "Funkcija „%s“ nerasta DLL „%s“"
-
-#. 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 "EasyTAG nustatymų aplankas: „%s“"
-
-#. Log_Print(_("weasytag_init start..."));
-#: ../src/win32/win32dep.c:472
-#, c-format
-msgid "weasytag_init start..."
-msgstr "weasytag_init pradžia..."
-
-#. 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 "GLib versija: %u.%u.%u\n"
-
-#. Set Environmental Variables
-#. Log_Print(_("weasytag_init end..."));
-#: ../src/win32/win32dep.c:496
-#, c-format
-msgid "weasytag_init end..."
-msgstr "weasytag_init pabaiga..."
-
-#. Log_Print(_("Audio player: '%s'"), player);
-#: ../src/win32/win32dep.c:620
-#, c-format
-msgid "Audio player: '%s'"
-msgstr "Garso grotuvas: „%s“"
diff --git a/po/pl.po b/po/pl.po
index bf7d962..901cef5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-19 21:12+0100\n"
-"PO-Revision-Date: 2014-02-19 21:13+0100\n"
+"POT-Creation-Date: 2014-04-07 19:02+0200\n"
+"PO-Revision-Date: 2014-04-07 19:03+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
 "Language-Team: Polish <gnomepl at aviary.pl>\n"
 "Language: pl\n"
@@ -29,11 +29,11 @@ msgstr ""
 
 #: ../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."
+"View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg "
+"Vorbis, MusePack, Monkey's Audio and WavPack files."
 msgstr ""
 "Wyświetlanie i modyfikowanie etykiet plików MP3, MP2, MP4/AAC, FLAC, Ogg "
-"Vorbis, MusePack, Monkey's Audio i WavPack."
+"Opus, Ogg Speex, Ogg Vorbis, MusePack, Monkey's Audio i WavPack."
 
 #: ../data/easytag.appdata.xml.in.h:2
 msgid ""
@@ -64,7 +64,7 @@ msgstr "Modyfikowanie metadanych plików dźwiękowych"
 msgid "mp3;tag;audio;"
 msgstr "mp3;etykieta;znacznik;tag;dźwięk;audio;"
 
-#: ../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 "
@@ -95,7 +95,7 @@ msgstr ""
 "- proszę odwiedzić stronę internetową <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 ""
 "Maciej Kasprzyk <kapsrzol at o2.pl>, 2002\n"
@@ -105,7 +105,7 @@ msgstr ""
 "Piotr Drąg <piotrdrag at gmail.com>, 2012-2014\n"
 "Aviary.pl <gnomepl at aviary.pl>, 2012-2014"
 
-#: ../src/about.c:118
+#: ../src/about.c:116
 msgid "View and edit tags in audio files"
 msgstr "Wyświetlanie i modyfikowanie etykiet w plikach dźwiękowych"
 
@@ -132,623 +132,623 @@ msgstr "- nadawanie etykiet i zmienianie nazw plikach dźwiękowych"
 #.
 #. * Main Menu Actions
 #.
-#: ../src/bar.c:154
+#: ../src/bar.c:155
 msgid "_File"
 msgstr "_Plik"
 
-#: ../src/bar.c:155
+#: ../src/bar.c:156
 msgid "Sort List by Tag"
 msgstr "Uporządkuj listę według etykiet"
 
-#: ../src/bar.c:158
+#: ../src/bar.c:159
 msgid "Sort List by Property"
 msgstr "Uporządkuj listę według właściwości"
 
-#: ../src/bar.c:159
+#: ../src/bar.c:160
 msgid "Ascending by filename"
 msgstr "Rosnąco według nazw plików"
 
-#: ../src/bar.c:160
+#: ../src/bar.c:161
 msgid "Descending by filename"
 msgstr "Malejąco według nazw plików"
 
-#: ../src/bar.c:161
+#: ../src/bar.c:162
 msgid "Ascending by creation date"
 msgstr "Rosnąco według daty utworzenia"
 
-#: ../src/bar.c:162
+#: ../src/bar.c:163
 msgid "Descending by creation date"
 msgstr "Malejąco według daty utworzenia"
 
-#: ../src/bar.c:163
+#: ../src/bar.c:164
 msgid "Ascending by track number"
 msgstr "Rosnąco według numeru ścieżki"
 
-#: ../src/bar.c:164
+#: ../src/bar.c:165
 msgid "Descending by track number"
 msgstr "Malejąco według numeru ścieżki"
 
-#: ../src/bar.c:165
+#: ../src/bar.c:166
 msgid "Ascending by title"
 msgstr "Rosnąco według tytułu"
 
-#: ../src/bar.c:166
+#: ../src/bar.c:167
 msgid "Descending by title"
 msgstr "Malejąco według tytułu"
 
-#: ../src/bar.c:167
+#: ../src/bar.c:168
 msgid "Ascending by artist"
 msgstr "Rosnąco według wykonawcy"
 
-#: ../src/bar.c:168
+#: ../src/bar.c:169
 msgid "Descending by artist"
 msgstr "Malejąco według wykonawcy"
 
-#: ../src/bar.c:169
+#: ../src/bar.c:170
 msgid "Ascending by album artist"
 msgstr "Rosnąco według wykonawcy albumu"
 
-#: ../src/bar.c:170
+#: ../src/bar.c:171
 msgid "Descending by album artist"
 msgstr "Malejąco według wykonawcy albumu"
 
-#: ../src/bar.c:171
+#: ../src/bar.c:172
 msgid "Ascending by album"
 msgstr "Rosnąco według albumu"
 
-#: ../src/bar.c:172
+#: ../src/bar.c:173
 msgid "Descending by album"
 msgstr "Malejąco według albumu"
 
-#: ../src/bar.c:173
+#: ../src/bar.c:174
 msgid "Ascending by year"
 msgstr "Rosnąco według roku"
 
-#: ../src/bar.c:174
+#: ../src/bar.c:175
 msgid "Descending by year"
 msgstr "Malejąco według roku"
 
-#: ../src/bar.c:175
+#: ../src/bar.c:176
 msgid "Ascending by genre"
 msgstr "Rosnąco według gatunku"
 
-#: ../src/bar.c:176
+#: ../src/bar.c:177
 msgid "Descending by genre"
 msgstr "Malejąco według gatunku"
 
-#: ../src/bar.c:177
+#: ../src/bar.c:178
 msgid "Ascending by comment"
 msgstr "Rosnąco według komentarza"
 
-#: ../src/bar.c:178
+#: ../src/bar.c:179
 msgid "Descending by comment"
 msgstr "Malejąco według komentarza"
 
-#: ../src/bar.c:179
+#: ../src/bar.c:180
 msgid "Ascending by composer"
 msgstr "Rosnąco według kompozytora"
 
-#: ../src/bar.c:180
+#: ../src/bar.c:181
 msgid "Descending by composer"
 msgstr "Malejąco według kompozytora"
 
-#: ../src/bar.c:181
+#: ../src/bar.c:182
 msgid "Ascending by original artist"
 msgstr "Rosnąco według pierwotnego wykonawcy"
 
-#: ../src/bar.c:182
+#: ../src/bar.c:183
 msgid "Descending by original artist"
 msgstr "Malejąco według pierwotnego wykonawcy"
 
-#: ../src/bar.c:183
+#: ../src/bar.c:184
 msgid "Ascending by copyright"
 msgstr "Rosnąco według praw autorskich"
 
-#: ../src/bar.c:184
+#: ../src/bar.c:185
 msgid "Descending by copyright"
 msgstr "Malejąco według praw autorskich"
 
-#: ../src/bar.c:185
+#: ../src/bar.c:186
 msgid "Ascending by URL"
 msgstr "Rosnąco według adresów URL"
 
-#: ../src/bar.c:186
+#: ../src/bar.c:187
 msgid "Descending by URL"
 msgstr "Malejąco według adresów 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 "Rosnąco według nazwiska kodującego"
 
 #. 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 "Malejąco według nazwiska kodującego"
 
-#: ../src/bar.c:193
+#: ../src/bar.c:194
 msgid "Ascending by file type"
 msgstr "Rosnąco według typu pliku"
 
-#: ../src/bar.c:194
+#: ../src/bar.c:195
 msgid "Descending by file type"
 msgstr "Malejąco według typu pliku"
 
-#: ../src/bar.c:195
+#: ../src/bar.c:196
 msgid "Ascending by file size"
 msgstr "Rosnąco według rozmiaru pliku"
 
-#: ../src/bar.c:196
+#: ../src/bar.c:197
 msgid "Descending by file size"
 msgstr "Malejąco według rozmiaru pliku"
 
-#: ../src/bar.c:197
+#: ../src/bar.c:198
 msgid "Ascending by duration"
 msgstr "Rosnąco według czasu trwania"
 
-#: ../src/bar.c:198
+#: ../src/bar.c:199
 msgid "Descending by duration"
 msgstr "Malejąco według czasu trwania"
 
-#: ../src/bar.c:199
+#: ../src/bar.c:200
 msgid "Ascending by bitrate"
 msgstr "Rosnąco według gęstości bitowej"
 
-#: ../src/bar.c:200
+#: ../src/bar.c:201
 msgid "Descending by bitrate"
 msgstr "Malejąco według gęstości bitowej"
 
-#: ../src/bar.c:201
+#: ../src/bar.c:202
 msgid "Ascending by samplerate"
 msgstr "Rosnąco według częstotliwości próbkowania"
 
-#: ../src/bar.c:202
+#: ../src/bar.c:203
 msgid "Descending by samplerate"
 msgstr "Malejąco według częstotliwości próbkowania"
 
-#: ../src/bar.c:204
+#: ../src/bar.c:205
 msgid "Open Files With…"
 msgstr "Otwórz pliki za pomocą…"
 
-#: ../src/bar.c:205
+#: ../src/bar.c:206
 msgid "Run a command on the selected files"
 msgstr "Wykonaj polecenie na zaznaczonych plików"
 
-#: ../src/bar.c:208
+#: ../src/bar.c:209
 msgid "Select all"
 msgstr "Zaznacz wszystkie"
 
-#: ../src/bar.c:209
+#: ../src/bar.c:210
 msgid "Unselect All"
 msgstr "Odznacz wszystkie"
 
-#: ../src/bar.c:210
+#: ../src/bar.c:211
 msgid "Clear the current selection"
 msgstr "Wyczyść bieżące zaznaczenie"
 
-#: ../src/bar.c:213
+#: ../src/bar.c:214
 msgid "Invert File Selection"
 msgstr "Odwróć zaznaczenie plików"
 
-#: ../src/bar.c:214
+#: ../src/bar.c:215
 msgid "Invert file selection"
 msgstr "Odwróć zaznaczenie plików"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete Files"
 msgstr "Usuń pliki"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete files"
 msgstr "Usuń pliki"
 
-#: ../src/bar.c:217
+#: ../src/bar.c:218
 msgid "_First File"
 msgstr "P_ierwszy plik"
 
-#: ../src/bar.c:218
+#: ../src/bar.c:219
 msgid "First file"
 msgstr "Pierwszy plik"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "_Previous File"
 msgstr "Pop_rzedni plik"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "Previous file"
 msgstr "Poprzedni plik"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "_Next File"
 msgstr "_Następny plik"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "Next file"
 msgstr "Następny plik"
 
-#: ../src/bar.c:221
+#: ../src/bar.c:222
 msgid "_Last File"
 msgstr "_Ostatni plik"
 
-#: ../src/bar.c:222
+#: ../src/bar.c:223
 msgid "Last file"
 msgstr "Ostatni plik"
 
-#: ../src/bar.c:223
+#: ../src/bar.c:224
 msgid "S_can Files"
 msgstr "S_kanuj pliki"
 
-#: ../src/bar.c:224 ../src/scan.c:2344
+#: ../src/bar.c:225 ../src/scan.c:2008
 msgid "Scan selected files"
 msgstr "Skanuj zaznaczone pliki"
 
-#: ../src/bar.c:225
+#: ../src/bar.c:226
 msgid "_Remove Tags"
 msgstr "_Usuń etykiety"
 
-#: ../src/bar.c:226
+#: ../src/bar.c:227
 msgid "Remove tags"
 msgstr "Usuń etykiety"
 
-#: ../src/bar.c:227
+#: ../src/bar.c:228
 msgid "_Undo Last Files Changes"
 msgstr "Cof_nij ostatnie zmiany plików"
 
-#: ../src/bar.c:228
+#: ../src/bar.c:229
 msgid "Undo last files changes"
 msgstr "Cofnij ostatnie zmiany plików"
 
-#: ../src/bar.c:230
+#: ../src/bar.c:231
 msgid "R_edo Last Files Changes"
 msgstr "P_onów ostatnie zmiany plików"
 
-#: ../src/bar.c:231
+#: ../src/bar.c:232
 msgid "Redo last files changes"
 msgstr "Ponów ostatnie zmiany plików"
 
-#: ../src/bar.c:233
+#: ../src/bar.c:234
 msgid "_Save Files"
 msgstr "Zapi_sz pliki"
 
-#: ../src/bar.c:234
+#: ../src/bar.c:235
 msgid "Save changes to selected files"
 msgstr "Zapisz zmiany zaznaczonych plików"
 
-#: ../src/bar.c:236
+#: ../src/bar.c:237
 msgid "_Force Save Files"
 msgstr "_Wymuś zapisanie plików"
 
-#: ../src/bar.c:237
+#: ../src/bar.c:238
 msgid "Force saving files"
 msgstr "Wymuś zapisanie plików"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo Last Changes"
 msgstr "Cofnij ostatnie zmiany"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo last changes"
 msgstr "Cofnij ostatnie zmiany"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo Last Changes"
 msgstr "Ponów ostatnie zmiany"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo last changes"
 msgstr "Ponów ostatnie zmiany"
 
-#: ../src/bar.c:241
+#: ../src/bar.c:242
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#: ../src/bar.c:241 ../src/easytag.c:2418 ../src/easytag.c:4502
-#: ../src/easytag.c:4530
+#: ../src/bar.c:242 ../src/easytag.c:2429 ../src/easytag.c:4565
+#: ../src/easytag.c:4597
 msgid "Quit"
 msgstr "Zakończ"
 
-#: ../src/bar.c:244
+#: ../src/bar.c:245
 msgid "_Browser"
 msgstr "_Przeglądarka"
 
-#: ../src/bar.c:245
+#: ../src/bar.c:246
 msgid "_Home Directory"
 msgstr "_Katalog domowy"
 
-#: ../src/bar.c:246
+#: ../src/bar.c:247
 msgid "Go to home directory"
 msgstr "Przejdź do katalogu domowego"
 
-#: ../src/bar.c:248
+#: ../src/bar.c:249
 msgid "Desktop Directory"
 msgstr "Katalog pulpitu"
 
-#: ../src/bar.c:249
+#: ../src/bar.c:250
 msgid "Go to desktop directory"
 msgstr "Przejdź do katalogu pulpitu"
 
-#: ../src/bar.c:251
+#: ../src/bar.c:252
 msgid "Documents Directory"
 msgstr "Katalog dokumentów"
 
-#: ../src/bar.c:252
+#: ../src/bar.c:253
 msgid "Go to documents directory"
 msgstr "Przejdź do katalogu dokumentów"
 
-#: ../src/bar.c:254
+#: ../src/bar.c:255
 msgid "Downloads Directory"
 msgstr "Katalog pobranych plików"
 
-#: ../src/bar.c:255
+#: ../src/bar.c:256
 msgid "Go to downloads directory"
 msgstr "Przejdź do katalogu pobranych plików"
 
-#: ../src/bar.c:257
+#: ../src/bar.c:258
 msgid "Music Directory"
 msgstr "Katalog muzyki"
 
-#: ../src/bar.c:258
+#: ../src/bar.c:259
 msgid "Go to music directory"
 msgstr "Przejdź do katalogu muzyki"
 
-#: ../src/bar.c:260
+#: ../src/bar.c:261
 msgid "_Parent Directory"
 msgstr "Katalog _nadrzędny"
 
-#: ../src/bar.c:261
+#: ../src/bar.c:262
 msgid "Go to parent directory"
 msgstr "Przejdź do katalogu nadrzędnego"
 
-#: ../src/bar.c:263
+#: ../src/bar.c:264
 msgid "_Default Directory"
 msgstr "_Domyślny katalog"
 
-#: ../src/bar.c:264
+#: ../src/bar.c:265
 msgid "Go to default directory"
 msgstr "Przejdź do domyślnego katalogu"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set _Current Path as Default"
 msgstr "Ustaw _bieżącą ścieżkę jako domyślną"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set current path as default"
 msgstr "Ustaw bieżącą ścieżkę jako domyślną"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename Directory…"
 msgstr "Zmień nazwę katalogu…"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename directory"
 msgstr "Zmień nazwę katalogu"
 
-#: ../src/bar.c:268
+#: ../src/bar.c:269
 msgid "Reload Directory"
 msgstr "Ponownie wczytaj katalog"
 
-#: ../src/bar.c:269
+#: ../src/bar.c:270
 msgid "Reload directory"
 msgstr "Ponownie wczytaj katalog"
 
-#: ../src/bar.c:272
+#: ../src/bar.c:273
 msgid "Browse Directory With…"
 msgstr "Przeglądaj katalog za pomocą…"
 
-#: ../src/bar.c:273
+#: ../src/bar.c:274
 msgid "Run a command on the directory"
 msgstr "Wykonaj polecenia na tym katalogu"
 
-#: ../src/bar.c:275
+#: ../src/bar.c:276
 msgid "_Collapse Tree"
 msgstr "_Zwiń drzewo"
 
-#: ../src/bar.c:276
+#: ../src/bar.c:277
 msgid "Collapse directory tree"
 msgstr "Zwiń drzewo katalogów"
 
-#: ../src/bar.c:277
+#: ../src/bar.c:278
 msgid "_Reload Tree"
 msgstr "Ponownie _wczytaj drzewo"
 
-#: ../src/bar.c:278
+#: ../src/bar.c:279
 msgid "Reload directory tree"
 msgstr "Ponownie wczytaj drzewo katalogów"
 
-#: ../src/bar.c:281
+#: ../src/bar.c:282
 msgid "S_canner Mode"
 msgstr "Tryb s_kanera"
 
-#: ../src/bar.c:283
+#: ../src/bar.c:284
 msgid "_Miscellaneous"
 msgstr "_Różne"
 
-#: ../src/bar.c:284
+#: ../src/bar.c:285
 msgid "_Find…"
 msgstr "Z_najdź…"
 
-#: ../src/bar.c:285
+#: ../src/bar.c:286
 msgid "Search filenames and tags"
 msgstr "Wyszukaj nazwy plików i etykiety"
 
-#: ../src/bar.c:287
+#: ../src/bar.c:288
 msgid "CDD_B Search…"
 msgstr "Wyszukaj pliki w CDD_B…"
 
-#: ../src/bar.c:288
+#: ../src/bar.c:289
 msgid "CDDB search"
 msgstr "Wyszukiwanie w CDDB"
 
-#: ../src/bar.c:290
+#: ../src/bar.c:291
 msgid "Load Filenames From a Text File…"
 msgstr "Wczytaj nazwy plików z pliku tekstowego…"
 
-#: ../src/bar.c:291
+#: ../src/bar.c:292
 msgid "Load filenames from a text file"
 msgstr "Wczytaj nazwy plików z pliku tekstowego"
 
-#: ../src/bar.c:293
+#: ../src/bar.c:294
 msgid "Generate Playlist…"
 msgstr "Utwórz listę odtwarzania…"
 
-#: ../src/bar.c:294
+#: ../src/bar.c:295
 msgid "Generate a playlist"
 msgstr "Utwórz listę odtwarzania"
 
-#: ../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 "Uruchom odtwarzacz dźwięku"
 
-#: ../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 "Uruchom odtwarzacz dźwięku"
 
-#: ../src/bar.c:300
+#: ../src/bar.c:301
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../src/bar.c:301
+#: ../src/bar.c:302
 msgid "_Preferences"
 msgstr "_Preferencje"
 
 #. The window
-#: ../src/bar.c:302 ../src/prefs.c:110
+#: ../src/bar.c:303 ../src/prefs.c:110
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../src/bar.c:304
+#: ../src/bar.c:305
 msgid "_View"
 msgstr "_Widok"
 
-#: ../src/bar.c:305
+#: ../src/bar.c:306
 msgid "_Go"
 msgstr "P_rzejdź"
 
-#: ../src/bar.c:307
+#: ../src/bar.c:308
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../src/bar.c:310
+#: ../src/bar.c:311
 msgid "_Contents"
 msgstr "_Spis treści"
 
-#: ../src/bar.c:311
+#: ../src/bar.c:312
 msgid "Show help"
 msgstr "Wyświetla pomoc"
 
-#: ../src/bar.c:313
+#: ../src/bar.c:314
 msgid "_About"
 msgstr "_O programie"
 
-#: ../src/bar.c:313
+#: ../src/bar.c:314
 msgid "About"
 msgstr "O programie"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: ../src/bar.c:319
+#: ../src/bar.c:320
 msgid "Stop the current action"
 msgstr "Zatrzymaj bieżące działanie"
 
 #.
 #. * Popup menu's Actions
 #.
-#: ../src/bar.c:325
+#: ../src/bar.c:326
 msgid "_File Operations"
 msgstr "_Działania na plikach"
 
-#: ../src/bar.c:326
+#: ../src/bar.c:327
 msgid "S_canner"
 msgstr "S_kaner"
 
-#: ../src/bar.c:330
+#: ../src/bar.c:331
 msgid "CDDB Search Files…"
 msgstr "Wyszukaj pliki w CDDB…"
 
-#: ../src/bar.c:330
+#: ../src/bar.c:331
 msgid "CDDB search files…"
 msgstr "Wyszukaj pliki w CDDB…"
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: ../src/bar.c:334
+#: ../src/bar.c:335
 msgid "Clear log"
 msgstr "Wyczyść dziennik"
 
 #. { 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 "Przeglądanie p_odkatalogów"
 
-#: ../src/bar.c:341
+#: ../src/bar.c:342
 msgid "Browse subdirectories"
 msgstr "Przeglądanie podkatalogów"
 
-#: ../src/bar.c:345
+#: ../src/bar.c:346
 msgid "Show Hidden Directories"
 msgstr "Wyświetlanie ukrytych katalogów"
 
-#: ../src/bar.c:345
+#: ../src/bar.c:346
 msgid "Show hidden directories"
 msgstr "Wyświetlanie ukrytych katalogów"
 
-#: ../src/bar.c:347
+#: ../src/bar.c:348
 msgid "_Show Scanner"
 msgstr "Wyświetlanie _skanera"
 
-#: ../src/bar.c:348
+#: ../src/bar.c:349
 msgid "Show scanner"
 msgstr "Wyświetlanie skanera"
 
-#: ../src/bar.c:354
+#: ../src/bar.c:355
 msgid "Tree Browser"
 msgstr "Przeglądarka drzewa"
 
-#: ../src/bar.c:355
+#: ../src/bar.c:356
 msgid "View by directory tree"
 msgstr "Wyświetlanie według drzewa katalogów"
 
-#: ../src/bar.c:357
+#: ../src/bar.c:358
 msgid "Artist and Album"
 msgstr "Wykonawca i album"
 
-#: ../src/bar.c:358
+#: ../src/bar.c:359
 msgid "View by artist and album"
 msgstr "Wyświetlanie według wykonawcy i albumu"
 
-#: ../src/bar.c:363
+#: ../src/bar.c:364
 msgid "_Fill Tags…"
 msgstr "_Wypełnij etykiety…"
 
-#: ../src/bar.c:364
+#: ../src/bar.c:365
 msgid "Fill tags"
 msgstr "Wypełnij etykiety"
 
-#: ../src/bar.c:366
+#: ../src/bar.c:367
 msgid "_Rename Files and Directories…"
 msgstr "Z_mień nazwy plików i katalogów…"
 
-#: ../src/bar.c:367
+#: ../src/bar.c:368
 msgid "Rename files and directories"
 msgstr "Zmień nazwy plików i katalogów"
 
-#: ../src/bar.c:369
+#: ../src/bar.c:370
 msgid "_Process Fields…"
 msgstr "_Przetwarzaj pola…"
 
-#: ../src/bar.c:369 ../src/scan.c:182
+#: ../src/bar.c:370 ../src/scan.c:182
 msgid "Process Fields"
 msgstr "Przetwarzaj pola"
 
-#: ../src/bar.c:427
+#: ../src/bar.c:428
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Nie można scalić interfejsu użytkownika, błąd: %s\n"
 
-#: ../src/bar.c:532
+#: ../src/bar.c:533
 msgid "Ready to start"
 msgstr "Gotowe do rozpoczęcia"
 
@@ -756,113 +756,113 @@ msgstr "Gotowe do rozpoczęcia"
 msgid "New default path for files selected"
 msgstr "Wybrano nową domyślną ścieżkę do plików"
 
-#: ../src/browser.c:677 ../src/easytag.c:4498
+#: ../src/browser.c:678 ../src/easytag.c:4561
 msgid "Some files have been modified but not saved"
 msgstr "Niektóre pliki zostały zmodyfikowane, ale nie zostały zapisane"
 
-#: ../src/browser.c:678
+#: ../src/browser.c:679
 msgid "Do you want to save them before changing the directory?"
 msgstr "Zapisać je przed zmianą katalogu?"
 
-#: ../src/browser.c:682
+#: ../src/browser.c:683
 msgid "Confirm Directory Change"
 msgstr "Potwierdzenie zmiany katalogu"
 
-#: ../src/browser.c:2134
+#: ../src/browser.c:2146
 msgid "<All albums>"
 msgstr "<Wszystkie albumy>"
 
-#: ../src/browser.c:2595
+#: ../src/browser.c:2607
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Błąd: wyszukiwanie %s, nie można odnaleźć węzła %s w drzewie."
 
-#: ../src/browser.c:3127 ../src/browser.c:3205
+#: ../src/browser.c:3101 ../src/browser.c:3179
 msgid "Tree"
 msgstr "Drzewo"
 
-#: ../src/browser.c:3128 ../src/cddb.c:803 ../src/misc.c:1902
+#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1902
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: ../src/browser.c:3128 ../src/cddb.c:804 ../src/misc.c:1903
+#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1903
 #: ../src/prefs.c:643
 msgid "Title"
 msgstr "Tytuł"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Artist".
-#: ../src/browser.c:3129 ../src/browser.c:3136 ../src/cddb.c:483
+#: ../src/browser.c:3103 ../src/browser.c:3110 ../src/cddb.c:483
 #: ../src/cddb.c:805 ../src/misc.c:1904 ../src/prefs.c:644
 msgid "Artist"
 msgstr "Wykonawca"
 
-#: ../src/browser.c:3129 ../src/misc.c:1905
+#: ../src/browser.c:3103 ../src/misc.c:1905
 msgid "Album Artist"
 msgstr "Wykonawca albumu"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Album".
-#: ../src/browser.c:3130 ../src/browser.c:3138 ../src/cddb.c:486
+#: ../src/browser.c:3104 ../src/browser.c:3112 ../src/cddb.c:486
 #: ../src/cddb.c:806 ../src/misc.c:1906 ../src/prefs.c:645
 msgid "Album"
 msgstr "Album"
 
-#: ../src/browser.c:3130 ../src/cddb.c:807 ../src/misc.c:1908
+#: ../src/browser.c:3104 ../src/cddb.c:807 ../src/misc.c:1908
 msgid "Year"
 msgstr "Rok"
 
-#: ../src/browser.c:3130
+#: ../src/browser.c:3104
 msgid "Disc"
 msgstr "Płyta"
 
-#: ../src/browser.c:3131 ../src/misc.c:1909
+#: ../src/browser.c:3105 ../src/misc.c:1909
 msgid "Track"
 msgstr "Ścieżka"
 
-#: ../src/browser.c:3131 ../src/cddb.c:810 ../src/misc.c:1910
+#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1910
 #: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Gatunek"
 
-#: ../src/browser.c:3132 ../src/misc.c:1911 ../src/prefs.c:647
+#: ../src/browser.c:3106 ../src/misc.c:1911 ../src/prefs.c:647
 msgid "Comment"
 msgstr "Komentarz"
 
-#: ../src/browser.c:3132 ../src/misc.c:1912 ../src/picture.c:863
+#: ../src/browser.c:3106 ../src/misc.c:1912 ../src/picture.c:1059
 #: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Kompozytor"
 
-#: ../src/browser.c:3133 ../src/misc.c:1913
+#: ../src/browser.c:3107 ../src/misc.c:1913
 msgid "Original Artist"
 msgstr "Pierwotny wykonawca"
 
-#: ../src/browser.c:3134 ../src/misc.c:1914
+#: ../src/browser.c:3108 ../src/misc.c:1914
 msgid "Copyright"
 msgstr "Prawa autorskie"
 
-#: ../src/browser.c:3134 ../src/misc.c:1915
+#: ../src/browser.c:3108 ../src/misc.c:1915
 msgid "URL"
 msgstr "URL"
 
-#: ../src/browser.c:3135 ../src/misc.c:1916
+#: ../src/browser.c:3109 ../src/misc.c:1916
 msgid "Encoded By"
 msgstr "Koder"
 
-#: ../src/browser.c:3136
+#: ../src/browser.c:3110
 msgid "# Albums"
 msgstr "# Albumy"
 
-#: ../src/browser.c:3137 ../src/browser.c:3138
+#: ../src/browser.c:3111 ../src/browser.c:3112
 msgid "# Files"
 msgstr "# Pliki"
 
-#: ../src/browser.c:3163
+#: ../src/browser.c:3137
 msgid "Enter a directory to browse."
 msgstr "Proszę podać katalog do przeglądania."
 
-#: ../src/browser.c:3172
+#: ../src/browser.c:3146
 msgid "Select a directory to browse."
 msgstr "Proszę wybrać katalog do przeglądania."
 
@@ -870,33 +870,33 @@ msgstr "Proszę wybrać katalog do przeglądania."
 #. * The label for displaying number of files in path (without subdirs)
 #.
 #. Translators: No files, as in "0 files".
-#: ../src/browser.c:3179 ../src/easytag.c:3440
+#: ../src/browser.c:3153 ../src/easytag.c:3468
 msgid "No files"
 msgstr "Brak plików"
 
-#: ../src/browser.c:3257
+#: ../src/browser.c:3231
 msgid "Artist & Album"
 msgstr "Wykonawca i album"
 
 #. Only directories changed
-#: ../src/browser.c:3621 ../src/easytag.c:2858
+#: ../src/browser.c:3595 ../src/easytag.c:2880
 msgid "Rename Directory"
 msgstr "Zmień nazwę katalogu"
 
-#: ../src/browser.c:3643
+#: ../src/browser.c:3617
 #, c-format
 msgid "Rename the directory '%s' to:"
 msgstr "Zmiana nazwy katalogu \"%s\" na:"
 
-#: ../src/browser.c:3662 ../src/misc.c:1171
+#: ../src/browser.c:3636 ../src/misc.c:1171
 msgid "Use mask:"
 msgstr "Maska:"
 
-#: ../src/browser.c:3665
+#: ../src/browser.c:3639
 msgid "If activated, it will use masks to rename directory."
 msgstr "Jeśli jest włączone, to użyje maski do zmiany nazwy katalogu."
 
-#: ../src/browser.c:3683
+#: ../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."
@@ -905,64 +905,64 @@ msgstr ""
 "\"), aby zmienić nazwę katalogu z pól etykiet."
 
 #. Preview label
-#: ../src/browser.c:3707
+#: ../src/browser.c:3681
 msgid "Rename directory preview"
 msgstr "Podgląd zmiany nazwy katalogu"
 
-#: ../src/browser.c:3799
+#: ../src/browser.c:3773
 msgid "You must type a directory name"
 msgstr "Należy wprowadzić nazwę katalogu"
 
-#: ../src/browser.c:3800 ../src/browser.c:3821
+#: ../src/browser.c:3774 ../src/browser.c:3795
 msgid "Directory Name Error"
 msgstr "Błąd nazwy katalogu"
 
-#: ../src/browser.c:3818
+#: ../src/browser.c:3792
 #, c-format
 msgid "Could not convert '%s' into filename encoding."
 msgstr "Nie można przekonwertować \"%s\" na kodowanie znaków nazwy pliku."
 
-#: ../src/browser.c:3820
+#: ../src/browser.c:3794
 msgid "Please use another name"
 msgstr "Proszę użyć innej nazwy"
 
-#: ../src/browser.c:3890
+#: ../src/browser.c:3864
 #, c-format
 msgid "The directory name '%s' already exists"
 msgstr "Nazwa katalogu \"%s\" już istnieje"
 
-#: ../src/browser.c:3891 ../src/easytag.c:2941
+#: ../src/browser.c:3865 ../src/easytag.c:2963
 msgid "Rename File Error"
 msgstr "Błąd zmiany nazwy pliku"
 
-#: ../src/browser.c:3929 ../src/browser.c:3958
+#: ../src/browser.c:3903 ../src/browser.c:3932
 msgid "Rename Directory Error"
 msgstr "Błąd zmiany nazwy katalogu"
 
-#: ../src/browser.c:3996
+#: ../src/browser.c:3970
 msgid "Directory renamed"
 msgstr "Zmieniono nazwę katalogu"
 
-#: ../src/browser.c:4032
+#: ../src/browser.c:4006
 msgid "Browse Directory With"
 msgstr "Przeglądaj katalog za pomocą"
 
-#: ../src/browser.c:4048 ../src/browser.c:4174
+#: ../src/browser.c:4022 ../src/browser.c:4148
 msgid "Program to run:"
 msgstr "Program do uruchomienia:"
 
-#: ../src/browser.c:4060
+#: ../src/browser.c:4034
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Proszę podać program do uruchomienia. Otrzyma on bieżący katalog jako "
 "parametr."
 
-#: ../src/browser.c:4154
+#: ../src/browser.c:4128
 msgid "Open Files With"
 msgstr "Otwórz pliki za pomocą"
 
-#: ../src/browser.c:4186
+#: ../src/browser.c:4160
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
@@ -1057,7 +1057,7 @@ msgstr "Wszystkie pola"
 
 #. 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:1037 ../src/prefs.c:807
 msgid "Other"
 msgstr "Inne"
 
@@ -1228,7 +1228,7 @@ msgstr "Dopasowanie wierszy według algorytmu Levenshteina"
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: ../src/cddb.c: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 "
@@ -1650,46 +1650,46 @@ msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Ciąg \"%s\" nie może zostać przekonwertowany na UTF-8 (%s)."
 
 #. Starting messages
-#: ../src/easytag.c:173
+#: ../src/easytag.c:184
 #, c-format
 msgid "Starting EasyTAG version %s (PID: %d)…"
 msgstr "Uruchamianie EasyTAG %s (PID: %d)…"
 
-#: ../src/easytag.c:175
+#: ../src/easytag.c:186
 #, c-format
 msgid "Using libid3tag version %s"
 msgstr "Używanie biblioteki libid3tag w wersji %s"
 
-#: ../src/easytag.c:178
+#: ../src/easytag.c:189
 #, c-format
 msgid "Using id3lib version %d.%d.%d"
 msgstr "Używanie biblioteki id3lib w wersji %d.%d.%d"
 
-#: ../src/easytag.c:184
+#: ../src/easytag.c:195
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
 msgstr "Podano zmienną EASYTAGLANG. Ustawianie lokalizacji: \"%s\""
 
-#: ../src/easytag.c:186
+#: ../src/easytag.c:197
 #, c-format
 msgid "Setting locale: '%s'"
 msgstr "Ustawianie lokalizacji: \"%s\""
 
-#: ../src/easytag.c:191
+#: ../src/easytag.c:202
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')"
 msgstr "Używanie lokalizacji \"%s\" (i ostatecznie \"%s\")"
 
-#: ../src/easytag.c:198
+#: ../src/easytag.c:209
 msgid "Unable to create setting directories"
 msgstr "Nie można utworzyć katalogów ustawień"
 
-#: ../src/easytag.c:415 ../src/et_core.c:582
+#: ../src/easytag.c:426 ../src/et_core.c:597 ../src/et_core.c:609
 #, c-format
 msgid "Error while querying information for file: '%s' (%s)"
 msgstr "Błąd podczas odpytywania informacji o pliku: \"%s\" (%s)"
 
-#: ../src/easytag.c:479
+#: ../src/easytag.c:489
 #, c-format
 msgid "Cannot open path '%s'"
 msgstr "Nie można otworzyć ścieżki \"%s\""
@@ -1697,11 +1697,11 @@ msgstr "Nie można otworzyć ścieżki \"%s\""
 #.
 #. * Browser
 #.
-#: ../src/easytag.c:571 ../src/prefs.c:142
+#: ../src/easytag.c:581 ../src/prefs.c:142
 msgid "Browser"
 msgstr "Przeglądarka"
 
-#: ../src/easytag.c:593 ../src/et_core.c:2769
+#: ../src/easytag.c:603 ../src/et_core.c:2817
 msgid "File"
 msgstr "Plik"
 
@@ -1711,114 +1711,114 @@ msgstr "Plik"
 #. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
 #. Version changed to encoder version
 #. Encoder version
-#: ../src/easytag.c:625 ../src/easytag.c:4168 ../src/flac_header.c:201
+#: ../src/easytag.c:635 ../src/easytag.c:4231 ../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 "Koder:"
 
-#: ../src/easytag.c:633
+#: ../src/easytag.c:643
 msgid "Bitrate:"
 msgstr "Gęstość bitowa:"
 
 #. Translators: Please try to keep this string as short as possible as it
 #. * is shown in a narrow column.
-#: ../src/easytag.c:643
+#: ../src/easytag.c:653
 msgid "Frequency:"
 msgstr "Częstotliwość:"
 
 #. Mode
-#: ../src/easytag.c:654 ../src/easytag.c:4172 ../src/mpeg_header.c:216
+#: ../src/easytag.c:664 ../src/easytag.c:4235 ../src/mpeg_header.c:216
 msgid "Mode:"
 msgstr "Tryb:"
 
-#: ../src/easytag.c:661
+#: ../src/easytag.c:671
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: ../src/easytag.c:668
+#: ../src/easytag.c:678
 msgid "Duration:"
 msgstr "Czas trwania:"
 
 #. Main Frame
-#: ../src/easytag.c:715 ../src/et_core.c:2707
+#: ../src/easytag.c:725 ../src/et_core.c:2747
 msgid "Tag"
 msgstr "Etykieta"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: ../src/easytag.c:737
+#: ../src/easytag.c:747
 msgid "Common"
 msgstr "Ogólne"
 
 #. Title
-#: ../src/easytag.c:744
+#: ../src/easytag.c:754
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: ../src/easytag.c:758
+#: ../src/easytag.c:768
 msgid "Tag selected files with this title"
 msgstr "Tytuł z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Artist
-#: ../src/easytag.c:763
+#: ../src/easytag.c:773
 msgid "Artist:"
 msgstr "Wykonawca:"
 
-#: ../src/easytag.c:777
+#: ../src/easytag.c:787
 msgid "Tag selected files with this artist"
 msgstr "Wykonawca z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Album Artist
-#: ../src/easytag.c:782
+#: ../src/easytag.c:792
 msgid "Album artist:"
 msgstr "Wykonawca albumu:"
 
-#: ../src/easytag.c:796
+#: ../src/easytag.c:806
 msgid "Tag selected files with this album artist"
 msgstr "Wykonawca albumu z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Album
-#: ../src/easytag.c:801
+#: ../src/easytag.c:811
 msgid "Album:"
 msgstr "Album:"
 
-#: ../src/easytag.c:815
+#: ../src/easytag.c:825
 msgid "Tag selected files with this album name"
 msgstr "Nazwa albumu z tego pola zostanie wstawiona do zaznaczonych plików"
 
 #. Disc Number
-#: ../src/easytag.c:820
+#: ../src/easytag.c:830
 msgid "CD:"
 msgstr "CD:"
 
-#: ../src/easytag.c:837
+#: ../src/easytag.c:847
 msgid "Tag selected files with this disc number"
 msgstr "Numer płyty z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Year
-#: ../src/easytag.c:842
+#: ../src/easytag.c:852
 msgid "Year:"
 msgstr "Rok:"
 
-#: ../src/easytag.c:862
+#: ../src/easytag.c:872
 msgid "Tag selected files with this year"
 msgstr "Rok z tego pola zostanie wstawiony do zaznaczonych plików"
 
-#: ../src/easytag.c:876
+#: ../src/easytag.c:886
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Nadaje plikom kolejne numery ścieżek. Zaczyna od 01 w każdym podkatalogu."
 
 #. To have enough space to display the icon
 #. To have enough space to display the icon
-#: ../src/easytag.c:885
+#: ../src/easytag.c:895
 msgid "Track #:"
 msgstr "Ścieżka #:"
 
-#: ../src/easytag.c:916
+#: ../src/easytag.c:926
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1826,73 +1826,73 @@ msgstr ""
 "Ustawia liczbę plików w tym samym katalogu, co wyświetlany plik jako liczbę "
 "ścieżek."
 
-#: ../src/easytag.c:936
+#: ../src/easytag.c:946
 msgid "Tag selected files with this number of tracks"
 msgstr "Numer ścieżki z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Genre
-#: ../src/easytag.c:940
+#: ../src/easytag.c:950
 msgid "Genre:"
 msgstr "Gatunek:"
 
-#: ../src/easytag.c:968
+#: ../src/easytag.c:978
 msgid "Tag selected files with this genre"
 msgstr "Gatunek z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Comment
-#: ../src/easytag.c:973
+#: ../src/easytag.c:983
 msgid "Comment:"
 msgstr "Komentarz:"
 
-#: ../src/easytag.c:1000
+#: ../src/easytag.c:1010
 msgid "Tag selected files with this comment"
 msgstr "Komentarz z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. Composer (name of the composers)
-#: ../src/easytag.c:1007
+#: ../src/easytag.c:1017
 msgid "Composer:"
 msgstr "Kompozytor:"
 
-#: ../src/easytag.c:1021
+#: ../src/easytag.c:1031
 msgid "Tag selected files with this composer"
 msgstr "Kompozytor z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. 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:1028
+#: ../src/easytag.c:1038
 msgid "Orig. artist:"
 msgstr "Pierwotny wykonawca:"
 
-#: ../src/easytag.c:1042
+#: ../src/easytag.c:1052
 msgid "Tag selected files with this original artist"
 msgstr ""
 "Pierwotny wykonawca z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Copyright
-#: ../src/easytag.c:1048
+#: ../src/easytag.c:1058
 msgid "Copyright:"
 msgstr "Prawa autorskie:"
 
-#: ../src/easytag.c:1062
+#: ../src/easytag.c:1072
 msgid "Tag selected files with this copyright"
 msgstr "Prawa autorskie z tego pola zostaną wstawione do zaznaczonych plików"
 
 #. URL
-#: ../src/easytag.c:1068
+#: ../src/easytag.c:1078
 msgid "URL:"
 msgstr "Adres URL:"
 
-#: ../src/easytag.c:1082
+#: ../src/easytag.c:1092
 msgid "Tag selected files with this URL"
 msgstr "Adres URL z tego pola zostaną wstawione do zaznaczonych plików"
 
 #. Encoded by
-#: ../src/easytag.c:1088
+#: ../src/easytag.c:1098
 msgid "Encoded by:"
 msgstr "Skompresowany przez:"
 
-#: ../src/easytag.c:1102
+#: ../src/easytag.c:1112
 msgid "Tag selected files with this encoder name"
 msgstr ""
 "Nazwisko osoby, przez którą plik został utworzony z tego pola zostanie "
@@ -1901,197 +1901,197 @@ msgstr ""
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1136 ../src/et_core.c:3142 ../src/et_core.c:3145
+#: ../src/easytag.c:1146 ../src/et_core.c:3189 ../src/et_core.c:3192
 msgid "Images"
 msgstr "Obrazy"
 
-#: ../src/easytag.c:1160
+#: ../src/easytag.c:1170
 msgid "You can use drag and drop to add an image"
 msgstr "Można tutaj przeciągnąć i upuścić obraz"
 
-#: ../src/easytag.c:1207
+#: ../src/easytag.c:1217
 msgid "Add images to the tag"
 msgstr "Dodaje obrazy do etykiety"
 
-#: ../src/easytag.c:1225
+#: ../src/easytag.c:1235
 msgid "Remove selected images from the tag"
 msgstr "Usuwa zaznaczone obrazy z etykiety"
 
-#: ../src/easytag.c:1239
+#: ../src/easytag.c:1249
 msgid "Save the selected images to files"
 msgstr "Zapisuje zaznaczone obrazy do plików"
 
-#: ../src/easytag.c:1250
+#: ../src/easytag.c:1260
 msgid "Edit image properties"
 msgstr "Modyfikuje właściwości obrazu"
 
-#: ../src/easytag.c:1264
+#: ../src/easytag.c:1274
 msgid "Tag selected files with these images"
 msgstr "Wstawia te obrazy do zaznaczonych plików"
 
-#: ../src/easytag.c:1322
+#: ../src/easytag.c:1332
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Zaznaczonym plikom ustawiono tytuł \"%s\"."
 
-#: ../src/easytag.c:1324
+#: ../src/easytag.c:1334
 msgid "Removed title from selected files."
 msgstr "Usunięto tytuły zaznaczonym plikom."
 
-#: ../src/easytag.c:1339
+#: ../src/easytag.c:1349
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Zaznaczonym plikom ustawiono wykonawcę na \"%s\"."
 
-#: ../src/easytag.c:1341
+#: ../src/easytag.c:1351
 msgid "Removed artist from selected files."
 msgstr "Usunięto wykonawcę z zaznaczonych plików."
 
-#: ../src/easytag.c:1355
+#: ../src/easytag.c:1365
 #, c-format
 msgid "Selected files tagged with album artist '%s'."
 msgstr "Zaznaczonym plikom ustawiono wykonawcę albumu na \"%s\"."
 
-#: ../src/easytag.c:1357
+#: ../src/easytag.c:1367
 msgid "Removed album artist from selected files."
 msgstr "Usunięto wykonawcę albumu z zaznaczonych plików."
 
-#: ../src/easytag.c:1372
+#: ../src/easytag.c:1382
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Zaznaczonym plikom ustawiono album na \"%s\"."
 
-#: ../src/easytag.c:1374
+#: ../src/easytag.c:1384
 msgid "Removed album name from selected files."
 msgstr "Usunięto album z zaznaczonych plików."
 
-#: ../src/easytag.c:1411
+#: ../src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with disc number '%s/%s'."
 msgstr "Zaznaczonym plikom ustawiono numer płyty na \"%s/%s\"."
 
-#: ../src/easytag.c:1416
+#: ../src/easytag.c:1426
 #, c-format
 msgid "Selected files tagged with disc number like 'xx'."
 msgstr "Zaznaczonym plikom ustawiono numer płyty na \"xx\"."
 
-#: ../src/easytag.c:1421
+#: ../src/easytag.c:1431
 msgid "Removed disc number from selected files."
 msgstr "Usunięto numer płyty z zaznaczonych plików."
 
-#: ../src/easytag.c:1437
+#: ../src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Zaznaczonym plikom ustawiono rok na \"%s\"."
 
-#: ../src/easytag.c:1439
+#: ../src/easytag.c:1449
 msgid "Removed year from selected files."
 msgstr "Usunięto rok z zaznaczonych plików."
 
-#: ../src/easytag.c:1465 ../src/easytag.c:1555
+#: ../src/easytag.c:1475 ../src/easytag.c:1566
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Zaznaczonym plikom ustawiono numer ścieżki na \"xx/%s\"."
 
-#: ../src/easytag.c:1468
+#: ../src/easytag.c:1478
 #, c-format
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Zaznaczonym plikom ustawiono numer ścieżki na \"xx\"."
 
-#: ../src/easytag.c:1472 ../src/easytag.c:1558
+#: ../src/easytag.c:1482 ../src/easytag.c:1569
 msgid "Removed track number from selected files."
 msgstr "Usunięto numer ścieżki z zaznaczonych plików."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1528
+#: ../src/easytag.c:1539
 #, c-format
 msgid "Selected tracks numbered sequentially."
 msgstr "Zaznaczone pliki ponumerowano według kolejności."
 
-#: ../src/easytag.c:1574
+#: ../src/easytag.c:1585
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Zaznaczonym plikom ustawiono gatunek na \"%s\"."
 
-#: ../src/easytag.c:1576
+#: ../src/easytag.c:1587
 msgid "Removed genre from selected files."
 msgstr "Usunięto gatunek z zaznaczonych plików."
 
-#: ../src/easytag.c:1598
+#: ../src/easytag.c:1609
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Zaznaczonym plikom ustawiono komentarz na \"%s\"."
 
-#: ../src/easytag.c:1600
+#: ../src/easytag.c:1611
 msgid "Removed comment from selected files."
 msgstr "Usunięto komentarz z zaznaczonych plików."
 
-#: ../src/easytag.c:1614
+#: ../src/easytag.c:1625
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Zaznaczonym plikom ustawiono kompozytora na \"%s\"."
 
-#: ../src/easytag.c:1616
+#: ../src/easytag.c:1627
 msgid "Removed composer from selected files."
 msgstr "Usunięto kompozytora z zaznaczonych plików."
 
-#: ../src/easytag.c:1631
+#: ../src/easytag.c:1642
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Zaznaczonym plikom ustawiono pierwotnego wykonawcę na \"%s\"."
 
-#: ../src/easytag.c:1633
+#: ../src/easytag.c:1644
 msgid "Removed original artist from selected files."
 msgstr "Usunięto pierwotnego wykonawcę z zaznaczonych plików."
 
-#: ../src/easytag.c:1648
+#: ../src/easytag.c:1659
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Zaznaczonym plikom ustawiono prawa autorskie na \"%s\"."
 
-#: ../src/easytag.c:1650
+#: ../src/easytag.c:1661
 msgid "Removed copyright from selected files."
 msgstr "Usunięto prawa autorskie z zaznaczonych plików."
 
-#: ../src/easytag.c:1665
+#: ../src/easytag.c:1676
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Zaznaczonym plikom ustawiono adres URL na \"%s\"."
 
-#: ../src/easytag.c:1667
+#: ../src/easytag.c:1678
 msgid "Removed URL from selected files."
 msgstr "Usunięto adres URL z zaznaczonych plików."
 
-#: ../src/easytag.c:1682
+#: ../src/easytag.c:1693
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Zaznaczonym plikom ustawiono nazwisko kodera na \"%s\"."
 
-#: ../src/easytag.c:1684
+#: ../src/easytag.c:1695
 msgid "Removed encoder name from selected files."
 msgstr "Usunięto nazwisko kodera z zaznaczonych plików."
 
-#: ../src/easytag.c:1716
+#: ../src/easytag.c:1727
 msgid "Selected files tagged with images."
 msgstr "Ustawiono obrazy w zaznaczonych plikach."
 
-#: ../src/easytag.c:1718
+#: ../src/easytag.c:1729
 msgid "Removed images from selected files."
 msgstr "Usunięto obrazy z zaznaczonych plików."
 
-#: ../src/easytag.c:1999
+#: ../src/easytag.c:2010
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Proszę wybrać tryb i maskę, po czym ponowić to samo działanie"
 
-#: ../src/easytag.c:2051
+#: ../src/easytag.c:2062
 msgid "All tags have been scanned"
 msgstr "Wszystkie etykiety zostały zeskanowane"
 
-#: ../src/easytag.c:2107
+#: ../src/easytag.c:2118
 msgid "All tags have been removed"
 msgstr "Wszystkie etykiety zostały usunięte"
 
-#: ../src/easytag.c:2412
+#: ../src/easytag.c:2423
 #, c-format
 msgid "A file was changed by an external program"
 msgid_plural "%d files were changed by an external program."
@@ -2099,153 +2099,153 @@ msgstr[0] "Plik został zmieniony przez zewnętrzny program"
 msgstr[1] "%d pliki zostały zmienione przez zewnętrzny program."
 msgstr[2] "%d plików zostało zmienionych przez zewnętrzny program."
 
-#: ../src/easytag.c:2417
+#: ../src/easytag.c:2428
 msgid "Do you want to continue saving the file?"
 msgstr "Kontynuować zapisywanie pliku?"
 
-#: ../src/easytag.c:2472 ../src/easytag.c:2492
+#: ../src/easytag.c:2486 ../src/easytag.c:2506
 msgid "Saving files was stopped"
 msgstr "Zatrzymano zapisywanie plików"
 
-#: ../src/easytag.c:2494
+#: ../src/easytag.c:2508
 msgid "All files have been saved"
 msgstr "Wszystkie pliki zostały zapisane"
 
-#: ../src/easytag.c:2625
+#: ../src/easytag.c:2643
 #, c-format
 msgid "Cannot delete file (%s)"
 msgstr "Nie można usunąć pliku (%s)"
 
-#: ../src/easytag.c:2645
+#: ../src/easytag.c:2664
 msgid "Files have been partially deleted"
 msgstr "Pliki zostały częściowo usunięte"
 
-#: ../src/easytag.c:2647
+#: ../src/easytag.c:2666
 msgid "All files have been deleted"
 msgstr "Wszystkie pliki zostały usunięte"
 
-#: ../src/easytag.c:2763
+#: ../src/easytag.c:2782
 #, c-format
 msgid "Do you want to write the tag of file '%s'?"
 msgstr "Zapisać etykietę pliku \"%s\"?"
 
-#: ../src/easytag.c:2765
+#: ../src/easytag.c:2784
 msgid "Confirm Tag Writing"
 msgstr "Potwierdzenie zapisania etykiety"
 
-#: ../src/easytag.c:2770 ../src/easytag.c:2887 ../src/easytag.c:3147
+#: ../src/easytag.c:2789 ../src/easytag.c:2909 ../src/easytag.c:3172
 msgid "Repeat action for the remaining files"
 msgstr "Powtórzenie działania dla pozostałych plików"
 
 #. Directories and filename changed
-#: ../src/easytag.c:2851 ../src/scan.c:181
+#: ../src/easytag.c:2873 ../src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Zmień nazwę pliku i katalogu"
 
-#: ../src/easytag.c:2852
+#: ../src/easytag.c:2874
 msgid "File and directory rename confirmation required"
 msgstr "Wymagane jest potwierdzenie zmiany nazwy pliku i katalogu"
 
-#: ../src/easytag.c:2853
+#: ../src/easytag.c:2875
 #, c-format
 msgid "Do you want to rename the file and directory '%s' to '%s'?"
 msgstr "Zmienić nazwę pliku i katalogu z \"%s\" na \"%s\"?"
 
-#: ../src/easytag.c:2859
+#: ../src/easytag.c:2881
 msgid "Directory rename confirmation required"
 msgstr "Wymagane jest potwierdzenie zmiany nazwy katalogu"
 
-#: ../src/easytag.c:2860
+#: ../src/easytag.c:2882
 #, c-format
 msgid "Do you want to rename the directory '%s' to '%s'?"
 msgstr "Zmienić nazwę katalogu \"%s\" na \"%s\"?"
 
 #. Only filename changed
-#: ../src/easytag.c:2866
+#: ../src/easytag.c:2888
 msgid "Rename File"
 msgstr "Zmień nazwę pliku"
 
-#: ../src/easytag.c:2867
+#: ../src/easytag.c:2889
 msgid "File rename confirmation required"
 msgstr "Wymagane jest potwierdzenie zmiany nazwy pliku"
 
-#: ../src/easytag.c:2868
+#: ../src/easytag.c:2890
 #, c-format
 msgid "Do you want to rename the file '%s' to '%s'?"
 msgstr "Zmienić nazwę pliku \"%s\" na \"%s\"?"
 
-#: ../src/easytag.c:2934
+#: ../src/easytag.c:2956
 #, c-format
 msgid "Cannot rename file '%s' to '%s'"
 msgstr "Nie można zmienić nazwy pliku \"%s\" na \"%s\""
 
-#: ../src/easytag.c:2948
+#: ../src/easytag.c:2970
 #, c-format
 msgid "Cannot rename file '%s' to '%s': %s"
 msgstr "Nie można zmienić nazwy pliku \"%s\" na \"%s\": %s"
 
-#: ../src/easytag.c:2952
+#: ../src/easytag.c:2974
 msgid "File(s) not renamed"
 msgstr "Pliki, którym nie zmieniono nazwy"
 
-#: ../src/easytag.c:3061
+#: ../src/easytag.c:3086
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Zapisywanie etykiety \"%s\""
 
-#: ../src/easytag.c:3068
+#: ../src/easytag.c:3093
 msgid "Tag(s) written"
 msgstr "Zapisano etykiety"
 
-#: ../src/easytag.c:3083
+#: ../src/easytag.c:3108
 #, c-format
 msgid "Cannot write tag in file '%s' (%s)"
 msgstr "Nie można zapisać etykiety w pliku \"%s\" (%s)"
 
-#: ../src/easytag.c:3096
+#: ../src/easytag.c:3121
 #, c-format
 msgid "Cannot write tag in file '%s'"
 msgstr "Nie można zapisać etykiety w pliku \"%s\""
 
-#: ../src/easytag.c:3099
+#: ../src/easytag.c:3124
 msgid "Tag Write Error"
 msgstr "Błąd zapisu etykiety"
 
-#: ../src/easytag.c:3144 ../src/easytag.c:3158
+#: ../src/easytag.c:3169 ../src/easytag.c:3183
 #, c-format
 msgid "Do you really want to delete the file '%s'?"
 msgstr "Na pewno usunąć plik \"%s\"?"
 
-#: ../src/easytag.c:3150 ../src/easytag.c:3160
+#: ../src/easytag.c:3175 ../src/easytag.c:3185
 msgid "Delete File"
 msgstr "Usuń pliki"
 
-#: ../src/easytag.c:3185
+#: ../src/easytag.c:3210
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Usunięto plik \"%s\""
 
-#: ../src/easytag.c:3317
+#: ../src/easytag.c:3345
 #, c-format
 msgid "Cannot read directory '%s'"
 msgstr "Nie można odczytać katalogu \"%s\""
 
-#: ../src/easytag.c:3321
+#: ../src/easytag.c:3349
 msgid "Directory Read Error"
 msgstr "Błąd odczytu katalogu"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3342
+#: ../src/easytag.c:3370
 #, c-format
 msgid "Search in progress…"
 msgstr "Trwa wyszukiwanie…"
 
-#: ../src/easytag.c:3365 ../src/et_core.c:2776
+#: ../src/easytag.c:3393 ../src/et_core.c:2824
 #, c-format
 msgid "File: '%s'"
 msgstr "Plik: \"%s\""
 
-#: ../src/easytag.c:3415
+#: ../src/easytag.c:3443
 #, c-format
 msgid "Found one file in this directory and subdirectories"
 msgid_plural "Found %d files in this directory and subdirectories"
@@ -2253,7 +2253,7 @@ msgstr[0] "Odnaleziono jeden plik w tym katalogu i jego podkatalogach"
 msgstr[1] "Odnaleziono %d pliki w tym katalogu i jego podkatalogach"
 msgstr[2] "Odnaleziono %d plików w tym katalogu i jego podkatalogach"
 
-#: ../src/easytag.c:3422
+#: ../src/easytag.c:3450
 #, c-format
 msgid "Found one file in this directory"
 msgid_plural "Found %d files in this directory"
@@ -2261,178 +2261,191 @@ msgstr[0] "Odnaleziono jeden plik w tym katalogu"
 msgstr[1] "Odnaleziono %d pliki w tym katalogu"
 msgstr[2] "Odnaleziono %d plików w tym katalogu"
 
-#: ../src/easytag.c:3444
+#: ../src/easytag.c:3472
 msgid "No file found in this directory and subdirectories"
 msgstr "Nie odnaleziono żadnego pliku w tym katalogu i jego podkatalogach"
 
-#: ../src/easytag.c:3446
+#: ../src/easytag.c:3474
 msgid "No file found in this directory"
 msgstr "Nie odnaleziono żadnego pliku w tym katalogu"
 
-#: ../src/easytag.c:3514
+#: ../src/easytag.c:3542
 #, c-format
 msgid "Error opening directory '%s' (%s)"
 msgstr "Błąd podczas otwierania katalogu \"%s\" (%s)"
 
-#: ../src/easytag.c:3550
+#: ../src/easytag.c:3578
 #, c-format
 msgid "Cannot read directory (%s)"
 msgstr "Nie można odczytać katalogu (%s)"
 
-#: ../src/easytag.c:3570
+#: ../src/easytag.c:3598
 msgid "Searching for audio files…"
 msgstr "Wyszukiwanie plików dźwiękowych…"
 
-#: ../src/easytag.c:3571
+#: ../src/easytag.c:3599
 msgid "Searching"
 msgstr "Wyszukiwanie"
 
-#: ../src/easytag.c:4202
+#: ../src/easytag.c:4265
 msgid "Select a directory to browse"
 msgstr "Proszę wybrać katalog do przeglądania"
 
 #. Menu items
-#: ../src/easytag.c:4349
+#: ../src/easytag.c:4412
 msgid "Tag selected files with this field"
 msgstr "Wartość z tego pola zostanie wstawiona do zaznaczonych plików"
 
-#: ../src/easytag.c:4361 ../src/scan.c:2654
+#: ../src/easytag.c:4424 ../src/scan.c:2318
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Zamiana \"_\" i \"%20\" na spacje"
 
-#: ../src/easytag.c:4368 ../src/scan.c:2656
+#: ../src/easytag.c:4431 ../src/scan.c:2320
 msgid "Convert ' ' to '_'"
 msgstr "Zamiana \" \" na \"_\""
 
-#: ../src/easytag.c:4379
+#: ../src/easytag.c:4442
 msgid "All uppercase"
 msgstr "Wszystko wielką literą"
 
-#: ../src/easytag.c:4386
+#: ../src/easytag.c:4449
 msgid "All lowercase"
 msgstr "Wszystko małą literą"
 
-#: ../src/easytag.c:4393
+#: ../src/easytag.c:4456
 msgid "First letter uppercase"
 msgstr "Wielka pierwsza litera"
 
-#: ../src/easytag.c:4400
+#: ../src/easytag.c:4463
 msgid "First letter uppercase of each word"
 msgstr "Wielka pierwsza litera każdego słowa"
 
-#: ../src/easytag.c:4411 ../src/prefs.c:1023 ../src/scan.c:2754
+#: ../src/easytag.c:4474 ../src/prefs.c:1023 ../src/scan.c:2418
 msgid "Remove spaces"
 msgstr "Usuwanie spacji"
 
-#: ../src/easytag.c:4418
+#: ../src/easytag.c:4481
 msgid "Insert space before uppercase letter"
 msgstr "Wstawianie spacji przed wielką literą"
 
-#: ../src/easytag.c:4425
+#: ../src/easytag.c:4488
 msgid "Remove duplicate spaces or underscores"
 msgstr "Usuwanie powtarzających się spacji lub znaków podkreślenia"
 
-#: ../src/easytag.c:4432
+#: ../src/easytag.c:4495
 msgid "Remove all text"
 msgstr "Usuwanie całego tekstu"
 
-#: ../src/easytag.c:4451
+#: ../src/easytag.c:4514
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: prawidłowe zakończenie działania."
 
-#: ../src/easytag.c:4503
+#: ../src/easytag.c:4566
 msgid "Do you want to save them before quitting?"
 msgstr "Zapisać je przed zakończeniem działania?"
 
-#: ../src/easytag.c:4526
+#: ../src/easytag.c:4593
 msgid "Do you really want to quit?"
 msgstr "Na pewno zakończyć działanie?"
 
-#: ../src/et_core.c:504
+#: ../src/et_core.c:510
 #, c-format
 msgid "Error reading tag from ogg file (%s)"
 msgstr "Błąd podczas odczytywania etykiety z pliku Ogg (%s)"
 
-#: ../src/et_core.c:656
+#: ../src/et_core.c:539
+#, c-format
+msgid "Error reading tag from Opus file (%s)"
+msgstr "Błąd podczas odczytywania etykiety z pliku Opus (%s)"
+
+#: ../src/et_core.c:682
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr "Zastosowano automatyczne poprawki do pliku \"%s\"."
 
-#: ../src/et_core.c:2673
+#: ../src/et_core.c:2707
 msgid "ID3 Tag"
 msgstr "Etykieta ID3"
 
-#: ../src/et_core.c:2679
+#: ../src/et_core.c:2713
 msgid "Ogg Vorbis Tag"
 msgstr "Etykieta Ogg Vorbis"
 
-#: ../src/et_core.c:2685
+#: ../src/et_core.c:2719
 msgid "FLAC Vorbis Tag"
 msgstr "Etykieta FLAC Vorbis"
 
-#: ../src/et_core.c:2690
+#: ../src/et_core.c:2724
 msgid "APE Tag"
 msgstr "Etykieta APE"
 
-#: ../src/et_core.c:2695
+#: ../src/et_core.c:2729
 msgid "MP4/M4A/AAC Tag"
 msgstr "Etykieta MP4/M4A/AAC"
 
-#: ../src/et_core.c:2701
+#: ../src/et_core.c:2735
 msgid "Wavpack Tag"
-msgstr "Etykieta Wavpack"
+msgstr "Etykieta WavPack"
 
-#: ../src/et_core.c:2721
+#: ../src/et_core.c:2741
+msgid "Opus Tag"
+msgstr "Etykieta Opus"
+
+#: ../src/et_core.c:2761
 msgid "MP3 File"
 msgstr "Plik MP3"
 
-#: ../src/et_core.c:2725
+#: ../src/et_core.c:2765
 msgid "MP2 File"
 msgstr "Plik MP2"
 
-#: ../src/et_core.c:2731
+#: ../src/et_core.c:2771
 msgid "Ogg Vorbis File"
 msgstr "Plik Ogg Vorbis"
 
-#: ../src/et_core.c:2737
+#: ../src/et_core.c:2777
 msgid "Speex File"
 msgstr "Plik Speex"
 
-#: ../src/et_core.c:2743
+#: ../src/et_core.c:2783
 msgid "FLAC File"
 msgstr "Plik FLAC"
 
-#: ../src/et_core.c:2748
+#: ../src/et_core.c:2788
 msgid "MusePack File"
 msgstr "Plik MusePack"
 
-#: ../src/et_core.c:2752
+#: ../src/et_core.c:2792
 msgid "Monkey's Audio File"
 msgstr "Plik Monkey's Audio"
 
-#: ../src/et_core.c:2757
+#: ../src/et_core.c:2797
 msgid "MP4/AAC File"
 msgstr "Plik MP4/AAC"
 
-#: ../src/et_core.c:2763
+#: ../src/et_core.c:2803
 msgid "Wavpack File"
-msgstr "Plik Wavpack"
+msgstr "Plik WavPack"
+
+#: ../src/et_core.c:2809
+msgid "Opus File"
+msgstr "Plik Opus"
 
-#: ../src/et_core.c:2820 ../src/et_core.c:2875
+#: ../src/et_core.c:2868 ../src/et_core.c:2923
 msgid "File not found"
 msgstr "Nie odnaleziono pliku"
 
-#: ../src/et_core.c:2825
+#: ../src/et_core.c:2873
 #, c-format
 msgid "Cannot query file information (%s)"
 msgstr "Nie można odpytać informacji o pliku (%s)"
 
-#: ../src/et_core.c:2859
+#: ../src/et_core.c:2907
 msgid "Read-only file"
 msgstr "Plik tylko do odczytu"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2923
+#: ../src/et_core.c:2971
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
@@ -2440,44 +2453,44 @@ msgstr[0] "Jeden plik"
 msgstr[1] "%u pliki"
 msgstr[2] "%u plików"
 
-#: ../src/et_core.c:3128
+#: ../src/et_core.c:3175
 #, c-format
 msgid "Images (%d)"
 msgstr "Obrazy (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3170 ../src/flac_header.c:205
+#: ../src/et_core.c:3217 ../src/flac_header.c:205
 #: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
 #: ../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:3175 ../src/flac_header.c:210
+#: ../src/et_core.c:3222 ../src/flac_header.c:210
 #: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
 #: ../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:3318 ../src/scan.c:690
+#: ../src/et_core.c:3368 ../src/scan.c:686
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding"
 msgstr ""
 "Nie można przekonwertować nazwy pliku \"%s\" na systemowe kodowanie znaków"
 
-#: ../src/et_core.c:3320
+#: ../src/et_core.c:3370
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Proszę spróbować ustawić zmienną środowiskową G_FILENAME_ENCODING."
 
-#: ../src/et_core.c:3321 ../src/scan.c:692
+#: ../src/et_core.c:3371 ../src/scan.c:688
 msgid "Filename translation"
 msgstr "Tłumaczenie nazw plików"
 
-#: ../src/et_core.c:4021
+#: ../src/et_core.c:4076
 #, c-format
 msgid "Error writing tag type %d to file %s (%s)"
 msgstr "Błąd podczas zapisywania etykiety typu %d do pliku %s (%s)"
@@ -2487,7 +2500,7 @@ msgstr "Błąd podczas zapisywania etykiety typu %d do pliku %s (%s)"
 #. 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/opus_header.c:237 ../src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Kanały:"
 
@@ -2496,7 +2509,7 @@ msgstr "Kanały:"
 msgid "Error while opening file: '%s' as FLAC (%s)."
 msgstr "Błąd podczas otwierania pliku: \"%s\" jako 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 "
@@ -2515,7 +2528,7 @@ msgstr "Nieprawidłowy blok obrazu: \"%s\""
 msgid "Error: Failed to write comments to file '%s' (%s)."
 msgstr "Błąd: zapisanie komentarzy do pliku \"%s\" się nie powiodło (%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 "Zapisano etykietę pliku \"%s\""
@@ -2538,27 +2551,27 @@ msgstr ""
 msgid "Corrupted file"
 msgstr "Uszkodzony plik"
 
-#: ../src/id3_tag.c:540
+#: ../src/id3_tag.c:555
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Usunięto etykietę z pliku \"%s\""
 
-#: ../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 "Błąd podczas usuwania etykiety ID3v1 pliku \"%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 "Błąd podczas usuwania etykiety ID3v2 pliku \"%s\" (%s)"
 
-#: ../src/id3_tag.c:565
+#: ../src/id3_tag.c:580
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Błąd podczas uaktualniania etykiety ID3v2 pliku \"%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"
@@ -2566,7 +2579,7 @@ msgstr ""
 "Próbowano zapisać tę etykietę w unikodzie, ale wykryto wersję biblioteki "
 "id3lib z błędami"
 
-#: ../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 "
@@ -2585,90 +2598,90 @@ msgstr ""
 "\n"
 "Plik: %s"
 
-#: ../src/id3_tag.c:602
+#: ../src/id3_tag.c:617
 msgid "Buggy id3lib"
 msgstr "Biblioteka id3lib z błędami"
 
-#: ../src/id3_tag.c:636
+#: ../src/id3_tag.c:651
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Błąd podczas aktualizowania etykiety ID3v1 pliku \"%s\" (%s)"
 
-#: ../src/id3_tag.c:650 ../src/id3v24_tag.c:1050
+#: ../src/id3_tag.c:665 ../src/id3v24_tag.c:1048
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Zaktualizowano etykietę pliku \"%s\""
 
-#: ../src/id3_tag.c:669
+#: ../src/id3_tag.c:684
 msgid "No error reported"
 msgstr "Nie zgłoszono błędów"
 
-#: ../src/id3_tag.c:671
+#: ../src/id3_tag.c:686
 msgid "No available memory"
 msgstr "Brak dostępnej pamięci"
 
-#: ../src/id3_tag.c:673
+#: ../src/id3_tag.c:688
 msgid "No data to parse"
 msgstr "Brak danych do przetwarzania"
 
-#: ../src/id3_tag.c:675
+#: ../src/id3_tag.c:690
 msgid "Improperly formatted data"
 msgstr "Niepoprawnie sformatowane dane"
 
-#: ../src/id3_tag.c:677
+#: ../src/id3_tag.c:692
 msgid "No buffer to write to"
 msgstr "Brak bufora do zapisu"
 
-#: ../src/id3_tag.c:679
+#: ../src/id3_tag.c:694
 msgid "Buffer is too small"
 msgstr "Bufor jest za mały"
 
-#: ../src/id3_tag.c:681
+#: ../src/id3_tag.c:696
 msgid "Invalid frame ID"
 msgstr "Nieprawidłowy identyfikator ramki"
 
-#: ../src/id3_tag.c:683
+#: ../src/id3_tag.c:698
 msgid "Requested field not found"
 msgstr "Nie odnaleziono żądanego pola"
 
-#: ../src/id3_tag.c:685
+#: ../src/id3_tag.c:700
 msgid "Unknown field type"
 msgstr "Nieznany typ pola"
 
-#: ../src/id3_tag.c:687
+#: ../src/id3_tag.c:702
 msgid "Tag is already attached to a file"
 msgstr "Plik już posiada dołączoną etykietę"
 
-#: ../src/id3_tag.c:689
+#: ../src/id3_tag.c:704
 msgid "Invalid tag version"
 msgstr "Nieprawidłowa wersja etykiety"
 
-#: ../src/id3_tag.c:691
+#: ../src/id3_tag.c:706
 msgid "No file to parse"
 msgstr "Brak pliku do przetwarzania"
 
-#: ../src/id3_tag.c:693
+#: ../src/id3_tag.c:708
 msgid "Attempting to write to a read-only file"
 msgstr "Próba zapisania do pliku tylko do odczytu"
 
-#: ../src/id3_tag.c:695
+#: ../src/id3_tag.c:710
 msgid "Error in compression/uncompression"
 msgstr "Błąd podczas kompresji/dekompresji"
 
-#: ../src/id3_tag.c:697
+#: ../src/id3_tag.c:712
 msgid "Unknown error message"
 msgstr "Nieznany komunikat błędu"
 
-#: ../src/id3_tag.c:1301
+#: ../src/id3_tag.c:1316
 #, c-format
 msgid "Error while creating temporary file: '%s'"
 msgstr "Błąd podczas tworzenia pliku tymczasowego: \"%s\""
 
-#: ../src/id3_tag.c:1308
+#: ../src/id3_tag.c:1323
 msgid "Error while creating temporary file"
 msgstr "Błąd podczas tworzenia pliku tymczasowego"
 
-#: ../src/id3_tag.c:1328
+#: ../src/id3_tag.c:1343
 #, c-format
 msgid "Error while writing to file: '%s' (%s)"
 msgstr "Błąd podczas zapisywania do pliku: \"%s\" (%s)"
@@ -2678,7 +2691,7 @@ msgstr "Błąd podczas zapisywania do pliku: \"%s\" (%s)"
 #. * missing (not read for some reason) while reading from
 #. * the file.
 #.
-#: ../src/id3v24_tag.c:1505
+#: ../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)"
@@ -2686,12 +2699,12 @@ msgstr[0] "Nie można zapisać etykiety w pliku \"%s\" (brak jednego bajtu)"
 msgstr[1] "Nie można zapisać etykiety w pliku \"%s\" (brak %s bajtów)"
 msgstr[2] "Nie można zapisać etykiety w pliku \"%s\" (brak %s bajtów)"
 
-#: ../src/id3v24_tag.c:1526
+#: ../src/id3v24_tag.c:1524
 #, c-format
 msgid "Cannot save tag of file '%s'"
 msgstr "Nie można zapisać etykiety pliku \"%s\""
 
-#: ../src/id3v24_tag.c:1537
+#: ../src/id3v24_tag.c:1535
 #, c-format
 msgid "Size error while saving tag of '%s'"
 msgstr "Błąd rozmiaru podczas etykiety pliku \"%s\""
@@ -2817,7 +2830,7 @@ msgstr "Błąd pliku listy odtwarzania"
 msgid "Written playlist file '%s'"
 msgstr "Zapisano listę odtwarzania \"%s\""
 
-#: ../src/misc.c:1543 ../src/scan.c:3239 ../src/scan.c:3301
+#: ../src/misc.c:1543 ../src/scan.c:2903 ../src/scan.c:2965
 msgid "Invalid scanner mask"
 msgstr "Nieprawidłowa maska skanera"
 
@@ -3069,175 +3082,184 @@ msgstr ""
 msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
 msgstr "Błąd: otwarcie pliku się nie powiodło: \"%s\" jako Vorbis (%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 "Ostrzeżenie: plik Ogg Vorbis \"%s\" zawiera etykietę ID3v2."
 
-#: ../src/picture.c:244 ../src/picture.c:269
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1257
 #, c-format
-msgid "Image file not loaded: %s"
-msgstr "Plik obrazu nie został wczytany: %s"
+msgid "Error with 'loader_write': %s"
+msgstr "Błąd \"loader_write\": %s"
 
-#: ../src/picture.c:261
+#: ../src/ogg_tag.c:1050 ../src/picture.c:1180
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr "Błąd \"loader_close\": %s"
+
+#: ../src/picture.c:104
+#, c-format
+msgid "Image file not saved: %s"
+msgstr "Plik obrazu nie został zapisany: %s"
+
+#: ../src/picture.c:154
 #, c-format
 msgid "Cannot open file: '%s'"
 msgstr "Nie można otworzyć pliku: \"%s\""
 
-#: ../src/picture.c:265
+#: ../src/picture.c:158
 msgid "Image File Error"
 msgstr "Błąd pliku obrazu"
 
-#: ../src/picture.c:276
+#: ../src/picture.c:162 ../src/picture.c:424
+#, c-format
+msgid "Image file not loaded: %s"
+msgstr "Plik obrazu nie został wczytany: %s"
+
+#: ../src/picture.c:446
 msgid "Image file loaded"
 msgstr "Wczytano plik obrazu"
 
-#: ../src/picture.c:334
+#: ../src/picture.c:504
 msgid "Add Images"
 msgstr "Dodaj obrazy"
 
-#: ../src/picture.c:344 ../src/picture.c:700
+#: ../src/picture.c:514 ../src/picture.c:874
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
-#: ../src/picture.c:350 ../src/picture.c:706
+#: ../src/picture.c:520 ../src/picture.c:880
 msgid "PNG and JPEG"
 msgstr "PNG i JPEG"
 
-#: ../src/picture.c:477
+#: ../src/picture.c:651
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Właściwości obrazu %d/%d"
 
-#: ../src/picture.c:501
+#: ../src/picture.c:675
 msgid "Image Type"
 msgstr "Typ obrazu"
 
 #. Description of the picture
-#: ../src/picture.c:560
+#: ../src/picture.c:734
 msgid "Image Description:"
 msgstr "Opis obrazu:"
 
-#: ../src/picture.c:687
+#: ../src/picture.c:861
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Zapisz obraz %d/%d"
 
-#: ../src/picture.c:759
-#, c-format
-msgid "Image file not saved: %s"
-msgstr "Plik obrazu nie został zapisany: %s"
-
-#: ../src/picture.c:827
+#: ../src/picture.c:1021
 msgid "JPEG image"
 msgstr "Obraz JPEG"
 
-#: ../src/picture.c:829
+#: ../src/picture.c:1023
 msgid "PNG image"
 msgstr "Obraz PNG"
 
-#: ../src/picture.c:831
+#: ../src/picture.c:1025
+msgid "GIF image"
+msgstr "Obraz GIF"
+
+#: ../src/picture.c:1027
 msgid "Unknown image"
 msgstr "Nieznany obraz"
 
-#: ../src/picture.c:843
+#: ../src/picture.c:1039
 msgid "32x32 pixel PNG file icon"
 msgstr "Ikona 32x32 piksele w formacie PNG"
 
-#: ../src/picture.c:845
+#: ../src/picture.c:1041
 msgid "Other file icon"
 msgstr "Inny plik ikony"
 
-#: ../src/picture.c:847
+#: ../src/picture.c:1043
 msgid "Cover (front)"
 msgstr "Okładka (przód)"
 
-#: ../src/picture.c:849
+#: ../src/picture.c:1045
 msgid "Cover (back)"
 msgstr "Okładka (tył)"
 
-#: ../src/picture.c:851
+#: ../src/picture.c:1047
 msgid "Leaflet page"
 msgstr "Środek okładki"
 
-#: ../src/picture.c:853
+#: ../src/picture.c:1049
 msgid "Media (e.g. label side of CD)"
 msgstr "Nośnik (np. strona z nadrukiem na CD)"
 
-#: ../src/picture.c:855
+#: ../src/picture.c:1051
 msgid "Lead artist/lead performer/soloist"
 msgstr "Prowadzący wykonawca/solista"
 
-#: ../src/picture.c:857
+#: ../src/picture.c:1053
 msgid "Artist/performer"
 msgstr "Wykonawca"
 
-#: ../src/picture.c:859
+#: ../src/picture.c:1055
 msgid "Conductor"
 msgstr "Dyrygent"
 
-#: ../src/picture.c:861
+#: ../src/picture.c:1057
 msgid "Band/Orchestra"
 msgstr "Zespół/orkiestra"
 
-#: ../src/picture.c:865
+#: ../src/picture.c:1061
 msgid "Lyricist/text writer"
 msgstr "Tekściarz/autor tekstów"
 
-#: ../src/picture.c:867
+#: ../src/picture.c:1063
 msgid "Recording location"
 msgstr "Miejsce nagrywania"
 
-#: ../src/picture.c:869
+#: ../src/picture.c:1065
 msgid "During recording"
 msgstr "Podczas nagrywania"
 
-#: ../src/picture.c:871
+#: ../src/picture.c:1067
 msgid "During performance"
 msgstr "Podczas występu"
 
-#: ../src/picture.c:873
+#: ../src/picture.c:1069
 msgid "Movie/video screen capture"
 msgstr "Zrzut ekranu z filmu/wideo"
 
-#: ../src/picture.c:875
+#: ../src/picture.c:1071
 msgid "A bright colored fish"
 msgstr "Jaskrawo pokolorowana ryba"
 
-#: ../src/picture.c:877
+#: ../src/picture.c:1073
 msgid "Illustration"
 msgstr "Ilustracja"
 
-#: ../src/picture.c:879
+#: ../src/picture.c:1075
 msgid "Band/Artist logotype"
 msgstr "Logo zespołu/wykonawcy"
 
-#: ../src/picture.c:881
+#: ../src/picture.c:1077
 msgid "Publisher/studio logotype"
 msgstr "Logo wydawcy/studia"
 
-#: ../src/picture.c:885
+#: ../src/picture.c:1081
 msgid "Unknown image type"
 msgstr "Nieznany typ obrazu"
 
-#: ../src/picture.c:915 ../src/picture.c:926
+#: ../src/picture.c:1111 ../src/picture.c:1122
 msgid "pixels"
 msgstr "pikseli"
 
-#: ../src/picture.c:916 ../src/picture.c:927
+#: ../src/picture.c:1112 ../src/picture.c:1123
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/picture.c:928
+#: ../src/picture.c:1124
 msgid "Description"
 msgstr "Opis"
 
-#: ../src/picture.c:984
-#, c-format
-msgid "Error with 'loader_close': %s"
-msgstr "Błąd \"loader_close\": %s"
-
-#: ../src/picture.c:1044
+#: ../src/picture.c:1240
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
@@ -3245,26 +3267,21 @@ msgstr ""
 "Nie można wyświetlić obrazu, ponieważ za mała ilość danych została "
 "odczytana, aby ustalić, jak utworzyć bufor obrazu."
 
-#: ../src/picture.c:1051
+#: ../src/picture.c:1247
 msgid "Cannot display the image"
 msgstr "Nie można wyświetlić obrazu"
 
-#: ../src/picture.c:1053
+#: ../src/picture.c:1249
 msgid ""
 "Not enough data has been read to determine how to create the image buffer."
 msgstr ""
 "Za mała ilość danych została odczytana, aby ustalić, jak utworzyć bufor "
 "obrazu."
 
-#: ../src/picture.c:1055
+#: ../src/picture.c:1251
 msgid "Load Image File"
 msgstr "Wczytaj plik obrazu"
 
-#: ../src/picture.c:1061
-#, c-format
-msgid "Error with 'loader_write': %s"
-msgstr "Błąd \"loader_write\": %s"
-
 #. Label
 #: ../src/prefs.c:152
 msgid "Default directory:"
@@ -4225,16 +4242,16 @@ msgstr "Nazwa użytkownika dla serwera pośredniczącego."
 msgid "User Password:"
 msgstr "Hasło użytkownika:"
 
-#: ../src/prefs.c:1337
-msgid "Password of user for the the proxy server."
+#: ../src/prefs.c:1338
+msgid "Password of user for the proxy server."
 msgstr "Hasło użytkownika dla serwera pośredniczącego."
 
 #. Track Name list (CDDB results)
-#: ../src/prefs.c:1342
+#: ../src/prefs.c:1343
 msgid "Track Name List"
 msgstr "Lista ścieżek"
 
-#: ../src/prefs.c:1349
+#: ../src/prefs.c:1350
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
@@ -4242,7 +4259,7 @@ msgstr ""
 "Proszę zaznaczyć odpowiedni plik dźwiękowy (odnośnie pozycji lub DLM, jeśli "
 "włączono poniżej)"
 
-#: ../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."
@@ -4251,7 +4268,7 @@ msgstr ""
 "ścieżek, odpowiedni plik dźwiękowy zostanie zaznaczony na głównej liście."
 
 #. Check box to use DLM (also used in the cddb window)
-#: ../src/prefs.c:1358
+#: ../src/prefs.c:1359
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4262,15 +4279,15 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: ../src/prefs.c:1373
+#: ../src/prefs.c:1374
 msgid "Confirmation"
 msgstr "Potwierdzenia"
 
-#: ../src/prefs.c:1378
+#: ../src/prefs.c:1379
 msgid "Confirm exit from program"
 msgstr "Potwierdzanie zakończenia programu"
 
-#: ../src/prefs.c:1381
+#: ../src/prefs.c:1382
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
@@ -4278,51 +4295,51 @@ msgstr ""
 "Jeśli ta opcja jest włączona, to wyświetla okno dialogowe proszące o "
 "potwierdzenie przed zakończeniem programu."
 
-#: ../src/prefs.c:1384
+#: ../src/prefs.c:1385
 msgid "Confirm writing of file tag"
 msgstr "Potwierdzanie zapisania etykiet plików"
 
-#: ../src/prefs.c:1388
+#: ../src/prefs.c:1389
 msgid "Confirm renaming of file"
 msgstr "Potwierdzanie zmiany nazwy plików"
 
-#: ../src/prefs.c:1392
+#: ../src/prefs.c:1393
 msgid "Confirm deleting of file"
 msgstr "Potwierdzanie usuwania plików"
 
-#: ../src/prefs.c:1396
+#: ../src/prefs.c:1397
 msgid "Confirm writing of playlist"
 msgstr "Potwierdzanie zapisania listy odtwarzania"
 
-#: ../src/prefs.c:1400
+#: ../src/prefs.c:1401
 msgid "Confirm changing directory when there are unsaved changes"
 msgstr "Potwierdzanie zmiany katalogu, kiedy są niezapisane zmiany"
 
 #. 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 "(Przykład: %.*d_-_Nazwa_ścieżki_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 "(Przykład: płyta_%.*d_z_10/Nazwa_ścieżki_1.mp3)"
 
-#: ../src/prefs.c:1613 ../src/setting.c:904
+#: ../src/prefs.c:1614 ../src/setting.c:904
 msgid "Configuration saved"
 msgstr "Zapisano konfigurację"
 
-#: ../src/prefs.c:1621
+#: ../src/prefs.c:1622
 msgid "Configuration unchanged"
 msgstr "Nie zmieniono konfiguracji"
 
-#: ../src/prefs.c:1712
+#: ../src/prefs.c:1713
 msgid "The selected path for 'Default path to files' is invalid"
 msgstr "Wybrana ścieżka dla \"Domyślnej ścieżki do plików\" jest nieprawidłowa"
 
-#: ../src/prefs.c:1714
+#: ../src/prefs.c:1715
 #, c-format
 msgid ""
 "Path: '%s'\n"
@@ -4331,16 +4348,16 @@ msgstr ""
 "Ścieżka: \"%s\"\n"
 "Błąd: %s"
 
-#: ../src/prefs.c:1716
+#: ../src/prefs.c:1717
 msgid "Invalid Path Error"
 msgstr "Błąd nieprawidłowej ścieżki"
 
-#: ../src/prefs.c:1830
+#: ../src/prefs.c:1831
 #, c-format
 msgid "The audio file player '%s' cannot be found"
 msgstr "Nie można odnaleźć odtwarzacza dźwięku \"%s\""
 
-#: ../src/prefs.c:1832
+#: ../src/prefs.c:1833
 msgid "Audio Player Error"
 msgstr "Błąd odtwarzacza dźwięku"
 
@@ -4348,77 +4365,77 @@ msgstr "Błąd odtwarzacza dźwięku"
 msgid "Fill Tag"
 msgstr "Wypełnianie etykiet"
 
-#: ../src/scan.c:358
+#: ../src/scan.c:354
 #, c-format
 msgid "Cannot calculate CRC value of file (%s)"
 msgstr "Nie można obliczyć wartości CRC pliku (%s)"
 
-#: ../src/scan.c:373
+#: ../src/scan.c:369
 msgid "Tag successfully scanned"
 msgstr "Pomyślnie zeskanowany etykiety"
 
-#: ../src/scan.c:375
+#: ../src/scan.c:371
 #, c-format
 msgid "Tag successfully scanned: %s"
 msgstr "Pomyślnie zeskanowany etykiety: %s"
 
-#: ../src/scan.c:416
+#: ../src/scan.c:412
 #, c-format
 msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
 msgstr ""
 "Skaner etykiet: rozszerzenie \"%s\" nie zostało odnalezione w pliku \"%s\""
 
-#: ../src/scan.c:498 ../src/scan.c:527
+#: ../src/scan.c:494 ../src/scan.c:523
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Błąd skanowania: nie można odnaleźć separatora \"%s\" wewnątrz \"%s\""
 
-#: ../src/scan.c:714
+#: ../src/scan.c:710
 msgid "New filename successfully scanned"
 msgstr "Pomyślnie zeskanowano nową nazwę pliku"
 
-#: ../src/scan.c:717
+#: ../src/scan.c:713
 #, c-format
 msgid "New filename successfully scanned: %s"
 msgstr "Pomyślnie zeskanowano nową nazwę pliku: %s"
 
-#: ../src/scan.c:1821
+#: ../src/scan.c:1822
 #, c-format
 msgid "Error while processing fields: %s"
 msgstr "Błąd podczas przetwarzania pól: %s"
 
 #. The window
-#: ../src/scan.c:2328
+#: ../src/scan.c:1992
 msgid "Tag and Filename Scan"
 msgstr "Skanowanie etykiet i nazw plików"
 
 #. TODO: Set related action to match AM_SCAN_FILES.
-#: ../src/scan.c:2337
+#: ../src/scan.c:2001
 msgid "Scan Files"
 msgstr "Skanuj pliki"
 
 #. Option Menu
-#: ../src/scan.c:2365
+#: ../src/scan.c:2029
 msgid "Scanner:"
 msgstr "Skaner:"
 
-#: ../src/scan.c:2386
+#: ../src/scan.c:2050
 msgid "Select the type of scanner to use"
 msgstr "Proszę wybrać typ skanera, który ma zostać użyty"
 
-#: ../src/scan.c:2395
+#: ../src/scan.c:2059
 msgid "Scanner Preferences"
 msgstr "Preferencje skanera"
 
-#: ../src/scan.c:2404
+#: ../src/scan.c:2068
 msgid "Show / Hide Masks Editor"
 msgstr "Wyświetla/ukrywa edytor masek"
 
-#: ../src/scan.c:2414
+#: ../src/scan.c:2078
 msgid "Show / Hide Legend"
 msgstr "Wyświetla/ukrywa legendę"
 
-#: ../src/scan.c:2444
+#: ../src/scan.c:2108
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse filename and "
 "path. Used to fill in tag fields"
@@ -4428,15 +4445,15 @@ msgstr ""
 "etykiet"
 
 #. Preview label
-#: ../src/scan.c:2468
+#: ../src/scan.c:2132
 msgid "Fill tag preview"
 msgstr "Podgląd zmiany etykiet"
 
-#: ../src/scan.c:2498
+#: ../src/scan.c:2162
 msgid "Prefix mask with current path"
 msgstr "Dodaje do maski przedrostek bieżącej ścieżki"
 
-#: ../src/scan.c:2512
+#: ../src/scan.c:2176
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4450,15 +4467,15 @@ msgstr ""
 "jako względna."
 
 #. Preview label
-#: ../src/scan.c:2537
+#: ../src/scan.c:2201
 msgid "Rename file preview"
 msgstr "Podgląd zmiany nazwy pliku"
 
-#: ../src/scan.c:2556
+#: ../src/scan.c:2220
 msgid "Select fields:"
 msgstr "Proszę wybrać pola:"
 
-#: ../src/scan.c:2559
+#: ../src/scan.c:2223
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those which interest you"
@@ -4467,134 +4484,134 @@ msgstr ""
 "przetworzone. Proszę wybrać te, które mają zostać zmienione"
 
 #. Advice for Translators: set the first letter of filename translated
-#: ../src/scan.c:2563
+#: ../src/scan.c:2227
 msgid "F"
 msgstr "N"
 
-#: ../src/scan.c:2565
+#: ../src/scan.c:2229
 msgid "Process filename field"
 msgstr "Przetwarzanie pola nazwy pliku"
 
 #. Advice for Translators: set the first letter of title translated
-#: ../src/scan.c:2567
+#: ../src/scan.c:2231
 msgid "T"
 msgstr "T"
 
-#: ../src/scan.c:2568
+#: ../src/scan.c:2232
 msgid "Process title field"
 msgstr "Przetwarzanie pola tytułu"
 
 #. Advice for Translators: set the first letter of artist translated
-#: ../src/scan.c:2570
+#: ../src/scan.c:2234
 msgid "Ar"
 msgstr "W"
 
-#: ../src/scan.c:2571
+#: ../src/scan.c:2235
 msgid "Process file artist field"
 msgstr "Przetwarzanie pola wykonawcy"
 
 #. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan.c:2573
+#: ../src/scan.c:2237
 msgid "AA"
 msgstr "WA"
 
-#: ../src/scan.c:2574
+#: ../src/scan.c:2238
 msgid "Process album artist field"
 msgstr "Przetwarzanie pola wykonawcy albumu"
 
 #. Advice for Translators: set the first letter of album translated
-#: ../src/scan.c:2576
+#: ../src/scan.c:2240
 msgid "Al"
 msgstr "Al"
 
-#: ../src/scan.c:2577
+#: ../src/scan.c:2241
 msgid "Process album field"
 msgstr "Przetwarzanie pola albumu"
 
 #. Advice for Translators: set the first letter of genre translated
-#: ../src/scan.c:2579
+#: ../src/scan.c:2243
 msgid "G"
 msgstr "G"
 
-#: ../src/scan.c:2580
+#: ../src/scan.c:2244
 msgid "Process genre field"
 msgstr "Przetwarzanie pola gatunku"
 
 #. Advice for Translators: set the first letter of comment translated
-#: ../src/scan.c:2582
+#: ../src/scan.c:2246
 msgid "Cm"
 msgstr "Km"
 
-#: ../src/scan.c:2583
+#: ../src/scan.c:2247
 msgid "Process comment field"
 msgstr "Przetwarzanie pola komentarza"
 
 #. Advice for Translators: set the first letter of composer translated
-#: ../src/scan.c:2585
+#: ../src/scan.c:2249
 msgid "Cp"
 msgstr "Kp"
 
-#: ../src/scan.c:2586
+#: ../src/scan.c:2250
 msgid "Process composer field"
 msgstr "Przetwarzanie pola kompozytora"
 
 #. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan.c:2588
+#: ../src/scan.c:2252
 msgid "O"
 msgstr "P"
 
-#: ../src/scan.c:2589
+#: ../src/scan.c:2253
 msgid "Process original artist field"
 msgstr "Przetwarzanie pola pierwotnego wykonawcy"
 
 #. Advice for Translators: set the first letter of copyright translated
-#: ../src/scan.c:2591
+#: ../src/scan.c:2255
 msgid "Cr"
 msgstr "Cr"
 
-#: ../src/scan.c:2592
+#: ../src/scan.c:2256
 msgid "Process copyright field"
 msgstr "Przetwarzanie pola praw autorskich"
 
 #. Advice for Translators: set the first letter of URL translated
-#: ../src/scan.c:2594
+#: ../src/scan.c:2258
 msgid "U"
 msgstr "U"
 
-#: ../src/scan.c:2595
+#: ../src/scan.c:2259
 msgid "Process URL field"
 msgstr "Przetwarzanie pola adresu URL"
 
 #. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan.c:2597
+#: ../src/scan.c:2261
 msgid "E"
 msgstr "K"
 
-#: ../src/scan.c:2598
+#: ../src/scan.c:2262
 msgid "Process encoder name field"
 msgstr "Przetwarzanie pola nazwa kodera"
 
-#: ../src/scan.c:2642
+#: ../src/scan.c:2306
 msgid "Invert selection"
 msgstr "Odwróć zaznaczenie"
 
-#: ../src/scan.c:2649
+#: ../src/scan.c:2313
 msgid "Select/Unselect all"
 msgstr "Zaznacz/odznacz wszystko"
 
-#: ../src/scan.c:2664
+#: ../src/scan.c:2328
 msgid "Convert:"
 msgstr "Zamiana:"
 
-#: ../src/scan.c:2666
+#: ../src/scan.c:2330
 msgid "to: "
 msgstr "na: "
 
-#: ../src/scan.c:2673
+#: ../src/scan.c:2337
 msgid "Do not convert"
 msgstr "Bez zmieniania"
 
-#: ../src/scan.c:2692
+#: ../src/scan.c:2356
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4602,7 +4619,7 @@ msgstr ""
 "Znak podkreślenia oraz ciąg \"%20\" jest zamieniany na jedną spację. "
 "Przykład, przed: \"Tekst%20w%20jakimś_polu\", po: \"Tekst w jakimś polu\"."
 
-#: ../src/scan.c:2695
+#: ../src/scan.c:2359
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4610,36 +4627,36 @@ msgstr ""
 "Znak spacji jest zamieniany na jeden znak podkreślenia. Przykład, przed: "
 "\"Tekst w jakimś polu\", po: \"Tekst_w_jakimś_polu\"."
 
-#: ../src/scan.c:2698
+#: ../src/scan.c:2362
 msgid ""
 "Replace a string by another one. Note that the search is case sensitive."
 msgstr "Zamienia podany tekst na inny. Wyszukiwanie rozróżnia wielkość liter."
 
-#: ../src/scan.c:2705
+#: ../src/scan.c:2369
 msgid "Capitalize all"
 msgstr "Wszystkie wielkie litery"
 
-#: ../src/scan.c:2707
+#: ../src/scan.c:2371
 msgid "Lowercase all"
 msgstr "Wszystkie małe litery"
 
-#: ../src/scan.c:2709
+#: ../src/scan.c:2373
 msgid "Capitalize first letter"
 msgstr "Wielka pierwsza litera"
 
-#: ../src/scan.c:2711
+#: ../src/scan.c:2375
 msgid "Capitalize the first letter of each word"
 msgstr "Wielka pierwsza litera każdego słowa"
 
-#: ../src/scan.c:2712
+#: ../src/scan.c:2376
 msgid "Detect Roman numerals"
 msgstr "Wykrywanie liczb rzymskich"
 
-#: ../src/scan.c:2714
+#: ../src/scan.c:2378
 msgid "Do not change capitalization"
 msgstr "Bez zmiany wielkości liter"
 
-#: ../src/scan.c:2736
+#: ../src/scan.c:2400
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4647,7 +4664,7 @@ msgstr ""
 "Zamienia wszystkie słowa we wszystkich polach na wielkie litery. Przykład, "
 "przed: \"Tekst W JAKIMŚ polu\", po: \"TEKST W JAKIMŚ POLU\"."
 
-#: ../src/scan.c:2739
+#: ../src/scan.c:2403
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4655,7 +4672,7 @@ msgstr ""
 "Zamienia wszystkie słowa we wszystkich polach na małe litery. Przykład, "
 "przed: \"TEKST W jakimś polu\", po: \"tekst w jakimś polu\"."
 
-#: ../src/scan.c:2742
+#: ../src/scan.c:2406
 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'."
@@ -4664,7 +4681,7 @@ msgstr ""
 "literę. Przykład, przed: \"Tekst W Jakimś POLU\", po: \"Tekst w jakimś polu"
 "\"."
 
-#: ../src/scan.c:2745
+#: ../src/scan.c:2409
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4673,7 +4690,7 @@ msgstr ""
 "literę. Przykład, przed: \"Tekst w jakimś POLU\", po: \"Tekst W Jakimś Polu"
 "\"."
 
-#: ../src/scan.c:2748
+#: ../src/scan.c:2412
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -4681,19 +4698,19 @@ msgstr ""
 "Wymusza zamienianie liczb rzymskich na duże litery. Przykład, przed: \"ix. "
 "tekst w jakimś polu\", po: \"IX. Tekst W Jakimś Polu\"."
 
-#: ../src/scan.c:2756
+#: ../src/scan.c:2420
 msgid "Insert a space before uppercase letters"
 msgstr "Wstawianie spacji przed wielką literą"
 
-#: ../src/scan.c:2758
+#: ../src/scan.c:2422
 msgid "Remove duplicate spaces and underscores"
 msgstr "Usuwanie powtarzających się spacji i znaków podkreślenia"
 
-#: ../src/scan.c:2760
+#: ../src/scan.c:2424
 msgid "Do not change word separators"
 msgstr "Bez zmiany separatorów słów"
 
-#: ../src/scan.c:2774
+#: ../src/scan.c:2438
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4701,7 +4718,7 @@ msgstr ""
 "Wszystkie spacje pomiędzy słowami są usuwane. Przykład, przed: \"Tekst W "
 "Jakimś Polu\", po: \"TekstWJakimśPolu\"."
 
-#: ../src/scan.c:2777
+#: ../src/scan.c:2441
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4709,7 +4726,7 @@ msgstr ""
 "Spacja jest wstawiana przed każdą wielką literą. Przykład, przed: "
 "\"TekstWJakimśPolu\", po: \"Tekst W Jakimś Polu\"."
 
-#: ../src/scan.c:2780
+#: ../src/scan.c:2444
 msgid ""
 "Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4720,141 +4737,141 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2787
+#: ../src/scan.c:2451
 msgid "Legend"
 msgstr "Legenda"
 
-#: ../src/scan.c:2793
+#: ../src/scan.c:2457
 #, c-format
 msgid "%a: artist"
 msgstr "%a: wykonawca"
 
-#: ../src/scan.c:2796
+#: ../src/scan.c:2460
 msgid "%z: album artist"
 msgstr "%z: wykonawca albumu"
 
-#: ../src/scan.c:2799
+#: ../src/scan.c:2463
 msgid "%b: album"
 msgstr "%b: album"
 
-#: ../src/scan.c:2802
+#: ../src/scan.c:2466
 #, c-format
 msgid "%c: comment"
 msgstr "%c: komentarz"
 
-#: ../src/scan.c:2805
+#: ../src/scan.c:2469
 #, c-format
 msgid "%p: composer"
 msgstr "%p: kompozytor"
 
-#: ../src/scan.c:2808
+#: ../src/scan.c:2472
 msgid "%r: copyright"
 msgstr "%r: prawa autorskie"
 
-#: ../src/scan.c:2811
+#: ../src/scan.c:2475
 #, c-format
 msgid "%d: disc number"
 msgstr "%d: numer płyty"
 
-#: ../src/scan.c:2814
+#: ../src/scan.c:2478
 #, c-format
 msgid "%e: encoded by"
 msgstr "%e: koder"
 
-#: ../src/scan.c:2817
+#: ../src/scan.c:2481
 #, c-format
 msgid "%g: genre"
 msgstr "%g: gatunek"
 
-#: ../src/scan.c:2820
+#: ../src/scan.c:2484
 #, c-format
 msgid "%i: ignored"
 msgstr "%i: ignorowane"
 
-#: ../src/scan.c:2823
+#: ../src/scan.c:2487
 msgid "%l: number of tracks"
 msgstr "%l: liczba ścieżek"
 
-#: ../src/scan.c:2826
+#: ../src/scan.c:2490
 #, c-format
 msgid "%o: orig. artist"
 msgstr "%o: pierwotny wykonawca"
 
-#: ../src/scan.c:2829
+#: ../src/scan.c:2493
 #, c-format
 msgid "%n: track"
 msgstr "%n: ścieżka"
 
-#: ../src/scan.c:2832
+#: ../src/scan.c:2496
 msgid "%t: title"
 msgstr "%t: tytuł"
 
-#: ../src/scan.c:2835
+#: ../src/scan.c:2499
 #, c-format
 msgid "%u: URL"
 msgstr "%u: adres URL"
 
-#: ../src/scan.c:2838
+#: ../src/scan.c:2502
 #, c-format
 msgid "%x: number of discs"
 msgstr "%x: liczba płyt"
 
-#: ../src/scan.c:2841
+#: ../src/scan.c:2505
 msgid "%y: year"
 msgstr "%y: rok"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2848
+#: ../src/scan.c:2512
 msgid "Mask Editor"
 msgstr "Edytor masek"
 
-#: ../src/scan.c:2902
+#: ../src/scan.c:2566
 msgid "Create New Mask"
 msgstr "Utwórz nową maskę"
 
-#: ../src/scan.c:2912
+#: ../src/scan.c:2576
 msgid "Move Up this Mask"
 msgstr "Przesuń maskę do góry"
 
-#: ../src/scan.c:2922
+#: ../src/scan.c:2586
 msgid "Move Down this Mask"
 msgstr "Przesuń maskę w dół"
 
-#: ../src/scan.c:2932
+#: ../src/scan.c:2596
 msgid "Duplicate Mask"
 msgstr "Zduplikuj maskę"
 
-#: ../src/scan.c:2942
+#: ../src/scan.c:2606
 msgid "Add Default Masks"
 msgstr "Dodaj domyślną maskę"
 
-#: ../src/scan.c:2952
+#: ../src/scan.c:2616
 msgid "Remove Mask"
 msgstr "Usuń maskę"
 
-#: ../src/scan.c:2962
+#: ../src/scan.c:2626
 msgid "Save Masks"
 msgstr "Zapisz maski"
 
-#: ../src/scan.c:3542
+#: ../src/scan.c:3206
 msgid "New_mask"
 msgstr "Nowa_maska"
 
-#: ../src/scan.c:3581
+#: ../src/scan.c:3245
 msgid "Copy: No row selected"
 msgstr "Kopiowanie: nie wybrano rzędu"
 
-#: ../src/scan.c:3674
+#: ../src/scan.c:3338
 msgid "Remove: No row selected"
 msgstr "Usuwanie: nie wybrano rzędu"
 
-#: ../src/scan.c:3721
+#: ../src/scan.c:3385
 msgid "Move Up: No row selected"
 msgstr "Przesunięcie w górę: nie wybrano rzędu"
 
-#: ../src/scan.c:3765
+#: ../src/scan.c:3429
 msgid "Move Down: No row selected"
 msgstr "Przesunięcie w dół: nie wybrano rzędu"
 
@@ -4921,62 +4938,3 @@ msgstr "Przeniesienie pliku konfiguracji \"%s\" się nie powiodło"
 #, c-format
 msgid "Error: Cannot create directory '%s' (%s)"
 msgstr "Błąd: nie można utworzyć katalogu \"%s\" (%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 ""
-"Biblioteka DLL \"%s\" nie jest jeszcze wczytana. Próba jej wczytania..."
-
-#. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: ../src/win32/win32dep.c:130
-#, c-format
-msgid "DLL '%s' could not be loaded"
-msgstr "Biblioteka DLL \"%s\" nie może zostać wczytana"
-
-#. 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 wersja \"%s\" zawiera \"%s\""
-
-#. 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 "Nie odnaleziono funkcji \"%s\" w bibliotece DLL \"%s\""
-
-#. 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 "Katalog ustawień programu EasyTAG: \"%s\""
-
-#. Log_Print(_("weasytag_init start..."));
-#: ../src/win32/win32dep.c:472
-#, c-format
-msgid "weasytag_init start..."
-msgstr "Rozpoczynanie weasytag_init..."
-
-#. 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 "Wersja biblioteki GLib: %u.%u.%u\n"
-
-#. Set Environmental Variables
-#. Log_Print(_("weasytag_init end..."));
-#: ../src/win32/win32dep.c:496
-#, c-format
-msgid "weasytag_init end..."
-msgstr "Kończenie weasytag_init..."
-
-#. Log_Print(_("Audio player: '%s'"), player);
-#: ../src/win32/win32dep.c:620
-#, c-format
-msgid "Audio player: '%s'"
-msgstr "Odtwarzacz dźwięku: \"%s\""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 29f4aa3..948893e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,17 +1,17 @@
 # Brazilian Portuguese translation of EasyTAG
-# Copyright (C) 2005-2013 Free Software Foundation, Inc.
+# Copyright (C) 2005-2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the EasyTAG package.
 # doutor.zero <doutor.zero at gmail.com>, 2005, 2007, 2008.
-# Enrico Nicoletto <liverig at gmail.com>, 2013.
-# Rafael Ferreira <rafael.f.f1 at gmail.com>, 2013.
+# Enrico Nicoletto <liverig at gmail.com>, 2013, 2014.
+# Rafael Ferreira <rafael.f.f1 at gmail.com>, 2013, 2014.
 #
 msgid ""
 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-01-21 20:09+0000\n"
-"PO-Revision-Date: 2014-02-02 12:14-0300\n"
+"POT-Creation-Date: 2014-04-03 16:46+0000\n"
+"PO-Revision-Date: 2014-04-03 14:13-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"
@@ -19,7 +19,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.6.3\n"
+"X-Generator: Poedit 1.6.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 ""
+"Veja e edite etiquetas de arquivos MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg "
+"Speex, Ogg Vorbis, MusePack, Monkey's Audio e WavPack."
+
+#: ../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 ""
+"Pesquise por álbuns em bases de dados on-line, edite etiquetas em massa, "
+"crie listas de reprodução e renomeie uma coleção de arquivos."
+
+#: ../data/easytag.appdata.xml.in.h:3
+msgid ""
+"A simple and nice GTK+ interface makes tagging easier under GNU/Linux and "
+"Windows."
+msgstr ""
+"Uma interface GTK+ simples e agradável que facilita a criação de etiquetas "
+"no GNU/Linux e Windows."
 
 #: ../data/easytag.desktop.in.h:1
 msgid "Sound File Metadata Editor"
@@ -32,7 +56,7 @@ msgstr "Edite metadados de arquivo de som"
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/easytag.desktop.in.h:4
 msgid "mp3;tag;audio;"
-msgstr "mp3;tag;etiqueta;áudio;"
+msgstr "mp3;tag;etiqueta;áudio;audio;som;"
 
 #: ../src/about.c:91
 msgid ""
@@ -66,7 +90,7 @@ msgstr ""
 msgid "translator-credits"
 msgstr ""
 "doutor.zero <doutor.zero at gmail.com>, 2005, 2007, 2008\n"
-"Enrico Nicoletto <liverig at gmail.com>, 2013\n"
+"Enrico Nicoletto <liverig at gmail.com>, 2013, 2014\n"
 "Rafael Ferreira <rafael.f.f1 at gmail.com>, 2013"
 
 #: ../src/about.c:118
@@ -96,731 +120,739 @@ msgstr " - Etiquete e renomeie arquivos de áudio"
 #.
 #. * Main Menu Actions
 #.
-#: ../src/bar.c:154
+#: ../src/bar.c:155
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../src/bar.c:155
+#: ../src/bar.c:156
 msgid "Sort List by Tag"
 msgstr "Organizar a lista por etiqueta"
 
-#: ../src/bar.c:158
+#: ../src/bar.c:159
 msgid "Sort List by Property"
 msgstr "Organizar a lista pela propriedade"
 
-#: ../src/bar.c:159
+#: ../src/bar.c:160
 msgid "Ascending by filename"
 msgstr "Ascendente pelo nome do arquivo"
 
-#: ../src/bar.c:160
+#: ../src/bar.c:161
 msgid "Descending by filename"
 msgstr "Descendente pelo nome do arquivo"
 
-#: ../src/bar.c:161
+#: ../src/bar.c:162
 msgid "Ascending by creation date"
 msgstr "Ascendente pela data de criação"
 
-#: ../src/bar.c:162
+#: ../src/bar.c:163
 msgid "Descending by creation date"
 msgstr "Descendente pela data de criação"
 
-#: ../src/bar.c:163
+#: ../src/bar.c:164
 msgid "Ascending by track number"
 msgstr "Ascendente pelo número da faixa"
 
-#: ../src/bar.c:164
+#: ../src/bar.c:165
 msgid "Descending by track number"
 msgstr "Descendente pelo número da faixa"
 
-#: ../src/bar.c:165
+#: ../src/bar.c:166
 msgid "Ascending by title"
 msgstr "Ascendente pelo título"
 
-#: ../src/bar.c:166
+#: ../src/bar.c:167
 msgid "Descending by title"
 msgstr "Descendente pelo título"
 
-#: ../src/bar.c:167
+#: ../src/bar.c:168
 msgid "Ascending by artist"
 msgstr "Ascendente pelo artista"
 
-#: ../src/bar.c:168
+#: ../src/bar.c:169
 msgid "Descending by artist"
 msgstr "Descendente pelo artista"
 
-#: ../src/bar.c:169
+#: ../src/bar.c:170
 msgid "Ascending by album artist"
 msgstr "Ascendente pelo artista do álbum"
 
-#: ../src/bar.c:170
+#: ../src/bar.c:171
 msgid "Descending by album artist"
 msgstr "Descendente pelo artista do álbum"
 
-#: ../src/bar.c:171
+#: ../src/bar.c:172
 msgid "Ascending by album"
 msgstr "Ascendente pelo álbum"
 
-#: ../src/bar.c:172
+#: ../src/bar.c:173
 msgid "Descending by album"
 msgstr "Descendente pelo álbum"
 
-#: ../src/bar.c:173
+#: ../src/bar.c:174
 msgid "Ascending by year"
 msgstr "Ascendente pelo ano"
 
-#: ../src/bar.c:174
+#: ../src/bar.c:175
 msgid "Descending by year"
 msgstr "Descendente pelo ano"
 
-#: ../src/bar.c:175
+#: ../src/bar.c:176
 msgid "Ascending by genre"
 msgstr "Ascendente pelo gênero"
 
-#: ../src/bar.c:176
+#: ../src/bar.c:177
 msgid "Descending by genre"
 msgstr "Descendente pelo gênero"
 
-#: ../src/bar.c:177
+#: ../src/bar.c:178
 msgid "Ascending by comment"
 msgstr "Ascendente pelo comentário"
 
-#: ../src/bar.c:178
+#: ../src/bar.c:179
 msgid "Descending by comment"
 msgstr "Descendente pelo comentário"
 
-#: ../src/bar.c:179
+#: ../src/bar.c:180
 msgid "Ascending by composer"
 msgstr "Ascendente pelo compositor"
 
-#: ../src/bar.c:180
+#: ../src/bar.c:181
 msgid "Descending by composer"
 msgstr "Descendente pelo compositor"
 
-#: ../src/bar.c:181
+#: ../src/bar.c:182
 msgid "Ascending by original artist"
 msgstr "Ascendente pelo artista original"
 
-#: ../src/bar.c:182
+#: ../src/bar.c:183
 msgid "Descending by original artist"
 msgstr "Descendente pelo artista original"
 
-#: ../src/bar.c:183
+#: ../src/bar.c:184
 msgid "Ascending by copyright"
 msgstr "Ascendente pelo copyright"
 
-#: ../src/bar.c:184
+#: ../src/bar.c:185
 msgid "Descending by copyright"
 msgstr "Descendente pelo copyright"
 
-#: ../src/bar.c:185
+#: ../src/bar.c:186
 msgid "Ascending by URL"
 msgstr "Ascendente pela URL"
 
-#: ../src/bar.c:186
+#: ../src/bar.c:187
 msgid "Descending by URL"
 msgstr "Descendente pela 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 "Ascendente pelo nome do codificador"
 
 #. 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 "Descendente pelo nome do codificador"
 
-#: ../src/bar.c:193
+#: ../src/bar.c:194
 msgid "Ascending by file type"
 msgstr "Ascendente pelo tipo do arquivo"
 
-#: ../src/bar.c:194
+#: ../src/bar.c:195
 msgid "Descending by file type"
 msgstr "Descendente pelo tipo do arquivo"
 
-#: ../src/bar.c:195
+#: ../src/bar.c:196
 msgid "Ascending by file size"
 msgstr "Ascendente pelo tamanho do arquivo"
 
-#: ../src/bar.c:196
+#: ../src/bar.c:197
 msgid "Descending by file size"
 msgstr "Descendente pelo tamanho do arquivo"
 
-#: ../src/bar.c:197
+#: ../src/bar.c:198
 msgid "Ascending by duration"
 msgstr "Ascendente pela duração"
 
-#: ../src/bar.c:198
+#: ../src/bar.c:199
 msgid "Descending by duration"
 msgstr "Descendente pela duração"
 
-#: ../src/bar.c:199
+#: ../src/bar.c:200
 msgid "Ascending by bitrate"
 msgstr "Ascendente pela taxa de bits"
 
-#: ../src/bar.c:200
+#: ../src/bar.c:201
 msgid "Descending by bitrate"
 msgstr "Descendente pela taxa de bits"
 
-#: ../src/bar.c:201
+#: ../src/bar.c:202
 msgid "Ascending by samplerate"
 msgstr "Ascendente pela taxa de amostragem"
 
-#: ../src/bar.c:202
+#: ../src/bar.c:203
 msgid "Descending by samplerate"
 msgstr "Descendente pela taxa de amostragem"
 
-#: ../src/bar.c:204
+#: ../src/bar.c:205
 msgid "Open Files With…"
 msgstr "Abrir arquivos com…"
 
-#: ../src/bar.c:205
+#: ../src/bar.c:206
 msgid "Run a command on the selected files"
 msgstr "Executa um comando nos arquivos selecionados"
 
-#: ../src/bar.c:208
+#: ../src/bar.c:209
 msgid "Select all"
 msgstr "Seleciona tudo"
 
-#: ../src/bar.c:209
+#: ../src/bar.c:210
 msgid "Unselect All"
 msgstr "Desmarcar tudo"
 
-#: ../src/bar.c:210
+#: ../src/bar.c:211
 msgid "Clear the current selection"
 msgstr "Limpa a seleção atual"
 
-#: ../src/bar.c:213
+#: ../src/bar.c:214
 msgid "Invert File Selection"
 msgstr "Inverter a seleção de arquivo"
 
-#: ../src/bar.c:214
+#: ../src/bar.c:215
 msgid "Invert file selection"
 msgstr "Inverte a seleção de arquivo"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete Files"
 msgstr "Excluir arquivos"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete files"
 msgstr "Exclui arquivos"
 
-#: ../src/bar.c:217
+#: ../src/bar.c:218
 msgid "_First File"
 msgstr "_Primeiro arquivo"
 
-#: ../src/bar.c:218
+#: ../src/bar.c:219
 msgid "First file"
 msgstr "Primeiro arquivo"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "_Previous File"
 msgstr "Arquivo _anterior"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "Previous file"
 msgstr "Arquivo anterior"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "_Next File"
 msgstr "P_róximo arquivo"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "Next file"
 msgstr "Próximo arquivo"
 
-#: ../src/bar.c:221
+#: ../src/bar.c:222
 msgid "_Last File"
 msgstr "Úl_timo arquivo"
 
-#: ../src/bar.c:222
+#: ../src/bar.c:223
 msgid "Last file"
 msgstr "Último arquivo"
 
-#: ../src/bar.c:223
+#: ../src/bar.c:224
 msgid "S_can Files"
 msgstr "V_erificar arquivos"
 
-#: ../src/bar.c:224 ../src/scan.c:2352
+#: ../src/bar.c:225 ../src/scan.c:2344
 msgid "Scan selected files"
 msgstr "Verificar os arquivos selecionados"
 
-#: ../src/bar.c:225
+#: ../src/bar.c:226
 msgid "_Remove Tags"
 msgstr "_Remover etiquetas"
 
-#: ../src/bar.c:226
+#: ../src/bar.c:227
 msgid "Remove tags"
 msgstr "Remove etiquetas"
 
-#: ../src/bar.c:227
+#: ../src/bar.c:228
 msgid "_Undo Last Files Changes"
 msgstr "_Desfazer a última modificação nos arquivos"
 
-#: ../src/bar.c:228
+#: ../src/bar.c:229
 msgid "Undo last files changes"
 msgstr "Desfaz a última modificação nos arquivos"
 
-#: ../src/bar.c:230
+#: ../src/bar.c:231
 msgid "R_edo Last Files Changes"
 msgstr "Re_fazer a última modificação nos arquivos"
 
-#: ../src/bar.c:231
+#: ../src/bar.c:232
 msgid "Redo last files changes"
 msgstr "Refaz a última modificação nos arquivos"
 
-#: ../src/bar.c:233
+#: ../src/bar.c:234
 msgid "_Save Files"
 msgstr "_Salvar arquivos"
 
-#: ../src/bar.c:234
+#: ../src/bar.c:235
 msgid "Save changes to selected files"
 msgstr "Salva alterações nos arquivos selecionados"
 
-#: ../src/bar.c:236
+#: ../src/bar.c:237
 msgid "_Force Save Files"
 msgstr "_Forçar salvamento de arquivos"
 
-#: ../src/bar.c:237
+#: ../src/bar.c:238
 msgid "Force saving files"
 msgstr "Força o salvamento dos arquivos"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo Last Changes"
 msgstr "Desfazer últimas modificações"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo last changes"
 msgstr "Desfaz as últimas modificações"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo Last Changes"
 msgstr "Refazer últimas modificações"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo last changes"
 msgstr "Refaz as últimas modificações"
 
-#: ../src/bar.c:241
+#: ../src/bar.c:242
 msgid "_Quit"
 msgstr "Sa_ir"
 
-#: ../src/bar.c:241 ../src/easytag.c:2404 ../src/easytag.c:4488
-#: ../src/easytag.c:4516
+#: ../src/bar.c:242 ../src/easytag.c:2429 ../src/easytag.c:4565
+#: ../src/easytag.c:4597
 msgid "Quit"
 msgstr "Sair"
 
-#: ../src/bar.c:244
+#: ../src/bar.c:245
 msgid "_Browser"
 msgstr "_Navegador"
 
-#: ../src/bar.c:245
+#: ../src/bar.c:246
 msgid "_Home Directory"
 msgstr "_Pasta pessoal"
 
-#: ../src/bar.c:246
+#: ../src/bar.c:247
 msgid "Go to home directory"
 msgstr "Ir para a pasta pessoal"
 
-#: ../src/bar.c:248
+#: ../src/bar.c:249
 msgid "Desktop Directory"
 msgstr "Área de trabalho"
 
-#: ../src/bar.c:249
+#: ../src/bar.c:250
 msgid "Go to desktop directory"
 msgstr "Ir para o diretório da área de trabalho"
 
-#: ../src/bar.c:251
+#: ../src/bar.c:252
 msgid "Documents Directory"
 msgstr "Documentos"
 
 # Nome do diretório é maiúsculo, motivo pelo qual mantive assim no meio da mensagem
-#: ../src/bar.c:252
+#: ../src/bar.c:253
 msgid "Go to documents directory"
 msgstr "Ir para o diretório de documentos"
 
-#: ../src/bar.c:254
+#: ../src/bar.c:255
 msgid "Downloads Directory"
 msgstr "Downloads"
 
-#: ../src/bar.c:255
+#: ../src/bar.c:256
 msgid "Go to downloads directory"
 msgstr "Ir para o diretório de downloads"
 
-#: ../src/bar.c:257
+#: ../src/bar.c:258
 msgid "Music Directory"
 msgstr "Músicas"
 
-#: ../src/bar.c:258
+#: ../src/bar.c:259
 msgid "Go to music directory"
 msgstr "Ir para o diretório de músicas"
 
-#: ../src/bar.c:260
+#: ../src/bar.c:261
 msgid "_Parent Directory"
 msgstr "Diretório su_perior"
 
-#: ../src/bar.c:261
+#: ../src/bar.c:262
 msgid "Go to parent directory"
 msgstr "Ir para o diretório superior"
 
-#: ../src/bar.c:263
+#: ../src/bar.c:264
 msgid "_Default Directory"
 msgstr "Diretório pa_drão"
 
-#: ../src/bar.c:264
+#: ../src/bar.c:265
 msgid "Go to default directory"
 msgstr "Ir para o diretório padrão"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set _Current Path as Default"
 msgstr "Definir o _caminho atual como padrão"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set current path as default"
 msgstr "Define o caminho atual como padrão"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename Directory…"
 msgstr "Renomear diretório…"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename directory"
 msgstr "Renomeia um diretório"
 
-#: ../src/bar.c:268
+#: ../src/bar.c:269
 msgid "Reload Directory"
 msgstr "Recarregar diretório"
 
-#: ../src/bar.c:269
+#: ../src/bar.c:270
 msgid "Reload directory"
 msgstr "Recarrega um diretório"
 
-#: ../src/bar.c:272
+#: ../src/bar.c:273
 msgid "Browse Directory With…"
 msgstr "Navegar no pasta com…"
 
-#: ../src/bar.c:273
+#: ../src/bar.c:274
 msgid "Run a command on the directory"
 msgstr "Executa um comando neste diretório"
 
-#: ../src/bar.c:275
+#: ../src/bar.c:276
 msgid "_Collapse Tree"
 msgstr "Re_colher árvore"
 
-#: ../src/bar.c:276
+#: ../src/bar.c:277
 msgid "Collapse directory tree"
 msgstr "Recolhe uma árvore de diretórios"
 
-#: ../src/bar.c:277
+#: ../src/bar.c:278
 msgid "_Reload Tree"
 msgstr "_Recarregar árvore"
 
-#: ../src/bar.c:278
+#: ../src/bar.c:279
 msgid "Reload directory tree"
 msgstr "Recarrega uma árvore de diretórios"
 
-#: ../src/bar.c:281
+#: ../src/bar.c:282
 msgid "S_canner Mode"
 msgstr "Modo v_erificador"
 
-#: ../src/bar.c:283
+#: ../src/bar.c:284
 msgid "_Miscellaneous"
 msgstr "_Miscelânea"
 
-#: ../src/bar.c:284
+#: ../src/bar.c:285
 msgid "_Find…"
 msgstr "_Localizar…"
 
-#: ../src/bar.c:285
+#: ../src/bar.c:286
 msgid "Search filenames and tags"
 msgstr "Pesquisa nomes de arquivos e etiquetas"
 
-#: ../src/bar.c:287
+#: ../src/bar.c:288
 msgid "CDD_B Search…"
 msgstr "Pesquisar no CDD_B…"
 
-#: ../src/bar.c:288
+#: ../src/bar.c:289
 msgid "CDDB search"
 msgstr "Pesquisa no CDDB"
 
-#: ../src/bar.c:290
+#: ../src/bar.c:291
 msgid "Load Filenames From a Text File…"
 msgstr "Carregar nomes dos arquivos de um arquivo texto…"
 
-#: ../src/bar.c:291
+#: ../src/bar.c:292
 msgid "Load filenames from a text file"
 msgstr "Carrega os nomes dos arquivos de um arquivo texto"
 
-#: ../src/bar.c:293
+#: ../src/bar.c:294
 msgid "Generate Playlist…"
 msgstr "Gerar uma lista de reprodução…"
 
-#: ../src/bar.c:294
+#: ../src/bar.c:295
 msgid "Generate a playlist"
 msgstr "Gera uma lista de reprodução"
 
-#: ../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 "Executar reprodutor de áudio"
 
-#: ../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 "Executa um reprodutor de áudio"
 
-#: ../src/bar.c:300
+#: ../src/bar.c:301
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/bar.c:301
+#: ../src/bar.c:302
 msgid "_Preferences"
 msgstr "_Preferências"
 
 #. The window
-#: ../src/bar.c:302 ../src/prefs.c:110
+#: ../src/bar.c:303 ../src/prefs.c:110
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../src/bar.c:304
+#: ../src/bar.c:305
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/bar.c:305
+#: ../src/bar.c:306
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../src/bar.c:307
+#: ../src/bar.c:308
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:311
+msgid "_Contents"
+msgstr "Su_mário"
+
+#: ../src/bar.c:312
+msgid "Show help"
+msgstr "Mostrar ajuda"
+
+#: ../src/bar.c:314
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:314
 msgid "About"
 msgstr "Sobre"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: ../src/bar.c:314
+#: ../src/bar.c:320
 msgid "Stop the current action"
 msgstr "Para a ação atual"
 
 #.
 #. * Popup menu's Actions
 #.
-#: ../src/bar.c:320
+#: ../src/bar.c:326
 msgid "_File Operations"
 msgstr "_Operação em arquivos"
 
-#: ../src/bar.c:321
+#: ../src/bar.c:327
 msgid "S_canner"
 msgstr "V_erificador"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:331
 msgid "CDDB Search Files…"
 msgstr "Pesquisar no CDDB pelos arquivos…"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:331
 msgid "CDDB search files…"
 msgstr "Pesquisar no CDDB pelos arquivos…"
 
 #. { 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 "Limpar log"
 
 #. { 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 "Navegar nos _subdiretórios"
 
-#: ../src/bar.c:336
+#: ../src/bar.c:342
 msgid "Browse subdirectories"
 msgstr "Navega nos subdiretórios"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:346
 msgid "Show Hidden Directories"
 msgstr "Mostrar diretórios ocultos"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:346
 msgid "Show hidden directories"
 msgstr "Mostra os diretórios ocultos"
 
-#: ../src/bar.c:342
+#: ../src/bar.c:348
 msgid "_Show Scanner"
 msgstr "Mo_strar o verificador"
 
-#: ../src/bar.c:343
+#: ../src/bar.c:349
 msgid "Show scanner"
 msgstr "Mostra o verificador"
 
-#: ../src/bar.c:349
+#: ../src/bar.c:355
 msgid "Tree Browser"
 msgstr "Navegador de árvore"
 
-#: ../src/bar.c:350
+#: ../src/bar.c:356
 msgid "View by directory tree"
 msgstr "Vê por árvore de diretórios"
 
-#: ../src/bar.c:352
+#: ../src/bar.c:358
 msgid "Artist and Album"
 msgstr "Artista e álbum"
 
-#: ../src/bar.c:353
+#: ../src/bar.c:359
 msgid "View by artist and album"
 msgstr "Vê por artista e álbum"
 
-#: ../src/bar.c:358
+#: ../src/bar.c:364
 msgid "_Fill Tags…"
 msgstr "Pr_eencher etiquetas…"
 
-#: ../src/bar.c:359
+#: ../src/bar.c:365
 msgid "Fill tags"
 msgstr "Preenche etiquetas"
 
-#: ../src/bar.c:361
+#: ../src/bar.c:367
 msgid "_Rename Files and Directories…"
 msgstr "_Renomear arquivos e diretórios…"
 
-#: ../src/bar.c:362
+#: ../src/bar.c:368
 msgid "Rename files and directories"
 msgstr "Renomeia arquivos e diretórios"
 
-#: ../src/bar.c:364
+#: ../src/bar.c:370
 msgid "_Process Fields…"
 msgstr "_Processar campos…"
 
-#: ../src/bar.c:364 ../src/scan.c:182
+#: ../src/bar.c:370 ../src/scan.c:182
 msgid "Process Fields"
 msgstr "Processa campos"
 
-#: ../src/bar.c:422
+#: ../src/bar.c:428
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Não foi possível unir a interface gráfica, o erro foi: %s\n"
 
-#: ../src/bar.c:528
+#: ../src/bar.c:533
 msgid "Ready to start"
 msgstr "Pronto para começar"
 
-#: ../src/browser.c:369
+#: ../src/browser.c:376
 msgid "New default path for files selected"
 msgstr "Novo caminho padrão para arquivos selecionados"
 
-#: ../src/browser.c:670 ../src/easytag.c:4484
+#: ../src/browser.c:678 ../src/easytag.c:4561
 msgid "Some files have been modified but not saved"
 msgstr "Alguns arquivos foram modificados, mas não salvos"
 
-#: ../src/browser.c:671
+#: ../src/browser.c:679
 msgid "Do you want to save them before changing the directory?"
 msgstr "Deseja salvá-los antes de alterar o diretório?"
 
-#: ../src/browser.c:675
+#: ../src/browser.c:683
 msgid "Confirm Directory Change"
 msgstr "Confirmar alteração do diretório"
 
-#: ../src/browser.c:2121
+#: ../src/browser.c:2146
 msgid "<All albums>"
 msgstr "<Todos os álbuns>"
 
-#: ../src/browser.c:2573
+#: ../src/browser.c:2607
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr ""
 "Erro: Pesquisando por %s, não foi possível localizar o nodo %s na árvore."
 
-#: ../src/browser.c:3067 ../src/browser.c:3145
+#: ../src/browser.c:3101 ../src/browser.c:3179
 msgid "Tree"
 msgstr "Árvore"
 
-#: ../src/browser.c:3068 ../src/cddb.c:803 ../src/misc.c:1913
+#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1902
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: ../src/browser.c:3068 ../src/cddb.c:804 ../src/misc.c:1914
+#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1903
 #: ../src/prefs.c:643
 msgid "Title"
 msgstr "Título"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Artist".
-#: ../src/browser.c:3069 ../src/browser.c:3076 ../src/cddb.c:483
-#: ../src/cddb.c:805 ../src/misc.c:1915 ../src/prefs.c:644
+#: ../src/browser.c:3103 ../src/browser.c:3110 ../src/cddb.c:483
+#: ../src/cddb.c:805 ../src/misc.c:1904 ../src/prefs.c:644
 msgid "Artist"
 msgstr "Artista"
 
-#: ../src/browser.c:3069 ../src/misc.c:1916
+#: ../src/browser.c:3103 ../src/misc.c:1905
 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:3070 ../src/browser.c:3078 ../src/cddb.c:486
-#: ../src/cddb.c:806 ../src/misc.c:1917 ../src/prefs.c:645
+#: ../src/browser.c:3104 ../src/browser.c:3112 ../src/cddb.c:486
+#: ../src/cddb.c:806 ../src/misc.c:1906 ../src/prefs.c:645
 msgid "Album"
 msgstr "Álbum"
 
-#: ../src/browser.c:3070 ../src/cddb.c:807 ../src/misc.c:1919
+#: ../src/browser.c:3104 ../src/cddb.c:807 ../src/misc.c:1908
 msgid "Year"
 msgstr "Ano"
 
-#: ../src/browser.c:3070
+#: ../src/browser.c:3104
 msgid "Disc"
 msgstr "Disco"
 
-#: ../src/browser.c:3071 ../src/misc.c:1920
+#: ../src/browser.c:3105 ../src/misc.c:1909
 msgid "Track"
 msgstr "Faixa"
 
-#: ../src/browser.c:3071 ../src/cddb.c:810 ../src/misc.c:1921
+#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1910
 #: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Gênero"
 
-#: ../src/browser.c:3072 ../src/misc.c:1922 ../src/prefs.c:647
+#: ../src/browser.c:3106 ../src/misc.c:1911 ../src/prefs.c:647
 msgid "Comment"
 msgstr "Comentário"
 
-#: ../src/browser.c:3072 ../src/misc.c:1923 ../src/picture.c:863
+#: ../src/browser.c:3106 ../src/misc.c:1912 ../src/picture.c:1059
 #: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Compositor"
 
-#: ../src/browser.c:3073 ../src/misc.c:1924
+#: ../src/browser.c:3107 ../src/misc.c:1913
 msgid "Original Artist"
 msgstr "Artista original"
 
-#: ../src/browser.c:3074 ../src/misc.c:1925
+#: ../src/browser.c:3108 ../src/misc.c:1914
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../src/browser.c:3074 ../src/misc.c:1926
+#: ../src/browser.c:3108 ../src/misc.c:1915
 msgid "URL"
 msgstr "URL"
 
-#: ../src/browser.c:3075 ../src/misc.c:1927
+#: ../src/browser.c:3109 ../src/misc.c:1916
 msgid "Encoded By"
 msgstr "Codificado por"
 
-#: ../src/browser.c:3076
+#: ../src/browser.c:3110
 msgid "# Albums"
 msgstr "# álbuns"
 
-#: ../src/browser.c:3077 ../src/browser.c:3078
+#: ../src/browser.c:3111 ../src/browser.c:3112
 msgid "# Files"
 msgstr "# arquivos"
 
-#: ../src/browser.c:3103
+#: ../src/browser.c:3137
 msgid "Enter a directory to browse."
 msgstr "Digite o nome de um diretório para navegar."
 
-#: ../src/browser.c:3112
+#: ../src/browser.c:3146
 msgid "Select a directory to browse."
 msgstr "Selecione um diretório para navegar."
 
@@ -828,33 +860,33 @@ 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:3119 ../src/easytag.c:3426
+#: ../src/browser.c:3153 ../src/easytag.c:3468
 msgid "No files"
 msgstr "Nenhum arquivo"
 
-#: ../src/browser.c:3197
+#: ../src/browser.c:3231
 msgid "Artist & Album"
 msgstr "Artista & álbum"
 
 #. Only directories changed
-#: ../src/browser.c:3561 ../src/easytag.c:2844
+#: ../src/browser.c:3595 ../src/easytag.c:2880
 msgid "Rename Directory"
 msgstr "Renomear diretório"
 
-#: ../src/browser.c:3583
+#: ../src/browser.c:3617
 #, c-format
 msgid "Rename the directory '%s' to:"
 msgstr "Renomear o diretório \"%s\" para:"
 
-#: ../src/browser.c:3602 ../src/misc.c:1177
+#: ../src/browser.c:3636 ../src/misc.c:1171
 msgid "Use mask:"
 msgstr "Usar a máscara:"
 
-#: ../src/browser.c:3605
+#: ../src/browser.c:3639
 msgid "If activated, it will use masks to rename directory."
 msgstr "Se ativada, máscaras serão usadas para renomear o diretório."
 
-#: ../src/browser.c:3623
+#: ../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."
@@ -863,98 +895,70 @@ msgstr ""
 "do verificador) para renomear o diretório à partir dos campos das etiquetas."
 
 #. Preview label
-#: ../src/browser.c:3647
+#: ../src/browser.c:3681
 msgid "Rename directory preview"
 msgstr "Visualização da renomeação do diretório"
 
-#: ../src/browser.c:3739
+#: ../src/browser.c:3773
 msgid "You must type a directory name"
 msgstr "Você deve digitar um nome para o diretório"
 
-#: ../src/browser.c:3740 ../src/browser.c:3761
+#: ../src/browser.c:3774 ../src/browser.c:3795
 msgid "Directory Name Error"
 msgstr "Erro no nome do diretório"
 
-#: ../src/browser.c:3758
+#: ../src/browser.c:3792
 #, c-format
 msgid "Could not convert '%s' into filename encoding."
 msgstr "Não foi possível converter \"%s\" para a codifição do nome de arquivo."
 
-#: ../src/browser.c:3760
+#: ../src/browser.c:3794
 msgid "Please use another name"
 msgstr "Por favor, use um outro nome"
 
-#: ../src/browser.c:3830
+#: ../src/browser.c:3864
 #, c-format
 msgid "The directory name '%s' already exists"
 msgstr "O nome do diretório \"%s\" já existe"
 
-#: ../src/browser.c:3831 ../src/easytag.c:2927
+#: ../src/browser.c:3865 ../src/easytag.c:2963
 msgid "Rename File Error"
 msgstr "Erro ao renomear o arquivo"
 
-#: ../src/browser.c:3869 ../src/browser.c:3898
+#: ../src/browser.c:3903 ../src/browser.c:3932
 msgid "Rename Directory Error"
 msgstr "Erro ao renomear o diretório"
 
-#: ../src/browser.c:3936
+#: ../src/browser.c:3970
 msgid "Directory renamed"
 msgstr "Diretório renomeado"
 
-#: ../src/browser.c:3972
+#: ../src/browser.c:4006
 msgid "Browse Directory With"
 msgstr "Navegar no diretório com"
 
-#: ../src/browser.c:3988 ../src/browser.c:4114
+#: ../src/browser.c:4022 ../src/browser.c:4148
 msgid "Program to run:"
 msgstr "Programa para executar:"
 
-#: ../src/browser.c:4000
+#: ../src/browser.c:4034
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Digite o nome do programa para executar. Ele receberá o diretório atual como "
 "parâmetro."
 
-#: ../src/browser.c:4094
+#: ../src/browser.c:4128
 msgid "Open Files With"
 msgstr "Abrir arquivos com"
 
-#: ../src/browser.c:4126
+#: ../src/browser.c:4160
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Digite o nome do programa para executar. Ele receberá o arquivo atual como "
 "parâmetro."
 
-#: ../src/browser.c:4257
-msgid "You must type a program name"
-msgstr "Você deve digitar o nome de um programa"
-
-#: ../src/browser.c:4258 ../src/browser.c:4275
-msgid "Program Name Error"
-msgstr "Erro no nome do programa"
-
-#: ../src/browser.c:4273 ../src/misc.c:793
-#, c-format
-msgid "The program '%s' cannot be found"
-msgstr "O programa \"%s\" não pôde ser localizado"
-
-#: ../src/browser.c:4325 ../src/misc.c:839
-#, c-format
-msgid "Cannot execute ‘%s’ (%s)"
-msgstr "Não foi possível executar \"%s\" (%s)"
-
-#: ../src/browser.c:4369 ../src/misc.c:884
-#, c-format
-msgid "Executed command: %s"
-msgstr "Comando executado: %s"
-
-#: ../src/browser.c:4375 ../src/misc.c:890
-#, c-format
-msgid "Failed to launch program: %s"
-msgstr "Falha ao iniciar programa: %s"
-
 #: ../src/cddb.c:313
 msgid "Artist / Album"
 msgstr "Artista / álbum"
@@ -1044,7 +1048,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:841 ../src/prefs.c:807
+#: ../src/cddb.c:492 ../src/picture.c:1037 ../src/prefs.c:807
 msgid "Other"
 msgstr "Outro"
 
@@ -1139,7 +1143,7 @@ msgstr "Categorias"
 msgid "Results:"
 msgstr "Resultados:"
 
-#: ../src/cddb.c:606 ../src/misc.c:1961
+#: ../src/cddb.c:606 ../src/misc.c:1950
 msgid "Search:"
 msgstr "Pesquisar:"
 
@@ -1204,7 +1208,7 @@ msgid "# Tracks"
 msgstr "# faixas"
 
 #. Check box to run the scanner
-#: ../src/cddb.c:847 ../src/misc.c:3002
+#: ../src/cddb.c:847 ../src/misc.c:2991
 msgid "Run the current scanner for each file"
 msgstr "Executar a verificação atual para cada arquivo"
 
@@ -1303,7 +1307,7 @@ msgstr "Erro ao ler a resposta do CDDB (%s)"
 msgid "Cannot create file '%s' (%s)"
 msgstr "Não foi possível criar o arquivo \"%s\" (%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 "Não foi possível abrir o arquivo \"%s\" (%s)"
@@ -1640,46 +1644,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:173
+#: ../src/easytag.c:184
 #, c-format
 msgid "Starting EasyTAG version %s (PID: %d)…"
 msgstr "Inicializando EasyTAG versão %s (PID: %d)…"
 
-#: ../src/easytag.c:175
+#: ../src/easytag.c:186
 #, c-format
 msgid "Using libid3tag version %s"
 msgstr "Usando libid3tag versão %s"
 
-#: ../src/easytag.c:178
+#: ../src/easytag.c:189
 #, c-format
 msgid "Using id3lib version %d.%d.%d"
 msgstr "Usando id3lib versão %d.%d.%d"
 
-#: ../src/easytag.c:184
+#: ../src/easytag.c:195
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
 msgstr "Variável EASYTAGLANG definida. Configurando a localização: \"%s\""
 
-#: ../src/easytag.c:186
+#: ../src/easytag.c:197
 #, c-format
 msgid "Setting locale: '%s'"
 msgstr "Configurando a localização: \"%s\""
 
-#: ../src/easytag.c:191
+#: ../src/easytag.c:202
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')"
 msgstr "Usando atualmente a localização \"%s\" (e eventualmente \"%s\")"
 
-#: ../src/easytag.c:198
+#: ../src/easytag.c:209
 msgid "Unable to create setting directories"
 msgstr "Não foi possível criar os diretórios de configuração"
 
-#: ../src/easytag.c:415 ../src/et_core.c:583
+#: ../src/easytag.c:426 ../src/et_core.c:597 ../src/et_core.c:609
 #, c-format
 msgid "Error while querying information for file: '%s' (%s)"
 msgstr "Erro ao consultar informação de arquivo: \"%s\" (%s)"
 
-#: ../src/easytag.c:480
+#: ../src/easytag.c:489
 #, c-format
 msgid "Cannot open path '%s'"
 msgstr "Não foi possível abrir o caminho \"%s\""
@@ -1687,11 +1691,11 @@ msgstr "Não foi possível abrir o caminho \"%s\""
 #.
 #. * Browser
 #.
-#: ../src/easytag.c:572 ../src/prefs.c:142
+#: ../src/easytag.c:581 ../src/prefs.c:142
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../src/easytag.c:594 ../src/et_core.c:2727
+#: ../src/easytag.c:603 ../src/et_core.c:2817
 msgid "File"
 msgstr "Arquivo"
 
@@ -1701,103 +1705,103 @@ msgstr "Arquivo"
 #. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
 #. Version changed to encoder version
 #. Encoder version
-#: ../src/easytag.c:626 ../src/easytag.c:4154 ../src/flac_header.c:201
+#: ../src/easytag.c:635 ../src/easytag.c:4231 ../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 "Codificador:"
 
-#: ../src/easytag.c:634
+#: ../src/easytag.c:643
 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:644
+#: ../src/easytag.c:653
 msgid "Frequency:"
 msgstr "Frequência:"
 
 #. Mode
-#: ../src/easytag.c:655 ../src/easytag.c:4158 ../src/mpeg_header.c:216
+#: ../src/easytag.c:664 ../src/easytag.c:4235 ../src/mpeg_header.c:216
 msgid "Mode:"
 msgstr "Modo:"
 
-#: ../src/easytag.c:662
+#: ../src/easytag.c:671
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: ../src/easytag.c:669
+#: ../src/easytag.c:678
 msgid "Duration:"
 msgstr "Duração:"
 
 #. Main Frame
-#: ../src/easytag.c:716 ../src/et_core.c:2665
+#: ../src/easytag.c:725 ../src/et_core.c:2747
 msgid "Tag"
 msgstr "Etiqueta"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: ../src/easytag.c:738
+#: ../src/easytag.c:747
 msgid "Common"
 msgstr "Comuns"
 
 #. Title
-#: ../src/easytag.c:745
+#: ../src/easytag.c:754
 msgid "Title:"
 msgstr "Título:"
 
-#: ../src/easytag.c:759
+#: ../src/easytag.c:768
 msgid "Tag selected files with this title"
 msgstr "Etiqueta arquivos selecionados com esse título"
 
 #. Artist
-#: ../src/easytag.c:764
+#: ../src/easytag.c:773
 msgid "Artist:"
 msgstr "Artista:"
 
-#: ../src/easytag.c:778
+#: ../src/easytag.c:787
 msgid "Tag selected files with this artist"
 msgstr "Etiqueta arquivos selecionados com esse artista"
 
 #. Album Artist
-#: ../src/easytag.c:783
+#: ../src/easytag.c:792
 msgid "Album artist:"
 msgstr "Artista do álbum:"
 
-#: ../src/easytag.c:797
+#: ../src/easytag.c:806
 msgid "Tag selected files with this album artist"
 msgstr "Etiqueta arquivos selecionados com o artista deste álbum"
 
 #. Album
-#: ../src/easytag.c:802
+#: ../src/easytag.c:811
 msgid "Album:"
 msgstr "Álbum:"
 
-#: ../src/easytag.c:816
+#: ../src/easytag.c:825
 msgid "Tag selected files with this album name"
 msgstr "Etiqueta arquivos selecionados com o nome deste álbum"
 
 #. Disc Number
-#: ../src/easytag.c:821
+#: ../src/easytag.c:830
 msgid "CD:"
 msgstr "CD:"
 
-#: ../src/easytag.c:838
+#: ../src/easytag.c:847
 msgid "Tag selected files with this disc number"
 msgstr "Etiqueta arquivos selecionados com o número deste disco"
 
 #. Year
-#: ../src/easytag.c:843
+#: ../src/easytag.c:852
 msgid "Year:"
 msgstr "Ano:"
 
-#: ../src/easytag.c:863
+#: ../src/easytag.c:872
 msgid "Tag selected files with this year"
 msgstr "Etiqueta arquivos selecionados com esse ano"
 
-#: ../src/easytag.c:877
+#: ../src/easytag.c:886
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Numera os arquivos selecionados seqüencialmente. Começar com 01 em cada "
@@ -1805,11 +1809,11 @@ msgstr ""
 
 #. To have enough space to display the icon
 #. To have enough space to display the icon
-#: ../src/easytag.c:886
+#: ../src/easytag.c:895
 msgid "Track #:"
 msgstr "Faixa #:"
 
-#: ../src/easytag.c:917
+#: ../src/easytag.c:926
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1817,658 +1821,666 @@ msgstr ""
 "Define o número de arquivos, no mesmo diretório do arquivo exibido, para as "
 "faixas selecionadas."
 
-#: ../src/easytag.c:937
+#: ../src/easytag.c:946
 msgid "Tag selected files with this number of tracks"
 msgstr "Etiqueta os arquivos selecionados com esse número de faixa"
 
 #. Genre
-#: ../src/easytag.c:941
+#: ../src/easytag.c:950
 msgid "Genre:"
 msgstr "Gênero:"
 
-#: ../src/easytag.c:969
+#: ../src/easytag.c:978
 msgid "Tag selected files with this genre"
 msgstr "Etiqueta os arquivos selecionados com esse gênero"
 
 #. Comment
-#: ../src/easytag.c:974
+#: ../src/easytag.c:983
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: ../src/easytag.c:1001
+#: ../src/easytag.c:1010
 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:1008
+#: ../src/easytag.c:1017
 msgid "Composer:"
 msgstr "Compositor:"
 
-#: ../src/easytag.c:1022
+#: ../src/easytag.c:1031
 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:1029
+#: ../src/easytag.c:1038
 msgid "Orig. artist:"
 msgstr "Artista orig.:"
 
-#: ../src/easytag.c:1043
+#: ../src/easytag.c:1052
 msgid "Tag selected files with this original artist"
 msgstr "Etiqueta os arquivos selecionados com esse artista original"
 
 #. Copyright
-#: ../src/easytag.c:1049
+#: ../src/easytag.c:1058
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../src/easytag.c:1063
+#: ../src/easytag.c:1072
 msgid "Tag selected files with this copyright"
 msgstr "Etiqueta os arquivos selecionados com esse copyright"
 
 #. URL
-#: ../src/easytag.c:1069
+#: ../src/easytag.c:1078
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/easytag.c:1083
+#: ../src/easytag.c:1092
 msgid "Tag selected files with this URL"
 msgstr "Etiqueta os arquivos selecionados com essa URL"
 
 #. Encoded by
-#: ../src/easytag.c:1089
+#: ../src/easytag.c:1098
 msgid "Encoded by:"
 msgstr "Codificado por:"
 
-#: ../src/easytag.c:1103
+#: ../src/easytag.c:1112
 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:1137 ../src/et_core.c:3100 ../src/et_core.c:3103
+#: ../src/easytag.c:1146 ../src/et_core.c:3189 ../src/et_core.c:3192
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/easytag.c:1161
+#: ../src/easytag.c:1170
 msgid "You can use drag and drop to add an image"
 msgstr "Você pode arrastar e soltar para adicionar uma imagem"
 
-#: ../src/easytag.c:1208
+#: ../src/easytag.c:1217
 msgid "Add images to the tag"
 msgstr "Adiciona imagens à etiqueta"
 
-#: ../src/easytag.c:1226
+#: ../src/easytag.c:1235
 msgid "Remove selected images from the tag"
 msgstr "Remove imagens selecionadas da etiqueta"
 
-#: ../src/easytag.c:1240
+#: ../src/easytag.c:1249
 msgid "Save the selected images to files"
 msgstr "Salva as imagens selecionadas em arquivos"
 
-#: ../src/easytag.c:1251
+#: ../src/easytag.c:1260
 msgid "Edit image properties"
 msgstr "Edita as propriedades da imagem"
 
-#: ../src/easytag.c:1265
+#: ../src/easytag.c:1274
 msgid "Tag selected files with these images"
 msgstr "Etiqueta os arquivos selecionados com essas imagens"
 
-#: ../src/easytag.c:1323
+#: ../src/easytag.c:1332
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Arquivos selecionados etiquetados com o título \"%s\"."
 
-#: ../src/easytag.c:1325
+#: ../src/easytag.c:1334
 msgid "Removed title from selected files."
 msgstr "Título selecionado dos arquivos selecionados."
 
-#: ../src/easytag.c:1340
+#: ../src/easytag.c:1349
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Arquivos selecionados etiquetados com o artista \"%s\"."
 
-#: ../src/easytag.c:1342
+#: ../src/easytag.c:1351
 msgid "Removed artist from selected files."
 msgstr "Artista removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1356
+#: ../src/easytag.c:1365
 #, c-format
 msgid "Selected files tagged with album artist '%s'."
 msgstr "Arquivos selecionados etiquetados com o artista do álbum \"%s\"."
 
-#: ../src/easytag.c:1358
+#: ../src/easytag.c:1367
 msgid "Removed album artist from selected files."
 msgstr "Artista do álbum removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1373
+#: ../src/easytag.c:1382
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Arquivos selecionados etiquetados com o álbum \"%s\"."
 
-#: ../src/easytag.c:1375
+#: ../src/easytag.c:1384
 msgid "Removed album name from selected files."
 msgstr "Nome do álbum removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1412
+#: ../src/easytag.c:1421
 #, 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:1417
+#: ../src/easytag.c:1426
 #, 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:1422
+#: ../src/easytag.c:1431
 msgid "Removed disc number from selected files."
 msgstr "Número do disco removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1438
+#: ../src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Arquivos selecionados etiquetados com o ano \"%s\"."
 
-#: ../src/easytag.c:1440
+#: ../src/easytag.c:1449
 msgid "Removed year from selected files."
 msgstr "Ano removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1466 ../src/easytag.c:1556
+#: ../src/easytag.c:1475 ../src/easytag.c:1566
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Arquivos selecionados etiquetados com a faixa como \"xx/%s\"."
 
-#: ../src/easytag.c:1469
+#: ../src/easytag.c:1478
 #, c-format
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Arquivos selecionados etiquetados com a faixa como \"xx\"."
 
-#: ../src/easytag.c:1473 ../src/easytag.c:1559
+#: ../src/easytag.c:1482 ../src/easytag.c:1569
 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:1529
+#: ../src/easytag.c:1539
 #, c-format
 msgid "Selected tracks numbered sequentially."
 msgstr "Faixas selecionadas numeradas sequencialmente."
 
-#: ../src/easytag.c:1575
+#: ../src/easytag.c:1585
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Arquivos selecionados etiquetados com o gênero \"%s\"."
 
-#: ../src/easytag.c:1577
+#: ../src/easytag.c:1587
 msgid "Removed genre from selected files."
 msgstr "Gênero removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1599
+#: ../src/easytag.c:1609
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Arquivos selecionados etiquetados com o comentário \"%s\"."
 
-#: ../src/easytag.c:1601
+#: ../src/easytag.c:1611
 msgid "Removed comment from selected files."
 msgstr "Comentário removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1615
+#: ../src/easytag.c:1625
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Arquivos selecionados etiquetados com o compositor \"%s\"."
 
-#: ../src/easytag.c:1617
+#: ../src/easytag.c:1627
 msgid "Removed composer from selected files."
 msgstr "Compositor removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1632
+#: ../src/easytag.c:1642
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Arquivos selecionados etiquetados com o artista original \"%s\"."
 
-#: ../src/easytag.c:1634
+#: ../src/easytag.c:1644
 msgid "Removed original artist from selected files."
 msgstr "Artista original removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1649
+#: ../src/easytag.c:1659
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Arquivos selecionados etiquetados com o copyright \"%s\"."
 
-#: ../src/easytag.c:1651
+#: ../src/easytag.c:1661
 msgid "Removed copyright from selected files."
 msgstr "Copyright removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1666
+#: ../src/easytag.c:1676
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Arquivos selecionados etiquetados com a URL \"%s\"."
 
-#: ../src/easytag.c:1668
+#: ../src/easytag.c:1678
 msgid "Removed URL from selected files."
 msgstr "URL removida dos arquivos selecionados."
 
-#: ../src/easytag.c:1683
+#: ../src/easytag.c:1693
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Arquivos selecionados etiquetados com o nome do codificador \"%s\"."
 
-#: ../src/easytag.c:1685
+#: ../src/easytag.c:1695
 msgid "Removed encoder name from selected files."
 msgstr "Nome do codificador removido dos arquivos selecionados."
 
-#: ../src/easytag.c:1717
+#: ../src/easytag.c:1727
 msgid "Selected files tagged with images."
 msgstr "Arquivos selecionados etiquetados com imagens."
 
-#: ../src/easytag.c:1719
+#: ../src/easytag.c:1729
 msgid "Removed images from selected files."
 msgstr "Imagens removidas dos arquivos selecionados."
 
-#: ../src/easytag.c:2000
+#: ../src/easytag.c:2010
 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:2052
+#: ../src/easytag.c:2062
 msgid "All tags have been scanned"
 msgstr "Todas as etiquetas foram verificadas"
 
-#: ../src/easytag.c:2108
+#: ../src/easytag.c:2118
 msgid "All tags have been removed"
 msgstr "Todas as etiquetas foram removidas"
 
-#: ../src/easytag.c:2398
+#: ../src/easytag.c:2423
 #, 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:2403
+#: ../src/easytag.c:2428
 msgid "Do you want to continue saving the file?"
 msgstr "Você deseja continuar salvando o arquivo?"
 
-#: ../src/easytag.c:2458 ../src/easytag.c:2478
+#: ../src/easytag.c:2486 ../src/easytag.c:2506
 msgid "Saving files was stopped"
 msgstr "O salvamento de arquivos foi interrompido"
 
-#: ../src/easytag.c:2480
+#: ../src/easytag.c:2508
 msgid "All files have been saved"
 msgstr "Todas os arquivos foram salvos"
 
-#: ../src/easytag.c:2611
+#: ../src/easytag.c:2643
 #, c-format
 msgid "Cannot delete file (%s)"
 msgstr "Não foi possível excluir o arquivo (%s)"
 
-#: ../src/easytag.c:2631
+#: ../src/easytag.c:2664
 msgid "Files have been partially deleted"
 msgstr "Os arquivos foram parcialmente excluídos"
 
-#: ../src/easytag.c:2633
+#: ../src/easytag.c:2666
 msgid "All files have been deleted"
 msgstr "Todos os arquivos foram excluídos"
 
-#: ../src/easytag.c:2749
+#: ../src/easytag.c:2782
 #, 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:2751
+#: ../src/easytag.c:2784
 msgid "Confirm Tag Writing"
 msgstr "Confirmar gravação de etiqueta"
 
-#: ../src/easytag.c:2756 ../src/easytag.c:2873 ../src/easytag.c:3133
+#: ../src/easytag.c:2789 ../src/easytag.c:2909 ../src/easytag.c:3172
 msgid "Repeat action for the remaining files"
 msgstr "Repita esta ação para o resto dos arquivos"
 
 #. Directories and filename changed
-#: ../src/easytag.c:2837 ../src/scan.c:181
+#: ../src/easytag.c:2873 ../src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Renomear arquivo e diretório"
 
-#: ../src/easytag.c:2838
+#: ../src/easytag.c:2874
 msgid "File and directory rename confirmation required"
 msgstr "É necessário confirmação para renomear arquivo e diretório"
 
-#: ../src/easytag.c:2839
+#: ../src/easytag.c:2875
 #, 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:2845
+#: ../src/easytag.c:2881
 msgid "Directory rename confirmation required"
 msgstr "É necessário confirmação para renomear diretório"
 
-#: ../src/easytag.c:2846
+#: ../src/easytag.c:2882
 #, 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:2852
+#: ../src/easytag.c:2888
 msgid "Rename File"
 msgstr "Renomear arquivo"
 
-#: ../src/easytag.c:2853
+#: ../src/easytag.c:2889
 msgid "File rename confirmation required"
 msgstr "É necessário confirmação para renomear o arquivo"
 
-#: ../src/easytag.c:2854
+#: ../src/easytag.c:2890
 #, 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:2920
+#: ../src/easytag.c:2956
 #, c-format
 msgid "Cannot rename file '%s' to '%s'"
 msgstr "Não foi possível renomear o arquivo \"%s\" para \"%s\""
 
-#: ../src/easytag.c:2934
+#: ../src/easytag.c:2970
 #, 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:2938
+#: ../src/easytag.c:2974
 msgid "File(s) not renamed"
 msgstr "Arquivo(s) não renomeado(s)"
 
-#: ../src/easytag.c:3047
+#: ../src/easytag.c:3086
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Gravando etiqueta em \"%s\""
 
-#: ../src/easytag.c:3054
+#: ../src/easytag.c:3093
 msgid "Tag(s) written"
 msgstr "Etiqueta(s) gravada(s)"
 
-#: ../src/easytag.c:3069
+#: ../src/easytag.c:3108
 #, 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:3082
+#: ../src/easytag.c:3121
 #, c-format
 msgid "Cannot write tag in file '%s'"
 msgstr "Não foi possível gravar a etiqueta no arquivo \"%s\""
 
-#: ../src/easytag.c:3085
+#: ../src/easytag.c:3124
 msgid "Tag Write Error"
 msgstr "Erro de gravação de etiqueta"
 
-#: ../src/easytag.c:3130 ../src/easytag.c:3144
+#: ../src/easytag.c:3169 ../src/easytag.c:3183
 #, c-format
 msgid "Do you really want to delete the file '%s'?"
 msgstr "Você deseja mesmo excluir o arquivo \"%s\"?"
 
-#: ../src/easytag.c:3136 ../src/easytag.c:3146
+#: ../src/easytag.c:3175 ../src/easytag.c:3185
 msgid "Delete File"
 msgstr "Excluir arquivo"
 
-#: ../src/easytag.c:3171
+#: ../src/easytag.c:3210
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Arquivo \"%s\" excluído"
 
-#: ../src/easytag.c:3303
+#: ../src/easytag.c:3345
 #, c-format
 msgid "Cannot read directory '%s'"
 msgstr "Não foi possível ler o diretório \"%s\""
 
-#: ../src/easytag.c:3307
+#: ../src/easytag.c:3349
 msgid "Directory Read Error"
 msgstr "Erro de leitura do diretório"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3328
+#: ../src/easytag.c:3370
 #, c-format
 msgid "Search in progress…"
 msgstr "Pesquisa em progresso…"
 
-#: ../src/easytag.c:3351 ../src/et_core.c:2734
+#: ../src/easytag.c:3393 ../src/et_core.c:2824
 #, c-format
 msgid "File: '%s'"
 msgstr "Arquivo: \"%s\""
 
-#: ../src/easytag.c:3401
+#: ../src/easytag.c:3443
 #, 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:3408
+#: ../src/easytag.c:3450
 #, 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:3430
+#: ../src/easytag.c:3472
 msgid "No file found in this directory and subdirectories"
 msgstr "Nenhum arquivo encontrado nesse diretório e subdiretórios"
 
-#: ../src/easytag.c:3432
+#: ../src/easytag.c:3474
 msgid "No file found in this directory"
 msgstr "Nenhum arquivo encontrado neste diretório"
 
-#: ../src/easytag.c:3500
+#: ../src/easytag.c:3542
 #, c-format
 msgid "Error opening directory '%s' (%s)"
 msgstr "Erro ao abrir o diretório \"%s\" (%s)"
 
-#: ../src/easytag.c:3536
+#: ../src/easytag.c:3578
 #, c-format
 msgid "Cannot read directory (%s)"
 msgstr "Não foi possível ler o diretório (%s)"
 
-#: ../src/easytag.c:3556
+#: ../src/easytag.c:3598
 msgid "Searching for audio files…"
 msgstr "Pesquisa por arquivos de áudio…"
 
-#: ../src/easytag.c:3557
+#: ../src/easytag.c:3599
 msgid "Searching"
 msgstr "Pesquisando"
 
-#: ../src/easytag.c:4188
+#: ../src/easytag.c:4265
 msgid "Select a directory to browse"
 msgstr "Seleciona um diretório para navegar"
 
 #. Menu items
-#: ../src/easytag.c:4335
+#: ../src/easytag.c:4412
 msgid "Tag selected files with this field"
 msgstr "Etiquetar arquivos selecionados com esse campo"
 
-#: ../src/easytag.c:4347 ../src/scan.c:2662
+#: ../src/easytag.c:4424 ../src/scan.c:2654
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Converter \"_\" e \"%20\" para espaços"
 
-#: ../src/easytag.c:4354 ../src/scan.c:2664
+#: ../src/easytag.c:4431 ../src/scan.c:2656
 msgid "Convert ' ' to '_'"
 msgstr "Converter \" \" para \"_\""
 
-#: ../src/easytag.c:4365
+#: ../src/easytag.c:4442
 msgid "All uppercase"
 msgstr "Todas maiúsculas"
 
-#: ../src/easytag.c:4372
+#: ../src/easytag.c:4449
 msgid "All lowercase"
 msgstr "Todas minúsculas"
 
-#: ../src/easytag.c:4379
+#: ../src/easytag.c:4456
 msgid "First letter uppercase"
 msgstr "Primeira letra maiúscula"
 
-#: ../src/easytag.c:4386
+#: ../src/easytag.c:4463
 msgid "First letter uppercase of each word"
 msgstr "Primeira letra de cada palavra maiúscula"
 
-#: ../src/easytag.c:4397 ../src/prefs.c:1023 ../src/scan.c:2762
+#: ../src/easytag.c:4474 ../src/prefs.c:1023 ../src/scan.c:2754
 msgid "Remove spaces"
 msgstr "Remover espaços"
 
-#: ../src/easytag.c:4404
+#: ../src/easytag.c:4481
 msgid "Insert space before uppercase letter"
 msgstr "Inserir espaço antes da letra maiúscula"
 
-#: ../src/easytag.c:4411
+#: ../src/easytag.c:4488
 msgid "Remove duplicate spaces or underscores"
 msgstr "Remover espaços e sublinhados duplicados"
 
-#: ../src/easytag.c:4418
+#: ../src/easytag.c:4495
 msgid "Remove all text"
 msgstr "Remover todo texto"
 
-#: ../src/easytag.c:4437
+#: ../src/easytag.c:4514
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: Saída normal."
 
-#: ../src/easytag.c:4489
+#: ../src/easytag.c:4566
 msgid "Do you want to save them before quitting?"
 msgstr "Você deseja salvá-los antes de sair?"
 
-#: ../src/easytag.c:4512
+#: ../src/easytag.c:4593
 msgid "Do you really want to quit?"
 msgstr "Você realmente deseja sair?"
 
-#: ../src/et_core.c:505
+#: ../src/et_core.c:510
 #, c-format
 msgid "Error reading tag from ogg file (%s)"
 msgstr "Erro ao ler a etiqueta do arquivo off (%s)"
 
-#: ../src/et_core.c:639
+#: ../src/et_core.c:539
+#, 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
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr "Correções automáticas aplicadas no arquivo \"%s\"."
 
-#: ../src/et_core.c:2631
+#: ../src/et_core.c:2707
 msgid "ID3 Tag"
 msgstr "Etiqueta ID3"
 
-#: ../src/et_core.c:2637
+#: ../src/et_core.c:2713
 msgid "Ogg Vorbis Tag"
 msgstr "Etiqueta Ogg Vorbis"
 
-#: ../src/et_core.c:2643
+#: ../src/et_core.c:2719
 msgid "FLAC Vorbis Tag"
 msgstr "Etiqueta FLAC"
 
-#: ../src/et_core.c:2648
+#: ../src/et_core.c:2724
 msgid "APE Tag"
 msgstr "Etiqueta APE"
 
-#: ../src/et_core.c:2653
+#: ../src/et_core.c:2729
 msgid "MP4/M4A/AAC Tag"
 msgstr "Etiqueta MP4/M4A/AAC"
 
-#: ../src/et_core.c:2659
+#: ../src/et_core.c:2735
 msgid "Wavpack Tag"
 msgstr "Etiqueta Wavpack"
 
-#: ../src/et_core.c:2679
+#: ../src/et_core.c:2741
+msgid "Opus Tag"
+msgstr "Etiqueta Opus"
+
+#: ../src/et_core.c:2761
 msgid "MP3 File"
 msgstr "Arquivo MP3"
 
-#: ../src/et_core.c:2683
+#: ../src/et_core.c:2765
 msgid "MP2 File"
 msgstr "Arquivo MP2"
 
-#: ../src/et_core.c:2689
+#: ../src/et_core.c:2771
 msgid "Ogg Vorbis File"
 msgstr "Arquivo Ogg Vorbis"
 
-#: ../src/et_core.c:2695
+#: ../src/et_core.c:2777
 msgid "Speex File"
 msgstr "Arquivo Speex"
 
-#: ../src/et_core.c:2701
+#: ../src/et_core.c:2783
 msgid "FLAC File"
 msgstr "Arquivo FLAC"
 
-#: ../src/et_core.c:2706
+#: ../src/et_core.c:2788
 msgid "MusePack File"
 msgstr "Arquivo MusePack"
 
 # http://www.monkeysaudio.com/ (MAC)
-#: ../src/et_core.c:2710
+#: ../src/et_core.c:2792
 msgid "Monkey's Audio File"
 msgstr "Arquivo Monkey's audio"
 
-#: ../src/et_core.c:2715
+#: ../src/et_core.c:2797
 msgid "MP4/AAC File"
 msgstr "Arquivo MP4/AAC"
 
-#: ../src/et_core.c:2721
+#: ../src/et_core.c:2803
 msgid "Wavpack File"
 msgstr "Arquivo Wavpack"
 
-#: ../src/et_core.c:2778 ../src/et_core.c:2833
+#: ../src/et_core.c:2809
+msgid "Opus File"
+msgstr "Arquivo Opus"
+
+#: ../src/et_core.c:2868 ../src/et_core.c:2923
 msgid "File not found"
 msgstr "Arquivo não localizado"
 
-#: ../src/et_core.c:2783
+#: ../src/et_core.c:2873
 #, 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:2817
+#: ../src/et_core.c:2907
 msgid "Read-only file"
 msgstr "Arquivo somente leitura"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2881
+#: ../src/et_core.c:2971
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
 msgstr[0] "Um arquivo"
 msgstr[1] "%u arquivos"
 
-#: ../src/et_core.c:3086
+#: ../src/et_core.c:3175
 #, c-format
 msgid "Images (%d)"
 msgstr "Imagens (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3128 ../src/flac_header.c:205
+#: ../src/et_core.c:3217 ../src/flac_header.c:205
 #: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
 #: ../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/et_core.c:3222 ../src/flac_header.c:210
 #: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
 #: ../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:3368 ../src/scan.c:690
 #, 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:3278
+#: ../src/et_core.c:3370
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Tente definir a variável de ambiente G_FILENAME_ENCODING."
 
-#: ../src/et_core.c:3279 ../src/scan.c:692
+#: ../src/et_core.c:3371 ../src/scan.c:692
 msgid "Filename translation"
 msgstr "Tradução do nome do arquivo"
 
-#: ../src/et_core.c:3940
-#, c-format
-msgid "Cannot change the permissions of file '%s' (%s)"
-msgstr "Não foi possível alterar as permissões do arquivo \"%s\" (%s)"
-
-#: ../src/et_core.c:3978
+#: ../src/et_core.c:4076
 #, 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)"
@@ -2478,7 +2490,7 @@ msgstr "Erro ao gravar o tipo da etiqueta %d no arquivo %s (%s)"
 #. 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/opus_header.c:237 ../src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Canais:"
 
@@ -2487,7 +2499,7 @@ msgstr "Canais:"
 msgid "Error while opening file: '%s' as FLAC (%s)."
 msgstr "Erro ao abrir o arquivo: \"%s\" como 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 "
@@ -2506,7 +2518,7 @@ msgstr "O bloco da imagem não é válido: \"%s\""
 msgid "Error: Failed to write comments to file '%s' (%s)."
 msgstr "Erro: Falha ao gravar comentários no arquivo \"%s\" (%s)."
 
-#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:922
+#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1166
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Gravada etiqueta de '%s'"
@@ -2529,27 +2541,27 @@ msgstr ""
 msgid "Corrupted file"
 msgstr "Arquivo corrompido"
 
-#: ../src/id3_tag.c:540
+#: ../src/id3_tag.c:555
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Removida etiqueta de \"%s\""
 
-#: ../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 "Erro ao remover etiqueta ID3v1 de \"%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 "Erro ao remover etiqueta ID3v2 de \"%s\" (%s)"
 
-#: ../src/id3_tag.c:565
+#: ../src/id3_tag.c:580
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Erro ao atualizar etiqueta ID3v2 de \"%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"
@@ -2557,7 +2569,7 @@ msgstr ""
 "Você tentou salvar esta etiqueta em Unicode, mas foi detectado que sua "
 "versão de id3lib está defeituosa"
 
-#: ../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 "
@@ -2576,90 +2588,90 @@ msgstr ""
 "\n"
 "Arquivo: %s"
 
-#: ../src/id3_tag.c:602
+#: ../src/id3_tag.c:617
 msgid "Buggy id3lib"
 msgstr "id3lib defeituoso"
 
-#: ../src/id3_tag.c:636
+#: ../src/id3_tag.c:651
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Erro ao atualizar etiqueta ID3v1 de \"%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 "Etiqueta atualizada de \"%s\""
 
-#: ../src/id3_tag.c:669
+#: ../src/id3_tag.c:684
 msgid "No error reported"
 msgstr "Nenhum erro relatado"
 
-#: ../src/id3_tag.c:671
+#: ../src/id3_tag.c:686
 msgid "No available memory"
 msgstr "Sem memória disponível"
 
-#: ../src/id3_tag.c:673
+#: ../src/id3_tag.c:688
 msgid "No data to parse"
 msgstr "Sem dados para analisar"
 
-#: ../src/id3_tag.c:675
+#: ../src/id3_tag.c:690
 msgid "Improperly formatted data"
 msgstr "Dados formatados incorretamente"
 
-#: ../src/id3_tag.c:677
+#: ../src/id3_tag.c:692
 msgid "No buffer to write to"
 msgstr "Sem buffer para gravar para"
 
-#: ../src/id3_tag.c:679
+#: ../src/id3_tag.c:694
 msgid "Buffer is too small"
 msgstr "Buffer é muito pequeno"
 
-#: ../src/id3_tag.c:681
+#: ../src/id3_tag.c:696
 msgid "Invalid frame ID"
 msgstr "ID do quadro inválido"
 
-#: ../src/id3_tag.c:683
+#: ../src/id3_tag.c:698
 msgid "Requested field not found"
 msgstr "Campo requerido não encontrado"
 
-#: ../src/id3_tag.c:685
+#: ../src/id3_tag.c:700
 msgid "Unknown field type"
 msgstr "Tipo de campo desconhecido"
 
-#: ../src/id3_tag.c:687
+#: ../src/id3_tag.c:702
 msgid "Tag is already attached to a file"
 msgstr "Etiqueta já está anexada ao arquivo"
 
-#: ../src/id3_tag.c:689
+#: ../src/id3_tag.c:704
 msgid "Invalid tag version"
 msgstr "Versão da etiqueta inválida"
 
-#: ../src/id3_tag.c:691
+#: ../src/id3_tag.c:706
 msgid "No file to parse"
 msgstr "Nenhum arquivo para analisar"
 
-#: ../src/id3_tag.c:693
+#: ../src/id3_tag.c:708
 msgid "Attempting to write to a read-only file"
 msgstr "Tentando gravar em um arquivo somente-leitura"
 
-#: ../src/id3_tag.c:695
+#: ../src/id3_tag.c:710
 msgid "Error in compression/uncompression"
 msgstr "Erro na compressão/descompressão"
 
-#: ../src/id3_tag.c:697
+#: ../src/id3_tag.c:712
 msgid "Unknown error message"
 msgstr "Mensagem de erro desconhecida"
 
-#: ../src/id3_tag.c:1301
+#: ../src/id3_tag.c:1316
 #, c-format
 msgid "Error while creating temporary file: '%s'"
 msgstr "Erro ao criar um arquivo temporário: \"%s\""
 
-#: ../src/id3_tag.c:1308
+#: ../src/id3_tag.c:1323
 msgid "Error while creating temporary file"
 msgstr "Erro ao criar um arquivo temporário"
 
-#: ../src/id3_tag.c:1328
+#: ../src/id3_tag.c:1343
 #, c-format
 msgid "Error while writing to file: '%s' (%s)"
 msgstr "Erro ao gravar no arquivo: \"%s\" (%s)"
@@ -2669,7 +2681,7 @@ msgstr "Erro ao gravar no arquivo: \"%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)"
@@ -2677,12 +2689,12 @@ msgstr[0] "Não foi possível gravar etiqueta do arquivo ‘%s’ (um byte em fa
 msgstr[1] ""
 "Não foi possível gravar etiqueta do arquivo ‘%s’ (%s bytes em falta)"
 
-#: ../src/id3v24_tag.c:1525
+#: ../src/id3v24_tag.c:1524
 #, c-format
 msgid "Cannot save tag of file '%s'"
 msgstr "Não foi possível gravar a etiqueta do arquivo \"%s\""
 
-#: ../src/id3v24_tag.c:1536
+#: ../src/id3v24_tag.c:1535
 #, c-format
 msgid "Size error while saving tag of '%s'"
 msgstr "Erro ao salvar etiqueta de \"%s\""
@@ -2691,66 +2703,54 @@ msgstr "Erro ao salvar etiqueta de \"%s\""
 msgid "Log"
 msgstr "Log"
 
-#: ../src/misc.c:691
-msgid "Select File"
-msgstr "Selecionar arquivo"
-
-#: ../src/misc.c:697
-msgid "Select Directory"
-msgstr "Selecionar diretório"
-
-#: ../src/misc.c:782
-msgid "No audio player defined"
-msgstr "Nenhum reprodutor de áudio definido"
-
-#: ../src/misc.c:783
-msgid "Audio Player Warning"
-msgstr "Aviso do reprodutor de áudio"
+#: ../src/misc.c:719
+msgid "You must type a program name"
+msgstr "Você deve digitar o nome de um programa"
 
-#. Translators: file size (bytes, kilobytes, megabytes, gigabytes,
-#. * terabytes).
-#: ../src/misc.c:1048 ../src/misc.c:1068
-msgid "B"
-msgstr "B"
+#: ../src/misc.c:720
+msgid "Program Name Error"
+msgstr "Erro no nome do programa"
 
-#: ../src/misc.c:1048 ../src/misc.c:1068
-msgid "kB"
-msgstr "kB"
+#: ../src/misc.c:799
+#, c-format
+msgid "Executed command: %s"
+msgstr "Comando executado: %s"
 
-#: ../src/misc.c:1048 ../src/misc.c:1068
-msgid "MB"
-msgstr "MB"
+#: ../src/misc.c:806
+#, c-format
+msgid "Failed to launch program: %s"
+msgstr "Falha ao iniciar programa: %s"
 
-#: ../src/misc.c:1048 ../src/misc.c:1068
-msgid "GB"
-msgstr "GB"
+#: ../src/misc.c:823
+msgid "Select File"
+msgstr "Selecionar arquivo"
 
-#: ../src/misc.c:1048 ../src/misc.c:1068
-msgid "TB"
-msgstr "TB"
+#: ../src/misc.c:829
+msgid "Select Directory"
+msgstr "Selecionar diretório"
 
-#: ../src/misc.c:1147
+#: ../src/misc.c:1141
 msgid "Generate Playlist"
 msgstr "Gerar uma lista de reprodução"
 
-#: ../src/misc.c:1171
+#: ../src/misc.c:1165
 msgid "M3U Playlist Name"
 msgstr "Nome da lista de reprodução M3U"
 
-#: ../src/misc.c:1186
+#: ../src/misc.c:1180
 msgid "Use directory name"
 msgstr "Usar o nome do diretório"
 
 #. Playlist options
-#: ../src/misc.c:1203
+#: ../src/misc.c:1197
 msgid "Playlist Options"
 msgstr "Opções da lista de reprodução"
 
-#: ../src/misc.c:1209
+#: ../src/misc.c:1203
 msgid "Include only the selected files"
 msgstr "Incluir apenas os arquivos selecionados"
 
-#: ../src/misc.c:1212
+#: ../src/misc.c:1206
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2758,29 +2758,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:1215
+#: ../src/misc.c:1209
 msgid "Use full path for files in playlist"
 msgstr "Usar o caminho absoluto para os arquivos na lista de reprodução"
 
-#: ../src/misc.c:1218
+#: ../src/misc.c:1212
 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:1224
+#: ../src/misc.c:1218
 msgid "Create playlist in the parent directory"
 msgstr "Criar uma lista de reprodução no diretório superior"
 
-#: ../src/misc.c:1227
+#: ../src/misc.c:1221
 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:1231
+#: ../src/misc.c:1225
 msgid "Use DOS directory separator"
 msgstr "Usar separador de diretório DOS"
 
-#: ../src/misc.c:1237
+#: ../src/misc.c:1231
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2788,49 +2788,49 @@ msgstr ""
 "Essa opção substitui o separador de diretório UNIX \"/\" por um separador "
 "DOS \"\\\"."
 
-#: ../src/misc.c:1246
+#: ../src/misc.c:1240
 msgid "Playlist Content"
 msgstr "Conteúdo da lista de reprodução"
 
-#: ../src/misc.c:1252
+#: ../src/misc.c:1246
 msgid "Write only list of files"
 msgstr "Gravar somente a lista dos arquivos"
 
-#: ../src/misc.c:1256
+#: ../src/misc.c:1250
 msgid "Write info using filename"
 msgstr "Gravar informações usando o nome do arquivo"
 
-#: ../src/misc.c:1259
+#: ../src/misc.c:1253
 msgid "Write info using:"
 msgstr "Gravar informações usando:"
 
-#: ../src/misc.c:1478
+#: ../src/misc.c:1467
 #, 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:1482
+#: ../src/misc.c:1471
 msgid "Playlist File Error"
 msgstr "Erro no arquivo de lista de reprodução"
 
-#: ../src/misc.c:1490
+#: ../src/misc.c:1479
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Gravando o arquivo de lista de reprodução \"%s\""
 
-#: ../src/misc.c:1554 ../src/scan.c:3247 ../src/scan.c:3309
+#: ../src/misc.c:1543 ../src/scan.c:3239 ../src/scan.c:3301
 msgid "Invalid scanner mask"
 msgstr "Máscara de verificação inválida"
 
-#: ../src/misc.c:1918
+#: ../src/misc.c:1907
 msgid "CD"
 msgstr "CD"
 
-#: ../src/misc.c:1940
+#: ../src/misc.c:1929
 msgid "Find Files"
 msgstr "Localizar arquivos"
 
-#: ../src/misc.c:1972
+#: ../src/misc.c:1961
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2838,13 +2838,13 @@ msgstr ""
 "todos os arquivos."
 
 #. Where...
-#: ../src/misc.c:1978
+#: ../src/misc.c:1967
 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:1983
+#: ../src/misc.c:1972
 msgid "the Filename"
 msgstr "o nome do arquivo"
 
@@ -2853,83 +2853,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:1989
+#: ../src/misc.c:1978
 msgid "the Tag"
 msgstr "a etiqueta"
 
 #. Property of the search
-#: ../src/misc.c:2000 ../src/prefs.c:335
+#: ../src/misc.c:1989 ../src/prefs.c:335
 msgid "Case sensitive"
 msgstr "Diferenciar maiúsculas de minúsculas"
 
-#: ../src/misc.c:2227
+#: ../src/misc.c:2216
 msgid "Ready to search…"
 msgstr "Pronto para pesquisar…"
 
-#: ../src/misc.c:2447
+#: ../src/misc.c:2436
 #, c-format
 msgid "Found one file"
 msgid_plural "Found %d files"
 msgstr[0] "Encontrou um arquivo"
 msgstr[1] "Encontrou %d arquivos"
 
-#: ../src/misc.c:2732
+#: ../src/misc.c:2721
 msgid "Load Filenames From a Text File"
 msgstr "Carregar os nomes dos arquivos de um arquivo texto"
 
-#: ../src/misc.c:2761
+#: ../src/misc.c:2750
 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:2780
+#: ../src/misc.c:2769
 msgid " Load "
 msgstr " Carregar "
 
-#: ../src/misc.c:2798
+#: ../src/misc.c:2787
 msgid "Content of Text File"
 msgstr "Conteúdo do arquivo texto"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2819 ../src/misc.c:2914
+#: ../src/misc.c:2808 ../src/misc.c:2903
 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:2828 ../src/misc.c:2923
+#: ../src/misc.c:2817 ../src/misc.c:2912
 msgid "Delete the selected line"
 msgstr "Excluir a linha selecionada"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2837 ../src/misc.c:2932 ../src/misc.c:3418
+#: ../src/misc.c:2826 ../src/misc.c:2921 ../src/misc.c:3407
 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:2849 ../src/misc.c:2944
+#: ../src/misc.c:2838 ../src/misc.c:2933
 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:2858 ../src/misc.c:2953
+#: ../src/misc.c:2847 ../src/misc.c:2942
 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:2870 ../src/misc.c:2965 ../src/misc.c:3442
+#: ../src/misc.c:2859 ../src/misc.c:2954 ../src/misc.c:3431
 msgid "Reload"
 msgstr "Recarregar"
 
-#: ../src/misc.c:2892
+#: ../src/misc.c:2881
 msgid "List of Files"
 msgstr "Lista dos arquivos"
 
-#: ../src/misc.c:2987
+#: ../src/misc.c:2976
 msgid "Selected line:"
 msgstr "Linha selecionada:"
 
-#: ../src/misc.c:3005
+#: ../src/misc.c:2994
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2938,34 +2938,34 @@ msgstr ""
 "selecionado atualmente será executado (a janela do verificador deverá estar "
 "aberta)."
 
-#: ../src/misc.c:3092
+#: ../src/misc.c:3081
 #, c-format
 msgid "Cannot retrieve file info (%s)"
 msgstr "Não foi possível obter informação do arquivo (%s)"
 
-#: ../src/misc.c:3154
+#: ../src/misc.c:3143
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Não foi possível abrir o arquivo \"%s\" (%s)"
 
-#: ../src/misc.c:3190
+#: ../src/misc.c:3179
 #, c-format
 msgid "Error reading file (%s)"
 msgstr "Erro na leitura do arquivo (%s)"
 
-#: ../src/misc.c:3406
+#: ../src/misc.c:3395
 msgid "Insert a blank line"
 msgstr "Inserir uma linha em branco"
 
-#: ../src/misc.c:3412
+#: ../src/misc.c:3401
 msgid "Delete this line"
 msgstr "Excluir esta linha"
 
-#: ../src/misc.c:3427
+#: ../src/misc.c:3416
 msgid "Move up this line"
 msgstr "Mover esta linha para cima"
 
-#: ../src/misc.c:3433
+#: ../src/misc.c:3422
 msgid "Move down this line"
 msgstr "Mover esta linha para baixo"
 
@@ -3069,175 +3069,184 @@ msgstr ""
 msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
 msgstr "Erro: Falha ao abrir o arquivo: \"%s\" como Vorbis (%s)."
 
-#: ../src/ogg_tag.c: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 "Aviso: O arquivo Ogg Vorbis \"%s\" contém uma etiqueta ID3v2."
 
-#: ../src/picture.c:244 ../src/picture.c:269
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1257
 #, c-format
-msgid "Image file not loaded: %s"
-msgstr "O arquivo de imagem não foi carregado: %s"
+msgid "Error with 'loader_write': %s"
+msgstr "Erro com \"loader_write\": %s"
+
+#: ../src/ogg_tag.c:1050 ../src/picture.c:1180
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr "Erro com \"loader_close\": %s"
 
-#: ../src/picture.c:261
+#: ../src/picture.c:104
+#, c-format
+msgid "Image file not saved: %s"
+msgstr "O arquivo de imagem não salvo: %s"
+
+#: ../src/picture.c:154
 #, c-format
 msgid "Cannot open file: '%s'"
 msgstr "Não foi possível abrir o arquivo \"%s\""
 
-#: ../src/picture.c:265
+#: ../src/picture.c:158
 msgid "Image File Error"
 msgstr "Erro o arquivo de imagem"
 
-#: ../src/picture.c:276
+#: ../src/picture.c:162 ../src/picture.c:424
+#, c-format
+msgid "Image file not loaded: %s"
+msgstr "O arquivo de imagem não foi carregado: %s"
+
+#: ../src/picture.c:446
 msgid "Image file loaded"
 msgstr "Arquivo de imagem carregado"
 
-#: ../src/picture.c:334
+#: ../src/picture.c:504
 msgid "Add Images"
 msgstr "Adicionar imagens"
 
-#: ../src/picture.c:344 ../src/picture.c:700
+#: ../src/picture.c:514 ../src/picture.c:874
 msgid "All Files"
 msgstr "Todos os Arquivos"
 
-#: ../src/picture.c:350 ../src/picture.c:706
+#: ../src/picture.c:520 ../src/picture.c:880
 msgid "PNG and JPEG"
 msgstr "PNG e JPEG"
 
-#: ../src/picture.c:477
+#: ../src/picture.c:651
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Propriedades da imagem %d/%d"
 
-#: ../src/picture.c:501
+#: ../src/picture.c:675
 msgid "Image Type"
 msgstr "Tipo de imagem"
 
 #. Description of the picture
-#: ../src/picture.c:560
+#: ../src/picture.c:734
 msgid "Image Description:"
 msgstr "Descrição de imagem:"
 
-#: ../src/picture.c:687
+#: ../src/picture.c:861
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Salvar imagem %d/%d"
 
-#: ../src/picture.c:759
-#, c-format
-msgid "Image file not saved: %s"
-msgstr "O arquivo de imagem não salvo: %s"
-
-#: ../src/picture.c:827
+#: ../src/picture.c:1021
 msgid "JPEG image"
 msgstr "Imagem JPEG"
 
-#: ../src/picture.c:829
+#: ../src/picture.c:1023
 msgid "PNG image"
 msgstr "Imagem PNG"
 
-#: ../src/picture.c:831
+#: ../src/picture.c:1025
+msgid "GIF image"
+msgstr "Imagem GIF"
+
+#: ../src/picture.c:1027
 msgid "Unknown image"
 msgstr "Imagem desconhecida"
 
-#: ../src/picture.c:843
+#: ../src/picture.c:1039
 msgid "32x32 pixel PNG file icon"
 msgstr "32x32 pixels: ícone de arquivo PNG"
 
-#: ../src/picture.c:845
+#: ../src/picture.c:1041
 msgid "Other file icon"
 msgstr "Outro ícone de arquivo"
 
-#: ../src/picture.c:847
+#: ../src/picture.c:1043
 msgid "Cover (front)"
 msgstr "Capa (frente)"
 
-#: ../src/picture.c:849
+#: ../src/picture.c:1045
 msgid "Cover (back)"
 msgstr "Capa (atrás)"
 
-#: ../src/picture.c:851
+#: ../src/picture.c:1047
 msgid "Leaflet page"
 msgstr "Página do folheto"
 
-#: ../src/picture.c:853
+#: ../src/picture.c:1049
 msgid "Media (e.g. label side of CD)"
 msgstr "Mídia (ex.: lado do rótulo do CD)"
 
-#: ../src/picture.c:855
+#: ../src/picture.c:1051
 msgid "Lead artist/lead performer/soloist"
 msgstr "Artista principal/músico principal/solista"
 
-#: ../src/picture.c:857
+#: ../src/picture.c:1053
 msgid "Artist/performer"
 msgstr "Artista/músico"
 
-#: ../src/picture.c:859
+#: ../src/picture.c:1055
 msgid "Conductor"
 msgstr "Maestro"
 
-#: ../src/picture.c:861
+#: ../src/picture.c:1057
 msgid "Band/Orchestra"
 msgstr "Banda/orquestra"
 
-#: ../src/picture.c:865
+#: ../src/picture.c:1061
 msgid "Lyricist/text writer"
 msgstr "Letrista/escritor"
 
-#: ../src/picture.c:867
+#: ../src/picture.c:1063
 msgid "Recording location"
 msgstr "Local da gravação"
 
-#: ../src/picture.c:869
+#: ../src/picture.c:1065
 msgid "During recording"
 msgstr "Duração da gravação"
 
-#: ../src/picture.c:871
+#: ../src/picture.c:1067
 msgid "During performance"
 msgstr "Duração da performance"
 
-#: ../src/picture.c:873
+#: ../src/picture.c:1069
 msgid "Movie/video screen capture"
 msgstr "Captura de tela de filme/vídeo"
 
-#: ../src/picture.c:875
+#: ../src/picture.c:1071
 msgid "A bright colored fish"
 msgstr "Um peixe de cores fortes"
 
-#: ../src/picture.c:877
+#: ../src/picture.c:1073
 msgid "Illustration"
 msgstr "Ilustração"
 
-#: ../src/picture.c:879
+#: ../src/picture.c:1075
 msgid "Band/Artist logotype"
 msgstr "Logotipo da banda/artista"
 
-#: ../src/picture.c:881
+#: ../src/picture.c:1077
 msgid "Publisher/studio logotype"
 msgstr "Logotipo do distribuidor/estúdio"
 
-#: ../src/picture.c:885
+#: ../src/picture.c:1081
 msgid "Unknown image type"
 msgstr "Tipo de imagem desconhecida"
 
-#: ../src/picture.c:915 ../src/picture.c:926
+#: ../src/picture.c:1111 ../src/picture.c:1122
 msgid "pixels"
 msgstr "pixels"
 
-#: ../src/picture.c:916 ../src/picture.c:927
+#: ../src/picture.c:1112 ../src/picture.c:1123
 msgid "Type"
 msgstr "Tipo"
 
-#: ../src/picture.c:928
+#: ../src/picture.c:1124
 msgid "Description"
 msgstr "Descrição"
 
-#: ../src/picture.c:984
-#, c-format
-msgid "Error with 'loader_close': %s"
-msgstr "Erro com \"loader_close\": %s"
-
-#: ../src/picture.c:1044
+#: ../src/picture.c:1240
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
@@ -3245,25 +3254,20 @@ 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:1051
+#: ../src/picture.c:1247
 msgid "Cannot display the image"
 msgstr "Não foi possível exibir a imagem"
 
-#: ../src/picture.c:1053
+#: ../src/picture.c:1249
 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:1055
+#: ../src/picture.c:1251
 msgid "Load Image File"
 msgstr "Carregar arquivo de imagem"
 
-#: ../src/picture.c:1061
-#, c-format
-msgid "Error with 'loader_write': %s"
-msgstr "Erro com \"loader_write\": %s"
-
 #. Label
 #: ../src/prefs.c:152
 msgid "Default directory:"
@@ -4335,11 +4339,11 @@ msgstr "Configuração salva"
 msgid "Configuration unchanged"
 msgstr "Configuração inalterada"
 
-#: ../src/prefs.c:1707
+#: ../src/prefs.c:1712
 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:1708
+#: ../src/prefs.c:1714
 #, c-format
 msgid ""
 "Path: '%s'\n"
@@ -4348,16 +4352,16 @@ msgstr ""
 "Caminho: \"%s\"\n"
 "Erro: %s"
 
-#: ../src/prefs.c:1709
+#: ../src/prefs.c:1716
 msgid "Invalid Path Error"
 msgstr "Erro de caminho inválido"
 
-#: ../src/prefs.c:1823
+#: ../src/prefs.c:1830
 #, 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:1825
+#: ../src/prefs.c:1832
 msgid "Audio Player Error"
 msgstr "Erro no reprodutor de áudio"
 
@@ -4402,43 +4406,43 @@ msgstr "Novo nome do arquivo verificado com sucesso"
 msgid "New filename successfully scanned: %s"
 msgstr "Novo nome do arquivo verificado com sucesso: %s"
 
-#: ../src/scan.c:1817
+#: ../src/scan.c:1821
 #, c-format
 msgid "Error while processing fields: %s"
 msgstr "Erro ao processar os campos: %s"
 
 #. The window
-#: ../src/scan.c:2336
+#: ../src/scan.c:2328
 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:2345
+#: ../src/scan.c:2337
 msgid "Scan Files"
 msgstr "Verificar arquivos"
 
 #. Option Menu
-#: ../src/scan.c:2373
+#: ../src/scan.c:2365
 msgid "Scanner:"
 msgstr "Verificador:"
 
-#: ../src/scan.c:2394
+#: ../src/scan.c:2386
 msgid "Select the type of scanner to use"
 msgstr "Seleciona o tipo do verificador a ser usado"
 
-#: ../src/scan.c:2403
+#: ../src/scan.c:2395
 msgid "Scanner Preferences"
 msgstr "Preferências do verificador"
 
-#: ../src/scan.c:2412
+#: ../src/scan.c:2404
 msgid "Show / Hide Masks Editor"
 msgstr "Mostra / oculta o editor de máscaras"
 
-#: ../src/scan.c:2422
+#: ../src/scan.c:2414
 msgid "Show / Hide Legend"
 msgstr "Mostra / oculta legendas"
 
-#: ../src/scan.c:2452
+#: ../src/scan.c:2444
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse filename and "
 "path. Used to fill in tag fields"
@@ -4447,15 +4451,15 @@ msgstr ""
 "o nome do arquivo e o caminho. Usado para preencher campos das etiquetas"
 
 #. Preview label
-#: ../src/scan.c:2476
+#: ../src/scan.c:2468
 msgid "Fill tag preview"
 msgstr "Visualização do preenchimento da etiqueta"
 
-#: ../src/scan.c:2506
+#: ../src/scan.c:2498
 msgid "Prefix mask with current path"
 msgstr "Prefixa a máscara no caminho atual"
 
-#: ../src/scan.c:2520
+#: ../src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4468,15 +4472,15 @@ msgstr ""
 "absoluto, caso contrário é relativo ao caminho anterior."
 
 #. Preview label
-#: ../src/scan.c:2545
+#: ../src/scan.c:2537
 msgid "Rename file preview"
 msgstr "Visualização da renomeação do arquivo"
 
-#: ../src/scan.c:2564
+#: ../src/scan.c:2556
 msgid "Select fields:"
 msgstr "Campos selecionados:"
 
-#: ../src/scan.c:2567
+#: ../src/scan.c:2559
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those which interest you"
@@ -4485,134 +4489,134 @@ msgstr ""
 "Selecione aqueles que lhe interessam."
 
 #. Advice for Translators: set the first letter of filename translated
-#: ../src/scan.c:2571
+#: ../src/scan.c:2563
 msgid "F"
 msgstr "A"
 
-#: ../src/scan.c:2573
+#: ../src/scan.c:2565
 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:2575
+#: ../src/scan.c:2567
 msgid "T"
 msgstr "T"
 
-#: ../src/scan.c:2576
+#: ../src/scan.c:2568
 msgid "Process title field"
 msgstr "Processar o campo do título"
 
 #. Advice for Translators: set the first letter of artist translated
-#: ../src/scan.c:2578
+#: ../src/scan.c:2570
 msgid "Ar"
 msgstr "Ar"
 
-#: ../src/scan.c:2579
+#: ../src/scan.c:2571
 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:2581
+#: ../src/scan.c:2573
 msgid "AA"
 msgstr "AA"
 
-#: ../src/scan.c:2582
+#: ../src/scan.c:2574
 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:2584
+#: ../src/scan.c:2576
 msgid "Al"
 msgstr "Al"
 
-#: ../src/scan.c:2585
+#: ../src/scan.c:2577
 msgid "Process album field"
 msgstr "Processar o campo do álbum"
 
 #. Advice for Translators: set the first letter of genre translated
-#: ../src/scan.c:2587
+#: ../src/scan.c:2579
 msgid "G"
 msgstr "G"
 
-#: ../src/scan.c:2588
+#: ../src/scan.c:2580
 msgid "Process genre field"
 msgstr "Processar o campo do gênero"
 
 #. Advice for Translators: set the first letter of comment translated
-#: ../src/scan.c:2590
+#: ../src/scan.c:2582
 msgid "Cm"
 msgstr "Cm"
 
-#: ../src/scan.c:2591
+#: ../src/scan.c:2583
 msgid "Process comment field"
 msgstr "Processar o campo do comentário"
 
 #. Advice for Translators: set the first letter of composer translated
-#: ../src/scan.c:2593
+#: ../src/scan.c:2585
 msgid "Cp"
 msgstr "Cp"
 
-#: ../src/scan.c:2594
+#: ../src/scan.c:2586
 msgid "Process composer field"
 msgstr "Processar o campo do compositor"
 
 #. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan.c:2596
+#: ../src/scan.c:2588
 msgid "O"
 msgstr "A"
 
-#: ../src/scan.c:2597
+#: ../src/scan.c:2589
 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:2599
+#: ../src/scan.c:2591
 msgid "Cr"
 msgstr "Cr"
 
-#: ../src/scan.c:2600
+#: ../src/scan.c:2592
 msgid "Process copyright field"
 msgstr "Processar o campo de copyright"
 
 #. Advice for Translators: set the first letter of URL translated
-#: ../src/scan.c:2602
+#: ../src/scan.c:2594
 msgid "U"
 msgstr "U"
 
-#: ../src/scan.c:2603
+#: ../src/scan.c:2595
 msgid "Process URL field"
 msgstr "Processar o campo da URL"
 
 #. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan.c:2605
+#: ../src/scan.c:2597
 msgid "E"
 msgstr "C"
 
-#: ../src/scan.c:2606
+#: ../src/scan.c:2598
 msgid "Process encoder name field"
 msgstr "Processar o campo do nome do codificador"
 
-#: ../src/scan.c:2650
+#: ../src/scan.c:2642
 msgid "Invert selection"
 msgstr "Inverter seleção"
 
-#: ../src/scan.c:2657
+#: ../src/scan.c:2649
 msgid "Select/Unselect all"
 msgstr "Selecionar/Desmarcar todos"
 
-#: ../src/scan.c:2672
+#: ../src/scan.c:2664
 msgid "Convert:"
 msgstr "Converter:"
 
-#: ../src/scan.c:2674
+#: ../src/scan.c:2666
 msgid "to: "
 msgstr "para: "
 
-#: ../src/scan.c:2681
+#: ../src/scan.c:2673
 msgid "Do not convert"
 msgstr "Não converter"
 
-#: ../src/scan.c:2700
+#: ../src/scan.c:2692
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4621,7 +4625,7 @@ msgstr ""
 "Por exemplo, antes: \"Texto%20Em%20Uma_Entrada\", após: \"Texto em uma "
 "entrada\"."
 
-#: ../src/scan.c:2703
+#: ../src/scan.c:2695
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4629,7 +4633,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:2706
+#: ../src/scan.c:2698
 msgid ""
 "Replace a string by another one. Note that the search is case sensitive."
 msgstr ""
@@ -4637,31 +4641,31 @@ msgstr ""
 "minúsculo."
 
 # Caixa alta?
-#: ../src/scan.c:2713
+#: ../src/scan.c:2705
 msgid "Capitalize all"
 msgstr "Tudo em maiúsculo"
 
-#: ../src/scan.c:2715
+#: ../src/scan.c:2707
 msgid "Lowercase all"
 msgstr "Tudo em minúsculo"
 
-#: ../src/scan.c:2717
+#: ../src/scan.c:2709
 msgid "Capitalize first letter"
 msgstr "Primeira letra em maiúsculo"
 
-#: ../src/scan.c:2719
+#: ../src/scan.c:2711
 msgid "Capitalize the first letter of each word"
 msgstr "Primeira letra de cada palavra em maiúsculo"
 
-#: ../src/scan.c:2720
+#: ../src/scan.c:2712
 msgid "Detect Roman numerals"
 msgstr "Detectar numerais romano"
 
-#: ../src/scan.c:2722
+#: ../src/scan.c:2714
 msgid "Do not change capitalization"
 msgstr "Não alterar maiúsculo/minúsculo"
 
-#: ../src/scan.c:2744
+#: ../src/scan.c:2736
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4669,7 +4673,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:2747
+#: ../src/scan.c:2739
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4677,7 +4681,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:2750
+#: ../src/scan.c:2742
 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'."
@@ -4686,7 +4690,7 @@ msgstr ""
 "campos. Por exemplo, antes: \"Texto EM Uma ENTRADA\", após: \"Texto em uma "
 "entrada\"."
 
-#: ../src/scan.c:2753
+#: ../src/scan.c:2745
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4694,7 +4698,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:2756
+#: ../src/scan.c:2748
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -4702,19 +4706,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:2764
+#: ../src/scan.c:2756
 msgid "Insert a space before uppercase letters"
 msgstr "Inserir um espaço antes das letras maiúsculas"
 
-#: ../src/scan.c:2766
+#: ../src/scan.c:2758
 msgid "Remove duplicate spaces and underscores"
 msgstr "Remover sublinhados e espaços duplicados"
 
-#: ../src/scan.c:2768
+#: ../src/scan.c:2760
 msgid "Do not change word separators"
 msgstr "Não alterar seperadores de palavras"
 
-#: ../src/scan.c:2782
+#: ../src/scan.c:2774
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4722,7 +4726,7 @@ msgstr ""
 "Todos os espaços entre palavras são removidos. Por exemplo, antes: \"Texto "
 "Em Uma Entrada\", após: \"TextoEmUmaEntrada\"."
 
-#: ../src/scan.c:2785
+#: ../src/scan.c:2777
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4730,7 +4734,7 @@ msgstr ""
 "Um espaço é inserido antes de cada letra maiúscula. Por exemplo, antes: "
 "'TextoEmUmaEntrada', depois: 'Texto Em Uma Entrada'."
 
-#: ../src/scan.c:2788
+#: ../src/scan.c:2780
 msgid ""
 "Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4741,141 +4745,141 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2795
+#: ../src/scan.c:2787
 msgid "Legend"
 msgstr "Legenda"
 
-#: ../src/scan.c:2801
+#: ../src/scan.c:2793
 #, c-format
 msgid "%a: artist"
 msgstr "%a: artista"
 
-#: ../src/scan.c:2804
+#: ../src/scan.c:2796
 msgid "%z: album artist"
 msgstr "%z: artista do álbum"
 
-#: ../src/scan.c:2807
+#: ../src/scan.c:2799
 msgid "%b: album"
 msgstr "%b: álbum"
 
-#: ../src/scan.c:2810
+#: ../src/scan.c:2802
 #, c-format
 msgid "%c: comment"
 msgstr "%c: comentário"
 
-#: ../src/scan.c:2813
+#: ../src/scan.c:2805
 #, c-format
 msgid "%p: composer"
 msgstr "%p: compositor"
 
-#: ../src/scan.c:2816
+#: ../src/scan.c:2808
 msgid "%r: copyright"
 msgstr "%r: copyright"
 
-#: ../src/scan.c:2819
+#: ../src/scan.c:2811
 #, c-format
 msgid "%d: disc number"
 msgstr "%d: número do disco"
 
-#: ../src/scan.c:2822
+#: ../src/scan.c:2814
 #, c-format
 msgid "%e: encoded by"
 msgstr "%e: codificado por"
 
-#: ../src/scan.c:2825
+#: ../src/scan.c:2817
 #, c-format
 msgid "%g: genre"
 msgstr "%g: gênero"
 
-#: ../src/scan.c:2828
+#: ../src/scan.c:2820
 #, c-format
 msgid "%i: ignored"
 msgstr "%i: ignorado"
 
-#: ../src/scan.c:2831
+#: ../src/scan.c:2823
 msgid "%l: number of tracks"
 msgstr "%l: número de faixas"
 
-#: ../src/scan.c:2834
+#: ../src/scan.c:2826
 #, c-format
 msgid "%o: orig. artist"
 msgstr "%o: artista orig."
 
-#: ../src/scan.c:2837
+#: ../src/scan.c:2829
 #, c-format
 msgid "%n: track"
 msgstr "%n: faixa"
 
-#: ../src/scan.c:2840
+#: ../src/scan.c:2832
 msgid "%t: title"
 msgstr "%t: título"
 
-#: ../src/scan.c:2843
+#: ../src/scan.c:2835
 #, c-format
 msgid "%u: URL"
 msgstr "%u: URL"
 
-#: ../src/scan.c:2846
+#: ../src/scan.c:2838
 #, c-format
 msgid "%x: number of discs"
 msgstr "%x: número de discos"
 
-#: ../src/scan.c:2849
+#: ../src/scan.c:2841
 msgid "%y: year"
 msgstr "%y: ano"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2856
+#: ../src/scan.c:2848
 msgid "Mask Editor"
 msgstr "Editor de máscara"
 
-#: ../src/scan.c:2910
+#: ../src/scan.c:2902
 msgid "Create New Mask"
 msgstr "Criar nova máscara"
 
-#: ../src/scan.c:2920
+#: ../src/scan.c:2912
 msgid "Move Up this Mask"
 msgstr "Mover essa máscara para cima"
 
-#: ../src/scan.c:2930
+#: ../src/scan.c:2922
 msgid "Move Down this Mask"
 msgstr "Mover essa máscara para baixo"
 
-#: ../src/scan.c:2940
+#: ../src/scan.c:2932
 msgid "Duplicate Mask"
 msgstr "Duplicar máscara"
 
-#: ../src/scan.c:2950
+#: ../src/scan.c:2942
 msgid "Add Default Masks"
 msgstr "Adicionar máscaras padrão"
 
-#: ../src/scan.c:2960
+#: ../src/scan.c:2952
 msgid "Remove Mask"
 msgstr "Remover máscara"
 
-#: ../src/scan.c:2970
+#: ../src/scan.c:2962
 msgid "Save Masks"
 msgstr "Salvar máscaras"
 
-#: ../src/scan.c:3550
+#: ../src/scan.c:3542
 msgid "New_mask"
 msgstr "Nova_máscara"
 
-#: ../src/scan.c:3589
+#: ../src/scan.c:3581
 msgid "Copy: No row selected"
 msgstr "Copiar: Nenhuma linha selecionada"
 
-#: ../src/scan.c:3682
+#: ../src/scan.c:3674
 msgid "Remove: No row selected"
 msgstr "Remover: Nenhuma linha selecionada"
 
-#: ../src/scan.c:3729
+#: ../src/scan.c:3721
 msgid "Move Up: No row selected"
 msgstr "Mover para cima: Nenhuma linha selecionada"
 
-#: ../src/scan.c:3773
+#: ../src/scan.c:3765
 msgid "Move Down: No row selected"
 msgstr "Mover para baixo: Nenhuma linha selecionada"
 
@@ -4889,117 +4893,116 @@ msgstr "Erro: Não foi possível gravar o arquivo de configuração: %s (%s)"
 msgid "Error while writing configuration file: %s"
 msgstr "Erro ao escrever o arquivo de configuração %s"
 
-#: ../src/setting.c:1104
+#: ../src/setting.c:1100
 #, c-format
 msgid "Cannot open configuration file '%s' (%s)"
 msgstr "Não foi possível abrir o arquivo de configuração \"%s\" (%s)"
 
-#: ../src/setting.c:1106
+#: ../src/setting.c:1102
 msgid "Loading default configuration"
 msgstr "Carregando configuração padrão"
 
-#: ../src/setting.c:1147
+#: ../src/setting.c:1143
 #, c-format
 msgid "Cannot create or open file '%s' (%s)"
 msgstr "Não foi possível criar ou abrir o arquivo \"%s\" (%s)"
 
-#: ../src/setting.c:1207
+#: ../src/setting.c:1203
 #, c-format
 msgid "Error: Cannot write list to file: %s (%s)"
 msgstr "Erro: Não foi possível gravar a lista para o arquivo: %s (%s)"
 
-#: ../src/setting.c:1225
+#: ../src/setting.c:1221
 #, c-format
 msgid "Error while writing list file: %s"
 msgstr "Erro ao gravar o arquivo de lista: %s"
 
 #. Fall back to defaults
-#: ../src/setting.c:1305
+#: ../src/setting.c:1301
 msgid "Loading default 'Fill Tag' masks…"
 msgstr "Carregando as máscaras padrão de \"Preenchimento de etiqueta\"…"
 
 #. Fall back to defaults
-#: ../src/setting.c:1335
+#: ../src/setting.c:1331
 msgid "Loading default 'Rename File' masks…"
 msgstr "Carregando as máscaras padrão de \"Renomear arquivo\"…"
 
 #. Fall back to defaults
-#: ../src/setting.c:1361
+#: ../src/setting.c:1357
 msgid "Loading default 'Rename Directory' masks…"
 msgstr "Carregando as máscaras padrão de \"Renomear diretório\"…"
 
-#: ../src/setting.c:1572
+#: ../src/setting.c:1568
 #, c-format
 msgid "Migrating configuration from directory '%s' to '%s'"
 msgstr "Migrando a configuração do diretório \"%s\" para \"%s\""
 
-#: ../src/setting.c:1596
+#: ../src/setting.c:1592
 #, c-format
 msgid "Failed to migrate configuration file '%s'"
 msgstr "Falha ao migrar o arquivo de configuração \"%s\""
 
-#: ../src/setting.c:1633
+#: ../src/setting.c:1629
 #, c-format
 msgid "Error: Cannot create directory '%s' (%s)"
 msgstr "Erro: Não foi possível criar o diretório \"%s\" (%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 "A DLL \"%s\" nao carregado ainda. Tente carregá-la..."
+#~ msgid "DLL '%s' not already loaded. Try loading it..."
+#~ msgstr "A DLL \"%s\" nao carregado ainda. Tente carregá-la..."
 
-#. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: ../src/win32/win32dep.c:130
-#, c-format
-msgid "DLL '%s' could not be loaded"
-msgstr "A DLL \"%s\" não pôde ser carregada"
+#~ msgid "DLL '%s' could not be loaded"
+#~ msgstr "A DLL \"%s\" não pôde ser carregada"
 
-#. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: ../src/win32/win32dep.c:140
-#, c-format
-msgid "This version of '%s' contains '%s'"
-msgstr "Essa versão de \"%s\" contém \"%s\""
+#~ msgid "This version of '%s' contains '%s'"
+#~ msgstr "Essa versão de \"%s\" contém \"%s\""
 
-#. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: ../src/win32/win32dep.c:146
-#, c-format
-msgid "Function '%s' not found in DLL '%s'"
-msgstr "A função \"%s\" não encontrada na DLL \"%s\""
+#~ msgid "Function '%s' not found in DLL '%s'"
+#~ msgstr "A função \"%s\" não encontrada na DLL \"%s\""
 
-#. 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 "Diretório de configurações do EasyTAG: \"%s\""
+#~ msgid "EasyTAG settings directory: '%s'"
+#~ msgstr "Diretório de configurações do EasyTAG: \"%s\""
 
-#. Log_Print(_("weasytag_init start..."));
-#: ../src/win32/win32dep.c:472
-#, c-format
-msgid "weasytag_init start..."
-msgstr "weasytag_init iniciando..."
+#~ msgid "weasytag_init start..."
+#~ msgstr "weasytag_init iniciando..."
 
-#. 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 "Versão do GLib: %u.%u.%u\n"
+#~ msgid "GLib version: %u.%u.%u\n"
+#~ msgstr "Versão do GLib: %u.%u.%u\n"
 
-#. Set Environmental Variables
-#. Log_Print(_("weasytag_init end..."));
-#: ../src/win32/win32dep.c:496
-#, c-format
-msgid "weasytag_init end..."
-msgstr "weasytag_init terminando..."
+#~ msgid "weasytag_init end..."
+#~ msgstr "weasytag_init terminando..."
 
-#. Log_Print(_("Audio player: '%s'"), player);
-#: ../src/win32/win32dep.c:620
-#, c-format
-msgid "Audio player: '%s'"
-msgstr "Reprodutor de áudio: \"%s\""
+#~ msgid "Audio player: '%s'"
+#~ msgstr "Reprodutor de áudio: \"%s\""
+
+#~ msgid "The program '%s' cannot be found"
+#~ msgstr "O programa \"%s\" não pôde ser localizado"
+
+#~ msgid "Cannot execute ‘%s’ (%s)"
+#~ msgstr "Não foi possível executar \"%s\" (%s)"
+
+#~ msgid "Cannot change the permissions of file '%s' (%s)"
+#~ msgstr "Não foi possível alterar as permissões do arquivo \"%s\" (%s)"
+
+#~ msgid "No audio player defined"
+#~ msgstr "Nenhum reprodutor de áudio definido"
+
+#~ msgid "Audio Player Warning"
+#~ msgstr "Aviso do reprodutor de áudio"
+
+#~ msgid "B"
+#~ msgstr "B"
+
+#~ msgid "kB"
+#~ msgstr "kB"
+
+#~ msgid "MB"
+#~ msgstr "MB"
+
+#~ msgid "GB"
+#~ msgstr "GB"
+
+#~ msgid "TB"
+#~ msgstr "TB"
 
 #~ msgid "Cannot fork another process\n"
 #~ msgstr "Não foi possível separar outro processo\n"
diff --git a/po/sr.po b/po/sr.po
index 89cd7bf..ba15212 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,15 +1,16 @@
 # Serbian translation of EasyTAG
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2007—2014.
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the EasyTAG package.
 # Miloš Popović <gpopac at gmail.com>, 2007.
-# Мирослав Николић <miroslavnikolic at rocketmail.com>, 2012, 2013, 2014.
+# Мирослав Николић <miroslavnikolic at rocketmail.com>, 2012—2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG-2.1.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=easyta"
 "g&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-01-21 20:09+0000\n"
-"PO-Revision-Date: 2014-01-27 22:08+0200\n"
+"POT-Creation-Date: 2014-04-03 16:46+0000\n"
+"PO-Revision-Date: 2014-04-05 21:22+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic at rocketmail.com>\n"
 "Language-Team: Serbian <gnom at prevod.org>\n"
 "Language: sr\n"
@@ -18,6 +19,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Project-Style: gnome\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 Opus, Ogg Speex, Ogg "
+"Vorbis, MusePack, Monkey's Audio and WavPack files."
+msgstr ""
+"Прегледајте и уређујте ознаке за МП3, МП2, МП4/ААЦ, ФЛАЦ, Огг Опус, Огг "
+"Спикс, Огг Ворбис, МјузПак, Монки аудио и Вејвпак датотеке."
+
+#: ../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 ""
+"Једноставно и привлачно Гтк+ сучеље чини означавање лакшим у ГНУ/Линуксу и "
+"Виндоузу."
 
 #: ../data/easytag.desktop.in.h:1
 msgid "Sound File Metadata Editor"
@@ -48,16 +77,16 @@ msgid ""
 "this program. If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 "Овај програм је слободан софтвер: можете га делити и/или мењати под условима "
-"ГНУ-ове Опште јавне лиценце коју је објавила Задужбина слободног софтвера, "
-"било верзије 2 лиценце, или (према вашем избору) било које новије верзије.\n"
+"Гнуове опште јавне лиценце коју је објавила Задужбина слободног софтвера, "
+"било издања 2 лиценце, или (према вашем избору) било којег новијег издања.\n"
 "\n"
 "Овај програм се расподељује у нади да ће бити користан,али БЕЗ ИКАКВЕ "
 "ГАРАНЦИЈЕ, чак и без примењене гаранције ТРЖИШНЕ ВРЕДНОСТИ или "
-"ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ. Погледајте ГНУ Општу јавну лиценцу за више "
-"детаља.\n"
+"ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ. Погледајте Гнуову општу јавну лиценцу за "
+"више детаља.\n"
 "\n"
-"Требали сте да примите примерак ГНУ Опште јавне лиценце уз овај програм. Ако "
-"нисте, погледајте: http://www.gnu.org/licenses/."
+"Требали сте да примите примерак Гнуове опште јавне лиценце уз овај програм. "
+"Ако нисте, погледајте: „http://www.gnu.org/licenses/“."
 
 #. Translators: put your own name here to appear in the about dialog.
 #: ../src/about.c:108
@@ -95,729 +124,737 @@ msgstr "— Уређујте ознаке и преименујте звучне
 #.
 #. * Main Menu Actions
 #.
-#: ../src/bar.c:154
+#: ../src/bar.c:155
 msgid "_File"
 msgstr "_Датотека"
 
-#: ../src/bar.c:155
+#: ../src/bar.c:156
 msgid "Sort List by Tag"
 msgstr "Поређај списак према ознаци"
 
-#: ../src/bar.c:158
+#: ../src/bar.c:159
 msgid "Sort List by Property"
 msgstr "Поређај списак према својству"
 
-#: ../src/bar.c:159
+#: ../src/bar.c:160
 msgid "Ascending by filename"
 msgstr "Растуће, према називу датотеке"
 
-#: ../src/bar.c:160
+#: ../src/bar.c:161
 msgid "Descending by filename"
 msgstr "Опадајуће, према називу датотеке"
 
-#: ../src/bar.c:161
+#: ../src/bar.c:162
 msgid "Ascending by creation date"
 msgstr "Растуће, према датуму настанка"
 
-#: ../src/bar.c:162
+#: ../src/bar.c:163
 msgid "Descending by creation date"
 msgstr "Опадајуће, према датуму настанка"
 
-#: ../src/bar.c:163
+#: ../src/bar.c:164
 msgid "Ascending by track number"
 msgstr "Растуће, према броју нумере"
 
-#: ../src/bar.c:164
+#: ../src/bar.c:165
 msgid "Descending by track number"
 msgstr "Опадајуће, према броју нумере"
 
-#: ../src/bar.c:165
+#: ../src/bar.c:166
 msgid "Ascending by title"
 msgstr "Растуће, према наслову"
 
-#: ../src/bar.c:166
+#: ../src/bar.c:167
 msgid "Descending by title"
 msgstr "Опадајуће, према наслову"
 
-#: ../src/bar.c:167
+#: ../src/bar.c:168
 msgid "Ascending by artist"
 msgstr "Растуће, према извођачу"
 
-#: ../src/bar.c:168
+#: ../src/bar.c:169
 msgid "Descending by artist"
 msgstr "Опадајуће, према извођачу"
 
-#: ../src/bar.c:169
+#: ../src/bar.c:170
 msgid "Ascending by album artist"
 msgstr "Растуће, према извођачу албума"
 
-#: ../src/bar.c:170
+#: ../src/bar.c:171
 msgid "Descending by album artist"
 msgstr "Опадајуће, према извођачу албума"
 
-#: ../src/bar.c:171
+#: ../src/bar.c:172
 msgid "Ascending by album"
 msgstr "Растуће, према албуму"
 
-#: ../src/bar.c:172
+#: ../src/bar.c:173
 msgid "Descending by album"
 msgstr "Опадајуће, према албуму"
 
-#: ../src/bar.c:173
+#: ../src/bar.c:174
 msgid "Ascending by year"
 msgstr "Растуће, према години"
 
-#: ../src/bar.c:174
+#: ../src/bar.c:175
 msgid "Descending by year"
 msgstr "Опадајуће, према години"
 
-#: ../src/bar.c:175
+#: ../src/bar.c:176
 msgid "Ascending by genre"
 msgstr "Растуће, према жанру"
 
-#: ../src/bar.c:176
+#: ../src/bar.c:177
 msgid "Descending by genre"
 msgstr "Опадајуће, према жанру"
 
-#: ../src/bar.c:177
+#: ../src/bar.c:178
 msgid "Ascending by comment"
 msgstr "Растуће, према напомени"
 
-#: ../src/bar.c:178
+#: ../src/bar.c:179
 msgid "Descending by comment"
 msgstr "Опадајуће, према напомени"
 
-#: ../src/bar.c:179
+#: ../src/bar.c:180
 msgid "Ascending by composer"
 msgstr "Растуће, према композитору"
 
-#: ../src/bar.c:180
+#: ../src/bar.c:181
 msgid "Descending by composer"
 msgstr "Опадајуће, према композитору"
 
-#: ../src/bar.c:181
+#: ../src/bar.c:182
 msgid "Ascending by original artist"
 msgstr "Растуће, према оригиналном извођачу"
 
-#: ../src/bar.c:182
+#: ../src/bar.c:183
 msgid "Descending by original artist"
 msgstr "Опадајуће, према оригиналном извођачу"
 
-#: ../src/bar.c:183
+#: ../src/bar.c:184
 msgid "Ascending by copyright"
 msgstr "Растуће, према ауторским правима"
 
-#: ../src/bar.c:184
+#: ../src/bar.c:185
 msgid "Descending by copyright"
 msgstr "Опадајуће, према ауторским правима"
 
-#: ../src/bar.c:185
+#: ../src/bar.c:186
 msgid "Ascending by URL"
 msgstr "Растуће, према адреси"
 
-#: ../src/bar.c:186
+#: ../src/bar.c:187
 msgid "Descending by URL"
 msgstr "Опадајуће, према адреси"
 
 #. 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 "Растуће, према називу кодера"
 
 #. 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 "Опадајуће, према називу кодера"
 
-#: ../src/bar.c:193
+#: ../src/bar.c:194
 msgid "Ascending by file type"
 msgstr "Растуће, према врсти датотеке"
 
-#: ../src/bar.c:194
+#: ../src/bar.c:195
 msgid "Descending by file type"
 msgstr "Опадајуће, према врсти датотеке"
 
-#: ../src/bar.c:195
+#: ../src/bar.c:196
 msgid "Ascending by file size"
 msgstr "Растуће, према величини датотеке"
 
-#: ../src/bar.c:196
+#: ../src/bar.c:197
 msgid "Descending by file size"
 msgstr "Опадајуће, према величини датотеке"
 
-#: ../src/bar.c:197
+#: ../src/bar.c:198
 msgid "Ascending by duration"
 msgstr "Растуће, према трајању нумере"
 
-#: ../src/bar.c:198
+#: ../src/bar.c:199
 msgid "Descending by duration"
 msgstr "Опадајуће, према трајању нумере"
 
-#: ../src/bar.c:199
+#: ../src/bar.c:200
 msgid "Ascending by bitrate"
 msgstr "Растуће, према битском протоку"
 
-#: ../src/bar.c:200
+#: ../src/bar.c:201
 msgid "Descending by bitrate"
 msgstr "Опадајуће, према битском протоку"
 
-#: ../src/bar.c:201
+#: ../src/bar.c:202
 msgid "Ascending by samplerate"
 msgstr "Растуће према протоку узорка"
 
-#: ../src/bar.c:202
+#: ../src/bar.c:203
 msgid "Descending by samplerate"
 msgstr "Опадајуће, према протоку узорка"
 
-#: ../src/bar.c:204
+#: ../src/bar.c:205
 msgid "Open Files With…"
 msgstr "Отвори датотеке програмом…"
 
-#: ../src/bar.c:205
+#: ../src/bar.c:206
 msgid "Run a command on the selected files"
 msgstr "Покрени наредбу над изабраним датотекама"
 
-#: ../src/bar.c:208
+#: ../src/bar.c:209
 msgid "Select all"
 msgstr "Изабери све"
 
-#: ../src/bar.c:209
+#: ../src/bar.c:210
 msgid "Unselect All"
 msgstr "Одзначи све"
 
-#: ../src/bar.c:210
+#: ../src/bar.c:211
 msgid "Clear the current selection"
 msgstr "Очистите текући избор"
 
-#: ../src/bar.c:213
+#: ../src/bar.c:214
 msgid "Invert File Selection"
 msgstr "Преокрени избор датотека"
 
-#: ../src/bar.c:214
+#: ../src/bar.c:215
 msgid "Invert file selection"
 msgstr "Преокрените избор датотека"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete Files"
 msgstr "Обриши датотеке"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete files"
 msgstr "Обришите датотеке"
 
-#: ../src/bar.c:217
+#: ../src/bar.c:218
 msgid "_First File"
 msgstr "П_рва датотека"
 
-#: ../src/bar.c:218
+#: ../src/bar.c:219
 msgid "First file"
 msgstr "Прва датотека"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "_Previous File"
 msgstr "Пре_тходна датотека"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "Previous file"
 msgstr "Претходна датотека"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "_Next File"
 msgstr "_Следећа датотека"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "Next file"
 msgstr "Следећа датотека"
 
-#: ../src/bar.c:221
+#: ../src/bar.c:222
 msgid "_Last File"
 msgstr "Пос_ледња датотека"
 
-#: ../src/bar.c:222
+#: ../src/bar.c:223
 msgid "Last file"
 msgstr "Последња датотека"
 
-#: ../src/bar.c:223
+#: ../src/bar.c:224
 msgid "S_can Files"
 msgstr "_Прегледај датотеке"
 
-#: ../src/bar.c:224 ../src/scan.c:2352
+#: ../src/bar.c:225 ../src/scan.c:2344
 msgid "Scan selected files"
 msgstr "Прегледајте изабране датотеке"
 
-#: ../src/bar.c:225
+#: ../src/bar.c:226
 msgid "_Remove Tags"
 msgstr "_Уклони ознаке"
 
-#: ../src/bar.c:226
+#: ../src/bar.c:227
 msgid "Remove tags"
 msgstr "Уклоните ознаке"
 
-#: ../src/bar.c:227
+#: ../src/bar.c:228
 msgid "_Undo Last Files Changes"
 msgstr "_Опозови последње измене датотека"
 
-#: ../src/bar.c:228
+#: ../src/bar.c:229
 msgid "Undo last files changes"
 msgstr "Опозовите измене последњих датотека"
 
-#: ../src/bar.c:230
+#: ../src/bar.c:231
 msgid "R_edo Last Files Changes"
 msgstr "_Понови последње измене датотека"
 
-#: ../src/bar.c:231
+#: ../src/bar.c:232
 msgid "Redo last files changes"
 msgstr "Поновите последње измене датотека"
 
-#: ../src/bar.c:233
+#: ../src/bar.c:234
 msgid "_Save Files"
 msgstr "_Сачувај датотеке"
 
-#: ../src/bar.c:234
+#: ../src/bar.c:235
 msgid "Save changes to selected files"
 msgstr "Сачувајте измене у изабраним датотекама"
 
-#: ../src/bar.c:236
+#: ../src/bar.c:237
 msgid "_Force Save Files"
 msgstr "_Приморај чување датотека"
 
-#: ../src/bar.c:237
+#: ../src/bar.c:238
 msgid "Force saving files"
 msgstr "Приморајте чување датотека"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo Last Changes"
 msgstr "Опозови последње измене"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo last changes"
 msgstr "Опозовите последње измене"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo Last Changes"
 msgstr "Понови последње измене"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo last changes"
 msgstr "Поновите последње измене"
 
-#: ../src/bar.c:241
+#: ../src/bar.c:242
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: ../src/bar.c:241 ../src/easytag.c:2404 ../src/easytag.c:4488
-#: ../src/easytag.c:4516
+#: ../src/bar.c:242 ../src/easytag.c:2429 ../src/easytag.c:4565
+#: ../src/easytag.c:4597
 msgid "Quit"
 msgstr "Изађите из програма"
 
-#: ../src/bar.c:244
+#: ../src/bar.c:245
 msgid "_Browser"
 msgstr "_Прегледник"
 
-#: ../src/bar.c:245
+#: ../src/bar.c:246
 msgid "_Home Directory"
 msgstr "_Лични директоријум"
 
-#: ../src/bar.c:246
+#: ../src/bar.c:247
 msgid "Go to home directory"
 msgstr "Идите у лични директоријум"
 
-#: ../src/bar.c:248
+#: ../src/bar.c:249
 msgid "Desktop Directory"
 msgstr "Директоријум радне површи"
 
-#: ../src/bar.c:249
+#: ../src/bar.c:250
 msgid "Go to desktop directory"
 msgstr "Идите у директоријум радне површи"
 
-#: ../src/bar.c:251
+#: ../src/bar.c:252
 msgid "Documents Directory"
 msgstr "Директоријум са документима"
 
-#: ../src/bar.c:252
+#: ../src/bar.c:253
 msgid "Go to documents directory"
 msgstr "Идите у директоријум са документима"
 
-#: ../src/bar.c:254
+#: ../src/bar.c:255
 msgid "Downloads Directory"
 msgstr "Директоријум преузимања"
 
-#: ../src/bar.c:255
+#: ../src/bar.c:256
 msgid "Go to downloads directory"
 msgstr "Идите у директоријум преузимања"
 
-#: ../src/bar.c:257
+#: ../src/bar.c:258
 msgid "Music Directory"
 msgstr "Директоријум музике"
 
-#: ../src/bar.c:258
+#: ../src/bar.c:259
 msgid "Go to music directory"
 msgstr "Идите у директоријум музике"
 
-#: ../src/bar.c:260
+#: ../src/bar.c:261
 msgid "_Parent Directory"
 msgstr "_Родитељски директоријум"
 
-#: ../src/bar.c:261
+#: ../src/bar.c:262
 msgid "Go to parent directory"
 msgstr "Иди у родитељски директоријум"
 
-#: ../src/bar.c:263
+#: ../src/bar.c:264
 msgid "_Default Directory"
 msgstr "_Основни директоријум"
 
-#: ../src/bar.c:264
+#: ../src/bar.c:265
 msgid "Go to default directory"
 msgstr "Идите у основни директоријум"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set _Current Path as Default"
 msgstr "Постави _тренутну путању као основну"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set current path as default"
 msgstr "Поставите тренутну путању као основну"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename Directory…"
 msgstr "Преименуј директоријум…"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename directory"
 msgstr "Преименујте директоријум"
 
-#: ../src/bar.c:268
+#: ../src/bar.c:269
 msgid "Reload Directory"
 msgstr "Освежи директоријум"
 
-#: ../src/bar.c:269
+#: ../src/bar.c:270
 msgid "Reload directory"
 msgstr "Освежите директоријум"
 
-#: ../src/bar.c:272
+#: ../src/bar.c:273
 msgid "Browse Directory With…"
 msgstr "Отвори директоријум програмом…"
 
-#: ../src/bar.c:273
+#: ../src/bar.c:274
 msgid "Run a command on the directory"
 msgstr "Покрени наредбу над директоријумом"
 
-#: ../src/bar.c:275
+#: ../src/bar.c:276
 msgid "_Collapse Tree"
 msgstr "_Скупи стабло"
 
-#: ../src/bar.c:276
+#: ../src/bar.c:277
 msgid "Collapse directory tree"
 msgstr "Скупите стабло директоријума"
 
-#: ../src/bar.c:277
+#: ../src/bar.c:278
 msgid "_Reload Tree"
 msgstr "_Освежи стабло"
 
-#: ../src/bar.c:278
+#: ../src/bar.c:279
 msgid "Reload directory tree"
 msgstr "Освежите стабло директоријума"
 
-#: ../src/bar.c:281
+#: ../src/bar.c:282
 msgid "S_canner Mode"
 msgstr "Режим _прегледача"
 
-#: ../src/bar.c:283
+#: ../src/bar.c:284
 msgid "_Miscellaneous"
 msgstr "_Разно"
 
-#: ../src/bar.c:284
+#: ../src/bar.c:285
 msgid "_Find…"
 msgstr "_Пронађи…"
 
-#: ../src/bar.c:285
+#: ../src/bar.c:286
 msgid "Search filenames and tags"
 msgstr "Потражите називе датотека и ознаке"
 
-#: ../src/bar.c:287
+#: ../src/bar.c:288
 msgid "CDD_B Search…"
 msgstr "Претражи _базу података ЦД-а…"
 
-#: ../src/bar.c:288
+#: ../src/bar.c:289
 msgid "CDDB search"
 msgstr "ЦДБП претрага"
 
-#: ../src/bar.c:290
+#: ../src/bar.c:291
 msgid "Load Filenames From a Text File…"
 msgstr "Учитај називе датотека из текстуалне датотеке…"
 
-#: ../src/bar.c:291
+#: ../src/bar.c:292
 msgid "Load filenames from a text file"
 msgstr "Учитајте називе датотека из текстуалне датотеке"
 
-#: ../src/bar.c:293
+#: ../src/bar.c:294
 msgid "Generate Playlist…"
 msgstr "Начини списак нумера…"
 
-#: ../src/bar.c:294
+#: ../src/bar.c:295
 msgid "Generate a playlist"
 msgstr "Начини списак нумера"
 
-#: ../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 "Покрени програм за звук"
 
-#: ../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 "Покрените програм за пуштање звука"
 
-#: ../src/bar.c:300
+#: ../src/bar.c:301
 msgid "_Edit"
 msgstr "_Уређивање"
 
-#: ../src/bar.c:301
+#: ../src/bar.c:302
 msgid "_Preferences"
 msgstr "_Поставке"
 
 #. The window
-#: ../src/bar.c:302 ../src/prefs.c:110
+#: ../src/bar.c:303 ../src/prefs.c:110
 msgid "Preferences"
 msgstr "Поставке"
 
-#: ../src/bar.c:304
+#: ../src/bar.c:305
 msgid "_View"
 msgstr "_Преглед"
 
-#: ../src/bar.c:305
+#: ../src/bar.c:306
 msgid "_Go"
 msgstr "_Иди"
 
-#: ../src/bar.c:307
+#: ../src/bar.c:308
 msgid "_Help"
 msgstr "По_моћ"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:311
+msgid "_Contents"
+msgstr "_Садржај"
+
+#: ../src/bar.c:312
+msgid "Show help"
+msgstr "Прикажите помоћ"
+
+#: ../src/bar.c:314
 msgid "_About"
 msgstr "_О програму"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:314
 msgid "About"
 msgstr "О програму"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: ../src/bar.c:314
+#: ../src/bar.c:320
 msgid "Stop the current action"
 msgstr "Прекини тренутну радњу"
 
 #.
 #. * Popup menu's Actions
 #.
-#: ../src/bar.c:320
+#: ../src/bar.c:326
 msgid "_File Operations"
 msgstr "_Радње над датотекама"
 
-#: ../src/bar.c:321
+#: ../src/bar.c:327
 msgid "S_canner"
 msgstr "_Прегледач"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:331
 msgid "CDDB Search Files…"
 msgstr "Нађи датотеке у бази података ЦД-а…"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:331
 msgid "CDDB search files…"
 msgstr "Нађите датотеке у бази података ЦД-а…"
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: ../src/bar.c:329
+#: ../src/bar.c:335
 msgid "Clear log"
 msgstr "Очисти дневник измена"
 
 #. { 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 "Разгледај _под-директоријуме"
 
-#: ../src/bar.c:336
+#: ../src/bar.c:342
 msgid "Browse subdirectories"
 msgstr "Разгледајте под-директоријуме"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:346
 msgid "Show Hidden Directories"
 msgstr "Прикажи скривене директоријуме"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:346
 msgid "Show hidden directories"
 msgstr "Прикажите скривене директоријуме"
 
-#: ../src/bar.c:342
+#: ../src/bar.c:348
 msgid "_Show Scanner"
 msgstr "_Покажи прегледач"
 
-#: ../src/bar.c:343
+#: ../src/bar.c:349
 msgid "Show scanner"
 msgstr "Покажите прегледач"
 
-#: ../src/bar.c:349
+#: ../src/bar.c:355
 msgid "Tree Browser"
 msgstr "Разгледач стаблом"
 
-#: ../src/bar.c:350
+#: ../src/bar.c:356
 msgid "View by directory tree"
 msgstr "Прегледајте стаблом директоријума"
 
-#: ../src/bar.c:352
+#: ../src/bar.c:358
 msgid "Artist and Album"
 msgstr "Извођач и албум"
 
-#: ../src/bar.c:353
+#: ../src/bar.c:359
 msgid "View by artist and album"
 msgstr "Прегледајте према извођачу и албуму"
 
-#: ../src/bar.c:358
+#: ../src/bar.c:364
 msgid "_Fill Tags…"
 msgstr "_Испуни ознаке…"
 
-#: ../src/bar.c:359
+#: ../src/bar.c:365
 msgid "Fill tags"
 msgstr "Попуните ознаке"
 
-#: ../src/bar.c:361
+#: ../src/bar.c:367
 msgid "_Rename Files and Directories…"
 msgstr "_Преименуј датотеке и директоријуме…"
 
-#: ../src/bar.c:362
+#: ../src/bar.c:368
 msgid "Rename files and directories"
 msgstr "Преименујте датотеке и директоријуме"
 
-#: ../src/bar.c:364
+#: ../src/bar.c:370
 msgid "_Process Fields…"
 msgstr "_Обради поља…"
 
-#: ../src/bar.c:364 ../src/scan.c:182
+#: ../src/bar.c:370 ../src/scan.c:182
 msgid "Process Fields"
 msgstr "Обрадите поља"
 
-#: ../src/bar.c:422
+#: ../src/bar.c:428
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Не могу да стопим КС, грешка беше: %s\n"
 
-#: ../src/bar.c:528
+#: ../src/bar.c:533
 msgid "Ready to start"
 msgstr "Спреман сам за почетак"
 
-#: ../src/browser.c:369
+#: ../src/browser.c:376
 msgid "New default path for files selected"
 msgstr "Изабрана је нова основна путања за датотеке"
 
-#: ../src/browser.c:670 ../src/easytag.c:4484
+#: ../src/browser.c:678 ../src/easytag.c:4561
 msgid "Some files have been modified but not saved"
 msgstr "Неке датотеке су измењене али нису сачуване"
 
-#: ../src/browser.c:671
+#: ../src/browser.c:679
 msgid "Do you want to save them before changing the directory?"
 msgstr "Да ли желите да их сачувате пре него што промените директоријум?"
 
-#: ../src/browser.c:675
+#: ../src/browser.c:683
 msgid "Confirm Directory Change"
 msgstr "Потврдите промену директоријума"
 
-#: ../src/browser.c:2121
+#: ../src/browser.c:2146
 msgid "<All albums>"
 msgstr "<Сви албуми>"
 
-#: ../src/browser.c:2573
+#: ../src/browser.c:2607
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Грешка: Тражећи %s, не могу да нађем чвор %s у стаблу."
 
-#: ../src/browser.c:3067 ../src/browser.c:3145
+#: ../src/browser.c:3101 ../src/browser.c:3179
 msgid "Tree"
 msgstr "Стабло"
 
-#: ../src/browser.c:3068 ../src/cddb.c:803 ../src/misc.c:1913
+#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1902
 msgid "Filename"
 msgstr "Назив датотеке"
 
-#: ../src/browser.c:3068 ../src/cddb.c:804 ../src/misc.c:1914
+#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1903
 #: ../src/prefs.c:643
 msgid "Title"
 msgstr "Наслов"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Artist".
-#: ../src/browser.c:3069 ../src/browser.c:3076 ../src/cddb.c:483
-#: ../src/cddb.c:805 ../src/misc.c:1915 ../src/prefs.c:644
+#: ../src/browser.c:3103 ../src/browser.c:3110 ../src/cddb.c:483
+#: ../src/cddb.c:805 ../src/misc.c:1904 ../src/prefs.c:644
 msgid "Artist"
 msgstr "Извођач"
 
-#: ../src/browser.c:3069 ../src/misc.c:1916
+#: ../src/browser.c:3103 ../src/misc.c:1905
 msgid "Album Artist"
 msgstr "Извођач албума"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Album".
-#: ../src/browser.c:3070 ../src/browser.c:3078 ../src/cddb.c:486
-#: ../src/cddb.c:806 ../src/misc.c:1917 ../src/prefs.c:645
+#: ../src/browser.c:3104 ../src/browser.c:3112 ../src/cddb.c:486
+#: ../src/cddb.c:806 ../src/misc.c:1906 ../src/prefs.c:645
 msgid "Album"
 msgstr "Албум"
 
-#: ../src/browser.c:3070 ../src/cddb.c:807 ../src/misc.c:1919
+#: ../src/browser.c:3104 ../src/cddb.c:807 ../src/misc.c:1908
 msgid "Year"
 msgstr "Година"
 
-#: ../src/browser.c:3070
+#: ../src/browser.c:3104
 msgid "Disc"
 msgstr "Диск"
 
-#: ../src/browser.c:3071 ../src/misc.c:1920
+#: ../src/browser.c:3105 ../src/misc.c:1909
 msgid "Track"
 msgstr "Нумера"
 
-#: ../src/browser.c:3071 ../src/cddb.c:810 ../src/misc.c:1921
+#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1910
 #: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Жанр"
 
-#: ../src/browser.c:3072 ../src/misc.c:1922 ../src/prefs.c:647
+#: ../src/browser.c:3106 ../src/misc.c:1911 ../src/prefs.c:647
 msgid "Comment"
 msgstr "Коментар"
 
-#: ../src/browser.c:3072 ../src/misc.c:1923 ../src/picture.c:863
+#: ../src/browser.c:3106 ../src/misc.c:1912 ../src/picture.c:1059
 #: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Композитор"
 
-#: ../src/browser.c:3073 ../src/misc.c:1924
+#: ../src/browser.c:3107 ../src/misc.c:1913
 msgid "Original Artist"
 msgstr "Ориг. извођач"
 
-#: ../src/browser.c:3074 ../src/misc.c:1925
+#: ../src/browser.c:3108 ../src/misc.c:1914
 msgid "Copyright"
 msgstr "Ауторско право"
 
-#: ../src/browser.c:3074 ../src/misc.c:1926
+#: ../src/browser.c:3108 ../src/misc.c:1915
 msgid "URL"
 msgstr "Адреса"
 
-#: ../src/browser.c:3075 ../src/misc.c:1927
+#: ../src/browser.c:3109 ../src/misc.c:1916
 msgid "Encoded By"
 msgstr "Кодирано помоћу"
 
-#: ../src/browser.c:3076
+#: ../src/browser.c:3110
 msgid "# Albums"
 msgstr "#Албуми"
 
-#: ../src/browser.c:3077 ../src/browser.c:3078
+#: ../src/browser.c:3111 ../src/browser.c:3112
 msgid "# Files"
 msgstr "#Датотеке"
 
-#: ../src/browser.c:3103
+#: ../src/browser.c:3137
 msgid "Enter a directory to browse."
 msgstr "Унесите директоријум за разгледање."
 
-#: ../src/browser.c:3112
+#: ../src/browser.c:3146
 msgid "Select a directory to browse."
 msgstr "Изаберите директоријум за разгледање."
 
@@ -825,33 +862,33 @@ msgstr "Изаберите директоријум за разгледање."
 #. * The label for displaying number of files in path (without subdirs)
 #.
 #. Translators: No files, as in "0 files".
-#: ../src/browser.c:3119 ../src/easytag.c:3426
+#: ../src/browser.c:3153 ../src/easytag.c:3468
 msgid "No files"
 msgstr "Нема датотека"
 
-#: ../src/browser.c:3197
+#: ../src/browser.c:3231
 msgid "Artist & Album"
 msgstr "Извођач и албум"
 
 #. Only directories changed
-#: ../src/browser.c:3561 ../src/easytag.c:2844
+#: ../src/browser.c:3595 ../src/easytag.c:2880
 msgid "Rename Directory"
 msgstr "Преименуј директоријум"
 
-#: ../src/browser.c:3583
+#: ../src/browser.c:3617
 #, c-format
 msgid "Rename the directory '%s' to:"
 msgstr "Преименуј директоријум „%s“ у:"
 
-#: ../src/browser.c:3602 ../src/misc.c:1177
+#: ../src/browser.c:3636 ../src/misc.c:1171
 msgid "Use mask:"
 msgstr "Користи маску:"
 
-#: ../src/browser.c:3605
+#: ../src/browser.c:3639
 msgid "If activated, it will use masks to rename directory."
 msgstr "Уколик је активно, користиће маске за преименовање директоријума."
 
-#: ../src/browser.c:3623
+#: ../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."
@@ -860,98 +897,69 @@ msgstr ""
 "за преименовање директоријума из поља ознака."
 
 #. Preview label
-#: ../src/browser.c:3647
+#: ../src/browser.c:3681
 msgid "Rename directory preview"
 msgstr "Преглед преименовања директоријума"
 
-#: ../src/browser.c:3739
+#: ../src/browser.c:3773
 msgid "You must type a directory name"
 msgstr "Морате да унесете назив директоријума"
 
-#: ../src/browser.c:3740 ../src/browser.c:3761
+#: ../src/browser.c:3774 ../src/browser.c:3795
 msgid "Directory Name Error"
 msgstr "Грешка назива директоријума"
 
-#: ../src/browser.c:3758
+#: ../src/browser.c:3792
 #, c-format
 msgid "Could not convert '%s' into filename encoding."
 msgstr "Не могу да претворим „%s“ у систем кодирања назива датотеке."
 
-#: ../src/browser.c:3760
+#: ../src/browser.c:3794
 msgid "Please use another name"
 msgstr "Молим користите други назив"
 
-#: ../src/browser.c:3830
+#: ../src/browser.c:3864
 #, c-format
 msgid "The directory name '%s' already exists"
 msgstr "Назив директоријума „%s“ већ постоји"
 
-#: ../src/browser.c:3831 ../src/easytag.c:2927
+#: ../src/browser.c:3865 ../src/easytag.c:2963
 msgid "Rename File Error"
 msgstr "Грешка преименовања датотеке"
 
-#: ../src/browser.c:3869 ../src/browser.c:3898
+#: ../src/browser.c:3903 ../src/browser.c:3932
 msgid "Rename Directory Error"
 msgstr "Грешка преименовања директоријума"
 
-#: ../src/browser.c:3936
+#: ../src/browser.c:3970
 msgid "Directory renamed"
 msgstr "Директоријум је преименован"
 
-#: ../src/browser.c:3972
+#: ../src/browser.c:4006
 msgid "Browse Directory With"
 msgstr "Отвори директоријум програмом"
 
-#: ../src/browser.c:3988 ../src/browser.c:4114
+#: ../src/browser.c:4022 ../src/browser.c:4148
 msgid "Program to run:"
 msgstr "Програм за покретање:"
 
-#: ../src/browser.c:4000
+#: ../src/browser.c:4034
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Унесите програм за покретање. Он ће добити тренутни директоријум као "
 "параметар."
 
-#: ../src/browser.c:4094
+#: ../src/browser.c:4128
 msgid "Open Files With"
 msgstr "Отвори датотеке програмом"
 
-#: ../src/browser.c:4126
+#: ../src/browser.c:4160
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Унесите програм за покретање. Он ће добити означену датотеку као параметар."
 
-#: ../src/browser.c:4257
-msgid "You must type a program name"
-msgstr "Морате да унесете назив програма"
-
-#: ../src/browser.c:4258 ../src/browser.c:4275
-msgid "Program Name Error"
-msgstr "Грешка назива програма"
-
-#: ../src/browser.c:4273 ../src/misc.c:793
-#, c-format
-msgid "The program '%s' cannot be found"
-msgstr "Не могу да пронађем програм „%s“"
-
-#: ../src/browser.c:4325 ../src/misc.c:839
-#, c-format
-#| msgid "Cannot execute %s (%s)"
-msgid "Cannot execute ‘%s’ (%s)"
-msgstr "Не могу да покренем „%s“ (%s)"
-
-#: ../src/browser.c:4369 ../src/misc.c:884
-#, c-format
-msgid "Executed command: %s"
-msgstr "Извршена наредба: „%s“"
-
-#: ../src/browser.c:4375 ../src/misc.c:890
-#, c-format
-msgid "Failed to launch program: %s"
-msgstr "Нисам успео да покренем програм: %s"
-
 #: ../src/cddb.c:313
 msgid "Artist / Album"
 msgstr "Извођач / Албум"
@@ -1041,7 +1049,7 @@ msgstr "Сва поља"
 
 #. 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:1037 ../src/prefs.c:807
 msgid "Other"
 msgstr "Остало"
 
@@ -1135,7 +1143,7 @@ msgstr "Категорије"
 msgid "Results:"
 msgstr "Резултати:"
 
-#: ../src/cddb.c:606 ../src/misc.c:1961
+#: ../src/cddb.c:606 ../src/misc.c:1950
 msgid "Search:"
 msgstr "Потражи:"
 
@@ -1198,7 +1206,7 @@ msgid "# Tracks"
 msgstr "# Нумере"
 
 #. Check box to run the scanner
-#: ../src/cddb.c:847 ../src/misc.c:3002
+#: ../src/cddb.c:847 ../src/misc.c:2991
 msgid "Run the current scanner for each file"
 msgstr "Примени текући прегледач за сваку датотеку"
 
@@ -1296,7 +1304,7 @@ msgstr "Грешка при читању одговора из ЦДБП-а(%s)"
 msgid "Cannot create file '%s' (%s)"
 msgstr "Не могу да направим датотеку „%s“ (%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 "Не могу да отворим датотеку „%s“ (%s)"
@@ -1635,46 +1643,46 @@ msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Ниска „%s“ не може бити преведена у УТФ-8 (%s)."
 
 #. Starting messages
-#: ../src/easytag.c:173
+#: ../src/easytag.c:184
 #, c-format
 msgid "Starting EasyTAG version %s (PID: %d)…"
 msgstr "Покрећем Лаку ознаку %s (ПИБ: %d)…"
 
-#: ../src/easytag.c:175
+#: ../src/easytag.c:186
 #, c-format
 msgid "Using libid3tag version %s"
 msgstr "Користим „libid3tag“ %s…"
 
-#: ../src/easytag.c:178
+#: ../src/easytag.c:189
 #, c-format
 msgid "Using id3lib version %d.%d.%d"
 msgstr "Користим „id3lib“ %d.%d.%d…"
 
-#: ../src/easytag.c:184
+#: ../src/easytag.c:195
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
 msgstr "Променљива „EASYTAGLANG“ је одређена. Постављам локализацију: „%s“"
 
-#: ../src/easytag.c:186
+#: ../src/easytag.c:197
 #, c-format
 msgid "Setting locale: '%s'"
 msgstr "Постављам локализацију: „%s“"
 
-#: ../src/easytag.c:191
+#: ../src/easytag.c:202
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')"
 msgstr "Тренутно користим локализацију „%s“ (и евентуално „%s“)"
 
-#: ../src/easytag.c:198
+#: ../src/easytag.c:209
 msgid "Unable to create setting directories"
 msgstr "Не могу да направим директоријуме подешавања"
 
-#: ../src/easytag.c:415 ../src/et_core.c:583
+#: ../src/easytag.c:426 ../src/et_core.c:597 ../src/et_core.c:609
 #, c-format
 msgid "Error while querying information for file: '%s' (%s)"
 msgstr "Грешка приликом пропитивања података за датотеку: „%s“ (%s)"
 
-#: ../src/easytag.c:480
+#: ../src/easytag.c:489
 #, c-format
 msgid "Cannot open path '%s'"
 msgstr "Не могу да отворим путању „%s“"
@@ -1682,11 +1690,11 @@ msgstr "Не могу да отворим путању „%s“"
 #.
 #. * Browser
 #.
-#: ../src/easytag.c:572 ../src/prefs.c:142
+#: ../src/easytag.c:581 ../src/prefs.c:142
 msgid "Browser"
 msgstr "Прегледник"
 
-#: ../src/easytag.c:594 ../src/et_core.c:2727
+#: ../src/easytag.c:603 ../src/et_core.c:2817
 msgid "File"
 msgstr "Датотека"
 
@@ -1696,114 +1704,114 @@ msgstr "Датотека"
 #. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
 #. Version changed to encoder version
 #. Encoder version
-#: ../src/easytag.c:626 ../src/easytag.c:4154 ../src/flac_header.c:201
+#: ../src/easytag.c:635 ../src/easytag.c:4231 ../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 "Кодер:"
 
-#: ../src/easytag.c:634
+#: ../src/easytag.c:643
 msgid "Bitrate:"
 msgstr "Битски проток:"
 
 #. Translators: Please try to keep this string as short as possible as it
 #. * is shown in a narrow column.
-#: ../src/easytag.c:644
+#: ../src/easytag.c:653
 msgid "Frequency:"
 msgstr "Учесталост:"
 
 #. Mode
-#: ../src/easytag.c:655 ../src/easytag.c:4158 ../src/mpeg_header.c:216
+#: ../src/easytag.c:664 ../src/easytag.c:4235 ../src/mpeg_header.c:216
 msgid "Mode:"
 msgstr "Режим:"
 
-#: ../src/easytag.c:662
+#: ../src/easytag.c:671
 msgid "Size:"
 msgstr "Величина:"
 
-#: ../src/easytag.c:669
+#: ../src/easytag.c:678
 msgid "Duration:"
 msgstr "Трајање:"
 
 #. Main Frame
-#: ../src/easytag.c:716 ../src/et_core.c:2665
+#: ../src/easytag.c:725 ../src/et_core.c:2747
 msgid "Tag"
 msgstr "Ознака"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: ../src/easytag.c:738
+#: ../src/easytag.c:747
 msgid "Common"
 msgstr "Опште"
 
 #. Title
-#: ../src/easytag.c:745
+#: ../src/easytag.c:754
 msgid "Title:"
 msgstr "Наслов:"
 
-#: ../src/easytag.c:759
+#: ../src/easytag.c:768
 msgid "Tag selected files with this title"
 msgstr "Означите изабране датотеке овим насловом"
 
 #. Artist
-#: ../src/easytag.c:764
+#: ../src/easytag.c:773
 msgid "Artist:"
 msgstr "Извођач:"
 
-#: ../src/easytag.c:778
+#: ../src/easytag.c:787
 msgid "Tag selected files with this artist"
 msgstr "Означите изабране датотеке овим извођачем"
 
 #. Album Artist
-#: ../src/easytag.c:783
+#: ../src/easytag.c:792
 msgid "Album artist:"
 msgstr "Извођач албума:"
 
-#: ../src/easytag.c:797
+#: ../src/easytag.c:806
 msgid "Tag selected files with this album artist"
 msgstr "Означите изабране датотеке овим извођачем албума"
 
 #. Album
-#: ../src/easytag.c:802
+#: ../src/easytag.c:811
 msgid "Album:"
 msgstr "Албум:"
 
-#: ../src/easytag.c:816
+#: ../src/easytag.c:825
 msgid "Tag selected files with this album name"
 msgstr "Означите изабране датотеке овим називом албума"
 
 #. Disc Number
-#: ../src/easytag.c:821
+#: ../src/easytag.c:830
 msgid "CD:"
 msgstr "ЦД:"
 
-#: ../src/easytag.c:838
+#: ../src/easytag.c:847
 msgid "Tag selected files with this disc number"
 msgstr "Означите изабране датотеке овим бројем диска"
 
 #. Year
-#: ../src/easytag.c:843
+#: ../src/easytag.c:852
 msgid "Year:"
 msgstr "Година:"
 
-#: ../src/easytag.c:863
+#: ../src/easytag.c:872
 msgid "Tag selected files with this year"
 msgstr "Означите изабране датотеке овом годином"
 
-#: ../src/easytag.c:877
+#: ../src/easytag.c:886
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Број доследно изабраних нумера. Почиње од 01 у сваком под-директоријуму."
 
 #. To have enough space to display the icon
 #. To have enough space to display the icon
-#: ../src/easytag.c:886
+#: ../src/easytag.c:895
 msgid "Track #:"
 msgstr "Нумера #:"
 
-#: ../src/easytag.c:917
+#: ../src/easytag.c:926
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1811,269 +1819,269 @@ msgstr ""
 "Унесите број датотека, у истом директоријуму приказане датотеке, до "
 "изабраних нумера."
 
-#: ../src/easytag.c:937
+#: ../src/easytag.c:946
 msgid "Tag selected files with this number of tracks"
 msgstr "Означите изабране датотеке овим бројем нумера"
 
 #. Genre
-#: ../src/easytag.c:941
+#: ../src/easytag.c:950
 msgid "Genre:"
 msgstr "Жанр:"
 
-#: ../src/easytag.c:969
+#: ../src/easytag.c:978
 msgid "Tag selected files with this genre"
 msgstr "Означите изабране датотеке овим жанром"
 
 #. Comment
-#: ../src/easytag.c:974
+#: ../src/easytag.c:983
 msgid "Comment:"
 msgstr "Коментар:"
 
-#: ../src/easytag.c:1001
+#: ../src/easytag.c:1010
 msgid "Tag selected files with this comment"
 msgstr "Означите изабране датотеке овом напоменом"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. Composer (name of the composers)
-#: ../src/easytag.c:1008
+#: ../src/easytag.c:1017
 msgid "Composer:"
 msgstr "Композитор:"
 
-#: ../src/easytag.c:1022
+#: ../src/easytag.c:1031
 msgid "Tag selected files with this composer"
 msgstr "Означите изабране датотеке овим композитором"
 
 #. 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:1029
+#: ../src/easytag.c:1038
 msgid "Orig. artist:"
 msgstr "Ориг. извођач:"
 
-#: ../src/easytag.c:1043
+#: ../src/easytag.c:1052
 msgid "Tag selected files with this original artist"
 msgstr "Означите изабране датотеке овим оригиналним извођачем"
 
 #. Copyright
-#: ../src/easytag.c:1049
+#: ../src/easytag.c:1058
 msgid "Copyright:"
 msgstr "Ауторско право:"
 
-#: ../src/easytag.c:1063
+#: ../src/easytag.c:1072
 msgid "Tag selected files with this copyright"
 msgstr "Означите изабране датотеке овим ауторским правом"
 
 #. URL
-#: ../src/easytag.c:1069
+#: ../src/easytag.c:1078
 msgid "URL:"
 msgstr "Адреса:"
 
-#: ../src/easytag.c:1083
+#: ../src/easytag.c:1092
 msgid "Tag selected files with this URL"
 msgstr "Означите изабране датотеке овом адресом"
 
 #. Encoded by
-#: ../src/easytag.c:1089
+#: ../src/easytag.c:1098
 msgid "Encoded by:"
 msgstr "Кодирано помоћу:"
 
-#: ../src/easytag.c:1103
+#: ../src/easytag.c:1112
 msgid "Tag selected files with this encoder name"
 msgstr "Означите изабране датотеке називом овог енкодера"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1137 ../src/et_core.c:3100 ../src/et_core.c:3103
+#: ../src/easytag.c:1146 ../src/et_core.c:3189 ../src/et_core.c:3192
 msgid "Images"
 msgstr "Слике"
 
-#: ../src/easytag.c:1161
+#: ../src/easytag.c:1170
 msgid "You can use drag and drop to add an image"
 msgstr "Можете превући слике у ово прозорче да их додате"
 
-#: ../src/easytag.c:1208
+#: ../src/easytag.c:1217
 msgid "Add images to the tag"
 msgstr "Додајте слике у ознаке"
 
-#: ../src/easytag.c:1226
+#: ../src/easytag.c:1235
 msgid "Remove selected images from the tag"
 msgstr "Уклоните изабране слике из ознаке"
 
-#: ../src/easytag.c:1240
+#: ../src/easytag.c:1249
 msgid "Save the selected images to files"
 msgstr "Сачувајте изабране слике у датотеке"
 
-#: ../src/easytag.c:1251
+#: ../src/easytag.c:1260
 msgid "Edit image properties"
 msgstr "Уредите својства слике"
 
-#: ../src/easytag.c:1265
+#: ../src/easytag.c:1274
 msgid "Tag selected files with these images"
 msgstr "Означите изабране датотеке овим сликама"
 
-#: ../src/easytag.c:1323
+#: ../src/easytag.c:1332
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Изабране датотеке су означене насловом „%s“."
 
-#: ../src/easytag.c:1325
+#: ../src/easytag.c:1334
 msgid "Removed title from selected files."
 msgstr "Уклоњен је је наслов из изабраних датотека."
 
-#: ../src/easytag.c:1340
+#: ../src/easytag.c:1349
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Изабране датотеке су означене извођачем „%s“."
 
-#: ../src/easytag.c:1342
+#: ../src/easytag.c:1351
 msgid "Removed artist from selected files."
 msgstr "Уклоњен је је извођач из изабраних датотека."
 
-#: ../src/easytag.c:1356
+#: ../src/easytag.c:1365
 #, c-format
 msgid "Selected files tagged with album artist '%s'."
 msgstr "Изабране датотеке су означене извођачем албума „%s“."
 
-#: ../src/easytag.c:1358
+#: ../src/easytag.c:1367
 msgid "Removed album artist from selected files."
 msgstr "Уклоњен је је извођач албума из изабраних датотека."
 
-#: ../src/easytag.c:1373
+#: ../src/easytag.c:1382
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Изабране датотеке су означене албумом „%s“."
 
-#: ../src/easytag.c:1375
+#: ../src/easytag.c:1384
 msgid "Removed album name from selected files."
 msgstr "Уклоњен је је назив албума из изабраних датотека."
 
-#: ../src/easytag.c:1412
+#: ../src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with disc number '%s/%s'."
 msgstr "Изабране датотеке су означене бројем диска „%s/%s“."
 
-#: ../src/easytag.c:1417
+#: ../src/easytag.c:1426
 #, c-format
 msgid "Selected files tagged with disc number like 'xx'."
 msgstr "Изабране датотеке су означене бројем диска као „хх“."
 
-#: ../src/easytag.c:1422
+#: ../src/easytag.c:1431
 msgid "Removed disc number from selected files."
 msgstr "Уклоњен је број диска из изабраних датотека."
 
-#: ../src/easytag.c:1438
+#: ../src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Изабране датотеке су означене годином „%s“."
 
-#: ../src/easytag.c:1440
+#: ../src/easytag.c:1449
 msgid "Removed year from selected files."
 msgstr "Уклоњена је година из изабраних датотека."
 
-#: ../src/easytag.c:1466 ../src/easytag.c:1556
+#: ../src/easytag.c:1475 ../src/easytag.c:1566
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Изабране датотеке су означене нумером типа „xx/%s“."
 
-#: ../src/easytag.c:1469
+#: ../src/easytag.c:1478
 #, c-format
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Изабране датотеке су означене нумером типа „xx“."
 
-#: ../src/easytag.c:1473 ../src/easytag.c:1559
+#: ../src/easytag.c:1482 ../src/easytag.c:1569
 msgid "Removed track number from selected files."
 msgstr "Уклоњен је број нумере из изабраних датотека."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1529
+#: ../src/easytag.c:1539
 #, c-format
 msgid "Selected tracks numbered sequentially."
 msgstr "Изабране датотеке су побројане редом."
 
-#: ../src/easytag.c:1575
+#: ../src/easytag.c:1585
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Изабране датотеке су означене жанром „%s“."
 
-#: ../src/easytag.c:1577
+#: ../src/easytag.c:1587
 msgid "Removed genre from selected files."
 msgstr "Уклоњен је жанр из изабраних датотека."
 
-#: ../src/easytag.c:1599
+#: ../src/easytag.c:1609
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Изабране датотеке су означене коментаром „%s“."
 
-#: ../src/easytag.c:1601
+#: ../src/easytag.c:1611
 msgid "Removed comment from selected files."
 msgstr "Уклоњен је коментар из изабраних датотека."
 
-#: ../src/easytag.c:1615
+#: ../src/easytag.c:1625
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Изабране датотеке су означене композитором „%s“."
 
-#: ../src/easytag.c:1617
+#: ../src/easytag.c:1627
 msgid "Removed composer from selected files."
 msgstr "Уклоњен је композитор из изабраних датотека."
 
-#: ../src/easytag.c:1632
+#: ../src/easytag.c:1642
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Изабране датотеке су означене оригиналним извођачем „%s“."
 
-#: ../src/easytag.c:1634
+#: ../src/easytag.c:1644
 msgid "Removed original artist from selected files."
 msgstr "Уклоњен је оригинални извођач из изабраних датотека."
 
-#: ../src/easytag.c:1649
+#: ../src/easytag.c:1659
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Изабране датотеке су означене ауторским правом „%s“."
 
-#: ../src/easytag.c:1651
+#: ../src/easytag.c:1661
 msgid "Removed copyright from selected files."
 msgstr "Уклоњено је ауторско право из изабраних датотека."
 
-#: ../src/easytag.c:1666
+#: ../src/easytag.c:1676
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Изабране датотеке су означене адресом „%s“."
 
-#: ../src/easytag.c:1668
+#: ../src/easytag.c:1678
 msgid "Removed URL from selected files."
 msgstr "Уклоњена је адреса из изабраних датотека."
 
-#: ../src/easytag.c:1683
+#: ../src/easytag.c:1693
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Изабране датотеке су означене називом кодера „%s“."
 
-#: ../src/easytag.c:1685
+#: ../src/easytag.c:1695
 msgid "Removed encoder name from selected files."
 msgstr "Уклоњен је назив кодера из изабраних датотека."
 
-#: ../src/easytag.c:1717
+#: ../src/easytag.c:1727
 msgid "Selected files tagged with images."
 msgstr "Изабране датотеке су означене сликама."
 
-#: ../src/easytag.c:1719
+#: ../src/easytag.c:1729
 msgid "Removed images from selected files."
 msgstr "Уклоњене су слике из изабраних датотека."
 
-#: ../src/easytag.c:2000
+#: ../src/easytag.c:2010
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Изабери режим и маску, и понови исту радњу"
 
-#: ../src/easytag.c:2052
+#: ../src/easytag.c:2062
 msgid "All tags have been scanned"
 msgstr "Све ознаке су прегледане"
 
-#: ../src/easytag.c:2108
+#: ../src/easytag.c:2118
 msgid "All tags have been removed"
 msgstr "Све ознаке су уклоњене"
 
-#: ../src/easytag.c:2398
+#: ../src/easytag.c:2423
 #, c-format
 msgid "A file was changed by an external program"
 msgid_plural "%d files were changed by an external program."
@@ -2082,153 +2090,153 @@ msgstr[1] "%d датотеке су измењене спољним програ
 msgstr[2] "%d датотека је измењено спољним програмом."
 msgstr[3] "Једна датотека је измењена спољним програмом."
 
-#: ../src/easytag.c:2403
+#: ../src/easytag.c:2428
 msgid "Do you want to continue saving the file?"
 msgstr "Да ли желите да сачувате датотеку?"
 
-#: ../src/easytag.c:2458 ../src/easytag.c:2478
+#: ../src/easytag.c:2486 ../src/easytag.c:2506
 msgid "Saving files was stopped"
 msgstr "Чување датотека је заустављено"
 
-#: ../src/easytag.c:2480
+#: ../src/easytag.c:2508
 msgid "All files have been saved"
 msgstr "Све датотеке су сачуване"
 
-#: ../src/easytag.c:2611
+#: ../src/easytag.c:2643
 #, c-format
 msgid "Cannot delete file (%s)"
 msgstr "Не могу да обришем датотеку (%s)"
 
-#: ../src/easytag.c:2631
+#: ../src/easytag.c:2664
 msgid "Files have been partially deleted"
 msgstr "Датотеке су делимично уклоњене"
 
-#: ../src/easytag.c:2633
+#: ../src/easytag.c:2666
 msgid "All files have been deleted"
 msgstr "Све датотеке су уклоњене"
 
-#: ../src/easytag.c:2749
+#: ../src/easytag.c:2782
 #, c-format
 msgid "Do you want to write the tag of file '%s'?"
 msgstr "Да ли желите да упишете ознаку датотеке „%s“?"
 
-#: ../src/easytag.c:2751
+#: ../src/easytag.c:2784
 msgid "Confirm Tag Writing"
 msgstr "Потврди уписивање ознаке"
 
-#: ../src/easytag.c:2756 ../src/easytag.c:2873 ../src/easytag.c:3133
+#: ../src/easytag.c:2789 ../src/easytag.c:2909 ../src/easytag.c:3172
 msgid "Repeat action for the remaining files"
 msgstr "Понови радњу за преостале датотеке"
 
 #. Directories and filename changed
-#: ../src/easytag.c:2837 ../src/scan.c:181
+#: ../src/easytag.c:2873 ../src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Преименуј датотеку и директоријум"
 
-#: ../src/easytag.c:2838
+#: ../src/easytag.c:2874
 msgid "File and directory rename confirmation required"
 msgstr "Потребно је потврђивање за преименовање датотеке и директоријума"
 
-#: ../src/easytag.c:2839
+#: ../src/easytag.c:2875
 #, c-format
 msgid "Do you want to rename the file and directory '%s' to '%s'?"
 msgstr "Да ли желите да преименујете датотеку и директоријум „%s“ у „%s“?"
 
-#: ../src/easytag.c:2845
+#: ../src/easytag.c:2881
 msgid "Directory rename confirmation required"
 msgstr "Потребно је потврђивање за преименовање директоријума"
 
-#: ../src/easytag.c:2846
+#: ../src/easytag.c:2882
 #, c-format
 msgid "Do you want to rename the directory '%s' to '%s'?"
 msgstr "Да ли желите да преименујете директоријум „%s“ у „%s“?"
 
 #. Only filename changed
-#: ../src/easytag.c:2852
+#: ../src/easytag.c:2888
 msgid "Rename File"
 msgstr "Преименуј датотеку"
 
-#: ../src/easytag.c:2853
+#: ../src/easytag.c:2889
 msgid "File rename confirmation required"
 msgstr "Потребно је потврђивање за преименовање датотеке"
 
-#: ../src/easytag.c:2854
+#: ../src/easytag.c:2890
 #, c-format
 msgid "Do you want to rename the file '%s' to '%s'?"
 msgstr "Да ли желите да преименујете датотеку „%s“ у „%s“?"
 
-#: ../src/easytag.c:2920
+#: ../src/easytag.c:2956
 #, c-format
 msgid "Cannot rename file '%s' to '%s'"
 msgstr "Не могу да преименујем датотеку „%s“ у „%s“"
 
-#: ../src/easytag.c:2934
+#: ../src/easytag.c:2970
 #, c-format
 msgid "Cannot rename file '%s' to '%s': %s"
 msgstr "Не могу да преименујем датотеку „%s“ у „%s“: (%s)"
 
-#: ../src/easytag.c:2938
+#: ../src/easytag.c:2974
 msgid "File(s) not renamed"
 msgstr "Датотека(е) није преименована"
 
-#: ../src/easytag.c:3047
+#: ../src/easytag.c:3086
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Записујем ознаку од „%s“"
 
-#: ../src/easytag.c:3054
+#: ../src/easytag.c:3093
 msgid "Tag(s) written"
 msgstr "Ознака(е) уписане"
 
-#: ../src/easytag.c:3069
+#: ../src/easytag.c:3108
 #, c-format
 msgid "Cannot write tag in file '%s' (%s)"
 msgstr "Не могу да упишем ознаку у датотеку „%s“ (%s)"
 
-#: ../src/easytag.c:3082
+#: ../src/easytag.c:3121
 #, c-format
 msgid "Cannot write tag in file '%s'"
 msgstr "Не могу да упишем ознаку у датотеку „%s“"
 
-#: ../src/easytag.c:3085
+#: ../src/easytag.c:3124
 msgid "Tag Write Error"
 msgstr "Грешка уписивања ознаке"
 
-#: ../src/easytag.c:3130 ../src/easytag.c:3144
+#: ../src/easytag.c:3169 ../src/easytag.c:3183
 #, c-format
 msgid "Do you really want to delete the file '%s'?"
 msgstr "Да ли заиста желите да обришете датотеку „%s“?"
 
-#: ../src/easytag.c:3136 ../src/easytag.c:3146
+#: ../src/easytag.c:3175 ../src/easytag.c:3185
 msgid "Delete File"
 msgstr "Уклони датотеку"
 
-#: ../src/easytag.c:3171
+#: ../src/easytag.c:3210
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Датотека „%s“ је уклоњена"
 
-#: ../src/easytag.c:3303
+#: ../src/easytag.c:3345
 #, c-format
 msgid "Cannot read directory '%s'"
 msgstr "Не могу да читам директоријум „%s“"
 
-#: ../src/easytag.c:3307
+#: ../src/easytag.c:3349
 msgid "Directory Read Error"
 msgstr "Грешка читања директоријума"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3328
+#: ../src/easytag.c:3370
 #, c-format
 msgid "Search in progress…"
 msgstr "Претрага је у току…"
 
-#: ../src/easytag.c:3351 ../src/et_core.c:2734
+#: ../src/easytag.c:3393 ../src/et_core.c:2824
 #, c-format
 msgid "File: '%s'"
 msgstr "Датотека: „%s“"
 
-#: ../src/easytag.c:3401
+#: ../src/easytag.c:3443
 #, c-format
 msgid "Found one file in this directory and subdirectories"
 msgid_plural "Found %d files in this directory and subdirectories"
@@ -2237,7 +2245,7 @@ msgstr[1] "Нађох %d датотеке у овом директоријуму
 msgstr[2] "Нађох %d датотека у овом директоријуму и под-директоријумима"
 msgstr[3] "Нађох %d датотека(е) у овом директоријуму и под-директоријумима."
 
-#: ../src/easytag.c:3408
+#: ../src/easytag.c:3450
 #, c-format
 msgid "Found one file in this directory"
 msgid_plural "Found %d files in this directory"
@@ -2246,179 +2254,194 @@ msgstr[1] "Нађох %d датотеке у овом директоријуму
 msgstr[2] "Нађох %d датотека у овом директоријуму"
 msgstr[3] "Нађох %d датотека(е) у овом директоријуму."
 
-#: ../src/easytag.c:3430
+#: ../src/easytag.c:3472
 msgid "No file found in this directory and subdirectories"
 msgstr ""
 "Нисам пронашао ни једну датотеку у овом директоријуму и под-директоријумима"
 
-#: ../src/easytag.c:3432
+#: ../src/easytag.c:3474
 msgid "No file found in this directory"
 msgstr "Нисам пронашао ни једну датотеку у овом директоријуму"
 
-#: ../src/easytag.c:3500
+#: ../src/easytag.c:3542
 #, c-format
 msgid "Error opening directory '%s' (%s)"
 msgstr "Грешка отварања директоријума „%s“ (%s)"
 
-#: ../src/easytag.c:3536
+#: ../src/easytag.c:3578
 #, c-format
 msgid "Cannot read directory (%s)"
 msgstr "Не могу да читам директоријум (%s)"
 
-#: ../src/easytag.c:3556
+#: ../src/easytag.c:3598
 msgid "Searching for audio files…"
 msgstr "Тражи звучне датотеке…"
 
-#: ../src/easytag.c:3557
+#: ../src/easytag.c:3599
 msgid "Searching"
 msgstr "Тражим"
 
-#: ../src/easytag.c:4188
+#: ../src/easytag.c:4265
 msgid "Select a directory to browse"
 msgstr "Изаберите директоријум за разгледање"
 
 #. Menu items
-#: ../src/easytag.c:4335
+#: ../src/easytag.c:4412
 msgid "Tag selected files with this field"
 msgstr "Означи изабране датотеке овим пољем"
 
-#: ../src/easytag.c:4347 ../src/scan.c:2662
+#: ../src/easytag.c:4424 ../src/scan.c:2654
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Преведи „_“ и „%20“ у размак"
 
-#: ../src/easytag.c:4354 ../src/scan.c:2664
+#: ../src/easytag.c:4431 ../src/scan.c:2656
 msgid "Convert ' ' to '_'"
 msgstr "Преведи „ “ у „_“"
 
-#: ../src/easytag.c:4365
+#: ../src/easytag.c:4442
 msgid "All uppercase"
 msgstr "Сва слова велика"
 
-#: ../src/easytag.c:4372
+#: ../src/easytag.c:4449
 msgid "All lowercase"
 msgstr "Сва слова мала"
 
-#: ../src/easytag.c:4379
+#: ../src/easytag.c:4456
 msgid "First letter uppercase"
 msgstr "Прво слово велико"
 
-#: ../src/easytag.c:4386
+#: ../src/easytag.c:4463
 msgid "First letter uppercase of each word"
 msgstr "Прво слово сваке речи велико"
 
-#: ../src/easytag.c:4397 ../src/prefs.c:1023 ../src/scan.c:2762
+#: ../src/easytag.c:4474 ../src/prefs.c:1023 ../src/scan.c:2754
 msgid "Remove spaces"
 msgstr "Уклони размаке"
 
-#: ../src/easytag.c:4404
+#: ../src/easytag.c:4481
 msgid "Insert space before uppercase letter"
 msgstr "Убаци размак пре великог слова"
 
-#: ../src/easytag.c:4411
+#: ../src/easytag.c:4488
 msgid "Remove duplicate spaces or underscores"
 msgstr "Уклони дупле размаке или доње цртице"
 
-#: ../src/easytag.c:4418
+#: ../src/easytag.c:4495
 msgid "Remove all text"
 msgstr "Уклони сав текст"
 
-#: ../src/easytag.c:4437
+#: ../src/easytag.c:4514
 msgid "EasyTAG: Normal exit."
 msgstr "Лака ознака: Нормалан излаз."
 
-#: ../src/easytag.c:4489
+#: ../src/easytag.c:4566
 msgid "Do you want to save them before quitting?"
 msgstr "Да ли желите да их сачувате пре затварања?"
 
-#: ../src/easytag.c:4512
+#: ../src/easytag.c:4593
 msgid "Do you really want to quit?"
 msgstr "Да ли заиста желите да изађете из програма?"
 
-#: ../src/et_core.c:505
+#: ../src/et_core.c:510
 #, c-format
 msgid "Error reading tag from ogg file (%s)"
 msgstr "Грешка читања ознаке из огг датотеке (%s)"
 
-#: ../src/et_core.c:639
+#: ../src/et_core.c:539
+#, c-format
+#| msgid "Error reading tag from ogg file (%s)"
+msgid "Error reading tag from Opus file (%s)"
+msgstr "Грешка читања ознаке из Опус датотеке (%s)"
+
+#: ../src/et_core.c:682
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr "Самостално исправљање је примењено над датотеком „%s“."
 
-#: ../src/et_core.c:2631
+#: ../src/et_core.c:2707
 msgid "ID3 Tag"
 msgstr "ИД3 ознака"
 
-#: ../src/et_core.c:2637
+#: ../src/et_core.c:2713
 msgid "Ogg Vorbis Tag"
 msgstr "Огг Ворбис ознака"
 
-#: ../src/et_core.c:2643
+#: ../src/et_core.c:2719
 msgid "FLAC Vorbis Tag"
 msgstr "ФЛАЦ Ворбис ознака"
 
-#: ../src/et_core.c:2648
+#: ../src/et_core.c:2724
 msgid "APE Tag"
 msgstr "АПЕ ознака"
 
-#: ../src/et_core.c:2653
+#: ../src/et_core.c:2729
 msgid "MP4/M4A/AAC Tag"
 msgstr "МП4/М4А/ААЦ ознака"
 
-#: ../src/et_core.c:2659
+#: ../src/et_core.c:2735
 msgid "Wavpack Tag"
 msgstr "Вејвпак ознака"
 
-#: ../src/et_core.c:2679
+#: ../src/et_core.c:2741
+msgid "Opus Tag"
+msgstr "Опус ознака"
+
+#: ../src/et_core.c:2761
 msgid "MP3 File"
 msgstr "МП3 датотека"
 
-#: ../src/et_core.c:2683
+#: ../src/et_core.c:2765
 msgid "MP2 File"
 msgstr "МП2 датотека"
 
-#: ../src/et_core.c:2689
+#: ../src/et_core.c:2771
 msgid "Ogg Vorbis File"
 msgstr "Огг Ворбис датотека"
 
-#: ../src/et_core.c:2695
+#: ../src/et_core.c:2777
 msgid "Speex File"
 msgstr "Спикс датотека"
 
-#: ../src/et_core.c:2701
+#: ../src/et_core.c:2783
 msgid "FLAC File"
 msgstr "ФЛАЦ датотека"
 
-#: ../src/et_core.c:2706
+#: ../src/et_core.c:2788
 msgid "MusePack File"
 msgstr "МјузПак датотека"
 
-#: ../src/et_core.c:2710
+#: ../src/et_core.c:2792
 msgid "Monkey's Audio File"
 msgstr "Монки аудио датотека"
 
-#: ../src/et_core.c:2715
+#: ../src/et_core.c:2797
 msgid "MP4/AAC File"
 msgstr "МП4/ААЦ датотека"
 
-#: ../src/et_core.c:2721
+#: ../src/et_core.c:2803
 msgid "Wavpack File"
 msgstr "Вејвпак датотека"
 
-#: ../src/et_core.c:2778 ../src/et_core.c:2833
+#: ../src/et_core.c:2809
+#| msgid "MusePack File"
+msgid "Opus File"
+msgstr "Опус датотека"
+
+#: ../src/et_core.c:2868 ../src/et_core.c:2923
 msgid "File not found"
 msgstr "Нисам нашао датотеку"
 
-#: ../src/et_core.c:2783
+#: ../src/et_core.c:2873
 #, c-format
 msgid "Cannot query file information (%s)"
 msgstr "Не могу да пропитам податке датотеке (%s)"
 
-#: ../src/et_core.c:2817
+#: ../src/et_core.c:2907
 msgid "Read-only file"
 msgstr "Датотека само за читање"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2881
+#: ../src/et_core.c:2971
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
@@ -2427,49 +2450,44 @@ msgstr[1] "%u датотеке"
 msgstr[2] "%u датотека"
 msgstr[3] "Једна датотека"
 
-#: ../src/et_core.c:3086
+#: ../src/et_core.c:3175
 #, c-format
 msgid "Images (%d)"
 msgstr "Слике (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3128 ../src/flac_header.c:205
+#: ../src/et_core.c:3217 ../src/flac_header.c:205
 #: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
 #: ../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/et_core.c:3222 ../src/flac_header.c:210
 #: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
 #: ../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:3368 ../src/scan.c:690
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding"
 msgstr ""
 "Не могу да претворим назив датотеке „%s“ у кодирање назива датотеке система"
 
-#: ../src/et_core.c:3278
+#: ../src/et_core.c:3370
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Покушавам да поставим променљиву окружења Г_КОДИРАЊЕ_НАЗИВАДАТОТЕКЕ."
 
-#: ../src/et_core.c:3279 ../src/scan.c:692
+#: ../src/et_core.c:3371 ../src/scan.c:692
 msgid "Filename translation"
 msgstr "Превод назива датотеке"
 
-#: ../src/et_core.c:3940
-#, c-format
-msgid "Cannot change the permissions of file '%s' (%s)"
-msgstr "Не могу да променим овлашћења датотеке „%s“ (%s)"
-
-#: ../src/et_core.c:3978
+#: ../src/et_core.c:4076
 #, c-format
 msgid "Error writing tag type %d to file %s (%s)"
 msgstr "Грешка писања врсте ознаке %d у датотеку %s (%s)"
@@ -2479,7 +2497,7 @@ msgstr "Грешка писања врсте ознаке %d у датотеку
 #. 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/opus_header.c:237 ../src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Канала:"
 
@@ -2488,7 +2506,7 @@ msgstr "Канала:"
 msgid "Error while opening file: '%s' as FLAC (%s)."
 msgstr "Грешка при отварању датотеке: „%s“ као ФЛАЦ (%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 "
@@ -2507,7 +2525,7 @@ msgstr "Блок слике није исправан: „%s“"
 msgid "Error: Failed to write comments to file '%s' (%s)."
 msgstr "Грешка: Нисам успео да упишем напомене у датотеку „%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 "Уписана је ознака у „%s“"
@@ -2530,27 +2548,27 @@ msgstr ""
 msgid "Corrupted file"
 msgstr "Оштећена датотека"
 
-#: ../src/id3_tag.c:540
+#: ../src/id3_tag.c:555
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Уклоњена је ознака из „%s“"
 
-#: ../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 "Грешка при уклањању ИД3в1 ознаке из „%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 "Грешка при уклањању ИД3в2 ознаке из „%s“ (%s)"
 
-#: ../src/id3_tag.c:565
+#: ../src/id3_tag.c:580
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Грешка при ажурирању ИД3в2 ознаке у „%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"
@@ -2558,7 +2576,7 @@ msgstr ""
 "Покушали сте да сачувате ову ознаку у Уникоду али је откривено да ваше "
 "издање ид3библ има грашака"
 
-#: ../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 "
@@ -2577,90 +2595,90 @@ msgstr ""
 "\n"
 "Датотека: %s"
 
-#: ../src/id3_tag.c:602
+#: ../src/id3_tag.c:617
 msgid "Buggy id3lib"
 msgstr "Лоша ид3библ"
 
-#: ../src/id3_tag.c:636
+#: ../src/id3_tag.c:651
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Грешка при промени ИД3в1 ознаке у „%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 "Ознака у „%s“ је ажурирана"
 
-#: ../src/id3_tag.c:669
+#: ../src/id3_tag.c:684
 msgid "No error reported"
 msgstr "Нису пријављене грешке"
 
-#: ../src/id3_tag.c:671
+#: ../src/id3_tag.c:686
 msgid "No available memory"
 msgstr "Нема доступне меморије"
 
-#: ../src/id3_tag.c:673
+#: ../src/id3_tag.c:688
 msgid "No data to parse"
 msgstr "Нема података за обраду"
 
-#: ../src/id3_tag.c:675
+#: ../src/id3_tag.c:690
 msgid "Improperly formatted data"
 msgstr "Неисправно обликовани подаци"
 
-#: ../src/id3_tag.c:677
+#: ../src/id3_tag.c:692
 msgid "No buffer to write to"
 msgstr "Нема међумеморије за упис"
 
-#: ../src/id3_tag.c:679
+#: ../src/id3_tag.c:694
 msgid "Buffer is too small"
 msgstr "Међумеморија је сувише мала"
 
-#: ../src/id3_tag.c:681
+#: ../src/id3_tag.c:696
 msgid "Invalid frame ID"
 msgstr "Неисправан ИД оквира"
 
-#: ../src/id3_tag.c:683
+#: ../src/id3_tag.c:698
 msgid "Requested field not found"
 msgstr "Затражено поље није нађено"
 
-#: ../src/id3_tag.c:685
+#: ../src/id3_tag.c:700
 msgid "Unknown field type"
 msgstr "Непозната врста поља"
 
-#: ../src/id3_tag.c:687
+#: ../src/id3_tag.c:702
 msgid "Tag is already attached to a file"
 msgstr "Ознака је већ прикачена датотеци"
 
-#: ../src/id3_tag.c:689
+#: ../src/id3_tag.c:704
 msgid "Invalid tag version"
 msgstr "Неисправно издање ознаке"
 
-#: ../src/id3_tag.c:691
+#: ../src/id3_tag.c:706
 msgid "No file to parse"
 msgstr "Нема датотеке за обраду"
 
-#: ../src/id3_tag.c:693
+#: ../src/id3_tag.c:708
 msgid "Attempting to write to a read-only file"
 msgstr "Покушавам да упишем у датотеку само за читање"
 
-#: ../src/id3_tag.c:695
+#: ../src/id3_tag.c:710
 msgid "Error in compression/uncompression"
 msgstr "Грешка при сажимању/распакивању"
 
-#: ../src/id3_tag.c:697
+#: ../src/id3_tag.c:712
 msgid "Unknown error message"
 msgstr "Непозната порука о грешци"
 
-#: ../src/id3_tag.c:1301
+#: ../src/id3_tag.c:1316
 #, c-format
 msgid "Error while creating temporary file: '%s'"
 msgstr "Грешка приликом стварања привремене датотеке: „%s“"
 
-#: ../src/id3_tag.c:1308
+#: ../src/id3_tag.c:1323
 msgid "Error while creating temporary file"
 msgstr "Грешка приликом стварања привремене датотеке"
 
-#: ../src/id3_tag.c:1328
+#: ../src/id3_tag.c:1343
 #, c-format
 msgid "Error while writing to file: '%s' (%s)"
 msgstr "Грешка приликом писања у датотеку: „%s“ (%s)"
@@ -2670,7 +2688,7 @@ msgstr "Грешка приликом писања у датотеку: „%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)"
@@ -2679,12 +2697,12 @@ msgstr[1] "Не могу да упишем ознаку у датотеку „%
 msgstr[2] "Не могу да упишем ознаку у датотеку „%s“ (%s бајтова недостаје)"
 msgstr[3] "Не могу да упишем ознаку у датотеку „%s“ (%s)"
 
-#: ../src/id3v24_tag.c:1525
+#: ../src/id3v24_tag.c:1524
 #, c-format
 msgid "Cannot save tag of file '%s'"
 msgstr "Не могу да сачувам ознаку датотеке „%s“"
 
-#: ../src/id3v24_tag.c:1536
+#: ../src/id3v24_tag.c:1535
 #, c-format
 msgid "Size error while saving tag of '%s'"
 msgstr "Грешка величине при чувању ознаке за „%s“"
@@ -2693,66 +2711,54 @@ msgstr "Грешка величине при чувању ознаке за „%
 msgid "Log"
 msgstr "Дневник измена"
 
-#: ../src/misc.c:691
-msgid "Select File"
-msgstr "Изаберите датотеку"
-
-#: ../src/misc.c:697
-msgid "Select Directory"
-msgstr "Изаберите директоријум"
-
-#: ../src/misc.c:782
-msgid "No audio player defined"
-msgstr "Није одређен програм за пуштање звука"
-
-#: ../src/misc.c:783
-msgid "Audio Player Warning"
-msgstr "Упозорење програма за пуштање звука"
+#: ../src/misc.c:719
+msgid "You must type a program name"
+msgstr "Морате да унесете назив програма"
 
-#. Translators: file size (bytes, kilobytes, megabytes, gigabytes,
-#. * terabytes).
-#: ../src/misc.c:1048 ../src/misc.c:1068
-msgid "B"
-msgstr "B"
+#: ../src/misc.c:720
+msgid "Program Name Error"
+msgstr "Грешка назива програма"
 
-#: ../src/misc.c:1048 ../src/misc.c:1068
-msgid "kB"
-msgstr "kB"
+#: ../src/misc.c:799
+#, c-format
+msgid "Executed command: %s"
+msgstr "Извршена наредба: „%s“"
 
-#: ../src/misc.c:1048 ../src/misc.c:1068
-msgid "MB"
-msgstr "MB"
+#: ../src/misc.c:806
+#, c-format
+msgid "Failed to launch program: %s"
+msgstr "Нисам успео да покренем програм: %s"
 
-#: ../src/misc.c:1048 ../src/misc.c:1068
-msgid "GB"
-msgstr "GB"
+#: ../src/misc.c:823
+msgid "Select File"
+msgstr "Изаберите датотеку"
 
-#: ../src/misc.c:1048 ../src/misc.c:1068
-msgid "TB"
-msgstr "TB"
+#: ../src/misc.c:829
+msgid "Select Directory"
+msgstr "Изаберите директоријум"
 
-#: ../src/misc.c:1147
+#: ../src/misc.c:1141
 msgid "Generate Playlist"
 msgstr "Начини списак нумера"
 
-#: ../src/misc.c:1171
+#: ../src/misc.c:1165
 msgid "M3U Playlist Name"
 msgstr "Назив М3У списка нумера"
 
-#: ../src/misc.c:1186
+#: ../src/misc.c:1180
 msgid "Use directory name"
 msgstr "Користи назив директоријума"
 
 #. Playlist options
-#: ../src/misc.c:1203
+#: ../src/misc.c:1197
 msgid "Playlist Options"
 msgstr "Опције списка нумера"
 
-#: ../src/misc.c:1209
+#: ../src/misc.c:1203
 msgid "Include only the selected files"
 msgstr "Укључи само изабране датотеке"
 
-#: ../src/misc.c:1212
+#: ../src/misc.c:1206
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2760,80 +2766,80 @@ msgstr ""
 "Уколико је активирано, само изабране датотеке ће бити уписане у списак "
 "нумера. У супротном, све датотеке ће бити уписане."
 
-#: ../src/misc.c:1215
+#: ../src/misc.c:1209
 msgid "Use full path for files in playlist"
 msgstr "Користи пуне путање за датотеке у списку нумера"
 
-#: ../src/misc.c:1218
+#: ../src/misc.c:1212
 msgid "Use relative path for files in playlist"
 msgstr "Користи релативне путање за датотеке у списку нумера"
 
 #. Create playlist in parent directory
-#: ../src/misc.c:1224
+#: ../src/misc.c:1218
 msgid "Create playlist in the parent directory"
 msgstr "Начини списак нумера у родитељском директоријуму"
 
-#: ../src/misc.c:1227
+#: ../src/misc.c:1221
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Уколико је активирано, списак нумера ће бити начињен у родитељском "
 "директоријуму."
 
 #. DOS Separator
-#: ../src/misc.c:1231
+#: ../src/misc.c:1225
 msgid "Use DOS directory separator"
 msgstr "Користи ДОС-ов раздвајач датотека"
 
-#: ../src/misc.c:1237
+#: ../src/misc.c:1231
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 "Ова опција мења УНИКС-ов раздвајач датотека „/“ у ДОС-ов раздвајач „\\“."
 
-#: ../src/misc.c:1246
+#: ../src/misc.c:1240
 msgid "Playlist Content"
 msgstr "Садржај списка нумера"
 
-#: ../src/misc.c:1252
+#: ../src/misc.c:1246
 msgid "Write only list of files"
 msgstr "Упиши само списак датотека"
 
-#: ../src/misc.c:1256
+#: ../src/misc.c:1250
 msgid "Write info using filename"
 msgstr "Упиши информације користећи назив датотеке"
 
-#: ../src/misc.c:1259
+#: ../src/misc.c:1253
 msgid "Write info using:"
 msgstr "Упиши информације користећи:"
 
-#: ../src/misc.c:1478
+#: ../src/misc.c:1467
 #, c-format
 msgid "Cannot write playlist file '%s'"
 msgstr "Не могу да запишем датотеку списка нумера „%s“"
 
-#: ../src/misc.c:1482
+#: ../src/misc.c:1471
 msgid "Playlist File Error"
 msgstr "Грешка датотеке списка нумера"
 
-#: ../src/misc.c:1490
+#: ../src/misc.c:1479
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Датотека списка нумера „%s“ је записана"
 
-#: ../src/misc.c:1554 ../src/scan.c:3247 ../src/scan.c:3309
+#: ../src/misc.c:1543 ../src/scan.c:3239 ../src/scan.c:3301
 msgid "Invalid scanner mask"
 msgstr "Неисправна маска прегледача"
 
-#: ../src/misc.c:1918
+#: ../src/misc.c:1907
 msgid "CD"
 msgstr "ЦД"
 
-#: ../src/misc.c:1940
+#: ../src/misc.c:1929
 msgid "Find Files"
 msgstr "Пронађите датотеке"
 
-#: ../src/misc.c:1972
+#: ../src/misc.c:1961
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2841,13 +2847,13 @@ msgstr ""
 "све датотеке."
 
 #. Where...
-#: ../src/misc.c:1978
+#: ../src/misc.c:1967
 msgid "In:"
 msgstr "У:"
 
 #. Translators: This option is for the previous 'in' option. For instance,
 #. * translate this as "Search" "In:" "the Filename".
-#: ../src/misc.c:1983
+#: ../src/misc.c:1972
 msgid "the Filename"
 msgstr "називу датотеке"
 
@@ -2856,20 +2862,20 @@ msgstr "називу датотеке"
 #. * Note: label changed to "the Tag" (to be the only one) to fix a Hungarian
 #. * grammatical problem (which uses one word to say "in the tag" like here)
 #.
-#: ../src/misc.c:1989
+#: ../src/misc.c:1978
 msgid "the Tag"
 msgstr "ознаци"
 
 #. Property of the search
-#: ../src/misc.c:2000 ../src/prefs.c:335
+#: ../src/misc.c:1989 ../src/prefs.c:335
 msgid "Case sensitive"
 msgstr "Разликуј величину слова"
 
-#: ../src/misc.c:2227
+#: ../src/misc.c:2216
 msgid "Ready to search…"
 msgstr "Спреман сам за претрагу…"
 
-#: ../src/misc.c:2447
+#: ../src/misc.c:2436
 #, c-format
 msgid "Found one file"
 msgid_plural "Found %d files"
@@ -2878,63 +2884,63 @@ msgstr[1] "Пронашао сам %d датотеке"
 msgstr[2] "Пронашао сам %d датотека"
 msgstr[3] "Пронашао сам: %d датотеку/е/а"
 
-#: ../src/misc.c:2732
+#: ../src/misc.c:2721
 msgid "Load Filenames From a Text File"
 msgstr "Учитај називе датотека из текстуалне датотеке"
 
-#: ../src/misc.c:2761
+#: ../src/misc.c:2750
 msgid "File:"
 msgstr "Датотека:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: ../src/misc.c:2780
+#: ../src/misc.c:2769
 msgid " Load "
 msgstr " Учитај "
 
-#: ../src/misc.c:2798
+#: ../src/misc.c:2787
 msgid "Content of Text File"
 msgstr "Садржај текстуалне датотеке"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2819 ../src/misc.c:2914
+#: ../src/misc.c:2808 ../src/misc.c:2903
 msgid "Insert a blank line before the selected line"
 msgstr "Уметни празан ред пре изабраног"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2828 ../src/misc.c:2923
+#: ../src/misc.c:2817 ../src/misc.c:2912
 msgid "Delete the selected line"
 msgstr "Обриши изабрани ред"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2837 ../src/misc.c:2932 ../src/misc.c:3418
+#: ../src/misc.c:2826 ../src/misc.c:2921 ../src/misc.c:3407
 msgid "Delete all blank lines"
 msgstr "Обриши све пране редове"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2849 ../src/misc.c:2944
+#: ../src/misc.c:2838 ../src/misc.c:2933
 msgid "Move up the selected line"
 msgstr "Помери горе изабрани ред"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2858 ../src/misc.c:2953
+#: ../src/misc.c:2847 ../src/misc.c:2942
 msgid "Move down the selected line"
 msgstr "Помери доле изабрани ред"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2870 ../src/misc.c:2965 ../src/misc.c:3442
+#: ../src/misc.c:2859 ../src/misc.c:2954 ../src/misc.c:3431
 msgid "Reload"
 msgstr "Освежи"
 
-#: ../src/misc.c:2892
+#: ../src/misc.c:2881
 msgid "List of Files"
 msgstr "Списак датотека"
 
-#: ../src/misc.c:2987
+#: ../src/misc.c:2976
 msgid "Selected line:"
 msgstr "Изабрани ред:"
 
-#: ../src/misc.c:3005
+#: ../src/misc.c:2994
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2942,34 +2948,34 @@ msgstr ""
 "Покретањем ове опције, након учитавања назива датотека, тренутно изабрани "
 "прегледач ће бити покренут (прозор прегледача мора бити отворен)."
 
-#: ../src/misc.c:3092
+#: ../src/misc.c:3081
 #, c-format
 msgid "Cannot retrieve file info (%s)"
 msgstr "Не могу да преузмем податке о датотеци (%s)"
 
-#: ../src/misc.c:3154
+#: ../src/misc.c:3143
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Не могу да отворим датотеку „%s“ (%s)"
 
-#: ../src/misc.c:3190
+#: ../src/misc.c:3179
 #, c-format
 msgid "Error reading file (%s)"
 msgstr "Грешка читања датотеке (%s)"
 
-#: ../src/misc.c:3406
+#: ../src/misc.c:3395
 msgid "Insert a blank line"
 msgstr "Уметните празан ред"
 
-#: ../src/misc.c:3412
+#: ../src/misc.c:3401
 msgid "Delete this line"
 msgstr "Обришите овај ред"
 
-#: ../src/misc.c:3427
+#: ../src/misc.c:3416
 msgid "Move up this line"
 msgstr "Померите на горе овај ред"
 
-#: ../src/misc.c:3433
+#: ../src/misc.c:3422
 msgid "Move down this line"
 msgstr "Померите на доле овај ред"
 
@@ -3073,175 +3079,184 @@ msgstr ""
 msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
 msgstr "Грешка: Нисам успео да отворим датотеку: „%s“ као Ворбис (%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 "Упозорење: Огг Ворбис датотека „%s“ садржи ИД3в2 ознаку."
 
-#: ../src/picture.c:244 ../src/picture.c:269
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1257
 #, c-format
-msgid "Image file not loaded: %s"
-msgstr "Датотека слике није учитана: %s"
+msgid "Error with 'loader_write': %s"
+msgstr "Грешка са „учитавач_запиши“: %s"
 
-#: ../src/picture.c:261
+#: ../src/ogg_tag.c:1050 ../src/picture.c:1180
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr "Грешка са „учитавач_затвори“: %s"
+
+#: ../src/picture.c:104
+#, c-format
+msgid "Image file not saved: %s"
+msgstr "Датотека слике није сачувана: %s"
+
+#: ../src/picture.c:154
 #, c-format
 msgid "Cannot open file: '%s'"
 msgstr "Не могу да отворим датотеку: „%s“"
 
-#: ../src/picture.c:265
+#: ../src/picture.c:158
 msgid "Image File Error"
 msgstr "Грешка датотеке слике"
 
-#: ../src/picture.c:276
+#: ../src/picture.c:162 ../src/picture.c:424
+#, c-format
+msgid "Image file not loaded: %s"
+msgstr "Датотека слике није учитана: %s"
+
+#: ../src/picture.c:446
 msgid "Image file loaded"
 msgstr "Датотека слике је учитана"
 
-#: ../src/picture.c:334
+#: ../src/picture.c:504
 msgid "Add Images"
 msgstr "Додај слике"
 
-#: ../src/picture.c:344 ../src/picture.c:700
+#: ../src/picture.c:514 ../src/picture.c:874
 msgid "All Files"
 msgstr "Све датотеке"
 
-#: ../src/picture.c:350 ../src/picture.c:706
+#: ../src/picture.c:520 ../src/picture.c:880
 msgid "PNG and JPEG"
 msgstr "ПНГ и ЈПЕГ"
 
-#: ../src/picture.c:477
+#: ../src/picture.c:651
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Својства слике %d/%d"
 
-#: ../src/picture.c:501
+#: ../src/picture.c:675
 msgid "Image Type"
 msgstr "Врста слике"
 
 #. Description of the picture
-#: ../src/picture.c:560
+#: ../src/picture.c:734
 msgid "Image Description:"
 msgstr "Опис слике:"
 
-#: ../src/picture.c:687
+#: ../src/picture.c:861
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Сачувај слику %d/%d"
 
-#: ../src/picture.c:759
-#, c-format
-msgid "Image file not saved: %s"
-msgstr "Датотека слике није сачувана: %s"
-
-#: ../src/picture.c:827
+#: ../src/picture.c:1021
 msgid "JPEG image"
 msgstr "ЈПЕГ слика"
 
-#: ../src/picture.c:829
+#: ../src/picture.c:1023
 msgid "PNG image"
 msgstr "ПНГ слика"
 
-#: ../src/picture.c:831
+#: ../src/picture.c:1025
+msgid "GIF image"
+msgstr "ГИФ слика"
+
+#: ../src/picture.c:1027
 msgid "Unknown image"
 msgstr "Непозната слика"
 
-#: ../src/picture.c:843
+#: ../src/picture.c:1039
 msgid "32x32 pixel PNG file icon"
 msgstr "ПНГ иконица, 32x32 тачкица"
 
-#: ../src/picture.c:845
+#: ../src/picture.c:1041
 msgid "Other file icon"
 msgstr "Остале иконице датотеке"
 
-#: ../src/picture.c:847
+#: ../src/picture.c:1043
 msgid "Cover (front)"
 msgstr "Омот (лице)"
 
-#: ../src/picture.c:849
+#: ../src/picture.c:1045
 msgid "Cover (back)"
 msgstr "Омот (полеђина)"
 
-#: ../src/picture.c:851
+#: ../src/picture.c:1047
 msgid "Leaflet page"
 msgstr "Страна са летком"
 
-#: ../src/picture.c:853
+#: ../src/picture.c:1049
 msgid "Media (e.g. label side of CD)"
 msgstr "Медијум (нпр. страна са натписом ЦД-а)"
 
-#: ../src/picture.c:855
+#: ../src/picture.c:1051
 msgid "Lead artist/lead performer/soloist"
 msgstr "Водећи уметник/водећи извођач/солиста"
 
-#: ../src/picture.c:857
+#: ../src/picture.c:1053
 msgid "Artist/performer"
 msgstr "Уметник/Извођач"
 
-#: ../src/picture.c:859
+#: ../src/picture.c:1055
 msgid "Conductor"
 msgstr "Диригент"
 
-#: ../src/picture.c:861
+#: ../src/picture.c:1057
 msgid "Band/Orchestra"
 msgstr "Бенд/Оркестар"
 
-#: ../src/picture.c:865
+#: ../src/picture.c:1061
 msgid "Lyricist/text writer"
 msgstr "Писац текстова"
 
-#: ../src/picture.c:867
+#: ../src/picture.c:1063
 msgid "Recording location"
 msgstr "Место снимања"
 
-#: ../src/picture.c:869
+#: ../src/picture.c:1065
 msgid "During recording"
 msgstr "У току снимања"
 
-#: ../src/picture.c:871
+#: ../src/picture.c:1067
 msgid "During performance"
 msgstr "У току извођења"
 
-#: ../src/picture.c:873
+#: ../src/picture.c:1069
 msgid "Movie/video screen capture"
 msgstr "Филм/Видео запис"
 
-#: ../src/picture.c:875
+#: ../src/picture.c:1071
 msgid "A bright colored fish"
 msgstr "Светло обојена риба"
 
-#: ../src/picture.c:877
+#: ../src/picture.c:1073
 msgid "Illustration"
 msgstr "Илустрација"
 
-#: ../src/picture.c:879
+#: ../src/picture.c:1075
 msgid "Band/Artist logotype"
 msgstr "Лого бенда/извођача"
 
-#: ../src/picture.c:881
+#: ../src/picture.c:1077
 msgid "Publisher/studio logotype"
 msgstr "Лого издавача/студија"
 
-#: ../src/picture.c:885
+#: ../src/picture.c:1081
 msgid "Unknown image type"
 msgstr "Непозната врста слике"
 
-#: ../src/picture.c:915 ../src/picture.c:926
+#: ../src/picture.c:1111 ../src/picture.c:1122
 msgid "pixels"
 msgstr "тачкица"
 
-#: ../src/picture.c:916 ../src/picture.c:927
+#: ../src/picture.c:1112 ../src/picture.c:1123
 msgid "Type"
 msgstr "Врста"
 
-#: ../src/picture.c:928
+#: ../src/picture.c:1124
 msgid "Description"
 msgstr "Опис"
 
-#: ../src/picture.c:984
-#, c-format
-msgid "Error with 'loader_close': %s"
-msgstr "Грешка са „учитавач_затвори“: %s"
-
-#: ../src/picture.c:1044
+#: ../src/picture.c:1240
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
@@ -3249,26 +3264,21 @@ msgstr ""
 "Не могу да прикажем слику јер је недовољно података учитано да бих знао како "
 "да направим међумеморију слике."
 
-#: ../src/picture.c:1051
+#: ../src/picture.c:1247
 msgid "Cannot display the image"
 msgstr "Не могу да прикажем слику"
 
-#: ../src/picture.c:1053
+#: ../src/picture.c:1249
 msgid ""
 "Not enough data has been read to determine how to create the image buffer."
 msgstr ""
 "Није прочитано довољно података да бих одредио како да направим међумеморију "
 "слике."
 
-#: ../src/picture.c:1055
+#: ../src/picture.c:1251
 msgid "Load Image File"
 msgstr "Учитај датотеку слике"
 
-#: ../src/picture.c:1061
-#, c-format
-msgid "Error with 'loader_write': %s"
-msgstr "Грешка са „учитавач_запиши“: %s"
-
 #. Label
 #: ../src/prefs.c:152
 msgid "Default directory:"
@@ -4319,11 +4329,11 @@ msgstr "Поставке су сачуване"
 msgid "Configuration unchanged"
 msgstr "Поставке нису мењане"
 
-#: ../src/prefs.c:1707
+#: ../src/prefs.c:1712
 msgid "The selected path for 'Default path to files' is invalid"
 msgstr "Изабрана путања за „Основна путања до датотека“ није исправна"
 
-#: ../src/prefs.c:1708
+#: ../src/prefs.c:1714
 #, c-format
 msgid ""
 "Path: '%s'\n"
@@ -4332,16 +4342,16 @@ msgstr ""
 "Путања: „%s“\n"
 "Грешка: %s"
 
-#: ../src/prefs.c:1709
+#: ../src/prefs.c:1716
 msgid "Invalid Path Error"
 msgstr "Грешка неисправне путање"
 
-#: ../src/prefs.c:1823
+#: ../src/prefs.c:1830
 #, c-format
 msgid "The audio file player '%s' cannot be found"
 msgstr "Не могу да пронађем програм за пуштање звука „%s“"
 
-#: ../src/prefs.c:1825
+#: ../src/prefs.c:1832
 msgid "Audio Player Error"
 msgstr "Грешка програма за пуштање звука"
 
@@ -4383,43 +4393,43 @@ msgstr "Нови назив датотеке је успешно скенира
 msgid "New filename successfully scanned: %s"
 msgstr "Нови назив датотеке је успешно скениран: %s"
 
-#: ../src/scan.c:1817
+#: ../src/scan.c:1821
 #, c-format
 msgid "Error while processing fields: %s"
 msgstr "Грешка приликом обраде поља: %s"
 
 #. The window
-#: ../src/scan.c:2336
+#: ../src/scan.c:2328
 msgid "Tag and Filename Scan"
 msgstr "Прегледач ознака и назива датотека"
 
 #. TODO: Set related action to match AM_SCAN_FILES.
-#: ../src/scan.c:2345
+#: ../src/scan.c:2337
 msgid "Scan Files"
 msgstr "Прегледај датотеке"
 
 #. Option Menu
-#: ../src/scan.c:2373
+#: ../src/scan.c:2365
 msgid "Scanner:"
 msgstr "Прегледач:"
 
-#: ../src/scan.c:2394
+#: ../src/scan.c:2386
 msgid "Select the type of scanner to use"
 msgstr "Изабери врсту прегледача за употребу"
 
-#: ../src/scan.c:2403
+#: ../src/scan.c:2395
 msgid "Scanner Preferences"
 msgstr "Поставке прегледача"
 
-#: ../src/scan.c:2412
+#: ../src/scan.c:2404
 msgid "Show / Hide Masks Editor"
 msgstr "Прикажи / Сакриј уређивач маски"
 
-#: ../src/scan.c:2422
+#: ../src/scan.c:2414
 msgid "Show / Hide Legend"
 msgstr "Прикажи / Сакриј легенду"
 
-#: ../src/scan.c:2452
+#: ../src/scan.c:2444
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse filename and "
 "path. Used to fill in tag fields"
@@ -4428,15 +4438,15 @@ msgstr ""
 "датотеке и путање. Користи се за попуњавање поља ознака."
 
 #. Preview label
-#: ../src/scan.c:2476
+#: ../src/scan.c:2468
 msgid "Fill tag preview"
 msgstr "Преглед попуњавања ознаке"
 
-#: ../src/scan.c:2506
+#: ../src/scan.c:2498
 msgid "Prefix mask with current path"
 msgstr "Маска префикса са тренутном путањом"
 
-#: ../src/scan.c:2520
+#: ../src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4449,15 +4459,15 @@ msgstr ""
 "супротном је релативна према старој путањи."
 
 #. Preview label
-#: ../src/scan.c:2545
+#: ../src/scan.c:2537
 msgid "Rename file preview"
 msgstr "Преглед преименовања датотеке"
 
-#: ../src/scan.c:2564
+#: ../src/scan.c:2556
 msgid "Select fields:"
 msgstr "Изабери поља:"
 
-#: ../src/scan.c:2567
+#: ../src/scan.c:2559
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those which interest you"
@@ -4466,134 +4476,134 @@ msgstr ""
 "вам требају."
 
 #. Advice for Translators: set the first letter of filename translated
-#: ../src/scan.c:2571
+#: ../src/scan.c:2563
 msgid "F"
 msgstr "Д"
 
-#: ../src/scan.c:2573
+#: ../src/scan.c:2565
 msgid "Process filename field"
 msgstr "Обрадите поље назива датотеке"
 
 #. Advice for Translators: set the first letter of title translated
-#: ../src/scan.c:2575
+#: ../src/scan.c:2567
 msgid "T"
 msgstr "Н"
 
-#: ../src/scan.c:2576
+#: ../src/scan.c:2568
 msgid "Process title field"
 msgstr "Обрадите поље наслова"
 
 #. Advice for Translators: set the first letter of artist translated
-#: ../src/scan.c:2578
+#: ../src/scan.c:2570
 msgid "Ar"
 msgstr "И"
 
-#: ../src/scan.c:2579
+#: ../src/scan.c:2571
 msgid "Process file artist field"
 msgstr "Обрадите поље извођача"
 
 #. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan.c:2581
+#: ../src/scan.c:2573
 msgid "AA"
 msgstr "ИА"
 
-#: ../src/scan.c:2582
+#: ../src/scan.c:2574
 msgid "Process album artist field"
 msgstr "Обрадите поље извођача албума"
 
 #. Advice for Translators: set the first letter of album translated
-#: ../src/scan.c:2584
+#: ../src/scan.c:2576
 msgid "Al"
 msgstr "А"
 
-#: ../src/scan.c:2585
+#: ../src/scan.c:2577
 msgid "Process album field"
 msgstr "Обрадите поље албума"
 
 #. Advice for Translators: set the first letter of genre translated
-#: ../src/scan.c:2587
+#: ../src/scan.c:2579
 msgid "G"
 msgstr "Ж"
 
-#: ../src/scan.c:2588
+#: ../src/scan.c:2580
 msgid "Process genre field"
 msgstr "Обрадите поље жанра"
 
 #. Advice for Translators: set the first letter of comment translated
-#: ../src/scan.c:2590
+#: ../src/scan.c:2582
 msgid "Cm"
 msgstr "Нп"
 
-#: ../src/scan.c:2591
+#: ../src/scan.c:2583
 msgid "Process comment field"
 msgstr "Обрадите поље коментара"
 
 #. Advice for Translators: set the first letter of composer translated
-#: ../src/scan.c:2593
+#: ../src/scan.c:2585
 msgid "Cp"
 msgstr "Кп"
 
-#: ../src/scan.c:2594
+#: ../src/scan.c:2586
 msgid "Process composer field"
 msgstr "Обрадите поље композитора"
 
 #. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan.c:2596
+#: ../src/scan.c:2588
 msgid "O"
 msgstr "О"
 
-#: ../src/scan.c:2597
+#: ../src/scan.c:2589
 msgid "Process original artist field"
 msgstr "Обрадите поље оригиналног извођача"
 
 #. Advice for Translators: set the first letter of copyright translated
-#: ../src/scan.c:2599
+#: ../src/scan.c:2591
 msgid "Cr"
 msgstr "Ап"
 
-#: ../src/scan.c:2600
+#: ../src/scan.c:2592
 msgid "Process copyright field"
 msgstr "Обрадите поље ауторских права"
 
 #. Advice for Translators: set the first letter of URL translated
-#: ../src/scan.c:2602
+#: ../src/scan.c:2594
 msgid "U"
 msgstr "Ад"
 
-#: ../src/scan.c:2603
+#: ../src/scan.c:2595
 msgid "Process URL field"
 msgstr "Обрадите поље адресе"
 
 #. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan.c:2605
+#: ../src/scan.c:2597
 msgid "E"
 msgstr "Кд"
 
-#: ../src/scan.c:2606
+#: ../src/scan.c:2598
 msgid "Process encoder name field"
 msgstr "Обрадите поље назива енкодера"
 
-#: ../src/scan.c:2650
+#: ../src/scan.c:2642
 msgid "Invert selection"
 msgstr "Преокрени избор"
 
-#: ../src/scan.c:2657
+#: ../src/scan.c:2649
 msgid "Select/Unselect all"
 msgstr "Означи/одзначи све"
 
-#: ../src/scan.c:2672
+#: ../src/scan.c:2664
 msgid "Convert:"
 msgstr "Претвори:"
 
-#: ../src/scan.c:2674
+#: ../src/scan.c:2666
 msgid "to: "
 msgstr "у: "
 
-#: ../src/scan.c:2681
+#: ../src/scan.c:2673
 msgid "Do not convert"
 msgstr "Не претварај"
 
-#: ../src/scan.c:2700
+#: ../src/scan.c:2692
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4601,7 +4611,7 @@ msgstr ""
 "Доње цртице и знак „%20“ између речи ће бити замењени размаком. На пример "
 "„Текст%20у%20неком_пољу“ ће постати „Текст у неком пољу“."
 
-#: ../src/scan.c:2703
+#: ../src/scan.c:2695
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4609,38 +4619,38 @@ msgstr ""
 "Размак између речи биће замењен доњом цртицом. На пример „Текст у неком "
 "пољу“ ће постати „Текст_у_неком_пољу“."
 
-#: ../src/scan.c:2706
+#: ../src/scan.c:2698
 msgid ""
 "Replace a string by another one. Note that the search is case sensitive."
 msgstr ""
 "Замените једну ниску другом. Знајте да је претрага осетљива на величину "
 "слова."
 
-#: ../src/scan.c:2713
+#: ../src/scan.c:2705
 msgid "Capitalize all"
 msgstr "Сва слова велика"
 
-#: ../src/scan.c:2715
+#: ../src/scan.c:2707
 msgid "Lowercase all"
 msgstr "Сва слова мала"
 
-#: ../src/scan.c:2717
+#: ../src/scan.c:2709
 msgid "Capitalize first letter"
 msgstr "Прво слово велико"
 
-#: ../src/scan.c:2719
+#: ../src/scan.c:2711
 msgid "Capitalize the first letter of each word"
 msgstr "Прво слово сваке речи велико"
 
-#: ../src/scan.c:2720
+#: ../src/scan.c:2712
 msgid "Detect Roman numerals"
 msgstr "Откриј римске бројеве"
 
-#: ../src/scan.c:2722
+#: ../src/scan.c:2714
 msgid "Do not change capitalization"
 msgstr "Не мењај величину слова"
 
-#: ../src/scan.c:2744
+#: ../src/scan.c:2736
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4648,7 +4658,7 @@ msgstr ""
 "Све речи у пољима испиши великим словима. На пример „Текст У НЕКОМ пољу“ ће "
 "постати „ТЕКСТ У НЕКОМ ПОЉУ“."
 
-#: ../src/scan.c:2747
+#: ../src/scan.c:2739
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4656,7 +4666,7 @@ msgstr ""
 "Све речи у пољима испиши малим словима. На пример „ТЕКСТ У неком пољу“ ће "
 "постати „текст у неком пољу“."
 
-#: ../src/scan.c:2750
+#: ../src/scan.c:2742
 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'."
@@ -4664,7 +4674,7 @@ msgstr ""
 "Прво слово сваког поља промени у велико. На пример „текст У Неком ПОЉУ“ ће "
 "постати „Текст у неком пољу“."
 
-#: ../src/scan.c:2753
+#: ../src/scan.c:2745
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4672,7 +4682,7 @@ msgstr ""
 "Свако прво слово речи у пољима промени у велико. На пример „Текст у неком "
 "ПОЉУ“ ће постати „Текст У Неком Пољу“."
 
-#: ../src/scan.c:2756
+#: ../src/scan.c:2748
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -4680,19 +4690,19 @@ msgstr ""
 "Приморава претварање римских бројева у велика слова. На пример „ix. текст у "
 "неком пољу“ ће постати „IX. текст у неком пољу“."
 
-#: ../src/scan.c:2764
+#: ../src/scan.c:2756
 msgid "Insert a space before uppercase letters"
 msgstr "Убаци размак пре великог слова"
 
-#: ../src/scan.c:2766
+#: ../src/scan.c:2758
 msgid "Remove duplicate spaces and underscores"
 msgstr "Уклони дупле размаке и доње цртице"
 
-#: ../src/scan.c:2768
+#: ../src/scan.c:2760
 msgid "Do not change word separators"
 msgstr "Не мењај раздвајаче речи"
 
-#: ../src/scan.c:2782
+#: ../src/scan.c:2774
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4700,7 +4710,7 @@ msgstr ""
 "Уклања све размаке између речи. На пример „Текст У Неком Пољу“ ће постати "
 "„ТекстУНекомПољу“."
 
-#: ../src/scan.c:2785
+#: ../src/scan.c:2777
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4708,7 +4718,7 @@ msgstr ""
 "Додаје размак пре сваког великог слова. На пример „ТекстУНекомПољу“ ће "
 "постати „Текст У Неком Пољу“."
 
-#: ../src/scan.c:2788
+#: ../src/scan.c:2780
 msgid ""
 "Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4719,141 +4729,141 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2795
+#: ../src/scan.c:2787
 msgid "Legend"
 msgstr "Легенда"
 
-#: ../src/scan.c:2801
+#: ../src/scan.c:2793
 #, c-format
 msgid "%a: artist"
 msgstr "%a: извођач"
 
-#: ../src/scan.c:2804
+#: ../src/scan.c:2796
 msgid "%z: album artist"
 msgstr "%z: извођач албума"
 
-#: ../src/scan.c:2807
+#: ../src/scan.c:2799
 msgid "%b: album"
 msgstr "%b: албум"
 
-#: ../src/scan.c:2810
+#: ../src/scan.c:2802
 #, c-format
 msgid "%c: comment"
 msgstr "%c: коментар"
 
-#: ../src/scan.c:2813
+#: ../src/scan.c:2805
 #, c-format
 msgid "%p: composer"
 msgstr "%p: композитор"
 
-#: ../src/scan.c:2816
+#: ../src/scan.c:2808
 msgid "%r: copyright"
 msgstr "%r: ауторско право"
 
-#: ../src/scan.c:2819
+#: ../src/scan.c:2811
 #, c-format
 msgid "%d: disc number"
 msgstr "%d: број ЦД-а"
 
-#: ../src/scan.c:2822
+#: ../src/scan.c:2814
 #, c-format
 msgid "%e: encoded by"
 msgstr "%e: кодирано помоћу"
 
-#: ../src/scan.c:2825
+#: ../src/scan.c:2817
 #, c-format
 msgid "%g: genre"
 msgstr "%g: жанр"
 
-#: ../src/scan.c:2828
+#: ../src/scan.c:2820
 #, c-format
 msgid "%i: ignored"
 msgstr "%i: занемарено"
 
-#: ../src/scan.c:2831
+#: ../src/scan.c:2823
 msgid "%l: number of tracks"
 msgstr "%l: број нумера"
 
-#: ../src/scan.c:2834
+#: ../src/scan.c:2826
 #, c-format
 msgid "%o: orig. artist"
 msgstr "%o: ориг. извођач"
 
-#: ../src/scan.c:2837
+#: ../src/scan.c:2829
 #, c-format
 msgid "%n: track"
 msgstr "%n: нумера"
 
-#: ../src/scan.c:2840
+#: ../src/scan.c:2832
 msgid "%t: title"
 msgstr "%t: наслов"
 
-#: ../src/scan.c:2843
+#: ../src/scan.c:2835
 #, c-format
 msgid "%u: URL"
 msgstr "%u: адреса"
 
-#: ../src/scan.c:2846
+#: ../src/scan.c:2838
 #, c-format
 msgid "%x: number of discs"
 msgstr "%x: број дискова"
 
-#: ../src/scan.c:2849
+#: ../src/scan.c:2841
 msgid "%y: year"
 msgstr "%y: година"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2856
+#: ../src/scan.c:2848
 msgid "Mask Editor"
 msgstr "Уређивач маски"
 
-#: ../src/scan.c:2910
+#: ../src/scan.c:2902
 msgid "Create New Mask"
 msgstr "Направи нову маску"
 
-#: ../src/scan.c:2920
+#: ../src/scan.c:2912
 msgid "Move Up this Mask"
 msgstr "Помери маску нагоре"
 
-#: ../src/scan.c:2930
+#: ../src/scan.c:2922
 msgid "Move Down this Mask"
 msgstr "Помери маску надоле"
 
-#: ../src/scan.c:2940
+#: ../src/scan.c:2932
 msgid "Duplicate Mask"
 msgstr "Размножи маску"
 
-#: ../src/scan.c:2950
+#: ../src/scan.c:2942
 msgid "Add Default Masks"
 msgstr "Додај основну маску"
 
-#: ../src/scan.c:2960
+#: ../src/scan.c:2952
 msgid "Remove Mask"
 msgstr "Уклони маску"
 
-#: ../src/scan.c:2970
+#: ../src/scan.c:2962
 msgid "Save Masks"
 msgstr "Сачувај маску"
 
-#: ../src/scan.c:3550
+#: ../src/scan.c:3542
 msgid "New_mask"
 msgstr "Нова _маска"
 
-#: ../src/scan.c:3589
+#: ../src/scan.c:3581
 msgid "Copy: No row selected"
 msgstr "Умножи: Није изабран ред"
 
-#: ../src/scan.c:3682
+#: ../src/scan.c:3674
 msgid "Remove: No row selected"
 msgstr "Уклони: Није изабран ред"
 
-#: ../src/scan.c:3729
+#: ../src/scan.c:3721
 msgid "Move Up: No row selected"
 msgstr "Помери горе: Није изабран ред"
 
-#: ../src/scan.c:3773
+#: ../src/scan.c:3765
 msgid "Move Down: No row selected"
 msgstr "Помери доле: Није изабран ред"
 
@@ -4867,114 +4877,59 @@ msgstr "Грешка: Не могу да упишем датотеку поде
 msgid "Error while writing configuration file: %s"
 msgstr "Грешка приликом писања датотеке подешавања: „%s“"
 
-#: ../src/setting.c:1104
+#: ../src/setting.c:1100
 #, c-format
 msgid "Cannot open configuration file '%s' (%s)"
 msgstr "Не могу да отворим датотеку подешавања „%s“ (%s)"
 
-#: ../src/setting.c:1106
+#: ../src/setting.c:1102
 msgid "Loading default configuration"
 msgstr "Учитавам основно подешавање"
 
-#: ../src/setting.c:1147
+#: ../src/setting.c:1143
 #, c-format
 msgid "Cannot create or open file '%s' (%s)"
 msgstr "Не могу да направим или отворим датотеку „%s“ (%s)"
 
-#: ../src/setting.c:1207
+#: ../src/setting.c:1203
 #, c-format
 msgid "Error: Cannot write list to file: %s (%s)"
 msgstr "Грешка: Не могу да упишем списак у датотеку: %s (%s)"
 
-#: ../src/setting.c:1225
+#: ../src/setting.c:1221
 #, c-format
 msgid "Error while writing list file: %s"
 msgstr "Грешка приликом писања датотеке списка: „%s“"
 
 #. Fall back to defaults
-#: ../src/setting.c:1305
+#: ../src/setting.c:1301
 msgid "Loading default 'Fill Tag' masks…"
 msgstr "Учитавам основне маске за „Попуни ознаку“…"
 
 #. Fall back to defaults
-#: ../src/setting.c:1335
+#: ../src/setting.c:1331
 msgid "Loading default 'Rename File' masks…"
 msgstr "Учитавам основне маске за „Преименуј датотеку“…"
 
 #. Fall back to defaults
-#: ../src/setting.c:1361
+#: ../src/setting.c:1357
 msgid "Loading default 'Rename Directory' masks…"
 msgstr "Учитавам основне маске за „Преименуј директоријум“…"
 
-#: ../src/setting.c:1572
+#: ../src/setting.c:1568
 #, c-format
 msgid "Migrating configuration from directory '%s' to '%s'"
 msgstr "Селим подешавања из директоријума „%s“ у „%s“"
 
-#: ../src/setting.c:1596
+#: ../src/setting.c:1592
 #, c-format
 msgid "Failed to migrate configuration file '%s'"
 msgstr "Нисам успео да преселим датотеку подешавања „%s“"
 
-#: ../src/setting.c:1633
+#: ../src/setting.c:1629
 #, c-format
 msgid "Error: Cannot create directory '%s' (%s)"
 msgstr "Грешка: Не могу да направим директоријум „%s“ (%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 "ДЛЛ „%s“ није већ учитан. Покушајте да га учитате..."
-
-#. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: ../src/win32/win32dep.c:130
-#, c-format
-msgid "DLL '%s' could not be loaded"
-msgstr "ДЛЛ „%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 "Ово издање „%s“-а садржи „%s“"
-
-#. 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 "Функција „%s“ није нађена у ДЛЛ-у „%s“"
-
-#. 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 "Директоријум подешавања: „%s“"
-
-#. Log_Print(_("weasytag_init start..."));
-#: ../src/win32/win32dep.c:472
-#, c-format
-msgid "weasytag_init start..."
-msgstr "„weasytag_init“ почетак..."
-
-#. 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 "Издање Гбибл-а: %u.%u.%u\n"
-
-#. Set Environmental Variables
-#. Log_Print(_("weasytag_init end..."));
-#: ../src/win32/win32dep.c:496
-#, c-format
-msgid "weasytag_init end..."
-msgstr "„weasytag_init“ крај..."
-
-#. Log_Print(_("Audio player: '%s'"), player);
-#: ../src/win32/win32dep.c:620
-#, c-format
-msgid "Audio player: '%s'"
-msgstr "Програм за пуштање звука: „%s“"
+#~ msgid "The program '%s' cannot be found"
+#~ msgstr "Не могу да пронађем програм „%s“"
diff --git a/po/sr at latin.po b/po/sr at latin.po
index a295b48..f75a633 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -1,15 +1,16 @@
 # Serbian translation of EasyTAG
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2007—2014.
 # Copyright (C) 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the EasyTAG package.
 # Miloš Popović <gpopac at gmail.com>, 2007.
-# Miroslav Nikolić <miroslavnikolic at rocketmail.com>, 2012, 2013, 2014.
+# Miroslav Nikolić <miroslavnikolic at rocketmail.com>, 2012—2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: EasyTAG-2.1.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=easyta"
 "g&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-01-21 20:09+0000\n"
-"PO-Revision-Date: 2014-01-27 22:08+0200\n"
+"POT-Creation-Date: 2014-04-03 16:46+0000\n"
+"PO-Revision-Date: 2014-04-05 21:22+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic at rocketmail.com>\n"
 "Language-Team: Serbian <gnom at prevod.org>\n"
 "Language: sr\n"
@@ -18,6 +19,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Project-Style: gnome\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 Opus, Ogg Speex, Ogg "
+"Vorbis, MusePack, Monkey's Audio and WavPack files."
+msgstr ""
+"Pregledajte i uređujte oznake za MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg "
+"Spiks, Ogg Vorbis, MjuzPak, Monki audio i Vejvpak datoteke."
+
+#: ../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 ""
+"Tražite albume u bazi podataka na mreži, grupno uređujte oznake, stvarajte "
+"spiskove numera i preimenujte zbirke datoteka."
+
+#: ../data/easytag.appdata.xml.in.h:3
+msgid ""
+"A simple and nice GTK+ interface makes tagging easier under GNU/Linux and "
+"Windows."
+msgstr ""
+"Jednostavno i privlačno Gtk+ sučelje čini označavanje lakšim u GNU/Linuksu i "
+"Vindouzu."
 
 #: ../data/easytag.desktop.in.h:1
 msgid "Sound File Metadata Editor"
@@ -48,16 +77,16 @@ msgid ""
 "this program. If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 "Ovaj program je slobodan softver: možete ga deliti i/ili menjati pod uslovima "
-"GNU-ove Opšte javne licence koju je objavila Zadužbina slobodnog softvera, "
-"bilo verzije 2 licence, ili (prema vašem izboru) bilo koje novije verzije.\n"
+"Gnuove opšte javne licence koju je objavila Zadužbina slobodnog softvera, "
+"bilo izdanja 2 licence, ili (prema vašem izboru) bilo kojeg novijeg izdanja.\n"
 "\n"
 "Ovaj program se raspodeljuje u nadi da će biti koristan,ali BEZ IKAKVE "
 "GARANCIJE, čak i bez primenjene garancije TRŽIŠNE VREDNOSTI ili "
-"PRILAGOĐENOSTI ODREĐENOJ NAMENI. Pogledajte GNU Opštu javnu licencu za više "
-"detalja.\n"
+"PRILAGOĐENOSTI ODREĐENOJ NAMENI. Pogledajte Gnuovu opštu javnu licencu za "
+"više detalja.\n"
 "\n"
-"Trebali ste da primite primerak GNU Opšte javne licence uz ovaj program. Ako "
-"niste, pogledajte: http://www.gnu.org/licenses/."
+"Trebali ste da primite primerak Gnuove opšte javne licence uz ovaj program. "
+"Ako niste, pogledajte: „http://www.gnu.org/licenses/“."
 
 #. Translators: put your own name here to appear in the about dialog.
 #: ../src/about.c:108
@@ -95,729 +124,737 @@ msgstr "— Uređujte oznake i preimenujte zvučne datoteke"
 #.
 #. * 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 "Poređaj spisak prema oznaci"
 
-#: ../src/bar.c:158
+#: ../src/bar.c:159
 msgid "Sort List by Property"
 msgstr "Poređaj spisak prema svojstvu"
 
-#: ../src/bar.c:159
+#: ../src/bar.c:160
 msgid "Ascending by filename"
 msgstr "Rastuće, prema nazivu datoteke"
 
-#: ../src/bar.c:160
+#: ../src/bar.c:161
 msgid "Descending by filename"
 msgstr "Opadajuće, prema nazivu datoteke"
 
-#: ../src/bar.c:161
+#: ../src/bar.c:162
 msgid "Ascending by creation date"
 msgstr "Rastuće, prema datumu nastanka"
 
-#: ../src/bar.c:162
+#: ../src/bar.c:163
 msgid "Descending by creation date"
 msgstr "Opadajuće, prema datumu nastanka"
 
-#: ../src/bar.c:163
+#: ../src/bar.c:164
 msgid "Ascending by track number"
 msgstr "Rastuće, prema broju numere"
 
-#: ../src/bar.c:164
+#: ../src/bar.c:165
 msgid "Descending by track number"
 msgstr "Opadajuće, prema broju numere"
 
-#: ../src/bar.c:165
+#: ../src/bar.c:166
 msgid "Ascending by title"
 msgstr "Rastuće, prema naslovu"
 
-#: ../src/bar.c:166
+#: ../src/bar.c:167
 msgid "Descending by title"
 msgstr "Opadajuće, prema naslovu"
 
-#: ../src/bar.c:167
+#: ../src/bar.c:168
 msgid "Ascending by artist"
 msgstr "Rastuće, prema izvođaču"
 
-#: ../src/bar.c:168
+#: ../src/bar.c:169
 msgid "Descending by artist"
 msgstr "Opadajuće, prema izvođaču"
 
-#: ../src/bar.c:169
+#: ../src/bar.c:170
 msgid "Ascending by album artist"
 msgstr "Rastuće, prema izvođaču albuma"
 
-#: ../src/bar.c:170
+#: ../src/bar.c:171
 msgid "Descending by album artist"
 msgstr "Opadajuće, prema izvođaču albuma"
 
-#: ../src/bar.c:171
+#: ../src/bar.c:172
 msgid "Ascending by album"
 msgstr "Rastuće, prema albumu"
 
-#: ../src/bar.c:172
+#: ../src/bar.c:173
 msgid "Descending by album"
 msgstr "Opadajuće, prema albumu"
 
-#: ../src/bar.c:173
+#: ../src/bar.c:174
 msgid "Ascending by year"
 msgstr "Rastuće, prema godini"
 
-#: ../src/bar.c:174
+#: ../src/bar.c:175
 msgid "Descending by year"
 msgstr "Opadajuće, prema godini"
 
-#: ../src/bar.c:175
+#: ../src/bar.c:176
 msgid "Ascending by genre"
 msgstr "Rastuće, prema žanru"
 
-#: ../src/bar.c:176
+#: ../src/bar.c:177
 msgid "Descending by genre"
 msgstr "Opadajuće, prema žanru"
 
-#: ../src/bar.c:177
+#: ../src/bar.c:178
 msgid "Ascending by comment"
 msgstr "Rastuće, prema napomeni"
 
-#: ../src/bar.c:178
+#: ../src/bar.c:179
 msgid "Descending by comment"
 msgstr "Opadajuće, prema napomeni"
 
-#: ../src/bar.c:179
+#: ../src/bar.c:180
 msgid "Ascending by composer"
 msgstr "Rastuće, prema kompozitoru"
 
-#: ../src/bar.c:180
+#: ../src/bar.c:181
 msgid "Descending by composer"
 msgstr "Opadajuće, prema kompozitoru"
 
-#: ../src/bar.c:181
+#: ../src/bar.c:182
 msgid "Ascending by original artist"
 msgstr "Rastuće, prema originalnom izvođaču"
 
-#: ../src/bar.c:182
+#: ../src/bar.c:183
 msgid "Descending by original artist"
 msgstr "Opadajuće, prema originalnom izvođaču"
 
-#: ../src/bar.c:183
+#: ../src/bar.c:184
 msgid "Ascending by copyright"
 msgstr "Rastuće, prema autorskim pravima"
 
-#: ../src/bar.c:184
+#: ../src/bar.c:185
 msgid "Descending by copyright"
 msgstr "Opadajuće, prema autorskim pravima"
 
-#: ../src/bar.c:185
+#: ../src/bar.c:186
 msgid "Ascending by URL"
 msgstr "Rastuće, prema adresi"
 
-#: ../src/bar.c:186
+#: ../src/bar.c:187
 msgid "Descending by URL"
 msgstr "Opadajuće, prema adresi"
 
 #. 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 "Rastuće, prema nazivu kodera"
 
 #. 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 "Opadajuće, prema nazivu kodera"
 
-#: ../src/bar.c:193
+#: ../src/bar.c:194
 msgid "Ascending by file type"
 msgstr "Rastuće, prema vrsti datoteke"
 
-#: ../src/bar.c:194
+#: ../src/bar.c:195
 msgid "Descending by file type"
 msgstr "Opadajuće, prema vrsti datoteke"
 
-#: ../src/bar.c:195
+#: ../src/bar.c:196
 msgid "Ascending by file size"
 msgstr "Rastuće, prema veličini datoteke"
 
-#: ../src/bar.c:196
+#: ../src/bar.c:197
 msgid "Descending by file size"
 msgstr "Opadajuće, prema veličini datoteke"
 
-#: ../src/bar.c:197
+#: ../src/bar.c:198
 msgid "Ascending by duration"
 msgstr "Rastuće, prema trajanju numere"
 
-#: ../src/bar.c:198
+#: ../src/bar.c:199
 msgid "Descending by duration"
 msgstr "Opadajuće, prema trajanju numere"
 
-#: ../src/bar.c:199
+#: ../src/bar.c:200
 msgid "Ascending by bitrate"
 msgstr "Rastuće, prema bitskom protoku"
 
-#: ../src/bar.c:200
+#: ../src/bar.c:201
 msgid "Descending by bitrate"
 msgstr "Opadajuće, prema bitskom protoku"
 
-#: ../src/bar.c:201
+#: ../src/bar.c:202
 msgid "Ascending by samplerate"
 msgstr "Rastuće prema protoku uzorka"
 
-#: ../src/bar.c:202
+#: ../src/bar.c:203
 msgid "Descending by samplerate"
 msgstr "Opadajuće, prema protoku uzorka"
 
-#: ../src/bar.c:204
+#: ../src/bar.c:205
 msgid "Open Files With…"
 msgstr "Otvori datoteke programom…"
 
-#: ../src/bar.c:205
+#: ../src/bar.c:206
 msgid "Run a command on the selected files"
 msgstr "Pokreni naredbu nad izabranim datotekama"
 
-#: ../src/bar.c:208
+#: ../src/bar.c:209
 msgid "Select all"
 msgstr "Izaberi sve"
 
-#: ../src/bar.c:209
+#: ../src/bar.c:210
 msgid "Unselect All"
 msgstr "Odznači sve"
 
-#: ../src/bar.c:210
+#: ../src/bar.c:211
 msgid "Clear the current selection"
 msgstr "Očistite tekući izbor"
 
-#: ../src/bar.c:213
+#: ../src/bar.c:214
 msgid "Invert File Selection"
 msgstr "Preokreni izbor datoteka"
 
-#: ../src/bar.c:214
+#: ../src/bar.c:215
 msgid "Invert file selection"
 msgstr "Preokrenite izbor datoteka"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete Files"
 msgstr "Obriši datoteke"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:217
 msgid "Delete files"
 msgstr "Obrišite datoteke"
 
-#: ../src/bar.c:217
+#: ../src/bar.c:218
 msgid "_First File"
 msgstr "P_rva 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 "Pre_thodna datoteka"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:220
 msgid "Previous file"
 msgstr "Prethodna datoteka"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "_Next File"
 msgstr "_Sledeća datoteka"
 
-#: ../src/bar.c:220
+#: ../src/bar.c:221
 msgid "Next file"
 msgstr "Sledeća datoteka"
 
-#: ../src/bar.c:221
+#: ../src/bar.c:222
 msgid "_Last File"
 msgstr "Pos_lednja datoteka"
 
-#: ../src/bar.c:222
+#: ../src/bar.c:223
 msgid "Last file"
 msgstr "Poslednja datoteka"
 
-#: ../src/bar.c:223
+#: ../src/bar.c:224
 msgid "S_can Files"
 msgstr "_Pregledaj datoteke"
 
-#: ../src/bar.c:224 ../src/scan.c:2352
+#: ../src/bar.c:225 ../src/scan.c:2344
 msgid "Scan selected files"
 msgstr "Pregledajte izabrane datoteke"
 
-#: ../src/bar.c:225
+#: ../src/bar.c:226
 msgid "_Remove Tags"
 msgstr "_Ukloni oznake"
 
-#: ../src/bar.c:226
+#: ../src/bar.c:227
 msgid "Remove tags"
 msgstr "Uklonite oznake"
 
-#: ../src/bar.c:227
+#: ../src/bar.c:228
 msgid "_Undo Last Files Changes"
 msgstr "_Opozovi poslednje izmene datoteka"
 
-#: ../src/bar.c:228
+#: ../src/bar.c:229
 msgid "Undo last files changes"
 msgstr "Opozovite izmene poslednjih datoteka"
 
-#: ../src/bar.c:230
+#: ../src/bar.c:231
 msgid "R_edo Last Files Changes"
 msgstr "_Ponovi poslednje izmene datoteka"
 
-#: ../src/bar.c:231
+#: ../src/bar.c:232
 msgid "Redo last files changes"
 msgstr "Ponovite poslednje izmene datoteka"
 
-#: ../src/bar.c:233
+#: ../src/bar.c:234
 msgid "_Save Files"
 msgstr "_Sačuvaj datoteke"
 
-#: ../src/bar.c:234
+#: ../src/bar.c:235
 msgid "Save changes to selected files"
 msgstr "Sačuvajte izmene u izabranim datotekama"
 
-#: ../src/bar.c:236
+#: ../src/bar.c:237
 msgid "_Force Save Files"
 msgstr "_Primoraj čuvanje datoteka"
 
-#: ../src/bar.c:237
+#: ../src/bar.c:238
 msgid "Force saving files"
 msgstr "Primorajte čuvanje datoteka"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo Last Changes"
 msgstr "Opozovi poslednje izmene"
 
-#: ../src/bar.c:239
+#: ../src/bar.c:240
 msgid "Undo last changes"
 msgstr "Opozovite poslednje izmene"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo Last Changes"
 msgstr "Ponovi poslednje izmene"
 
-#: ../src/bar.c:240
+#: ../src/bar.c:241
 msgid "Redo last changes"
 msgstr "Ponovite poslednje izmene"
 
-#: ../src/bar.c:241
+#: ../src/bar.c:242
 msgid "_Quit"
 msgstr "_Izađi"
 
-#: ../src/bar.c:241 ../src/easytag.c:2404 ../src/easytag.c:4488
-#: ../src/easytag.c:4516
+#: ../src/bar.c:242 ../src/easytag.c:2429 ../src/easytag.c:4565
+#: ../src/easytag.c:4597
 msgid "Quit"
 msgstr "Izađite iz programa"
 
-#: ../src/bar.c:244
+#: ../src/bar.c:245
 msgid "_Browser"
 msgstr "_Preglednik"
 
-#: ../src/bar.c:245
+#: ../src/bar.c:246
 msgid "_Home Directory"
 msgstr "_Lični direktorijum"
 
-#: ../src/bar.c:246
+#: ../src/bar.c:247
 msgid "Go to home directory"
 msgstr "Idite u lični direktorijum"
 
-#: ../src/bar.c:248
+#: ../src/bar.c:249
 msgid "Desktop Directory"
 msgstr "Direktorijum radne površi"
 
-#: ../src/bar.c:249
+#: ../src/bar.c:250
 msgid "Go to desktop directory"
 msgstr "Idite u direktorijum radne površi"
 
-#: ../src/bar.c:251
+#: ../src/bar.c:252
 msgid "Documents Directory"
 msgstr "Direktorijum sa dokumentima"
 
-#: ../src/bar.c:252
+#: ../src/bar.c:253
 msgid "Go to documents directory"
 msgstr "Idite u direktorijum sa dokumentima"
 
-#: ../src/bar.c:254
+#: ../src/bar.c:255
 msgid "Downloads Directory"
 msgstr "Direktorijum preuzimanja"
 
-#: ../src/bar.c:255
+#: ../src/bar.c:256
 msgid "Go to downloads directory"
 msgstr "Idite u direktorijum preuzimanja"
 
-#: ../src/bar.c:257
+#: ../src/bar.c:258
 msgid "Music Directory"
 msgstr "Direktorijum muzike"
 
-#: ../src/bar.c:258
+#: ../src/bar.c:259
 msgid "Go to music directory"
 msgstr "Idite u direktorijum muzike"
 
-#: ../src/bar.c:260
+#: ../src/bar.c:261
 msgid "_Parent Directory"
 msgstr "_Roditeljski direktorijum"
 
-#: ../src/bar.c:261
+#: ../src/bar.c:262
 msgid "Go to parent directory"
 msgstr "Idi u roditeljski direktorijum"
 
-#: ../src/bar.c:263
+#: ../src/bar.c:264
 msgid "_Default Directory"
 msgstr "_Osnovni direktorijum"
 
-#: ../src/bar.c:264
+#: ../src/bar.c:265
 msgid "Go to default directory"
 msgstr "Idite u osnovni direktorijum"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set _Current Path as Default"
 msgstr "Postavi _trenutnu putanju kao osnovnu"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:267
 msgid "Set current path as default"
 msgstr "Postavite trenutnu putanju kao osnovnu"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename Directory…"
 msgstr "Preimenuj direktorijum…"
 
-#: ../src/bar.c:267
+#: ../src/bar.c:268
 msgid "Rename directory"
 msgstr "Preimenujte direktorijum"
 
-#: ../src/bar.c:268
+#: ../src/bar.c:269
 msgid "Reload Directory"
 msgstr "Osveži direktorijum"
 
-#: ../src/bar.c:269
+#: ../src/bar.c:270
 msgid "Reload directory"
 msgstr "Osvežite direktorijum"
 
-#: ../src/bar.c:272
+#: ../src/bar.c:273
 msgid "Browse Directory With…"
 msgstr "Otvori direktorijum programom…"
 
-#: ../src/bar.c:273
+#: ../src/bar.c:274
 msgid "Run a command on the directory"
 msgstr "Pokreni naredbu nad direktorijumom"
 
-#: ../src/bar.c:275
+#: ../src/bar.c:276
 msgid "_Collapse Tree"
 msgstr "_Skupi stablo"
 
-#: ../src/bar.c:276
+#: ../src/bar.c:277
 msgid "Collapse directory tree"
 msgstr "Skupite stablo direktorijuma"
 
-#: ../src/bar.c:277
+#: ../src/bar.c:278
 msgid "_Reload Tree"
 msgstr "_Osveži stablo"
 
-#: ../src/bar.c:278
+#: ../src/bar.c:279
 msgid "Reload directory tree"
 msgstr "Osvežite stablo direktorijuma"
 
-#: ../src/bar.c:281
+#: ../src/bar.c:282
 msgid "S_canner Mode"
 msgstr "Režim _pregledača"
 
-#: ../src/bar.c:283
+#: ../src/bar.c:284
 msgid "_Miscellaneous"
 msgstr "_Razno"
 
-#: ../src/bar.c:284
+#: ../src/bar.c:285
 msgid "_Find…"
 msgstr "_Pronađi…"
 
-#: ../src/bar.c:285
+#: ../src/bar.c:286
 msgid "Search filenames and tags"
 msgstr "Potražite nazive datoteka i oznake"
 
-#: ../src/bar.c:287
+#: ../src/bar.c:288
 msgid "CDD_B Search…"
 msgstr "Pretraži _bazu podataka CD-a…"
 
-#: ../src/bar.c:288
+#: ../src/bar.c:289
 msgid "CDDB search"
 msgstr "CDBP pretraga"
 
-#: ../src/bar.c:290
+#: ../src/bar.c:291
 msgid "Load Filenames From a Text File…"
 msgstr "Učitaj nazive datoteka iz tekstualne datoteke…"
 
-#: ../src/bar.c:291
+#: ../src/bar.c:292
 msgid "Load filenames from a text file"
 msgstr "Učitajte nazive datoteka iz tekstualne datoteke"
 
-#: ../src/bar.c:293
+#: ../src/bar.c:294
 msgid "Generate Playlist…"
 msgstr "Načini spisak numera…"
 
-#: ../src/bar.c:294
+#: ../src/bar.c:295
 msgid "Generate a playlist"
 msgstr "Načini spisak numera"
 
-#: ../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 "Pokreni program za zvuk"
 
-#: ../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 "Pokrenite program za puštanje zvuka"
 
-#: ../src/bar.c:300
+#: ../src/bar.c:301
 msgid "_Edit"
 msgstr "_Uređivanje"
 
-#: ../src/bar.c:301
+#: ../src/bar.c:302
 msgid "_Preferences"
 msgstr "_Postavke"
 
 #. The window
-#: ../src/bar.c:302 ../src/prefs.c:110
+#: ../src/bar.c:303 ../src/prefs.c:110
 msgid "Preferences"
 msgstr "Postavke"
 
-#: ../src/bar.c:304
+#: ../src/bar.c:305
 msgid "_View"
 msgstr "_Pregled"
 
-#: ../src/bar.c:305
+#: ../src/bar.c:306
 msgid "_Go"
 msgstr "_Idi"
 
-#: ../src/bar.c:307
+#: ../src/bar.c:308
 msgid "_Help"
 msgstr "Po_moć"
 
-#: ../src/bar.c:308
+#: ../src/bar.c:311
+msgid "_Contents"
+msgstr "_Sadržaj"
+
+#: ../src/bar.c:312
+msgid "Show help"
+msgstr "Prikažite 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 "Prekini trenutnu radnju"
 
 #.
 #. * Popup menu's Actions
 #.
-#: ../src/bar.c:320
+#: ../src/bar.c:326
 msgid "_File Operations"
 msgstr "_Radnje nad datotekama"
 
-#: ../src/bar.c:321
+#: ../src/bar.c:327
 msgid "S_canner"
 msgstr "_Pregledač"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:331
 msgid "CDDB Search Files…"
 msgstr "Nađi datoteke u bazi podataka CD-a…"
 
-#: ../src/bar.c:325
+#: ../src/bar.c:331
 msgid "CDDB search files…"
 msgstr "Nađite datoteke u bazi podataka CD-a…"
 
 #. { 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 "Očisti dnevnik izmena"
 
 #. { 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 "Razgledaj _pod-direktorijume"
 
-#: ../src/bar.c:336
+#: ../src/bar.c:342
 msgid "Browse subdirectories"
 msgstr "Razgledajte pod-direktorijume"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:346
 msgid "Show Hidden Directories"
 msgstr "Prikaži skrivene direktorijume"
 
-#: ../src/bar.c:340
+#: ../src/bar.c:346
 msgid "Show hidden directories"
 msgstr "Prikažite skrivene direktorijume"
 
-#: ../src/bar.c:342
+#: ../src/bar.c:348
 msgid "_Show Scanner"
 msgstr "_Pokaži pregledač"
 
-#: ../src/bar.c:343
+#: ../src/bar.c:349
 msgid "Show scanner"
 msgstr "Pokažite pregledač"
 
-#: ../src/bar.c:349
+#: ../src/bar.c:355
 msgid "Tree Browser"
 msgstr "Razgledač stablom"
 
-#: ../src/bar.c:350
+#: ../src/bar.c:356
 msgid "View by directory tree"
 msgstr "Pregledajte stablom direktorijuma"
 
-#: ../src/bar.c:352
+#: ../src/bar.c:358
 msgid "Artist and Album"
 msgstr "Izvođač i album"
 
-#: ../src/bar.c:353
+#: ../src/bar.c:359
 msgid "View by artist and album"
 msgstr "Pregledajte prema izvođaču i albumu"
 
-#: ../src/bar.c:358
+#: ../src/bar.c:364
 msgid "_Fill Tags…"
 msgstr "_Ispuni oznake…"
 
-#: ../src/bar.c:359
+#: ../src/bar.c:365
 msgid "Fill tags"
 msgstr "Popunite oznake"
 
-#: ../src/bar.c:361
+#: ../src/bar.c:367
 msgid "_Rename Files and Directories…"
 msgstr "_Preimenuj datoteke i direktorijume…"
 
-#: ../src/bar.c:362
+#: ../src/bar.c:368
 msgid "Rename files and directories"
 msgstr "Preimenujte datoteke i direktorijume"
 
-#: ../src/bar.c:364
+#: ../src/bar.c:370
 msgid "_Process Fields…"
 msgstr "_Obradi polja…"
 
-#: ../src/bar.c:364 ../src/scan.c:182
+#: ../src/bar.c:370 ../src/scan.c:182
 msgid "Process Fields"
 msgstr "Obradite polja"
 
-#: ../src/bar.c:422
+#: ../src/bar.c:428
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr "Ne mogu da stopim KS, greška beše: %s\n"
 
-#: ../src/bar.c:528
+#: ../src/bar.c:533
 msgid "Ready to start"
 msgstr "Spreman sam za početak"
 
-#: ../src/browser.c:369
+#: ../src/browser.c:376
 msgid "New default path for files selected"
 msgstr "Izabrana je nova osnovna putanja za datoteke"
 
-#: ../src/browser.c:670 ../src/easytag.c:4484
+#: ../src/browser.c:678 ../src/easytag.c:4561
 msgid "Some files have been modified but not saved"
 msgstr "Neke datoteke su izmenjene ali nisu sačuvane"
 
-#: ../src/browser.c:671
+#: ../src/browser.c:679
 msgid "Do you want to save them before changing the directory?"
 msgstr "Da li želite da ih sačuvate pre nego što promenite direktorijum?"
 
-#: ../src/browser.c:675
+#: ../src/browser.c:683
 msgid "Confirm Directory Change"
 msgstr "Potvrdite promenu direktorijuma"
 
-#: ../src/browser.c:2121
+#: ../src/browser.c:2146
 msgid "<All albums>"
 msgstr "<Svi albumi>"
 
-#: ../src/browser.c:2573
+#: ../src/browser.c:2607
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Greška: Tražeći %s, ne mogu da nađem čvor %s u stablu."
 
-#: ../src/browser.c:3067 ../src/browser.c:3145
+#: ../src/browser.c:3101 ../src/browser.c:3179
 msgid "Tree"
 msgstr "Stablo"
 
-#: ../src/browser.c:3068 ../src/cddb.c:803 ../src/misc.c:1913
+#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1902
 msgid "Filename"
 msgstr "Naziv datoteke"
 
-#: ../src/browser.c:3068 ../src/cddb.c:804 ../src/misc.c:1914
+#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1903
 #: ../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:3069 ../src/browser.c:3076 ../src/cddb.c:483
-#: ../src/cddb.c:805 ../src/misc.c:1915 ../src/prefs.c:644
+#: ../src/browser.c:3103 ../src/browser.c:3110 ../src/cddb.c:483
+#: ../src/cddb.c:805 ../src/misc.c:1904 ../src/prefs.c:644
 msgid "Artist"
 msgstr "Izvođač"
 
-#: ../src/browser.c:3069 ../src/misc.c:1916
+#: ../src/browser.c:3103 ../src/misc.c:1905
 msgid "Album Artist"
 msgstr "Izvođač albuma"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Album".
-#: ../src/browser.c:3070 ../src/browser.c:3078 ../src/cddb.c:486
-#: ../src/cddb.c:806 ../src/misc.c:1917 ../src/prefs.c:645
+#: ../src/browser.c:3104 ../src/browser.c:3112 ../src/cddb.c:486
+#: ../src/cddb.c:806 ../src/misc.c:1906 ../src/prefs.c:645
 msgid "Album"
 msgstr "Album"
 
-#: ../src/browser.c:3070 ../src/cddb.c:807 ../src/misc.c:1919
+#: ../src/browser.c:3104 ../src/cddb.c:807 ../src/misc.c:1908
 msgid "Year"
 msgstr "Godina"
 
-#: ../src/browser.c:3070
+#: ../src/browser.c:3104
 msgid "Disc"
 msgstr "Disk"
 
-#: ../src/browser.c:3071 ../src/misc.c:1920
+#: ../src/browser.c:3105 ../src/misc.c:1909
 msgid "Track"
 msgstr "Numera"
 
-#: ../src/browser.c:3071 ../src/cddb.c:810 ../src/misc.c:1921
+#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1910
 #: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Žanr"
 
-#: ../src/browser.c:3072 ../src/misc.c:1922 ../src/prefs.c:647
+#: ../src/browser.c:3106 ../src/misc.c:1911 ../src/prefs.c:647
 msgid "Comment"
 msgstr "Komentar"
 
-#: ../src/browser.c:3072 ../src/misc.c:1923 ../src/picture.c:863
+#: ../src/browser.c:3106 ../src/misc.c:1912 ../src/picture.c:1059
 #: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Kompozitor"
 
-#: ../src/browser.c:3073 ../src/misc.c:1924
+#: ../src/browser.c:3107 ../src/misc.c:1913
 msgid "Original Artist"
 msgstr "Orig. izvođač"
 
-#: ../src/browser.c:3074 ../src/misc.c:1925
+#: ../src/browser.c:3108 ../src/misc.c:1914
 msgid "Copyright"
 msgstr "Autorsko pravo"
 
-#: ../src/browser.c:3074 ../src/misc.c:1926
+#: ../src/browser.c:3108 ../src/misc.c:1915
 msgid "URL"
 msgstr "Adresa"
 
-#: ../src/browser.c:3075 ../src/misc.c:1927
+#: ../src/browser.c:3109 ../src/misc.c:1916
 msgid "Encoded By"
 msgstr "Kodirano pomoću"
 
-#: ../src/browser.c:3076
+#: ../src/browser.c:3110
 msgid "# Albums"
 msgstr "#Albumi"
 
-#: ../src/browser.c:3077 ../src/browser.c:3078
+#: ../src/browser.c:3111 ../src/browser.c:3112
 msgid "# Files"
 msgstr "#Datoteke"
 
-#: ../src/browser.c:3103
+#: ../src/browser.c:3137
 msgid "Enter a directory to browse."
 msgstr "Unesite direktorijum za razgledanje."
 
-#: ../src/browser.c:3112
+#: ../src/browser.c:3146
 msgid "Select a directory to browse."
 msgstr "Izaberite direktorijum za razgledanje."
 
@@ -825,33 +862,33 @@ msgstr "Izaberite direktorijum za razgledanje."
 #. * The label for displaying number of files in path (without subdirs)
 #.
 #. Translators: No files, as in "0 files".
-#: ../src/browser.c:3119 ../src/easytag.c:3426
+#: ../src/browser.c:3153 ../src/easytag.c:3468
 msgid "No files"
 msgstr "Nema datoteka"
 
-#: ../src/browser.c:3197
+#: ../src/browser.c:3231
 msgid "Artist & Album"
 msgstr "Izvođač i album"
 
 #. Only directories changed
-#: ../src/browser.c:3561 ../src/easytag.c:2844
+#: ../src/browser.c:3595 ../src/easytag.c:2880
 msgid "Rename Directory"
 msgstr "Preimenuj direktorijum"
 
-#: ../src/browser.c:3583
+#: ../src/browser.c:3617
 #, c-format
 msgid "Rename the directory '%s' to:"
 msgstr "Preimenuj direktorijum „%s“ u:"
 
-#: ../src/browser.c:3602 ../src/misc.c:1177
+#: ../src/browser.c:3636 ../src/misc.c:1171
 msgid "Use mask:"
 msgstr "Koristi masku:"
 
-#: ../src/browser.c:3605
+#: ../src/browser.c:3639
 msgid "If activated, it will use masks to rename directory."
 msgstr "Ukolik je aktivno, koristiće maske za preimenovanje direktorijuma."
 
-#: ../src/browser.c:3623
+#: ../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."
@@ -860,98 +897,69 @@ msgstr ""
 "za preimenovanje direktorijuma iz polja oznaka."
 
 #. Preview label
-#: ../src/browser.c:3647
+#: ../src/browser.c:3681
 msgid "Rename directory preview"
 msgstr "Pregled preimenovanja direktorijuma"
 
-#: ../src/browser.c:3739
+#: ../src/browser.c:3773
 msgid "You must type a directory name"
 msgstr "Morate da unesete naziv direktorijuma"
 
-#: ../src/browser.c:3740 ../src/browser.c:3761
+#: ../src/browser.c:3774 ../src/browser.c:3795
 msgid "Directory Name Error"
 msgstr "Greška naziva direktorijuma"
 
-#: ../src/browser.c:3758
+#: ../src/browser.c:3792
 #, c-format
 msgid "Could not convert '%s' into filename encoding."
 msgstr "Ne mogu da pretvorim „%s“ u sistem kodiranja naziva datoteke."
 
-#: ../src/browser.c:3760
+#: ../src/browser.c:3794
 msgid "Please use another name"
 msgstr "Molim koristite drugi naziv"
 
-#: ../src/browser.c:3830
+#: ../src/browser.c:3864
 #, c-format
 msgid "The directory name '%s' already exists"
 msgstr "Naziv direktorijuma „%s“ već postoji"
 
-#: ../src/browser.c:3831 ../src/easytag.c:2927
+#: ../src/browser.c:3865 ../src/easytag.c:2963
 msgid "Rename File Error"
 msgstr "Greška preimenovanja datoteke"
 
-#: ../src/browser.c:3869 ../src/browser.c:3898
+#: ../src/browser.c:3903 ../src/browser.c:3932
 msgid "Rename Directory Error"
 msgstr "Greška preimenovanja direktorijuma"
 
-#: ../src/browser.c:3936
+#: ../src/browser.c:3970
 msgid "Directory renamed"
 msgstr "Direktorijum je preimenovan"
 
-#: ../src/browser.c:3972
+#: ../src/browser.c:4006
 msgid "Browse Directory With"
 msgstr "Otvori direktorijum programom"
 
-#: ../src/browser.c:3988 ../src/browser.c:4114
+#: ../src/browser.c:4022 ../src/browser.c:4148
 msgid "Program to run:"
 msgstr "Program za pokretanje:"
 
-#: ../src/browser.c:4000
+#: ../src/browser.c:4034
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Unesite program za pokretanje. On će dobiti trenutni direktorijum kao "
 "parametar."
 
-#: ../src/browser.c:4094
+#: ../src/browser.c:4128
 msgid "Open Files With"
 msgstr "Otvori datoteke programom"
 
-#: ../src/browser.c:4126
+#: ../src/browser.c:4160
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 "Unesite program za pokretanje. On će dobiti označenu datoteku kao parametar."
 
-#: ../src/browser.c:4257
-msgid "You must type a program name"
-msgstr "Morate da unesete naziv programa"
-
-#: ../src/browser.c:4258 ../src/browser.c:4275
-msgid "Program Name Error"
-msgstr "Greška naziva programa"
-
-#: ../src/browser.c:4273 ../src/misc.c:793
-#, c-format
-msgid "The program '%s' cannot be found"
-msgstr "Ne mogu da pronađem program „%s“"
-
-#: ../src/browser.c:4325 ../src/misc.c:839
-#, c-format
-#| msgid "Cannot execute %s (%s)"
-msgid "Cannot execute ‘%s’ (%s)"
-msgstr "Ne mogu da pokrenem „%s“ (%s)"
-
-#: ../src/browser.c:4369 ../src/misc.c:884
-#, c-format
-msgid "Executed command: %s"
-msgstr "Izvršena naredba: „%s“"
-
-#: ../src/browser.c:4375 ../src/misc.c:890
-#, c-format
-msgid "Failed to launch program: %s"
-msgstr "Nisam uspeo da pokrenem program: %s"
-
 #: ../src/cddb.c:313
 msgid "Artist / Album"
 msgstr "Izvođač / Album"
@@ -1041,7 +1049,7 @@ msgstr "Sva 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:1037 ../src/prefs.c:807
 msgid "Other"
 msgstr "Ostalo"
 
@@ -1135,7 +1143,7 @@ msgstr "Kategorije"
 msgid "Results:"
 msgstr "Rezultati:"
 
-#: ../src/cddb.c:606 ../src/misc.c:1961
+#: ../src/cddb.c:606 ../src/misc.c:1950
 msgid "Search:"
 msgstr "Potraži:"
 
@@ -1198,7 +1206,7 @@ msgid "# Tracks"
 msgstr "# Numere"
 
 #. Check box to run the scanner
-#: ../src/cddb.c:847 ../src/misc.c:3002
+#: ../src/cddb.c:847 ../src/misc.c:2991
 msgid "Run the current scanner for each file"
 msgstr "Primeni tekući pregledač za svaku datoteku"
 
@@ -1296,7 +1304,7 @@ msgstr "Greška pri čitanju odgovora iz CDBP-a(%s)"
 msgid "Cannot create file '%s' (%s)"
 msgstr "Ne mogu da napravim datoteku „%s“ (%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 "Ne mogu da otvorim datoteku „%s“ (%s)"
@@ -1635,46 +1643,46 @@ msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Niska „%s“ ne može biti prevedena u UTF-8 (%s)."
 
 #. Starting messages
-#: ../src/easytag.c:173
+#: ../src/easytag.c:184
 #, c-format
 msgid "Starting EasyTAG version %s (PID: %d)…"
 msgstr "Pokrećem Laku oznaku %s (PIB: %d)…"
 
-#: ../src/easytag.c:175
+#: ../src/easytag.c:186
 #, c-format
 msgid "Using libid3tag version %s"
 msgstr "Koristim „libid3tag“ %s…"
 
-#: ../src/easytag.c:178
+#: ../src/easytag.c:189
 #, c-format
 msgid "Using id3lib version %d.%d.%d"
 msgstr "Koristim „id3lib“ %d.%d.%d…"
 
-#: ../src/easytag.c:184
+#: ../src/easytag.c:195
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
 msgstr "Promenljiva „EASYTAGLANG“ je određena. Postavljam lokalizaciju: „%s“"
 
-#: ../src/easytag.c:186
+#: ../src/easytag.c:197
 #, c-format
 msgid "Setting locale: '%s'"
 msgstr "Postavljam lokalizaciju: „%s“"
 
-#: ../src/easytag.c:191
+#: ../src/easytag.c:202
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')"
 msgstr "Trenutno koristim lokalizaciju „%s“ (i eventualno „%s“)"
 
-#: ../src/easytag.c:198
+#: ../src/easytag.c:209
 msgid "Unable to create setting directories"
 msgstr "Ne mogu da napravim direktorijume podešavanja"
 
-#: ../src/easytag.c:415 ../src/et_core.c:583
+#: ../src/easytag.c:426 ../src/et_core.c:597 ../src/et_core.c:609
 #, c-format
 msgid "Error while querying information for file: '%s' (%s)"
 msgstr "Greška prilikom propitivanja podataka za datoteku: „%s“ (%s)"
 
-#: ../src/easytag.c:480
+#: ../src/easytag.c:489
 #, c-format
 msgid "Cannot open path '%s'"
 msgstr "Ne mogu da otvorim putanju „%s“"
@@ -1682,11 +1690,11 @@ msgstr "Ne mogu da otvorim putanju „%s“"
 #.
 #. * Browser
 #.
-#: ../src/easytag.c:572 ../src/prefs.c:142
+#: ../src/easytag.c:581 ../src/prefs.c:142
 msgid "Browser"
 msgstr "Preglednik"
 
-#: ../src/easytag.c:594 ../src/et_core.c:2727
+#: ../src/easytag.c:603 ../src/et_core.c:2817
 msgid "File"
 msgstr "Datoteka"
 
@@ -1696,114 +1704,114 @@ msgstr "Datoteka"
 #. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
 #. Version changed to encoder version
 #. Encoder version
-#: ../src/easytag.c:626 ../src/easytag.c:4154 ../src/flac_header.c:201
+#: ../src/easytag.c:635 ../src/easytag.c:4231 ../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 "Koder:"
 
-#: ../src/easytag.c:634
+#: ../src/easytag.c:643
 msgid "Bitrate:"
 msgstr "Bitski protok:"
 
 #. Translators: Please try to keep this string as short as possible as it
 #. * is shown in a narrow column.
-#: ../src/easytag.c:644
+#: ../src/easytag.c:653
 msgid "Frequency:"
 msgstr "Učestalost:"
 
 #. Mode
-#: ../src/easytag.c:655 ../src/easytag.c:4158 ../src/mpeg_header.c:216
+#: ../src/easytag.c:664 ../src/easytag.c:4235 ../src/mpeg_header.c:216
 msgid "Mode:"
 msgstr "Režim:"
 
-#: ../src/easytag.c:662
+#: ../src/easytag.c:671
 msgid "Size:"
 msgstr "Veličina:"
 
-#: ../src/easytag.c:669
+#: ../src/easytag.c:678
 msgid "Duration:"
 msgstr "Trajanje:"
 
 #. Main Frame
-#: ../src/easytag.c:716 ../src/et_core.c:2665
+#: ../src/easytag.c:725 ../src/et_core.c:2747
 msgid "Tag"
 msgstr "Oznaka"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: ../src/easytag.c:738
+#: ../src/easytag.c:747
 msgid "Common"
 msgstr "Opšte"
 
 #. Title
-#: ../src/easytag.c:745
+#: ../src/easytag.c:754
 msgid "Title:"
 msgstr "Naslov:"
 
-#: ../src/easytag.c:759
+#: ../src/easytag.c:768
 msgid "Tag selected files with this title"
 msgstr "Označite izabrane datoteke ovim naslovom"
 
 #. Artist
-#: ../src/easytag.c:764
+#: ../src/easytag.c:773
 msgid "Artist:"
 msgstr "Izvođač:"
 
-#: ../src/easytag.c:778
+#: ../src/easytag.c:787
 msgid "Tag selected files with this artist"
 msgstr "Označite izabrane datoteke ovim izvođačem"
 
 #. Album Artist
-#: ../src/easytag.c:783
+#: ../src/easytag.c:792
 msgid "Album artist:"
 msgstr "Izvođač albuma:"
 
-#: ../src/easytag.c:797
+#: ../src/easytag.c:806
 msgid "Tag selected files with this album artist"
 msgstr "Označite izabrane datoteke ovim izvođačem albuma"
 
 #. Album
-#: ../src/easytag.c:802
+#: ../src/easytag.c:811
 msgid "Album:"
 msgstr "Album:"
 
-#: ../src/easytag.c:816
+#: ../src/easytag.c:825
 msgid "Tag selected files with this album name"
 msgstr "Označite izabrane datoteke ovim nazivom albuma"
 
 #. Disc Number
-#: ../src/easytag.c:821
+#: ../src/easytag.c:830
 msgid "CD:"
 msgstr "CD:"
 
-#: ../src/easytag.c:838
+#: ../src/easytag.c:847
 msgid "Tag selected files with this disc number"
 msgstr "Označite izabrane datoteke ovim brojem diska"
 
 #. Year
-#: ../src/easytag.c:843
+#: ../src/easytag.c:852
 msgid "Year:"
 msgstr "Godina:"
 
-#: ../src/easytag.c:863
+#: ../src/easytag.c:872
 msgid "Tag selected files with this year"
 msgstr "Označite izabrane datoteke ovom godinom"
 
-#: ../src/easytag.c:877
+#: ../src/easytag.c:886
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Broj dosledno izabranih numera. Počinje od 01 u svakom pod-direktorijumu."
 
 #. To have enough space to display the icon
 #. To have enough space to display the icon
-#: ../src/easytag.c:886
+#: ../src/easytag.c:895
 msgid "Track #:"
 msgstr "Numera #:"
 
-#: ../src/easytag.c:917
+#: ../src/easytag.c:926
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1811,269 +1819,269 @@ msgstr ""
 "Unesite broj datoteka, u istom direktorijumu prikazane datoteke, do "
 "izabranih numera."
 
-#: ../src/easytag.c:937
+#: ../src/easytag.c:946
 msgid "Tag selected files with this number of tracks"
 msgstr "Označite izabrane datoteke ovim brojem numera"
 
 #. Genre
-#: ../src/easytag.c:941
+#: ../src/easytag.c:950
 msgid "Genre:"
 msgstr "Žanr:"
 
-#: ../src/easytag.c:969
+#: ../src/easytag.c:978
 msgid "Tag selected files with this genre"
 msgstr "Označite izabrane datoteke ovim žanrom"
 
 #. Comment
-#: ../src/easytag.c:974
+#: ../src/easytag.c:983
 msgid "Comment:"
 msgstr "Komentar:"
 
-#: ../src/easytag.c:1001
+#: ../src/easytag.c:1010
 msgid "Tag selected files with this comment"
 msgstr "Označite izabrane datoteke ovom napomenom"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. Composer (name of the composers)
-#: ../src/easytag.c:1008
+#: ../src/easytag.c:1017
 msgid "Composer:"
 msgstr "Kompozitor:"
 
-#: ../src/easytag.c:1022
+#: ../src/easytag.c:1031
 msgid "Tag selected files with this composer"
 msgstr "Označite izabrane datoteke ovim kompozitorom"
 
 #. 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:1029
+#: ../src/easytag.c:1038
 msgid "Orig. artist:"
 msgstr "Orig. izvođač:"
 
-#: ../src/easytag.c:1043
+#: ../src/easytag.c:1052
 msgid "Tag selected files with this original artist"
 msgstr "Označite izabrane datoteke ovim originalnim izvođačem"
 
 #. Copyright
-#: ../src/easytag.c:1049
+#: ../src/easytag.c:1058
 msgid "Copyright:"
 msgstr "Autorsko pravo:"
 
-#: ../src/easytag.c:1063
+#: ../src/easytag.c:1072
 msgid "Tag selected files with this copyright"
 msgstr "Označite izabrane datoteke ovim autorskim pravom"
 
 #. URL
-#: ../src/easytag.c:1069
+#: ../src/easytag.c:1078
 msgid "URL:"
 msgstr "Adresa:"
 
-#: ../src/easytag.c:1083
+#: ../src/easytag.c:1092
 msgid "Tag selected files with this URL"
 msgstr "Označite izabrane datoteke ovom adresom"
 
 #. Encoded by
-#: ../src/easytag.c:1089
+#: ../src/easytag.c:1098
 msgid "Encoded by:"
 msgstr "Kodirano pomoću:"
 
-#: ../src/easytag.c:1103
+#: ../src/easytag.c:1112
 msgid "Tag selected files with this encoder name"
 msgstr "Označite izabrane datoteke nazivom ovog enkodera"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1137 ../src/et_core.c:3100 ../src/et_core.c:3103
+#: ../src/easytag.c:1146 ../src/et_core.c:3189 ../src/et_core.c:3192
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/easytag.c:1161
+#: ../src/easytag.c:1170
 msgid "You can use drag and drop to add an image"
 msgstr "Možete prevući slike u ovo prozorče da ih dodate"
 
-#: ../src/easytag.c:1208
+#: ../src/easytag.c:1217
 msgid "Add images to the tag"
 msgstr "Dodajte slike u oznake"
 
-#: ../src/easytag.c:1226
+#: ../src/easytag.c:1235
 msgid "Remove selected images from the tag"
 msgstr "Uklonite izabrane slike iz oznake"
 
-#: ../src/easytag.c:1240
+#: ../src/easytag.c:1249
 msgid "Save the selected images to files"
 msgstr "Sačuvajte izabrane slike u datoteke"
 
-#: ../src/easytag.c:1251
+#: ../src/easytag.c:1260
 msgid "Edit image properties"
 msgstr "Uredite svojstva slike"
 
-#: ../src/easytag.c:1265
+#: ../src/easytag.c:1274
 msgid "Tag selected files with these images"
 msgstr "Označite izabrane datoteke ovim slikama"
 
-#: ../src/easytag.c:1323
+#: ../src/easytag.c:1332
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr "Izabrane datoteke su označene naslovom „%s“."
 
-#: ../src/easytag.c:1325
+#: ../src/easytag.c:1334
 msgid "Removed title from selected files."
 msgstr "Uklonjen je je naslov iz izabranih datoteka."
 
-#: ../src/easytag.c:1340
+#: ../src/easytag.c:1349
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr "Izabrane datoteke su označene izvođačem „%s“."
 
-#: ../src/easytag.c:1342
+#: ../src/easytag.c:1351
 msgid "Removed artist from selected files."
 msgstr "Uklonjen je je izvođač iz izabranih datoteka."
 
-#: ../src/easytag.c:1356
+#: ../src/easytag.c:1365
 #, c-format
 msgid "Selected files tagged with album artist '%s'."
 msgstr "Izabrane datoteke su označene izvođačem albuma „%s“."
 
-#: ../src/easytag.c:1358
+#: ../src/easytag.c:1367
 msgid "Removed album artist from selected files."
 msgstr "Uklonjen je je izvođač albuma iz izabranih datoteka."
 
-#: ../src/easytag.c:1373
+#: ../src/easytag.c:1382
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr "Izabrane datoteke su označene albumom „%s“."
 
-#: ../src/easytag.c:1375
+#: ../src/easytag.c:1384
 msgid "Removed album name from selected files."
 msgstr "Uklonjen je je naziv albuma iz izabranih datoteka."
 
-#: ../src/easytag.c:1412
+#: ../src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with disc number '%s/%s'."
 msgstr "Izabrane datoteke su označene brojem diska „%s/%s“."
 
-#: ../src/easytag.c:1417
+#: ../src/easytag.c:1426
 #, c-format
 msgid "Selected files tagged with disc number like 'xx'."
 msgstr "Izabrane datoteke su označene brojem diska kao „hh“."
 
-#: ../src/easytag.c:1422
+#: ../src/easytag.c:1431
 msgid "Removed disc number from selected files."
 msgstr "Uklonjen je broj diska iz izabranih datoteka."
 
-#: ../src/easytag.c:1438
+#: ../src/easytag.c:1447
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr "Izabrane datoteke su označene godinom „%s“."
 
-#: ../src/easytag.c:1440
+#: ../src/easytag.c:1449
 msgid "Removed year from selected files."
 msgstr "Uklonjena je godina iz izabranih datoteka."
 
-#: ../src/easytag.c:1466 ../src/easytag.c:1556
+#: ../src/easytag.c:1475 ../src/easytag.c:1566
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Izabrane datoteke su označene numerom tipa „xx/%s“."
 
-#: ../src/easytag.c:1469
+#: ../src/easytag.c:1478
 #, c-format
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Izabrane datoteke su označene numerom tipa „xx“."
 
-#: ../src/easytag.c:1473 ../src/easytag.c:1559
+#: ../src/easytag.c:1482 ../src/easytag.c:1569
 msgid "Removed track number from selected files."
 msgstr "Uklonjen je broj numere iz izabranih datoteka."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1529
+#: ../src/easytag.c:1539
 #, c-format
 msgid "Selected tracks numbered sequentially."
 msgstr "Izabrane datoteke su pobrojane redom."
 
-#: ../src/easytag.c:1575
+#: ../src/easytag.c:1585
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Izabrane datoteke su označene žanrom „%s“."
 
-#: ../src/easytag.c:1577
+#: ../src/easytag.c:1587
 msgid "Removed genre from selected files."
 msgstr "Uklonjen je žanr iz izabranih datoteka."
 
-#: ../src/easytag.c:1599
+#: ../src/easytag.c:1609
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Izabrane datoteke su označene komentarom „%s“."
 
-#: ../src/easytag.c:1601
+#: ../src/easytag.c:1611
 msgid "Removed comment from selected files."
 msgstr "Uklonjen je komentar iz izabranih datoteka."
 
-#: ../src/easytag.c:1615
+#: ../src/easytag.c:1625
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Izabrane datoteke su označene kompozitorom „%s“."
 
-#: ../src/easytag.c:1617
+#: ../src/easytag.c:1627
 msgid "Removed composer from selected files."
 msgstr "Uklonjen je kompozitor iz izabranih datoteka."
 
-#: ../src/easytag.c:1632
+#: ../src/easytag.c:1642
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Izabrane datoteke su označene originalnim izvođačem „%s“."
 
-#: ../src/easytag.c:1634
+#: ../src/easytag.c:1644
 msgid "Removed original artist from selected files."
 msgstr "Uklonjen je originalni izvođač iz izabranih datoteka."
 
-#: ../src/easytag.c:1649
+#: ../src/easytag.c:1659
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Izabrane datoteke su označene autorskim pravom „%s“."
 
-#: ../src/easytag.c:1651
+#: ../src/easytag.c:1661
 msgid "Removed copyright from selected files."
 msgstr "Uklonjeno je autorsko pravo iz izabranih datoteka."
 
-#: ../src/easytag.c:1666
+#: ../src/easytag.c:1676
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Izabrane datoteke su označene adresom „%s“."
 
-#: ../src/easytag.c:1668
+#: ../src/easytag.c:1678
 msgid "Removed URL from selected files."
 msgstr "Uklonjena je adresa iz izabranih datoteka."
 
-#: ../src/easytag.c:1683
+#: ../src/easytag.c:1693
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Izabrane datoteke su označene nazivom kodera „%s“."
 
-#: ../src/easytag.c:1685
+#: ../src/easytag.c:1695
 msgid "Removed encoder name from selected files."
 msgstr "Uklonjen je naziv kodera iz izabranih datoteka."
 
-#: ../src/easytag.c:1717
+#: ../src/easytag.c:1727
 msgid "Selected files tagged with images."
 msgstr "Izabrane datoteke su označene slikama."
 
-#: ../src/easytag.c:1719
+#: ../src/easytag.c:1729
 msgid "Removed images from selected files."
 msgstr "Uklonjene su slike iz izabranih datoteka."
 
-#: ../src/easytag.c:2000
+#: ../src/easytag.c:2010
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Izaberi režim i masku, i ponovi istu radnju"
 
-#: ../src/easytag.c:2052
+#: ../src/easytag.c:2062
 msgid "All tags have been scanned"
 msgstr "Sve oznake su pregledane"
 
-#: ../src/easytag.c:2108
+#: ../src/easytag.c:2118
 msgid "All tags have been removed"
 msgstr "Sve oznake su uklonjene"
 
-#: ../src/easytag.c:2398
+#: ../src/easytag.c:2423
 #, c-format
 msgid "A file was changed by an external program"
 msgid_plural "%d files were changed by an external program."
@@ -2082,153 +2090,153 @@ msgstr[1] "%d datoteke su izmenjene spoljnim programom."
 msgstr[2] "%d datoteka je izmenjeno spoljnim programom."
 msgstr[3] "Jedna datoteka je izmenjena spoljnim programom."
 
-#: ../src/easytag.c:2403
+#: ../src/easytag.c:2428
 msgid "Do you want to continue saving the file?"
 msgstr "Da li želite da sačuvate datoteku?"
 
-#: ../src/easytag.c:2458 ../src/easytag.c:2478
+#: ../src/easytag.c:2486 ../src/easytag.c:2506
 msgid "Saving files was stopped"
 msgstr "Čuvanje datoteka je zaustavljeno"
 
-#: ../src/easytag.c:2480
+#: ../src/easytag.c:2508
 msgid "All files have been saved"
 msgstr "Sve datoteke su sačuvane"
 
-#: ../src/easytag.c:2611
+#: ../src/easytag.c:2643
 #, c-format
 msgid "Cannot delete file (%s)"
 msgstr "Ne mogu da obrišem datoteku (%s)"
 
-#: ../src/easytag.c:2631
+#: ../src/easytag.c:2664
 msgid "Files have been partially deleted"
 msgstr "Datoteke su delimično uklonjene"
 
-#: ../src/easytag.c:2633
+#: ../src/easytag.c:2666
 msgid "All files have been deleted"
 msgstr "Sve datoteke su uklonjene"
 
-#: ../src/easytag.c:2749
+#: ../src/easytag.c:2782
 #, c-format
 msgid "Do you want to write the tag of file '%s'?"
 msgstr "Da li želite da upišete oznaku datoteke „%s“?"
 
-#: ../src/easytag.c:2751
+#: ../src/easytag.c:2784
 msgid "Confirm Tag Writing"
 msgstr "Potvrdi upisivanje oznake"
 
-#: ../src/easytag.c:2756 ../src/easytag.c:2873 ../src/easytag.c:3133
+#: ../src/easytag.c:2789 ../src/easytag.c:2909 ../src/easytag.c:3172
 msgid "Repeat action for the remaining files"
 msgstr "Ponovi radnju za preostale datoteke"
 
 #. Directories and filename changed
-#: ../src/easytag.c:2837 ../src/scan.c:181
+#: ../src/easytag.c:2873 ../src/scan.c:181
 msgid "Rename File and Directory"
 msgstr "Preimenuj datoteku i direktorijum"
 
-#: ../src/easytag.c:2838
+#: ../src/easytag.c:2874
 msgid "File and directory rename confirmation required"
 msgstr "Potrebno je potvrđivanje za preimenovanje datoteke i direktorijuma"
 
-#: ../src/easytag.c:2839
+#: ../src/easytag.c:2875
 #, c-format
 msgid "Do you want to rename the file and directory '%s' to '%s'?"
 msgstr "Da li želite da preimenujete datoteku i direktorijum „%s“ u „%s“?"
 
-#: ../src/easytag.c:2845
+#: ../src/easytag.c:2881
 msgid "Directory rename confirmation required"
 msgstr "Potrebno je potvrđivanje za preimenovanje direktorijuma"
 
-#: ../src/easytag.c:2846
+#: ../src/easytag.c:2882
 #, c-format
 msgid "Do you want to rename the directory '%s' to '%s'?"
 msgstr "Da li želite da preimenujete direktorijum „%s“ u „%s“?"
 
 #. Only filename changed
-#: ../src/easytag.c:2852
+#: ../src/easytag.c:2888
 msgid "Rename File"
 msgstr "Preimenuj datoteku"
 
-#: ../src/easytag.c:2853
+#: ../src/easytag.c:2889
 msgid "File rename confirmation required"
 msgstr "Potrebno je potvrđivanje za preimenovanje datoteke"
 
-#: ../src/easytag.c:2854
+#: ../src/easytag.c:2890
 #, c-format
 msgid "Do you want to rename the file '%s' to '%s'?"
 msgstr "Da li želite da preimenujete datoteku „%s“ u „%s“?"
 
-#: ../src/easytag.c:2920
+#: ../src/easytag.c:2956
 #, c-format
 msgid "Cannot rename file '%s' to '%s'"
 msgstr "Ne mogu da preimenujem datoteku „%s“ u „%s“"
 
-#: ../src/easytag.c:2934
+#: ../src/easytag.c:2970
 #, c-format
 msgid "Cannot rename file '%s' to '%s': %s"
 msgstr "Ne mogu da preimenujem datoteku „%s“ u „%s“: (%s)"
 
-#: ../src/easytag.c:2938
+#: ../src/easytag.c:2974
 msgid "File(s) not renamed"
 msgstr "Datoteka(e) nije preimenovana"
 
-#: ../src/easytag.c:3047
+#: ../src/easytag.c:3086
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Zapisujem oznaku od „%s“"
 
-#: ../src/easytag.c:3054
+#: ../src/easytag.c:3093
 msgid "Tag(s) written"
 msgstr "Oznaka(e) upisane"
 
-#: ../src/easytag.c:3069
+#: ../src/easytag.c:3108
 #, c-format
 msgid "Cannot write tag in file '%s' (%s)"
 msgstr "Ne mogu da upišem oznaku u datoteku „%s“ (%s)"
 
-#: ../src/easytag.c:3082
+#: ../src/easytag.c:3121
 #, c-format
 msgid "Cannot write tag in file '%s'"
 msgstr "Ne mogu da upišem oznaku u datoteku „%s“"
 
-#: ../src/easytag.c:3085
+#: ../src/easytag.c:3124
 msgid "Tag Write Error"
 msgstr "Greška upisivanja oznake"
 
-#: ../src/easytag.c:3130 ../src/easytag.c:3144
+#: ../src/easytag.c:3169 ../src/easytag.c:3183
 #, c-format
 msgid "Do you really want to delete the file '%s'?"
 msgstr "Da li zaista želite da obrišete datoteku „%s“?"
 
-#: ../src/easytag.c:3136 ../src/easytag.c:3146
+#: ../src/easytag.c:3175 ../src/easytag.c:3185
 msgid "Delete File"
 msgstr "Ukloni datoteku"
 
-#: ../src/easytag.c:3171
+#: ../src/easytag.c:3210
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Datoteka „%s“ je uklonjena"
 
-#: ../src/easytag.c:3303
+#: ../src/easytag.c:3345
 #, c-format
 msgid "Cannot read directory '%s'"
 msgstr "Ne mogu da čitam direktorijum „%s“"
 
-#: ../src/easytag.c:3307
+#: ../src/easytag.c:3349
 msgid "Directory Read Error"
 msgstr "Greška čitanja direktorijuma"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3328
+#: ../src/easytag.c:3370
 #, c-format
 msgid "Search in progress…"
 msgstr "Pretraga je u toku…"
 
-#: ../src/easytag.c:3351 ../src/et_core.c:2734
+#: ../src/easytag.c:3393 ../src/et_core.c:2824
 #, c-format
 msgid "File: '%s'"
 msgstr "Datoteka: „%s“"
 
-#: ../src/easytag.c:3401
+#: ../src/easytag.c:3443
 #, c-format
 msgid "Found one file in this directory and subdirectories"
 msgid_plural "Found %d files in this directory and subdirectories"
@@ -2237,7 +2245,7 @@ msgstr[1] "Nađoh %d datoteke u ovom direktorijumu i pod-direktorijumima"
 msgstr[2] "Nađoh %d datoteka u ovom direktorijumu i pod-direktorijumima"
 msgstr[3] "Nađoh %d datoteka(e) u ovom direktorijumu i pod-direktorijumima."
 
-#: ../src/easytag.c:3408
+#: ../src/easytag.c:3450
 #, c-format
 msgid "Found one file in this directory"
 msgid_plural "Found %d files in this directory"
@@ -2246,179 +2254,194 @@ msgstr[1] "Nađoh %d datoteke u ovom direktorijumu"
 msgstr[2] "Nađoh %d datoteka u ovom direktorijumu"
 msgstr[3] "Nađoh %d datoteka(e) u ovom direktorijumu."
 
-#: ../src/easytag.c:3430
+#: ../src/easytag.c:3472
 msgid "No file found in this directory and subdirectories"
 msgstr ""
 "Nisam pronašao ni jednu datoteku u ovom direktorijumu i pod-direktorijumima"
 
-#: ../src/easytag.c:3432
+#: ../src/easytag.c:3474
 msgid "No file found in this directory"
 msgstr "Nisam pronašao ni jednu datoteku u ovom direktorijumu"
 
-#: ../src/easytag.c:3500
+#: ../src/easytag.c:3542
 #, c-format
 msgid "Error opening directory '%s' (%s)"
 msgstr "Greška otvaranja direktorijuma „%s“ (%s)"
 
-#: ../src/easytag.c:3536
+#: ../src/easytag.c:3578
 #, c-format
 msgid "Cannot read directory (%s)"
 msgstr "Ne mogu da čitam direktorijum (%s)"
 
-#: ../src/easytag.c:3556
+#: ../src/easytag.c:3598
 msgid "Searching for audio files…"
 msgstr "Traži zvučne datoteke…"
 
-#: ../src/easytag.c:3557
+#: ../src/easytag.c:3599
 msgid "Searching"
 msgstr "Tražim"
 
-#: ../src/easytag.c:4188
+#: ../src/easytag.c:4265
 msgid "Select a directory to browse"
 msgstr "Izaberite direktorijum za razgledanje"
 
 #. Menu items
-#: ../src/easytag.c:4335
+#: ../src/easytag.c:4412
 msgid "Tag selected files with this field"
 msgstr "Označi izabrane datoteke ovim poljem"
 
-#: ../src/easytag.c:4347 ../src/scan.c:2662
+#: ../src/easytag.c:4424 ../src/scan.c:2654
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Prevedi „_“ i „%20“ u razmak"
 
-#: ../src/easytag.c:4354 ../src/scan.c:2664
+#: ../src/easytag.c:4431 ../src/scan.c:2656
 msgid "Convert ' ' to '_'"
 msgstr "Prevedi „ “ u „_“"
 
-#: ../src/easytag.c:4365
+#: ../src/easytag.c:4442
 msgid "All uppercase"
 msgstr "Sva slova velika"
 
-#: ../src/easytag.c:4372
+#: ../src/easytag.c:4449
 msgid "All lowercase"
 msgstr "Sva slova mala"
 
-#: ../src/easytag.c:4379
+#: ../src/easytag.c:4456
 msgid "First letter uppercase"
 msgstr "Prvo slovo veliko"
 
-#: ../src/easytag.c:4386
+#: ../src/easytag.c:4463
 msgid "First letter uppercase of each word"
 msgstr "Prvo slovo svake reči veliko"
 
-#: ../src/easytag.c:4397 ../src/prefs.c:1023 ../src/scan.c:2762
+#: ../src/easytag.c:4474 ../src/prefs.c:1023 ../src/scan.c:2754
 msgid "Remove spaces"
 msgstr "Ukloni razmake"
 
-#: ../src/easytag.c:4404
+#: ../src/easytag.c:4481
 msgid "Insert space before uppercase letter"
 msgstr "Ubaci razmak pre velikog slova"
 
-#: ../src/easytag.c:4411
+#: ../src/easytag.c:4488
 msgid "Remove duplicate spaces or underscores"
 msgstr "Ukloni duple razmake ili donje crtice"
 
-#: ../src/easytag.c:4418
+#: ../src/easytag.c:4495
 msgid "Remove all text"
 msgstr "Ukloni sav tekst"
 
-#: ../src/easytag.c:4437
+#: ../src/easytag.c:4514
 msgid "EasyTAG: Normal exit."
 msgstr "Laka oznaka: Normalan izlaz."
 
-#: ../src/easytag.c:4489
+#: ../src/easytag.c:4566
 msgid "Do you want to save them before quitting?"
 msgstr "Da li želite da ih sačuvate pre zatvaranja?"
 
-#: ../src/easytag.c:4512
+#: ../src/easytag.c:4593
 msgid "Do you really want to quit?"
 msgstr "Da li zaista želite da izađete iz programa?"
 
-#: ../src/et_core.c:505
+#: ../src/et_core.c:510
 #, c-format
 msgid "Error reading tag from ogg file (%s)"
 msgstr "Greška čitanja oznake iz ogg datoteke (%s)"
 
-#: ../src/et_core.c:639
+#: ../src/et_core.c:539
+#, c-format
+#| msgid "Error reading tag from ogg file (%s)"
+msgid "Error reading tag from Opus file (%s)"
+msgstr "Greška čitanja oznake iz Opus datoteke (%s)"
+
+#: ../src/et_core.c:682
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr "Samostalno ispravljanje je primenjeno nad datotekom „%s“."
 
-#: ../src/et_core.c:2631
+#: ../src/et_core.c:2707
 msgid "ID3 Tag"
 msgstr "ID3 oznaka"
 
-#: ../src/et_core.c:2637
+#: ../src/et_core.c:2713
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis oznaka"
 
-#: ../src/et_core.c:2643
+#: ../src/et_core.c:2719
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis oznaka"
 
-#: ../src/et_core.c:2648
+#: ../src/et_core.c:2724
 msgid "APE Tag"
 msgstr "APE oznaka"
 
-#: ../src/et_core.c:2653
+#: ../src/et_core.c:2729
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC oznaka"
 
-#: ../src/et_core.c:2659
+#: ../src/et_core.c:2735
 msgid "Wavpack Tag"
 msgstr "Vejvpak oznaka"
 
-#: ../src/et_core.c:2679
+#: ../src/et_core.c:2741
+msgid "Opus Tag"
+msgstr "Opus oznaka"
+
+#: ../src/et_core.c:2761
 msgid "MP3 File"
 msgstr "MP3 datoteka"
 
-#: ../src/et_core.c:2683
+#: ../src/et_core.c:2765
 msgid "MP2 File"
 msgstr "MP2 datoteka"
 
-#: ../src/et_core.c:2689
+#: ../src/et_core.c:2771
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis datoteka"
 
-#: ../src/et_core.c:2695
+#: ../src/et_core.c:2777
 msgid "Speex File"
 msgstr "Spiks datoteka"
 
-#: ../src/et_core.c:2701
+#: ../src/et_core.c:2783
 msgid "FLAC File"
 msgstr "FLAC datoteka"
 
-#: ../src/et_core.c:2706
+#: ../src/et_core.c:2788
 msgid "MusePack File"
 msgstr "MjuzPak datoteka"
 
-#: ../src/et_core.c:2710
+#: ../src/et_core.c:2792
 msgid "Monkey's Audio File"
 msgstr "Monki audio datoteka"
 
-#: ../src/et_core.c:2715
+#: ../src/et_core.c:2797
 msgid "MP4/AAC File"
 msgstr "MP4/AAC datoteka"
 
-#: ../src/et_core.c:2721
+#: ../src/et_core.c:2803
 msgid "Wavpack File"
 msgstr "Vejvpak datoteka"
 
-#: ../src/et_core.c:2778 ../src/et_core.c:2833
+#: ../src/et_core.c:2809
+#| msgid "MusePack File"
+msgid "Opus File"
+msgstr "Opus datoteka"
+
+#: ../src/et_core.c:2868 ../src/et_core.c:2923
 msgid "File not found"
 msgstr "Nisam našao datoteku"
 
-#: ../src/et_core.c:2783
+#: ../src/et_core.c:2873
 #, c-format
 msgid "Cannot query file information (%s)"
 msgstr "Ne mogu da propitam podatke datoteke (%s)"
 
-#: ../src/et_core.c:2817
+#: ../src/et_core.c:2907
 msgid "Read-only file"
 msgstr "Datoteka samo za čitanje"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2881
+#: ../src/et_core.c:2971
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
@@ -2427,49 +2450,44 @@ msgstr[1] "%u datoteke"
 msgstr[2] "%u datoteka"
 msgstr[3] "Jedna datoteka"
 
-#: ../src/et_core.c:3086
+#: ../src/et_core.c:3175
 #, c-format
 msgid "Images (%d)"
 msgstr "Slike (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3128 ../src/flac_header.c:205
+#: ../src/et_core.c:3217 ../src/flac_header.c:205
 #: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
 #: ../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/et_core.c:3222 ../src/flac_header.c:210
 #: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
 #: ../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:3368 ../src/scan.c:690
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding"
 msgstr ""
 "Ne mogu da pretvorim naziv datoteke „%s“ u kodiranje naziva datoteke sistema"
 
-#: ../src/et_core.c:3278
+#: ../src/et_core.c:3370
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Pokušavam da postavim promenljivu okruženja G_KODIRANJE_NAZIVADATOTEKE."
 
-#: ../src/et_core.c:3279 ../src/scan.c:692
+#: ../src/et_core.c:3371 ../src/scan.c:692
 msgid "Filename translation"
 msgstr "Prevod naziva datoteke"
 
-#: ../src/et_core.c:3940
-#, c-format
-msgid "Cannot change the permissions of file '%s' (%s)"
-msgstr "Ne mogu da promenim ovlašćenja datoteke „%s“ (%s)"
-
-#: ../src/et_core.c:3978
+#: ../src/et_core.c:4076
 #, c-format
 msgid "Error writing tag type %d to file %s (%s)"
 msgstr "Greška pisanja vrste oznake %d u datoteku %s (%s)"
@@ -2479,7 +2497,7 @@ msgstr "Greška pisanja vrste oznake %d u datoteku %s (%s)"
 #. 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/opus_header.c:237 ../src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Kanala:"
 
@@ -2488,7 +2506,7 @@ msgstr "Kanala:"
 msgid "Error while opening file: '%s' as FLAC (%s)."
 msgstr "Greška pri otvaranju datoteke: „%s“ kao 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 "
@@ -2507,7 +2525,7 @@ msgstr "Blok slike nije ispravan: „%s“"
 msgid "Error: Failed to write comments to file '%s' (%s)."
 msgstr "Greška: Nisam uspeo da upišem napomene u datoteku „%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 "Upisana je oznaka u „%s“"
@@ -2530,27 +2548,27 @@ msgstr ""
 msgid "Corrupted file"
 msgstr "Oštećena datoteka"
 
-#: ../src/id3_tag.c:540
+#: ../src/id3_tag.c:555
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Uklonjena je oznaka iz „%s“"
 
-#: ../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 "Greška pri uklanjanju ID3v1 oznake iz „%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 "Greška pri uklanjanju ID3v2 oznake iz „%s“ (%s)"
 
-#: ../src/id3_tag.c:565
+#: ../src/id3_tag.c:580
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Greška pri ažuriranju ID3v2 oznake u „%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"
@@ -2558,7 +2576,7 @@ msgstr ""
 "Pokušali ste da sačuvate ovu oznaku u Unikodu ali je otkriveno da vaše "
 "izdanje id3bibl ima grašaka"
 
-#: ../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 "
@@ -2577,90 +2595,90 @@ msgstr ""
 "\n"
 "Datoteka: %s"
 
-#: ../src/id3_tag.c:602
+#: ../src/id3_tag.c:617
 msgid "Buggy id3lib"
 msgstr "Loša id3bibl"
 
-#: ../src/id3_tag.c:636
+#: ../src/id3_tag.c:651
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Greška pri promeni ID3v1 oznake u „%s“ (%s)"
 
-#: ../src/id3_tag.c: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 u „%s“ je ažurirana"
 
-#: ../src/id3_tag.c:669
+#: ../src/id3_tag.c:684
 msgid "No error reported"
 msgstr "Nisu prijavljene greške"
 
-#: ../src/id3_tag.c:671
+#: ../src/id3_tag.c:686
 msgid "No available memory"
 msgstr "Nema dostupne memorije"
 
-#: ../src/id3_tag.c:673
+#: ../src/id3_tag.c:688
 msgid "No data to parse"
 msgstr "Nema podataka za obradu"
 
-#: ../src/id3_tag.c:675
+#: ../src/id3_tag.c:690
 msgid "Improperly formatted data"
 msgstr "Neispravno oblikovani podaci"
 
-#: ../src/id3_tag.c:677
+#: ../src/id3_tag.c:692
 msgid "No buffer to write to"
 msgstr "Nema međumemorije za upis"
 
-#: ../src/id3_tag.c:679
+#: ../src/id3_tag.c:694
 msgid "Buffer is too small"
 msgstr "Međumemorija je suviše mala"
 
-#: ../src/id3_tag.c:681
+#: ../src/id3_tag.c:696
 msgid "Invalid frame ID"
 msgstr "Neispravan ID okvira"
 
-#: ../src/id3_tag.c:683
+#: ../src/id3_tag.c:698
 msgid "Requested field not found"
 msgstr "Zatraženo polje nije nađeno"
 
-#: ../src/id3_tag.c:685
+#: ../src/id3_tag.c:700
 msgid "Unknown field type"
 msgstr "Nepoznata vrsta polja"
 
-#: ../src/id3_tag.c:687
+#: ../src/id3_tag.c:702
 msgid "Tag is already attached to a file"
 msgstr "Oznaka je već prikačena datoteci"
 
-#: ../src/id3_tag.c:689
+#: ../src/id3_tag.c:704
 msgid "Invalid tag version"
 msgstr "Neispravno izdanje oznake"
 
-#: ../src/id3_tag.c:691
+#: ../src/id3_tag.c:706
 msgid "No file to parse"
 msgstr "Nema datoteke za obradu"
 
-#: ../src/id3_tag.c:693
+#: ../src/id3_tag.c:708
 msgid "Attempting to write to a read-only file"
 msgstr "Pokušavam da upišem u datoteku samo za čitanje"
 
-#: ../src/id3_tag.c:695
+#: ../src/id3_tag.c:710
 msgid "Error in compression/uncompression"
 msgstr "Greška pri sažimanju/raspakivanju"
 
-#: ../src/id3_tag.c:697
+#: ../src/id3_tag.c:712
 msgid "Unknown error message"
 msgstr "Nepoznata poruka o grešci"
 
-#: ../src/id3_tag.c:1301
+#: ../src/id3_tag.c:1316
 #, c-format
 msgid "Error while creating temporary file: '%s'"
 msgstr "Greška prilikom stvaranja privremene datoteke: „%s“"
 
-#: ../src/id3_tag.c:1308
+#: ../src/id3_tag.c:1323
 msgid "Error while creating temporary file"
 msgstr "Greška prilikom stvaranja privremene datoteke"
 
-#: ../src/id3_tag.c:1328
+#: ../src/id3_tag.c:1343
 #, c-format
 msgid "Error while writing to file: '%s' (%s)"
 msgstr "Greška prilikom pisanja u datoteku: „%s“ (%s)"
@@ -2670,7 +2688,7 @@ msgstr "Greška prilikom pisanja u datoteku: „%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)"
@@ -2679,12 +2697,12 @@ msgstr[1] "Ne mogu da upišem oznaku u datoteku „%s“ (%s bajta nedostaju)"
 msgstr[2] "Ne mogu da upišem oznaku u datoteku „%s“ (%s bajtova nedostaje)"
 msgstr[3] "Ne mogu da upišem oznaku u datoteku „%s“ (%s)"
 
-#: ../src/id3v24_tag.c:1525
+#: ../src/id3v24_tag.c:1524
 #, c-format
 msgid "Cannot save tag of file '%s'"
 msgstr "Ne mogu da sačuvam oznaku datoteke „%s“"
 
-#: ../src/id3v24_tag.c:1536
+#: ../src/id3v24_tag.c:1535
 #, c-format
 msgid "Size error while saving tag of '%s'"
 msgstr "Greška veličine pri čuvanju oznake za „%s“"
@@ -2693,66 +2711,54 @@ msgstr "Greška veličine pri čuvanju oznake za „%s“"
 msgid "Log"
 msgstr "Dnevnik izmena"
 
-#: ../src/misc.c:691
-msgid "Select File"
-msgstr "Izaberite datoteku"
-
-#: ../src/misc.c:697
-msgid "Select Directory"
-msgstr "Izaberite direktorijum"
-
-#: ../src/misc.c:782
-msgid "No audio player defined"
-msgstr "Nije određen program za puštanje zvuka"
-
-#: ../src/misc.c:783
-msgid "Audio Player Warning"
-msgstr "Upozorenje programa za puštanje zvuka"
+#: ../src/misc.c:719
+msgid "You must type a program name"
+msgstr "Morate da unesete naziv programa"
 
-#. Translators: file size (bytes, kilobytes, megabytes, gigabytes,
-#. * terabytes).
-#: ../src/misc.c:1048 ../src/misc.c:1068
-msgid "B"
-msgstr "B"
+#: ../src/misc.c:720
+msgid "Program Name Error"
+msgstr "Greška naziva programa"
 
-#: ../src/misc.c:1048 ../src/misc.c:1068
-msgid "kB"
-msgstr "kB"
+#: ../src/misc.c:799
+#, c-format
+msgid "Executed command: %s"
+msgstr "Izvršena naredba: „%s“"
 
-#: ../src/misc.c:1048 ../src/misc.c:1068
-msgid "MB"
-msgstr "MB"
+#: ../src/misc.c:806
+#, c-format
+msgid "Failed to launch program: %s"
+msgstr "Nisam uspeo da pokrenem program: %s"
 
-#: ../src/misc.c:1048 ../src/misc.c:1068
-msgid "GB"
-msgstr "GB"
+#: ../src/misc.c:823
+msgid "Select File"
+msgstr "Izaberite datoteku"
 
-#: ../src/misc.c:1048 ../src/misc.c:1068
-msgid "TB"
-msgstr "TB"
+#: ../src/misc.c:829
+msgid "Select Directory"
+msgstr "Izaberite direktorijum"
 
-#: ../src/misc.c:1147
+#: ../src/misc.c:1141
 msgid "Generate Playlist"
 msgstr "Načini spisak numera"
 
-#: ../src/misc.c:1171
+#: ../src/misc.c:1165
 msgid "M3U Playlist Name"
 msgstr "Naziv M3U spiska numera"
 
-#: ../src/misc.c:1186
+#: ../src/misc.c:1180
 msgid "Use directory name"
 msgstr "Koristi naziv direktorijuma"
 
 #. Playlist options
-#: ../src/misc.c:1203
+#: ../src/misc.c:1197
 msgid "Playlist Options"
 msgstr "Opcije spiska numera"
 
-#: ../src/misc.c:1209
+#: ../src/misc.c:1203
 msgid "Include only the selected files"
 msgstr "Uključi samo izabrane datoteke"
 
-#: ../src/misc.c:1212
+#: ../src/misc.c:1206
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2760,80 +2766,80 @@ msgstr ""
 "Ukoliko je aktivirano, samo izabrane datoteke će biti upisane u spisak "
 "numera. U suprotnom, sve datoteke će biti upisane."
 
-#: ../src/misc.c:1215
+#: ../src/misc.c:1209
 msgid "Use full path for files in playlist"
 msgstr "Koristi pune putanje za datoteke u spisku numera"
 
-#: ../src/misc.c:1218
+#: ../src/misc.c:1212
 msgid "Use relative path for files in playlist"
 msgstr "Koristi relativne putanje za datoteke u spisku numera"
 
 #. Create playlist in parent directory
-#: ../src/misc.c:1224
+#: ../src/misc.c:1218
 msgid "Create playlist in the parent directory"
 msgstr "Načini spisak numera u roditeljskom direktorijumu"
 
-#: ../src/misc.c:1227
+#: ../src/misc.c:1221
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Ukoliko je aktivirano, spisak numera će biti načinjen u roditeljskom "
 "direktorijumu."
 
 #. DOS Separator
-#: ../src/misc.c:1231
+#: ../src/misc.c:1225
 msgid "Use DOS directory separator"
 msgstr "Koristi DOS-ov razdvajač datoteka"
 
-#: ../src/misc.c:1237
+#: ../src/misc.c:1231
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 "Ova opcija menja UNIKS-ov razdvajač datoteka „/“ u DOS-ov razdvajač „\\“."
 
-#: ../src/misc.c:1246
+#: ../src/misc.c:1240
 msgid "Playlist Content"
 msgstr "Sadržaj spiska numera"
 
-#: ../src/misc.c:1252
+#: ../src/misc.c:1246
 msgid "Write only list of files"
 msgstr "Upiši samo spisak datoteka"
 
-#: ../src/misc.c:1256
+#: ../src/misc.c:1250
 msgid "Write info using filename"
 msgstr "Upiši informacije koristeći naziv datoteke"
 
-#: ../src/misc.c:1259
+#: ../src/misc.c:1253
 msgid "Write info using:"
 msgstr "Upiši informacije koristeći:"
 
-#: ../src/misc.c:1478
+#: ../src/misc.c:1467
 #, c-format
 msgid "Cannot write playlist file '%s'"
 msgstr "Ne mogu da zapišem datoteku spiska numera „%s“"
 
-#: ../src/misc.c:1482
+#: ../src/misc.c:1471
 msgid "Playlist File Error"
 msgstr "Greška datoteke spiska numera"
 
-#: ../src/misc.c:1490
+#: ../src/misc.c:1479
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Datoteka spiska numera „%s“ je zapisana"
 
-#: ../src/misc.c:1554 ../src/scan.c:3247 ../src/scan.c:3309
+#: ../src/misc.c:1543 ../src/scan.c:3239 ../src/scan.c:3301
 msgid "Invalid scanner mask"
 msgstr "Neispravna maska pregledača"
 
-#: ../src/misc.c:1918
+#: ../src/misc.c:1907
 msgid "CD"
 msgstr "CD"
 
-#: ../src/misc.c:1940
+#: ../src/misc.c:1929
 msgid "Find Files"
 msgstr "Pronađite datoteke"
 
-#: ../src/misc.c:1972
+#: ../src/misc.c:1961
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2841,13 +2847,13 @@ msgstr ""
 "sve datoteke."
 
 #. Where...
-#: ../src/misc.c:1978
+#: ../src/misc.c:1967
 msgid "In:"
 msgstr "U:"
 
 #. Translators: This option is for the previous 'in' option. For instance,
 #. * translate this as "Search" "In:" "the Filename".
-#: ../src/misc.c:1983
+#: ../src/misc.c:1972
 msgid "the Filename"
 msgstr "nazivu datoteke"
 
@@ -2856,20 +2862,20 @@ msgstr "nazivu 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:1989
+#: ../src/misc.c:1978
 msgid "the Tag"
 msgstr "oznaci"
 
 #. Property of the search
-#: ../src/misc.c:2000 ../src/prefs.c:335
+#: ../src/misc.c:1989 ../src/prefs.c:335
 msgid "Case sensitive"
 msgstr "Razlikuj veličinu slova"
 
-#: ../src/misc.c:2227
+#: ../src/misc.c:2216
 msgid "Ready to search…"
 msgstr "Spreman sam za pretragu…"
 
-#: ../src/misc.c:2447
+#: ../src/misc.c:2436
 #, c-format
 msgid "Found one file"
 msgid_plural "Found %d files"
@@ -2878,63 +2884,63 @@ msgstr[1] "Pronašao sam %d datoteke"
 msgstr[2] "Pronašao sam %d datoteka"
 msgstr[3] "Pronašao sam: %d datoteku/e/a"
 
-#: ../src/misc.c:2732
+#: ../src/misc.c:2721
 msgid "Load Filenames From a Text File"
 msgstr "Učitaj nazive datoteka iz tekstualne datoteke"
 
-#: ../src/misc.c:2761
+#: ../src/misc.c:2750
 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:2780
+#: ../src/misc.c:2769
 msgid " Load "
 msgstr " Učitaj "
 
-#: ../src/misc.c:2798
+#: ../src/misc.c:2787
 msgid "Content of Text File"
 msgstr "Sadržaj tekstualne datoteke"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2819 ../src/misc.c:2914
+#: ../src/misc.c:2808 ../src/misc.c:2903
 msgid "Insert a blank line before the selected line"
 msgstr "Umetni prazan red pre izabranog"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2828 ../src/misc.c:2923
+#: ../src/misc.c:2817 ../src/misc.c:2912
 msgid "Delete the selected line"
 msgstr "Obriši izabrani red"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2837 ../src/misc.c:2932 ../src/misc.c:3418
+#: ../src/misc.c:2826 ../src/misc.c:2921 ../src/misc.c:3407
 msgid "Delete all blank lines"
 msgstr "Obriši sve prane redove"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2849 ../src/misc.c:2944
+#: ../src/misc.c:2838 ../src/misc.c:2933
 msgid "Move up the selected line"
 msgstr "Pomeri gore izabrani red"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2858 ../src/misc.c:2953
+#: ../src/misc.c:2847 ../src/misc.c:2942
 msgid "Move down the selected line"
 msgstr "Pomeri dole izabrani red"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2870 ../src/misc.c:2965 ../src/misc.c:3442
+#: ../src/misc.c:2859 ../src/misc.c:2954 ../src/misc.c:3431
 msgid "Reload"
 msgstr "Osveži"
 
-#: ../src/misc.c:2892
+#: ../src/misc.c:2881
 msgid "List of Files"
 msgstr "Spisak datoteka"
 
-#: ../src/misc.c:2987
+#: ../src/misc.c:2976
 msgid "Selected line:"
 msgstr "Izabrani red:"
 
-#: ../src/misc.c:3005
+#: ../src/misc.c:2994
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2942,34 +2948,34 @@ msgstr ""
 "Pokretanjem ove opcije, nakon učitavanja naziva datoteka, trenutno izabrani "
 "pregledač će biti pokrenut (prozor pregledača mora biti otvoren)."
 
-#: ../src/misc.c:3092
+#: ../src/misc.c:3081
 #, c-format
 msgid "Cannot retrieve file info (%s)"
 msgstr "Ne mogu da preuzmem podatke o datoteci (%s)"
 
-#: ../src/misc.c:3154
+#: ../src/misc.c:3143
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Ne mogu da otvorim datoteku „%s“ (%s)"
 
-#: ../src/misc.c:3190
+#: ../src/misc.c:3179
 #, c-format
 msgid "Error reading file (%s)"
 msgstr "Greška čitanja datoteke (%s)"
 
-#: ../src/misc.c:3406
+#: ../src/misc.c:3395
 msgid "Insert a blank line"
 msgstr "Umetnite prazan red"
 
-#: ../src/misc.c:3412
+#: ../src/misc.c:3401
 msgid "Delete this line"
 msgstr "Obrišite ovaj red"
 
-#: ../src/misc.c:3427
+#: ../src/misc.c:3416
 msgid "Move up this line"
 msgstr "Pomerite na gore ovaj red"
 
-#: ../src/misc.c:3433
+#: ../src/misc.c:3422
 msgid "Move down this line"
 msgstr "Pomerite na dole ovaj red"
 
@@ -3073,175 +3079,184 @@ msgstr ""
 msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
 msgstr "Greška: Nisam uspeo da otvorim datoteku: „%s“ kao Vorbis (%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 "Upozorenje: Ogg Vorbis datoteka „%s“ sadrži ID3v2 oznaku."
 
-#: ../src/picture.c:244 ../src/picture.c:269
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1257
 #, c-format
-msgid "Image file not loaded: %s"
-msgstr "Datoteka slike nije učitana: %s"
+msgid "Error with 'loader_write': %s"
+msgstr "Greška sa „učitavač_zapiši“: %s"
 
-#: ../src/picture.c:261
+#: ../src/ogg_tag.c:1050 ../src/picture.c:1180
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr "Greška sa „učitavač_zatvori“: %s"
+
+#: ../src/picture.c:104
+#, c-format
+msgid "Image file not saved: %s"
+msgstr "Datoteka slike nije sačuvana: %s"
+
+#: ../src/picture.c:154
 #, c-format
 msgid "Cannot open file: '%s'"
 msgstr "Ne mogu da otvorim datoteku: „%s“"
 
-#: ../src/picture.c:265
+#: ../src/picture.c:158
 msgid "Image File Error"
 msgstr "Greška datoteke slike"
 
-#: ../src/picture.c:276
+#: ../src/picture.c:162 ../src/picture.c:424
+#, c-format
+msgid "Image file not loaded: %s"
+msgstr "Datoteka slike nije učitana: %s"
+
+#: ../src/picture.c:446
 msgid "Image file loaded"
 msgstr "Datoteka slike je učitana"
 
-#: ../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:874
 msgid "All Files"
 msgstr "Sve datoteke"
 
-#: ../src/picture.c:350 ../src/picture.c:706
+#: ../src/picture.c:520 ../src/picture.c:880
 msgid "PNG and JPEG"
 msgstr "PNG i JPEG"
 
-#: ../src/picture.c:477
+#: ../src/picture.c:651
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Svojstva slike %d/%d"
 
-#: ../src/picture.c:501
+#: ../src/picture.c:675
 msgid "Image Type"
 msgstr "Vrsta slike"
 
 #. Description of the picture
-#: ../src/picture.c:560
+#: ../src/picture.c:734
 msgid "Image Description:"
 msgstr "Opis slike:"
 
-#: ../src/picture.c:687
+#: ../src/picture.c:861
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Sačuvaj sliku %d/%d"
 
-#: ../src/picture.c:759
-#, c-format
-msgid "Image file not saved: %s"
-msgstr "Datoteka slike nije sačuvana: %s"
-
-#: ../src/picture.c:827
+#: ../src/picture.c:1021
 msgid "JPEG image"
 msgstr "JPEG slika"
 
-#: ../src/picture.c:829
+#: ../src/picture.c:1023
 msgid "PNG image"
 msgstr "PNG slika"
 
-#: ../src/picture.c:831
+#: ../src/picture.c:1025
+msgid "GIF image"
+msgstr "GIF slika"
+
+#: ../src/picture.c:1027
 msgid "Unknown image"
 msgstr "Nepoznata slika"
 
-#: ../src/picture.c:843
+#: ../src/picture.c:1039
 msgid "32x32 pixel PNG file icon"
 msgstr "PNG ikonica, 32x32 tačkica"
 
-#: ../src/picture.c:845
+#: ../src/picture.c:1041
 msgid "Other file icon"
 msgstr "Ostale ikonice datoteke"
 
-#: ../src/picture.c:847
+#: ../src/picture.c:1043
 msgid "Cover (front)"
 msgstr "Omot (lice)"
 
-#: ../src/picture.c:849
+#: ../src/picture.c:1045
 msgid "Cover (back)"
 msgstr "Omot (poleđina)"
 
-#: ../src/picture.c:851
+#: ../src/picture.c:1047
 msgid "Leaflet page"
 msgstr "Strana sa letkom"
 
-#: ../src/picture.c:853
+#: ../src/picture.c:1049
 msgid "Media (e.g. label side of CD)"
 msgstr "Medijum (npr. strana sa natpisom CD-a)"
 
-#: ../src/picture.c:855
+#: ../src/picture.c:1051
 msgid "Lead artist/lead performer/soloist"
 msgstr "Vodeći umetnik/vodeći izvođač/solista"
 
-#: ../src/picture.c:857
+#: ../src/picture.c:1053
 msgid "Artist/performer"
 msgstr "Umetnik/Izvođač"
 
-#: ../src/picture.c:859
+#: ../src/picture.c:1055
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: ../src/picture.c:861
+#: ../src/picture.c:1057
 msgid "Band/Orchestra"
 msgstr "Bend/Orkestar"
 
-#: ../src/picture.c:865
+#: ../src/picture.c:1061
 msgid "Lyricist/text writer"
 msgstr "Pisac tekstova"
 
-#: ../src/picture.c:867
+#: ../src/picture.c:1063
 msgid "Recording location"
 msgstr "Mesto snimanja"
 
-#: ../src/picture.c:869
+#: ../src/picture.c:1065
 msgid "During recording"
 msgstr "U toku snimanja"
 
-#: ../src/picture.c:871
+#: ../src/picture.c:1067
 msgid "During performance"
 msgstr "U toku izvođenja"
 
-#: ../src/picture.c:873
+#: ../src/picture.c:1069
 msgid "Movie/video screen capture"
 msgstr "Film/Video zapis"
 
-#: ../src/picture.c:875
+#: ../src/picture.c:1071
 msgid "A bright colored fish"
 msgstr "Svetlo obojena riba"
 
-#: ../src/picture.c:877
+#: ../src/picture.c:1073
 msgid "Illustration"
 msgstr "Ilustracija"
 
-#: ../src/picture.c:879
+#: ../src/picture.c:1075
 msgid "Band/Artist logotype"
 msgstr "Logo benda/izvođača"
 
-#: ../src/picture.c:881
+#: ../src/picture.c:1077
 msgid "Publisher/studio logotype"
 msgstr "Logo izdavača/studija"
 
-#: ../src/picture.c:885
+#: ../src/picture.c:1081
 msgid "Unknown image type"
 msgstr "Nepoznata vrsta slike"
 
-#: ../src/picture.c:915 ../src/picture.c:926
+#: ../src/picture.c:1111 ../src/picture.c:1122
 msgid "pixels"
 msgstr "tačkica"
 
-#: ../src/picture.c:916 ../src/picture.c:927
+#: ../src/picture.c:1112 ../src/picture.c:1123
 msgid "Type"
 msgstr "Vrsta"
 
-#: ../src/picture.c:928
+#: ../src/picture.c:1124
 msgid "Description"
 msgstr "Opis"
 
-#: ../src/picture.c:984
-#, c-format
-msgid "Error with 'loader_close': %s"
-msgstr "Greška sa „učitavač_zatvori“: %s"
-
-#: ../src/picture.c:1044
+#: ../src/picture.c:1240
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
@@ -3249,26 +3264,21 @@ msgstr ""
 "Ne mogu da prikažem sliku jer je nedovoljno podataka učitano da bih znao kako "
 "da napravim međumemoriju slike."
 
-#: ../src/picture.c:1051
+#: ../src/picture.c:1247
 msgid "Cannot display the image"
 msgstr "Ne mogu da prikažem sliku"
 
-#: ../src/picture.c:1053
+#: ../src/picture.c:1249
 msgid ""
 "Not enough data has been read to determine how to create the image buffer."
 msgstr ""
 "Nije pročitano dovoljno podataka da bih odredio kako da napravim međumemoriju "
 "slike."
 
-#: ../src/picture.c:1055
+#: ../src/picture.c:1251
 msgid "Load Image File"
 msgstr "Učitaj datoteku slike"
 
-#: ../src/picture.c:1061
-#, c-format
-msgid "Error with 'loader_write': %s"
-msgstr "Greška sa „učitavač_zapiši“: %s"
-
 #. Label
 #: ../src/prefs.c:152
 msgid "Default directory:"
@@ -4319,11 +4329,11 @@ msgstr "Postavke su sačuvane"
 msgid "Configuration unchanged"
 msgstr "Postavke nisu menjane"
 
-#: ../src/prefs.c:1707
+#: ../src/prefs.c:1712
 msgid "The selected path for 'Default path to files' is invalid"
 msgstr "Izabrana putanja za „Osnovna putanja do datoteka“ nije ispravna"
 
-#: ../src/prefs.c:1708
+#: ../src/prefs.c:1714
 #, c-format
 msgid ""
 "Path: '%s'\n"
@@ -4332,16 +4342,16 @@ msgstr ""
 "Putanja: „%s“\n"
 "Greška: %s"
 
-#: ../src/prefs.c:1709
+#: ../src/prefs.c:1716
 msgid "Invalid Path Error"
 msgstr "Greška neispravne putanje"
 
-#: ../src/prefs.c:1823
+#: ../src/prefs.c:1830
 #, c-format
 msgid "The audio file player '%s' cannot be found"
 msgstr "Ne mogu da pronađem program za puštanje zvuka „%s“"
 
-#: ../src/prefs.c:1825
+#: ../src/prefs.c:1832
 msgid "Audio Player Error"
 msgstr "Greška programa za puštanje zvuka"
 
@@ -4383,43 +4393,43 @@ msgstr "Novi naziv datoteke je uspešno skeniran"
 msgid "New filename successfully scanned: %s"
 msgstr "Novi naziv datoteke je uspešno skeniran: %s"
 
-#: ../src/scan.c:1817
+#: ../src/scan.c:1821
 #, c-format
 msgid "Error while processing fields: %s"
 msgstr "Greška prilikom obrade polja: %s"
 
 #. The window
-#: ../src/scan.c:2336
+#: ../src/scan.c:2328
 msgid "Tag and Filename Scan"
 msgstr "Pregledač oznaka i naziva datoteka"
 
 #. TODO: Set related action to match AM_SCAN_FILES.
-#: ../src/scan.c:2345
+#: ../src/scan.c:2337
 msgid "Scan Files"
 msgstr "Pregledaj datoteke"
 
 #. Option Menu
-#: ../src/scan.c:2373
+#: ../src/scan.c:2365
 msgid "Scanner:"
 msgstr "Pregledač:"
 
-#: ../src/scan.c:2394
+#: ../src/scan.c:2386
 msgid "Select the type of scanner to use"
 msgstr "Izaberi vrstu pregledača za upotrebu"
 
-#: ../src/scan.c:2403
+#: ../src/scan.c:2395
 msgid "Scanner Preferences"
 msgstr "Postavke pregledača"
 
-#: ../src/scan.c:2412
+#: ../src/scan.c:2404
 msgid "Show / Hide Masks Editor"
 msgstr "Prikaži / Sakrij uređivač maski"
 
-#: ../src/scan.c:2422
+#: ../src/scan.c:2414
 msgid "Show / Hide Legend"
 msgstr "Prikaži / Sakrij legendu"
 
-#: ../src/scan.c:2452
+#: ../src/scan.c:2444
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse filename and "
 "path. Used to fill in tag fields"
@@ -4428,15 +4438,15 @@ msgstr ""
 "datoteke i putanje. Koristi se za popunjavanje polja oznaka."
 
 #. Preview label
-#: ../src/scan.c:2476
+#: ../src/scan.c:2468
 msgid "Fill tag preview"
 msgstr "Pregled popunjavanja oznake"
 
-#: ../src/scan.c:2506
+#: ../src/scan.c:2498
 msgid "Prefix mask with current path"
 msgstr "Maska prefiksa sa trenutnom putanjom"
 
-#: ../src/scan.c:2520
+#: ../src/scan.c:2512
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4449,15 +4459,15 @@ msgstr ""
 "suprotnom je relativna prema staroj putanji."
 
 #. Preview label
-#: ../src/scan.c:2545
+#: ../src/scan.c:2537
 msgid "Rename file preview"
 msgstr "Pregled preimenovanja datoteke"
 
-#: ../src/scan.c:2564
+#: ../src/scan.c:2556
 msgid "Select fields:"
 msgstr "Izaberi polja:"
 
-#: ../src/scan.c:2567
+#: ../src/scan.c:2559
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those which interest you"
@@ -4466,134 +4476,134 @@ msgstr ""
 "vam trebaju."
 
 #. Advice for Translators: set the first letter of filename translated
-#: ../src/scan.c:2571
+#: ../src/scan.c:2563
 msgid "F"
 msgstr "D"
 
-#: ../src/scan.c:2573
+#: ../src/scan.c:2565
 msgid "Process filename field"
 msgstr "Obradite polje naziva datoteke"
 
 #. Advice for Translators: set the first letter of title translated
-#: ../src/scan.c:2575
+#: ../src/scan.c:2567
 msgid "T"
 msgstr "N"
 
-#: ../src/scan.c:2576
+#: ../src/scan.c:2568
 msgid "Process title field"
 msgstr "Obradite polje naslova"
 
 #. Advice for Translators: set the first letter of artist translated
-#: ../src/scan.c:2578
+#: ../src/scan.c:2570
 msgid "Ar"
 msgstr "I"
 
-#: ../src/scan.c:2579
+#: ../src/scan.c:2571
 msgid "Process file artist field"
 msgstr "Obradite polje izvođača"
 
 #. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan.c:2581
+#: ../src/scan.c:2573
 msgid "AA"
 msgstr "IA"
 
-#: ../src/scan.c:2582
+#: ../src/scan.c:2574
 msgid "Process album artist field"
 msgstr "Obradite polje izvođača albuma"
 
 #. Advice for Translators: set the first letter of album translated
-#: ../src/scan.c:2584
+#: ../src/scan.c:2576
 msgid "Al"
 msgstr "A"
 
-#: ../src/scan.c:2585
+#: ../src/scan.c:2577
 msgid "Process album field"
 msgstr "Obradite polje albuma"
 
 #. Advice for Translators: set the first letter of genre translated
-#: ../src/scan.c:2587
+#: ../src/scan.c:2579
 msgid "G"
 msgstr "Ž"
 
-#: ../src/scan.c:2588
+#: ../src/scan.c:2580
 msgid "Process genre field"
 msgstr "Obradite polje žanra"
 
 #. Advice for Translators: set the first letter of comment translated
-#: ../src/scan.c:2590
+#: ../src/scan.c:2582
 msgid "Cm"
 msgstr "Np"
 
-#: ../src/scan.c:2591
+#: ../src/scan.c:2583
 msgid "Process comment field"
 msgstr "Obradite polje komentara"
 
 #. Advice for Translators: set the first letter of composer translated
-#: ../src/scan.c:2593
+#: ../src/scan.c:2585
 msgid "Cp"
 msgstr "Kp"
 
-#: ../src/scan.c:2594
+#: ../src/scan.c:2586
 msgid "Process composer field"
 msgstr "Obradite polje kompozitora"
 
 #. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan.c:2596
+#: ../src/scan.c:2588
 msgid "O"
 msgstr "O"
 
-#: ../src/scan.c:2597
+#: ../src/scan.c:2589
 msgid "Process original artist field"
 msgstr "Obradite polje originalnog izvođača"
 
 #. Advice for Translators: set the first letter of copyright translated
-#: ../src/scan.c:2599
+#: ../src/scan.c:2591
 msgid "Cr"
 msgstr "Ap"
 
-#: ../src/scan.c:2600
+#: ../src/scan.c:2592
 msgid "Process copyright field"
 msgstr "Obradite polje autorskih prava"
 
 #. Advice for Translators: set the first letter of URL translated
-#: ../src/scan.c:2602
+#: ../src/scan.c:2594
 msgid "U"
 msgstr "Ad"
 
-#: ../src/scan.c:2603
+#: ../src/scan.c:2595
 msgid "Process URL field"
 msgstr "Obradite polje adrese"
 
 #. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan.c:2605
+#: ../src/scan.c:2597
 msgid "E"
 msgstr "Kd"
 
-#: ../src/scan.c:2606
+#: ../src/scan.c:2598
 msgid "Process encoder name field"
 msgstr "Obradite polje naziva enkodera"
 
-#: ../src/scan.c:2650
+#: ../src/scan.c:2642
 msgid "Invert selection"
 msgstr "Preokreni izbor"
 
-#: ../src/scan.c:2657
+#: ../src/scan.c:2649
 msgid "Select/Unselect all"
 msgstr "Označi/odznači sve"
 
-#: ../src/scan.c:2672
+#: ../src/scan.c:2664
 msgid "Convert:"
 msgstr "Pretvori:"
 
-#: ../src/scan.c:2674
+#: ../src/scan.c:2666
 msgid "to: "
 msgstr "u: "
 
-#: ../src/scan.c:2681
+#: ../src/scan.c:2673
 msgid "Do not convert"
 msgstr "Ne pretvaraj"
 
-#: ../src/scan.c:2700
+#: ../src/scan.c:2692
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4601,7 +4611,7 @@ msgstr ""
 "Donje crtice i znak „%20“ između reči će biti zamenjeni razmakom. Na primer "
 "„Tekst%20u%20nekom_polju“ će postati „Tekst u nekom polju“."
 
-#: ../src/scan.c:2703
+#: ../src/scan.c:2695
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4609,38 +4619,38 @@ msgstr ""
 "Razmak između reči biće zamenjen donjom crticom. Na primer „Tekst u nekom "
 "polju“ će postati „Tekst_u_nekom_polju“."
 
-#: ../src/scan.c:2706
+#: ../src/scan.c:2698
 msgid ""
 "Replace a string by another one. Note that the search is case sensitive."
 msgstr ""
 "Zamenite jednu nisku drugom. Znajte da je pretraga osetljiva na veličinu "
 "slova."
 
-#: ../src/scan.c:2713
+#: ../src/scan.c:2705
 msgid "Capitalize all"
 msgstr "Sva slova velika"
 
-#: ../src/scan.c:2715
+#: ../src/scan.c:2707
 msgid "Lowercase all"
 msgstr "Sva slova mala"
 
-#: ../src/scan.c:2717
+#: ../src/scan.c:2709
 msgid "Capitalize first letter"
 msgstr "Prvo slovo veliko"
 
-#: ../src/scan.c:2719
+#: ../src/scan.c:2711
 msgid "Capitalize the first letter of each word"
 msgstr "Prvo slovo svake reči veliko"
 
-#: ../src/scan.c:2720
+#: ../src/scan.c:2712
 msgid "Detect Roman numerals"
 msgstr "Otkrij rimske brojeve"
 
-#: ../src/scan.c:2722
+#: ../src/scan.c:2714
 msgid "Do not change capitalization"
 msgstr "Ne menjaj veličinu slova"
 
-#: ../src/scan.c:2744
+#: ../src/scan.c:2736
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4648,7 +4658,7 @@ msgstr ""
 "Sve reči u poljima ispiši velikim slovima. Na primer „Tekst U NEKOM polju“ će "
 "postati „TEKST U NEKOM POLJU“."
 
-#: ../src/scan.c:2747
+#: ../src/scan.c:2739
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4656,7 +4666,7 @@ msgstr ""
 "Sve reči u poljima ispiši malim slovima. Na primer „TEKST U nekom polju“ će "
 "postati „tekst u nekom polju“."
 
-#: ../src/scan.c:2750
+#: ../src/scan.c:2742
 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'."
@@ -4664,7 +4674,7 @@ msgstr ""
 "Prvo slovo svakog polja promeni u veliko. Na primer „tekst U Nekom POLJU“ će "
 "postati „Tekst u nekom polju“."
 
-#: ../src/scan.c:2753
+#: ../src/scan.c:2745
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4672,7 +4682,7 @@ msgstr ""
 "Svako prvo slovo reči u poljima promeni u veliko. Na primer „Tekst u nekom "
 "POLJU“ će postati „Tekst U Nekom Polju“."
 
-#: ../src/scan.c:2756
+#: ../src/scan.c:2748
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -4680,19 +4690,19 @@ msgstr ""
 "Primorava pretvaranje rimskih brojeva u velika slova. Na primer „ix. tekst u "
 "nekom polju“ će postati „IX. tekst u nekom polju“."
 
-#: ../src/scan.c:2764
+#: ../src/scan.c:2756
 msgid "Insert a space before uppercase letters"
 msgstr "Ubaci razmak pre velikog slova"
 
-#: ../src/scan.c:2766
+#: ../src/scan.c:2758
 msgid "Remove duplicate spaces and underscores"
 msgstr "Ukloni duple razmake i donje crtice"
 
-#: ../src/scan.c:2768
+#: ../src/scan.c:2760
 msgid "Do not change word separators"
 msgstr "Ne menjaj razdvajače reči"
 
-#: ../src/scan.c:2782
+#: ../src/scan.c:2774
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4700,7 +4710,7 @@ msgstr ""
 "Uklanja sve razmake između reči. Na primer „Tekst U Nekom Polju“ će postati "
 "„TekstUNekomPolju“."
 
-#: ../src/scan.c:2785
+#: ../src/scan.c:2777
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4708,7 +4718,7 @@ msgstr ""
 "Dodaje razmak pre svakog velikog slova. Na primer „TekstUNekomPolju“ će "
 "postati „Tekst U Nekom Polju“."
 
-#: ../src/scan.c:2788
+#: ../src/scan.c:2780
 msgid ""
 "Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4719,141 +4729,141 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2795
+#: ../src/scan.c:2787
 msgid "Legend"
 msgstr "Legenda"
 
-#: ../src/scan.c:2801
+#: ../src/scan.c:2793
 #, c-format
 msgid "%a: artist"
 msgstr "%a: izvođač"
 
-#: ../src/scan.c:2804
+#: ../src/scan.c:2796
 msgid "%z: album artist"
 msgstr "%z: izvođač albuma"
 
-#: ../src/scan.c:2807
+#: ../src/scan.c:2799
 msgid "%b: album"
 msgstr "%b: album"
 
-#: ../src/scan.c:2810
+#: ../src/scan.c:2802
 #, c-format
 msgid "%c: comment"
 msgstr "%c: komentar"
 
-#: ../src/scan.c:2813
+#: ../src/scan.c:2805
 #, c-format
 msgid "%p: composer"
 msgstr "%p: kompozitor"
 
-#: ../src/scan.c:2816
+#: ../src/scan.c:2808
 msgid "%r: copyright"
 msgstr "%r: autorsko pravo"
 
-#: ../src/scan.c:2819
+#: ../src/scan.c:2811
 #, c-format
 msgid "%d: disc number"
 msgstr "%d: broj CD-a"
 
-#: ../src/scan.c:2822
+#: ../src/scan.c:2814
 #, c-format
 msgid "%e: encoded by"
 msgstr "%e: kodirano pomoću"
 
-#: ../src/scan.c:2825
+#: ../src/scan.c:2817
 #, c-format
 msgid "%g: genre"
 msgstr "%g: žanr"
 
-#: ../src/scan.c:2828
+#: ../src/scan.c:2820
 #, c-format
 msgid "%i: ignored"
 msgstr "%i: zanemareno"
 
-#: ../src/scan.c:2831
+#: ../src/scan.c:2823
 msgid "%l: number of tracks"
 msgstr "%l: broj numera"
 
-#: ../src/scan.c:2834
+#: ../src/scan.c:2826
 #, c-format
 msgid "%o: orig. artist"
 msgstr "%o: orig. izvođač"
 
-#: ../src/scan.c:2837
+#: ../src/scan.c:2829
 #, c-format
 msgid "%n: track"
 msgstr "%n: numera"
 
-#: ../src/scan.c:2840
+#: ../src/scan.c:2832
 msgid "%t: title"
 msgstr "%t: naslov"
 
-#: ../src/scan.c:2843
+#: ../src/scan.c:2835
 #, c-format
 msgid "%u: URL"
 msgstr "%u: adresa"
 
-#: ../src/scan.c:2846
+#: ../src/scan.c:2838
 #, c-format
 msgid "%x: number of discs"
 msgstr "%x: broj diskova"
 
-#: ../src/scan.c:2849
+#: ../src/scan.c:2841
 msgid "%y: year"
 msgstr "%y: godina"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2856
+#: ../src/scan.c:2848
 msgid "Mask Editor"
 msgstr "Uređivač maski"
 
-#: ../src/scan.c:2910
+#: ../src/scan.c:2902
 msgid "Create New Mask"
 msgstr "Napravi novu masku"
 
-#: ../src/scan.c:2920
+#: ../src/scan.c:2912
 msgid "Move Up this Mask"
 msgstr "Pomeri masku nagore"
 
-#: ../src/scan.c:2930
+#: ../src/scan.c:2922
 msgid "Move Down this Mask"
 msgstr "Pomeri masku nadole"
 
-#: ../src/scan.c:2940
+#: ../src/scan.c:2932
 msgid "Duplicate Mask"
 msgstr "Razmnoži masku"
 
-#: ../src/scan.c:2950
+#: ../src/scan.c:2942
 msgid "Add Default Masks"
 msgstr "Dodaj osnovnu masku"
 
-#: ../src/scan.c:2960
+#: ../src/scan.c:2952
 msgid "Remove Mask"
 msgstr "Ukloni masku"
 
-#: ../src/scan.c:2970
+#: ../src/scan.c:2962
 msgid "Save Masks"
 msgstr "Sačuvaj masku"
 
-#: ../src/scan.c:3550
+#: ../src/scan.c:3542
 msgid "New_mask"
 msgstr "Nova _maska"
 
-#: ../src/scan.c:3589
+#: ../src/scan.c:3581
 msgid "Copy: No row selected"
 msgstr "Umnoži: Nije izabran red"
 
-#: ../src/scan.c:3682
+#: ../src/scan.c:3674
 msgid "Remove: No row selected"
 msgstr "Ukloni: Nije izabran red"
 
-#: ../src/scan.c:3729
+#: ../src/scan.c:3721
 msgid "Move Up: No row selected"
 msgstr "Pomeri gore: Nije izabran red"
 
-#: ../src/scan.c:3773
+#: ../src/scan.c:3765
 msgid "Move Down: No row selected"
 msgstr "Pomeri dole: Nije izabran red"
 
@@ -4867,114 +4877,59 @@ msgstr "Greška: Ne mogu da upišem datoteku podešavanja: %s (%s)"
 msgid "Error while writing configuration file: %s"
 msgstr "Greška prilikom pisanja datoteke podešavanja: „%s“"
 
-#: ../src/setting.c:1104
+#: ../src/setting.c:1100
 #, c-format
 msgid "Cannot open configuration file '%s' (%s)"
 msgstr "Ne mogu da otvorim datoteku podešavanja „%s“ (%s)"
 
-#: ../src/setting.c:1106
+#: ../src/setting.c:1102
 msgid "Loading default configuration"
 msgstr "Učitavam osnovno podešavanje"
 
-#: ../src/setting.c:1147
+#: ../src/setting.c:1143
 #, c-format
 msgid "Cannot create or open file '%s' (%s)"
 msgstr "Ne mogu da napravim ili otvorim datoteku „%s“ (%s)"
 
-#: ../src/setting.c:1207
+#: ../src/setting.c:1203
 #, c-format
 msgid "Error: Cannot write list to file: %s (%s)"
 msgstr "Greška: Ne mogu da upišem spisak u datoteku: %s (%s)"
 
-#: ../src/setting.c:1225
+#: ../src/setting.c:1221
 #, c-format
 msgid "Error while writing list file: %s"
 msgstr "Greška prilikom pisanja datoteke spiska: „%s“"
 
 #. Fall back to defaults
-#: ../src/setting.c:1305
+#: ../src/setting.c:1301
 msgid "Loading default 'Fill Tag' masks…"
 msgstr "Učitavam osnovne maske za „Popuni oznaku“…"
 
 #. Fall back to defaults
-#: ../src/setting.c:1335
+#: ../src/setting.c:1331
 msgid "Loading default 'Rename File' masks…"
 msgstr "Učitavam osnovne maske za „Preimenuj datoteku“…"
 
 #. Fall back to defaults
-#: ../src/setting.c:1361
+#: ../src/setting.c:1357
 msgid "Loading default 'Rename Directory' masks…"
 msgstr "Učitavam osnovne maske za „Preimenuj direktorijum“…"
 
-#: ../src/setting.c:1572
+#: ../src/setting.c:1568
 #, c-format
 msgid "Migrating configuration from directory '%s' to '%s'"
 msgstr "Selim podešavanja iz direktorijuma „%s“ u „%s“"
 
-#: ../src/setting.c:1596
+#: ../src/setting.c:1592
 #, c-format
 msgid "Failed to migrate configuration file '%s'"
 msgstr "Nisam uspeo da preselim datoteku podešavanja „%s“"
 
-#: ../src/setting.c:1633
+#: ../src/setting.c:1629
 #, c-format
 msgid "Error: Cannot create directory '%s' (%s)"
 msgstr "Greška: Ne mogu da napravim direktorijum „%s“ (%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“ nije već učitan. Pokušajte da ga učitate..."
-
-#. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: ../src/win32/win32dep.c:130
-#, c-format
-msgid "DLL '%s' could not be loaded"
-msgstr "DLL „%s“ ne može biti učitan"
-
-#. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: ../src/win32/win32dep.c:140
-#, c-format
-msgid "This version of '%s' contains '%s'"
-msgstr "Ovo izdanje „%s“-a sadrži „%s“"
-
-#. 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 "Funkcija „%s“ nije nađena u DLL-u „%s“"
-
-#. 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 "Direktorijum podešavanja: „%s“"
-
-#. Log_Print(_("weasytag_init start..."));
-#: ../src/win32/win32dep.c:472
-#, c-format
-msgid "weasytag_init start..."
-msgstr "„weasytag_init“ početak..."
-
-#. 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 "Izdanje Gbibl-a: %u.%u.%u\n"
-
-#. Set Environmental Variables
-#. Log_Print(_("weasytag_init end..."));
-#: ../src/win32/win32dep.c:496
-#, c-format
-msgid "weasytag_init end..."
-msgstr "„weasytag_init“ kraj..."
-
-#. Log_Print(_("Audio player: '%s'"), player);
-#: ../src/win32/win32dep.c:620
-#, c-format
-msgid "Audio player: '%s'"
-msgstr "Program za puštanje zvuka: „%s“"
+#~ msgid "The program '%s' cannot be found"
+#~ msgstr "Ne mogu da pronađem program „%s“"
diff --git a/po/ca.po b/po/te.po
similarity index 59%
copy from po/ca.po
copy to po/te.po
index 6a081cf..3dd299f 100644
--- a/po/ca.po
+++ b/po/te.po
@@ -1,23 +1,42 @@
-# Catalan translation of easytag.
-# Copyright © 2013 Free Software Foundation, Inc.
+# Telugu translation for easytag.
+# Copyright (C) 2014 easytag's COPYRIGHT HOLDER
 # This file is distributed under the same license as the easytag package.
-# Jordi Mas i Hernàndez <jmas at softcatala.org>, 2013.
-# Gil Forcada <gilforcada at guifi.net>, 2013.
+# Praveen Illa <mail2ipn at gmail.com>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: easytag\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-19 14:00+0000\n"
-"PO-Revision-Date: 2013-04-19 21:36+0200\n"
-"Last-Translator: Gil Forcada <gilforcada at guifi.net>\n"
-"Language-Team: Catalan <tradgnome at softcatala.org>\n"
-"Language: ca\n"
+"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: 2014-04-10 19:13+0000\n"
+"PO-Revision-Date: 2014-04-11 02:41+0530\n"
+"Last-Translator: Praveen Illa <mail2ipn at gmail.com>\n"
+"Language-Team: Telugu <indlinux-telugu at lists.sourceforge.net>\n"
+"Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
+"X-Poedit-Bookmarks: -1,516,-1,-1,-1,-1,-1,-1,-1,-1\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 ""
 
 #: ../data/easytag.desktop.in.h:1
 msgid "Sound File Metadata Editor"
@@ -30,9 +49,9 @@ msgstr ""
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/easytag.desktop.in.h:4
 msgid "mp3;tag;audio;"
-msgstr "mp3;etiqueta;àudio;"
+msgstr ""
 
-#: ../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 "
@@ -49,754 +68,768 @@ msgid ""
 msgstr ""
 
 #. Translators: put your own name here to appear in the about dialog.
-#: ../src/about.c:108
+#: ../src/about.c:106
 msgid "translator-credits"
-msgstr "Jordi Mas i Hernàndez <jmas at softcatala.org>"
+msgstr "Praveen Illa <mail2ipn at gmail.com>, 2014."
 
-#: ../src/about.c:118
+#: ../src/about.c:116
 msgid "View and edit tags in audio files"
 msgstr ""
 
 #. g_print(_("Error while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: ../src/ape_tag.c:62 ../src/et_core.c:4570 ../src/flac_header.c:108
-#: ../src/id3_tag.c:150 ../src/id3_tag.c:1210 ../src/id3v24_tag.c:114
-#: ../src/misc.c:1783 ../src/mp4_header.c:64 ../src/mp4_tag.c:72
-#: ../src/mp4_tag.c:83 ../src/mp4_tag.c:204 ../src/mp4_tag.c:213
-#: ../src/ogg_header.c:70 ../src/ogg_header.c:171 ../src/ogg_tag.c:145
-#: ../src/ogg_tag.c:650
+#: ../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
 #, c-format
 msgid "Error while opening file: '%s' (%s)."
 msgstr ""
 
-#. FIXME: Translators should not have to deal with this!
-#: ../src/application.c:54
-#, c-format
-msgid ""
-"\n"
-"Usage: easytag [option] \n"
-"   or: easytag [directory]\n"
-"\n"
-"Option:\n"
-"-------\n"
-"-h, --help        Display this text and exit.\n"
-"-v, --version     Print basic information and exit.\n"
-"\n"
-"Directory:\n"
-"----------\n"
-"%s/path_to/files  Use an absolute path to load,\n"
-"path_to/files     Use a relative path.\n"
-"\n"
+#: ../src/application.c:37
+msgid "Print the version and exit"
 msgstr ""
 
-#: ../src/application.c:119
+#: ../src/application.c:89
 #, c-format
 msgid "Website: %s"
+msgstr "జాలగూడు: %s"
+
+#: ../src/application.c:98
+msgid "- Tag and rename audio files"
 msgstr ""
 
 #.
 #. * Main Menu Actions
 #.
-#: ../src/bar.c:138
+#: ../src/bar.c:155
 msgid "_File"
-msgstr "_Fitxer"
+msgstr "దస్త్రం (_F)"
 
-#: ../src/bar.c:139
-msgid "Sort list by tag"
-msgstr ""
+#: ../src/bar.c:156
+msgid "Sort List by Tag"
+msgstr "కొసను బట్టి జాబితాను క్రమపరుచు"
 
-#: ../src/bar.c:140
-msgid "Sort list by property"
-msgstr ""
+#: ../src/bar.c:159
+msgid "Sort List by Property"
+msgstr "లక్షణం బట్టి జాబితాను క్రమపరుచు"
 
-#: ../src/bar.c:141
+#: ../src/bar.c:160
 msgid "Ascending by filename"
 msgstr ""
 
-#: ../src/bar.c:142
+#: ../src/bar.c:161
 msgid "Descending by filename"
 msgstr ""
 
-#: ../src/bar.c:143
+#: ../src/bar.c:162
 msgid "Ascending by creation date"
 msgstr ""
 
-#: ../src/bar.c:144
+#: ../src/bar.c:163
 msgid "Descending by creation date"
 msgstr ""
 
-#: ../src/bar.c:145
+#: ../src/bar.c:164
 msgid "Ascending by track number"
 msgstr ""
 
-#: ../src/bar.c:146
+#: ../src/bar.c:165
 msgid "Descending by track number"
 msgstr ""
 
-#: ../src/bar.c:147
+#: ../src/bar.c:166
 msgid "Ascending by title"
 msgstr ""
 
-#: ../src/bar.c:148
+#: ../src/bar.c:167
 msgid "Descending by title"
 msgstr ""
 
-#: ../src/bar.c:149
+#: ../src/bar.c:168
 msgid "Ascending by artist"
 msgstr ""
 
-#: ../src/bar.c:150
+#: ../src/bar.c:169
 msgid "Descending by artist"
 msgstr ""
 
-#: ../src/bar.c:151
+#: ../src/bar.c:170
 msgid "Ascending by album artist"
 msgstr ""
 
-#: ../src/bar.c:152
+#: ../src/bar.c:171
 msgid "Descending by album artist"
 msgstr ""
 
-#: ../src/bar.c:153
+#: ../src/bar.c:172
 msgid "Ascending by album"
 msgstr ""
 
-#: ../src/bar.c:154
+#: ../src/bar.c:173
 msgid "Descending by album"
 msgstr ""
 
-#: ../src/bar.c:155
+#: ../src/bar.c:174
 msgid "Ascending by year"
 msgstr ""
 
-#: ../src/bar.c:156
+#: ../src/bar.c:175
 msgid "Descending by year"
 msgstr ""
 
-#: ../src/bar.c:157
+#: ../src/bar.c:176
 msgid "Ascending by genre"
 msgstr ""
 
-#: ../src/bar.c:158
+#: ../src/bar.c:177
 msgid "Descending by genre"
 msgstr ""
 
-#: ../src/bar.c:159
+#: ../src/bar.c:178
 msgid "Ascending by comment"
 msgstr ""
 
-#: ../src/bar.c:160
+#: ../src/bar.c:179
 msgid "Descending by comment"
 msgstr ""
 
-#: ../src/bar.c:161
+#: ../src/bar.c:180
 msgid "Ascending by composer"
 msgstr ""
 
-#: ../src/bar.c:162
+#: ../src/bar.c:181
 msgid "Descending by composer"
 msgstr ""
 
-#: ../src/bar.c:163
+#: ../src/bar.c:182
 msgid "Ascending by original artist"
 msgstr ""
 
-#: ../src/bar.c:164
+#: ../src/bar.c:183
 msgid "Descending by original artist"
 msgstr ""
 
-#: ../src/bar.c:165
+#: ../src/bar.c:184
 msgid "Ascending by copyright"
 msgstr ""
 
-#: ../src/bar.c:166
+#: ../src/bar.c:185
 msgid "Descending by copyright"
 msgstr ""
 
-#: ../src/bar.c:167
+#: ../src/bar.c:186
 msgid "Ascending by URL"
 msgstr ""
 
-#: ../src/bar.c:168
+#: ../src/bar.c:187
 msgid "Descending by URL"
 msgstr ""
 
 #. 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:171
+#: ../src/bar.c:190
 msgid "Ascending by encoder name"
 msgstr ""
 
 #. 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:174
+#: ../src/bar.c:193
 msgid "Descending by encoder name"
 msgstr ""
 
-#: ../src/bar.c:175
+#: ../src/bar.c:194
 msgid "Ascending by file type"
 msgstr ""
 
-#: ../src/bar.c:176
+#: ../src/bar.c:195
 msgid "Descending by file type"
 msgstr ""
 
-#: ../src/bar.c:177
+#: ../src/bar.c:196
 msgid "Ascending by file size"
 msgstr ""
 
-#: ../src/bar.c:178
+#: ../src/bar.c:197
 msgid "Descending by file size"
 msgstr ""
 
-#: ../src/bar.c:179
+#: ../src/bar.c:198
 msgid "Ascending by duration"
 msgstr ""
 
-#: ../src/bar.c:180
+#: ../src/bar.c:199
 msgid "Descending by duration"
 msgstr ""
 
-#: ../src/bar.c:181
+#: ../src/bar.c:200
 msgid "Ascending by bitrate"
 msgstr ""
 
-#: ../src/bar.c:182
+#: ../src/bar.c:201
 msgid "Descending by bitrate"
 msgstr ""
 
-#: ../src/bar.c:183
+#: ../src/bar.c:202
 msgid "Ascending by samplerate"
 msgstr ""
 
-#: ../src/bar.c:184
+#: ../src/bar.c:203
 msgid "Descending by samplerate"
 msgstr ""
 
-#: ../src/bar.c:186
+#: ../src/bar.c:205
 msgid "Open Files With…"
-msgstr ""
+msgstr "దస్త్రాలను దీనితో తెరువు"
 
-#: ../src/bar.c:186
-msgid "Open files with…"
-msgstr ""
+#: ../src/bar.c:206
+msgid "Run a command on the selected files"
+msgstr "ఎంచుకున్న దస్త్రాలపై ఒక ఆదేశాన్ని నడుపు"
 
-#: ../src/bar.c:188
+#: ../src/bar.c:209
 msgid "Select all"
-msgstr "Selecciona-ho tot"
+msgstr "అన్నిటిని ఎంపికచేయి"
 
-#: ../src/bar.c:189
-msgid "Unselect All Files"
-msgstr ""
+#: ../src/bar.c:210
+msgid "Unselect All"
+msgstr "మొత్తం ఎంపిక రద్దు"
 
-#: ../src/bar.c:189
-msgid "Unselect all files"
-msgstr ""
+#: ../src/bar.c:211
+msgid "Clear the current selection"
+msgstr "ప్రస్తుత ఎంపికను శుభ్రపరుచు"
 
-#: ../src/bar.c:190
-msgid "Invert Files Selection"
-msgstr ""
+#: ../src/bar.c:214
+msgid "Invert File Selection"
+msgstr "దస్త్ర ఎంపికను విలోమించు"
 
-#: ../src/bar.c:190
-msgid "Invert files selection"
-msgstr ""
+#: ../src/bar.c:215
+msgid "Invert file selection"
+msgstr "దస్త్ర ఎంపికను విలోమించు"
 
-#: ../src/bar.c:191
+#: ../src/bar.c:217
 msgid "Delete Files"
-msgstr "Suprimeix els fitxers"
+msgstr "దస్త్రాలను తొలగించు"
 
-#: ../src/bar.c:191
+#: ../src/bar.c:217
 msgid "Delete files"
-msgstr ""
+msgstr "దస్త్రాలను తొలగించు"
 
-#: ../src/bar.c:192
+#: ../src/bar.c:218
 msgid "_First File"
-msgstr ""
+msgstr "మొదటి దస్త్రం (&O)"
 
-#: ../src/bar.c:192
+#: ../src/bar.c:219
 msgid "First file"
-msgstr ""
+msgstr "మొదటి దస్త్రం"
 
-#: ../src/bar.c:193
+#: ../src/bar.c:220
 msgid "_Previous File"
-msgstr ""
+msgstr "మునుపటి దస్త్రం (_P)"
 
-#: ../src/bar.c:193
+#: ../src/bar.c:220
 msgid "Previous file"
-msgstr ""
+msgstr "మునుపటి దస్త్రం"
 
-#: ../src/bar.c:194
+#: ../src/bar.c:221
 msgid "_Next File"
-msgstr ""
+msgstr "తదుపరి దస్త్రం (_N)"
 
-#: ../src/bar.c:194
+#: ../src/bar.c:221
 msgid "Next file"
-msgstr ""
+msgstr "తదుపరి దస్త్రం"
 
-#: ../src/bar.c:195
+#: ../src/bar.c:222
 msgid "_Last File"
-msgstr ""
+msgstr "చివరి దస్త్రం (_L)"
 
-#: ../src/bar.c:195
+#: ../src/bar.c:223
 msgid "Last file"
-msgstr ""
+msgstr "చివరి దస్త్రం"
 
-#. XXX GTK1 version uses Ctrl+C for scanner, this doesnt work in GTK1 as its copy! in gtk2, behaviour is different
-#. and binding Ctrl+C effectively stops the user copying text..
-#: ../src/bar.c:198
-msgid "S_can Files…"
-msgstr ""
+#: ../src/bar.c:224
+msgid "S_can Files"
+msgstr "దస్త్రాలను పరికించు (_c)"
 
-#: ../src/bar.c:198
-msgid "Scan files"
-msgstr ""
+#: ../src/bar.c:225 ../src/scan_dialog.c:1814
+msgid "Scan selected files"
+msgstr "ఎంపికచేసిన దస్త్రాలను పరికించు"
 
-#: ../src/bar.c:199
+#: ../src/bar.c:226
 msgid "_Remove Tags"
-msgstr ""
+msgstr "కొసలను తీసివేయి (_R)"
 
-#: ../src/bar.c:199
+#: ../src/bar.c:227
 msgid "Remove tags"
-msgstr ""
+msgstr "కొసలను తీసివేయి"
 
-#: ../src/bar.c:200
+#: ../src/bar.c:228
 msgid "_Undo Last Files Changes"
-msgstr ""
+msgstr "చివరగా దస్త్రాలకు చేసిన మార్పులను రద్దుచేయి (_U)"
 
-#: ../src/bar.c:200
-msgid "Undo last Files changes"
-msgstr ""
+#: ../src/bar.c:229
+msgid "Undo last files changes"
+msgstr "చివరగా దస్త్రాలకు చేసిన మార్పులను రద్దుచేయి"
 
-#: ../src/bar.c:201
+#: ../src/bar.c:231
 msgid "R_edo Last Files Changes"
-msgstr ""
+msgstr "చివరగా దస్త్రాలకు చేసిన మార్పులను మళ్ళీచేయి (_e)"
 
-#: ../src/bar.c:201
+#: ../src/bar.c:232
 msgid "Redo last files changes"
-msgstr ""
+msgstr "చివరగా దస్త్రాలకు చేసిన మార్పులను మళ్ళీచేయి"
 
-#: ../src/bar.c:202
+#: ../src/bar.c:234
 msgid "_Save Files"
-msgstr ""
+msgstr "దస్త్రాలను భద్రపరుచు (_S)"
 
-#: ../src/bar.c:202
-msgid "Save files"
-msgstr ""
+#: ../src/bar.c:235
+msgid "Save changes to selected files"
+msgstr "మార్పులను ఎంపికచేసిన దస్త్రాలకు భద్రపరుచు"
 
-#: ../src/bar.c:203
-msgid "_Force Saving Files"
-msgstr ""
+#: ../src/bar.c:237
+msgid "_Force Save Files"
+msgstr "బలవంతంగా దస్త్రాలను భద్రపరుచు (_F)"
 
-#: ../src/bar.c:203
+#: ../src/bar.c:238
 msgid "Force saving files"
-msgstr ""
+msgstr "బలవంతంగా దస్త్రాలను భద్రపరుస్తూంది"
 
-#: ../src/bar.c:204
+#: ../src/bar.c:240
 msgid "Undo Last Changes"
-msgstr ""
+msgstr "చివరి మార్పులను రద్దుచేయి"
 
-#: ../src/bar.c:204
+#: ../src/bar.c:240
 msgid "Undo last changes"
-msgstr ""
+msgstr "చివరి మార్పులను రద్దుచేయి"
 
-#: ../src/bar.c:205
+#: ../src/bar.c:241
 msgid "Redo Last Changes"
-msgstr ""
+msgstr "చివరి మార్పులను మళ్ళీచేయి"
 
-#: ../src/bar.c:205
+#: ../src/bar.c:241
 msgid "Redo last changes"
-msgstr ""
+msgstr "చివరి మార్పులను మళ్ళీచేయి"
 
-#: ../src/bar.c:206
+#: ../src/bar.c:242
 msgid "_Quit"
-msgstr "_Surt"
+msgstr "నిష్క్రమించు (_Q)"
 
-#: ../src/bar.c:206 ../src/easytag.c:2338 ../src/easytag.c:4924
-#: ../src/easytag.c:4950
+#: ../src/bar.c:242 ../src/easytag.c:2430 ../src/easytag.c:4565
+#: ../src/easytag.c:4597
 msgid "Quit"
-msgstr "Surt"
+msgstr "నిష్క్రమించు"
 
-#: ../src/bar.c:208
+#: ../src/bar.c:245
 msgid "_Browser"
-msgstr "_Navega"
+msgstr "విహారకం (_B)"
 
-#: ../src/bar.c:209
-msgid "Go to _Home Directory"
-msgstr ""
+#: ../src/bar.c:246
+msgid "_Home Directory"
+msgstr "నివాస సంచయం (_H)"
 
-#: ../src/bar.c:209
+#: ../src/bar.c:247
 msgid "Go to home directory"
-msgstr ""
+msgstr "నివాస సంచయానికి వెళ్ళు"
 
-#: ../src/bar.c:210
-msgid "Go to Desktop Directory"
-msgstr ""
+#: ../src/bar.c:249
+msgid "Desktop Directory"
+msgstr "డెస్క్‌టాప్ సంచయం"
 
-#: ../src/bar.c:210
+#: ../src/bar.c:250
 msgid "Go to desktop directory"
-msgstr ""
+msgstr "డెస్క్‌టాప్ సంచయానికి వెళ్ళు"
 
-#: ../src/bar.c:211
-msgid "Go to Documents Directory"
-msgstr ""
+#: ../src/bar.c:252
+msgid "Documents Directory"
+msgstr "పత్రాల సంచయం"
 
-#: ../src/bar.c:211
+#: ../src/bar.c:253
 msgid "Go to documents directory"
-msgstr ""
+msgstr "పత్రాల సంచయానికి వెళ్ళు"
 
-#: ../src/bar.c:212
-msgid "Go to Downloads Directory"
-msgstr ""
+#: ../src/bar.c:255
+msgid "Downloads Directory"
+msgstr "దింపుకోళ్ళ సంచయం"
 
-#: ../src/bar.c:212
+#: ../src/bar.c:256
 msgid "Go to downloads directory"
-msgstr ""
+msgstr "దింపుకోళ్ళ సంచయానికి వెళ్ళు"
 
-#: ../src/bar.c:213
-msgid "Go to Music Directory"
-msgstr ""
+#: ../src/bar.c:258
+msgid "Music Directory"
+msgstr "సంగీత సంచయం"
 
-#: ../src/bar.c:213
+#: ../src/bar.c:259
 msgid "Go to music directory"
-msgstr ""
+msgstr "సంగీత సంచయానికి వెళ్ళు"
 
-#: ../src/bar.c:214
-msgid "Go to _Default Directory"
-msgstr ""
+#: ../src/bar.c:261
+msgid "_Parent Directory"
+msgstr "మూల సంచయం (_P)"
 
-#: ../src/bar.c:214
+#: ../src/bar.c:262
+msgid "Go to parent directory"
+msgstr "మూల సంచయానికి వెళ్ళు"
+
+#: ../src/bar.c:264
+msgid "_Default Directory"
+msgstr "అప్రమేయ సంచయం (_D)"
+
+#: ../src/bar.c:265
 msgid "Go to default directory"
-msgstr ""
+msgstr "అప్రమేయ సంచయానికి వెళ్ళు"
 
-#: ../src/bar.c:215
+#: ../src/bar.c:267
 msgid "Set _Current Path as Default"
-msgstr ""
+msgstr "ప్రస్థుత బాటను అప్రమేయముగా అమర్చు (_C)"
 
-#: ../src/bar.c:215
+#: ../src/bar.c:267
 msgid "Set current path as default"
-msgstr ""
+msgstr "ప్రస్థుత బాటను అప్రమేయముగా అమర్చు"
 
-#: ../src/bar.c:216
+#: ../src/bar.c:268
 msgid "Rename Directory…"
-msgstr ""
+msgstr "సంచయం పేరుమార్చు..."
 
-#: ../src/bar.c:216
+#: ../src/bar.c:268
 msgid "Rename directory"
-msgstr ""
+msgstr "సంచయం పేరుమార్చు..."
 
-#: ../src/bar.c:217
+#: ../src/bar.c:269
 msgid "Reload Directory"
-msgstr ""
+msgstr "సంచయం తిరిగినింపు"
 
-#: ../src/bar.c:217
+#: ../src/bar.c:270
 msgid "Reload directory"
-msgstr ""
+msgstr "సంచయం తిరిగినింపు"
 
-#: ../src/bar.c:218 ../src/browser.c:3948
-msgid "Browse Directory with…"
-msgstr ""
+#: ../src/bar.c:273
+msgid "Browse Directory With…"
+msgstr "దీనితో సంచయాన్ని విహరించండి..."
 
-#: ../src/bar.c:218
-msgid "Browse directory with…"
-msgstr ""
+#: ../src/bar.c:274
+msgid "Run a command on the directory"
+msgstr "సంచయంపై ఒక ఆదేశాన్ని నడుపు"
 
-#: ../src/bar.c:219
+#: ../src/bar.c:276
 msgid "_Collapse Tree"
-msgstr ""
-
-#: ../src/bar.c:219
-msgid "_Collapse tree"
-msgstr ""
-
-#: ../src/bar.c:220
-msgid "_Refresh Tree"
-msgstr ""
-
-#: ../src/bar.c:220
-msgid "_Refresh tree"
-msgstr ""
-
-#: ../src/bar.c:222 ../src/bar.c:251
-msgid "S_canner"
-msgstr ""
-
-#: ../src/bar.c:223
-msgid "_Fill Tags…"
-msgstr ""
-
-#: ../src/bar.c:223
-msgid "Fill tags"
-msgstr ""
+msgstr "వృక్షాన్ని ముడుచు (_C)"
 
-#: ../src/bar.c:224
-msgid "_Rename Files and Directories…"
-msgstr ""
+#: ../src/bar.c:277
+msgid "Collapse directory tree"
+msgstr "సంచయ వృక్షాన్ని ముడుచు"
 
-#: ../src/bar.c:224
-msgid "Rename files and directories"
-msgstr ""
+#: ../src/bar.c:278
+msgid "_Reload Tree"
+msgstr "వృక్షాన్ని తిరిగినింపు (_R)"
 
-#: ../src/bar.c:225
-msgid "_Process Fields…"
-msgstr ""
+#: ../src/bar.c:279
+msgid "Reload directory tree"
+msgstr "సంచయ వృక్షాన్ని తిరిగినింపు"
 
-#: ../src/bar.c:225 ../src/scan.c:181
-msgid "Process Fields"
-msgstr ""
+#: ../src/bar.c:282
+msgid "S_canner Mode"
+msgstr "పరికింపకం రీతి (_c)"
 
-#: ../src/bar.c:227
+#: ../src/bar.c:284
 msgid "_Miscellaneous"
-msgstr ""
+msgstr "ఇతరాలు (_M)"
 
-#: ../src/bar.c:228
-msgid "Find _Files…"
-msgstr ""
+#: ../src/bar.c:285
+msgid "_Find…"
+msgstr "వెతుకు...(_F)"
 
-#: ../src/bar.c:228
-msgid "Find files"
-msgstr "Cercar fitxers"
+#: ../src/bar.c:286
+msgid "Search filenames and tags"
+msgstr "దస్త్రాలపేర్లను మరియు కొసలను వెతుకు"
 
-#: ../src/bar.c:229
-msgid "CD Data_base Search…"
+#: ../src/bar.c:288
+msgid "CDD_B Search…"
 msgstr ""
 
-#: ../src/bar.c:229
+#: ../src/bar.c:289
 msgid "CDDB search"
-msgstr ""
+msgstr "CDDB శోధన"
 
-#: ../src/bar.c:230
-msgid "Load Filenames From Text File…"
+#: ../src/bar.c:291
+msgid "Load Filenames From a Text File…"
 msgstr ""
 
-#: ../src/bar.c:230
-msgid "Load filenames from text file"
-msgstr ""
+#: ../src/bar.c:292
+msgid "Load filenames from a text file"
+msgstr "ఒక పాఠ్య దస్త్రం నుండి దస్త్రాలపేర్లను ఎక్కించు"
 
-#: ../src/bar.c:231
-msgid "Write Playlist…"
-msgstr ""
+#: ../src/bar.c:294
+msgid "Generate Playlist…"
+msgstr "పాటలజాబితాను ఉత్పత్తించు..."
 
-#: ../src/bar.c:231
-msgid "Write playlist"
-msgstr ""
+#: ../src/bar.c:295
+msgid "Generate a playlist"
+msgstr "పాటలజాబితాను ఉత్పత్తించు"
 
-#: ../src/bar.c:232 ../src/bar.c:252 ../src/bar.c:253 ../src/bar.c:254
+#: ../src/bar.c:297 ../src/bar.c:328 ../src/bar.c:329 ../src/bar.c:330
 msgid "Run Audio Player"
-msgstr ""
+msgstr "ఆడియో ప్రదర్శకాన్ని నడుపు"
 
-#: ../src/bar.c:232 ../src/bar.c:252 ../src/bar.c:253 ../src/bar.c:254
+#: ../src/bar.c:298 ../src/bar.c:328 ../src/bar.c:329 ../src/bar.c:330
 msgid "Run audio player"
-msgstr ""
+msgstr "ఆడియో ప్రదర్శకాన్ని నడుపు"
 
-#: ../src/bar.c:234
-msgid "_Settings"
-msgstr "_Paràmetres"
+#: ../src/bar.c:301
+msgid "_Edit"
+msgstr "సవరణ (_E)"
 
-#: ../src/bar.c:235
+#: ../src/bar.c:302
 msgid "_Preferences"
-msgstr "_Preferències"
+msgstr "అభిరుచులు (_P)"
 
-#. Title
-#: ../src/bar.c:235 ../src/prefs.c:114
+#. The window
+#: ../src/bar.c:303 ../src/prefs.c:110
 msgid "Preferences"
-msgstr "Preferències"
+msgstr "అభిరుచులు"
 
-#: ../src/bar.c:237
+#: ../src/bar.c:305
+msgid "_View"
+msgstr "చూడటం (_V)"
+
+#: ../src/bar.c:306
+msgid "_Go"
+msgstr "వెళ్ళు (_G)"
+
+#: ../src/bar.c:308
 msgid "_Help"
-msgstr "A_juda"
+msgstr "సహాయం (_H)"
 
-#: ../src/bar.c:238
+#: ../src/bar.c:311
+msgid "_Contents"
+msgstr "విషయాలు (_C)"
+
+#: ../src/bar.c:312
+msgid "Show help"
+msgstr "సహాయం చూపించు"
+
+#: ../src/bar.c:314
 msgid "_About"
-msgstr "_Quant a"
+msgstr "గురించి (_A)"
 
-#: ../src/bar.c:238
+#: ../src/bar.c:314
 msgid "About"
-msgstr "Quant a"
+msgstr "గురించి"
 
 #.
 #. * Following items are on toolbar but not on menu
 #.
-#: ../src/bar.c:244
+#: ../src/bar.c:320
 msgid "Stop the current action"
-msgstr "Atura l'acció actual"
+msgstr "ప్రస్తుత చర్యను రద్దుచేయి "
 
 #.
 #. * Popup menu's Actions
 #.
-#: ../src/bar.c:250
+#: ../src/bar.c:326
 msgid "_File Operations"
-msgstr ""
+msgstr "దస్త్ర పరిక్రియలు (_F)"
 
-#: ../src/bar.c:255
+#: ../src/bar.c:327
+msgid "S_canner"
+msgstr "పరికింపకం (_c)"
+
+#: ../src/bar.c:331
 msgid "CDDB Search Files…"
-msgstr ""
+msgstr "CDDB శోధనా దస్త్రాలు…"
 
-#: ../src/bar.c:255
+#: ../src/bar.c:331
 msgid "CDDB search files…"
-msgstr ""
+msgstr "CDDB శోధనా దస్త్రాలు…"
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
-#: ../src/bar.c:259
+#: ../src/bar.c:335
 msgid "Clear log"
-msgstr ""
+msgstr "చిట్టాను చెరిపివేయి"
 
 #. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Subdirectories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: ../src/bar.c:266
+#: ../src/bar.c:342
 msgid "Browse _Subdirectories"
-msgstr ""
+msgstr "ఉపసంచయాలను విహరించు (_S)"
 
-#: ../src/bar.c:266
+#: ../src/bar.c:342
 msgid "Browse subdirectories"
-msgstr ""
+msgstr "ఉపసంచయాలను విహరించు"
 
-#: ../src/bar.c:270
+#: ../src/bar.c:346
 msgid "Show Hidden Directories"
-msgstr ""
+msgstr "దాచబడిన సంచయాలను చూపించు"
 
-#: ../src/bar.c:270
+#: ../src/bar.c:346
 msgid "Show hidden directories"
-msgstr ""
+msgstr "దాచబడిన సంచయాలను చూపించు"
 
-#: ../src/bar.c:276
-msgid "Tree Browser View"
-msgstr ""
+#: ../src/bar.c:348
+msgid "_Show Scanner"
+msgstr "పరికింపకాన్ని చూపించు (_S)"
 
-#: ../src/bar.c:277
+#: ../src/bar.c:349
+msgid "Show scanner"
+msgstr "పరికింపకాన్ని చూపించు"
+
+#: ../src/bar.c:355
+msgid "Tree Browser"
+msgstr "వృక్ష విహారకం"
+
+#: ../src/bar.c:356
 msgid "View by directory tree"
-msgstr ""
+msgstr "సంచయ వృక్షంచే చూడండి"
 
-#: ../src/bar.c:279
-msgid "Artist and Album View"
-msgstr ""
+#: ../src/bar.c:358
+msgid "Artist and Album"
+msgstr "కళాకారి మరియు ఆల్బమ్"
 
-#: ../src/bar.c:280
+#: ../src/bar.c:359
 msgid "View by artist and album"
 msgstr ""
 
-#: ../src/bar.c:322
+#: ../src/bar.c:364
+msgid "_Fill Tags…"
+msgstr "కొసలను నింపు...(_F)"
+
+#: ../src/bar.c:365
+msgid "Fill tags"
+msgstr "కొసలను నింపు"
+
+#: ../src/bar.c:367
+msgid "_Rename Files and Directories…"
+msgstr "దస్త్రాలు మరియు సంచయాల పేరుమార్చు...(_R)"
+
+#: ../src/bar.c:368
+msgid "Rename files and directories"
+msgstr "దస్త్రాలు మరియు సంచయాల పేరుమార్చు"
+
+#: ../src/bar.c:370
+msgid "_Process Fields…"
+msgstr "ప్రక్రియ క్షేత్రాలు...(_P)"
+
+#: ../src/bar.c:370 ../src/scan_dialog.c:184
+msgid "Process Fields"
+msgstr "ప్రక్రియ క్షేత్రాలు"
+
+#: ../src/bar.c:428
 #, c-format
 msgid "Could not merge UI, error was: %s\n"
 msgstr ""
 
-#: ../src/bar.c:423
+#: ../src/bar.c:533
 msgid "Ready to start"
 msgstr ""
 
-#: ../src/browser.c:353
+#: ../src/browser.c:376
 msgid "New default path for files selected"
 msgstr ""
 
-#: ../src/browser.c:753 ../src/easytag.c:4922
+#: ../src/browser.c:678 ../src/easytag.c:4561
 msgid "Some files have been modified but not saved"
 msgstr ""
 
-#: ../src/browser.c:754
+#: ../src/browser.c:679
 msgid "Do you want to save them before changing the directory?"
 msgstr ""
 
-#: ../src/browser.c:756
+#: ../src/browser.c:683
 msgid "Confirm Directory Change"
 msgstr ""
 
-#: ../src/browser.c:2141
+#: ../src/browser.c:2146
 msgid "<All albums>"
-msgstr ""
+msgstr "<అన్ని ఆల్బమ్లు>"
 
-#: ../src/browser.c:2582
+#: ../src/browser.c:2607
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr ""
 
-#: ../src/browser.c:3030 ../src/browser.c:3124
+#: ../src/browser.c:3101 ../src/browser.c:3179
 msgid "Tree"
-msgstr "Arbre"
+msgstr "వృక్షం"
 
-#: ../src/browser.c:3031 ../src/cddb.c:732 ../src/misc.c:1931
+#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1903
 msgid "Filename"
-msgstr "Nom del fitxer"
+msgstr "దస్త్రంపేరు"
 
-#: ../src/browser.c:3031 ../src/cddb.c:733 ../src/misc.c:1932
-#: ../src/prefs.c:647
+#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1904
+#: ../src/prefs.c:643
 msgid "Title"
-msgstr "Títol"
+msgstr "శీర్షిక"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Artist".
-#: ../src/browser.c:3032 ../src/browser.c:3039 ../src/cddb.c:415
-#: ../src/cddb.c:734 ../src/misc.c:1933 ../src/prefs.c:648
+#: ../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 "Artista"
+msgstr "కళాకారులు"
 
-#: ../src/browser.c:3032 ../src/misc.c:1934
+#: ../src/browser.c:3103 ../src/misc.c:1906
 msgid "Album Artist"
-msgstr "Artista de l'àlbum"
+msgstr "ఆల్బమ్ కళాకారి"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Album".
-#: ../src/browser.c:3033 ../src/browser.c:3041 ../src/cddb.c:418
-#: ../src/cddb.c:735 ../src/misc.c:1935 ../src/prefs.c:649
+#: ../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 "Àlbum"
+msgstr "ఆల్బమ్"
 
-#: ../src/browser.c:3033 ../src/cddb.c:736 ../src/misc.c:1937
+#: ../src/browser.c:3104 ../src/cddb.c:807 ../src/misc.c:1909
 msgid "Year"
-msgstr "Any"
+msgstr "సంవత్సరం"
 
-#: ../src/browser.c:3033
+#: ../src/browser.c:3104
 msgid "Disc"
-msgstr "Disc"
+msgstr "డిస్కు"
 
-#: ../src/browser.c:3034 ../src/misc.c:1938
+#: ../src/browser.c:3105 ../src/misc.c:1910
 msgid "Track"
-msgstr "Pista"
+msgstr "ట్రాక్"
 
-#: ../src/browser.c:3034 ../src/cddb.c:739 ../src/misc.c:1939
-#: ../src/prefs.c:650
+#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1911
+#: ../src/prefs.c:646
 msgid "Genre"
-msgstr "Gènere"
+msgstr "సాహిత్యం"
 
-#: ../src/browser.c:3035 ../src/misc.c:1940 ../src/prefs.c:651
+#: ../src/browser.c:3106 ../src/misc.c:1912 ../src/prefs.c:647
 msgid "Comment"
-msgstr "Comentari"
+msgstr "వ్యాఖ్య"
 
-#: ../src/browser.c:3035 ../src/misc.c:1941 ../src/picture.c:819
-#: ../src/prefs.c:652
+#: ../src/browser.c:3106 ../src/misc.c:1913 ../src/picture.c:1059
+#: ../src/prefs.c:648
 msgid "Composer"
-msgstr "Redactor"
+msgstr "స్వరకర్త:"
 
-#: ../src/browser.c:3036 ../src/misc.c:1942
+#: ../src/browser.c:3107 ../src/misc.c:1914
 msgid "Original Artist"
-msgstr "Artista original"
+msgstr "అసలు కళాకారి"
 
-#: ../src/browser.c:3037 ../src/misc.c:1943
+#: ../src/browser.c:3108 ../src/misc.c:1915
 msgid "Copyright"
-msgstr "Copyright"
+msgstr "నకలుహక్కు"
 
-#: ../src/browser.c:3037 ../src/misc.c:1944
+#: ../src/browser.c:3108 ../src/misc.c:1916
 msgid "URL"
 msgstr "URL"
 
-#: ../src/browser.c:3038 ../src/misc.c:1945
+#: ../src/browser.c:3109 ../src/misc.c:1917
 msgid "Encoded By"
-msgstr ""
+msgstr "ఎన్కోడు చేసినవారు"
 
-#: ../src/browser.c:3039
+#: ../src/browser.c:3110
 msgid "# Albums"
-msgstr ""
+msgstr "# ఆల్బమ్‌లు"
 
-#: ../src/browser.c:3040 ../src/browser.c:3041
+#: ../src/browser.c:3111 ../src/browser.c:3112
 msgid "# Files"
-msgstr ""
+msgstr "# దస్ర్తాలు"
 
-#: ../src/browser.c:3064
-msgid "Go to parent directory"
-msgstr ""
-
-#: ../src/browser.c:3082
+#: ../src/browser.c:3137
 msgid "Enter a directory to browse."
 msgstr ""
 
-#: ../src/browser.c:3091
+#: ../src/browser.c:3146
 msgid "Select a directory to browse."
 msgstr ""
 
@@ -804,177 +837,149 @@ msgstr ""
 #. * The label for displaying number of files in path (without subdirs)
 #.
 #. Translators: No files, as in "0 files".
-#: ../src/browser.c:3098 ../src/easytag.c:3705
+#: ../src/browser.c:3153 ../src/easytag.c:3469
 msgid "No files"
-msgstr "Cap fitxer"
+msgstr ""
 
-#: ../src/browser.c:3175
+#: ../src/browser.c:3231
 msgid "Artist & Album"
-msgstr "Artista i àlbum"
+msgstr "కళాకారి & ఆల్బమ్"
 
-#: ../src/browser.c:3482
-msgid "Rename the directory"
+#. Only directories changed
+#: ../src/browser.c:3595 ../src/easytag.c:2881
+msgid "Rename Directory"
 msgstr ""
 
-#: ../src/browser.c:3498
+#: ../src/browser.c:3617
 #, c-format
 msgid "Rename the directory '%s' to:"
 msgstr ""
 
-#: ../src/browser.c:3517 ../src/misc.c:1276
+#: ../src/browser.c:3636 ../src/misc.c:1172
 msgid "Use mask:"
 msgstr ""
 
-#: ../src/browser.c:3520
+#: ../src/browser.c:3639
 msgid "If activated, it will use masks to rename directory."
 msgstr ""
 
-#: ../src/browser.c:3538
+#: ../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 ""
 
-#: ../src/browser.c:3558 ../src/misc.c:1297 ../src/misc.c:1396
-#: ../src/scan.c:2485 ../src/scan.c:2555 ../src/scan.c:2916
-msgid "Invalid Scanner Mask"
-msgstr ""
-
 #. Preview label
-#: ../src/browser.c:3564
+#: ../src/browser.c:3681
 msgid "Rename directory preview"
 msgstr ""
 
-#: ../src/browser.c:3687
+#: ../src/browser.c:3773
 msgid "You must type a directory name"
 msgstr ""
 
-#: ../src/browser.c:3688 ../src/browser.c:3709
+#: ../src/browser.c:3774 ../src/browser.c:3795
 msgid "Directory Name Error"
 msgstr ""
 
-#: ../src/browser.c:3706
+#: ../src/browser.c:3792
 #, c-format
 msgid "Could not convert '%s' into filename encoding."
 msgstr ""
 
-#: ../src/browser.c:3708
+#: ../src/browser.c:3794
 msgid "Please use another name"
 msgstr ""
 
-#: ../src/browser.c:3778
+#: ../src/browser.c:3864
 #, c-format
 msgid "The directory name '%s' already exists"
 msgstr ""
 
-#: ../src/browser.c:3779 ../src/easytag.c:3077 ../src/easytag.c:3118
-#: ../src/easytag.c:3145 ../src/easytag.c:3188 ../src/easytag.c:3367
+#: ../src/browser.c:3865 ../src/easytag.c:2964
 msgid "Rename File Error"
 msgstr ""
 
-#: ../src/browser.c:3818 ../src/browser.c:3848
+#: ../src/browser.c:3903 ../src/browser.c:3932
 msgid "Rename Directory Error"
 msgstr ""
 
-#: ../src/browser.c:3888
+#: ../src/browser.c:3970
 msgid "Directory renamed"
 msgstr ""
 
-#: ../src/browser.c:3965 ../src/browser.c:4125
-msgid "Program to run:"
+#: ../src/browser.c:4006
+msgid "Browse Directory With"
 msgstr ""
 
-#: ../src/browser.c:3978
+#: ../src/browser.c:4022 ../src/browser.c:4148
+msgid "Program to run:"
+msgstr "నడుపుటకు కార్యక్రమమును ఎంచుకోండి:"
+
+#: ../src/browser.c:4034
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 
-#: ../src/browser.c:4108
-msgid "Open File with…"
-msgstr ""
+#: ../src/browser.c:4128
+msgid "Open Files With"
+msgstr "దస్త్రాలను దీనితో తెరువు"
 
-#: ../src/browser.c:4138
+#: ../src/browser.c:4160
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
 
-#: ../src/browser.c:4299
-msgid "You must type a program name"
-msgstr ""
-
-#: ../src/browser.c:4300 ../src/browser.c:4317
-msgid "Program Name Error"
-msgstr ""
-
-#: ../src/browser.c:4315 ../src/misc.c:876
-#, c-format
-msgid "The program '%s' cannot be found"
-msgstr ""
-
-#: ../src/browser.c:4363 ../src/misc.c:921
-#, c-format
-msgid "Cannot execute %s (error %d)\n"
-msgstr ""
-
-#: ../src/browser.c:4382
-msgid "Cannot fork another process\n"
-msgstr ""
-
-#: ../src/browser.c:4417
-#, c-format
-msgid "Executed command: %s"
-msgstr ""
-
-#: ../src/cddb.c:229
+#: ../src/cddb.c:313
 msgid "Artist / Album"
-msgstr ""
+msgstr "కళాకారి / ఆల్బమ్"
 
-#: ../src/cddb.c:229
+#: ../src/cddb.c:313
 msgid "Category"
-msgstr "Categoria"
+msgstr "వర్గం"
 
 #. Note: don't set "" instead of NULL else this will cause problem with translation language
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Track Name".
-#: ../src/cddb.c:230 ../src/cddb.c:421
+#: ../src/cddb.c:314 ../src/cddb.c:489
 msgid "Track Name"
-msgstr ""
+msgstr "ట్రాక్ పేరు"
 
-#: ../src/cddb.c:230
+#: ../src/cddb.c:314
 msgid "Duration"
-msgstr "Durada"
+msgstr "నిడివి"
 
-#: ../src/cddb.c:241
-msgid "CD Database Search"
-msgstr ""
+#: ../src/cddb.c:326
+msgid "CDDB Search"
+msgstr "CDDB శోధన"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
 #.
-#: ../src/cddb.c:273
+#: ../src/cddb.c:346
 msgid "Automatic Search"
 msgstr ""
 
-#: ../src/cddb.c:285
-msgid "Request CD database:"
+#: ../src/cddb.c:356
+msgid "Request CDDB"
 msgstr ""
 
-#: ../src/cddb.c:295
+#: ../src/cddb.c:366
 msgid ""
-"Request automatically the CDDB database using the selected files (the order "
-"is important) to generate the CddbID"
+"Request automatically the CDDB using the selected files (the order is "
+"important) to generate the CddbID"
 msgstr ""
 
-#: ../src/cddb.c:306 ../src/cddb.c:389
+#: ../src/cddb.c:377 ../src/cddb.c:457
 msgid "Stop the search"
-msgstr "Atura la cerca"
+msgstr ""
 
 #. Check box to run the scanner
-#: ../src/cddb.c:313
+#: ../src/cddb.c:384
 msgid "Use local CDDB"
 msgstr ""
 
-#: ../src/cddb.c:316 ../src/cddb.c:779
+#: ../src/cddb.c:387 ../src/cddb.c:850
 msgid ""
 "When activating this option, after loading the fields, the current selected "
 "scanner will be ran (the scanner window must be opened)."
@@ -983,160 +988,160 @@ msgstr ""
 #.
 #. * 2 - Page for manual search
 #.
-#: ../src/cddb.c:333
+#: ../src/cddb.c:404
 msgid "Manual Search"
 msgstr ""
 
-#: ../src/cddb.c:348
+#: ../src/cddb.c:416
 msgid "Words:"
-msgstr "Paraules:"
+msgstr ""
 
-#: ../src/cddb.c:361
+#: ../src/cddb.c:429
 msgid "Enter the words to search (separated by a space or '+')"
 msgstr ""
 
 #.
 #. * Search options
 #.
-#: ../src/cddb.c:401
+#: ../src/cddb.c:469
 msgid "Search In:"
 msgstr ""
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "All fields".
-#: ../src/cddb.c:411
+#: ../src/cddb.c:479
 msgid "All Fields"
-msgstr ""
+msgstr "అన్ని క్షేత్రాలు"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Other".
-#: ../src/cddb.c:424 ../src/picture.c:797 ../src/prefs.c:826
+#: ../src/cddb.c:492 ../src/picture.c:1037 ../src/prefs.c:807
 msgid "Other"
-msgstr "Altres"
+msgstr "ఇతర"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "All Categories".
-#: ../src/cddb.c:448
+#: ../src/cddb.c:516
 msgid "All Categories"
-msgstr ""
+msgstr "అన్ని వర్గాలు"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Blues".
-#: ../src/cddb.c:452
+#: ../src/cddb.c:520
 msgid "Blues"
-msgstr "Blues"
+msgstr ""
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Classical".
-#: ../src/cddb.c:455
+#: ../src/cddb.c:523
 msgid "Classical"
-msgstr "Clàssica"
+msgstr "సాంప్రదాయకం"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Country".
-#: ../src/cddb.c:458
+#: ../src/cddb.c:526
 msgid "Country"
-msgstr "Country"
+msgstr "దేశం"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Folk".
-#: ../src/cddb.c:461
+#: ../src/cddb.c:529
 msgid "Folk"
-msgstr "Folk"
+msgstr ""
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Jazz".
-#: ../src/cddb.c:464
+#: ../src/cddb.c:532
 msgid "Jazz"
-msgstr "Jazz"
+msgstr ""
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Misc".
-#: ../src/cddb.c:467
+#: ../src/cddb.c:535
 msgid "Misc."
-msgstr ""
+msgstr "ఇతరాలు."
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "New age".
-#: ../src/cddb.c:470
+#: ../src/cddb.c:538
 msgid "New Age"
-msgstr "New Age"
+msgstr ""
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Reggae".
-#: ../src/cddb.c:473
+#: ../src/cddb.c:541
 msgid "Reggae"
-msgstr "Reggae"
+msgstr ""
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Rock".
-#: ../src/cddb.c:476
+#: ../src/cddb.c:544
 msgid "Rock"
-msgstr "Rock"
+msgstr "రాక్"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Soundtrack".
-#: ../src/cddb.c:479
+#: ../src/cddb.c:547
 msgid "Soundtrack"
-msgstr "Banda sonora"
+msgstr ""
 
-#: ../src/cddb.c:519
+#: ../src/cddb.c:587
 msgid "included: funk, soul, rap, pop, industrial, metal, etc."
 msgstr ""
 
-#: ../src/cddb.c:520
+#: ../src/cddb.c:588
 msgid "movies, shows"
 msgstr ""
 
-#: ../src/cddb.c:521
+#: ../src/cddb.c:589
 msgid "others that do not fit in the above categories"
 msgstr ""
 
 #. Button to display/hide the categories
-#: ../src/cddb.c:524
+#: ../src/cddb.c:592
 msgid "Categories"
-msgstr "Categories"
+msgstr "వర్గాలు"
 
 #.
 #. * Results command
 #.
-#: ../src/cddb.c:532
+#: ../src/cddb.c:600
 msgid "Results:"
-msgstr ""
+msgstr "ఫలితాలు:"
 
-#: ../src/cddb.c:539 ../src/misc.c:1983
+#: ../src/cddb.c:606 ../src/misc.c:1951
 msgid "Search:"
-msgstr "Cerca:"
+msgstr "శోధించు:"
 
-#: ../src/cddb.c:553
+#: ../src/cddb.c:620
 msgid "Enter the words to search in the list below"
 msgstr ""
 
-#: ../src/cddb.c:565
+#: ../src/cddb.c:632
 msgid "Search Next"
 msgstr ""
 
-#: ../src/cddb.c:571
+#: ../src/cddb.c:638
 msgid "Search Previous"
 msgstr ""
 
-#: ../src/cddb.c:582
+#: ../src/cddb.c:649
 msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
 msgstr ""
 
-#: ../src/cddb.c:588
+#: ../src/cddb.c:655
 msgid "Unselect all lines"
 msgstr ""
 
-#: ../src/cddb.c:594
+#: ../src/cddb.c:661
 msgid "Invert lines selection"
 msgstr ""
 
-#: ../src/cddb.c:603
+#: ../src/cddb.c:670
 msgid "Select all lines"
 msgstr ""
 
-#: ../src/cddb.c:716
+#: ../src/cddb.c:788
 msgid ""
 "Select lines to 'apply' to your files list. All lines will be processed if "
 "no line is selected.\n"
@@ -1146,36 +1151,36 @@ msgstr ""
 #.
 #. * Apply results to fields...
 #.
-#: ../src/cddb.c:723
+#: ../src/cddb.c:795
 msgid "Set Into:"
 msgstr ""
 
-#: ../src/cddb.c:730
+#: ../src/cddb.c:801
 msgid "All"
-msgstr "Tot"
+msgstr "అన్నీ"
 
-#: ../src/cddb.c:737
+#: ../src/cddb.c:808
 msgid "Track #"
-msgstr "Núm. cançó"
+msgstr ""
 
-#: ../src/cddb.c:738
+#: ../src/cddb.c:809
 msgid "# Tracks"
 msgstr ""
 
 #. Check box to run the scanner
-#: ../src/cddb.c:776 ../src/misc.c:3029
+#: ../src/cddb.c:847 ../src/misc.c:2992
 msgid "Run the current scanner for each file"
 msgstr ""
 
 #. Check box to use DLM (also used in the preferences window)
-#: ../src/cddb.c:783
+#: ../src/cddb.c:854
 msgid "Match lines with the Levenshtein algorithm"
 msgstr ""
 
 #. Doesn't activate it by default because if the new user don't pay attention to it,
 #. it will not understand why the cddb results aren't loaded correctly...
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(CddbUseDLM2),CDDB_USE_DLM);
-#: ../src/cddb.c:788 ../src/prefs.c:1396
+#: ../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 "
@@ -1184,67 +1189,76 @@ msgid ""
 "instead of using directly the position order."
 msgstr ""
 
-#: ../src/cddb.c:800
+#: ../src/cddb.c:871
 msgid "Load the selected lines or all lines (if no line selected)."
 msgstr ""
 
-#: ../src/cddb.c:810
+#: ../src/cddb.c:881
 msgid "Ready to search"
 msgstr ""
 
-#: ../src/cddb.c:1337
+#: ../src/cddb.c:1352
 #, c-format
 msgid ""
 "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgstr ""
 
-#: ../src/cddb.c:1575
+#: ../src/cddb.c:1588
 #, c-format
 msgid "Resolving host '%s'…"
 msgstr ""
 
-#: ../src/cddb.c:1583
+#: ../src/cddb.c:1629
 #, c-format
-msgid "Can't resolve host '%s' (%s)."
+msgid "Cannot create a new socket (%s)"
 msgstr ""
 
-#: ../src/cddb.c:1598
-#, c-format
-msgid "Cannot create a new socket (%s)"
+#: ../src/cddb.c:1643
+msgid "Cannot set options on the newly-created socket"
 msgstr ""
 
-#. Open connection to the server
-#: ../src/cddb.c:1612
+#. Open connection to the server.
+#: ../src/cddb.c:1647
 #, c-format
 msgid "Connecting to host '%s', port '%d'…"
 msgstr ""
 
-#: ../src/cddb.c:1619
+#: ../src/cddb.c:1660
 #, c-format
 msgid "Cannot connect to host '%s' (%s)"
 msgstr ""
 
-#: ../src/cddb.c:1625
+#: ../src/cddb.c:1684
+#, c-format
+msgid "Cannot resolve host '%s' (%s)"
+msgstr ""
+
+#: ../src/cddb.c:1697
 #, c-format
 msgid "Connected to host '%s'"
 msgstr ""
 
-#: ../src/cddb.c:1702
+#: ../src/cddb.c:1778
+#, c-format
+msgid "Error while writing CDDB results to file '%s'"
+msgstr ""
+
+#: ../src/cddb.c:1789
 #, c-format
 msgid "Receiving data (%s)…"
 msgstr ""
 
-#: ../src/cddb.c:1714
+#: ../src/cddb.c:1801
 #, c-format
 msgid "Error when reading CDDB response (%s)"
 msgstr ""
 
-#: ../src/cddb.c:1721
+#: ../src/cddb.c:1808
 #, c-format
 msgid "Cannot create file '%s' (%s)"
 msgstr ""
 
-#: ../src/cddb.c:1762 ../src/setting.c:1202
+#: ../src/cddb.c:1849 ../src/setting.c:1256
 #, c-format
 msgid "Cannot open file '%s' (%s)"
 msgstr ""
@@ -1255,11 +1269,11 @@ msgstr ""
 #. Send the request
 #. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: ../src/cddb.c:2221 ../src/cddb.c:2550 ../src/cddb.c:3424
+#: ../src/cddb.c:2314 ../src/cddb.c:2643 ../src/cddb.c:3516
 msgid "Sending request…"
 msgstr ""
 
-#: ../src/cddb.c:2225 ../src/cddb.c:2554 ../src/cddb.c:3124 ../src/cddb.c:3428
+#: ../src/cddb.c:2318 ../src/cddb.c:2647 ../src/cddb.c:3216 ../src/cddb.c:3520
 #, c-format
 msgid "Cannot send the request (%s)"
 msgstr ""
@@ -1268,362 +1282,367 @@ msgstr ""
 #. * Read the answer
 #.
 #. Read the answer
-#: ../src/cddb.c:2251 ../src/cddb.c:3137 ../src/cddb.c:3437
+#: ../src/cddb.c:2344 ../src/cddb.c:3230 ../src/cddb.c:3529
 msgid "Receiving data…"
 msgstr ""
 
-#: ../src/cddb.c:2258 ../src/cddb.c:2583 ../src/cddb.c:3144 ../src/cddb.c:3444
+#: ../src/cddb.c:2351 ../src/cddb.c:2676 ../src/cddb.c:3237 ../src/cddb.c:3536
 msgid "The server returned a bad response"
 msgstr ""
 
-#: ../src/cddb.c:2272 ../src/cddb.c:2599 ../src/cddb.c:3159 ../src/cddb.c:3461
-#: ../src/cddb.c:3476
+#: ../src/cddb.c:2365 ../src/cddb.c:2692 ../src/cddb.c:3252 ../src/cddb.c:3553
+#: ../src/cddb.c:3568
 #, c-format
 msgid "The server returned a bad response: %s"
 msgstr ""
 
-#: ../src/cddb.c:2419
+#: ../src/cddb.c:2512
 #, c-format
 msgid "Sorry, the web-based search is currently not available"
 msgstr ""
 
-#: ../src/cddb.c:2421 ../src/cddb.c:2770
+#: ../src/cddb.c:2514 ../src/cddb.c:2863
 #, c-format
 msgid "Found one matching album"
 msgid_plural "Found %d matching albums"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ఒక సరిపోలిన ఆల్బమ్ కనబడింది"
+msgstr[1] "%d సరిపోలిన ఆల్బమ్లు కనబడ్డాయి"
 
-#: ../src/cddb.c:2571
+#: ../src/cddb.c:2664
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)…"
 msgstr ""
 
-#: ../src/cddb.c:2573
+#: ../src/cddb.c:2666
 #, c-format
 msgid "Receiving data of page %d…"
 msgstr ""
 
-#: ../src/cddb.c:2737
+#: ../src/cddb.c:2830
 #, c-format
 msgid "More results to load…"
 msgstr ""
 
-#: ../src/cddb.c:2866
+#: ../src/cddb.c:2959
 #, c-format
 msgid "No file selected"
-msgstr "No s'ha seleccionat cap fitxer"
+msgstr ""
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: ../src/cddb.c:2874
+#: ../src/cddb.c:2967
 #, c-format
 msgid "More than 99 files selected. Cannot send request"
 msgstr ""
 
-#: ../src/cddb.c:2880
+#: ../src/cddb.c:2973
 #, c-format
 msgid "One file selected"
 msgid_plural "%d files selected"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ఒక దస్త్రం ఎంచుకోబడింది"
+msgstr[1] "%d దస్త్రాలు ఎంపికచేయబడ్డాయి"
 
-#: ../src/cddb.c:2964
+#: ../src/cddb.c:3056
 msgid "The path for 'Local CD Database' was not defined"
 msgstr ""
 
 #. Translators: 'it' in this sentence refers to the local CD
 #. * database path.
-#: ../src/cddb.c:2967
+#: ../src/cddb.c:3059
 msgid "Enter it in the preferences window before using this search."
 msgstr ""
 
-#: ../src/cddb.c:2969
+#: ../src/cddb.c:3061
 msgid "Local CD search"
 msgstr ""
 
 #. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
-#: ../src/cddb.c:3114
+#: ../src/cddb.c:3206
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"
 msgstr ""
 
-#: ../src/cddb.c:3270
+#: ../src/cddb.c:3363
 #, c-format
 msgid "DiscID '%s' gave one matching album"
 msgid_plural "DiscID '%s' gave %d matching albums"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/cddb.c:3368
+#: ../src/cddb.c:3460
 #, c-format
 msgid "Can't load file: '%s' (%s)."
 msgstr ""
 
 #. Load the track list of the album
-#: ../src/cddb.c:3667
+#: ../src/cddb.c:3759
 msgid "Loading album track list…"
 msgstr ""
 
-#: ../src/cddb.c:3870
+#: ../src/cddb.c:3958
 msgid "The number of CDDB results does not match the number of selected files"
 msgstr ""
 
-#: ../src/cddb.c:3874
+#: ../src/cddb.c:3962
 msgid "Write Tag from CDDB"
 msgstr ""
 
-#: ../src/charset.c:49
+#: ../src/charset.c:47
 msgid "Arabic (IBM-864)"
-msgstr "Àrab (IBM-864)"
+msgstr "అరబిక్ (IBM-864)"
 
-#: ../src/charset.c:50
+#: ../src/charset.c:48
 msgid "Arabic (ISO-8859-6)"
-msgstr "Àrab (ISO-8859-6)"
+msgstr "అరబిక్ (ISO 8859-6)"
 
-#: ../src/charset.c:51
+#: ../src/charset.c:49
 msgid "Arabic (Windows-1256)"
-msgstr "Àrab (Windows-1256)"
+msgstr "అరబిక్ (విండోస్-1256)"
 
-#: ../src/charset.c:52
+#: ../src/charset.c:50
 msgid "Baltic (ISO-8859-13)"
-msgstr "Bàltic (ISO-8859-13)"
+msgstr "బాల్టిక్ (ISO-8859-13)"
 
-#: ../src/charset.c:53
+#: ../src/charset.c:51
 msgid "Baltic (ISO-8859-4)"
-msgstr "Bàltic (ISO-8859-4)"
+msgstr "బాల్టిక్ (ISO-8859-13)"
 
-#: ../src/charset.c:54
+#: ../src/charset.c:52
 msgid "Baltic (Windows-1257)"
-msgstr "Bàltic (Windows-1257)"
+msgstr "బాల్టిక్ (విండోస్-1257)"
 
-#: ../src/charset.c:55
+#: ../src/charset.c:53
 msgid "Celtic (ISO-8859-14)"
-msgstr "Cèltic (ISO-8859-14)"
+msgstr "సెల్టిక్ (ISO-8859-14)"
 
-#: ../src/charset.c:56
+#: ../src/charset.c:54
 msgid "Central European (IBM-852)"
-msgstr "Europeu central (IBM-852)"
+msgstr "మధ్య ఐరోపా (IBM-852)"
 
-#: ../src/charset.c:57
+#: ../src/charset.c:55
 msgid "Central European (ISO-8859-2)"
-msgstr "Centreeuropeu (ISO-8859-2)"
+msgstr "సౌత్ యురోపియన్ (ISO-8859-2)"
 
-#: ../src/charset.c:58
+#: ../src/charset.c:56
 msgid "Central European (Windows-1250)"
-msgstr "Centreeuropeu (Windows-1250)"
+msgstr "మధ్య ఐరోపా  (Windows-1250)"
 
-#: ../src/charset.c:59
+#: ../src/charset.c:57
 msgid "Chinese Simplified (GB18030)"
-msgstr "Xinès simplificat (GB18030)"
+msgstr "సరళ చైనీసు (GB18030)"
 
-#: ../src/charset.c:60
+#: ../src/charset.c:58
 msgid "Chinese Simplified (GB2312)"
-msgstr "Xinès simplificat (GB2312)"
+msgstr "సరళ చైనీసు (GB2312)"
 
-#: ../src/charset.c:61
+#: ../src/charset.c:59
 msgid "Chinese Traditional (Big5)"
-msgstr "Xinès tradicional (Big5)"
+msgstr "సాంప్రదాయ చైనీస్ (Big5)"
 
-#: ../src/charset.c:62
+#: ../src/charset.c:60
 msgid "Chinese Traditional (Big5-HKSCS)"
-msgstr "Xinès tradicional (Big5-HKSCS)"
+msgstr "సాంప్రదాయ చైనీసు  (Big5-HKSCS)"
 
-#: ../src/charset.c:63
+#: ../src/charset.c:61
 msgid "Cyrillic (IBM-855)"
-msgstr "Ciríl·lic (IBM-855)"
+msgstr "సిరిల్లిక్ (IBM-855)"
 
-#: ../src/charset.c:64
+#: ../src/charset.c:62
 msgid "Cyrillic (ISO-8859-5)"
-msgstr "Ciríl·lic (ISO-8859-5)"
+msgstr "సిరిల్లిక్ (ISO 8859-5)"
 
-#: ../src/charset.c:65
+#: ../src/charset.c:63
 msgid "Cyrillic (ISO-IR-111)"
-msgstr "Ciríl·lic (ISO-IR-111)"
+msgstr "సిరిల్లిక్ (ISO-IR-111)"
 
-#: ../src/charset.c:66
+#: ../src/charset.c:64
 msgid "Cyrillic (KOI8-R)"
-msgstr "Ciríl·lic (KOI8-R)"
+msgstr "సిరిల్లిక్ (KOI8-R)"
 
-#: ../src/charset.c:67
+#: ../src/charset.c:65
 msgid "Cyrillic (Windows-1251)"
-msgstr "Ciríl·lic (Windows-1251)"
+msgstr "సిరిలిక్ (విండోస్-1251)"
 
-#: ../src/charset.c:68
+#: ../src/charset.c:66
 msgid "Cyrillic/Russian (CP-866)"
-msgstr "Ciríl·lic/Rus (CP-866)"
+msgstr "సిరిల్లిక్/రష్యన్ (IBM-866)"
 
-#: ../src/charset.c:69
+#: ../src/charset.c:67
 msgid "Cyrillic/Ukrainian (KOI8-U)"
-msgstr "Ciríl·lic/Ucraïnès (KOI8-U)"
+msgstr "సిరిల్లిక్/యుక్రైనియన్ (KOI8-U)"
 
-#: ../src/charset.c:70
+#: ../src/charset.c:68
 msgid "English (US-ASCII)"
-msgstr "Anglès (US-ASCII)"
+msgstr "ఇంగ్లీష్ (US-ASCII)"
 
-#: ../src/charset.c:71
+#: ../src/charset.c:69
 msgid "Greek (ISO-8859-7)"
-msgstr "Grec (ISO-8859-7)"
+msgstr "గ్రీక్ (ISO-8859-7)"
 
-#: ../src/charset.c:72
+#: ../src/charset.c:70
 msgid "Greek (Windows-1253)"
-msgstr "Grec (Windows-1253)"
+msgstr "గ్రీక్ (విండోస్-1253)"
 
-#: ../src/charset.c:73
+#: ../src/charset.c:71
 msgid "Hebrew (IBM-862)"
-msgstr "Hebreu (IBM-862)"
+msgstr "హిబ్రూ (IBM-862)"
 
-#: ../src/charset.c:74
+#: ../src/charset.c:72
 msgid "Hebrew (Windows-1255)"
-msgstr "Hebreu (Windows-1255)"
+msgstr "హిబ్రూ (విండోస్-1255)"
 
-#: ../src/charset.c:75
+#: ../src/charset.c:73
 msgid "Japanese (EUC-JP)"
-msgstr "Japonès (EUC-JP)"
+msgstr "జపనీస్ (EUC-JP)"
 
-#: ../src/charset.c:76
+#: ../src/charset.c:74
 msgid "Japanese (ISO-2022-JP)"
-msgstr "Japonès (ISO-2022-JP)"
+msgstr "జపనీస్ (ISO-2022-JP)"
 
-#: ../src/charset.c:77
+#: ../src/charset.c:75
 msgid "Japanese (Shift_JIS)"
-msgstr "Japonès (Shift_JIS)"
+msgstr "జపనీస్ (Shift_JIS)"
 
-#: ../src/charset.c:78
+#: ../src/charset.c:76
 msgid "Korean (EUC-KR)"
-msgstr "Coreà (EUC-KR)"
+msgstr "కొరియన్ (EUC-KR)"
 
-#: ../src/charset.c:79
+#: ../src/charset.c:77
 msgid "Nordic (ISO-8859-10)"
-msgstr "Nòrdic (ISO-8859-10)"
+msgstr "నార్డిక్ (ISO-8859-10)"
 
-#: ../src/charset.c:80
+#: ../src/charset.c:78
 msgid "South European (ISO-8859-3)"
-msgstr "Europeu meridional (ISO-8859-3) "
+msgstr "సౌత్ యురోపియన్ (ISO-8859-3)"
 
-#: ../src/charset.c:81
+#: ../src/charset.c:79
 msgid "Thai (TIS-620)"
-msgstr "Tai (TIS-620)"
+msgstr "థాయ్ (TIS-620)"
 
-#: ../src/charset.c:82
+#: ../src/charset.c:80
 msgid "Turkish (IBM-857)"
-msgstr "Turc (IBM-857)"
+msgstr "టర్కిష్ (IBM-857)"
 
-#: ../src/charset.c:83
+#: ../src/charset.c:81
 msgid "Turkish (ISO-8859-9)"
-msgstr "Turc (ISO-8859-9)"
+msgstr "టర్కిష్ (ISO-8859-9)"
 
-#: ../src/charset.c:84
+#: ../src/charset.c:82
 msgid "Turkish (Windows-1254)"
-msgstr "Turc (Windows-1254)"
+msgstr "టర్కిష్ (విండోస్-1254)"
 
 #. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
-#: ../src/charset.c:86
+#: ../src/charset.c:84
 msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
+msgstr "యూనీకోడ్ (UTF-8)"
 
 #. {N_("Unicode (UTF-16BE)"),                "UTF-16BE"      },
 #. {N_("Unicode (UTF-16LE)"),                "UTF-16LE"      },
 #. {N_("Unicode (UTF-32BE)"),                "UTF-32BE"      },
 #. {N_("Unicode (UTF-32LE)"),                "UTF-32LE"      },
-#: ../src/charset.c:93
+#: ../src/charset.c:91
 msgid "Vietnamese (VISCII)"
-msgstr "Vietnamita (VISCII)"
+msgstr "వియత్నామీస్ (VISCII)"
 
-#: ../src/charset.c:94
+#: ../src/charset.c:92
 msgid "Vietnamese (Windows-1258)"
-msgstr "Vietnamita (Windows-1258)"
+msgstr "వియత్నామీస్ (విండోస్-1258)"
 
-#: ../src/charset.c:95
+#: ../src/charset.c:93
 msgid "Visual Hebrew (ISO-8859-8)"
-msgstr "Hebreu visual (ISO-8859-8)"
+msgstr "విజువల్ హిబ్రూ (ISO-8859-8)"
 
-#: ../src/charset.c:96
+#: ../src/charset.c:94
 msgid "Western (IBM-850)"
-msgstr "Occidental (IBM-850)"
+msgstr "వెస్ట్రన్ (IBM-850)"
 
-#: ../src/charset.c:97
+#: ../src/charset.c:95
 msgid "Western (ISO-8859-1)"
-msgstr "Occidental (ISO-8859-1)"
+msgstr "వెస్ట్రన్ (ISO-8859-1)"
 
-#: ../src/charset.c:98
+#: ../src/charset.c:96
 msgid "Western (ISO-8859-15)"
-msgstr "Occidental (ISO-8859-15)"
+msgstr "వెస్ట్రన్ (ISO-8859-15)"
 
-#: ../src/charset.c:99
+#: ../src/charset.c:97
 msgid "Western (Windows-1252)"
-msgstr "Occidental (Windows-1252)"
+msgstr "వెస్ట్రన్ (Windows-1252)"
 
-#: ../src/charset.c:515
+#: ../src/charset.c:511
 #, c-format
 msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 
-#: ../src/charset.c:516 ../src/charset.c:615 ../src/charset.c:679
+#: ../src/charset.c:512 ../src/charset.c:611 ../src/charset.c:674
 msgid "Invalid UTF-8"
-msgstr "Missatge de text UTF-8 no vàlid"
+msgstr "చెల్లని UTF-8"
 
-#: ../src/charset.c:614
+#: ../src/charset.c:610
 #, c-format
 msgid ""
 "The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
 
-#: ../src/charset.c:678
+#: ../src/charset.c:673
 #, c-format
 msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr ""
 
-#: ../src/easytag.c:269
-#, c-format
-msgid "Unknown parameter or path '%s'\n"
-msgstr ""
-
 #. Starting messages
-#: ../src/easytag.c:308
+#: ../src/easytag.c:185
 #, c-format
 msgid "Starting EasyTAG version %s (PID: %d)…"
 msgstr ""
 
-#: ../src/easytag.c:310
+#: ../src/easytag.c:187
 #, c-format
 msgid "Using libid3tag version %s"
 msgstr ""
 
-#: ../src/easytag.c:313
+#: ../src/easytag.c:190
 #, c-format
 msgid "Using id3lib version %d.%d.%d"
 msgstr ""
 
-#: ../src/easytag.c:319
+#: ../src/easytag.c:196
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
 msgstr ""
 
-#: ../src/easytag.c:321
+#: ../src/easytag.c:198
 #, c-format
 msgid "Setting locale: '%s'"
 msgstr ""
 
-#: ../src/easytag.c:326
+#: ../src/easytag.c:203
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')"
 msgstr ""
 
-#: ../src/easytag.c:333
+#: ../src/easytag.c:210
 msgid "Unable to create setting directories"
 msgstr ""
 
+#: ../src/easytag.c:427 ../src/et_core.c:597 ../src/et_core.c:609
+#, c-format
+msgid "Error while querying information for file: '%s' (%s)"
+msgstr ""
+
+#: ../src/easytag.c:490
+#, c-format
+msgid "Cannot open path '%s'"
+msgstr ""
+
 #.
 #. * Browser
 #.
-#: ../src/easytag.c:483 ../src/prefs.c:139 ../src/prefs.c:140
+#: ../src/easytag.c:582 ../src/prefs.c:142
 msgid "Browser"
-msgstr "Navegador"
+msgstr "విహారకం"
 
-#: ../src/easytag.c:505 ../src/et_core.c:2728
+#: ../src/easytag.c:604 ../src/et_core.c:2817
 msgid "File"
-msgstr "Fitxer"
+msgstr "దస్త్రం"
 
 #. Default values are MPs data
 #. Nothing to display
@@ -1631,926 +1650,858 @@ msgstr "Fitxer"
 #. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
 #. Version changed to encoder version
 #. Encoder version
-#: ../src/easytag.c:537 ../src/easytag.c:4433 ../src/flac_header.c:236
+#: ../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:230 ../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 "Codificador:"
+msgstr "ఎన్కోడరు:"
 
-#: ../src/easytag.c:545
+#: ../src/easytag.c:644
 msgid "Bitrate:"
-msgstr "Taxa de bits:"
+msgstr "బిట్‌రేట్:"
 
 #. Translators: Please try to keep this string as short as possible as it
 #. * is shown in a narrow column.
-#: ../src/easytag.c:555
-msgid "Freq.:"
-msgstr ""
+#: ../src/easytag.c:654
+msgid "Frequency:"
+msgstr "పౌనఃపున్యం:"
 
 #. Mode
-#: ../src/easytag.c:566 ../src/easytag.c:4437 ../src/mpeg_header.c:216
+#: ../src/easytag.c:665 ../src/easytag.c:4236 ../src/mpeg_header.c:216
 msgid "Mode:"
-msgstr "Mode:"
+msgstr "రీతి:"
 
-#: ../src/easytag.c:573
+#: ../src/easytag.c:672
 msgid "Size:"
-msgstr "Mida:"
+msgstr "పరిమాణం:"
 
-#: ../src/easytag.c:580
+#: ../src/easytag.c:679
 msgid "Duration:"
-msgstr "Durada:"
+msgstr "నిడివి:"
 
 #. Main Frame
-#: ../src/easytag.c:626 ../src/et_core.c:2666
+#: ../src/easytag.c:726 ../src/et_core.c:2747
 msgid "Tag"
-msgstr "Etiqueta"
+msgstr "కొస"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: ../src/easytag.c:648
+#: ../src/easytag.c:748
 msgid "Common"
-msgstr "Comú"
+msgstr "ఉమ్మడి"
 
 #. Title
-#: ../src/easytag.c:655
+#: ../src/easytag.c:755
 msgid "Title:"
-msgstr "Títol:"
+msgstr "శీర్షిక:"
 
-#: ../src/easytag.c:670
+#: ../src/easytag.c:769
 msgid "Tag selected files with this title"
 msgstr ""
 
 #. Artist
-#: ../src/easytag.c:675
+#: ../src/easytag.c:774
 msgid "Artist:"
-msgstr "Artista:"
+msgstr "కళాకారి:"
 
-#: ../src/easytag.c:690
+#: ../src/easytag.c:788
 msgid "Tag selected files with this artist"
 msgstr ""
 
 #. Album Artist
-#: ../src/easytag.c:695
+#: ../src/easytag.c:793
 msgid "Album artist:"
-msgstr ""
+msgstr "ఆల్బమ్ కళాకారి:"
 
-#: ../src/easytag.c:710
+#: ../src/easytag.c:807
 msgid "Tag selected files with this album artist"
 msgstr ""
 
 #. Album
-#: ../src/easytag.c:715
+#: ../src/easytag.c:812
 msgid "Album:"
-msgstr "Àlbum:"
+msgstr "ఆల్బమ్:"
 
-#: ../src/easytag.c:730
+#: ../src/easytag.c:826
 msgid "Tag selected files with this album name"
 msgstr ""
 
 #. Disc Number
-#: ../src/easytag.c:735
+#: ../src/easytag.c:831
 msgid "CD:"
-msgstr ""
+msgstr "సీడీ:"
 
-#: ../src/easytag.c:753
+#: ../src/easytag.c:848
 msgid "Tag selected files with this disc number"
 msgstr ""
 
 #. Year
-#: ../src/easytag.c:758
+#: ../src/easytag.c:853
 msgid "Year:"
-msgstr "Any:"
+msgstr "సంవత్సరం:"
 
-#: ../src/easytag.c:779
+#: ../src/easytag.c:873
 msgid "Tag selected files with this year"
 msgstr ""
 
-#: ../src/easytag.c:793
+#: ../src/easytag.c:887
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 
 #. To have enough space to display the icon
 #. To have enough space to display the icon
-#: ../src/easytag.c:802
+#: ../src/easytag.c:896
 msgid "Track #:"
-msgstr ""
+msgstr "పాట #:"
 
-#: ../src/easytag.c:833
+#: ../src/easytag.c:927
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
 msgstr ""
 
-#: ../src/easytag.c:854
+#: ../src/easytag.c:947
 msgid "Tag selected files with this number of tracks"
 msgstr ""
 
 #. Genre
-#: ../src/easytag.c:858
+#: ../src/easytag.c:951
 msgid "Genre:"
-msgstr "Gènere:"
+msgstr "సాహిత్యం:"
 
-#: ../src/easytag.c:887
+#: ../src/easytag.c:979
 msgid "Tag selected files with this genre"
 msgstr ""
 
 #. Comment
-#: ../src/easytag.c:892
+#: ../src/easytag.c:984
 msgid "Comment:"
-msgstr "Comentari:"
+msgstr "వ్యాఖ్య:"
 
-#: ../src/easytag.c:920
+#: ../src/easytag.c:1011
 msgid "Tag selected files with this comment"
 msgstr ""
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. Composer (name of the composers)
-#: ../src/easytag.c:927
+#: ../src/easytag.c:1018
 msgid "Composer:"
-msgstr "Compositor:"
+msgstr "స్వరకర్త:"
 
-#: ../src/easytag.c:942
+#: ../src/easytag.c:1032
 msgid "Tag selected files with this composer"
 msgstr ""
 
 #. 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:949
+#: ../src/easytag.c:1039
 msgid "Orig. artist:"
-msgstr ""
+msgstr "అసలు కళాకారి:"
 
-#: ../src/easytag.c:964
+#: ../src/easytag.c:1053
 msgid "Tag selected files with this original artist"
 msgstr ""
 
 #. Copyright
-#: ../src/easytag.c:970
+#: ../src/easytag.c:1059
 msgid "Copyright:"
-msgstr "Copyright:"
+msgstr "నకలుహక్కు:"
 
-#: ../src/easytag.c:985
+#: ../src/easytag.c:1073
 msgid "Tag selected files with this copyright"
 msgstr ""
 
 #. URL
-#: ../src/easytag.c:991
+#: ../src/easytag.c:1079
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/easytag.c:1006
+#: ../src/easytag.c:1093
 msgid "Tag selected files with this URL"
 msgstr ""
 
 #. Encoded by
-#: ../src/easytag.c:1012
+#: ../src/easytag.c:1099
 msgid "Encoded by:"
-msgstr ""
+msgstr "ఎన్కోడు చేసినవారు:"
 
-#: ../src/easytag.c:1027
+#: ../src/easytag.c:1113
 msgid "Tag selected files with this encoder name"
 msgstr ""
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1078
+#: ../src/easytag.c:1147 ../src/et_core.c:3189 ../src/et_core.c:3192
 msgid "Images"
-msgstr ""
+msgstr "బొమ్మలు"
 
-#: ../src/easytag.c:1101
+#: ../src/easytag.c:1171
 msgid "You can use drag and drop to add an image"
 msgstr ""
 
-#: ../src/easytag.c:1148
+#: ../src/easytag.c:1218
 msgid "Add images to the tag"
 msgstr ""
 
-#: ../src/easytag.c:1166
+#: ../src/easytag.c:1236
 msgid "Remove selected images from the tag"
 msgstr ""
 
-#: ../src/easytag.c:1180
+#: ../src/easytag.c:1250
 msgid "Save the selected images to files"
 msgstr ""
 
-#: ../src/easytag.c:1191
+#: ../src/easytag.c:1261
 msgid "Edit image properties"
 msgstr ""
 
-#: ../src/easytag.c:1205
+#: ../src/easytag.c:1275
 msgid "Tag selected files with these images"
 msgstr ""
 
-#: ../src/easytag.c:1265
+#: ../src/easytag.c:1333
 #, c-format
 msgid "Selected files tagged with title '%s'."
 msgstr ""
 
-#: ../src/easytag.c:1267
+#: ../src/easytag.c:1335
 msgid "Removed title from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1284
+#: ../src/easytag.c:1350
 #, c-format
 msgid "Selected files tagged with artist '%s'."
 msgstr ""
 
-#: ../src/easytag.c:1286
+#: ../src/easytag.c:1352
 msgid "Removed artist from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1303
+#: ../src/easytag.c:1366
 #, c-format
 msgid "Selected files tagged with album artist '%s'."
 msgstr ""
 
-#: ../src/easytag.c:1305
+#: ../src/easytag.c:1368
 msgid "Removed album artist from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1322
+#: ../src/easytag.c:1383
 #, c-format
 msgid "Selected files tagged with album '%s'."
 msgstr ""
 
-#: ../src/easytag.c:1324
+#: ../src/easytag.c:1385
 msgid "Removed album name from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1341
+#: ../src/easytag.c:1422
+#, c-format
+msgid "Selected files tagged with disc number '%s/%s'."
+msgstr ""
+
+#: ../src/easytag.c:1427
 #, c-format
-msgid "Selected files tagged with disc number '%s'."
+msgid "Selected files tagged with disc number like 'xx'."
 msgstr ""
 
-#: ../src/easytag.c:1343
+#: ../src/easytag.c:1432
 msgid "Removed disc number from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1360
+#: ../src/easytag.c:1448
 #, c-format
 msgid "Selected files tagged with year '%s'."
 msgstr ""
 
-#: ../src/easytag.c:1362
+#: ../src/easytag.c:1450
 msgid "Removed year from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1390 ../src/easytag.c:1486
+#: ../src/easytag.c:1476 ../src/easytag.c:1567
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr ""
 
-#: ../src/easytag.c:1393
+#: ../src/easytag.c:1479
 #, c-format
 msgid "Selected files tagged with track like 'xx'."
 msgstr ""
 
-#: ../src/easytag.c:1397 ../src/easytag.c:1489
+#: ../src/easytag.c:1483 ../src/easytag.c:1570
 msgid "Removed track number from selected files."
 msgstr ""
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1455
+#: ../src/easytag.c:1540
 #, c-format
 msgid "Selected tracks numbered sequentially."
 msgstr ""
 
-#: ../src/easytag.c:1507
+#: ../src/easytag.c:1586
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr ""
 
-#: ../src/easytag.c:1509
+#: ../src/easytag.c:1588
 msgid "Removed genre from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1533
+#: ../src/easytag.c:1610
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr ""
 
-#: ../src/easytag.c:1535
+#: ../src/easytag.c:1612
 msgid "Removed comment from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1552
+#: ../src/easytag.c:1626
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr ""
 
-#: ../src/easytag.c:1554
+#: ../src/easytag.c:1628
 msgid "Removed composer from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1571
+#: ../src/easytag.c:1643
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr ""
 
-#: ../src/easytag.c:1573
+#: ../src/easytag.c:1645
 msgid "Removed original artist from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1590
+#: ../src/easytag.c:1660
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr ""
 
-#: ../src/easytag.c:1592
+#: ../src/easytag.c:1662
 msgid "Removed copyright from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1609
+#: ../src/easytag.c:1677
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr ""
 
-#: ../src/easytag.c:1611
+#: ../src/easytag.c:1679
 msgid "Removed URL from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1628
+#: ../src/easytag.c:1694
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr ""
 
-#: ../src/easytag.c:1630
+#: ../src/easytag.c:1696
 msgid "Removed encoder name from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1665
+#: ../src/easytag.c:1728
 msgid "Selected files tagged with images."
 msgstr ""
 
-#: ../src/easytag.c:1667
+#: ../src/easytag.c:1730
 msgid "Removed images from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1925
+#: ../src/easytag.c:2011
 msgid "Select Mode and Mask, and redo the same action"
 msgstr ""
 
-#: ../src/easytag.c:1980
+#: ../src/easytag.c:2063
 msgid "All tags have been scanned"
 msgstr ""
 
-#: ../src/easytag.c:2038
+#: ../src/easytag.c:2119
 msgid "All tags have been removed"
 msgstr ""
 
-#: ../src/easytag.c:2334
+#: ../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] ""
 msgstr[1] ""
 
-#: ../src/easytag.c:2337
+#: ../src/easytag.c:2429
 msgid "Do you want to continue saving the file?"
 msgstr ""
 
-#: ../src/easytag.c:2388 ../src/easytag.c:2409
+#: ../src/easytag.c:2487 ../src/easytag.c:2507
 msgid "Saving files was stopped"
 msgstr ""
 
-#: ../src/easytag.c:2411
+#: ../src/easytag.c:2509
 msgid "All files have been saved"
 msgstr ""
 
-#: ../src/easytag.c:2562
+#: ../src/easytag.c:2644
+#, c-format
+msgid "Cannot delete file (%s)"
+msgstr ""
+
+#: ../src/easytag.c:2665
 msgid "Files have been partially deleted"
 msgstr ""
 
-#: ../src/easytag.c:2564
+#: ../src/easytag.c:2667
 msgid "All files have been deleted"
 msgstr ""
 
-#: ../src/easytag.c:2680
+#: ../src/easytag.c:2783
 #, c-format
 msgid "Do you want to write the tag of file '%s'?"
 msgstr ""
 
-#: ../src/easytag.c:2682
+#: ../src/easytag.c:2785
 msgid "Confirm Tag Writing"
 msgstr ""
 
-#: ../src/easytag.c:2687 ../src/easytag.c:2799 ../src/easytag.c:3426
+#: ../src/easytag.c:2790 ../src/easytag.c:2910 ../src/easytag.c:3173
 msgid "Repeat action for the remaining files"
 msgstr ""
 
 #. Directories and filename changed
-#: ../src/easytag.c:2763 ../src/scan.c:180
+#: ../src/easytag.c:2874 ../src/scan_dialog.c:183
 msgid "Rename File and Directory"
 msgstr ""
 
-#: ../src/easytag.c:2764
+#: ../src/easytag.c:2875
 msgid "File and directory rename confirmation required"
 msgstr ""
 
-#: ../src/easytag.c:2765
+#: ../src/easytag.c:2876
 #, c-format
 msgid "Do you want to rename the file and directory '%s' to '%s'?"
 msgstr ""
 
-#. Only directories changed
-#: ../src/easytag.c:2770
-msgid "Rename Directory"
-msgstr ""
-
-#: ../src/easytag.c:2771
+#: ../src/easytag.c:2882
 msgid "Directory rename confirmation required"
 msgstr ""
 
-#: ../src/easytag.c:2772
+#: ../src/easytag.c:2883
 #, c-format
 msgid "Do you want to rename the directory '%s' to '%s'?"
 msgstr ""
 
 #. Only filename changed
-#: ../src/easytag.c:2778
-#, fuzzy
-#| msgid "Delete File"
+#: ../src/easytag.c:2889
 msgid "Rename File"
-msgstr "Suprimeix el fitxer"
+msgstr ""
 
-#: ../src/easytag.c:2779
+#: ../src/easytag.c:2890
 msgid "File rename confirmation required"
 msgstr ""
 
-#: ../src/easytag.c:2780
+#: ../src/easytag.c:2891
 #, c-format
 msgid "Do you want to rename the file '%s' to '%s'?"
 msgstr ""
 
-#: ../src/easytag.c:2874
-#, c-format
-msgid "Writing tag of '%s'"
-msgstr ""
-
-#: ../src/easytag.c:2880
-msgid "Tag(s) written"
-msgstr ""
-
-#: ../src/easytag.c:2891 ../src/easytag.c:2897
-#, c-format
-msgid "Cannot write tag in file '%s' (%s)"
-msgstr ""
-
-#: ../src/easytag.c:2910
-#, c-format
-msgid "Cannot write tag in file '%s'"
-msgstr ""
-
-#: ../src/easytag.c:2913
-msgid "Tag Write Error"
-msgstr ""
-
-#: ../src/easytag.c:3045
-#, c-format
-msgid "Renaming file '%s'"
-msgstr ""
-
-#. Renaming file to the temporary filename has failed
-#: ../src/easytag.c:3065
-#, c-format
-msgid "Cannot rename file '%s' to '%s' (%s)"
-msgstr ""
-
-#: ../src/easytag.c:3073 ../src/easytag.c:3114 ../src/easytag.c:3142
-#: ../src/easytag.c:3363
+#: ../src/easytag.c:2957
 #, c-format
 msgid "Cannot rename file '%s' to '%s'"
 msgstr ""
 
-#: ../src/easytag.c:3085 ../src/easytag.c:3129 ../src/easytag.c:3155
-#: ../src/easytag.c:3377
-msgid "File(s) not renamed"
-msgstr ""
-
-#: ../src/easytag.c:3124 ../src/easytag.c:3373
+#: ../src/easytag.c:2971
 #, c-format
 msgid "Cannot rename file '%s' to '%s': %s"
 msgstr ""
 
-#: ../src/easytag.c:3150
-#, c-format
-msgid "Cannot rename file '%s' because the following file already exists: '%s'"
-msgstr ""
-
-#: ../src/easytag.c:3185
-#, c-format
-msgid "Cannot create target directory '%s'"
-msgstr ""
-
-#: ../src/easytag.c:3193
-#, c-format
-msgid "Cannot create target directory '%s': %s"
-msgstr ""
-
-#. Renaming file has succeeded
-#: ../src/easytag.c:3212
-#, c-format
-msgid "Renamed file '%s' to '%s'"
-msgstr ""
-
-#: ../src/easytag.c:3218
-#, fuzzy
-#| msgid "File Name"
-msgid "File(s) renamed"
-msgstr "Nom del fitxer"
-
-#: ../src/easytag.c:3234 ../src/easytag.c:3292
-#, c-format
-msgid "Cannot remove old directory '%s'"
-msgstr ""
-
-#: ../src/easytag.c:3237 ../src/easytag.c:3295
-msgid "Remove Directory Error"
-msgstr ""
-
-#: ../src/easytag.c:3242
-#, c-format
-msgid "Cannot remove old directory '%s': %s"
+#: ../src/easytag.c:2975
+msgid "File(s) not renamed"
 msgstr ""
 
-#. Renaming file has succeeded
-#: ../src/easytag.c:3270
+#: ../src/easytag.c:3087
 #, c-format
-msgid "Moved file '%s' to '%s'"
+msgid "Writing tag of '%s'"
 msgstr ""
 
-#: ../src/easytag.c:3276
-#, fuzzy
-#| msgid "File Name"
-msgid "File(s) moved"
-msgstr "Nom del fitxer"
-
-#: ../src/easytag.c:3300
-#, c-format
-msgid "Cannot remove old directory '%s': (%s)"
+#: ../src/easytag.c:3094
+msgid "Tag(s) written"
 msgstr ""
 
-#: ../src/easytag.c:3326
+#: ../src/easytag.c:3109
 #, c-format
-msgid "Cannot move file '%s' to '%s'"
-msgstr ""
-
-#: ../src/easytag.c:3330
-msgid "File Move Error"
+msgid "Cannot write tag in file '%s' (%s)"
 msgstr ""
 
-#: ../src/easytag.c:3336
+#: ../src/easytag.c:3122
 #, c-format
-msgid "Cannot move file '%s' to '%s': (%s)"
+msgid "Cannot write tag in file '%s'"
 msgstr ""
 
-#: ../src/easytag.c:3341
-msgid "File(s) not moved"
+#: ../src/easytag.c:3125
+msgid "Tag Write Error"
 msgstr ""
 
-#: ../src/easytag.c:3423 ../src/easytag.c:3437
+#: ../src/easytag.c:3170 ../src/easytag.c:3184
 #, c-format
 msgid "Do you really want to delete the file '%s'?"
 msgstr ""
 
-#: ../src/easytag.c:3429 ../src/easytag.c:3439
+#: ../src/easytag.c:3176 ../src/easytag.c:3186
 msgid "Delete File"
-msgstr "Suprimeix el fitxer"
+msgstr ""
 
-#: ../src/easytag.c:3459
+#: ../src/easytag.c:3211
 #, c-format
 msgid "File '%s' deleted"
 msgstr ""
 
-#: ../src/easytag.c:3598
+#: ../src/easytag.c:3346
 #, c-format
 msgid "Cannot read directory '%s'"
 msgstr ""
 
-#: ../src/easytag.c:3601
+#: ../src/easytag.c:3350
 msgid "Directory Read Error"
 msgstr ""
 
 #. Read the directory recursively
-#: ../src/easytag.c:3621
+#: ../src/easytag.c:3371
 #, c-format
 msgid "Search in progress…"
 msgstr ""
 
-#: ../src/easytag.c:3638 ../src/et_core.c:2735
+#: ../src/easytag.c:3394 ../src/et_core.c:2824
 #, c-format
 msgid "File: '%s'"
 msgstr ""
 
-#: ../src/easytag.c:3688
+#: ../src/easytag.c:3444
 #, c-format
-msgid "Found %d file(s) in this directory and subdirectories."
-msgstr ""
+msgid "Found one file in this directory and subdirectories"
+msgid_plural "Found %d files in this directory and subdirectories"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/easytag.c:3690
+#: ../src/easytag.c:3451
 #, c-format
-msgid "Found %d file(s) in this directory."
-msgstr ""
+msgid "Found one file in this directory"
+msgid_plural "Found %d files in this directory"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/easytag.c:3709
+#: ../src/easytag.c:3473
 msgid "No file found in this directory and subdirectories"
 msgstr ""
 
-#: ../src/easytag.c:3711
+#: ../src/easytag.c:3475
 msgid "No file found in this directory"
 msgstr ""
 
-#: ../src/easytag.c:3802
-msgid "Searching…"
-msgstr "S'està cercant…"
+#: ../src/easytag.c:3543
+#, c-format
+msgid "Error opening directory '%s' (%s)"
+msgstr ""
+
+#: ../src/easytag.c:3579
+#, c-format
+msgid "Cannot read directory (%s)"
+msgstr ""
+
+#: ../src/easytag.c:3599
+msgid "Searching for audio files…"
+msgstr ""
 
-#. Button to stop...
-#: ../src/easytag.c:3822
-msgid "  STOP the search...  "
+#: ../src/easytag.c:3600
+msgid "Searching"
 msgstr ""
 
-#: ../src/easytag.c:4467
+#: ../src/easytag.c:4266
 msgid "Select a directory to browse"
 msgstr ""
 
 #. Menu items
-#: ../src/easytag.c:4614
+#: ../src/easytag.c:4412
 msgid "Tag selected files with this field"
 msgstr ""
 
-#. Group: character conversion
-#: ../src/easytag.c:4626 ../src/scan.c:2680
+#: ../src/easytag.c:4424 ../src/scan_dialog.c:2124
 msgid "Convert '_' and '%20' to spaces"
 msgstr ""
 
-#: ../src/easytag.c:4633 ../src/scan.c:2681
+#: ../src/easytag.c:4431 ../src/scan_dialog.c:2126
 msgid "Convert ' ' to '_'"
 msgstr ""
 
-#. Group: capitalize, ...
-#: ../src/easytag.c:4644 ../src/scan.c:2732
+#: ../src/easytag.c:4442
 msgid "All uppercase"
 msgstr ""
 
-#: ../src/easytag.c:4651 ../src/scan.c:2733
-#, fuzzy
-#| msgid "All Files"
+#: ../src/easytag.c:4449
 msgid "All lowercase"
-msgstr "Tots els fitxers"
+msgstr ""
 
-#: ../src/easytag.c:4658 ../src/scan.c:2734
+#: ../src/easytag.c:4456
 msgid "First letter uppercase"
 msgstr ""
 
-#: ../src/easytag.c:4665 ../src/scan.c:2735
+#: ../src/easytag.c:4463
 msgid "First letter uppercase of each word"
 msgstr ""
 
-#. Group: insert/remove spaces
-#: ../src/easytag.c:4676 ../src/prefs.c:1048 ../src/scan.c:2783
+#: ../src/easytag.c:4474 ../src/prefs.c:1023 ../src/scan_dialog.c:2224
 msgid "Remove spaces"
 msgstr ""
 
-#: ../src/easytag.c:4683
+#: ../src/easytag.c:4481
 msgid "Insert space before uppercase letter"
 msgstr ""
 
-#: ../src/easytag.c:4690
+#: ../src/easytag.c:4488
 msgid "Remove duplicate spaces or underscores"
 msgstr ""
 
-#: ../src/easytag.c:4697
+#: ../src/easytag.c:4495
 msgid "Remove all text"
 msgstr ""
 
-#. gchar commmand[256];
-#: ../src/easytag.c:4720
-#, c-format
-msgid "EasyTAG version %s: Abnormal exit (PID: %d)"
+#: ../src/easytag.c:4514
+msgid "EasyTAG: Normal exit."
 msgstr ""
 
-#: ../src/easytag.c:4721
-#, c-format
-msgid "Received signal %s (%d)"
+#: ../src/easytag.c:4566
+msgid "Do you want to save them before quitting?"
 msgstr ""
 
-#: ../src/easytag.c:4723 ../src/easytag.c:4733
-#, 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"
+#: ../src/easytag.c:4593
+msgid "Do you really want to quit?"
 msgstr ""
 
-#. To send messages to the console...
-#: ../src/easytag.c:4729
+#: ../src/et_core.c:510
 #, c-format
-msgid "EasyTAG version %s: Abnormal exit (PID: %d)."
+msgid "Error reading tag from ogg file (%s)"
 msgstr ""
 
-#: ../src/easytag.c:4731
+#: ../src/et_core.c:539
 #, c-format
-msgid "Received signal %s (%d)\a"
-msgstr ""
-
-#: ../src/easytag.c:4861
-msgid "Unknown signal"
+msgid "Error reading tag from Opus file (%s)"
 msgstr ""
 
-#: ../src/easytag.c:4874
-msgid "EasyTAG: Normal exit."
-msgstr ""
-
-#: ../src/easytag.c:4925
-msgid "Do you want to save them before quitting?"
-msgstr ""
-
-#: ../src/easytag.c:4948
-msgid "Do you really want to quit?"
-msgstr "Segur que voleu sortir?"
-
-#: ../src/et_core.c:621
+#: ../src/et_core.c:682
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: ../src/et_core.c:2632
+#: ../src/et_core.c:2707
 msgid "ID3 Tag"
-msgstr ""
+msgstr "ID3 కొస"
 
-#: ../src/et_core.c:2638
+#: ../src/et_core.c:2713
 msgid "Ogg Vorbis Tag"
 msgstr ""
 
-#: ../src/et_core.c:2644
+#: ../src/et_core.c:2719
 msgid "FLAC Vorbis Tag"
 msgstr ""
 
-#: ../src/et_core.c:2649
+#: ../src/et_core.c:2724
 msgid "APE Tag"
 msgstr ""
 
-#: ../src/et_core.c:2654
+#: ../src/et_core.c:2729
 msgid "MP4/M4A/AAC Tag"
 msgstr ""
 
-#: ../src/et_core.c:2660
+#: ../src/et_core.c:2735
 msgid "Wavpack Tag"
 msgstr ""
 
-#: ../src/et_core.c:2680
-msgid "MP3 File"
+#: ../src/et_core.c:2741
+msgid "Opus Tag"
 msgstr ""
 
-#: ../src/et_core.c:2684
+#: ../src/et_core.c:2761
+msgid "MP3 File"
+msgstr "MP3 దస్త్రం"
+
+#: ../src/et_core.c:2765
 msgid "MP2 File"
-msgstr ""
+msgstr "MP2 దస్త్రం"
 
-#: ../src/et_core.c:2690
+#: ../src/et_core.c:2771
 msgid "Ogg Vorbis File"
-msgstr ""
+msgstr "Ogg Vorbis దస్త్రం"
 
-#: ../src/et_core.c:2696
+#: ../src/et_core.c:2777
 msgid "Speex File"
-msgstr ""
+msgstr "Speex దస్త్రం"
 
-#: ../src/et_core.c:2702
+#: ../src/et_core.c:2783
 msgid "FLAC File"
-msgstr ""
+msgstr "FLAC దస్త్రం"
 
-#: ../src/et_core.c:2707
+#: ../src/et_core.c:2788
 msgid "MusePack File"
 msgstr ""
 
-#: ../src/et_core.c:2711
+#: ../src/et_core.c:2792
 msgid "Monkey's Audio File"
 msgstr ""
 
-#: ../src/et_core.c:2716
+#: ../src/et_core.c:2797
 msgid "MP4/AAC File"
-msgstr ""
+msgstr "MP4/AAC దస్త్రం"
 
-#: ../src/et_core.c:2722
+#: ../src/et_core.c:2803
 msgid "Wavpack File"
-msgstr ""
+msgstr "Wavpack దస్త్రం"
 
-#: ../src/et_core.c:2774
-msgid "Read-only file"
-msgstr ""
+#: ../src/et_core.c:2809
+msgid "Opus File"
+msgstr "Opus దస్త్రం"
 
-#: ../src/et_core.c:2780
+#: ../src/et_core.c:2868 ../src/et_core.c:2923
 msgid "File not found"
+msgstr "దస్త్రం కనపడలేదు"
+
+#: ../src/et_core.c:2873
+#, c-format
+msgid "Cannot query file information (%s)"
+msgstr ""
+
+#: ../src/et_core.c:2907
+msgid "Read-only file"
 msgstr ""
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2833
+#: ../src/et_core.c:2971
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ఒక దస్త్రం"
+msgstr[1] "%u దస్త్రాలు"
 
-#: ../src/et_core.c:3020
+#: ../src/et_core.c:3175
 #, c-format
 msgid "Images (%d)"
 msgstr ""
 
 #. Bitrate
-#: ../src/et_core.c:3060 ../src/flac_header.c:240
-#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:135
+#: ../src/et_core.c:3217 ../src/flac_header.c:205
+#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
 #: ../src/mpeg_header.c:206 ../src/musepack_header.c:88
-#: ../src/ogg_header.c:242 ../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 ""
+msgstr "%d కిబై/సె"
 
 #. Samplerate
-#: ../src/et_core.c:3065 ../src/flac_header.c:245
-#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:140
+#: ../src/et_core.c:3222 ../src/flac_header.c:210
+#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
 #: ../src/mpeg_header.c:211 ../src/musepack_header.c:93
-#: ../src/ogg_header.c:247 ../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 ""
+msgstr "%d హెర్ట్జ్"
 
-#: ../src/et_core.c:3209 ../src/scan.c:686
+#: ../src/et_core.c:3368 ../src/scan_dialog.c:688
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding"
 msgstr ""
 
-#: ../src/et_core.c:3211
+#: ../src/et_core.c:3370
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr ""
 
-#: ../src/et_core.c:3212 ../src/scan.c:688
+#: ../src/et_core.c:3371 ../src/scan_dialog.c:690
 msgid "Filename translation"
+msgstr "దస్త్రంపేరు అనువాదం"
+
+#: ../src/et_core.c:4076
+#, c-format
+msgid "Error writing tag type %d to file %s (%s)"
 msgstr ""
 
 #. Mode
 #. Mode
 #. mpeg4ip library seems to always return -1
 #. Mode
-#: ../src/flac_header.c:250 ../src/mp4_header.c:146 ../src/ogg_header.c:252
-#: ../src/wavpack_header.c:88
+#: ../src/flac_header.c:215 ../src/mp4_header.c:145 ../src/ogg_header.c:411
+#: ../src/opus_header.c:237 ../src/wavpack_header.c:88
 msgid "Channels:"
-msgstr "Canals:"
+msgstr "ఛానళ్ళు:"
 
-#: ../src/flac_tag.c:133 ../src/flac_tag.c:852 ../src/flac_tag.c:862
+#: ../src/flac_tag.c:131 ../src/flac_tag.c:850 ../src/flac_tag.c:860
 #, c-format
 msgid "Error while opening file: '%s' as FLAC (%s)."
 msgstr ""
 
-#: ../src/flac_tag.c:320 ../src/ogg_tag.c:297
+#: ../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 "
 "be lost while saving tag."
 msgstr ""
 
-#: ../src/flac_tag.c:1064
+#: ../src/flac_tag.c:1061
 #, c-format
 msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
-#: ../src/flac_tag.c:1097 ../src/ogg_tag.c:830
+#: ../src/flac_tag.c:1094
 #, c-format
 msgid "Error: Failed to write comments to file '%s' (%s)."
 msgstr ""
 
-#: ../src/flac_tag.c:1102 ../src/ogg_tag.c:837
+#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1166
 #, c-format
 msgid "Written tag of '%s'"
 msgstr ""
 
-#: ../src/id3_tag.c:505
+#: ../src/id3_tag.c:158
+#, c-format
+msgid "Error while reading file: '%s' (%s)"
+msgstr ""
+
+#: ../src/id3_tag.c:170
+#, c-format
+msgid ""
+"As the following corrupted file '%s' will cause an error in id3lib, it will "
+"not be processed"
+msgstr ""
+
+#: ../src/id3_tag.c:172
+msgid "Corrupted file"
+msgstr "దస్త్రం పాడైనది"
+
+#: ../src/id3_tag.c:555
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr ""
 
-#: ../src/id3_tag.c:509 ../src/id3_tag.c:609
+#: ../src/id3_tag.c:559 ../src/id3_tag.c:659
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr ""
 
-#: ../src/id3_tag.c:511 ../src/id3_tag.c:581
+#: ../src/id3_tag.c:561 ../src/id3_tag.c:631
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr ""
 
-#: ../src/id3_tag.c:530
+#: ../src/id3_tag.c:580
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr ""
 
-#: ../src/id3_tag.c:558
+#: ../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:560
+#: ../src/id3_tag.c:610
 #, c-format
 msgid ""
 "If you reload this file, some characters in the tag may not be displayed "
@@ -2562,290 +2513,256 @@ msgid ""
 "File: %s"
 msgstr ""
 
-#: ../src/id3_tag.c:567
+#: ../src/id3_tag.c:617
 msgid "Buggy id3lib"
 msgstr ""
 
-#: ../src/id3_tag.c:601
+#: ../src/id3_tag.c:651
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr ""
 
-#: ../src/id3_tag.c:615 ../src/id3v24_tag.c:1034
+#: ../src/id3_tag.c:665 ../src/id3v24_tag.c:1048
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr ""
 
-#: ../src/id3_tag.c:634
+#: ../src/id3_tag.c:684
 msgid "No error reported"
 msgstr ""
 
-#: ../src/id3_tag.c:636
+#: ../src/id3_tag.c:686
 msgid "No available memory"
 msgstr ""
 
-#: ../src/id3_tag.c:638
+#: ../src/id3_tag.c:688
 msgid "No data to parse"
 msgstr ""
 
-#: ../src/id3_tag.c:640
+#: ../src/id3_tag.c:690
 msgid "Improperly formatted data"
 msgstr ""
 
-#: ../src/id3_tag.c:642
+#: ../src/id3_tag.c:692
 msgid "No buffer to write to"
 msgstr ""
 
-#: ../src/id3_tag.c:644
+#: ../src/id3_tag.c:694
 msgid "Buffer is too small"
 msgstr ""
 
-#: ../src/id3_tag.c:646
+#: ../src/id3_tag.c:696
 msgid "Invalid frame ID"
 msgstr ""
 
-#: ../src/id3_tag.c:648
+#: ../src/id3_tag.c:698
 msgid "Requested field not found"
 msgstr ""
 
-#: ../src/id3_tag.c:650
+#: ../src/id3_tag.c:700
 msgid "Unknown field type"
 msgstr ""
 
-#: ../src/id3_tag.c:652
+#: ../src/id3_tag.c:702
 msgid "Tag is already attached to a file"
 msgstr ""
 
-#: ../src/id3_tag.c:654
+#: ../src/id3_tag.c:704
 msgid "Invalid tag version"
 msgstr ""
 
-#: ../src/id3_tag.c:656
+#: ../src/id3_tag.c:706
 msgid "No file to parse"
 msgstr ""
 
-#: ../src/id3_tag.c:658
+#: ../src/id3_tag.c:708
 msgid "Attempting to write to a read-only file"
 msgstr ""
 
-#: ../src/id3_tag.c:660
+#: ../src/id3_tag.c:710
 msgid "Error in compression/uncompression"
 msgstr ""
 
-#: ../src/id3_tag.c:662
+#: ../src/id3_tag.c:712
 msgid "Unknown error message"
 msgstr ""
 
-#: ../src/id3_tag.c:1240
-#, c-format
-msgid ""
-"As the following corrupted file '%s' will cause an error in id3lib, it will "
-"not be processed"
-msgstr ""
-
-#: ../src/id3_tag.c:1242
-msgid "Corrupted file"
-msgstr ""
-
-#: ../src/id3_tag.c:1281
+#: ../src/id3_tag.c:1316
 #, c-format
 msgid "Error while creating temporary file: '%s'"
 msgstr ""
 
-#: ../src/id3_tag.c:1288
+#: ../src/id3_tag.c:1323
 msgid "Error while creating temporary file"
 msgstr ""
 
-#: ../src/id3_tag.c:1305
+#: ../src/id3_tag.c:1343
 #, c-format
 msgid "Error while writing to file: '%s' (%s)"
 msgstr ""
 
-#: ../src/id3v24_tag.c:1477
+#. Translators: The first string is a filename, the
+#. * second string is the number of bytes that were
+#. * missing (not read for some reason) while reading from
+#. * the file.
+#.
+#: ../src/id3v24_tag.c:1503
 #, c-format
-msgid ""
-"Cannot write tag of file '%s' (%d bytes were read but %d bytes were expected)"
+msgid "Cannot write tag of file ‘%s’ (a byte was missing)"
+msgid_plural "Cannot write tag of file ‘%s’ (%s bytes were missing)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/id3v24_tag.c:1524
+#, c-format
+msgid "Cannot save tag of file '%s'"
 msgstr ""
 
-#: ../src/id3v24_tag.c:1496
+#: ../src/id3v24_tag.c:1535
 #, c-format
 msgid "Size error while saving tag of '%s'"
 msgstr ""
 
-#: ../src/log.c:103
+#: ../src/log.c:100
 msgid "Log"
-msgstr "Registre"
-
-#: ../src/misc.c:778
-msgid "Select File"
-msgstr "Seleccioneu un fitxer"
-
-#: ../src/misc.c:784
-msgid "Select Directory"
-msgstr "Seleccioneu una carpeta"
+msgstr "చిట్టా"
 
-#: ../src/misc.c:865
-msgid "No audio player defined"
+#: ../src/misc.c:720
+msgid "You must type a program name"
 msgstr ""
 
-#: ../src/misc.c:866
-msgid "Audio Player Warning"
+#: ../src/misc.c:721
+msgid "Program Name Error"
 msgstr ""
 
-#: ../src/misc.c:959
-msgid "Cannot fork another process"
+#: ../src/misc.c:800
+#, c-format
+msgid "Executed command: %s"
 msgstr ""
 
-#: ../src/misc.c:965
+#: ../src/misc.c:807
 #, c-format
-msgid "Cannot execute %s (%s)"
+msgid "Failed to launch program: %s"
 msgstr ""
 
-#. Translators: file size (bytes, kilobytes, megabytes, gigabytes,
-#. * terabytes).
-#: ../src/misc.c:1130 ../src/misc.c:1150
-msgid "B"
-msgstr "B"
-
-#: ../src/misc.c:1130 ../src/misc.c:1150
-msgid "kB"
-msgstr "kB"
-
-#: ../src/misc.c:1130 ../src/misc.c:1150
-msgid "MB"
-msgstr "MB"
-
-#: ../src/misc.c:1130 ../src/misc.c:1150
-msgid "GB"
-msgstr "GB"
-
-#: ../src/misc.c:1130 ../src/misc.c:1150
-msgid "TB"
-msgstr "TB"
+#: ../src/misc.c:824
+msgid "Select File"
+msgstr ""
 
-#: ../src/misc.c:1246
-msgid "Generate a playlist"
+#: ../src/misc.c:830
+msgid "Select Directory"
 msgstr ""
 
-#: ../src/misc.c:1270
+#: ../src/misc.c:1142
+msgid "Generate Playlist"
+msgstr "పాటలజాబితాను ఉత్పత్తించు"
+
+#: ../src/misc.c:1166
 msgid "M3U Playlist Name"
 msgstr ""
 
-#: ../src/misc.c:1284
+#: ../src/misc.c:1181
 msgid "Use directory name"
 msgstr ""
 
-#: ../src/misc.c:1308 ../src/misc.c:1407
-msgid "Edit Masks"
-msgstr ""
-
 #. Playlist options
-#: ../src/misc.c:1316
+#: ../src/misc.c:1198
 msgid "Playlist Options"
 msgstr ""
 
-#: ../src/misc.c:1322
+#: ../src/misc.c:1204
 msgid "Include only the selected files"
 msgstr ""
 
-#: ../src/misc.c:1325
+#: ../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:1332
+#: ../src/misc.c:1210
 msgid "Use full path for files in playlist"
 msgstr ""
 
-#: ../src/misc.c:1335
+#: ../src/misc.c:1213
 msgid "Use relative path for files in playlist"
 msgstr ""
 
 #. Create playlist in parent directory
-#: ../src/misc.c:1345
+#: ../src/misc.c:1219
 msgid "Create playlist in the parent directory"
 msgstr ""
 
-#: ../src/misc.c:1348
+#: ../src/misc.c:1222
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 
 #. DOS Separator
-#: ../src/misc.c:1352
+#: ../src/misc.c:1226
 msgid "Use DOS directory separator"
 msgstr ""
 
-#: ../src/misc.c:1358
+#: ../src/misc.c:1232
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
 msgstr ""
 
-#: ../src/misc.c:1367
+#: ../src/misc.c:1241
 msgid "Playlist Content"
 msgstr ""
 
-#: ../src/misc.c:1373
+#: ../src/misc.c:1247
 msgid "Write only list of files"
 msgstr ""
 
-#: ../src/misc.c:1377
+#: ../src/misc.c:1251
 msgid "Write info using filename"
 msgstr ""
 
-#: ../src/misc.c:1380
+#: ../src/misc.c:1254
 msgid "Write info using:"
 msgstr ""
 
-#: ../src/misc.c:1654
-#, c-format
-msgid "Playlist file '%s' already exists"
-msgstr ""
-
-#: ../src/misc.c:1656
-msgid "Do you want to save the playlist, overwriting the existing file?"
-msgstr ""
-
-#: ../src/misc.c:1658
-msgid "Write Playlist"
-msgstr ""
-
-#: ../src/misc.c:1676
+#: ../src/misc.c:1468
 #, c-format
 msgid "Cannot write playlist file '%s'"
 msgstr ""
 
-#: ../src/misc.c:1679
+#: ../src/misc.c:1472
 msgid "Playlist File Error"
 msgstr ""
 
-#: ../src/misc.c:1686
+#: ../src/misc.c:1480
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr ""
 
-#: ../src/misc.c:1936
+#: ../src/misc.c:1544 ../src/scan_dialog.c:2709 ../src/scan_dialog.c:2771
+msgid "Invalid scanner mask"
+msgstr ""
+
+#: ../src/misc.c:1908
 msgid "CD"
-msgstr "CD"
+msgstr ""
 
-#: ../src/misc.c:1956
+#: ../src/misc.c:1930
 msgid "Find Files"
-msgstr "Cerca fitxers"
+msgstr ""
 
-#: ../src/misc.c:1994
+#: ../src/misc.c:1962
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
 
 #. Where...
-#: ../src/misc.c:2000
+#: ../src/misc.c:1968
 msgid "In:"
 msgstr ""
 
 #. Translators: This option is for the previous 'in' option. For instance,
 #. * translate this as "Search" "In:" "the Filename".
-#: ../src/misc.c:2005
+#: ../src/misc.c:1973
 msgid "the Filename"
 msgstr ""
 
@@ -2854,104 +2771,116 @@ msgstr ""
 #. * Note: label changed to "the Tag" (to be the only one) to fix a Hungarian
 #. * grammatical problem (which uses one word to say "in the tag" like here)
 #.
-#: ../src/misc.c:2011
+#: ../src/misc.c:1979
 msgid "the Tag"
 msgstr ""
 
 #. Property of the search
-#: ../src/misc.c:2022 ../src/prefs.c:351
+#: ../src/misc.c:1990 ../src/prefs.c:335
 msgid "Case sensitive"
-msgstr "Distingeix entre majúscules i minúscules"
+msgstr ""
 
-#: ../src/misc.c:2248
+#: ../src/misc.c:2217
 msgid "Ready to search…"
 msgstr ""
 
-#: ../src/misc.c:2479
+#: ../src/misc.c:2437
 #, c-format
-msgid "Found: %d file(s)"
-msgstr "S'ha trobat: %d fitxers"
+msgid "Found one file"
+msgid_plural "Found %d files"
+msgstr[0] "ఒక దస్త్రం కనపడింది"
+msgstr[1] "%d దస్త్రాలు కనపడ్డాయి"
 
-#: ../src/misc.c:2756
-msgid "Load the filenames from a TXT file"
+#: ../src/misc.c:2722
+msgid "Load Filenames From a Text File"
 msgstr ""
 
-#: ../src/misc.c:2784
+#: ../src/misc.c:2751
 msgid "File:"
-msgstr "Fitxer:"
+msgstr "దస్త్రం:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: ../src/misc.c:2803
+#: ../src/misc.c:2770
 msgid " Load "
 msgstr ""
 
-#: ../src/misc.c:2826
-msgid "Content of TXT file"
+#: ../src/misc.c:2788
+msgid "Content of Text File"
 msgstr ""
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2847 ../src/misc.c:2941
+#: ../src/misc.c:2809 ../src/misc.c:2904
 msgid "Insert a blank line before the selected line"
 msgstr ""
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2856 ../src/misc.c:2950
+#: ../src/misc.c:2818 ../src/misc.c:2913
 msgid "Delete the selected line"
 msgstr ""
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2865 ../src/misc.c:2959 ../src/misc.c:3448
+#: ../src/misc.c:2827 ../src/misc.c:2922 ../src/misc.c:3408
 msgid "Delete all blank lines"
 msgstr ""
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2877 ../src/misc.c:2971
+#: ../src/misc.c:2839 ../src/misc.c:2934
 msgid "Move up the selected line"
 msgstr ""
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2886 ../src/misc.c:2980
+#: ../src/misc.c:2848 ../src/misc.c:2943
 msgid "Move down the selected line"
 msgstr ""
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2898 ../src/misc.c:2992 ../src/misc.c:3472
+#: ../src/misc.c:2860 ../src/misc.c:2955 ../src/misc.c:3432
 msgid "Reload"
-msgstr "Actualitza"
+msgstr ""
 
-#: ../src/misc.c:2919
-msgid "List of files"
+#: ../src/misc.c:2882
+msgid "List of Files"
 msgstr ""
 
-#: ../src/misc.c:3014
+#: ../src/misc.c:2977
 msgid "Selected line:"
 msgstr ""
 
-#: ../src/misc.c:3032
+#: ../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:3192
+#: ../src/misc.c:3082
+#, c-format
+msgid "Cannot retrieve file info (%s)"
+msgstr ""
+
+#: ../src/misc.c:3144
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr ""
 
-#: ../src/misc.c:3436
+#: ../src/misc.c:3180
+#, c-format
+msgid "Error reading file (%s)"
+msgstr ""
+
+#: ../src/misc.c:3396
 msgid "Insert a blank line"
 msgstr ""
 
-#: ../src/misc.c:3442
+#: ../src/misc.c:3402
 msgid "Delete this line"
 msgstr ""
 
-#: ../src/misc.c:3457
+#: ../src/misc.c:3417
 msgid "Move up this line"
 msgstr ""
 
-#: ../src/misc.c:3463
+#: ../src/misc.c:3423
 msgid "Move down this line"
 msgstr ""
 
@@ -2959,320 +2888,312 @@ msgstr ""
 #: ../src/monkeyaudio_header.c:78 ../src/musepack_header.c:80
 #, c-format
 msgid "Profile:"
-msgstr "Perfil:"
+msgstr "ప్రవర"
 
-#: ../src/mp4_header.c:64 ../src/mp4_tag.c:83 ../src/mp4_tag.c:213
+#: ../src/mp4_header.c:63 ../src/mp4_tag.c:65 ../src/mp4_tag.c:186
 msgid "MP4 format invalid"
 msgstr ""
 
-#: ../src/mp4_header.c:73 ../src/mp4_tag.c:92
+#: ../src/mp4_header.c:72 ../src/mp4_tag.c:74
 #, c-format
 msgid "File contains no audio track: '%s'"
 msgstr ""
 
-#: ../src/mp4_header.c:83
+#: ../src/mp4_header.c:82
 #, c-format
 msgid "Error reading properties from file: '%s'"
 msgstr ""
 
-#: ../src/mp4_header.c:133 ../src/mpeg_header.c:204
+#: ../src/mp4_header.c:132 ../src/mpeg_header.c:204
 #, c-format
 msgid "~%d kb/s"
 msgstr ""
 
-#: ../src/mp4_tag.c:103 ../src/mp4_tag.c:221
+#: ../src/mp4_tag.c:85 ../src/mp4_tag.c:194
 #, c-format
 msgid "Error reading tags from file: '%s'"
 msgstr ""
 
 #: ../src/mpeg_header.c:64
 msgid "Stereo"
-msgstr "Estèreo"
+msgstr "స్టీరియో"
 
 #: ../src/mpeg_header.c:65
 msgid "Joint stereo"
-msgstr "Estèreo conjunt"
+msgstr ""
 
 #: ../src/mpeg_header.c:66
 msgid "Dual channel"
-msgstr "Canal dual"
+msgstr ""
 
 #: ../src/mpeg_header.c:67
 msgid "Single channel"
-msgstr "Un sol canal"
+msgstr ""
 
 #. MPEG, Layer versions
 #: ../src/mpeg_header.c:194
 msgid "MPEG"
 msgstr ""
 
-#: ../src/ogg_header.c:85
+#. FIXME: Pass error back to calling function.
+#: ../src/ogg_header.c:227
+#, c-format
+msgid "Error while opening file: '%s' (%s)"
+msgstr ""
+
+#: ../src/ogg_header.c:243
 #, c-format
 msgid ""
 "Ogg Vorbis: The specified bitstream does not exist or the file has been "
 "initialized improperly (file: '%s')."
 msgstr ""
 
-#: ../src/ogg_header.c:116
+#: ../src/ogg_header.c:279
 #, c-format
 msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
 msgstr ""
 
-#: ../src/ogg_header.c:119
+#: ../src/ogg_header.c:282
 #, c-format
 msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
 msgstr ""
 
-#: ../src/ogg_header.c:122
+#: ../src/ogg_header.c:285
 #, c-format
 msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
 msgstr ""
 
-#: ../src/ogg_header.c:125
+#: ../src/ogg_header.c:288
 #, c-format
 msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
 msgstr ""
 
-#: ../src/ogg_header.c:128
+#: ../src/ogg_header.c:291
 #, c-format
 msgid ""
 "Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack corruption "
 "(file: '%s')."
 msgstr ""
 
-#: ../src/ogg_header.c:180 ../src/ogg_tag.c:187 ../src/ogg_tag.c:690
+#: ../src/ogg_header.c:337
 #, c-format
 msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
 msgstr ""
 
-#: ../src/ogg_tag.c:169
-#, c-format
-msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
+#: ../src/ogg_tag.c:712 ../src/ogg_tag.c:887
+#, c-format
+msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
+msgstr ""
+
+#: ../src/ogg_tag.c:1035 ../src/picture.c:1257
+#, c-format
+msgid "Error with 'loader_write': %s"
+msgstr ""
+
+#: ../src/ogg_tag.c:1050 ../src/picture.c:1180
+#, c-format
+msgid "Error with 'loader_close': %s"
+msgstr ""
+
+#: ../src/picture.c:104
+#, c-format
+msgid "Image file not saved: %s"
+msgstr ""
+
+#: ../src/picture.c:154
+#, c-format
+msgid "Cannot open file: '%s'"
+msgstr ""
+
+#: ../src/picture.c:158
+msgid "Image File Error"
+msgstr ""
+
+#: ../src/picture.c:162 ../src/picture.c:424
+#, c-format
+msgid "Image file not loaded: %s"
+msgstr ""
+
+#: ../src/picture.c:446
+msgid "Image file loaded"
 msgstr ""
 
-#: ../src/picture.c:301
-msgid "Add images"
-msgstr "Afegeix imatges"
+#: ../src/picture.c:504
+msgid "Add Images"
+msgstr "బొమ్మలను జోడించు"
 
-#: ../src/picture.c:311 ../src/picture.c:636
+#: ../src/picture.c:514 ../src/picture.c:874
 msgid "All Files"
-msgstr "Tots els fitxers"
+msgstr "అన్ని దస్త్రాలు"
 
-#: ../src/picture.c:317 ../src/picture.c:642
+#: ../src/picture.c:520 ../src/picture.c:880
 msgid "PNG and JPEG"
-msgstr "PNG i JPEG"
+msgstr "PNG మరియు JPEG"
 
-#: ../src/picture.c:425
+#: ../src/picture.c:651
 #, c-format
 msgid "Image Properties %d/%d"
-msgstr ""
+msgstr "బొమ్మ లక్షణాలు %d/%d"
 
-#: ../src/picture.c:448
+#: ../src/picture.c:675
 msgid "Image Type"
-msgstr ""
+msgstr "బొమ్మ రకం"
 
 #. Description of the picture
-#: ../src/picture.c:505
+#: ../src/picture.c:734
 msgid "Image Description:"
-msgstr "Descripció de la imatge:"
-
-#: ../src/picture.c:623
-#, c-format
-msgid "Save image %d/%d"
-msgstr ""
+msgstr "బొమ్మ వివరణ:"
 
-#: ../src/picture.c:702
+#: ../src/picture.c:861
 #, c-format
-msgid "The following file already exists: '%s'"
-msgstr ""
-
-#: ../src/picture.c:704
-msgid "Do you want to save anyway, overwriting the file?"
-msgstr ""
+msgid "Save Image %d/%d"
+msgstr "బొమ్మను భద్రపరుచు %d/%d"
 
-#: ../src/picture.c:706
-msgid "Save"
-msgstr "Desa"
-
-#: ../src/picture.c:783
+#: ../src/picture.c:1021
 msgid "JPEG image"
-msgstr "Imatge JPEG"
+msgstr "JPEG బొమ్మ"
 
-#: ../src/picture.c:785
+#: ../src/picture.c:1023
 msgid "PNG image"
-msgstr "Imatge PNG"
+msgstr "PNG బొమ్మ"
+
+#: ../src/picture.c:1025
+msgid "GIF image"
+msgstr "GIF బొమ్మ"
 
-#: ../src/picture.c:787
+#: ../src/picture.c:1027
 msgid "Unknown image"
-msgstr ""
+msgstr "తెలియని బొమ్మ"
 
-#: ../src/picture.c:799
+#: ../src/picture.c:1039
 msgid "32x32 pixel PNG file icon"
 msgstr ""
 
-#: ../src/picture.c:801
+#: ../src/picture.c:1041
 msgid "Other file icon"
 msgstr ""
 
-#: ../src/picture.c:803
+#: ../src/picture.c:1043
 msgid "Cover (front)"
 msgstr ""
 
-#: ../src/picture.c:805
+#: ../src/picture.c:1045
 msgid "Cover (back)"
 msgstr ""
 
-#: ../src/picture.c:807
+#: ../src/picture.c:1047
 msgid "Leaflet page"
 msgstr ""
 
-#: ../src/picture.c:809
+#: ../src/picture.c:1049
 msgid "Media (e.g. label side of CD)"
 msgstr ""
 
-#: ../src/picture.c:811
+#: ../src/picture.c:1051
 msgid "Lead artist/lead performer/soloist"
 msgstr ""
 
-#: ../src/picture.c:813
+#: ../src/picture.c:1053
 msgid "Artist/performer"
 msgstr ""
 
-#: ../src/picture.c:815
+#: ../src/picture.c:1055
 msgid "Conductor"
-msgstr "Conductor"
+msgstr ""
 
-#: ../src/picture.c:817
+#: ../src/picture.c:1057
 msgid "Band/Orchestra"
 msgstr ""
 
-#: ../src/picture.c:821
+#: ../src/picture.c:1061
 msgid "Lyricist/text writer"
 msgstr ""
 
-#: ../src/picture.c:823
+#: ../src/picture.c:1063
 msgid "Recording location"
 msgstr ""
 
-#: ../src/picture.c:825
+#: ../src/picture.c:1065
 msgid "During recording"
 msgstr ""
 
-#: ../src/picture.c:827
+#: ../src/picture.c:1067
 msgid "During performance"
 msgstr ""
 
-#: ../src/picture.c:829
+#: ../src/picture.c:1069
 msgid "Movie/video screen capture"
 msgstr ""
 
-#: ../src/picture.c:831
+#: ../src/picture.c:1071
 msgid "A bright colored fish"
 msgstr ""
 
-#: ../src/picture.c:833
+#: ../src/picture.c:1073
 msgid "Illustration"
-msgstr "Il·lustració"
+msgstr ""
 
-#: ../src/picture.c:835
+#: ../src/picture.c:1075
 msgid "Band/Artist logotype"
 msgstr ""
 
-#: ../src/picture.c:837
+#: ../src/picture.c:1077
 msgid "Publisher/studio logotype"
 msgstr ""
 
-#: ../src/picture.c:841
+#: ../src/picture.c:1081
 msgid "Unknown image type"
 msgstr ""
 
-#: ../src/picture.c:871 ../src/picture.c:882
+#: ../src/picture.c:1111 ../src/picture.c:1122
 msgid "pixels"
-msgstr "píxels"
+msgstr "చిణువులు"
 
-#: ../src/picture.c:872 ../src/picture.c:883
+#: ../src/picture.c:1112 ../src/picture.c:1123
 msgid "Type"
-msgstr "Tipus"
+msgstr "రకం"
 
-#: ../src/picture.c:884
+#: ../src/picture.c:1124
 msgid "Description"
-msgstr "Descripció"
-
-#: ../src/picture.c:940
-#, c-format
-msgid "Error with 'loader_close': %s"
-msgstr ""
+msgstr "వివరణ"
 
-#: ../src/picture.c:998
+#: ../src/picture.c:1240
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
 msgstr ""
 
-#: ../src/picture.c:1005
+#: ../src/picture.c:1247
 msgid "Cannot display the image"
 msgstr ""
 
-#: ../src/picture.c:1007
+#: ../src/picture.c:1249
 msgid ""
 "Not enough data has been read to determine how to create the image buffer."
 msgstr ""
 
-#: ../src/picture.c:1009
+#: ../src/picture.c:1251
 msgid "Load Image File"
-msgstr ""
-
-#: ../src/picture.c:1015
-#, c-format
-msgid "Error with 'loader_write': %s"
-msgstr ""
-
-#: ../src/picture.c:1107 ../src/picture.c:1137 ../src/picture.c:1158
-#, c-format
-msgid "Image file not loaded: %s"
-msgstr ""
-
-#: ../src/picture.c:1130
-#, c-format
-msgid "Cannot open file: '%s'"
-msgstr ""
-
-#: ../src/picture.c:1133
-msgid "Image File Error"
-msgstr ""
-
-#: ../src/picture.c:1171
-msgid "Image file loaded"
-msgstr ""
-
-#: ../src/picture.c:1188 ../src/picture.c:1196
-#, c-format
-msgid "Image file cannot be saved: %s"
-msgstr ""
-
-#. File Browser frame
-#: ../src/prefs.c:150
-msgid "File Browser"
-msgstr ""
+msgstr "బొమ్మ దస్త్రాన్ని నింపు"
 
 #. Label
-#: ../src/prefs.c:161
+#: ../src/prefs.c:152
 msgid "Default directory:"
-msgstr ""
+msgstr "అప్రమేయ సంచయం:"
 
-#: ../src/prefs.c:174
+#: ../src/prefs.c:165
 msgid ""
 "Specify the directory where your files are located. This path will be loaded "
 "when EasyTAG starts without parameter."
 msgstr ""
 
 #. Load directory on startup
-#: ../src/prefs.c:195
+#: ../src/prefs.c:186
 msgid ""
 "Load on startup the default directory or the directory passed as argument"
 msgstr ""
 
-#: ../src/prefs.c:198
+#: ../src/prefs.c:189
 msgid ""
 "Automatically search files, when EasyTAG starts, into the default directory. "
 "Note that this path may be overridden by the parameter passed to easytag "
@@ -3280,247 +3201,245 @@ msgid ""
 msgstr ""
 
 #. Browse subdirectories
-#: ../src/prefs.c:203
+#: ../src/prefs.c:194
 msgid "Search subdirectories"
 msgstr ""
 
-#: ../src/prefs.c:206
+#: ../src/prefs.c:197
 msgid "Search subdirectories for files when reading a directory into the tree."
 msgstr ""
 
 #. Open the node to show subdirectories
-#: ../src/prefs.c:210
+#: ../src/prefs.c:201
 msgid "Show subdirectories when selecting a directory"
 msgstr ""
 
-#: ../src/prefs.c:214
+#: ../src/prefs.c:205
 msgid ""
 "This expands the selected node into the file browser to display the sub-"
 "directories."
 msgstr ""
 
 #. Browse hidden directories
-#: ../src/prefs.c:218
+#: ../src/prefs.c:209
 msgid "Search hidden directories"
 msgstr ""
 
-#: ../src/prefs.c:223
+#: ../src/prefs.c:214
 msgid "Search hidden directories for files (directories starting by a '.')."
 msgstr ""
 
 #.
 #. * Misc
 #.
-#: ../src/prefs.c:231 ../src/prefs.c:232
+#: ../src/prefs.c:222
 msgid "Misc"
-msgstr "Miscel·lània"
+msgstr ""
 
 #. User interface
-#: ../src/prefs.c:242
+#: ../src/prefs.c:228
 msgid "User Interface"
-msgstr "Interfície d'usuari"
+msgstr "వాడుకరి అంతరవర్తి"
 
 #. Show header infos
-#: ../src/prefs.c:249
+#: ../src/prefs.c:235
 msgid "Show header information of file"
 msgstr ""
 
-#: ../src/prefs.c:252
+#: ../src/prefs.c:238
 msgid ""
 "If activated, information about the file as the bitrate, the time, the size, "
 "will be displayed under the filename entry."
 msgstr ""
 
-#: ../src/prefs.c:259
+#: ../src/prefs.c:244
 msgid "Display changed files in list using:"
 msgstr ""
 
-#: ../src/prefs.c:262
+#: ../src/prefs.c:247
 msgid "Red color"
-msgstr ""
+msgstr "ఎరుపు రంగు"
 
-#: ../src/prefs.c:268
+#: ../src/prefs.c:253
 msgid "Bold style"
 msgstr ""
 
 #. Sorting List Options
-#: ../src/prefs.c:274
+#: ../src/prefs.c:259
 msgid "Sorting List Options"
 msgstr ""
 
 #. Sorting method
-#: ../src/prefs.c:284
+#: ../src/prefs.c:268
 msgid "Sort the file list by:"
 msgstr ""
 
-#: ../src/prefs.c:294
+#: ../src/prefs.c:278
 msgid "Ascending filename"
 msgstr ""
 
-#: ../src/prefs.c:296
+#: ../src/prefs.c:280
 msgid "Descending filename"
 msgstr ""
 
-#: ../src/prefs.c:297
+#: ../src/prefs.c:281
 msgid "Ascending title"
 msgstr ""
 
-#: ../src/prefs.c:298
+#: ../src/prefs.c:282
 msgid "Descending title"
 msgstr ""
 
-#: ../src/prefs.c:299
+#: ../src/prefs.c:283
 msgid "Ascending artist"
 msgstr ""
 
-#: ../src/prefs.c:300
+#: ../src/prefs.c:284
 msgid "Descending artist"
 msgstr ""
 
-#: ../src/prefs.c:302
-#, fuzzy
-#| msgid "Album Artist"
+#: ../src/prefs.c:286
 msgid "Ascending album artist"
-msgstr "Artista de l'àlbum"
+msgstr ""
 
-#: ../src/prefs.c:304
+#: ../src/prefs.c:288
 msgid "Descending album artist"
 msgstr ""
 
-#: ../src/prefs.c:305
+#: ../src/prefs.c:289
 msgid "Ascending album"
 msgstr ""
 
-#: ../src/prefs.c:306
+#: ../src/prefs.c:290
 msgid "Descending album"
 msgstr ""
 
-#: ../src/prefs.c:307
+#: ../src/prefs.c:291
 msgid "Ascending year"
 msgstr ""
 
-#: ../src/prefs.c:308
+#: ../src/prefs.c:292
 msgid "Descending year"
 msgstr ""
 
-#: ../src/prefs.c:310
+#: ../src/prefs.c:294
 msgid "Ascending disc number"
 msgstr ""
 
-#: ../src/prefs.c:312
+#: ../src/prefs.c:296
 msgid "Descending disc number"
 msgstr ""
 
-#: ../src/prefs.c:314
+#: ../src/prefs.c:298
 msgid "Ascending track number"
 msgstr ""
 
-#: ../src/prefs.c:316
+#: ../src/prefs.c:300
 msgid "Descending track number"
 msgstr ""
 
-#: ../src/prefs.c:317
+#: ../src/prefs.c:301
 msgid "Ascending genre"
 msgstr ""
 
-#: ../src/prefs.c:318
+#: ../src/prefs.c:302
 msgid "Descending genre"
 msgstr ""
 
-#: ../src/prefs.c:319
+#: ../src/prefs.c:303
 msgid "Ascending comment"
 msgstr ""
 
-#: ../src/prefs.c:320
+#: ../src/prefs.c:304
 msgid "Descending comment"
 msgstr ""
 
-#: ../src/prefs.c:322
+#: ../src/prefs.c:306
 msgid "Ascending composer"
 msgstr ""
 
-#: ../src/prefs.c:324
+#: ../src/prefs.c:308
 msgid "Descending composer"
 msgstr ""
 
-#: ../src/prefs.c:326
+#: ../src/prefs.c:310
 msgid "Ascending original artist"
 msgstr ""
 
-#: ../src/prefs.c:328
+#: ../src/prefs.c:312
 msgid "Descending original artist"
 msgstr ""
 
-#: ../src/prefs.c:330
+#: ../src/prefs.c:314
 msgid "Ascending copyright"
 msgstr ""
 
-#: ../src/prefs.c:332
+#: ../src/prefs.c:316
 msgid "Descending copyright"
 msgstr ""
 
-#: ../src/prefs.c:334
+#: ../src/prefs.c:318
 msgid "Ascending URL"
 msgstr ""
 
-#: ../src/prefs.c:336
+#: ../src/prefs.c:320
 msgid "Descending URL"
 msgstr ""
 
-#: ../src/prefs.c:338
+#: ../src/prefs.c:322
 msgid "Ascending encoded by"
 msgstr ""
 
-#: ../src/prefs.c:340
+#: ../src/prefs.c:324
 msgid "Descending encoded by"
 msgstr ""
 
-#: ../src/prefs.c:342
+#: ../src/prefs.c:326
 msgid "Ascending creation date"
 msgstr ""
 
-#: ../src/prefs.c:344
+#: ../src/prefs.c:328
 msgid "Descending creation date"
 msgstr ""
 
-#: ../src/prefs.c:348
+#: ../src/prefs.c:332
 msgid "Select the type of file sorting when loading a directory."
 msgstr ""
 
-#: ../src/prefs.c:360
+#: ../src/prefs.c:344
 msgid "If activated, the sorting of the list will be dependent on the case."
 msgstr ""
 
 #. File Player
-#: ../src/prefs.c:364
+#: ../src/prefs.c:348
 msgid "File Audio Player"
 msgstr ""
 
-#: ../src/prefs.c:376
+#: ../src/prefs.c:360
 msgid "Player to run:"
 msgstr ""
 
-#: ../src/prefs.c:382
+#: ../src/prefs.c:366
 msgid ""
 "Enter the program used to play the files. Some arguments can be passed for "
 "the program (as 'xmms -p') before to receive files as other arguments."
 msgstr ""
 
 #. Log options
-#: ../src/prefs.c:400
+#: ../src/prefs.c:384
 msgid "Log Options"
 msgstr ""
 
 #. Show / hide log view
-#: ../src/prefs.c:407
+#: ../src/prefs.c:391
 msgid "Show log view in main window"
 msgstr ""
 
-#: ../src/prefs.c:410
+#: ../src/prefs.c:394
 msgid "If activated, the log view would be visible in the main window."
 msgstr ""
 
-#: ../src/prefs.c:417
+#: ../src/prefs.c:400
 msgid "Max number of lines:"
 msgstr ""
 
@@ -3533,20 +3452,20 @@ msgstr ""
 #.
 #. * File Settings
 #.
-#: ../src/prefs.c:435 ../src/prefs.c:436
+#: ../src/prefs.c:418
 msgid "File Settings"
-msgstr ""
+msgstr "దస్త్ర అమరికలు"
 
 #. File (name) Options
-#: ../src/prefs.c:446
+#: ../src/prefs.c:424
 msgid "File Options"
-msgstr ""
+msgstr "దస్త్ర ఐచ్ఛికాలు"
 
-#: ../src/prefs.c:452
+#: ../src/prefs.c:430
 msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgstr ""
 
-#: ../src/prefs.c:455
+#: ../src/prefs.c:433
 msgid ""
 "Convert illegal characters for FAT32/16 and ISO9660 + Joliet filesystems "
 "('\\', ':', ';', '*', '?', '\"', '<', '>', '|') of the filename to avoid "
@@ -3555,52 +3474,52 @@ msgid ""
 msgstr ""
 
 #. Extension case (lower/upper?)
-#: ../src/prefs.c:464
+#: ../src/prefs.c:441
 msgid "Convert filename extension to:"
 msgstr ""
 
-#: ../src/prefs.c:467
+#: ../src/prefs.c:444
 msgid "Lower Case"
 msgstr ""
 
-#: ../src/prefs.c:470
+#: ../src/prefs.c:447
 msgid "For example, the extension will be converted to '.mp3'"
 msgstr ""
 
-#: ../src/prefs.c:473
+#: ../src/prefs.c:450
 msgid "Upper Case"
 msgstr ""
 
-#: ../src/prefs.c:476
+#: ../src/prefs.c:453
 msgid "For example, the extension will be converted to '.MP3'"
 msgstr ""
 
-#: ../src/prefs.c:479
+#: ../src/prefs.c:456
 msgid "No Change"
 msgstr ""
 
-#: ../src/prefs.c:482
+#: ../src/prefs.c:459
 msgid "The extension will not be converted"
 msgstr ""
 
 #. Preserve modification time
-#: ../src/prefs.c:485
+#: ../src/prefs.c:462
 msgid "Preserve modification time of the file"
 msgstr ""
 
-#: ../src/prefs.c:488
+#: ../src/prefs.c:465
 msgid ""
 "Preserve the modification time (in file properties) when saving the file."
 msgstr ""
 
 #. Change directory modification time
-#: ../src/prefs.c:492
+#: ../src/prefs.c:469
 msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
 
-#: ../src/prefs.c:496
+#: ../src/prefs.c:473
 msgid ""
 "The modification time of the parent directory of the file will be updated "
 "when saving tag the file. At the present time it is automatically done only "
@@ -3611,47 +3530,47 @@ msgid ""
 msgstr ""
 
 #. Character Set for Filename
-#: ../src/prefs.c:504
+#: ../src/prefs.c:481
 msgid "Character Set for Filename"
 msgstr ""
 
 #. Rules for character set
-#: ../src/prefs.c:520
+#: ../src/prefs.c:493
 msgid ""
 "Rules to apply if some characters can't be converted to the system character "
 "encoding when writing filename:"
 msgstr ""
 
-#: ../src/prefs.c:528
+#: ../src/prefs.c:499
 msgid "Try another character encoding"
 msgstr ""
 
-#: ../src/prefs.c:532
+#: ../src/prefs.c:503
 msgid ""
 "With this option, it will try the conversion to the encoding associated to "
 "your locale (for example: ISO-8859-1 for 'fr', KOI8-R for 'ru', ISO-8859-2 "
 "for 'ro'). If it fails, it will try the character encoding ISO-8859-1."
 msgstr ""
 
-#: ../src/prefs.c:539
+#: ../src/prefs.c:510
 msgid ""
 "Force using the system character encoding and activate the transliteration"
 msgstr ""
 
-#: ../src/prefs.c:543 ../src/prefs.c:863 ../src/prefs.c:935
+#: ../src/prefs.c:514 ../src/prefs.c:844 ../src/prefs.c:913
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it can be approximated through one or several similarly "
 "looking characters."
 msgstr ""
 
-#: ../src/prefs.c:549
+#: ../src/prefs.c:520
 msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr ""
 
-#: ../src/prefs.c:553 ../src/prefs.c:873 ../src/prefs.c:945
+#: ../src/prefs.c:524 ../src/prefs.c:854 ../src/prefs.c:923
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it will be silently discarded."
@@ -3660,96 +3579,93 @@ msgstr ""
 #.
 #. * Tag Settings
 #.
-#: ../src/prefs.c:562 ../src/prefs.c:563
+#: ../src/prefs.c:533
 msgid "Tag Settings"
 msgstr ""
 
 #. Tag Options
-#: ../src/prefs.c:572
+#: ../src/prefs.c:539
 msgid "Tag Options"
 msgstr ""
 
-#: ../src/prefs.c:578
+#: ../src/prefs.c:545
 msgid "Auto completion of date if not complete"
 msgstr ""
 
-#: ../src/prefs.c:581
+#: ../src/prefs.c:548
 msgid ""
 "Try to complete the year field if you enter only the last numerals of the "
 "date (for instance, if the current year is 2005: 5 => 2005, 4 => 2004, 6 => "
 "1996, 95 => 1995…)."
 msgstr ""
 
-#: ../src/prefs.c:588
+#: ../src/prefs.c:556
 msgid "Write the track field with the following number of digits:"
 msgstr ""
 
-#: ../src/prefs.c:591
+#: ../src/prefs.c:559
 msgid ""
 "If activated, the track field is written using the number '0' as padding to "
 "obtain a number with 'n' digits (for example, with two digits: '05', '09', "
 "'10'…). Else it keeps the 'raw' track value."
 msgstr ""
 
-#: ../src/prefs.c:616
+#: ../src/prefs.c:578
+msgid "Write the disc field with the following number of digits:"
+msgstr ""
+
+#: ../src/prefs.c:583
+msgid "Whether to pad the disc field with leading zeroes"
+msgstr ""
+
+#: ../src/prefs.c:613
 msgid ""
 "Tag field focus when switching files in list with shortcuts Page Up/Page "
 "Down:"
 msgstr ""
 
-#: ../src/prefs.c:625
+#: ../src/prefs.c:619
 msgid "Keep focus to the same tag field"
 msgstr ""
 
-#: ../src/prefs.c:631
+#: ../src/prefs.c:625
 msgid "Return focus to the first tag field (i.e. 'Title' field)"
 msgstr ""
 
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(SetFocusToFirstTagField),SET_FOCUS_TO_FIRST_TAG_FIELD);
 #. Tag Splitting
-#: ../src/prefs.c:636
+#: ../src/prefs.c:630
 msgid "Tag Splitting"
 msgstr ""
 
-#: ../src/prefs.c:643
+#: ../src/prefs.c:639
 msgid ""
 "For Vorbis tags, selected fields will be split at dashes and saved as "
 "separate tags"
 msgstr ""
 
-#: ../src/prefs.c:653
+#: ../src/prefs.c:649
 msgid "Original artist"
 msgstr ""
 
 #.
 #. * ID3 Tag Settings
 #.
-#: ../src/prefs.c:674 ../src/prefs.c:675
+#: ../src/prefs.c:670
 msgid "ID3 Tag Settings"
 msgstr ""
 
 #. Tag Rules frame
-#: ../src/prefs.c:687
+#: ../src/prefs.c:679
 msgid "ID3 Tag Rules"
 msgstr ""
 
-#. Write ID3 tags in FLAC files
-#: ../src/prefs.c:699
-msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
-msgstr ""
-
-#: ../src/prefs.c:702
-msgid ""
-"If activated, ID3 tags will be also added in the FLAC file (according the "
-"two rules above, plus the FLAC tag). Else ID3 tags will be stripped."
-msgstr ""
-
 #. Strip tag when fields (managed by EasyTAG) are empty
-#: ../src/prefs.c:707
+#: ../src/prefs.c:691
 msgid "Strip tags if all fields are set to blank"
 msgstr ""
 
-#: ../src/prefs.c:710
+#: ../src/prefs.c:694
 msgid ""
 "As ID3v2 tags may contain other data than Title, Artist, Album, Year, Track, "
 "Genre or Comment (as an attached image, lyrics…), this option allows you to "
@@ -3758,72 +3674,72 @@ msgid ""
 msgstr ""
 
 #. Convert old ID3v2 tag version
-#: ../src/prefs.c:716
+#: ../src/prefs.c:700
 msgid "Automatically convert old ID3v2 tag versions"
 msgstr ""
 
-#: ../src/prefs.c:719
+#: ../src/prefs.c:703
 msgid ""
 "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
 "ID3v2.3 version."
 msgstr ""
 
 #. Use CRC32
-#: ../src/prefs.c:723
+#: ../src/prefs.c:707
 msgid "Use CRC32"
 msgstr ""
 
-#: ../src/prefs.c:726
+#: ../src/prefs.c:710
 msgid "Set CRC32 in the ID3v2 tags"
 msgstr ""
 
 #. Use Compression
-#: ../src/prefs.c:729
+#: ../src/prefs.c:713
 msgid "Use Compression"
 msgstr ""
 
-#: ../src/prefs.c:733
+#: ../src/prefs.c:717
 msgid "Set Compression in the ID3v2 tags"
 msgstr ""
 
 #. Write Genre in text
-#: ../src/prefs.c:736
+#: ../src/prefs.c:720
 msgid "Write Genre in text only"
 msgstr ""
 
-#: ../src/prefs.c:740
+#: ../src/prefs.c:724
 msgid ""
 "Don't use ID3v1 number references in genre tag. Enable this if you see "
 "numbers as genre in your music player."
 msgstr ""
 
 #. Character Set for writing ID3 tag
-#: ../src/prefs.c:743
+#: ../src/prefs.c:727
 msgid "Character Set for writing ID3 tags"
 msgstr ""
 
 #. ID3v2 tags
-#: ../src/prefs.c:750
+#: ../src/prefs.c:734
 msgid "ID3v2 tags"
 msgstr ""
 
 #. Write ID3v2 tag
-#: ../src/prefs.c:763
+#: ../src/prefs.c:747
 msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../src/prefs.c:766
+#: ../src/prefs.c:750
 msgid ""
 "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
 "the MP3 files. Else it will be stripped."
 msgstr ""
 
 #. ID3v2 tag version
-#: ../src/prefs.c:773
+#: ../src/prefs.c:757
 msgid "Version:"
-msgstr "Versió:"
+msgstr "రూపాంతరం:"
 
-#: ../src/prefs.c:779
+#: ../src/prefs.c:763
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " - ID3v2.3 is written using id3lib,\n"
@@ -3832,78 +3748,78 @@ msgstr ""
 
 #. Charset
 #. Id3V1 writing character set
-#: ../src/prefs.c:794 ../src/prefs.c:901
+#: ../src/prefs.c:778 ../src/prefs.c:882
 msgid "Charset:"
-msgstr ""
+msgstr "అక్షరసమితి:"
 
 #. Unicode
-#: ../src/prefs.c:802
+#: ../src/prefs.c:783
 msgid "Unicode "
-msgstr ""
+msgstr "యూనికోడ్"
 
-#: ../src/prefs.c:810
+#: ../src/prefs.c:791
 msgid "Unicode type to use"
 msgstr ""
 
-#: ../src/prefs.c:834
+#: ../src/prefs.c:815
 msgid "Character set used to write the tag data in the file."
 msgstr ""
 
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
-#: ../src/prefs.c:844 ../src/prefs.c:916
+#: ../src/prefs.c:825 ../src/prefs.c:894
 msgid "Additional settings for iconv():"
 msgstr ""
 
-#: ../src/prefs.c:850 ../src/prefs.c:922
+#: ../src/prefs.c:831 ../src/prefs.c:900
 msgid "No"
-msgstr "No"
+msgstr ""
 
-#: ../src/prefs.c:854 ../src/prefs.c:926
+#: ../src/prefs.c:835 ../src/prefs.c:904
 msgid ""
 "With this option, when a character cannot be represented in the target "
 "character set, it isn't changed. But note that an error message will be "
 "displayed for information."
 msgstr ""
 
-#: ../src/prefs.c:859 ../src/prefs.c:931
+#: ../src/prefs.c:840 ../src/prefs.c:909
 msgid "//TRANSLIT"
 msgstr ""
 
-#: ../src/prefs.c:869 ../src/prefs.c:941
+#: ../src/prefs.c:850 ../src/prefs.c:919
 msgid "//IGNORE"
 msgstr ""
 
 #. ID3v1 tags
-#: ../src/prefs.c:878
+#: ../src/prefs.c:859
 msgid "ID3v1 tags"
 msgstr ""
 
 #. Write ID3v1 tag
-#: ../src/prefs.c:892
+#: ../src/prefs.c:873
 msgid "Write ID3v1.x tag"
 msgstr ""
 
-#: ../src/prefs.c:895
+#: ../src/prefs.c:876
 msgid ""
 "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
 "files. Else it will be stripped."
 msgstr ""
 
-#: ../src/prefs.c:912
+#: ../src/prefs.c:890
 msgid "Character set used to write ID3v1 tag data in the file."
 msgstr ""
 
 #. Character Set for reading tag
-#: ../src/prefs.c:950
+#: ../src/prefs.c:928
 msgid "Character Set for reading ID3 tags"
 msgstr ""
 
-#: ../src/prefs.c:964
+#: ../src/prefs.c:942
 msgid "Non-standard:"
 msgstr ""
 
-#: ../src/prefs.c:970
+#: ../src/prefs.c:948
 msgid ""
 "This character set will be used when reading the tag data, to convert each "
 "string found in an ISO-8859-1 field in the tag (for ID3v2 or/and ID3v1 "
@@ -3920,59 +3836,59 @@ msgid ""
 "written under Unix systems."
 msgstr ""
 
-#: ../src/prefs.c:988
+#: ../src/prefs.c:966
 msgid "Character set used to read tag data in the file."
 msgstr ""
 
 #.
 #. * Scanner
 #.
-#: ../src/prefs.c:1002 ../src/prefs.c:1003
+#: ../src/prefs.c:980
 msgid "Scanner"
-msgstr "Escàner"
+msgstr "పరికింపకం"
 
 #. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: ../src/prefs.c:1015
+#: ../src/prefs.c:990
 msgid "Fill Tag Scanner - Character Conversion"
 msgstr ""
 
-#: ../src/prefs.c:1021 ../src/prefs.c:1046
+#: ../src/prefs.c:996 ../src/prefs.c:1021
 msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr ""
 
-#: ../src/prefs.c:1023 ../src/prefs.c:1047
+#: ../src/prefs.c:998 ../src/prefs.c:1022
 msgid "Convert space ' ' to underscore '_'"
 msgstr ""
 
-#: ../src/prefs.c:1035 ../src/prefs.c:1037
+#: ../src/prefs.c:1010 ../src/prefs.c:1012
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for tags."
 msgstr ""
 
 #. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: ../src/prefs.c:1041
+#: ../src/prefs.c:1016
 msgid "Rename File Scanner - Character Conversion"
 msgstr ""
 
-#: ../src/prefs.c:1058 ../src/prefs.c:1060 ../src/prefs.c:1062
+#: ../src/prefs.c:1033 ../src/prefs.c:1035 ../src/prefs.c:1037
 msgid ""
 "If activated, this conversion will be used when applying a mask from the "
 "scanner for filenames."
 msgstr ""
 
 #. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: ../src/prefs.c:1065
+#: ../src/prefs.c:1040
 msgid "Process Fields Scanner - Character Conversion"
 msgstr ""
 
 #. Don't convert some words like to, feat. first letter uppercase.
-#: ../src/prefs.c:1072
+#: ../src/prefs.c:1047
 msgid ""
 "Don't uppercase first letter of words for some prepositions and articles."
 msgstr ""
 
-#: ../src/prefs.c:1076
+#: ../src/prefs.c:1051
 msgid ""
 "Don't convert first letter of words like prepositions, articles and words "
 "like feat., when using the scanner 'First letter uppercase of each "
@@ -3981,52 +3897,52 @@ msgid ""
 msgstr ""
 
 #. Properties of the scanner window
-#: ../src/prefs.c:1082
+#: ../src/prefs.c:1057
 msgid "Scanner Window"
-msgstr ""
+msgstr "పరికింపకం కిటికీ"
 
-#: ../src/prefs.c:1088
+#: ../src/prefs.c:1063
 msgid "Open the Scanner Window on startup"
 msgstr ""
 
-#: ../src/prefs.c:1091
+#: ../src/prefs.c:1066
 msgid ""
 "Activate this option to open automatically the scanner window when EasyTAG "
 "starts."
 msgstr ""
 
 #. Other options
-#: ../src/prefs.c:1096
+#: ../src/prefs.c:1071
 msgid "Fields"
-msgstr ""
+msgstr "క్షేత్రాలు"
 
 #. Overwrite text into tag fields
-#: ../src/prefs.c:1103
+#: ../src/prefs.c:1078
 msgid "Overwrite fields when scanning tags"
 msgstr ""
 
-#: ../src/prefs.c:1106
+#: ../src/prefs.c:1081
 msgid ""
 "If activated, the scanner will replace existing text in fields by the new "
 "one. If deactivated, only blank fields of the tag will be filled."
 msgstr ""
 
-#: ../src/prefs.c:1117
+#: ../src/prefs.c:1092
 msgid "Set this text as default comment:"
 msgstr ""
 
-#: ../src/prefs.c:1120
+#: ../src/prefs.c:1095
 msgid ""
 "Activate this option if you want to put the following string into the "
 "comment field when using the 'Fill Tag' scanner."
 msgstr ""
 
 #. CRC32 comment
-#: ../src/prefs.c:1138
+#: ../src/prefs.c:1113
 msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgstr ""
 
-#: ../src/prefs.c:1142
+#: ../src/prefs.c:1117
 msgid ""
 "Calculates the CRC-32 value of the file and writes it into the comment field "
 "when using the 'Fill Tag' scanner."
@@ -4035,110 +3951,110 @@ msgstr ""
 #.
 #. * CDDB
 #.
-#: ../src/prefs.c:1153 ../src/prefs.c:1154
-msgid "CD Data Base"
-msgstr ""
+#: ../src/prefs.c:1128
+msgid "CDDB"
+msgstr "CDDB"
 
 #. CDDB Server Settings (Automatic Search)
-#: ../src/prefs.c:1163
+#: ../src/prefs.c:1134
 msgid "Server Settings for Automatic Search"
 msgstr ""
 
-#: ../src/prefs.c:1172 ../src/prefs.c:1211 ../src/prefs.c:1245
+#: ../src/prefs.c:1143 ../src/prefs.c:1182 ../src/prefs.c:1216
 msgid "Name:"
-msgstr ""
+msgstr "పేరు:"
 
-#: ../src/prefs.c:1191 ../src/prefs.c:1219 ../src/prefs.c:1254
-#: ../src/prefs.c:1343
+#: ../src/prefs.c:1162 ../src/prefs.c:1190 ../src/prefs.c:1225
+#: ../src/prefs.c:1310
 msgid "Port:"
-msgstr ""
+msgstr "పోర్టు:"
 
-#: ../src/prefs.c:1201 ../src/prefs.c:1229 ../src/prefs.c:1264
+#: ../src/prefs.c:1172 ../src/prefs.c:1200 ../src/prefs.c:1234
 msgid "CGI Path:"
 msgstr ""
 
 #. CDDB Server Settings (Manual Search)
-#: ../src/prefs.c:1237
+#: ../src/prefs.c:1208
 msgid "Server Settings for Manual Search"
 msgstr ""
 
 #. Local access for CDDB (Automatic Search)
-#: ../src/prefs.c:1272
-msgid "Local CD Data Base"
+#: ../src/prefs.c:1242
+msgid "Local CDDB"
 msgstr ""
 
-#: ../src/prefs.c:1280
+#: ../src/prefs.c:1250
 msgid "Path:"
-msgstr ""
+msgstr "బాట:"
 
-#: ../src/prefs.c:1292
+#: ../src/prefs.c:1262
 msgid ""
 "Specify the directory where the local CD database is located. The local CD "
-"data base contains the eleven following directories 'blues', 'classical', "
+"database contains the eleven following directories 'blues', 'classical', "
 "'country', 'data', 'folk', 'jazz', 'newage', 'reggae', 'rock', 'soundtrack' "
 "and 'misc'."
 msgstr ""
 
 #. CDDB Proxy Settings
-#: ../src/prefs.c:1318
+#: ../src/prefs.c:1288
 msgid "Proxy Settings"
-msgstr "Paràmetres del servidor intermediari"
+msgstr "ప్రాక్సీ  అమరికలు"
 
-#: ../src/prefs.c:1327
+#: ../src/prefs.c:1297
 msgid "Use a proxy"
 msgstr ""
 
-#: ../src/prefs.c:1330
+#: ../src/prefs.c:1300
 msgid "Set active the settings of the proxy server."
 msgstr ""
 
-#: ../src/prefs.c:1335
+#: ../src/prefs.c:1302
 msgid "Host Name:"
 msgstr ""
 
-#: ../src/prefs.c:1342
+#: ../src/prefs.c:1309
 msgid "Name of the proxy server."
 msgstr ""
 
-#: ../src/prefs.c:1350
+#: ../src/prefs.c:1317
 msgid "Port of the proxy server."
 msgstr ""
 
-#: ../src/prefs.c:1355
+#: ../src/prefs.c:1321
 msgid "User Name:"
-msgstr "Nom d'usuari:"
+msgstr "వాడుకరి పేరు:"
 
-#: ../src/prefs.c:1362
+#: ../src/prefs.c:1328
 msgid "Name of user for the the proxy server."
 msgstr ""
 
-#: ../src/prefs.c:1363
+#: ../src/prefs.c:1329
 msgid "User Password:"
-msgstr ""
+msgstr "వాడుకరి సంకేతపదం:"
 
-#: ../src/prefs.c:1371
-msgid "Password of user for the the proxy server."
+#: ../src/prefs.c:1338
+msgid "Password of user for the proxy server."
 msgstr ""
 
 #. Track Name list (CDDB results)
-#: ../src/prefs.c:1376
+#: ../src/prefs.c:1343
 msgid "Track Name List"
 msgstr ""
 
-#: ../src/prefs.c:1383
+#: ../src/prefs.c:1350
 msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
 
-#: ../src/prefs.c:1387
+#: ../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:1392
+#: ../src/prefs.c:1359
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
 "files (using filename)"
@@ -4147,178 +4063,173 @@ msgstr ""
 #.
 #. * Confirmation
 #.
-#: ../src/prefs.c:1407 ../src/prefs.c:1408
+#: ../src/prefs.c:1374
 msgid "Confirmation"
-msgstr "Confirmació"
+msgstr ""
 
-#: ../src/prefs.c:1416
+#: ../src/prefs.c:1379
 msgid "Confirm exit from program"
 msgstr ""
 
-#: ../src/prefs.c:1419
+#: ../src/prefs.c:1382
 msgid ""
 "If activated, opens a dialog box to ask confirmation before exiting the "
 "program."
 msgstr ""
 
-#: ../src/prefs.c:1422
+#: ../src/prefs.c:1385
 msgid "Confirm writing of file tag"
 msgstr ""
 
-#: ../src/prefs.c:1426
+#: ../src/prefs.c:1389
 msgid "Confirm renaming of file"
 msgstr ""
 
-#: ../src/prefs.c:1430
+#: ../src/prefs.c:1393
 msgid "Confirm deleting of file"
 msgstr ""
 
-#: ../src/prefs.c:1434
+#: ../src/prefs.c:1397
 msgid "Confirm writing of playlist"
 msgstr ""
 
-#: ../src/prefs.c:1438
+#: ../src/prefs.c:1401
 msgid "Confirm changing directory when there are unsaved changes"
 msgstr ""
 
-#: ../src/prefs.c:1455
-msgid "Apply changes (but don't save) and close this window"
-msgstr ""
-
-#: ../src/prefs.c:1464
-msgid "Close this window without saving"
+#. For translators : be aware to NOT translate '%.*d' in this string
+#: ../src/prefs.c:1439
+#, c-format
+msgid "(Example: %.*d_-_Track_name_1.mp3)"
 msgstr ""
 
+#. Translators: please do NOT translate '%.*d' in this string.
 #: ../src/prefs.c:1472
-msgid "Save changes and close this window"
-msgstr ""
-
-#. For translators : be aware to NOT translate '%.*d' in this string
-#: ../src/prefs.c:1507
 #, c-format
-msgid "(Example: %.*d_-_Track_name_1.mp3)"
+msgid "(Example: disc_%.*d_of_10/Track_name_1.mp3)"
 msgstr ""
 
-#: ../src/prefs.c:1669 ../src/setting.c:894
+#: ../src/prefs.c:1614 ../src/setting.c:904
 msgid "Configuration saved"
 msgstr ""
 
-#: ../src/prefs.c:1677
+#: ../src/prefs.c:1622
 msgid "Configuration unchanged"
 msgstr ""
 
-#: ../src/prefs.c:1781
+#: ../src/prefs.c:1713
 msgid "The selected path for 'Default path to files' is invalid"
 msgstr ""
 
-#: ../src/prefs.c:1782
+#: ../src/prefs.c:1715
 #, c-format
 msgid ""
 "Path: '%s'\n"
 "Error: %s"
 msgstr ""
 
-#: ../src/prefs.c:1783
+#: ../src/prefs.c:1717
 msgid "Invalid Path Error"
 msgstr ""
 
-#: ../src/prefs.c:1897
+#: ../src/prefs.c:1831
 #, c-format
 msgid "The audio file player '%s' cannot be found"
 msgstr ""
 
-#: ../src/prefs.c:1899
+#: ../src/prefs.c:1833
 msgid "Audio Player Error"
 msgstr ""
 
-#: ../src/scan.c:179
+#: ../src/scan_dialog.c:182
 msgid "Fill Tag"
 msgstr ""
 
-#: ../src/scan.c:368
+#: ../src/scan_dialog.c:356
+#, c-format
+msgid "Cannot calculate CRC value of file (%s)"
+msgstr ""
+
+#: ../src/scan_dialog.c:371
 msgid "Tag successfully scanned"
 msgstr ""
 
-#: ../src/scan.c:370
+#: ../src/scan_dialog.c:373
 #, c-format
 msgid "Tag successfully scanned: %s"
 msgstr ""
 
-#: ../src/scan.c:411
+#: ../src/scan_dialog.c:414
 #, c-format
 msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
 msgstr ""
 
-#: ../src/scan.c:493 ../src/scan.c:522
+#: ../src/scan_dialog.c:496 ../src/scan_dialog.c:525
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr ""
 
-#: ../src/scan.c:710
+#: ../src/scan_dialog.c:712
 msgid "New filename successfully scanned"
 msgstr ""
 
-#: ../src/scan.c:713
+#: ../src/scan_dialog.c:715
 #, c-format
 msgid "New filename successfully scanned: %s"
 msgstr ""
 
-#: ../src/scan.c:1815
+#: ../src/scan_dialog.c:1628
 #, c-format
 msgid "Error while processing fields: %s"
 msgstr ""
 
-#: ../src/scan.c:2346
+#. The window
+#: ../src/scan_dialog.c:1798
 msgid "Tag and Filename Scan"
 msgstr ""
 
+#. TODO: Set related action to match AM_SCAN_FILES.
+#: ../src/scan_dialog.c:1807
+msgid "Scan Files"
+msgstr ""
+
 #. Option Menu
-#: ../src/scan.c:2365
+#: ../src/scan_dialog.c:1835
 msgid "Scanner:"
 msgstr ""
 
-#: ../src/scan.c:2386
+#: ../src/scan_dialog.c:1856
 msgid "Select the type of scanner to use"
 msgstr ""
 
-#: ../src/scan.c:2395
-msgid "Open scanner window / Scan selected files"
-msgstr ""
-
-#: ../src/scan.c:2408
-#, fuzzy
-#| msgid "Preferences"
+#: ../src/scan_dialog.c:1865
 msgid "Scanner Preferences"
-msgstr "Preferències"
+msgstr ""
 
-#: ../src/scan.c:2417
+#: ../src/scan_dialog.c:1874
 msgid "Show / Hide Masks Editor"
 msgstr ""
 
-#: ../src/scan.c:2427
+#: ../src/scan_dialog.c:1884
 msgid "Show / Hide Legend"
 msgstr ""
 
-#: ../src/scan.c:2437
-msgid "Close this window"
-msgstr "Tanca aquesta finestra"
-
-#: ../src/scan.c:2465
+#: ../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:2491
+#: ../src/scan_dialog.c:1938
 msgid "Fill tag preview"
 msgstr ""
 
-#: ../src/scan.c:2521
+#: ../src/scan_dialog.c:1968
 msgid "Prefix mask with current path"
 msgstr ""
 
-#: ../src/scan.c:2534
+#: ../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"
@@ -4327,506 +4238,450 @@ msgid ""
 msgstr ""
 
 #. Preview label
-#: ../src/scan.c:2561
+#: ../src/scan_dialog.c:2007
 msgid "Rename file preview"
 msgstr ""
 
-#: ../src/scan.c:2580
+#: ../src/scan_dialog.c:2026
 msgid "Select fields:"
 msgstr ""
 
-#: ../src/scan.c:2583
+#: ../src/scan_dialog.c:2029
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those which interest you"
 msgstr ""
 
 #. Advice for Translators: set the first letter of filename translated
-#: ../src/scan.c:2587
+#: ../src/scan_dialog.c:2033
 msgid "F"
-msgstr "F"
+msgstr ""
 
-#: ../src/scan.c:2589
+#: ../src/scan_dialog.c:2035
 msgid "Process filename field"
 msgstr ""
 
 #. Advice for Translators: set the first letter of title translated
-#: ../src/scan.c:2591
+#: ../src/scan_dialog.c:2037
 msgid "T"
-msgstr "T"
+msgstr ""
 
-#: ../src/scan.c:2592
+#: ../src/scan_dialog.c:2038
 msgid "Process title field"
 msgstr ""
 
 #. Advice for Translators: set the first letter of artist translated
-#: ../src/scan.c:2594
+#: ../src/scan_dialog.c:2040
 msgid "Ar"
 msgstr ""
 
-#: ../src/scan.c:2595
+#: ../src/scan_dialog.c:2041
 msgid "Process file artist field"
 msgstr ""
 
 #. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan.c:2597
+#: ../src/scan_dialog.c:2043
 msgid "AA"
 msgstr ""
 
-#: ../src/scan.c:2598
+#: ../src/scan_dialog.c:2044
 msgid "Process album artist field"
 msgstr ""
 
 #. Advice for Translators: set the first letter of album translated
-#: ../src/scan.c:2600
+#: ../src/scan_dialog.c:2046
 msgid "Al"
 msgstr ""
 
-#: ../src/scan.c:2601
+#: ../src/scan_dialog.c:2047
 msgid "Process album field"
 msgstr ""
 
 #. Advice for Translators: set the first letter of genre translated
-#: ../src/scan.c:2603
+#: ../src/scan_dialog.c:2049
 msgid "G"
-msgstr "G"
+msgstr ""
 
-#: ../src/scan.c:2604
+#: ../src/scan_dialog.c:2050
 msgid "Process genre field"
 msgstr ""
 
 #. Advice for Translators: set the first letter of comment translated
-#: ../src/scan.c:2606
+#: ../src/scan_dialog.c:2052
 msgid "Cm"
 msgstr ""
 
-#: ../src/scan.c:2607
+#: ../src/scan_dialog.c:2053
 msgid "Process comment field"
 msgstr ""
 
 #. Advice for Translators: set the first letter of composer translated
-#: ../src/scan.c:2609
+#: ../src/scan_dialog.c:2055
 msgid "Cp"
 msgstr ""
 
-#: ../src/scan.c:2610
+#: ../src/scan_dialog.c:2056
 msgid "Process composer field"
 msgstr ""
 
 #. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan.c:2612
+#: ../src/scan_dialog.c:2058
 msgid "O"
-msgstr "O"
+msgstr ""
 
-#: ../src/scan.c:2613
+#: ../src/scan_dialog.c:2059
 msgid "Process original artist field"
 msgstr ""
 
 #. Advice for Translators: set the first letter of copyright translated
-#: ../src/scan.c:2615
+#: ../src/scan_dialog.c:2061
 msgid "Cr"
 msgstr ""
 
-#: ../src/scan.c:2616
+#: ../src/scan_dialog.c:2062
 msgid "Process copyright field"
 msgstr ""
 
 #. Advice for Translators: set the first letter of URL translated
-#: ../src/scan.c:2618
+#: ../src/scan_dialog.c:2064
 msgid "U"
-msgstr "U"
+msgstr ""
 
-#: ../src/scan.c:2619
+#: ../src/scan_dialog.c:2065
 msgid "Process URL field"
 msgstr ""
 
 #. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan.c:2621
+#: ../src/scan_dialog.c:2067
 msgid "E"
-msgstr "E"
+msgstr ""
 
-#: ../src/scan.c:2622
+#: ../src/scan_dialog.c:2068
 msgid "Process encoder name field"
 msgstr ""
 
-#: ../src/scan.c:2666
+#: ../src/scan_dialog.c:2112
 msgid "Invert selection"
-msgstr ""
+msgstr "ఎంపికను విలోమించు"
 
-#: ../src/scan.c:2673
+#: ../src/scan_dialog.c:2119
 msgid "Select/Unselect all"
 msgstr ""
 
-#: ../src/scan.c:2686
+#: ../src/scan_dialog.c:2134
 msgid "Convert:"
 msgstr ""
 
-#: ../src/scan.c:2688
+#: ../src/scan_dialog.c:2136
 msgid "to: "
 msgstr ""
 
-#: ../src/scan.c:2717
+#: ../src/scan_dialog.c:2143
+msgid "Do not convert"
+msgstr ""
+
+#: ../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'."
 msgstr ""
 
-#: ../src/scan.c:2720
+#: ../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'."
 msgstr ""
 
-#: ../src/scan.c:2723
+#: ../src/scan_dialog.c:2168
 msgid ""
 "Replace a string by another one. Note that the search is case sensitive."
 msgstr ""
 
-#: ../src/scan.c:2736
+#: ../src/scan_dialog.c:2175
+msgid "Capitalize all"
+msgstr ""
+
+#: ../src/scan_dialog.c:2177
+msgid "Lowercase all"
+msgstr ""
+
+#: ../src/scan_dialog.c:2179
+msgid "Capitalize first letter"
+msgstr ""
+
+#: ../src/scan_dialog.c:2181
+msgid "Capitalize the first letter of each word"
+msgstr ""
+
+#: ../src/scan_dialog.c:2182
 msgid "Detect Roman numerals"
 msgstr ""
 
-#: ../src/scan.c:2763
+#: ../src/scan_dialog.c:2184
+msgid "Do not change capitalization"
+msgstr ""
+
+#: ../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'."
 msgstr ""
 
-#: ../src/scan.c:2766
+#: ../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'."
 msgstr ""
 
-#: ../src/scan.c:2769
+#: ../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'."
 msgstr ""
 
-#: ../src/scan.c:2772
+#: ../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'."
 msgstr ""
 
-#: ../src/scan.c:2775
+#: ../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'."
 msgstr ""
 
-#: ../src/scan.c:2784
-msgid "Insert a space before an uppercase letter"
+#: ../src/scan_dialog.c:2226
+msgid "Insert a space before uppercase letters"
+msgstr ""
+
+#: ../src/scan_dialog.c:2228
+msgid "Remove duplicate spaces and underscores"
 msgstr ""
 
-#: ../src/scan.c:2785
-msgid "Remove duplicates of space or underscore"
+#: ../src/scan_dialog.c:2230
+msgid "Do not change word separators"
 msgstr ""
 
-#: ../src/scan.c:2803
+#: ../src/scan_dialog.c:2244
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
 
-#: ../src/scan.c:2806
+#: ../src/scan_dialog.c:2247
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
 
-#: ../src/scan.c:2809
+#: ../src/scan_dialog.c:2250
 msgid ""
-"Duplicated spaces or underscores are removed. Example, before: "
+"Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
 msgstr ""
 
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2816
+#: ../src/scan_dialog.c:2257
 msgid "Legend"
-msgstr "Llegenda"
+msgstr ""
 
-#: ../src/scan.c:2822
+#: ../src/scan_dialog.c:2263
 #, c-format
 msgid "%a: artist"
-msgstr "%a: artista"
+msgstr ""
 
-#: ../src/scan.c:2825
+#: ../src/scan_dialog.c:2266
 msgid "%z: album artist"
-msgstr "%z: artista de l'àlbum"
+msgstr ""
 
-#: ../src/scan.c:2828
+#: ../src/scan_dialog.c:2269
 msgid "%b: album"
 msgstr ""
 
-#: ../src/scan.c:2831
+#: ../src/scan_dialog.c:2272
 #, c-format
 msgid "%c: comment"
-msgstr "%c: comentari"
+msgstr ""
 
-#: ../src/scan.c:2834
+#: ../src/scan_dialog.c:2275
 #, c-format
 msgid "%p: composer"
-msgstr "%p: redactor"
+msgstr ""
 
-#: ../src/scan.c:2837
+#: ../src/scan_dialog.c:2278
 msgid "%r: copyright"
-msgstr "%r: copyright"
+msgstr ""
 
-#: ../src/scan.c:2840
+#: ../src/scan_dialog.c:2281
 #, c-format
 msgid "%d: disc number"
 msgstr ""
 
-#: ../src/scan.c:2843
+#: ../src/scan_dialog.c:2284
 #, c-format
 msgid "%e: encoded by"
 msgstr ""
 
-#: ../src/scan.c:2846
+#: ../src/scan_dialog.c:2287
 #, c-format
 msgid "%g: genre"
 msgstr ""
 
-#: ../src/scan.c:2849
+#: ../src/scan_dialog.c:2290
 #, c-format
 msgid "%i: ignored"
 msgstr ""
 
-#: ../src/scan.c:2852
+#: ../src/scan_dialog.c:2293
 msgid "%l: number of tracks"
 msgstr ""
 
-#: ../src/scan.c:2855
+#: ../src/scan_dialog.c:2296
 #, c-format
 msgid "%o: orig. artist"
 msgstr ""
 
-#: ../src/scan.c:2858
+#: ../src/scan_dialog.c:2299
 #, c-format
 msgid "%n: track"
-msgstr "%n: pista"
+msgstr ""
 
-#: ../src/scan.c:2861
+#: ../src/scan_dialog.c:2302
 msgid "%t: title"
-msgstr "%t: títol"
+msgstr ""
 
-#: ../src/scan.c:2864
+#: ../src/scan_dialog.c:2305
 #, c-format
 msgid "%u: URL"
-msgstr "%u: URL"
+msgstr ""
+
+#: ../src/scan_dialog.c:2308
+#, c-format
+msgid "%x: number of discs"
+msgstr ""
 
-#: ../src/scan.c:2867
+#: ../src/scan_dialog.c:2311
 msgid "%y: year"
-msgstr "%y: any"
+msgstr ""
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2874
+#: ../src/scan_dialog.c:2318
 msgid "Mask Editor"
 msgstr ""
 
-#: ../src/scan.c:2931
+#: ../src/scan_dialog.c:2372
 msgid "Create New Mask"
 msgstr ""
 
-#: ../src/scan.c:2941
+#: ../src/scan_dialog.c:2382
 msgid "Move Up this Mask"
 msgstr ""
 
-#: ../src/scan.c:2951
+#: ../src/scan_dialog.c:2392
 msgid "Move Down this Mask"
 msgstr ""
 
-#: ../src/scan.c:2961
+#: ../src/scan_dialog.c:2402
 msgid "Duplicate Mask"
 msgstr ""
 
-#: ../src/scan.c:2971
+#: ../src/scan_dialog.c:2412
 msgid "Add Default Masks"
 msgstr ""
 
-#: ../src/scan.c:2981
+#: ../src/scan_dialog.c:2422
 msgid "Remove Mask"
 msgstr ""
 
-#: ../src/scan.c:2991
+#: ../src/scan_dialog.c:2432
 msgid "Save Masks"
 msgstr ""
 
-#: ../src/scan.c:3601
+#: ../src/scan_dialog.c:3012
 msgid "New_mask"
 msgstr ""
 
-#: ../src/scan.c:3640
+#: ../src/scan_dialog.c:3051
 msgid "Copy: No row selected"
 msgstr ""
 
-#: ../src/scan.c:3748
+#: ../src/scan_dialog.c:3144
 msgid "Remove: No row selected"
 msgstr ""
 
-#: ../src/scan.c:3796
+#: ../src/scan_dialog.c:3191
 msgid "Move Up: No row selected"
 msgstr ""
 
-#: ../src/scan.c:3850
+#: ../src/scan_dialog.c:3235
 msgid "Move Down: No row selected"
 msgstr ""
 
-#: ../src/setting.c:914
+#: ../src/setting.c:924
 #, c-format
 msgid "Error: Cannot write configuration file: %s (%s)"
 msgstr ""
 
-#: ../src/setting.c:1056
+#: ../src/setting.c:944 ../src/setting.c:961 ../src/setting.c:981
+#, c-format
+msgid "Error while writing configuration file: %s"
+msgstr ""
+
+#: ../src/setting.c:1100
 #, c-format
 msgid "Cannot open configuration file '%s' (%s)"
 msgstr ""
 
-#: ../src/setting.c:1058
+#: ../src/setting.c:1102
 msgid "Loading default configuration"
 msgstr ""
 
-#: ../src/setting.c:1099
+#: ../src/setting.c:1143
 #, c-format
 msgid "Cannot create or open file '%s' (%s)"
 msgstr ""
 
-#: ../src/setting.c:1160
+#: ../src/setting.c:1203
 #, c-format
 msgid "Error: Cannot write list to file: %s (%s)"
 msgstr ""
 
+#: ../src/setting.c:1221
+#, c-format
+msgid "Error while writing list file: %s"
+msgstr ""
+
 #. Fall back to defaults
-#: ../src/setting.c:1245
+#: ../src/setting.c:1301
 msgid "Loading default 'Fill Tag' masks…"
 msgstr ""
 
 #. Fall back to defaults
-#: ../src/setting.c:1273
+#: ../src/setting.c:1331
 msgid "Loading default 'Rename File' masks…"
 msgstr ""
 
 #. Fall back to defaults
-#: ../src/setting.c:1300
+#: ../src/setting.c:1357
 msgid "Loading default 'Rename Directory' masks…"
 msgstr ""
 
-#: ../src/setting.c:1511
+#: ../src/setting.c:1568
 #, c-format
 msgid "Migrating configuration from directory '%s' to '%s'"
 msgstr ""
 
-#: ../src/setting.c:1535
+#: ../src/setting.c:1592
 #, c-format
 msgid "Failed to migrate configuration file '%s'"
 msgstr ""
 
-#: ../src/setting.c:1572
+#: ../src/setting.c:1629
 #, c-format
 msgid "Error: Cannot create directory '%s' (%s)"
 msgstr ""
-
-#: ../src/vcedit.c:295
-msgid "Input truncated or empty."
-msgstr ""
-
-#: ../src/vcedit.c:297
-msgid "Input is not an Ogg bitstream."
-msgstr ""
-
-#: ../src/vcedit.c:315
-msgid "Error reading first page of Ogg bitstream."
-msgstr ""
-
-#: ../src/vcedit.c:321
-msgid "Error reading initial header packet."
-msgstr ""
-
-#: ../src/vcedit.c:348
-msgid "Ogg bitstream contains neither Speex or Vorbis data."
-msgstr ""
-
-#: ../src/vcedit.c:381
-msgid "Corrupt secondary header."
-msgstr ""
-
-#: ../src/vcedit.c:411
-msgid "Need to save extra headers"
-msgstr ""
-
-#: ../src/vcedit.c:425
-msgid "EOF before end of Vorbis headers."
-msgstr ""
-
-#: ../src/vcedit.c:590
-msgid "Corrupt or missing data, continuing…"
-msgstr ""
-
-#: ../src/vcedit.c:627
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr ""
-
-#. Log_Print(_("DLL '%s' not already loaded. Try loading it..."), dllname);
-#: ../src/win32/win32dep.c:121
-#, c-format
-msgid "DLL '%s' not already loaded. Try loading it..."
-msgstr ""
-
-#. Log_Print(_("DLL '%s' could not be loaded"), dllname);
-#: ../src/win32/win32dep.c:125
-#, c-format
-msgid "DLL '%s' could not be loaded"
-msgstr ""
-
-#. Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-#: ../src/win32/win32dep.c:135
-#, c-format
-msgid "This version of '%s' contains '%s'"
-msgstr ""
-
-#. Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-#: ../src/win32/win32dep.c:141
-#, c-format
-msgid "Function '%s' not found in DLL '%s'"
-msgstr ""
-
-#. ET_Win32_Path_Replace_Backslashes(app_data_dir);
-#. Log_Print(_("EasyTAG settings directory: '%s'"), app_data_dir);
-#: ../src/win32/win32dep.c:277
-#, c-format
-msgid "EasyTAG settings directory: '%s'"
-msgstr ""
-
-#. Log_Print(_("weasytag_init start..."));
-#: ../src/win32/win32dep.c:467
-#, c-format
-msgid "weasytag_init start..."
-msgstr ""
-
-#. Log_Print(_("EasyTAG version: %s"),VERSION);
-#. g_print(_("EasyTAG version: %s"),VERSION);
-#. g_print("\n");
-#: ../src/win32/win32dep.c:473
-#, c-format
-msgid "GLib version: %u.%u.%u\n"
-msgstr ""
-
-#. Set Environmental Variables
-#. Log_Print(_("weasytag_init end..."));
-#: ../src/win32/win32dep.c:491
-#, c-format
-msgid "weasytag_init end..."
-msgstr ""
-
-#. Log_Print(_("Audio player: '%s'"), player);
-#: ../src/win32/win32dep.c:615
-#, c-format
-msgid "Audio player: '%s'"
-msgstr ""
diff --git a/src/about.c b/src/about.c
index 5fdec2b..f9ca091 100644
--- a/src/about.c
+++ b/src/about.c
@@ -42,9 +42,9 @@ void Show_About_Window (void)
         "Santtu Lakkala <inz at inz.fi>",
         "Jérôme Couderc <easytag at gmail.com>",
         "Daniel Drake <dsd at gentoo.org>",
+        "Avhinav Jangda <abhijangda at hotmail.com>",
         "Mihael Vrbanec <miqster at gmx.net>",
         "Michael Pujos <pujos.michael at laposte.net>",
-        "Adrian Bunk <bunk at fs.tum.de>",
         "Goetz Waschk <waschk at informatik.uni-rostock.de>",
         "Holger Schemel <aeglos at valinor.owl.de>",
         "Charles Kerr <charles at superimp.org>",
@@ -75,9 +75,7 @@ void Show_About_Window (void)
 
     static const gchar * const documenters[] =
     {
-        "Emmanuel Brun <brunema at wanadoo.fr>",
-        "Daniel Pichler <dpichler at dnet.it>",
-        "Anders Strömer <anders.stromer at comhem.se>",
+        "Ekaterina Gerasimova <kittykat3756 at gmail.com>",
         NULL
     };
 
diff --git a/src/bar.c b/src/bar.c
index 262684f..495c0b1 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -29,12 +29,13 @@
 #include "prefs.h"
 #include "setting.h"
 #include "browser.h"
-#include "scan.h"
+#include "scan_dialog.h"
 #include "cddb.h"
 #include "log.h"
 #include "misc.h"
 #include "charset.h"
 #include "ui_manager.h"
+#include "gtk2_compat.h"
 
 /***************
  * Declaration *
@@ -637,7 +638,7 @@ et_statusbar_pop_tooltip (void)
  */
 GtkWidget *Create_Progress_Bar (void)
 {
-    ProgressBar = gtk_progress_bar_new();
+    ProgressBar = et_progress_bar_new ();
 
     gtk_widget_show(ProgressBar);
     return ProgressBar;
diff --git a/src/browser.c b/src/browser.c
index 6787cf6..f80d90c 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -43,7 +43,7 @@
 #include "easytag.h"
 #include "browser.h"
 #include "et_core.h"
-#include "scan.h"
+#include "scan_dialog.h"
 #include "bar.h"
 #include "log.h"
 #include "misc.h"
@@ -535,7 +535,7 @@ Browser_List_Button_Press (GtkTreeView *treeView, GdkEventButton *event)
     {
         /* Double left mouse click */
         // Select files of the same directory (useful when browsing sub-directories)
-        GList *etfilelist = NULL;
+        GList *l;
         gchar *path_ref = NULL;
         gchar *patch_check = NULL;
         GtkTreePath *currentPath = NULL;
@@ -547,19 +547,20 @@ Browser_List_Button_Press (GtkTreeView *treeView, GdkEventButton *event)
         path_ref = g_path_get_dirname( ((File_Name *)ETCore->ETFileDisplayed->FileNameCur->data)->value );
 
         // Search and select files of the same directory
-        etfilelist = g_list_first(ETCore->ETFileDisplayedList);
-        while (etfilelist)
+        for (l = g_list_first (ETCore->ETFileDisplayedList); l != NULL;
+             l = g_list_next (l))
         {
             // Path of the file to check if it is in the same directory
-            patch_check = g_path_get_dirname( ((File_Name *)((ET_File *)etfilelist->data)->FileNameCur->data)->value );
+            patch_check = g_path_get_dirname (((File_Name *)((ET_File *)l->data)->FileNameCur->data)->value);
 
             if ( path_ref && patch_check && strcmp(path_ref,patch_check)==0 )
             {
                 // Use of 'currentPath' to try to increase speed. Indeed, in many
                 // cases, the next file to select, is the next in the list
-                currentPath = Browser_List_Select_File_By_Etfile2((ET_File *)etfilelist->data,TRUE,currentPath);
+                currentPath = Browser_List_Select_File_By_Etfile2 ((ET_File *)l->data,
+                                                                   TRUE,
+                                                                   currentPath);
             }
-            etfilelist = g_list_next(etfilelist);
             g_free(patch_check);
         }
         g_free(path_ref);
@@ -692,8 +693,12 @@ Browser_Tree_Node_Selected (GtkTreeSelection *selection, gpointer user_data)
             case GTK_RESPONSE_NO:
                 break;
             case GTK_RESPONSE_CANCEL:
-            case GTK_RESPONSE_NONE:
+            case GTK_RESPONSE_DELETE_EVENT:
                 return TRUE;
+                break;
+            default:
+                g_assert_not_reached ();
+                break;
         }
     }
 
@@ -980,10 +985,15 @@ Browser_List_Row_Selected (GtkTreeSelection *selection, gpointer data)
         // Returns the last line selected (in ascending line order) to display the item
         lastSelected = (GtkTreePath *)g_list_last(selectedRows)->data;
         if (gtk_tree_model_get_iter(GTK_TREE_MODEL(fileListModel), &lastFile, lastSelected))
-            gtk_tree_model_get(GTK_TREE_MODEL(fileListModel), &lastFile,
-                               LIST_FILE_POINTER, &fileETFile, -1);
-
-        Action_Select_Nth_File_By_Etfile(fileETFile);
+        {
+            gtk_tree_model_get (GTK_TREE_MODEL(fileListModel), &lastFile,
+                                LIST_FILE_POINTER, &fileETFile, -1);
+            Action_Select_Nth_File_By_Etfile (fileETFile);
+        }
+        else
+        {
+            g_warning ("%s", "Error getting iter from last path in selection");
+        }
     }else
     {
         // The real last selected line
@@ -1507,6 +1517,8 @@ void Browser_List_Remove_File (ET_File *searchETFile)
             }
         }
     }
+
+    gtk_tree_path_free (currentPath);
 }
 
 /*
@@ -2714,61 +2726,41 @@ GtkTreePath *Find_Child_Node (GtkTreeIter *parentnode, gchar *childtext)
 static gboolean
 check_for_subdir (const gchar *path)
 {
-    DIR *dir;
-    struct dirent *dirent;
-    gchar *npath;
-
-    if( (dir=opendir(path)) )
+    GFile *dir;
+    GFileEnumerator *enumerator;
+
+    dir = g_file_new_for_path (path);
+    enumerator = g_file_enumerate_children (dir,
+                                            G_FILE_ATTRIBUTE_STANDARD_TYPE ","
+                                            G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN,
+                                            G_FILE_QUERY_INFO_NONE,
+                                            NULL, NULL);
+    g_object_unref (dir);
+
+    if (enumerator)
     {
-        while( (dirent=readdir(dir)) )
+        GFileInfo *childinfo;
+
+        while ((childinfo = g_file_enumerator_next_file (enumerator,
+                                                         NULL, NULL)))
         {
-            // We don't read the directories '.' and '..', but may read hidden directories
-            // like '.mydir' (note that '..mydir' or '...mydir' aren't hidden directories)
-            // See also the rule into 'expand_cb' function
-            if ((g_ascii_strcasecmp(dirent->d_name,".")  != 0)
-            && (g_ascii_strcasecmp(dirent->d_name,"..") != 0)
-            // Display hidden directories is needed, or keep only the not hidden directories
-            && (BROWSE_HIDDEN_DIR
-              || !( (g_ascii_strncasecmp(dirent->d_name,".", 1) == 0)
-                 && (strlen(dirent->d_name) > 1)
-                 && (g_ascii_strncasecmp(dirent->d_name+1,".", 1) != 0) ))
-               )
+            if ((g_file_info_get_file_type (childinfo) ==
+                 G_FILE_TYPE_DIRECTORY) &&
+                (BROWSE_HIDDEN_DIR || !g_file_info_get_is_hidden (childinfo)))
             {
-                GFile *file;
-                GFileInfo *fileinfo;
-#ifdef G_OS_WIN32
-                // On win32 : stat("/path/to/dir") succeed, while stat("/path/to/dir/") fails
-                npath = g_strconcat(path,dirent->d_name,NULL);
-#else /* !G_OS_WIN32 */
-                npath = g_strconcat(path,dirent->d_name,G_DIR_SEPARATOR_S,NULL);
-#endif /* !G_OS_WIN32 */
-
-                file = g_file_new_for_path (npath);
-                fileinfo = g_file_query_info (file,
-                                              G_FILE_ATTRIBUTE_STANDARD_TYPE,
-                                              G_FILE_QUERY_INFO_NONE, NULL,
-                                              NULL);
-                g_free (npath);
-                g_object_unref (file);
-
-                if (!fileinfo)
-                {
-                    continue;
-                }
-
-                if (g_file_info_get_file_type (fileinfo)
-                    == G_FILE_TYPE_DIRECTORY)
-                {
-                    g_object_unref (fileinfo);
-                    closedir(dir);
-                    return TRUE;
-                }
-
-                g_object_unref (fileinfo);
+                g_object_unref (childinfo);
+                g_file_enumerator_close (enumerator, NULL, NULL);
+                g_object_unref (enumerator);
+                return TRUE;
             }
+
+            g_object_unref (childinfo);
         }
-        closedir(dir);
+
+        g_file_enumerator_close (enumerator, NULL, NULL);
+        g_object_unref (enumerator);
     }
+
     return FALSE;
 }
 
@@ -2890,10 +2882,8 @@ Browser_List_Select_Func (GtkTreeSelection *selection, GtkTreeModel *model, GtkT
  */
 static void expand_cb (GtkWidget *tree, GtkTreeIter *iter, GtkTreePath *gtreePath, gpointer data)
 {
-    DIR *dir;
-    struct dirent *dirent;
-    gchar *path;
-    gchar *dirname_utf8;
+    GFile *dir;
+    GFileEnumerator *enumerator;
     gchar *fullpath_file;
     gchar *parentPath;
     gboolean treeScanned;
@@ -2911,61 +2901,41 @@ static void expand_cb (GtkWidget *tree, GtkTreeIter *iter, GtkTreePath *gtreePat
     if (treeScanned)
         return;
 
-    if ( (dir=opendir(parentPath)) )
+    dir = g_file_new_for_path (parentPath);
+    enumerator = g_file_enumerate_children (dir,
+                                            G_FILE_ATTRIBUTE_STANDARD_TYPE ","
+                                            G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME ","
+                                            G_FILE_ATTRIBUTE_STANDARD_NAME ","
+                                            G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN,
+                                            G_FILE_QUERY_INFO_NONE,
+                                            NULL, NULL);
+
+    if (enumerator)
     {
-        while ( (dirent=readdir(dir)) )
+        GFileInfo *childinfo;
+
+        while ((childinfo = g_file_enumerator_next_file (enumerator,
+                                                         NULL, NULL))
+               != NULL)
         {
-            GFile *file;
-            GFileInfo *fileinfo;
+            const gchar *name;
+            GFile *child;
             gboolean isdir = FALSE;
 
-            path = g_strconcat(parentPath, dirent->d_name, NULL);
-            file = g_file_new_for_path (path);
-            fileinfo = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TYPE,
-                                          G_FILE_QUERY_INFO_NONE, NULL, NULL);
-            g_object_unref (file);
+            name = g_file_info_get_name (childinfo);
+            child = g_file_get_child (dir, name);
+            fullpath_file = g_file_get_path (child);
+            isdir = g_file_info_get_file_type (childinfo) == G_FILE_TYPE_DIRECTORY;
 
-            if (fileinfo)
+            if (isdir &&
+                (BROWSE_HIDDEN_DIR || !g_file_info_get_is_hidden (childinfo)))
             {
-                isdir = g_file_info_get_file_type (fileinfo)
-                        == G_FILE_TYPE_DIRECTORY;
+                const gchar *dirname_utf8;
+                dirname_utf8 = g_file_info_get_display_name (childinfo);
 
-                g_object_unref (fileinfo);
-            }
+                has_subdir = check_for_subdir (fullpath_file);
 
-            // We don't read the directories '.' and '..', but may read hidden directories
-            // like '.mydir' (note that '..mydir' or '...mydir' aren't hidden directories)
-            // See also the rule into 'check_for_subdir' function
-            if (isdir
-            && (g_ascii_strcasecmp(dirent->d_name,".")  != 0)
-            && (g_ascii_strcasecmp(dirent->d_name,"..") != 0)
-            // Display hidden directories is needed, or keep only the not hidden directories
-            && (BROWSE_HIDDEN_DIR
-              || !( (g_ascii_strncasecmp(dirent->d_name,".", 1) == 0)
-                 && (strlen(dirent->d_name) > 1)
-                 && (g_ascii_strncasecmp(dirent->d_name+1,".", 1) != 0) ))
-               )
-            {
-
-                if (path[strlen(path)-1]!=G_DIR_SEPARATOR)
-                    fullpath_file = g_strconcat(path,G_DIR_SEPARATOR_S,NULL);
-                else
-                    fullpath_file = g_strdup(path);
-
-                dirname_utf8 = filename_to_display(dirent->d_name);
-
-                //if (!dirname_utf8)
-                //{
-                //    gchar *escaped_temp = g_strescape(dirent->d_name, NULL);
-                //    g_free(escaped_temp);
-                //}
-
-                if (check_for_subdir(fullpath_file))
-                    has_subdir = TRUE;
-                else
-                    has_subdir = FALSE;
-
-                // Select pixmap according permissions for the directory
+                /* Select pixmap according permissions for the directory. */
                 icon = get_gicon_for_path (fullpath_file,
                                            ET_PATH_STATE_CLOSED);
 
@@ -2988,19 +2958,23 @@ static void expand_cb (GtkWidget *tree, GtkTreeIter *iter, GtkTreePath *gtreePat
                 }
 
                 g_object_unref (icon);
-                g_free(fullpath_file);
-                g_free(dirname_utf8);
             }
-            g_free(path);
 
+            g_free (fullpath_file);
+            g_object_unref (childinfo);
+            g_object_unref (child);
         }
-        closedir(dir);
+
+        g_file_enumerator_close (enumerator, NULL, NULL);
+        g_object_unref (enumerator);
+
         /* Remove dummy node. */
         gtk_tree_model_iter_children (GTK_TREE_MODEL (directoryTreeModel),
                                       &subNodeIter, iter);
         gtk_tree_store_remove (directoryTreeModel, &subNodeIter);
     }
 
+    g_object_unref (dir);
     icon = get_gicon_for_path (parentPath, ET_PATH_STATE_OPEN);
 
 #ifdef G_OS_WIN32
diff --git a/src/cddb.c b/src/cddb.c
index fc12dca..e90daa7 100644
--- a/src/cddb.c
+++ b/src/cddb.c
@@ -44,7 +44,7 @@
 #include "easytag.h"
 #include "et_core.h"
 #include "browser.h"
-#include "scan.h"
+#include "scan_dialog.h"
 #include "log.h"
 #include "misc.h"
 #include "setting.h"
diff --git a/src/charset.h b/src/charset.h
index 201b601..a5c629d 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -24,9 +24,7 @@
 
 #include <gtk/gtk.h>
 
-/***************
- * Declaration *
- ***************/
+G_BEGIN_DECLS
 
 typedef struct
 {
@@ -61,5 +59,6 @@ gchar *Charset_Get_Name_From_Title (const gchar *charset_title);
 void Charset_Insert_Locales_Init    (void);
 void Charset_Insert_Locales_Destroy (void);
 
+G_END_DECLS
 
 #endif /* __CHARSET_H__ */
diff --git a/src/easytag.c b/src/easytag.c
index 29eeb82..cbd3f55 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -47,6 +47,7 @@
 #include "prefs.h"
 #include "setting.h"
 #include "scan.h"
+#include "scan_dialog.h"
 #include "mpeg_header.h"
 #include "id3_tag.h"
 #include "ogg_tag.h"
@@ -156,6 +157,17 @@ static gboolean et_tag_field_on_key_press_event (GtkEntry *entry,
                                                  GdkEventKey *event,
                                                  gpointer user_data);
 
+static gboolean
+on_main_window_delete_event (GtkWidget *window,
+                             GdkEvent *event,
+                             gpointer user_data)
+{
+    Quit_MainWindow ();
+
+    /* Handled the event, so stop propagation. */
+    return TRUE;
+}
+
 /*
  * common_init:
  * @application: the application
@@ -225,8 +237,8 @@ common_init (GApplication *application)
     // This part is needed to set correctly the position of handle panes
     gtk_window_set_default_size(GTK_WINDOW(MainWindow),MAIN_WINDOW_WIDTH,MAIN_WINDOW_HEIGHT);
 
-    g_signal_connect(G_OBJECT(MainWindow),"delete_event",G_CALLBACK(Quit_MainWindow),NULL);
-    g_signal_connect(G_OBJECT(MainWindow),"destroy",G_CALLBACK(Quit_MainWindow),NULL);
+    g_signal_connect (MainWindow, "delete-event",
+                      G_CALLBACK (on_main_window_delete_event), NULL);
 
     /* Minimised window icon */
     gtk_widget_realize(MainWindow);
@@ -463,7 +475,6 @@ on_application_open (GApplication *application, GFile **files, gint n_files,
                     Browser_Tree_Select_Dir (parent_path);
 
                     g_free (parent_path);
-                    g_free (path_utf8);
                 }
                 else
                 {
@@ -1489,6 +1500,7 @@ 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
@@ -2425,10 +2437,13 @@ Save_List_Of_Files (GList *etfilelist, gboolean force_saving_files)
             case GTK_RESPONSE_YES:
                 break;
             case GTK_RESPONSE_NO:
-            case GTK_RESPONSE_NONE:
+            case GTK_RESPONSE_DELETE_EVENT:
                 /* Skip the following loop. */
                 Main_Stop_Button_Pressed = TRUE;
                 break;
+            default:
+                g_assert_not_reached ();
+                break;
         }
     }
 
@@ -2622,9 +2637,14 @@ Delete_Selected_Files_With_Answer (void)
                 ET_Remove_File_From_File_List(ETFile);
                 break;
             case 0:
-                Log_Print (LOG_ERROR, _("Cannot delete file (%s)"),
-                           error->message);
-                g_error_free (error);
+                /* Distinguish between the file being skipped, and there being
+                 * an error during deletion. */
+                if (error)
+                {
+                    Log_Print (LOG_ERROR, _("Cannot delete file (%s)"),
+                               error->message);
+                    g_clear_error (&error);
+                }
                 break;
             case -1:
                 // Stop deleting files + reinit progress bar
@@ -2814,10 +2834,13 @@ Save_File (ET_File *ETFile, gboolean multiple_files,
             case GTK_RESPONSE_NO:
                 break;
             case GTK_RESPONSE_CANCEL:
-            case GTK_RESPONSE_NONE:
+            case GTK_RESPONSE_DELETE_EVENT:
                 stop_loop = -1;
                 return stop_loop;
                 break;
+            default:
+                g_assert_not_reached ();
+                break;
         }
     }
 
@@ -2968,10 +2991,13 @@ Save_File (ET_File *ETFile, gboolean multiple_files,
             case GTK_RESPONSE_NO:
                 break;
             case GTK_RESPONSE_CANCEL:
-            case GTK_RESPONSE_NONE:
+            case GTK_RESPONSE_DELETE_EVENT:
                 stop_loop = -1;
                 return stop_loop;
                 break;
+            default:
+                g_assert_not_reached ();
+                break;
         }
     }
 
@@ -3027,8 +3053,8 @@ et_rename_file (const char *old_filepath, const char *new_filepath,
     g_object_unref (file_new_parent);
 
     /* Move the file. */
-    if (!g_file_move (file_old, file_new, G_FILE_COPY_OVERWRITE, NULL, NULL,
-                      NULL, error))
+    if (!g_file_move (file_old, file_new, G_FILE_COPY_NONE, NULL, NULL, NULL,
+                      error))
     {
         /* Error moving file. */
         g_object_unref (file_old);
@@ -3203,6 +3229,9 @@ delete_file (ET_File *ETFile, gboolean multiple_files, GError **error)
             g_free(basename_utf8);
             return stop_loop;
             break;
+        default:
+            g_assert_not_reached ();
+            break;
     }
 
     g_free(basename_utf8);
@@ -3719,10 +3748,12 @@ void Update_Command_Buttons_Sensivity (void)
                                  AM_SCANNER_RENAME_FILE, FALSE);
         ui_widget_set_sensitive (MENU_SCANNER_PATH,
                                  AM_SCANNER_PROCESS_FIELDS, FALSE);
+        ui_widget_set_sensitive (MENU_VIEW, AM_ARTIST_VIEW_MODE, FALSE);
 
         return;
     }else
     {
+        GtkWidget *artist_radio = NULL;
         GList *selfilelist = NULL;
         ET_File *etfile;
         gboolean has_undo = FALSE;
@@ -3788,6 +3819,7 @@ void Update_Command_Buttons_Sensivity (void)
                                  AM_SCANNER_RENAME_FILE, TRUE);
         ui_widget_set_sensitive (MENU_SCANNER_PATH,
                                  AM_SCANNER_PROCESS_FIELDS, TRUE);
+        ui_widget_set_sensitive (MENU_VIEW, AM_ARTIST_VIEW_MODE, TRUE);
 
         /* Check if one of the selected files has undo or redo data */
         if (BrowserList)
@@ -3842,6 +3874,20 @@ void Update_Command_Buttons_Sensivity (void)
             ui_widget_set_sensitive (MENU_EDIT, AM_REDO_HISTORY, TRUE);
         else
             ui_widget_set_sensitive (MENU_EDIT, AM_REDO_HISTORY, FALSE);
+
+        artist_radio = gtk_ui_manager_get_widget (UIManager,
+                                                  "/ToolBar/ArtistViewMode");
+
+        if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (artist_radio)))
+        {
+            ui_widget_set_sensitive (MENU_VIEW, AM_COLLAPSE_TREE, FALSE);
+            ui_widget_set_sensitive (MENU_VIEW, AM_INITIALIZE_TREE, FALSE);
+        }
+        else
+        {
+            ui_widget_set_sensitive (MENU_VIEW, AM_COLLAPSE_TREE, TRUE);
+            ui_widget_set_sensitive (MENU_VIEW, AM_INITIALIZE_TREE, TRUE);
+        }
     }
 
     if (!ETCore->ETFileDisplayedList->prev)    /* Is it the 1st item ? */
@@ -4025,6 +4071,24 @@ void Tag_Area_Display_Controls (ET_File *ETFile)
             break;
 #endif
 
+#ifdef ENABLE_OPUS
+        case OPUS_TAG:
+            gtk_widget_show (GTK_WIDGET (DiscNumberLabel));
+            gtk_widget_show (GTK_WIDGET (DiscNumberEntry));
+            gtk_widget_show (GTK_WIDGET (ComposerLabel));
+            gtk_widget_show (GTK_WIDGET (ComposerEntry));
+            gtk_widget_show (GTK_WIDGET (OrigArtistLabel));
+            gtk_widget_show (GTK_WIDGET (OrigArtistEntry));
+            gtk_widget_show (GTK_WIDGET (CopyrightLabel));
+            gtk_widget_show (GTK_WIDGET (CopyrightEntry));
+            gtk_widget_show (GTK_WIDGET (URLLabel));
+            gtk_widget_show (GTK_WIDGET (URLEntry));
+            gtk_widget_show (GTK_WIDGET (EncodedByLabel));
+            gtk_widget_show (GTK_WIDGET (EncodedByEntry));
+            et_tag_notebook_show_images_tab (TagNoteBook);
+            break;
+#endif
+
 #ifdef ENABLE_FLAC
         case FLAC_TAG:
             gtk_widget_show(GTK_WIDGET(DiscNumberLabel));
@@ -4061,19 +4125,19 @@ void Tag_Area_Display_Controls (ET_File *ETFile)
 
 #ifdef ENABLE_MP4
         case MP4_TAG:
-            gtk_widget_hide(GTK_WIDGET(DiscNumberLabel));
-            gtk_widget_hide(GTK_WIDGET(DiscNumberEntry));
-            gtk_widget_hide(GTK_WIDGET(ComposerLabel));
-            gtk_widget_hide(GTK_WIDGET(ComposerEntry));
+            gtk_widget_show (GTK_WIDGET (DiscNumberLabel));
+            gtk_widget_show (GTK_WIDGET (DiscNumberEntry));
+            gtk_widget_show (GTK_WIDGET (ComposerLabel));
+            gtk_widget_show (GTK_WIDGET (ComposerEntry));
             gtk_widget_hide(GTK_WIDGET(OrigArtistLabel));
             gtk_widget_hide(GTK_WIDGET(OrigArtistEntry));
-            gtk_widget_hide(GTK_WIDGET(CopyrightLabel));
-            gtk_widget_hide(GTK_WIDGET(CopyrightEntry));
+            gtk_widget_show (GTK_WIDGET (CopyrightLabel));
+            gtk_widget_show (GTK_WIDGET (CopyrightEntry));
             gtk_widget_hide(GTK_WIDGET(URLLabel));
             gtk_widget_hide(GTK_WIDGET(URLEntry));
-            gtk_widget_hide(GTK_WIDGET(EncodedByLabel));
-            gtk_widget_hide(GTK_WIDGET(EncodedByEntry));
-            et_tag_notebook_hide_images_tab (TagNoteBook);
+            gtk_widget_show (GTK_WIDGET (EncodedByLabel));
+            gtk_widget_show (GTK_WIDGET (EncodedByEntry));
+            et_tag_notebook_show_images_tab (TagNoteBook);
             break;
 #endif
 
@@ -4227,7 +4291,7 @@ Convert_Space_Into_Underscore (GtkWidget *entry)
 {
     gchar *string = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
 
-    Scan_Convert_Space_Into_Undescore(string);
+    Scan_Convert_Space_Into_Underscore (string);
     gtk_entry_set_text(GTK_ENTRY(entry),string);
     g_free(string);
 }
@@ -4245,21 +4309,23 @@ Convert_All_Uppercase (GtkWidget *entry)
 static void
 Convert_All_Lowercase (GtkWidget *entry)
 {
-    gchar *string = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
+    gchar *res;
+    const gchar *string = gtk_entry_get_text (GTK_ENTRY (entry));
 
-    Scan_Process_Fields_All_Downcase(string);
-    gtk_entry_set_text(GTK_ENTRY(entry),string);
-    g_free(string);
+    res = Scan_Process_Fields_All_Uppercase (string);
+    gtk_entry_set_text (GTK_ENTRY (entry), res);
+    g_free (res);
 }
 
 static void
 Convert_Letter_Uppercase (GtkWidget *entry)
 {
-    gchar *string = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
+    gchar *res;
+    const gchar *string = gtk_entry_get_text (GTK_ENTRY (entry));
 
-    Scan_Process_Fields_Letter_Uppercase(string);
-    gtk_entry_set_text(GTK_ENTRY(entry),string);
-    g_free(string);
+    res = Scan_Process_Fields_Letter_Uppercase (string);
+    gtk_entry_set_text (GTK_ENTRY (entry), res);
+    g_free (res);
 }
 
 static void
@@ -4285,15 +4351,12 @@ Convert_Remove_Space (GtkWidget *entry)
 static void
 Convert_Insert_Space (GtkWidget *entry)
 {
-    // FIX ME : we suppose that it will not grow more than 2 times its size...
-    guint string_length = 2 * strlen(gtk_entry_get_text(GTK_ENTRY(entry)));
-    gchar *string       = g_malloc(string_length+1);
-    strncpy(string,gtk_entry_get_text(GTK_ENTRY(entry)),string_length);
-    string[string_length]='\0';
+    gchar *res;
+    const gchar *string = (gtk_entry_get_text (GTK_ENTRY (entry)));
 
-    Scan_Process_Fields_Insert_Space(&string);
-    gtk_entry_set_text(GTK_ENTRY(entry),string);
-    g_free(string);
+    res = Scan_Process_Fields_Insert_Space (string);
+    gtk_entry_set_text (GTK_ENTRY (entry), res);
+    g_free (res);
 }
 
 static void
@@ -4512,8 +4575,12 @@ void Quit_MainWindow (void)
                 Quit_MainWindow_Confirmed();
                 break;
             case GTK_RESPONSE_CANCEL:
-            case GTK_RESPONSE_NONE:
+            case GTK_RESPONSE_DELETE_EVENT:
                 return;
+                break;
+            default:
+                g_assert_not_reached ();
+                break;
         }
 
     } else if (CONFIRM_BEFORE_EXIT)
@@ -4536,9 +4603,12 @@ void Quit_MainWindow (void)
                 Quit_MainWindow_Confirmed();
                 break;
             case GTK_RESPONSE_CANCEL:
-            case GTK_RESPONSE_NONE:
+            case GTK_RESPONSE_DELETE_EVENT:
                 return;
                 break;
+            default:
+                g_assert_not_reached ();
+                break;
         }
     }else
     {
diff --git a/src/et_core.c b/src/et_core.c
index 11c52cc..e699c39 100644
--- a/src/et_core.c
+++ b/src/et_core.c
@@ -58,6 +58,10 @@
 #   include "wavpack_header.h"
 #   include "wavpack_tag.h"
 #endif
+#ifdef ENABLE_OPUS
+#include "opus_tag.h"
+#include "opus_header.h"
+#endif
 #include "bar.h"
 #include "browser.h"
 #include "log.h"
@@ -74,6 +78,46 @@
 
 ET_Core *ETCore = NULL;
 
+const ET_File_Description ETFileDescription[] =
+{
+#ifdef ENABLE_MP3
+    { MP3_FILE, ".mp3", ID3_TAG},
+    { MP2_FILE, ".mp2", ID3_TAG},
+#endif
+#ifdef ENABLE_OPUS
+    { OPUS_FILE, ".opus", OPUS_TAG},
+#endif
+#ifdef ENABLE_OGG
+    { OGG_FILE, ".ogg", OGG_TAG},
+    { OGG_FILE, ".oga", OGG_TAG},
+#endif
+#ifdef ENABLE_SPEEX
+    { SPEEX_FILE, ".spx", OGG_TAG}, /* Implemented by Pierre Dumuid. */
+#endif
+#ifdef ENABLE_FLAC
+    { FLAC_FILE, ".flac", FLAC_TAG},
+    { FLAC_FILE, ".fla",  FLAC_TAG},
+#endif
+    { MPC_FILE, ".mpc", APE_TAG}, /* Implemented by Artur Polaczynski. */
+    { MPC_FILE, ".mp+", APE_TAG}, /* Implemented by Artur Polaczynski. */
+    { MPC_FILE, ".mpp", APE_TAG}, /* Implemented by Artur Polaczynski. */
+    { MAC_FILE, ".ape", APE_TAG}, /* Implemented by Artur Polaczynski. */
+    { MAC_FILE, ".mac", APE_TAG}, /* Implemented by Artur Polaczynski. */
+    { OFR_FILE, ".ofr", APE_TAG},
+    { OFR_FILE, ".ofs", APE_TAG},
+#ifdef ENABLE_MP4
+    { MP4_FILE, ".mp4", MP4_TAG}, /* Implemented by Michael Ihde. */
+    { MP4_FILE, ".m4a", MP4_TAG}, /* Implemented by Michael Ihde. */
+    { MP4_FILE, ".m4p", MP4_TAG}, /* Implemented by Michael Ihde. */
+#endif
+#ifdef ENABLE_WAVPACK
+    { WAVPACK_FILE, ".wv", WAVPACK_TAG}, /* Implemented by Maarten Maathuis. */
+#endif
+    { UNKNOWN_FILE, "", UNKNOWN_TAG } /* This item must be placed at the end! */
+};
+
+const gsize ET_FILE_DESCRIPTION_SIZE = G_N_ELEMENTS (ETFileDescription) - 1;
+
 /*
  * Colors Used
  */
@@ -463,6 +507,8 @@ GList *ET_Add_File_To_File_List (gchar *filename)
     if (!filename)
         return ETCore->ETFileList;
 
+    file = g_file_new_for_path (filename);
+
     /* Primary Key for this file */
     ETFileKey = ET_File_Key_New();
 
@@ -525,6 +571,17 @@ GList *ET_Add_File_To_File_List (gchar *filename)
             Wavpack_Tag_Read_File_Tag(filename, FileTag);
         break;
 #endif
+#ifdef ENABLE_OPUS
+        case OPUS_TAG:
+            if (!et_opus_tag_read_file_tag (file, FileTag, &error))
+            {
+                Log_Print (LOG_ERROR,
+                           _("Error reading tag from Opus file (%s)"),
+                           error->message);
+                g_clear_error (&error);
+            }
+            break;
+#endif
         case UNKNOWN_TAG:
         default:
             Log_Print(LOG_ERROR,"FileTag: Undefined tag type (%d) for file %s",ETFileDescription->TagType,filename_utf8);
@@ -573,6 +630,16 @@ GList *ET_Add_File_To_File_List (gchar *filename)
             Mp4_Header_Read_File_Info(filename,ETFileInfo);
             break;
 #endif
+#ifdef ENABLE_OPUS
+        case OPUS_FILE:
+            if (!et_opus_read_file_info (file, ETFileInfo, &error))
+            {
+                Log_Print (LOG_ERROR, _("Error while querying information for file: '%s' (%s)"),
+                           filename_utf8, error->message);
+                g_error_free (error);
+            }
+            break;
+#endif
         case UNKNOWN_FILE:
         default:
             Log_Print(LOG_ERROR,"ETFileInfo: Undefined file type (%d) for file %s",ETFileDescription->FileType,filename_utf8);
@@ -592,7 +659,6 @@ GList *ET_Add_File_To_File_List (gchar *filename)
 
     /* Store the modification time of the file to check if the file was changed
      * before saving */
-    file = g_file_new_for_path (filename);
     fileinfo = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED,
                                   G_FILE_QUERY_INFO_NONE, NULL, NULL);
     g_object_unref (file);
@@ -694,14 +760,13 @@ ET_Add_File_To_Artist_Album_File_List (ET_File *ETFile)
         gchar *ETFile_Album  = ((File_Tag *)ETFile->FileTag->data)->album;  // Album  value of the ETFile passed in parameter
         gchar *etfile_artist = NULL;
         gchar *etfile_album  = NULL;
-        GList *ArtistList    = NULL;
+        GList *ArtistList;
         GList *AlbumList     = NULL;
         GList *etfilelist    = NULL;
         ET_File *etfile      = NULL;
 
-
-        ArtistList = ETCore->ETArtistAlbumFileList;
-        while (ArtistList)
+        for (ArtistList = ETCore->ETArtistAlbumFileList; ArtistList != NULL;
+             ArtistList = g_list_next (ArtistList))
         {
             AlbumList = (GList *)ArtistList->data;  /* Take the first item */
             if (AlbumList
@@ -741,7 +806,7 @@ ET_Add_File_To_Artist_Album_File_List (ET_File *ETFile)
                         AlbumList->data = (gpointer) g_list_sort((GList *)AlbumList->data,(GCompareFunc)ET_Comp_Func_Sort_Etfile_Item_By_Ascending_Filename);
                         return TRUE;
                     }
-                    AlbumList = AlbumList->next;
+                    AlbumList = g_list_next (AlbumList);
                 }
                 // The "AlbumList" item was NOT found! => Add a new "AlbumList" item (+...) item to the "ArtistList" list
                 etfilelist = g_list_append(NULL,ETFile);
@@ -750,7 +815,6 @@ ET_Add_File_To_Artist_Album_File_List (ET_File *ETFile)
                 ArtistList->data = (gpointer) g_list_sort((GList *)ArtistList->data,(GCompareFunc)ET_Comp_Func_Sort_Album_Item_By_Ascending_Album);
                 return TRUE;
             }
-            ArtistList = ArtistList->next;
         }
         // The "ArtistList" item was NOT found! => Add a new "ArtistList" to the main list (=ETArtistAlbumFileList)
         etfilelist = g_list_append(NULL,ETFile);
@@ -863,53 +927,61 @@ ET_Remove_File_From_Artist_Album_List (ET_File *ETFile)
     GList *ArtistList;
     GList *AlbumList;
     GList *etfilelist;
-    ET_File *etfile;
 
+    g_return_val_if_fail (ETFile != NULL, FALSE);
 
-    // Search the ETFile in the list...
-    ArtistList = ETCore->ETArtistAlbumFileList;
-    while (ArtistList && ETFile)
+    /* Search for the ETFile in the list. */
+    for (ArtistList = ETCore->ETArtistAlbumFileList; ArtistList != NULL;
+         ArtistList = g_list_next (ArtistList))
     {
-        AlbumList = g_list_first((GList *)ArtistList->data);
-        while (AlbumList)
+        for (AlbumList = g_list_first ((GList *)ArtistList->data);
+             AlbumList != NULL; AlbumList = g_list_next (AlbumList))
         {
-            etfilelist = g_list_first((GList *)AlbumList->data);
-            while (etfilelist)
+            for (etfilelist = g_list_first ((GList *)AlbumList->data);
+                 etfilelist != NULL; etfilelist = g_list_next (etfilelist))
             {
-                etfile = (ET_File *)etfilelist->data;
-                if (ETFile == etfile) // The ETFile to delete was found!
+                ET_File *etfile = (ET_File *)etfilelist->data;
+
+                if (ETFile == etfile) /* The ETFile to delete was found! */
                 {
-                    etfilelist = g_list_remove(etfilelist,ETFile);
-                    if (etfilelist) // Delete from AlbumList
+                    etfilelist = g_list_remove (etfilelist, ETFile);
+
+                    if (etfilelist) /* Delete from AlbumList. */
                     {
-                        AlbumList->data = (gpointer) g_list_first(etfilelist);
-                    }else
+                        AlbumList->data = (gpointer) g_list_first (etfilelist);
+                    }
+                    else
                     {
-                        AlbumList = g_list_remove(AlbumList,AlbumList->data);
-                        if (AlbumList) // Delete from ArtistList
+                        AlbumList = g_list_remove (AlbumList, AlbumList->data);
+
+                        if (AlbumList) /* Delete from ArtistList. */
                         {
-                            ArtistList->data = (gpointer) g_list_first(AlbumList);
-                        }else
+                            ArtistList->data = (gpointer) g_list_first (AlbumList);
+                        }
+                        else
                         {
-                            ETCore->ETArtistAlbumFileList = g_list_remove(ArtistList,ArtistList->data); // Delete from the main list
+                            /* Delete from the main list. */
+                            ETCore->ETArtistAlbumFileList = g_list_remove (ArtistList,ArtistList->data);
+
                             if (ETCore->ETArtistAlbumFileList)
-                                ETCore->ETArtistAlbumFileList = g_list_first(ETCore->ETArtistAlbumFileList);
+                            {
+                                ETCore->ETArtistAlbumFileList = g_list_first (ETCore->ETArtistAlbumFileList);
+                            }
+
                             return TRUE;
                         }
+
                         return TRUE;
                     }
+
                     return TRUE;
                 }
-                etfilelist = etfilelist->next;
             }
-            AlbumList = AlbumList->next;
         }
-        ArtistList = ArtistList->next;
     }
-    return FALSE; // ETFile is NUL, or not found in the list
-}
-
 
+    return FALSE; /* ETFile is NUL, or not found in the list. */
+}
 
 /**************************
  * File sorting functions *
@@ -2021,12 +2093,11 @@ GList *ET_Displayed_File_List_By_Etfile (ET_File *ETFile)
 {
     GList *etfilelist;
 
-    etfilelist = ET_Displayed_File_List_First();
-    while (ETFile && etfilelist)
+    for (etfilelist = ET_Displayed_File_List_First (); etfilelist != NULL;
+         etfilelist = ET_Displayed_File_List_Next ())
     {
-        if ( ETFile == (ET_File *)etfilelist->data )
+        if (ETFile == (ET_File *)etfilelist->data)
             break;
-        etfilelist = ET_Displayed_File_List_Next();
     }
     ETCore->ETFileDisplayedList = etfilelist; // To "save" the position like in ET_File_List_Next... (not very good - FIX ME)
     return etfilelist;
@@ -2647,6 +2718,9 @@ void ET_Display_File_Data_To_UI (ET_File *ETFile)
     gchar *cur_filename;
     gchar *cur_filename_utf8;
     gchar *msg;
+#ifdef ENABLE_OPUS
+    GFile *file;
+#endif
 
     g_return_if_fail (ETFile != NULL &&
                       ((GList *)ETFile->FileNameCur)->data != NULL);
@@ -2702,6 +2776,12 @@ void ET_Display_File_Data_To_UI (ET_File *ETFile)
             ET_Display_File_Tag_To_UI(ETFile);
             break;
 #endif
+#ifdef ENABLE_OPUS
+        case OPUS_TAG:
+            gtk_frame_set_label (GTK_FRAME (TagFrame), _("Opus Tag"));
+            ET_Display_File_Tag_To_UI (ETFile);
+            break;
+#endif
         case UNKNOWN_TAG:
         default:
             gtk_frame_set_label(GTK_FRAME(TagFrame),_("Tag"));
@@ -2764,6 +2844,14 @@ void ET_Display_File_Data_To_UI (ET_File *ETFile)
             Wavpack_Header_Display_File_Info_To_UI(cur_filename,ETFile->ETFileInfo);
             break;
 #endif
+#ifdef ENABLE_OPUS
+        case OPUS_FILE:
+            gtk_frame_set_label (GTK_FRAME (FileFrame), _("Opus File"));
+            file = g_file_new_for_path (cur_filename);
+            et_opus_header_display_file_info_to_ui (file, ETFile->ETFileInfo);
+            g_object_unref (file);
+            break;
+#endif
         case UNKNOWN_FILE:
         default:
             gtk_frame_set_label(GTK_FRAME(FileFrame),_("File"));
@@ -3117,10 +3205,9 @@ ET_Display_File_Tag_To_UI (ET_File *ETFile)
         PictureEntry_Update(FileTag->picture, FALSE);
 
         // Count the number of items
-        while (pic)
+        for (pic = FileTag->picture; pic != NULL; pic = pic->next)
         {
             nbr_pic++;
-            pic = pic->next;
         }
 
         // Get page "Images" of the notebook
@@ -3264,6 +3351,9 @@ void ET_Save_File_Data_From_UI (ET_File *ETFile)
 #ifdef ENABLE_WAVPACK
         case WAVPACK_TAG:
 #endif
+#ifdef ENABLE_OPUS
+        case OPUS_TAG:
+#endif
         case APE_TAG:
             ET_Save_File_Tag_From_UI(FileTag);
             ET_Copy_File_Tag_Item_Other_Field(ETFile,FileTag);
@@ -3961,6 +4051,11 @@ gboolean ET_Save_File_Tag_To_HD (ET_File *ETFile)
             state = Wavpack_Tag_Write_File_Tag(ETFile);
             break;
 #endif
+#ifdef ENABLE_OPUS
+        case OPUS_TAG:
+            state = ogg_tag_write_file_tag (ETFile, &error);
+            break;
+#endif
         case UNKNOWN_TAG:
         default:
             Log_Print(LOG_ERROR,"Saving to HD: Undefined function for tag type '%d' (file %s).",
@@ -4005,9 +4100,9 @@ gboolean ET_Save_File_Tag_To_HD (ET_File *ETFile)
         // parent directory is automatically updated.
         if (UPDATE_PARENT_DIRECTORY_MODIFICATION_TIME)
         {
-            gchar *path = g_path_get_dirname(cur_filename);
-            utime(g_path_get_dirname(cur_filename),NULL);
-            g_free(path);
+            gchar *path = g_path_get_dirname (cur_filename);
+            utime (path, NULL);
+            g_free (path);
         }
 
         ET_Mark_File_Tag_As_Saved(ETFile);
@@ -4050,12 +4145,13 @@ void ET_Update_Directory_Name_Into_File_List (gchar* last_path, gchar *new_path)
     else
         last_path_tmp = g_strconcat(last_path,G_DIR_SEPARATOR_S,NULL);
 
-    filelist = g_list_first(ETCore->ETFileList);
-    while (filelist)
+    for (filelist = g_list_first (ETCore->ETFileList); filelist != NULL;
+         filelist = g_list_next (filelist))
     {
-        if ( (file=filelist->data) && (filenamelist=file->FileNameList) )
+        if ((file = filelist->data))
         {
-            while (filenamelist)
+            for (filenamelist = file->FileNameList; filenamelist != NULL;
+                 filenamelist = g_list_next (filenamelist))
             {
                 File_Name *FileName = (File_Name *)filenamelist->data;
 
@@ -4082,10 +4178,8 @@ void ET_Update_Directory_Name_Into_File_List (gchar* last_path, gchar *new_path)
                         FileName->value_ck = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
                     }
                 }
-                filenamelist = g_list_next(filenamelist);
              }
         }
-        filelist = g_list_next(filelist);
     }
 
     g_free(last_path_tmp);
diff --git a/src/et_core.h b/src/et_core.h
index c9dc610..5476550 100644
--- a/src/et_core.h
+++ b/src/et_core.h
@@ -27,21 +27,18 @@
 #include <gdk/gdk.h>
 #include <config.h> // For definition of ENABLE_OGG, ...
 
-
-/***************
- * Declaration *
- ***************/
+G_BEGIN_DECLS
 
 /*
  * Colors Used (see declaration into et_core.c)
  */
-GdkColor LIGHT_BLUE;
-GdkColor RED;
-GdkColor LIGHT_RED;
-GdkColor GREY;
-GdkColor LIGHT_GREY;
-GdkColor YELLOW;
-GdkColor BLACK;
+extern GdkColor LIGHT_BLUE;
+extern GdkColor RED;
+extern GdkColor LIGHT_RED;
+extern GdkColor GREY;
+extern GdkColor LIGHT_GREY;
+extern GdkColor YELLOW;
+extern GdkColor BLACK;
 
 
 /*
@@ -110,6 +107,7 @@ typedef enum
     SPEEX_FILE,      // Speech audio files        : .spx
     OFR_FILE,        // OptimFROG (lossless)      : .ofr .ofs
     WAVPACK_FILE,    // Wavpack (lossless)        : .wv
+    OPUS_FILE, /* Ogg Opus File: .opus */
     UNKNOWN_FILE
 } ET_File_Type;
 
@@ -125,6 +123,7 @@ typedef enum
     FLAC_TAG,
     MP4_TAG,
     WAVPACK_TAG,
+    OPUS_TAG,
     UNKNOWN_TAG
 } ET_Tag_Type;
 
@@ -217,7 +216,7 @@ typedef struct _ET_File_Description ET_File_Description;
 struct _ET_File_Description
 {
     ET_File_Type FileType;    /* Type of file (ex: MP3) */
-    gchar       *Extension;   /* Extension (ex: ".mp3") */
+    const gchar *Extension; /* Extension (ex: ".mp3") */
     ET_Tag_Type  TagType;     /* Type of tag (ex: ID3) */
 };
 
@@ -225,43 +224,10 @@ struct _ET_File_Description
 /*
  * Description of supported files
  */
-static const ET_File_Description ETFileDescription[] = 
-{
-#ifdef ENABLE_MP3
-    {MP3_FILE,     ".mp3",  ID3_TAG},
-    {MP2_FILE,     ".mp2",  ID3_TAG},
-#endif
-#ifdef ENABLE_OGG
-    {OGG_FILE,     ".ogg",  OGG_TAG},
-    {OGG_FILE,     ".oga",  OGG_TAG},
-#endif
-#ifdef ENABLE_SPEEX
-    {SPEEX_FILE,   ".spx",  OGG_TAG},  // Implemented by Pierre Dumuid
-#endif
-#ifdef ENABLE_FLAC
-    {FLAC_FILE,    ".flac", FLAC_TAG},
-    {FLAC_FILE,    ".fla",  FLAC_TAG},
-#endif
-    {MPC_FILE,     ".mpc",  APE_TAG},  // Implemented by Artur Polaczynski
-    {MPC_FILE,     ".mp+",  APE_TAG},  // Implemented by Artur Polaczynski
-    {MPC_FILE,     ".mpp",  APE_TAG},  // Implemented by Artur Polaczynski
-    {MAC_FILE,     ".ape",  APE_TAG},  // Implemented by Artur Polaczynski
-    {MAC_FILE,     ".mac",  APE_TAG},  // Implemented by Artur Polaczynski
-    {OFR_FILE,     ".ofr",  APE_TAG},
-    {OFR_FILE,     ".ofs",  APE_TAG},
-#ifdef ENABLE_MP4
-    {MP4_FILE,     ".mp4",  MP4_TAG},  // Implemented by Michael Ihde
-    {MP4_FILE,     ".m4a",  MP4_TAG},  // Implemented by Michael Ihde
-    {MP4_FILE,     ".m4p",  MP4_TAG},  // Implemented by Michael Ihde
-#endif
-#ifdef ENABLE_WAVPACK
-    {WAVPACK_FILE, ".wv",   WAVPACK_TAG}, // Implemented by Maarten Maathuis
-#endif
-    {UNKNOWN_FILE, "",      UNKNOWN_TAG}    /* This item must be placed to the end! */
-};
+extern const ET_File_Description ETFileDescription[];
 
 /* Calculate the last index of the previous tab */
-#define ET_FILE_DESCRIPTION_SIZE ( sizeof(ETFileDescription)/sizeof(ETFileDescription[0]) - 1 )
+extern const gsize ET_FILE_DESCRIPTION_SIZE;
 
 
 /*
@@ -332,7 +298,7 @@ struct _ET_Core
     GList *ETHistoryFileList;           // History list of files changes for undo/redo actions
 };
 
-ET_Core *ETCore;    // Main pointer to structure needed by EasyTAG
+extern ET_Core *ETCore; /* Main pointer to structure needed by EasyTAG. */
 
 
 
@@ -446,5 +412,6 @@ gint ET_Comp_Func_Sort_File_By_Descending_File_Bitrate    (ET_File *ETFile1, ET_
 gint ET_Comp_Func_Sort_File_By_Ascending_File_Samplerate  (ET_File *ETFile1, ET_File *ETFile2);
 gint ET_Comp_Func_Sort_File_By_Descending_File_Samplerate (ET_File *ETFile1, ET_File *ETFile2);
 
+G_END_DECLS
 
 #endif /* __ET_CORE_H__ */
diff --git a/src/gio_wrapper.cc b/src/gio_wrapper.cc
new file mode 100644
index 0000000..9599494
--- /dev/null
+++ b/src/gio_wrapper.cc
@@ -0,0 +1,473 @@
+/*
+ *  EasyTAG - Tag editor for audio files
+ *  Copyright (C) 2014  Santtu Lakkala <inz at inz.fi>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "gio_wrapper.h"
+
+GIO_InputStream::GIO_InputStream (GFile * file_) :
+    file ((GFile *)g_object_ref (gpointer (file_))),
+    filename (g_file_get_uri (file)),
+    error (NULL)
+{
+    stream = g_file_read (file, NULL, &error);
+}
+
+GIO_InputStream::~GIO_InputStream ()
+{
+    clear ();
+
+    g_clear_object (&stream);
+    g_free (filename);
+    g_object_unref (file);
+}
+
+TagLib::FileName
+GIO_InputStream::name () const
+{
+    return TagLib::FileName (filename);
+}
+
+TagLib::ByteVector
+GIO_InputStream::readBlock (TagLib::ulong length)
+{
+    if (error)
+    {
+        return TagLib::ByteVector::null;
+    }
+
+    TagLib::ByteVector rv (length, 0);
+    gsize bytes;
+    g_input_stream_read_all (G_INPUT_STREAM (stream), (void *)rv.data (),
+                             length, &bytes, NULL, &error);
+
+    return rv.resize (bytes);
+}
+
+void
+GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+{
+    g_warning ("%s", "Trying to write to read-only file!");
+}
+
+void
+GIO_InputStream::insert (TagLib::ByteVector const &data,
+                         TagLib::ulong start,
+                         TagLib::ulong replace)
+{
+    g_warning ("%s", "Trying to write to read-only file!");
+}
+
+void
+GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong length)
+{
+    g_warning ("%s", "Trying to write to read-only file!");
+}
+
+bool
+GIO_InputStream::readOnly () const
+{
+    return true;
+}
+
+bool
+GIO_InputStream::isOpen () const
+{
+    return !!stream;
+}
+
+void
+GIO_InputStream::seek (long int offset, TagLib::IOStream::Position p)
+{
+    if (error)
+    {
+        return;
+    }
+
+    GSeekType type;
+
+    switch (p)
+    {
+        case TagLib::IOStream::Beginning:
+            type = G_SEEK_SET;
+            break;
+        case TagLib::IOStream::Current:
+            type = G_SEEK_CUR;
+            break;
+        case TagLib::IOStream::End:
+            type = G_SEEK_END;
+            break;
+        default:
+            g_warning ("Unknown seek");
+            return;
+    }
+
+    g_seekable_seek (G_SEEKABLE (stream), offset, type, NULL, &error);
+}
+
+void
+GIO_InputStream::clear ()
+{
+    if (error)
+    {
+        g_error_free(error);
+        error = NULL;
+    }
+}
+
+long int
+GIO_InputStream::tell () const
+{
+    return g_seekable_tell (G_SEEKABLE (stream));
+}
+
+long int
+GIO_InputStream::length ()
+{
+    if (error)
+    {
+        return -1;
+    }
+
+    long int rv = -1;
+    GFileInfo *info = g_file_input_stream_query_info (stream,
+                                                      G_FILE_ATTRIBUTE_STANDARD_SIZE,
+                                                      NULL, &error);
+    if (info)
+    {
+        rv = g_file_info_get_size (info);
+        g_object_unref (info);
+    }
+
+    return rv;
+}
+
+void
+GIO_InputStream::truncate (long int length)
+{
+    g_warning ("%s", "Trying to truncate read-only file");
+}
+
+GIO_IOStream::GIO_IOStream (GFile *file_) :
+    file ((GFile *)g_object_ref (gpointer (file_))),
+    filename (g_file_get_uri (file_)),
+    error (NULL)
+{
+    stream = g_file_open_readwrite (file, NULL, &error);
+}
+
+const GError *
+GIO_InputStream::getError () const
+{
+    return error;
+}
+
+GIO_IOStream::~GIO_IOStream ()
+{
+    clear ();
+
+    if (stream)
+    {
+        g_io_stream_close (G_IO_STREAM (stream), NULL, &error);
+        clear ();
+    }
+
+    g_free (filename);
+    g_object_unref (G_OBJECT (file));
+}
+
+TagLib::FileName
+GIO_IOStream::name () const
+{
+    return TagLib::FileName (filename);
+}
+
+TagLib::ByteVector
+GIO_IOStream::readBlock (TagLib::ulong length)
+{
+    if (error)
+    {
+        return TagLib::ByteVector::null;
+    }
+
+    gsize bytes = 0;
+    TagLib::ByteVector rv (length, 0);
+    GInputStream *istream = g_io_stream_get_input_stream (G_IO_STREAM (stream));
+    g_input_stream_read_all (istream,
+                             (void *)rv.data (), length,
+                             &bytes,
+                             NULL, &error);
+
+    return rv.resize(bytes);
+}
+
+void
+GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+{
+    if (error)
+    {
+        return;
+    }
+
+    GOutputStream *ostream = g_io_stream_get_output_stream (G_IO_STREAM (stream));
+
+    g_output_stream_write_all (ostream, data.data (), data.size (), NULL,
+			       NULL, &error);
+}
+
+void
+GIO_IOStream::insert (TagLib::ByteVector const &data,
+                      TagLib::ulong start,
+                      TagLib::ulong replace)
+{
+    if (error)
+    {
+        return;
+    }
+
+    if (data.size () == replace)
+    {
+        seek (start, TagLib::IOStream::Beginning);
+        writeBlock (data);
+        return;
+    }
+    else if (data.size () < replace)
+    {
+        removeBlock (start, replace - data.size ());
+        seek (start);
+        writeBlock (data);
+        return;
+    }
+
+    GFileIOStream *tstr;
+    /* FIXME: Check for NULL. */
+    GFile *tmp = g_file_new_tmp ("easytag-XXXXXX", &tstr, NULL);
+    char *buffer[4096];
+    gsize r;
+
+    GOutputStream *ostream = g_io_stream_get_output_stream (G_IO_STREAM (tstr));
+    GInputStream *istream = g_io_stream_get_input_stream (G_IO_STREAM (stream));
+
+    seek (0);
+
+    while (g_input_stream_read_all (istream, buffer,
+                                    MIN (sizeof (buffer), start), &r, NULL,
+                                    &error) && r > 0)
+    {
+        gsize w;
+        g_output_stream_write_all (ostream, buffer, r, &w, NULL, &error);
+
+        if (w != r)
+        {
+            g_warning ("%s", "Unable to write all bytes");
+        }
+
+	if (error)
+	{
+            g_object_unref (tstr);
+            g_object_unref (tmp);
+            return;
+	}
+
+        start -= r;
+        g_warning ("Wrote %lu bytes of %lu: %.*s", r, start, (int)r, buffer);
+    }
+
+    if (error)
+    {
+        g_object_unref (tstr);
+        g_object_unref (tmp);
+        return;
+    }
+
+    g_output_stream_write_all (ostream, data.data (), data.size (), NULL,
+                               NULL, &error);
+    seek (replace, TagLib::IOStream::Current);
+
+    if (error)
+    {
+        g_object_unref (tstr);
+        g_object_unref (tmp);
+        return;
+    }
+
+    while (g_input_stream_read_all (istream, buffer, sizeof (buffer), &r,
+                                    NULL, &error) && r > 0)
+    {
+        gsize w;
+        g_output_stream_write_all (ostream, buffer, r, &w, NULL, &error);
+
+        if (w != r)
+        {
+            g_warning ("%s", "Unable to write all bytes");
+        }
+
+        if (error)
+        {
+            g_object_unref (tstr);
+            g_object_unref (tmp);
+            return;
+        }
+    }
+
+    g_object_unref (tstr);
+    g_object_unref (stream);
+    stream = NULL;
+
+    g_file_move (tmp, file, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &error);
+
+    if (error)
+    {
+            g_object_unref (tmp);
+	    return;
+    }
+
+    stream = g_file_open_readwrite (file, NULL, &error);
+
+    g_object_unref (tmp);
+}
+
+void
+GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
+{
+    if (start + len >= (TagLib::ulong)length ())
+    {
+        truncate (start);
+        return;
+    }
+
+    char *buffer[4096];
+    gsize r;
+    GInputStream *istream = g_io_stream_get_input_stream (G_IO_STREAM (stream));
+    GOutputStream *ostream = g_io_stream_get_output_stream (G_IO_STREAM (stream));
+    seek (start + len);
+
+    while (g_input_stream_read_all (istream, buffer, sizeof (buffer), &r, NULL,
+                                    NULL) && r > 0)
+    {
+        gsize w;
+        seek (start);
+        g_output_stream_write_all (ostream, buffer, r, &w, NULL, NULL);
+
+        if (w != r)
+        {
+            g_warning ("%s", "Unable to write all bytes");
+        }
+
+	if (error)
+	{
+	    return;
+	}
+
+        start += r;
+        seek (start + len);
+    }
+
+    truncate (start);
+}
+
+bool
+GIO_IOStream::readOnly () const
+{
+    return !stream;
+}
+
+bool
+GIO_IOStream::isOpen () const
+{
+    return !!stream;
+}
+
+void
+GIO_IOStream::seek (long int offset, TagLib::IOStream::Position p)
+{
+    if (error)
+    {
+        return;
+    }
+
+    GSeekType type;
+
+    switch (p)
+    {
+        case TagLib::IOStream::Beginning:
+            type = G_SEEK_SET;
+            break;
+        case TagLib::IOStream::Current:
+            type = G_SEEK_CUR;
+            break;
+        case TagLib::IOStream::End:
+            type = G_SEEK_END;
+            break;
+        default:
+            g_warning ("%s", "Unknown seek");
+            return;
+    }
+
+    g_seekable_seek (G_SEEKABLE (stream), offset, type, NULL, &error);
+}
+
+void
+GIO_IOStream::clear ()
+{
+    g_clear_error (&error);
+}
+
+long int
+GIO_IOStream::tell () const
+{
+    return g_seekable_tell (G_SEEKABLE (stream));
+}
+
+long int
+GIO_IOStream::length ()
+{
+    long rv = -1;
+
+    if (error)
+    {
+	return rv;
+    }
+
+    GFileInfo *info = g_file_io_stream_query_info (stream,
+                                                   G_FILE_ATTRIBUTE_STANDARD_SIZE,
+                                                   NULL, &error);
+
+    if (info)
+    {
+        rv = g_file_info_get_size (info);
+        g_object_unref (info);
+    }
+
+    return rv;
+}
+
+void
+GIO_IOStream::truncate (long int length)
+{
+    if (error)
+    {
+        return;
+    }
+
+    g_seekable_truncate (G_SEEKABLE (stream), length, NULL, &error);
+}
+
+const GError *GIO_IOStream::getError () const
+{
+    return error;
+}
diff --git a/src/gio_wrapper.h b/src/gio_wrapper.h
new file mode 100644
index 0000000..dc6c9da
--- /dev/null
+++ b/src/gio_wrapper.h
@@ -0,0 +1,82 @@
+/*
+ *  EasyTAG - Tag editor for audio files
+ *  Copyright (C) 2014  Santtu Lakkala <inz at inz.fi>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef ET_GIO_WRAPPER_H_
+#define ET_GIO_WRAPPER_H_
+
+#include <tiostream.h>
+#include <gio/gio.h>
+
+class GIO_InputStream : public TagLib::IOStream
+{
+public:
+    GIO_InputStream (GFile *file_);
+    virtual ~GIO_InputStream ();
+    virtual TagLib::FileName name () const;
+    virtual TagLib::ByteVector readBlock (TagLib::ulong length);
+    virtual void writeBlock (TagLib::ByteVector const &data);
+    virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+    virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
+    virtual bool readOnly () const;
+    virtual bool isOpen () const;
+    virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+    virtual void clear ();
+    virtual long int tell () const;
+    virtual long int length ();
+    virtual void truncate (long int length);
+
+    virtual const GError *getError() const;
+
+private:
+    GIO_InputStream (const GIO_InputStream &other);
+    GFile *file;
+    GFileInputStream *stream;
+    char *filename;
+    GError *error;
+};
+
+class GIO_IOStream : public TagLib::IOStream
+{
+public:
+    GIO_IOStream (GFile *file_);
+    virtual ~GIO_IOStream ();
+    virtual TagLib::FileName name () const;
+    virtual TagLib::ByteVector readBlock (TagLib::ulong length);
+    virtual void writeBlock (TagLib::ByteVector const &data);
+    virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+    virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
+    virtual bool readOnly () const;
+    virtual bool isOpen () const;
+    virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+    virtual void clear ();
+    virtual long int tell () const;
+    virtual long int length ();
+    virtual void truncate (long int length);
+
+    virtual const GError *getError() const;
+
+private:
+    GIO_IOStream (const GIO_IOStream &other);
+    GFile *file;
+    GFileIOStream *stream;
+    char *filename;
+    GError *error;
+};
+
+#endif /* ET_GIO_WRAPPER_H_ */
diff --git a/src/gtk2_compat.c b/src/gtk2_compat.c
index f4cc8aa..0f416d5 100644
--- a/src/gtk2_compat.c
+++ b/src/gtk2_compat.c
@@ -101,3 +101,18 @@ void et_grid_attach_margins (GtkGrid *grid, GtkWidget *child, gint left,
     et_grid_attach_full (grid, child, left, top, width, height, FALSE, FALSE,
                          hmargin, vmargin);
 }
+
+GtkWidget *
+et_progress_bar_new (void)
+{
+    GtkWidget *progress;
+
+    progress = gtk_progress_bar_new ();
+
+#if GTK_CHECK_VERSION(3,0,0)
+    gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR (progress), TRUE);
+    gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress), "");
+#endif
+
+    return progress;
+}
diff --git a/src/gtk2_compat.h b/src/gtk2_compat.h
index e089d7b..382e2dd 100644
--- a/src/gtk2_compat.h
+++ b/src/gtk2_compat.h
@@ -57,6 +57,8 @@ void et_grid_attach_margins (GtkGrid *grid, GtkWidget *child, gint left,
                              gint top, gint width, gint height, gint hmargin,
                              gint vmargin);
 
+GtkWidget * et_progress_bar_new (void);
+
 G_END_DECLS
 
 #endif /* GTK2_COMPAT_H_ */
diff --git a/src/id3_tag.c b/src/id3_tag.c
index f6e8abf..dabec6d 100644
--- a/src/id3_tag.c
+++ b/src/id3_tag.c
@@ -433,10 +433,10 @@ Id3tag_Write_File_v23Tag (ET_File *ETFile)
      ***********/
     while ( (id3_frame = ID3Tag_FindFrameWithID(id3_tag,ID3FID_PICTURE)) )
         ID3Tag_RemoveFrame(id3_tag,id3_frame);
-    pic = FileTag->picture;
-    if (!pic)
-        has_picture = 0;
-    while (pic)
+
+    has_picture = FALSE;
+
+    for (pic = FileTag->picture; pic != NULL; pic = pic->next)
     {
         Picture_Format format = Picture_Format_From_Data(pic);
 
@@ -458,6 +458,22 @@ Id3tag_Write_File_v23Tag (ET_File *ETFile)
                 if ((id3_field = ID3Frame_GetField(id3_frame,ID3FN_IMAGEFORMAT)))
                     ID3Field_SetASCII(id3_field, "PNG");
                 break;
+            case PICTURE_FORMAT_GIF:
+                if ((id3_field = ID3Frame_GetField (id3_frame,
+                                                    ID3FN_MIMETYPE)))
+                {
+                    ID3Field_SetASCII (id3_field,
+                                       Picture_Mime_Type_String (format));
+                }
+
+                if ((id3_field = ID3Frame_GetField (id3_frame,
+                                                    ID3FN_IMAGEFORMAT)))
+                {
+                    /* I could find no reference for what ID3FN_IMAGEFORMAT
+                     * should contain, so this is a guess. */
+                    ID3Field_SetASCII (id3_field, "GIF");
+                }
+                break;
             default:
                 break;
         }
@@ -471,7 +487,6 @@ Id3tag_Write_File_v23Tag (ET_File *ETFile)
         if ((id3_field = ID3Frame_GetField(id3_frame,ID3FN_DATA)))
             ID3Field_SetBINARY(id3_field, pic->data, pic->size);
 
-        pic = pic->next;
         has_picture = TRUE;
     }
 
diff --git a/src/id3v24_tag.c b/src/id3v24_tag.c
index 52b079e..9324ef2 100644
--- a/src/id3v24_tag.c
+++ b/src/id3v24_tag.c
@@ -991,8 +991,7 @@ gboolean Id3tag_Write_File_v24Tag (ET_File *ETFile)
 
     if (v2tag)
     {
-        pic = FileTag->picture;
-        while (pic)
+        for (pic = FileTag->picture; pic != NULL; pic = pic->next)
         {
             gint i;
 
@@ -1025,7 +1024,6 @@ gboolean Id3tag_Write_File_v24Tag (ET_File *ETFile)
                 id3taglib_set_field(frame, pic->description, ID3_FIELD_TYPE_STRING, 0, 0, 0);
 
             strip_tags = FALSE;
-            pic = pic->next;
         }
     }
 
diff --git a/src/log.h b/src/log.h
index 6aea0be..743f246 100644
--- a/src/log.h
+++ b/src/log.h
@@ -24,8 +24,7 @@
 
 #include <gtk/gtk.h>
 
-//#include "et_core.h"
-
+G_BEGIN_DECLS
 
 /*
  * Types of errors
@@ -51,5 +50,6 @@ void       Log_Clean_Log_List   (void);
 void Log_Print (Log_Error_Type error_type,
                 gchar const *format, ...) G_GNUC_PRINTF (2, 3);
 
+G_END_DECLS
 
 #endif /* __LOG_H__ */
diff --git a/src/misc.c b/src/misc.c
index af68db0..0aa04eb 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -36,6 +36,7 @@
 #include "bar.h"
 #include "prefs.h"
 #include "scan.h"
+#include "scan_dialog.h"
 #include "genres.h"
 #include "log.h"
 #include "charset.h"
@@ -1399,7 +1400,7 @@ Playlist_Write_Button_Pressed (void)
         }
         if (RFS_CONVERT_SPACE_INTO_UNDERSCORE)
         {
-            Scan_Convert_Space_Into_Undescore(playlist_basename_utf8);
+            Scan_Convert_Space_Into_Underscore (playlist_basename_utf8);
         }
         if (RFS_REMOVE_SPACES)
 				 {
@@ -2724,7 +2725,7 @@ void Open_Load_Filename_Window (void)
                                                       GTK_STOCK_CLOSE,
                                                       GTK_RESPONSE_CANCEL,
                                                       GTK_STOCK_APPLY,
-                                                      GTK_RESPONSE_ACCEPT,
+                                                      GTK_RESPONSE_APPLY,
                                                       NULL);
     gtk_dialog_set_default_response (GTK_DIALOG (LoadFilenameWindow),
                                      GTK_RESPONSE_ACCEPT);
diff --git a/src/misc.h b/src/misc.h
index 1885d3b..2ca216d 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -24,9 +24,7 @@
 
 #include <gtk/gtk.h>
 
-/***************
- * Declaration *
- ***************/
+G_BEGIN_DECLS
 
 GtkWidget *playlist_use_mask_name;
 GtkWidget *playlist_use_dir_name;
@@ -110,4 +108,6 @@ gchar * et_track_number_to_string (const guint track_number);
 
 void et_on_child_exited (GPid pid, gint status, gpointer user_data);
 
+G_END_DECLS
+
 #endif /* __MISC_H__ */
diff --git a/src/mp4_header.c b/src/mp4_header.cc
similarity index 66%
rename from src/mp4_header.c
rename to src/mp4_header.cc
index f9952a2..ebb024c 100644
--- a/src/mp4_header.c
+++ b/src/mp4_header.cc
@@ -1,6 +1,6 @@
-/* mp4_header.c - 2005/02/05 */
 /*
- *  EasyTAG - Tag editor for MP3 and Ogg Vorbis files
+ *  EasyTAG - Tag editor for audio files
+ *  Copyright (C) 2012-1014  David King <amigadave at amigadave.com>
  *  Copyright (C) 2000-2003  Jerome Couderc <easytag at gmail.com>
  *  Copyright (C) 2005  Stewart Whitman <swhitman at cox.net>
  *
@@ -19,27 +19,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "config.h" // For definition of ENABLE_MP4
-
-#ifdef ENABLE_MP4
-
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "mp4_header.h"
-#include "easytag.h"
-#include "et_core.h"
-#include "log.h"
-#include "misc.h"
-#include "charset.h"
-
-#include <tag_c.h>
-
+/* This file is intended to be included directly in mp4_tag.cc */
 
 /*
  * Mp4_Header_Read_File_Info:
@@ -48,48 +28,77 @@
  */
 gboolean Mp4_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
 {
-    TagLib_File *file;
-    const TagLib_AudioProperties *properties;
+    TagLib::MP4::Tag *tag;
+    const TagLib::MP4::Properties *properties;
 
     g_return_val_if_fail (filename != NULL && ETFileInfo != NULL, FALSE);
 
     /* Get size of file */
     ETFileInfo->size = et_get_file_size (filename);
 
-    if ((file = taglib_file_new_type(filename, TagLib_File_MP4)) == NULL )
+    GFile *file = g_file_new_for_path (filename);
+    GIO_InputStream stream (file);
+
+    if (!stream.isOpen ())
+    {
+        gchar *filename_utf8 = filename_to_display (filename);
+        const GError *error = stream.getError ();
+        Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
+                   filename_utf8, error->message);
+        g_free (filename_utf8);
+        return FALSE;
+    }
+
+    TagLib::MP4::File mp4file (&stream);
+
+    g_object_unref (file);
+
+    if (!mp4file.isOpen ())
     {
-        gchar *filename_utf8 = filename_to_display(filename);
-        //g_print(_("Error while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-        Log_Print(LOG_ERROR,_("Error while opening file: '%s' (%s)."),filename_utf8,_("MP4 format invalid"));
-        g_free(filename_utf8);
+        gchar *filename_utf8 = filename_to_display (filename);
+        Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
+                   filename_utf8,_("MP4 format invalid"));
+        g_free (filename_utf8);
         return FALSE;
     }
 
-    /* Check for audio track */
-    if( !taglib_file_is_valid(file) )
+    if (!(tag = mp4file.tag ()))
     {
-        gchar *filename_utf8 = filename_to_display(filename);
+        gchar *filename_utf8 = filename_to_display (filename);
         Log_Print (LOG_ERROR, _("File contains no audio track: '%s'"),
                    filename_utf8);
-        g_free(filename_utf8);
+        g_free (filename_utf8);
         return FALSE;
     }
 
-    properties = taglib_file_audioproperties(file);
+    properties = mp4file.audioProperties ();
+
     if (properties == NULL)
     {
         gchar *filename_utf8 = filename_to_display (filename);
         Log_Print (LOG_ERROR, _("Error reading properties from file: '%s'"),
                    filename_utf8);
         g_free (filename_utf8);
-        taglib_file_free (file);
         return FALSE;
     }
 
     /* Get format/subformat */
     {
-        ETFileInfo->mpc_version = g_strdup("MPEG");
-	ETFileInfo->mpc_profile = g_strdup("4, Unknown");
+        ETFileInfo->mpc_version = g_strdup ("MPEG");
+
+        switch (properties->codec ())
+        {
+            case TagLib::MP4::Properties::AAC:
+                ETFileInfo->mpc_profile = g_strdup ("4, AAC");
+                break;
+            case TagLib::MP4::Properties::ALAC:
+                ETFileInfo->mpc_profile = g_strdup ("4, ALAC");
+                break;
+            case TagLib::MP4::Properties::Unknown:
+            default:
+                ETFileInfo->mpc_profile = g_strdup ("4, Unknown");
+                break;
+        };
     }
 
     ETFileInfo->version = 4;
@@ -97,12 +106,11 @@ gboolean Mp4_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
     ETFileInfo->layer = 14;
 
     ETFileInfo->variable_bitrate = TRUE;
-    ETFileInfo->bitrate = taglib_audioproperties_bitrate(properties);
-    ETFileInfo->samplerate = taglib_audioproperties_samplerate(properties);
-    ETFileInfo->mode = taglib_audioproperties_channels(properties);
-    ETFileInfo->duration = taglib_audioproperties_length(properties);
+    ETFileInfo->bitrate = properties->bitrate ();
+    ETFileInfo->samplerate = properties->sampleRate ();
+    ETFileInfo->mode = properties->channels ();
+    ETFileInfo->duration = properties->length ();
 
-    taglib_file_free(file);
     return TRUE;
 }
 
@@ -170,5 +178,3 @@ gboolean Mp4_Header_Display_File_Info_To_UI(gchar *filename, ET_File_Info *ETFil
 
     return TRUE;
 }
-
-#endif
diff --git a/src/mp4_header.h b/src/mp4_header.h
index a5374a5..97de5b6 100644
--- a/src/mp4_header.h
+++ b/src/mp4_header.h
@@ -1,6 +1,6 @@
-/* mp4_header.h - 2005/02/15 */
 /*
- *  EasyTAG - Tag editor for MP3 and Ogg Vorbis files
+ *  EasyTAG - Tag editor for audio files
+ *  Copyright (C) 2012-2014  David King <amigadave at amigadave.com>
  *  Copyright (C) 2000-2005  Jerome Couderc <easytag at gmail.com>
  *  Copyright (C) 2005  Stewart Whitman <swhitman at cox.net>
  *
@@ -20,23 +20,17 @@
  */
 
 
-#ifndef __MP4_HEADER_H__
-#define __MP4_HEADER_H__
+#ifndef ET_MP4_HEADER_H_
+#define ET_MP4_HEADER_H_
 
 
 #include "et_core.h"
 
-/****************
- * Declarations *
- ****************/
+G_BEGIN_DECLS
 
-
-/**************
- * Prototypes *
- **************/
-
-gboolean Mp4_Header_Read_File_Info          (gchar *filename, ET_File_Info *ETFileInfo);
+gboolean Mp4_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo);
 gboolean Mp4_Header_Display_File_Info_To_UI (gchar *filename, ET_File_Info *ETFileInfo);
 
+G_END_DECLS
 
-#endif /* __MP4_HEADER_H__ */
+#endif /* ET_MP4_HEADER_H_ */
diff --git a/src/mp4_tag.c b/src/mp4_tag.c
deleted file mode 100644
index fa047de..0000000
--- a/src/mp4_tag.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/* mp4_tag.c - 2005/08/06 */
-/*
- *  EasyTAG - Tag editor for MP3 and Ogg Vorbis files
- *  Copyright (C) 2001-2005  Jerome Couderc <easytag at gmail.com>
- *  Copyright (C) 2005  Michael Ihde <mike.ihde at randomwalking.com>
- *  Copyright (C) 2005  Stewart Whitman <swhitman at cox.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "config.h" // For definition of ENABLE_MP4
-
-#ifdef ENABLE_MP4
-
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <stdlib.h>
-
-#include "mp4_tag.h"
-#include "picture.h"
-#include "easytag.h"
-#include "setting.h"
-#include "log.h"
-#include "misc.h"
-#include "et_core.h"
-#include "charset.h"
-
-#include <tag_c.h>
-
-
-/*
- * Mp4_Tag_Read_File_Tag:
- *
- * Read tag data into an Mp4 file.
- *
- * Note:
- *  - for string fields, //if field is found but contains no info (strlen(str)==0), we don't read it
- *  - for track numbers, if they are zero, then we don't read it
- */
-gboolean Mp4tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
-{
-    TagLib_File *mp4file;
-    TagLib_Tag *tag;
-    guint track;
-
-    g_return_val_if_fail (filename != NULL && FileTag != NULL, FALSE);
-
-    /* Get data from tag */
-    mp4file = taglib_file_new_type(filename,TagLib_File_MP4);
-    if (mp4file == NULL)
-    {
-        gchar *filename_utf8 = filename_to_display(filename);
-        Log_Print(LOG_ERROR,_("Error while opening file: '%s' (%s)."),filename_utf8,_("MP4 format invalid"));
-        g_free(filename_utf8);
-        return FALSE;
-    }
-
-    /* Check for audio track */
-    if (!taglib_file_is_valid (mp4file))
-    {
-        gchar *filename_utf8 = filename_to_display (filename);
-        Log_Print (LOG_ERROR, _("File contains no audio track: '%s'"),
-                   filename_utf8);
-        g_free (filename_utf8);
-        taglib_file_free (mp4file);
-        return FALSE;
-    }
-
-    tag = taglib_file_tag (mp4file);
-    if (tag == NULL)
-    {
-        gchar *filename_utf8 = filename_to_display (filename);
-        Log_Print (LOG_ERROR, _("Error reading tags from file: '%s'"),
-                   filename_utf8);
-        g_free (filename_utf8);
-        taglib_file_free (mp4file);
-        return FALSE;
-    }
-
-    /*********
-     * Title *
-     *********/
-    FileTag->title = g_strdup(taglib_tag_title(tag));
-
-    /**********
-     * Artist *
-     **********/
-    FileTag->artist = g_strdup(taglib_tag_artist(tag));
-
-    /*********
-     * Album *
-     *********/
-    FileTag->album = g_strdup(taglib_tag_album(tag));
-
-    /****************
-     * Album Artist *
-     ****************/
-    /* TODO: No album artist or disc number support in the TagLib C API! */
-
-    /********
-     * Year *
-     ********/
-    FileTag->year = g_strdup_printf("%u", taglib_tag_year(tag));
-
-    /*************************
-     * Track and Total Track *
-     *************************/
-    track = taglib_tag_track(tag);
-
-    if (track != 0)
-        FileTag->track = et_track_number_to_string (track);
-    /* TODO: No total track support in the TagLib C API! */
-
-    /*********
-     * Genre *
-     *********/
-    FileTag->genre = g_strdup(taglib_tag_genre(tag));
-
-    /***********
-     * Comment *
-     ***********/
-    FileTag->comment = g_strdup(taglib_tag_comment(tag));
-
-    /**********************
-     * Composer or Writer *
-     **********************/
-    /* TODO: No composer support in the TagLib C API! */
-
-    /*****************
-     * Encoding Tool *
-     *****************/
-    /* TODO: No encode_by support in the TagLib C API! */
-
-    /***********
-     * Picture *
-     ***********/
-    /* TODO: No encode_by support in the TagLib C API! */
-
-    /* Free allocated data */
-    taglib_tag_free_strings();
-    taglib_file_free(mp4file);
-
-    return TRUE;
-}
-
-
-/*
- * Mp4_Tag_Write_File_Tag:
- *
- * Write tag data into an Mp4 file.
- *
- * Note:
- *  - for track numbers, we write 0's if one or the other is blank
- */
-gboolean Mp4tag_Write_File_Tag (ET_File *ETFile)
-{
-    File_Tag *FileTag;
-    gchar    *filename;
-    gchar    *filename_utf8;
-    TagLib_File *mp4file = NULL;
-    TagLib_Tag *tag;
-    gboolean success;
-
-    g_return_val_if_fail (ETFile != NULL && ETFile->FileTag != NULL, FALSE);
-
-    FileTag = (File_Tag *)ETFile->FileTag->data;
-    filename      = ((File_Name *)ETFile->FileNameCur->data)->value;
-    filename_utf8 = ((File_Name *)ETFile->FileNameCur->data)->value_utf8;
-
-    /* Open file for writing */
-    mp4file = taglib_file_new_type(filename, TagLib_File_MP4);
-    if (mp4file == NULL)
-    {
-        Log_Print(LOG_ERROR,_("Error while opening file: '%s' (%s)."),filename_utf8,_("MP4 format invalid"));
-        return FALSE;
-    }
-
-    tag = taglib_file_tag (mp4file);
-    if (tag == NULL)
-    {
-        gchar *filename_utf8 = filename_to_display (filename);
-        Log_Print (LOG_ERROR, _("Error reading tags from file: '%s'"),
-                   filename_utf8);
-        g_free (filename_utf8);
-        taglib_file_free (mp4file);
-        return FALSE;
-    }
-
-    /*********
-     * Title *
-     *********/
-    if (FileTag->title && g_utf8_strlen(FileTag->title, -1) > 0)
-    {
-        taglib_tag_set_title(tag, FileTag->title);
-    }else
-    {
-        taglib_tag_set_title(tag,"");
-    }
-
-    /**********
-     * Artist *
-     **********/
-    if (FileTag->artist && g_utf8_strlen(FileTag->artist, -1) > 0)
-    {
-        taglib_tag_set_artist(tag,FileTag->artist);
-    }else
-    {
-        taglib_tag_set_artist(tag,"");
-    }
-
-    /*********
-     * Album *
-     *********/
-    if (FileTag->album && g_utf8_strlen(FileTag->album, -1) > 0)
-    {
-        taglib_tag_set_album(tag,FileTag->album);
-    }else
-    {
-        taglib_tag_set_album(tag,"");
-    }
-
-
-    /********
-     * Year *
-     ********/
-    if (FileTag->year && g_utf8_strlen(FileTag->year, -1) > 0)
-    {
-        taglib_tag_set_year(tag,atoi(FileTag->year));
-    }else
-    {
-        taglib_tag_set_year(tag,0);
-    }
-
-    /*************************
-     * Track and Total Track *
-     *************************/
-    if ( FileTag->track && g_utf8_strlen(FileTag->track, -1) > 0 )
-    {
-        taglib_tag_set_track(tag,atoi(FileTag->track));
-    }else
-    {
-        taglib_tag_set_track(tag,0);
-    }
-
-    /*********
-     * Genre *
-     *********/
-    if (FileTag->genre && g_utf8_strlen(FileTag->genre, -1) > 0 )
-    {
-        taglib_tag_set_genre(tag,FileTag->genre);
-    }else
-    {
-        taglib_tag_set_genre(tag,"");
-    }
-
-    /***********
-     * Comment *
-     ***********/
-    if (FileTag->comment && g_utf8_strlen(FileTag->comment, -1) > 0)
-    {
-        taglib_tag_set_comment(tag,FileTag->comment);
-    }else
-    {
-        taglib_tag_set_comment(tag,"");
-    }
-
-    /**********************
-     * Composer or Writer *
-     **********************/
-
-    /*****************
-     * Encoding Tool *
-     *****************/
-
-    /***********
-     * Picture *
-     ***********/
-
-    success = taglib_file_save (mp4file) ? TRUE : FALSE;
-    taglib_file_free(mp4file);
-
-    return success;
-}
-
-
-#endif /* ENABLE_MP4 */
diff --git a/src/mp4_tag.cc b/src/mp4_tag.cc
new file mode 100644
index 0000000..efeaebd
--- /dev/null
+++ b/src/mp4_tag.cc
@@ -0,0 +1,472 @@
+/*
+ *  EasyTAG - Tag editor for MP3 and Ogg Vorbis files
+ *  Copyright (C) 2012-1014  David King <amigadave at amigadave.com>
+ *  Copyright (C) 2001-2005  Jerome Couderc <easytag at gmail.com>
+ *  Copyright (C) 2005  Michael Ihde <mike.ihde at randomwalking.com>
+ *  Copyright (C) 2005  Stewart Whitman <swhitman at cox.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h" // For definition of ENABLE_MP4
+
+#ifdef ENABLE_MP4
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <stdlib.h>
+
+#include "mp4_header.h"
+#include "mp4_tag.h"
+#include "picture.h"
+#include "easytag.h"
+#include "setting.h"
+#include "log.h"
+#include "misc.h"
+#include "et_core.h"
+#include "charset.h"
+#include "gio_wrapper.h"
+
+#include <mp4file.h>
+#include <mp4tag.h>
+#include <tpropertymap.h>
+
+/* Include mp4_header.cc directly. */
+#include "mp4_header.cc"
+
+/*
+ * Mp4_Tag_Read_File_Tag:
+ *
+ * Read tag data into an Mp4 file.
+ */
+gboolean Mp4tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
+{
+    TagLib::MP4::Tag *tag;
+    guint year;
+
+    g_return_val_if_fail (filename != NULL && FileTag != NULL, FALSE);
+
+    /* Get data from tag. */
+    GFile *file = g_file_new_for_path (filename);
+    GIO_InputStream stream (file);
+
+    if (!stream.isOpen ())
+    {
+        gchar *filename_utf8 = filename_to_display (filename);
+        const GError *error = stream.getError ();
+        Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
+                   filename_utf8, error->message);
+        g_free (filename_utf8);
+        return FALSE;
+    }
+
+    TagLib::MP4::File mp4file (&stream);
+    g_object_unref (file);
+
+    if (!mp4file.isOpen ())
+    {
+        gchar *filename_utf8 = filename_to_display (filename);
+        const GError *error = stream.getError ();
+
+        if (error)
+        {
+            Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
+                       filename_utf8, error->message);
+        }
+        else
+        {
+            Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
+                       filename_utf8, _("MP4 format invalid"));
+        }
+
+        g_free (filename_utf8);
+        return FALSE;
+    }
+
+    if (!(tag = mp4file.tag ()))
+    {
+        gchar *filename_utf8 = filename_to_display (filename);
+        Log_Print (LOG_ERROR, _("Error reading tags from file: '%s'"),
+                   filename_utf8);
+        g_free (filename_utf8);
+        return FALSE;
+    }
+
+    /*********
+     * Title *
+     *********/
+    FileTag->title = g_strdup (tag->title ().toCString (true));
+
+    /**********
+     * Artist *
+     **********/
+    FileTag->artist = g_strdup (tag->artist ().toCString (true));
+
+    /*********
+     * Album *
+     *********/
+    FileTag->album = g_strdup (tag->album ().toCString (true));
+
+    const TagLib::PropertyMap extra_tag = tag->properties ();
+
+    /* Disc number. */
+    /* Total disc number support in TagLib reads multiple disc numbers and
+     * joins them with a "/". */
+    if (extra_tag.contains ("DISCNUMBER"))
+    {
+        const TagLib::StringList disc_numbers = extra_tag["DISCNUMBER"];
+        int offset = disc_numbers.front ().find ("/");
+
+        if (offset != -1)
+        {
+            FileTag->disc_total = et_disc_number_to_string (disc_numbers.front ().substr (offset + 1).toInt ());
+        }
+
+        FileTag->disc_number = et_disc_number_to_string (disc_numbers.front ().toInt ());
+    }
+
+    /********
+     * Year *
+     ********/
+    year = tag->year ();
+
+    if (year != 0)
+    {
+        FileTag->year = g_strdup_printf ("%u", year);
+    }
+
+    /*************************
+     * Track and Total Track *
+     *************************/
+    if (extra_tag.contains ("TRACKNUMBER"))
+    {
+        const TagLib::StringList track_numbers = extra_tag["TRACKNUMBER"];
+        int offset = track_numbers.front ().find ("/");
+
+        if (offset != -1)
+        {
+            FileTag->track_total = et_track_number_to_string (track_numbers.front ().substr (offset + 1).toInt ());
+        }
+
+        FileTag->track = et_track_number_to_string (track_numbers.front ().toInt ());
+    }
+
+    /*********
+     * Genre *
+     *********/
+    FileTag->genre = g_strdup (tag->genre ().toCString (true));
+
+    /***********
+     * Comment *
+     ***********/
+    FileTag->comment = g_strdup (tag->comment ().toCString (true));
+
+    /**********************
+     * Composer or Writer *
+     **********************/
+    if (extra_tag.contains ("COMPOSER"))
+    {
+        const TagLib::StringList composers = extra_tag["COMPOSER"];
+        FileTag->composer = g_strdup (composers.front ().toCString (true));
+    }
+
+    /* Copyright. */
+    if (extra_tag.contains ("COPYRIGHT"))
+    {
+        const TagLib::StringList copyrights = extra_tag["COPYRIGHT"];
+        FileTag->copyright = g_strdup (copyrights.front ().toCString (true));
+    }
+
+    /*****************
+     * Encoding Tool *
+     *****************/
+    if (extra_tag.contains ("ENCODEDBY"))
+    {
+        const TagLib::StringList encodedbys = extra_tag["ENCODEDBY"];
+        FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+    }
+
+    const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+
+    /****************
+     * Album Artist *
+     ****************/
+    if (extra_items.contains ("aART"))
+    {
+        const TagLib::MP4::Item album_artists = extra_items["aART"];
+        FileTag->album_artist = g_strdup (album_artists.toStringList ().front ().toCString (true));
+    }
+
+    /***********
+     * Picture *
+     ***********/
+    if (extra_items.contains ("covr"))
+    {
+        const TagLib::MP4::Item cover = extra_items["covr"];
+        const TagLib::MP4::CoverArt &art = cover.toCoverArtList ().front ();
+
+        FileTag->picture = Picture_Allocate ();
+
+        FileTag->picture->size = art.data ().size ();
+        FileTag->picture->data = (guchar *)g_memdup (art.data ().data (),
+                                                     art.data ().size ());
+    }
+    else
+    {
+        FileTag->picture = NULL;
+    }
+
+    return TRUE;
+}
+
+
+/*
+ * Mp4_Tag_Write_File_Tag:
+ *
+ * Write tag data into an Mp4 file.
+ */
+gboolean Mp4tag_Write_File_Tag (ET_File *ETFile)
+{
+    File_Tag *FileTag;
+    gchar    *filename;
+    gchar    *filename_utf8;
+    TagLib::MP4::Tag *tag;
+    gboolean success;
+
+    g_return_val_if_fail (ETFile != NULL && ETFile->FileTag != NULL, FALSE);
+
+    FileTag = (File_Tag *)ETFile->FileTag->data;
+    filename      = ((File_Name *)ETFile->FileNameCur->data)->value;
+    filename_utf8 = ((File_Name *)ETFile->FileNameCur->data)->value_utf8;
+
+    /* Open file for writing */
+    GFile *file = g_file_new_for_path (filename);
+    GIO_IOStream stream (file);
+
+    if (!stream.isOpen ())
+    {
+        gchar *filename_utf8 = filename_to_display (filename);
+        const GError *error = stream.getError ();
+        Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
+                   filename_utf8, error->message);
+        g_free (filename_utf8);
+        return FALSE;
+    }
+
+    TagLib::MP4::File mp4file (&stream);
+
+    g_object_unref (file);
+
+    if (!mp4file.isOpen ())
+    {
+        const GError *error = stream.getError ();
+
+        if (error)
+        {
+            Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
+                       filename_utf8, error->message);
+        }
+        else
+        {
+            Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
+                       filename_utf8, _("MP4 format invalid"));
+        }
+
+        return FALSE;
+    }
+
+    if (!(tag = mp4file.tag ()))
+    {
+        gchar *filename_utf8 = filename_to_display (filename);
+        Log_Print (LOG_ERROR, _("Error reading tags from file: '%s'"),
+                   filename_utf8);
+        g_free (filename_utf8);
+        return FALSE;
+    }
+
+    TagLib::PropertyMap fields;
+
+    /*********
+     * Title *
+     *********/
+    if (FileTag->title && *(FileTag->title))
+    {
+        TagLib::String string (FileTag->title, TagLib::String::UTF8);
+        fields.insert ("TITLE", string);
+    }
+
+    /**********
+     * Artist *
+     **********/
+    if (FileTag->artist && *(FileTag->artist))
+    {
+        TagLib::String string (FileTag->artist, TagLib::String::UTF8);
+        fields.insert ("ARTIST", string);
+    }
+
+    /*********
+     * Album *
+     *********/
+    if (FileTag->album && *(FileTag->album))
+    {
+        TagLib::String string (FileTag->album, TagLib::String::UTF8);
+        fields.insert ("ALBUM", string);
+    }
+
+    /* Disc number. */
+    if (FileTag->disc_number && *(FileTag->disc_number))
+    {
+        if (FileTag->disc_total && *(FileTag->disc_total))
+        {
+            gchar *str;
+
+            str = g_strconcat (FileTag->disc_number, "/", FileTag->disc_total,
+                               NULL);
+            TagLib::String string (str, TagLib::String::UTF8);
+            fields.insert ("DISCNUMBER", string);
+            g_free (str);
+        }
+        else
+        {
+            TagLib::String string (FileTag->disc_number, TagLib::String::UTF8);
+            fields.insert ("DISCNUMBER", string);
+        }
+    }
+
+    /********
+     * Year *
+     ********/
+    if (FileTag->year && *(FileTag->year))
+    {
+        TagLib::String string (FileTag->year, TagLib::String::UTF8);
+        fields.insert ("DATE", string);
+    }
+
+    /*************************
+     * Track and Total Track *
+     *************************/
+    if (FileTag->track && *(FileTag->track))
+    {
+        if (FileTag->track_total && *(FileTag->track_total))
+        {
+            gchar *str;
+
+            str = g_strconcat (FileTag->track, "/", FileTag->track_total,
+                               NULL);
+            TagLib::String string (str, TagLib::String::UTF8);
+            fields.insert ("TRACKNUMBER", string);
+            g_free (str);
+        }
+        else
+        {
+            TagLib::String string (FileTag->track, TagLib::String::UTF8);
+            fields.insert ("TRACKNUMBER", string);
+        }
+    }
+
+    /*********
+     * Genre *
+     *********/
+    if (FileTag->genre && *(FileTag->genre))
+    {
+        TagLib::String string (FileTag->genre, TagLib::String::UTF8);
+        fields.insert ("GENRE", string);
+    }
+
+    /***********
+     * Comment *
+     ***********/
+    if (FileTag->comment && *(FileTag->comment))
+    {
+        TagLib::String string (FileTag->comment, TagLib::String::UTF8);
+        fields.insert ("COMMENT", string);
+    }
+
+    /**********************
+     * Composer or Writer *
+     **********************/
+    if (FileTag->composer && *(FileTag->composer))
+    {
+        TagLib::String string (FileTag->composer, TagLib::String::UTF8);
+        fields.insert ("COMPOSER", string);
+    }
+
+    /* Copyright. */
+    if (FileTag->copyright && *(FileTag->copyright))
+    {
+        TagLib::String string (FileTag->copyright, TagLib::String::UTF8);
+        fields.insert ("COPYRIGHT", string);
+    }
+
+    /*****************
+     * Encoding Tool *
+     *****************/
+    if (FileTag->encoded_by && *(FileTag->encoded_by))
+    {
+        TagLib::String string (FileTag->encoded_by, TagLib::String::UTF8);
+        fields.insert ("ENCODEDBY", string);
+    }
+
+    TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+
+    /* Album artist. */
+    /* FIXME: No "ALBUMARTIST" support in TagLib, use atom directly. */
+    if (FileTag->album_artist && *(FileTag->album_artist))
+    {
+        TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+        extra_items.insert ("aART", TagLib::MP4::Item (string));
+    }
+
+    /***********
+     * Picture *
+     ***********/
+    if (FileTag->picture)
+    {
+        Picture_Format pf;
+        TagLib::MP4::CoverArt::Format f;
+
+        pf = Picture_Format_From_Data (FileTag->picture);
+
+        switch (pf)
+        {
+            case PICTURE_FORMAT_JPEG:
+                f = TagLib::MP4::CoverArt::JPEG;
+                break;
+            case PICTURE_FORMAT_PNG:
+                f = TagLib::MP4::CoverArt::PNG;
+                break;
+            case PICTURE_FORMAT_GIF:
+                f = TagLib::MP4::CoverArt::GIF;
+                break;
+            default:
+                g_critical ("Unknown format");
+                f = TagLib::MP4::CoverArt::JPEG;
+                break;
+        }
+
+        TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)FileTag->picture->data,
+                                                         FileTag->picture->size));
+
+        extra_items.insert ("covr",
+                            TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+    }
+
+    tag->setProperties (fields);
+    success = mp4file.save () ? TRUE : FALSE;
+
+    return success;
+}
+
+#endif /* ENABLE_MP4 */
diff --git a/src/mp4_tag.h b/src/mp4_tag.h
index 2b426c2..64d7f54 100644
--- a/src/mp4_tag.h
+++ b/src/mp4_tag.h
@@ -1,6 +1,6 @@
-/* mp4_tag.h - 2005/08/06 */
 /*
  *  EasyTAG - Tag editor for MP3 and Ogg Vorbis files
+ *  Copyright (C) 2012-1014  David King <amigadave at amigadave.com>
  *  Copyright (C) 2001-2005  Jerome Couderc <easytag at gmail.com>
  *  Copyright (C) 2005  Michael Ihde <mike.ihde at randomwalking.com>
  *
@@ -19,23 +19,16 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
-#ifndef __MP4_TAG_H__
-#define __MP4_TAG_H__
-
+#ifndef ET_MP4_TAG_H_
+#define ET_MP4_TAG_H_
 
 #include "et_core.h"
 
-/****************
- * Declarations *
- ****************/
-
+G_BEGIN_DECLS
 
-
-/**************
- * Prototypes *
- **************/
-gboolean Mp4tag_Read_File_Tag  (gchar *filename, File_Tag *FileTag);
+gboolean Mp4tag_Read_File_Tag (gchar *filename, File_Tag *FileTag);
 gboolean Mp4tag_Write_File_Tag (ET_File *ETFile);
 
-#endif /* __MP4_TAG_H__ */
+G_END_DECLS
+
+#endif /* ET_MP4_TAG_H_ */
diff --git a/src/ogg_tag.c b/src/ogg_tag.c
index 6e28bde..df2ee7f 100644
--- a/src/ogg_tag.c
+++ b/src/ogg_tag.c
@@ -115,121 +115,84 @@ static void Ogg_Set_Tag (vorbis_comment *vc, const gchar *tag_name, gchar *value
  *************/
 
 /*
- * Read tag data into an Ogg Vorbis file.
- * Note:
- *  - if field is found but contains no info (strlen(str)==0), we don't read it
+ * convert_to_byte_array:
+ * @n: Integer to convert
+ * @array: Destination byte array
+ *
+ * Converts an integer to byte array.
  */
-gboolean
-ogg_tag_read_file_tag (gchar *filename, File_Tag *FileTag, GError **error)
+static void
+convert_to_byte_array (guint32 n, guchar *array)
 {
-    GFile *file;
-    GFileInputStream *istream;
-    vcedit_state   *state;
-    vorbis_comment *vc;
-    gchar          *string = NULL;
-    gchar          *string1 = NULL;
-    gchar          *string2 = NULL;
-    gchar          *filename_utf8 = filename_to_display(filename);
-    guint           field_num, i;
-    Picture        *prev_pic = NULL;
-
-    g_return_val_if_fail (filename != NULL && FileTag != NULL, FALSE);
-    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-    file = g_file_new_for_path (filename);
-    istream = g_file_read (file, NULL, error);
+    array [0] = (n >> 24) & 0xFF;
+    array [1] = (n >> 16) & 0xFF;
+    array [2] = (n >> 8) & 0xFF;
+    array [3] = n & 0xFF;
+}
 
-    if (!istream)
-    {
-        g_object_unref (file);
-        g_assert (error == NULL || *error != NULL);
-        return FALSE;
-    }
+/*
+ * add_to_guchar_str:
+ * @ustr: Destination string
+ * @ustr_len: Pointer to length of destination string
+ * @str: String to append
+ * @str_len: Length of str
+ *
+ * Append a guchar string to given guchar string.
+ */
 
-    {
-    // Skip the id3v2 tag
-    guchar tmp_id3[4];
-    gulong id3v2size;
+static void
+add_to_guchar_str (guchar *ustr, gsize *ustr_len, guchar *str, gsize str_len)
+{
+    gsize i;
 
-    // Check if there is an ID3v2 tag...
-    if (!g_seekable_seek (G_SEEKABLE (istream), 0L, G_SEEK_SET, NULL, error))
+    for (i = *ustr_len; i < *ustr_len + str_len; i++)
     {
-        goto err;
+        ustr [i] = str [i - *ustr_len];
     }
 
-    if (g_input_stream_read (G_INPUT_STREAM (istream), tmp_id3, 4, NULL,
-                             error) == 4)
-    {
-        // Calculate ID3v2 length
-        if (tmp_id3[0] == 'I' && tmp_id3[1] == 'D' && tmp_id3[2] == '3' && tmp_id3[3] < 0xFF)
-        {
-            // id3v2 tag skipeer $49 44 33 yy yy xx zz zz zz zz [zz size]
-            /* Size is 6-9 position */
-            if (!g_seekable_seek (G_SEEKABLE (istream), 2, G_SEEK_CUR,
-                                  NULL, error))
-            {
-                goto err;
-            }
-
-            if (g_input_stream_read (G_INPUT_STREAM (istream), tmp_id3, 4,
-                                     NULL, error) == 4)
-            {
-                id3v2size = 10 + ( (long)(tmp_id3[3])        | ((long)(tmp_id3[2]) << 7)
-                                | ((long)(tmp_id3[1]) << 14) | ((long)(tmp_id3[0]) << 21) );
-
-                if (!g_seekable_seek (G_SEEKABLE (istream), id3v2size,
-                                      G_SEEK_SET, NULL, error))
-                {
-                    goto err;
-                }
-
-                Log_Print(LOG_ERROR,_("Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."),filename_utf8);
-            }
-            else if (!g_seekable_seek (G_SEEKABLE (istream), 0L, G_SEEK_SET,
-                                       NULL, error))
-            {
-                goto err;
-            }
+    *ustr_len += str_len;
+}
 
-        }
-        else if (!g_seekable_seek (G_SEEKABLE (istream), 0L, G_SEEK_SET,
-                                   NULL, error))
-        {
-            goto err;
-        }
+/*
+ * read_guint_from_byte:
+ * @str: the byte string
+ * @start: position to start with
+ *
+ * Reads and returns an integer from given byte string starting from start.
+ * Returns: Integer which is read
+ */
+static guint32
+read_guint32_from_byte (guchar *str, gsize start)
+{
+    gsize i;
+    guint32 read = 0;
 
-    }
-    else if (!g_seekable_seek (G_SEEKABLE (istream), 0L, G_SEEK_SET,
-                               NULL, error))
+    for (i = start; i < start + 4; i++)
     {
-        goto err;
+        read = (read << 8) + str[i];
     }
 
-    }
-
-    g_assert (error == NULL || *error == NULL);
-
-    g_object_unref (istream);
-
-    state = vcedit_new_state();    // Allocate memory for 'state'
-
-    if (!vcedit_open (state, file, error))
-    {
-        g_assert (error == NULL || *error != NULL);
-        g_object_unref (file);
-        vcedit_clear(state);
-        return FALSE;
-    }
+    return read;
+}
 
-    g_assert (error == NULL || *error == NULL);
+/*
+ * et_add_file_tags_from_vorbis_comments:
+ * @vc: the byte string
+ * @FileTag: position to start with
+ * @filename_utf8: display filename
+ *
+ * Reads vorbis comments and copies them to file tag.
+ */
 
-    /* Get data from tag */
-    vc = vcedit_comments(state);
-    /*{
-        gint i; 
-        for (i=0;i<vc->comments;i++) 
-            g_print("%s -> Ogg vc:'%s'\n",g_path_get_basename(filename),vc->user_comments[i]);
-    }*/
+void
+et_add_file_tags_from_vorbis_comments (vorbis_comment *vc, File_Tag *FileTag,
+                                       const gchar *filename_utf8)
+{
+    gchar *string = NULL;
+    gchar *string1 = NULL;
+    gchar *string2 = NULL;
+    guint field_num, i;
+    Picture *prev_pic = NULL;
 
     /*********
      * Title *
@@ -548,6 +511,10 @@ ogg_tag_read_file_tag (gchar *filename, File_Tag *FileTag, GError **error)
     {
         Picture *pic;
             
+        /* Force marking the file as modified, so that the deprecated cover art
+         * field in converted in a METADATA_PICTURE_BLOCK field. */
+        FileTag->saved = FALSE;
+
         pic = Picture_Allocate();
         if (!prev_pic)
             FileTag->picture = pic;
@@ -577,6 +544,70 @@ ogg_tag_read_file_tag (gchar *filename, File_Tag *FileTag, GError **error)
 
     }
 
+    /* METADATA_BLOCK_PICTURE tag used for picture information */
+    field_num = 0;
+    while ((string = vorbis_comment_query (vc, "METADATA_BLOCK_PICTURE",
+                                           field_num++)) != NULL)
+    {
+        Picture *pic;
+        gsize bytes_pos, mimelen, desclen;
+        guchar *decoded_ustr;
+        gsize decoded_len;
+
+        pic = Picture_Allocate();
+
+        if (!prev_pic)
+        {
+            FileTag->picture = pic;
+        }
+        else
+        {
+            prev_pic->next = pic;
+        }
+
+        prev_pic = pic;
+
+        pic->data = NULL;
+
+        /* Decode picture data. */
+        decoded_ustr = g_base64_decode (string, &decoded_len);
+
+        /* Reading picture type. */
+        pic->type = read_guint32_from_byte (decoded_ustr, 0);
+        bytes_pos = 4;
+
+        /* Reading MIME data. */
+        mimelen = read_guint32_from_byte (decoded_ustr, bytes_pos);
+        bytes_pos = 8 + mimelen;
+
+        /* Reading description */
+        desclen = read_guint32_from_byte (decoded_ustr, bytes_pos);
+        bytes_pos += 4;
+
+        pic->description = g_malloc (desclen + 1);
+
+        for (i = 0; i < desclen; i++)
+        {
+            pic->description [i] = decoded_ustr [i + bytes_pos];
+        }
+
+        pic->description [desclen] = '\0';
+        bytes_pos += desclen + 16;
+
+        /* Reading picture size */
+        pic->size = read_guint32_from_byte (decoded_ustr, bytes_pos);
+        bytes_pos += 4;
+
+        /* Reading decoded picture */
+        pic->data = g_malloc (pic->size);
+
+        for (i = 0; i < pic->size; i++)
+        {
+            pic->data [i] = decoded_ustr [i + bytes_pos];
+        }
+
+        g_free (decoded_ustr);
+    }
 
     /***************************
      * Save unsupported fields *
@@ -604,13 +635,130 @@ ogg_tag_read_file_tag (gchar *filename, File_Tag *FileTag, GError **error)
           && strncasecmp(vc->user_comments[i],"COVERARTTYPE=",       13) != 0
           && strncasecmp(vc->user_comments[i],"COVERARTMIME=",       13) != 0
           && strncasecmp(vc->user_comments[i],"COVERARTDESCRIPTION=",20) != 0
+          && strncasecmp (vc->user_comments[i], "METADATA_BLOCK_PICTURE=", 23) != 0
            )
         {
             FileTag->other = g_list_append(FileTag->other,
                                            Try_To_Validate_Utf8_String(vc->user_comments[i]));
         }
     }
+}
+
+/*
+ * Read tag data into an Ogg Vorbis file.
+ * Note:
+ *  - if field is found but contains no info (strlen(str)==0), we don't read it
+ */
+gboolean
+ogg_tag_read_file_tag (gchar *filename, File_Tag *FileTag, GError **error)
+{
+    GFile *file;
+    GFileInputStream *istream;
+    vcedit_state   *state;
+    gchar *filename_utf8;
+
+    g_return_val_if_fail (filename != NULL && FileTag != NULL, FALSE);
+    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+    file = g_file_new_for_path (filename);
+    istream = g_file_read (file, NULL, error);
+
+    if (!istream)
+    {
+        g_object_unref (file);
+        g_assert (error == NULL || *error != NULL);
+        return FALSE;
+    }
+
+    filename_utf8 = filename_to_display (filename);
+
+    {
+    // Skip the id3v2 tag
+    guchar tmp_id3[4];
+    gulong id3v2size;
 
+    // Check if there is an ID3v2 tag...
+    if (!g_seekable_seek (G_SEEKABLE (istream), 0L, G_SEEK_SET, NULL, error))
+    {
+        goto err;
+    }
+
+    if (g_input_stream_read (G_INPUT_STREAM (istream), tmp_id3, 4, NULL,
+                             error) == 4)
+    {
+        // Calculate ID3v2 length
+        if (tmp_id3[0] == 'I' && tmp_id3[1] == 'D' && tmp_id3[2] == '3' && tmp_id3[3] < 0xFF)
+        {
+            // id3v2 tag skipeer $49 44 33 yy yy xx zz zz zz zz [zz size]
+            /* Size is 6-9 position */
+            if (!g_seekable_seek (G_SEEKABLE (istream), 2, G_SEEK_CUR,
+                                  NULL, error))
+            {
+                goto err;
+            }
+
+            if (g_input_stream_read (G_INPUT_STREAM (istream), tmp_id3, 4,
+                                     NULL, error) == 4)
+            {
+                id3v2size = 10 + ( (long)(tmp_id3[3])        | ((long)(tmp_id3[2]) << 7)
+                                | ((long)(tmp_id3[1]) << 14) | ((long)(tmp_id3[0]) << 21) );
+
+                if (!g_seekable_seek (G_SEEKABLE (istream), id3v2size,
+                                      G_SEEK_SET, NULL, error))
+                {
+                    goto err;
+                }
+
+                Log_Print(LOG_ERROR,_("Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."),filename_utf8);
+            }
+            else if (!g_seekable_seek (G_SEEKABLE (istream), 0L, G_SEEK_SET,
+                                       NULL, error))
+            {
+                goto err;
+            }
+
+        }
+        else if (!g_seekable_seek (G_SEEKABLE (istream), 0L, G_SEEK_SET,
+                                   NULL, error))
+        {
+            goto err;
+        }
+
+    }
+    else if (!g_seekable_seek (G_SEEKABLE (istream), 0L, G_SEEK_SET,
+                               NULL, error))
+    {
+        goto err;
+    }
+
+    }
+
+    g_assert (error == NULL || *error == NULL);
+
+    g_object_unref (istream);
+
+    state = vcedit_new_state();    // Allocate memory for 'state'
+
+    if (!vcedit_open (state, file, error))
+    {
+        g_assert (error == NULL || *error != NULL);
+        g_object_unref (file);
+        vcedit_clear(state);
+        g_free (filename_utf8);
+        return FALSE;
+    }
+
+    g_assert (error == NULL || *error == NULL);
+
+    /* Get data from tag */
+    /*{
+        gint i; 
+        for (i=0;i<vc->comments;i++) 
+            g_print("%s -> Ogg vc:'%s'\n",g_path_get_basename(filename),vc->user_comments[i]);
+    }*/
+
+    et_add_file_tags_from_vorbis_comments (vcedit_comments(state), FileTag,
+                                           filename_utf8);
     vcedit_clear(state);
     g_object_unref (file);
     g_free(filename_utf8);
@@ -679,7 +827,7 @@ ogg_tag_write_file_tag (ET_File *ETFile, GError **error)
     vcedit_state   *state;
     vorbis_comment *vc;
     gchar          *string;
-    GList          *list;
+    GList *l;
     Picture        *pic;
 
     g_return_val_if_fail (ETFile != NULL && ETFile->FileTag != NULL, FALSE);
@@ -861,51 +1009,147 @@ ogg_tag_write_file_tag (ET_File *ETFile, GError **error)
     /***********
      * Picture *
      ***********/
-    pic = FileTag->picture;
-    while (pic)
+    for (pic = FileTag->picture; pic != NULL; pic = pic->next)
     {
         if (pic->data)
         {
-            gchar *data_encoded = NULL;
-            Picture_Format format = Picture_Format_From_Data(pic);
-
-            string = g_strdup_printf("COVERARTMIME=%s",Picture_Mime_Type_String(format));
-            vorbis_comment_add(vc,string);
-            g_free(string);
-        
-            if (pic->type)
+            const gchar *mime;
+            guchar array[4];
+            guchar *ustring = NULL;
+            gsize ustring_len = 0;
+            gchar *base64_string;
+            Picture_Format format = Picture_Format_From_Data (pic);
+
+            /* According to the specification, only PNG and JPEG images should
+             * be added to Vorbis comments. */
+            if (format != PICTURE_FORMAT_PNG && format != PICTURE_FORMAT_JPEG)
             {
-                string = g_strdup_printf("COVERARTTYPE=%d",pic->type);
-                vorbis_comment_add(vc,string);
-                g_free(string);
-            }
+                GdkPixbufLoader *loader;
+                GError *error = NULL;
 
-            if (pic->description)
-            {
-                string = g_strdup_printf("COVERARTDESCRIPTION=%s",pic->description);
-                vorbis_comment_add(vc,string);
-                g_free(string);
+                loader = gdk_pixbuf_loader_new ();
+
+                if (!gdk_pixbuf_loader_write (loader, pic->data, pic->size,
+                                              &error))
+                {
+                    Log_Print (LOG_ERROR, _("Error with 'loader_write': %s"),
+                               error->message);
+                    g_error_free (error);
+                    g_object_unref (loader);
+                    continue;
+                }
+                else
+                {
+                    GdkPixbuf *pixbuf;
+                    gchar *buffer;
+                    gsize buffer_size;
+
+                    if (!gdk_pixbuf_loader_close (loader, &error))
+                    {
+                        Log_Print (LOG_ERROR,
+                                   _("Error with 'loader_close': %s"),
+                                   error->message);
+                        g_error_free (error);
+                        g_object_unref (loader);
+                        continue;
+                    }
+
+                    pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+
+                    if (!pixbuf)
+                    {
+                        g_object_unref (loader);
+                        continue;
+                    }
+
+                    g_object_ref (pixbuf);
+                    g_object_unref (loader);
+
+                    /* Always convert to PNG. */
+                    if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer,
+                                                    &buffer_size, "png",
+                                                    &error, NULL))
+                    {
+                        g_debug ("Error while converting image to PNG: %s",
+                                 error->message);
+                        g_error_free (error);
+                        g_object_unref (pixbuf);
+                        continue;
+                    }
+
+                    g_object_unref (pixbuf);
+
+                    g_free (pic->data);
+                    pic->data = (guchar *)buffer;
+                    pic->size = buffer_size;
+
+                    /* Set the picture format to reflect the new data. */
+                    format = Picture_Format_From_Data (pic);
+                }
             }
 
-            data_encoded = g_base64_encode (pic->data, pic->size);
-            string = g_strdup_printf("COVERART=%s",data_encoded);
-            vorbis_comment_add(vc,string);
-            g_free(data_encoded);
-            g_free(string);
-        }
+            mime = Picture_Mime_Type_String (format);
+
+            /* Calculating full length of byte string and allocating. */
+            ustring = g_malloc (4 * 8 + strlen (mime)
+                                + strlen (pic->description) + pic->size);
+
+            /* Adding picture type. */
+            convert_to_byte_array (pic->type, array);
+            add_to_guchar_str (ustring, &ustring_len, array, 4);
+
+            /* Adding MIME string and its length. */
+            convert_to_byte_array (strlen (mime), array);
+            add_to_guchar_str (ustring, &ustring_len, array, 4);
+            add_to_guchar_str (ustring, &ustring_len, (guchar *)mime,
+                               strlen (mime));
+
+            /* Adding picture description. */
+            convert_to_byte_array (strlen (pic->description), array);
+            add_to_guchar_str (ustring, &ustring_len, array, 4);
+            add_to_guchar_str (ustring, &ustring_len,
+                               (guchar *)pic->description,
+                               strlen (pic->description));
+
+            /* Adding width, height, color depth, indexed colors. */
+            convert_to_byte_array (pic->width, array);
+            add_to_guchar_str (ustring, &ustring_len, array, 4);
+
+            convert_to_byte_array (pic->height, array);
+            add_to_guchar_str (ustring, &ustring_len, array, 4);
 
-        pic = pic->next;
+            convert_to_byte_array (0, array);
+            add_to_guchar_str (ustring, &ustring_len, array, 4);
+
+            convert_to_byte_array (0, array);
+            add_to_guchar_str (ustring, &ustring_len, array, 4);
+
+            /* Adding picture data and its size. */
+            convert_to_byte_array (pic->size, array);
+            add_to_guchar_str (ustring, &ustring_len, array, 4);
+
+            add_to_guchar_str (ustring, &ustring_len, pic->data, pic->size);
+
+            base64_string = g_base64_encode (ustring, ustring_len);
+            string = g_strconcat ("METADATA_BLOCK_PICTURE=", base64_string,
+                                  NULL);
+            vorbis_comment_add (vc, string);
+
+            g_free (base64_string);
+            g_free (ustring);
+            g_free (string);
+        }
     }
 
     /**************************
      * Set unsupported fields *
      **************************/
-    list = FileTag->other;
-    while (list)
+    for (l = FileTag->other; l != NULL; l = g_list_next (l))
     {
-        if (list->data)
-            vorbis_comment_add(vc,(gchar *)list->data);
-        list = list->next;
+        if (l->data)
+        {
+            vorbis_comment_add (vc, (gchar *)l->data);
+        }
     }
 
     /* Write tag to 'file' in all cases */
diff --git a/src/ogg_tag.h b/src/ogg_tag.h
index 620731d..f2137c1 100644
--- a/src/ogg_tag.h
+++ b/src/ogg_tag.h
@@ -24,6 +24,7 @@
 
 
 #include <glib.h>
+#include "vcedit.h"
 #include "et_core.h"
 
 /**************
@@ -32,6 +33,9 @@
 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);
 #endif /* __OGG_TAG_H__ */
diff --git a/src/opus_header.c b/src/opus_header.c
new file mode 100644
index 0000000..a623893
--- /dev/null
+++ b/src/opus_header.c
@@ -0,0 +1,263 @@
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 Abhinav Jangda (abhijangda at hotmail.com)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h" /* For definition of ENABLE_OPUS */
+
+#ifdef ENABLE_OPUS
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <errno.h>
+
+#include "easytag.h"
+#include "opus_header.h"
+#include "et_core.h"
+#include "charset.h"
+#include "log.h"
+#include "misc.h"
+
+/*
+ * et_opus_error_quark:
+ *
+ * To get EtOpusError domain.
+ *
+ * Returns: GQuark for EtOpusError domain
+ */
+GQuark
+et_opus_error_quark (void)
+{
+    return g_quark_from_static_string ("et-opus-error-quark");
+}
+
+/*
+ * et_opus_open_file:
+ * @filename: Filepath to open
+ * @error: GError or %NULL
+ *
+ * Opens an Opus file.
+ *
+ * Returns: a OggOpusFile on success or %NULL on error.
+ */
+OggOpusFile *
+et_opus_open_file (GFile *gfile, GError **error)
+{
+    OggOpusFile *file;
+    gchar *path;
+    int error_val;
+
+    g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+    g_return_val_if_fail (gfile != NULL, NULL);
+
+    path = g_file_get_path (gfile);
+    file = op_open_file (path, &error_val);
+    g_free (path);
+
+    if (!file)
+    {
+        /* Got error while opening opus file */
+        switch (error_val)
+        {
+            case OP_EREAD:
+                g_set_error (error, ET_OPUS_ERROR, ET_OPUS_ERROR_READ,
+                             "Error reading file");
+                g_assert (error == NULL || *error != NULL);
+                return NULL;
+
+            case OP_EFAULT:
+                g_set_error (error, ET_OPUS_ERROR, ET_OPUS_ERROR_FAULT,
+                             "Memory allocation failure or internal library error");
+                g_assert (error == NULL || *error != NULL);
+                return NULL;
+
+            case OP_EIMPL:
+                g_set_error (error, ET_OPUS_ERROR, ET_OPUS_ERROR_IMPL,
+                             "Stream used an unimplemented feature");
+                g_assert (error == NULL || *error != NULL);
+                return NULL;
+
+            case OP_EINVAL:
+                g_set_error (error, ET_OPUS_ERROR, ET_OPUS_ERROR_INVAL,
+                             "seek () succeeded on this source but tell () did not");
+                g_assert (error == NULL || *error != NULL);
+                return NULL;
+
+            case OP_ENOTFORMAT:
+                g_set_error (error, ET_OPUS_ERROR, ET_OPUS_ERROR_NOTFORMAT,
+                             "No logical stream found in a link");
+                g_assert (error == NULL || *error != NULL);
+                return NULL;
+
+            case OP_EBADHEADER:
+                g_set_error (error, ET_OPUS_ERROR, ET_OPUS_ERROR_BADHEADER,
+                             "Corrupted header packet");
+                g_assert (error == NULL || *error != NULL);
+                return NULL;
+
+            case OP_EVERSION:
+                g_set_error (error, ET_OPUS_ERROR, ET_OPUS_ERROR_VERSION,
+                             "ID header contained an unrecognized version number");
+                g_assert (error == NULL || *error != NULL);
+                return NULL;
+
+            case OP_EBADLINK:
+                g_set_error (error, ET_OPUS_ERROR, ET_OPUS_ERROR_BADLINK,
+                             "Corrupted link found");
+                g_assert (error == NULL || *error != NULL);
+                return NULL;
+
+            case OP_EBADTIMESTAMP:
+                g_set_error (error, ET_OPUS_ERROR, ET_OPUS_ERROR_BADTIMESTAMP,
+                             "First/last timestamp in a link failed checks");
+                g_assert (error == NULL || *error != NULL);
+                return NULL;
+        }
+    }
+
+    return file;
+}
+
+/*
+ * et_opus_read_file_info:
+ * @file: file to read info from
+ * @ETFileInfo: ET_File_Info to put information into
+ * @error: a GError or %NULL
+ *
+ * Read header information of an Opus file.
+ *
+ * Returns: %TRUE if successful otherwise %FALSE
+ */
+gboolean
+et_opus_read_file_info (GFile *gfile, ET_File_Info *ETFileInfo,
+                        GError **error)
+{
+    OggOpusFile *file;
+    const OpusHead* head;
+    GFileInfo *info;
+
+    g_return_val_if_fail (gfile != NULL && ETFileInfo != NULL, FALSE);
+    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+    file = et_opus_open_file (gfile, error);
+
+    if (!file)
+    {
+        g_assert (error == NULL || *error != NULL);
+        return FALSE;
+    }
+
+    /* FIXME: Improve error-checking. */
+    head = op_head (file, -1);
+    /* TODO: Read the vendor string from the Vorbis comment? */
+    ETFileInfo->version = head->version;
+    ETFileInfo->bitrate = op_bitrate (file, -1) / 1000;
+    ETFileInfo->mode = head->channel_count;
+
+    /* All Opus audio is encoded at 48 kHz, but the input sample rate can
+     * differ, and then input_sample_rate will be set. */
+    if (head->input_sample_rate != 0)
+    {
+        ETFileInfo->samplerate = head->input_sample_rate;
+    }
+    else
+    {
+        ETFileInfo->samplerate = 48000;
+    }
+
+    ETFileInfo->duration = op_pcm_total (file, -1) / 48000;
+    op_free (file);
+
+    info = g_file_query_info (gfile, G_FILE_ATTRIBUTE_STANDARD_SIZE,
+                              G_FILE_QUERY_INFO_NONE, NULL, NULL);
+
+    if (info)
+    {
+        ETFileInfo->size = g_file_info_get_size (info);
+        g_object_unref (info);
+    }
+    else
+    {
+        ETFileInfo->size = 0;
+    }
+
+    g_assert (error == NULL || *error == NULL);
+    return TRUE;
+}
+
+/*
+ * et_opus_header_display_file_info_to_ui:
+ * @filename: file to display info of
+ * @ETFileInfo: ET_File_Info to display information
+ *
+ * Display header info from ET_File_Info.
+ *
+ * Returns: %TRUE if successful, otherwise %FALSE
+ */
+gboolean
+et_opus_header_display_file_info_to_ui (GFile *file,
+                                        ET_File_Info *ETFileInfo)
+{
+    gchar *text;
+    gchar *time = NULL;
+    gchar *time1 = NULL;
+    gchar *size = NULL;
+    gchar *size1 = NULL;
+
+    /* Encoder version */
+    gtk_label_set_text (GTK_LABEL (VersionLabel), _("Encoder:"));
+    text = g_strdup_printf ("%d", ETFileInfo->version);
+    gtk_label_set_text (GTK_LABEL (VersionValueLabel), text);
+    g_free (text);
+
+    /* Bitrate */
+    text = g_strdup_printf (_("%d kb/s"), ETFileInfo->bitrate);
+    gtk_label_set_text (GTK_LABEL (BitrateValueLabel), text);
+    g_free (text);
+
+    /* Samplerate */
+    text = g_strdup_printf (_("%d Hz"), ETFileInfo->samplerate);
+    gtk_label_set_text (GTK_LABEL (SampleRateValueLabel), text);
+    g_free (text);
+
+    /* Mode */
+    gtk_label_set_text (GTK_LABEL (ModeLabel), _("Channels:"));
+    text = g_strdup_printf ("%d", ETFileInfo->mode);
+    gtk_label_set_text (GTK_LABEL (ModeValueLabel), text);
+    g_free (text);
+
+    /* Size */
+    size  = g_format_size (ETFileInfo->size);
+    size1 = g_format_size (ETCore->ETFileDisplayedList_TotalSize);
+    text  = g_strdup_printf ("%s (%s)", size, size1);
+    gtk_label_set_text (GTK_LABEL (SizeValueLabel), text);
+    g_free (size);
+    g_free (size1);
+    g_free (text);
+
+    /* Duration */
+    time  = Convert_Duration (ETFileInfo->duration);
+    time1 = Convert_Duration (ETCore->ETFileDisplayedList_TotalDuration);
+    text  = g_strdup_printf ("%s (%s)", time, time1);
+    gtk_label_set_text (GTK_LABEL (DurationValueLabel), text);
+    g_free (time);
+    g_free (time1);
+    g_free (text);
+
+    return TRUE;
+}
+
+#endif /* ENABLE_OPUS */
diff --git a/src/opus_header.h b/src/opus_header.h
new file mode 100644
index 0000000..8feb0f6
--- /dev/null
+++ b/src/opus_header.h
@@ -0,0 +1,65 @@
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 Abhinav Jangda <abhijangda at hotmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef ET_OPUS_HEADER_H_
+#define ET_OPUS_HEADER_H_
+
+#include <glib.h>
+#include <opus/opusfile.h>
+
+#include "et_core.h"
+
+/*
+ * Error domain and codes for errors while reading/writing Opus files
+ */
+GQuark et_opus_error_quark (void);
+
+#define ET_OPUS_ERROR et_opus_error_quark ()
+
+/*
+ * EtOpusError:
+ * @ET_OPUS_ERROR_READ: Error reading file
+ * @ET_OPUS_ERROR_FAULT: Memory allocation failure or internal library error
+ * @ET_OPUS_ERROR_IMPL: Stream used an unimplemented feature
+ * @ET_OPUS_ERROR_INVAL: seek () succeeded on this source but tell () didn't
+ * @ET_OPUS_ERROR_NOTFORMAT: No logical stream found in a link
+ * @ET_OPUS_ERROR_BADHEADER: Corrputed header packet
+ * @ET_OPUS_ERROR_VERSION: ID header contained an unrecognized version number
+ * @ET_OPUS_ERROR_BADLINK: Corrupted link found
+ * @ET_OPUS_ERROR_BADTIMESTAMP: First/last timestamp in a link failed checks
+ *
+ * Errors that can occur when reading Opus files.
+ */
+typedef enum
+{
+    ET_OPUS_ERROR_READ,
+    ET_OPUS_ERROR_FAULT,
+    ET_OPUS_ERROR_IMPL,
+    ET_OPUS_ERROR_INVAL,
+    ET_OPUS_ERROR_NOTFORMAT,
+    ET_OPUS_ERROR_BADHEADER,
+    ET_OPUS_ERROR_VERSION,
+    ET_OPUS_ERROR_BADLINK,
+    ET_OPUS_ERROR_BADTIMESTAMP,
+} EtOpusError;
+
+gboolean et_opus_read_file_info (GFile *gfile, ET_File_Info *ETFileInfo, GError **error);
+OggOpusFile * et_opus_open_file (GFile *gfile, GError **error);
+gboolean et_opus_header_display_file_info_to_ui (GFile *gfile, ET_File_Info *ETFileInfo);
+
+#endif /* ET_OPUS_HEADER_H_ */
diff --git a/src/opus_tag.c b/src/opus_tag.c
new file mode 100644
index 0000000..c28addf
--- /dev/null
+++ b/src/opus_tag.c
@@ -0,0 +1,96 @@
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 Abhinav Jangda <abhijangda at hotmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h" /* For definition of ENABLE_OPUS */
+
+#ifdef ENABLE_OPUS
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <opus/opus.h>
+#include <vorbis/codec.h>
+
+#include "easytag.h"
+#include "opus_tag.h"
+#include "opus_header.h"
+#include "ogg_tag.h"
+#include "et_core.h"
+#include "log.h"
+#include "misc.h"
+#include "picture.h"
+#include "setting.h"
+#include "charset.h"
+
+#define MULTIFIELD_SEPARATOR " - "
+
+/*
+ * et_opus_tag_read_file_tag:
+ * @filename: file from which to read tags
+ * @FileTag: File_Tag to read tag into
+ * @error: a GError or %NULL
+ *
+ * Read file tags and store into File_Tag.
+ *
+ * Returns: %TRUE if successful otherwise %FALSE
+ */
+gboolean
+et_opus_tag_read_file_tag (GFile *gfile, File_Tag *FileTag,
+                           GError **error)
+{
+    OggOpusFile *file;
+    const OpusTags *tags;
+    GFileInfo *info;
+
+    g_return_val_if_fail (gfile != NULL && FileTag != NULL, FALSE);
+    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+    file = et_opus_open_file (gfile, error);
+
+    if (!file)
+    {
+        g_assert (error == NULL || *error != NULL);
+        return FALSE;
+    }
+
+    tags = op_tags (file, 0);
+    info = g_file_query_info (gfile, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
+                              G_FILE_QUERY_INFO_NONE, NULL, error);
+
+    if (!info)
+    {
+        op_free (file);
+        g_assert (error == NULL || *error != NULL);
+        return FALSE;
+    }
+
+    /* The cast is safe according to the opusfile documentation. */
+    et_add_file_tags_from_vorbis_comments ((vorbis_comment *)tags, FileTag,
+                                           g_file_info_get_display_name (info));
+    g_object_unref (info);
+    op_free (file);
+
+    g_assert (error == NULL || *error == NULL);
+    return TRUE;
+}
+
+#endif
diff --git a/src/dlm.h b/src/opus_tag.h
similarity index 66%
copy from src/dlm.h
copy to src/opus_tag.h
index bd9292f..e012727 100644
--- a/src/dlm.h
+++ b/src/opus_tag.h
@@ -1,5 +1,5 @@
 /* EasyTAG - tag editor for audio files
- * Copyright (C) 2004  Santtu Lakkala <inz at inz.fi>
+ * Copyright (C) 2014 Abhinav Jangda <abhijangda at hotmail.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -13,12 +13,19 @@
  *
  * You should have received a copy of the GNU General Public License along with
  * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __DLM_H__
-#define __DLM_H__
+#ifndef ET_OPUS_TAG_H_
+#define ET_OPUS_TAG_H_
 
-int dlm (const gchar *s, const gchar *t);
+#include <glib.h>
+#include "et_core.h"
 
-#endif /* __DLM_H__ */
+G_BEGIN_DECLS
+
+gboolean et_opus_tag_read_file_tag (GFile *file, File_Tag *FileTag, GError **error);
+
+G_END_DECLS
+
+#endif /* ET_OPUS_TAG_H_ */
diff --git a/src/picture.c b/src/picture.c
index 646ed0e..6eb5997 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -42,13 +42,26 @@
 
 #include "win32/win32dep.h"
 
+/* Data passed to et_picture_not_opened_callback */
+typedef struct
+{
+    GError *error;
+    gchar *filename;
+} ErrorDialogData;
+
+/* Data passed to et_picture_save_file_data_thread_func */
+typedef struct
+{
+    GFile *file;
+    Picture *pic;
+    GError *error;
+} PictureSaveData;
 
 /**************
  * Prototypes *
  **************/
 
 static void et_picture_load_file (GFile *file, gpointer user_data);
-
 static const gchar *Picture_Format_String (Picture_Format format);
 static const gchar *Picture_Type_String (EtPictureType type);
 static gchar *Picture_Info (Picture *pic);
@@ -69,12 +82,181 @@ static gboolean et_picture_save_file_data (const Picture *pic, GFile *file,
  * Functions *
  *************/
 
+/*
+ * et_picture_save_file_data_callback:
+ * @object: Source object of GAsyncResult
+ * @res: GAsyncResult for which callback is called
+ * @user_data: User data associated with GAsyncResult
+ *
+ * The callback function which is called when GSimpleAsyncResult of
+ * Picture_Save_Button_Clicked completes its operation.
+ */
+static void
+et_picture_save_file_data_callback (GObject *object, GAsyncResult *res,
+                                    gpointer user_data)
+{
+    PictureSaveData *data;
+
+    data = g_async_result_get_user_data (G_ASYNC_RESULT (res));
+
+    if (data->error)
+    {
+        Log_Print (LOG_ERROR, _("Image file not saved: %s"),
+                   data->error->message);
+        g_error_free (data->error);
+    }
+
+    gtk_widget_set_sensitive (MainWindow, TRUE);
+    g_slice_free (PictureSaveData, data);
+}
+
+/*
+ * et_picture_save_file_data_thread_func:
+ * @res: GSimpleAsyncResult associated with this function.
+ * @obj: Source object of GAsyncResult.
+ * @canc: Object to cancel the operation.
+ *
+ * Thread function of GSimpleAsyncResult of Picture_Save_Button_Clicked.
+ * This function will load pictures.
+ */
+static void
+et_picture_save_file_data_thread_func (GSimpleAsyncResult *res, GObject *obj,
+                                       GCancellable *cancellable)
+{
+    PictureSaveData *data;
+
+    data = g_async_result_get_user_data (G_ASYNC_RESULT (res));
+    et_picture_save_file_data (data->pic, data->file, &data->error);
+    g_object_unref (data->file);
+}
+
+/*
+ * et_picture_not_opened_callback:
+ * @object: Source object of GAsyncResult
+ * @res: GAsyncResult for which callback is called
+ * @user_data: User data associated with GAsyncResult
+ *
+ * The callback function which is called when et_picture_load_file
+ * reports an error.
+ */
+static void
+et_picture_not_opened_callback (GObject *object, GAsyncResult *res,
+                                gpointer user_data)
+{
+    GtkWidget *msgdialog;
+    ErrorDialogData *data = user_data;
+
+    /* Picture file not opened */
+    msgdialog = gtk_message_dialog_new (GTK_WINDOW (MainWindow),
+                                        GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        GTK_MESSAGE_ERROR,
+                                        GTK_BUTTONS_CLOSE,
+                                        _("Cannot open file: '%s'"),
+                                        data->filename);
+    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(msgdialog),
+                                              "%s", data->error->message);
+    gtk_window_set_title (GTK_WINDOW (msgdialog), _("Image File Error"));
+    gtk_dialog_run (GTK_DIALOG (msgdialog));
+    gtk_widget_destroy (msgdialog);
+
+    Log_Print (LOG_ERROR, _("Image file not loaded: %s"),
+               data->error->message);
+
+    g_error_free (data->error);
+    g_free (data->filename);
+    g_slice_free (ErrorDialogData, data);
+}
+
+/*
+ * et_load_pictures_callback:
+ * @object: Source object of GAsyncResult
+ * @res: GAsyncResult for which callback is called
+ * @user_data: User data associated with GAsyncResult
+ *
+ * The callback function which is called when GSimpleAsyncResult of
+ * Picture_Add_Button_Clicked completes its operation.
+ */
+static void
+et_load_pictures_callback (GObject *object, GAsyncResult *res,
+                           gpointer user_data)
+{
+    GSList *list = g_async_result_get_user_data (res);
+
+    g_slist_free_full (list, g_object_unref);
+    gtk_widget_set_sensitive (MainWindow, TRUE);
+    g_object_unref (res);
+}
+
+/*
+ * et_load_pictures_thread_func:
+ * @res: GSimpleAsyncResult associated with this function.
+ * @obj: Source object of GAsyncResult.
+ * @canc: Object to cancel the operation.
+ *
+ * Thread function of GSimpleAsyncResult of Picture_Add_Button_Clicked.
+ * This function will load pictures.
+ */
+static void
+et_load_pictures_thread_func (GSimpleAsyncResult *res, GObject *obj,
+                              GCancellable *canc)
+{
+    GSList *list = g_async_result_get_user_data (G_ASYNC_RESULT (res));
+
+    g_slist_foreach (list, (GFunc) et_picture_load_file, NULL);
+}
+
+/*
+ * et_picture_load_file_callback:
+ * @source: Source object of GAsyncResult
+ * @res: GAsyncResult for which callback is called
+ * @user_data: User data associated with GAsyncResult
+ *
+ * The callback function which is called when simpleasync in
+ * Tag_Area_Picture_Drag_Data completes its operation.
+ */
+static void
+et_picture_load_file_callback (GObject *source, GAsyncResult *res,
+                               gpointer user_data)
+{
+    gtk_widget_set_sensitive (MainWindow, TRUE);
+    g_object_unref (res);
+}
+
+/*
+ * et_picture_load_file_thread_func:
+ * @res: GSimpleAsyncResult associated with this function.
+ * @obj: Source object of GAsyncResult.
+ * @cancellable: Object to cancel the operation.
+ *
+ * Thread function of simpleasync in Tag_Area_Picture_Drag_Data.
+ * This function will load pictures.
+ */
+static void
+et_picture_load_file_thread_func (GSimpleAsyncResult *res, GObject *obj,
+                                  GCancellable *cancellable)
+{
+    gchar **uri_list = g_async_result_get_user_data (G_ASYNC_RESULT (res));
+    gchar **uri = uri_list;
+
+    while (*uri && *(*uri))
+    {
+        GFile *file = g_file_new_for_uri (*uri);
+
+        et_picture_load_file (file, NULL);
+        g_object_unref (file);
+        uri++;
+    }
+
+    g_strfreev (uri_list);
+}
+
 void Tag_Area_Picture_Drag_Data (GtkWidget *widget, GdkDragContext *dc,
                                  gint x, gint y, GtkSelectionData *selection_data,
                                  guint info, guint t, gpointer data)
 {
     GtkTreeSelection *selection;
-    gchar **uri_list, **uri;
+    gchar **uri_list;
+    GSimpleAsyncResult *simpleasync;
 
     gtk_drag_finish(dc, TRUE, FALSE, t);
 
@@ -86,17 +268,15 @@ void Tag_Area_Picture_Drag_Data (GtkWidget *widget, GdkDragContext *dc,
     selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(PictureEntryView));
     gtk_tree_selection_unselect_all(selection);
 
-    uri = uri_list = g_strsplit((gchar *)gtk_selection_data_get_data(selection_data), "\r\n", 0);
-    while (*uri && strlen(*uri))
-    {
-        GFile *file = g_file_new_for_uri (*uri);
-
-        et_picture_load_file (file, NULL);
-
-        g_object_unref (file);
-        uri++;
-    }
-    g_strfreev(uri_list);
+    uri_list = g_strsplit((gchar *)gtk_selection_data_get_data(selection_data), "\r\n", 0);
+    simpleasync = g_simple_async_result_new (NULL,
+                                             et_picture_load_file_callback,
+                                             uri_list,
+                                             Tag_Area_Picture_Drag_Data);
+    gtk_widget_set_sensitive (MainWindow, FALSE);
+    g_simple_async_result_run_in_thread (simpleasync,
+                                         et_picture_load_file_thread_func,
+                                         G_PRIORITY_DEFAULT, NULL);
 }
 
 void
@@ -251,24 +431,14 @@ et_picture_load_file (GFile *file, gpointer user_data)
 
     if (!pic)
     {
-        GtkWidget *msgdialog;
-
-        /* Picture file not opened */
-        msgdialog = gtk_message_dialog_new (GTK_WINDOW (MainWindow),
-                                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                            GTK_MESSAGE_ERROR,
-                                            GTK_BUTTONS_CLOSE,
-                                            _("Cannot open file: '%s'"),
-                                            filename_utf8);
-        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(msgdialog),
-                                                  "%s", error->message);
-        gtk_window_set_title (GTK_WINDOW (msgdialog), _("Image File Error"));
-        gtk_dialog_run (GTK_DIALOG (msgdialog));
-        gtk_widget_destroy (msgdialog);
-
-        Log_Print (LOG_ERROR, _("Image file not loaded: %s"),
-                   error->message);
-        g_error_free (error);
+        GSimpleAsyncResult *simple;
+        ErrorDialogData *data = g_slice_new (ErrorDialogData);
+        data->error = error;
+        data->filename = g_strdup (filename_utf8);
+        simple = g_simple_async_result_new (NULL, et_picture_not_opened_callback,
+                                            data, NULL);
+        g_simple_async_result_complete_in_idle (simple);
+        g_object_unref (info);
         return;
     }
     else
@@ -289,6 +459,7 @@ et_picture_load_file (GFile *file, gpointer user_data)
             // Other tag types
             case ID3_TAG:
             case OGG_TAG:
+            case OPUS_TAG:
             case APE_TAG:
             case FLAC_TAG:
             case WAVPACK_TAG:
@@ -301,10 +472,9 @@ et_picture_load_file (GFile *file, gpointer user_data)
                 g_assert_not_reached ();
         }
 
-        PictureEntry_Update(pic, TRUE);
+        PictureEntry_Update (pic, TRUE);
 
-        // FIXME: Call Picture_Free(pic) here? It seems PictureEntry_Update makes copies of pic.
-        //Picture_Free(pic);
+        Picture_Free (pic);
     }
 
     g_object_unref (info);
@@ -394,14 +564,18 @@ void Picture_Add_Button_Clicked (GObject *object)
     {
         GtkTreeSelection *selection;
         GSList *list;
+        GSimpleAsyncResult *res;
 
         selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(PictureEntryView));
         gtk_tree_selection_unselect_all(selection);
 
         list = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (FileSelectionWindow));
-        g_slist_foreach (list, (GFunc) et_picture_load_file, NULL);
-        g_slist_free_full (list, g_object_unref);
-
+        res = g_simple_async_result_new (NULL, et_load_pictures_callback,
+                                         list, Picture_Add_Button_Clicked);
+        gtk_widget_set_sensitive (MainWindow, FALSE);
+        g_simple_async_result_run_in_thread (res,
+                                             et_load_pictures_thread_func,
+                                             G_PRIORITY_DEFAULT, NULL);
         // Save the directory selected for initialize next time
         g_free(init_dir);
         init_dir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow));
@@ -484,6 +658,8 @@ void Picture_Properties_Button_Clicked (GObject *object)
                                                          NULL);
         g_free(title);
 
+        gtk_window_set_default_size (GTK_WINDOW (PictureTypesWindow), 400,
+                                     400);
         gtk_dialog_set_default_response(GTK_DIALOG(PictureTypesWindow), GTK_RESPONSE_OK);
 
         ScrollWindowPictureTypes = gtk_scrolled_window_new(NULL, NULL);
@@ -503,7 +679,6 @@ void Picture_Properties_Button_Clicked (GObject *object)
                                             "text", PICTURE_TYPE_COLUMN_TEXT,
                                             NULL);
         gtk_tree_view_append_column(GTK_TREE_VIEW(type), column);
-        gtk_widget_set_size_request(type, 256, 256);
         gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(PictureTypesWindow))),ScrollWindowPictureTypes,TRUE,TRUE,0);
 
         // Behaviour following the tag type...
@@ -729,6 +904,9 @@ void Picture_Save_Button_Clicked (GObject *object)
                 case PICTURE_FORMAT_PNG :
                     image_name = g_strdup("image_name.png");
                     break;
+                case PICTURE_FORMAT_GIF:
+                    image_name = g_strdup ("image_name.gif");
+                    break;
                 case PICTURE_FORMAT_UNKNOWN :
                     image_name = g_strdup("image_name.ext");
                     break;
@@ -746,22 +924,24 @@ void Picture_Save_Button_Clicked (GObject *object)
         if (response == GTK_RESPONSE_OK)
         {
             GFile *file;
-            GError *error = NULL;
+            GSimpleAsyncResult *res;
+            PictureSaveData *data = g_slice_new (PictureSaveData);
 
             // Save the directory selected for initialize next time
             g_free(init_dir);
             init_dir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow));
 
             file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (FileSelectionWindow));
-
-            if (!et_picture_save_file_data (pic, file, &error))
-            {
-                 Log_Print (LOG_ERROR, _("Image file not saved: %s"),
-                            error->message);
-                 g_error_free (error);
-            }
-
-            g_object_unref (file);
+            gtk_widget_set_sensitive (MainWindow, FALSE);
+            data->file = file;
+            data->pic = pic;
+            data->error = NULL;
+            res = g_simple_async_result_new (NULL,
+                                             et_picture_save_file_data_callback,
+                                             data, NULL);
+            g_simple_async_result_run_in_thread (res,
+                                                 et_picture_save_file_data_thread_func,
+                                                 G_PRIORITY_DEFAULT, NULL);
         }
         gtk_widget_destroy(FileSelectionWindow);
     }
@@ -791,7 +971,7 @@ Picture_Format Picture_Format_From_Data (Picture *pic)
     &&  pic->data[7] == 0x0a)
         return PICTURE_FORMAT_PNG;
     
-    /*// GIF : "GIF87a"
+    /* GIF: "GIF87a" */
     if (pic->data && pic->size > 6
     &&  pic->data[0] == 0x47
     &&  pic->data[1] == 0x49
@@ -799,7 +979,19 @@ Picture_Format Picture_Format_From_Data (Picture *pic)
     &&  pic->data[3] == 0x38
     &&  pic->data[4] == 0x37
     &&  pic->data[5] == 0x61)
-        return PICTURE_FORMAT_GIF;*/
+        return PICTURE_FORMAT_GIF;
+
+    /* GIF: "GIF89a" */
+    if (pic->data && pic->size > 6
+        &&  pic->data[0] == 0x47
+        &&  pic->data[1] == 0x49
+        &&  pic->data[2] == 0x46
+        &&  pic->data[3] == 0x38
+        &&  pic->data[4] == 0x39
+        &&  pic->data[5] == 0x61)
+    {
+        return PICTURE_FORMAT_GIF;
+    }
     
     return PICTURE_FORMAT_UNKNOWN;
 }
@@ -812,8 +1004,11 @@ const gchar *Picture_Mime_Type_String (Picture_Format format)
             return "image/jpeg";
         case PICTURE_FORMAT_PNG:
             return "image/png";
+        case PICTURE_FORMAT_GIF:
+            return "image/gif";
         default:
-            return NULL;
+            g_debug ("%s", "Unrecognised image MIME type");
+            return "application/octet-stream";
     }
 }
 
@@ -827,6 +1022,8 @@ Picture_Format_String (Picture_Format format)
             return _("JPEG image");
         case PICTURE_FORMAT_PNG:
             return _("PNG image");
+        case PICTURE_FORMAT_GIF:
+            return _("GIF image");
         default:
             return _("Unknown image");
     }
diff --git a/src/picture.h b/src/picture.h
index 3498510..caf5616 100644
--- a/src/picture.h
+++ b/src/picture.h
@@ -24,6 +24,7 @@
 
 #include "et_core.h"
 
+G_BEGIN_DECLS
 
 /***************
  * Declaration *
@@ -74,6 +75,7 @@ typedef enum
 {
     PICTURE_FORMAT_JPEG,
     PICTURE_FORMAT_PNG,
+    PICTURE_FORMAT_GIF,
     PICTURE_FORMAT_UNKNOWN
 } Picture_Format;
 
@@ -125,5 +127,6 @@ const gchar   *Picture_Mime_Type_String (Picture_Format format);
 gboolean Picture_Entry_View_Button_Pressed (GtkTreeView *treeview, GdkEventButton *event, gpointer data);
 gboolean Picture_Entry_View_Key_Pressed    (GtkTreeView *treeview, GdkEvent *event, gpointer data);
 
+G_END_DECLS
 
 #endif /* __PICTURE_H__ */
diff --git a/src/prefs.c b/src/prefs.c
index 301438a..e27ffe2 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -1334,7 +1334,8 @@ void Open_OptionsWindow (void)
         gtk_entry_set_text(GTK_ENTRY(CddbProxyUserPassword),CDDB_PROXY_USER_PASSWORD);
     gtk_grid_attach (GTK_GRID (Table), CddbProxyUserPassword, 4, 2, 1, 1);
     gtk_entry_set_visibility(GTK_ENTRY(CddbProxyUserPassword),FALSE);
-    gtk_widget_set_tooltip_text(CddbProxyUserPassword,_("Password of user for the the proxy server."));
+    gtk_widget_set_tooltip_text (CddbProxyUserPassword,
+                                 _("Password of user for the proxy server."));
     Cddb_Use_Proxy_Toggled();
 
 
diff --git a/src/scan.c b/src/scan.c
index 1a0bf52..1eab0d1 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -1,4040 +1,228 @@
-/* scan.c - 2000/06/16 */
-/*
- *  EasyTAG - Tag editor for MP3 and Ogg Vorbis files
- *  Copyright (C) 2000-2003  Jerome Couderc <easytag at gmail.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <config.h>
-
-#include <gtk/gtk.h>
-#include <string.h>
-#include <stdlib.h>
-#include <gdk/gdkkeysyms.h>
-#include <config.h>
-#include <glib/gi18n.h>
-
-#include "gtk2_compat.h"
-#include "scan.h"
-#include "easytag.h"
-#include "prefs.h"
-#include "setting.h"
-#include "id3_tag.h"
-#include "bar.h"
-#include "browser.h"
-#include "log.h"
-#include "misc.h"
-#include "et_core.h"
-#include "crc32.h"
-#include "charset.h"
-
-
-#define step(a,b) (b-a)+1
-
-
-/****************
- * Declarations *
- ****************/
-static GtkWidget *ScanTagMaskCombo = NULL;
-static GtkWidget *RenameFileMaskCombo = NULL;
-static GtkWidget *ScannerOptionCombo = NULL;
-static GtkWidget *RenameFilePrefixPathButton = NULL;
-
-static GtkWidget *ScanTagFrame;
-static GtkWidget *RenameFileFrame;
-static GtkWidget *ProcessFieldsFrame;
-static GtkWidget *FillTagPreviewLabel = NULL;
-static GtkWidget *RenameFilePreviewLabel = NULL;
-
-static GtkListStore *RenameFileListModel;
-static GtkListStore *ScanTagListModel;
-
-static GtkWidget *ProcessFileNameField;
-static GtkWidget *ProcessTitleField;
-static GtkWidget *ProcessArtistField;
-static GtkWidget *ProcessAlbumArtistField;
-static GtkWidget *ProcessAlbumField;
-static GtkWidget *ProcessGenreField;
-static GtkWidget *ProcessCommentField;
-static GtkWidget *ProcessComposerField;
-static GtkWidget *ProcessOrigArtistField;
-static GtkWidget *ProcessCopyrightField;
-static GtkWidget *ProcessURLField;
-static GtkWidget *ProcessEncodedByField;
-static GtkWidget *ProcessFieldsConvertIntoSpace = NULL;
-static GtkWidget *ProcessFieldsConvertSpace = NULL;
-static GtkWidget *ProcessFieldsConvert = NULL;
-static GtkWidget *ProcessFieldsConvertLabelTo;
-static GtkWidget *ProcessFieldsConvertTo = NULL;
-static GtkWidget *ProcessFieldsConvertFrom = NULL;
-static GtkWidget *ProcessFieldsAllUppercase = NULL;
-static GtkWidget *ProcessFieldsAllDowncase = NULL;
-static GtkWidget *ProcessFieldsFirstLetterUppercase = NULL;
-static GtkWidget *ProcessFieldsFirstLettersUppercase = NULL;
-static GtkWidget *ProcessFieldsDetectRomanNumerals = NULL;
-static GtkWidget *ProcessFieldsRemoveSpace = NULL;
-static GtkWidget *ProcessFieldsInsertSpace = NULL;
-static GtkWidget *ProcessFieldsOnlyOneSpace = NULL;
-
-static GtkWidget *LegendFrame = NULL;
-static GtkWidget *LegendButton = NULL;
-
-static GtkWidget *MaskEditorButton = NULL;
-static GtkWidget *MaskEditorFrame  = NULL;
-static GtkWidget *MaskEditorVBox;
-static GtkWidget *MaskEditorHBox;
-static GtkWidget *MaskEditorScrollWindow;
-static GtkWidget *MaskEditorList;
-static GtkWidget *MaskEditorEntry;
-static GtkWidget *MaskEditorNewButton;
-static GtkWidget *MaskEditorCopyButton;
-static GtkWidget *MaskEditorAddButton;
-static GtkWidget *MaskEditorRemoveButton;
-static GtkWidget *MaskEditorUpButton;
-static GtkWidget *MaskEditorDownButton;
-static GtkWidget *MaskEditorSaveButton;
-
-static const guint BOX_SPACING = 6;
-
-/* Some predefined masks -- IMPORTANT: Null-terminate me! */
-static const gchar *Scan_Masks [] =
-{
-    "%a - %b"G_DIR_SEPARATOR_S"%n - %t",
-    "%a_-_%b"G_DIR_SEPARATOR_S"%n_-_%t",
-    "%a - %b (%y)"G_DIR_SEPARATOR_S"%n - %a - %t",
-    "%a_-_%b_(%y)"G_DIR_SEPARATOR_S"%n_-_%a_-_%t",
-    "%a - %b (%y) - %g"G_DIR_SEPARATOR_S"%n - %a - %t",
-    "%a_-_%b_(%y)_-_%g"G_DIR_SEPARATOR_S"%n_-_%a_-_%t",
-    "%a - %b"G_DIR_SEPARATOR_S"%n. %t",
-    "%a_-_%b"G_DIR_SEPARATOR_S"%n._%t",
-    "%a-%b"G_DIR_SEPARATOR_S"%n-%t",
-    "%b"G_DIR_SEPARATOR_S"%n. %a - %t",
-    "%b"G_DIR_SEPARATOR_S"%n._%a_-_%t",
-    "%b"G_DIR_SEPARATOR_S"%n - %a - %t",
-    "%b"G_DIR_SEPARATOR_S"%n_-_%a_-_%t",
-    "%b"G_DIR_SEPARATOR_S"%n-%a-%t",
-    "%a-%b"G_DIR_SEPARATOR_S"%n-%t",
-    "%a"G_DIR_SEPARATOR_S"%b"G_DIR_SEPARATOR_S"%n. %t",
-    "%g"G_DIR_SEPARATOR_S"%a"G_DIR_SEPARATOR_S"%b"G_DIR_SEPARATOR_S"%t",
-    "%a_-_%b-%n-%t-%y",
-    "%a - %b"G_DIR_SEPARATOR_S"%n. %t(%c)",
-    "%t",
-    "Track%n",
-    "Track%i %n",
-    NULL
-};
-
-static const gchar *Rename_File_Masks [] =
-{
-    "%n - %a - %t",
-    "%n_-_%a_-_%t",
-    "%n. %a - %t",
-    "%n._%a_-_%t",
-    "%a - %b"G_DIR_SEPARATOR_S"%n - %t",
-    "%a_-_%b"G_DIR_SEPARATOR_S"%n_-_%t",
-    "%a - %b (%y) - %g"G_DIR_SEPARATOR_S"%n - %t",
-    "%a_-_%b_(%y)_-_%g"G_DIR_SEPARATOR_S"%n_-_%t",
-    "%n - %t",
-    "%n_-_%t",
-    "%n. %t",
-    "%n._%t",
-    "%n - %a - %b - %t",
-    "%n_-_%a_-_%b_-_%t",
-    "%a - %b - %t",
-    "%a_-_%b_-_%t",
-    "%a - %b - %n - %t",
-    "%a_-_%b_-_%n_-_%t",
-    "%a - %t",
-    "%a_-_%t",
-    "Track %n",
-    NULL
-};
-
-/**gchar *Rename_Directory_Masks [] =
-{
-    "%a - %b",
-    "%a_-_%b",
-    "%a - %b (%y) - %g",
-    "%a_-_%b_(%y)_-_%g",
-    "VA - %b (%y)",
-    "VA_-_%b_(%y)",
-    NULL
-};**/
-
-
-static const gchar *Scanner_Option_Menu_Items [] =
-{
-    N_("Fill Tag"),
-    N_("Rename File and Directory"),
-    N_("Process Fields")
-};
-
-typedef enum
-{
-    UNKNOWN = 0,           /* Default value when initialized */
-    LEADING_SEPARATOR,     /* characters before the first code */
-    TRAILING_SEPARATOR,    /* characters after the last code */
-    SEPARATOR,             /* item is a separator between two codes */
-    DIRECTORY_SEPARATOR,   /* item is a separator between two codes with character '/' (G_DIR_SEPARATOR) */
-    FIELD,                 /* item contains text (not empty) of entry */
-    EMPTY_FIELD            /* item when entry contains no text */
-} Mask_Item_Type;
-
-
-
-/*
- * Used into Rename File Scanner
- */
-typedef struct _File_Mask_Item File_Mask_Item;
-struct _File_Mask_Item
-{
-    Mask_Item_Type  type;
-    gchar          *string;
-};
-
-/*
- * Used into Scan Tag Scanner
- */
-typedef struct _Scan_Mask_Item Scan_Mask_Item;
-struct _Scan_Mask_Item
-{
-    gchar  code;   // The code of the mask without % (ex: %a => a)
-    gchar *string; // The string found by the scanner for the code defined the line above
-};
-
-
-
-/**************
- * Prototypes *
- **************/
-static void Scan_Tag_With_Mask (ET_File *ETFile);
-static void ScannerWindow_Quit (void);
-static void Scan_Toggle_Legend_Button (void);
-static void Scan_Toggle_Mask_Editor_Button (void);
-static void Scan_Option_Button (void);
-static void entry_check_scan_tag_mask (GtkEntry *entry, gpointer user_data);
-
-static GList *Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask);
-static void Scan_Rename_File_Prefix_Path (void);
-static void Scan_Free_File_Rename_List (GList *list);
-static void Scan_Free_File_Fill_Tag_List (GList *list);
-
-static gchar **Scan_Return_File_Tag_Field_From_Mask_Code (File_Tag *FileTag,
-                                                          gchar code);
-static void Scan_Process_Fields_Functions (gchar **string);
-
-static gint Scan_Word_Is_Roman_Numeral (const gchar *text);
-
-static void Process_Fields_Convert_Check_Button_Toggled (GtkWidget *object);
-static void Process_Fields_First_Letters_Check_Button_Toggled (GtkWidget *object);
-static void Select_Fields_Invert_Selection (void);
-static void Select_Fields_Select_Unselect_All (void);
-static void Select_Fields_Set_Sensitive (void);
-
-static void Mask_Editor_List_Row_Selected (GtkTreeSelection* selection,
-                                           gpointer data);
-static void Mask_Editor_List_Set_Row_Visible (GtkTreeModel *treeModel,
-                                              GtkTreeIter *rowIter);
-static void Mask_Editor_List_New (void);
-static void Mask_Editor_List_Duplicate (void);
-static void Mask_Editor_List_Add (void);
-static void Mask_Editor_List_Remove (void);
-static void Mask_Editor_List_Move_Up (void);
-static void Mask_Editor_List_Move_Down (void);
-static void Mask_Editor_List_Save_Button (void);
-static void Mask_Editor_Entry_Changed (void);
-static gboolean Mask_Editor_List_Key_Press (GtkWidget *widget,
-                                            GdkEvent *event);
-
-static void Mask_Editor_Clean_Up_Masks_List (void);
-
-static void Scanner_Option_Menu_Activate_Item (GtkWidget *widget, gpointer data);
-
-static int roman2int (const char *str);
-static const char *int2roman (int num);
-static char *int2roman_r (int num, char * str, size_t len);
-
-static void Scan_Convert_Character (gchar **string);
-static GList *Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask);
-static void Scan_Set_Scanner_Window_Init_Position (void);
-
-static void et_scan_on_response (GtkDialog *dialog, gint response_id,
-                                 gpointer user_data);
-
-
-/*************
- * Functions *
- *************/
-
-void Init_ScannerWindow (void)
-{
-    ScannerWindow     = NULL;
-    ScannerOptionCombo= NULL;
-}
-
-
-/*
- * Uses the filename and path to fill tag information
- * Note: mask and source are read from the right to the left
- */
-static void
-Scan_Tag_With_Mask (ET_File *ETFile)
-{
-    GList *fill_tag_list = NULL;
-    GList *l;
-    gchar **dest = NULL;
-    gchar *mask; // The 'mask' in the entry
-    gchar *filename_utf8;
-    File_Tag *FileTag;
-
-    g_return_if_fail (ScannerWindow != NULL && ScanTagMaskCombo != NULL);
-    g_return_if_fail (ETFile != NULL);
-
-    mask = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(ScanTagMaskCombo)))));
-    if (!mask) return;
-
-    // Create a new File_Tag item
-    FileTag = ET_File_Tag_Item_New();
-    ET_Copy_File_Tag_Item(ETFile,FileTag);
-
-    // Process this mask with file
-    fill_tag_list = Scan_Generate_New_Tag_From_Mask(ETFile,mask);
-
-    for (l = fill_tag_list; l != NULL; l = g_list_next (l))
-    {
-        Scan_Mask_Item *mask_item = l->data;
-
-        // Get the target entry for this code
-        dest = Scan_Return_File_Tag_Field_From_Mask_Code(FileTag,mask_item->code);
-
-        // We display the text affected to the code
-        if ( dest && ( OVERWRITE_TAG_FIELD || *dest==NULL || strlen(*dest)==0 ) )
-            ET_Set_Field_File_Tag_Item(dest,mask_item->string);
-
-    }
-
-    Scan_Free_File_Fill_Tag_List(fill_tag_list);
-
-    // Set the default text to comment
-    if (SET_DEFAULT_COMMENT && (OVERWRITE_TAG_FIELD || FileTag->comment==NULL || strlen(FileTag->comment)==0 ) )
-        ET_Set_Field_File_Tag_Item((void *)&FileTag->comment,DEFAULT_COMMENT);
-
-    // Set CRC-32 value as default comment (for files with ID3 tag only ;-)
-    if (SET_CRC32_COMMENT && (OVERWRITE_TAG_FIELD || FileTag->comment==NULL || strlen(FileTag->comment)==0 ) )
-    {
-        GError *error = NULL;
-        guint32 crc32_value;
-        gchar *buffer;
-        ET_File_Description *ETFileDescription;
-
-        ETFileDescription = ETFile->ETFileDescription;
-        switch (ETFileDescription->TagType)
-        {
-            case ID3_TAG:
-                if (crc32_file_with_ID3_tag (((File_Name *)((GList *)ETFile->FileNameNew)->data)->value,
-                                             &crc32_value, &error))
-                {
-                    buffer = g_strdup_printf ("%.8" G_GUINT32_FORMAT,
-                                              crc32_value);
-                    ET_Set_Field_File_Tag_Item((void *)&FileTag->comment,buffer);
-                    g_free(buffer);
-                }
-                else
-                {
-                    Log_Print (LOG_ERROR,
-                               _("Cannot calculate CRC value of file (%s)"),
-                               error->message);
-                    g_error_free (error);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-
-    // Save changes of the 'File_Tag' item
-    ET_Manage_Changes_Of_File_Data(ETFile,NULL,FileTag);
-
-    g_free(mask);
-    Statusbar_Message(_("Tag successfully scanned"),TRUE);
-    filename_utf8 = g_path_get_basename( ((File_Name *)ETFile->FileNameNew->data)->value_utf8 );
-    Log_Print(LOG_OK,_("Tag successfully scanned: %s"),filename_utf8);
-    g_free(filename_utf8);
-}
-
-static GList *
-Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask)
-{
-    GList *fill_tag_list = NULL;
-    gchar *filename_utf8;
-    gchar *tmp;
-    gchar *buf;
-    gchar *separator;
-    gchar *string;
-    gint  len, i, loop=0;
-    gchar **mask_splitted;
-    gchar **file_splitted;
-    guint mask_splitted_number;
-    guint file_splitted_number;
-    guint mask_splitted_index;
-    guint file_splitted_index;
-    Scan_Mask_Item *mask_item;
-
-    g_return_val_if_fail (ETFile != NULL && mask != NULL, NULL);
-
-    filename_utf8 = g_strdup(((File_Name *)((GList *)ETFile->FileNameNew)->data)->value_utf8);
-    if (!filename_utf8) return NULL;
-
-    // Remove extension of file (if found)
-    tmp = strrchr(filename_utf8,'.');
-    for (i=0; i<=(gint)ET_FILE_DESCRIPTION_SIZE; i++)
-    {
-        if ( strcasecmp(tmp,ETFileDescription[i].Extension)==0 )
-        {
-            *tmp = 0; //strrchr(source,'.') = 0;
-            break;
-        }
-    }
-
-    if (i==ET_FILE_DESCRIPTION_SIZE)
-    {
-        gchar *tmp1 = g_path_get_basename(filename_utf8);
-        Log_Print(LOG_ERROR,_("Tag scanner: strange… the extension '%s' was not found in filename '%s'"),tmp,tmp1);
-        g_free(tmp1);
-    }
-
-    // Replace characters into mask and filename before parsing
-    if (FTS_CONVERT_UNDERSCORE_AND_P20_INTO_SPACE)
-    {
-        Scan_Convert_Underscore_Into_Space(mask);
-        Scan_Convert_Underscore_Into_Space(filename_utf8);
-        Scan_Convert_P20_Into_Space(mask);
-        Scan_Convert_P20_Into_Space(filename_utf8);
-    }
-    if (FTS_CONVERT_SPACE_INTO_UNDERSCORE)
-    {
-        Scan_Convert_Space_Into_Undescore(mask);
-        Scan_Convert_Space_Into_Undescore(filename_utf8);
-    }
-
-
-    // Split the Scanner mask
-    mask_splitted = g_strsplit(mask,G_DIR_SEPARATOR_S,0);
-    // Get number of arguments into 'mask_splitted'
-    for (mask_splitted_number=0;mask_splitted[mask_splitted_number];mask_splitted_number++);
-
-    // Split the File Path
-    file_splitted = g_strsplit(filename_utf8,G_DIR_SEPARATOR_S,0);
-    // Get number of arguments into 'file_splitted'
-    for (file_splitted_number=0;file_splitted[file_splitted_number];file_splitted_number++);
-
-    // Set the starting position for each tab
-    if (mask_splitted_number <= file_splitted_number)
-    {
-        mask_splitted_index = 0;
-        file_splitted_index = file_splitted_number - mask_splitted_number;
-    }else
-    {
-        mask_splitted_index = mask_splitted_number - file_splitted_number;
-        file_splitted_index = 0;
-    }
-
-    loop = 0;
-    while ( mask_splitted[mask_splitted_index]!= NULL && file_splitted[file_splitted_index]!=NULL )
-    {
-        gchar *mask_seq = mask_splitted[mask_splitted_index];
-        gchar *file_seq = file_splitted[file_splitted_index];
-        gchar *file_seq_utf8 = filename_to_display(file_seq);
-
-        //g_print(">%d> seq '%s' '%s'\n",loop,mask_seq,file_seq);
-        while ( mask_seq && strlen(mask_seq)>0 )
-        {
-
-            /*
-             * Determine (first) code and destination
-             */
-            if ( (tmp=strchr(mask_seq,'%')) == NULL || strlen(tmp) < 2 )
-            {
-                break;
-            }
-
-            /*
-             * Allocate a new iten for the fill_tag_list
-             */
-            mask_item = g_malloc0(sizeof(Scan_Mask_Item));
-
-            // Get the code (used to determine the corresponding target entry)
-            mask_item->code = tmp[1];
-
-            /*
-             * Delete text before the code
-             */
-            if ( (len = strlen(mask_seq) - strlen(tmp)) > 0 )
-            {
-                // Get this text in 'mask_seq'
-                buf = g_strndup(mask_seq,len);
-                // We remove it in 'mask_seq'
-                mask_seq = mask_seq + len;
-                // Find the same text at the begining of 'file_seq' ?
-                if ( (strstr(file_seq,buf)) == file_seq )
-                {
-                    file_seq = file_seq + len; // We remove it
-                }else
-                {
-                    Log_Print(LOG_ERROR,_("Scan Error: can't find separator '%s' within '%s'"),buf,file_seq_utf8);
-                }
-                g_free(buf);
-            }
-
-            // Remove the current code into 'mask_seq'
-            mask_seq = mask_seq + 2;
-
-            /*
-             * Determine separator between two code or trailing text (after code)
-             */
-            if ( mask_seq && strlen(mask_seq)>0 )
-            {
-                if ( (tmp=strchr(mask_seq,'%')) == NULL || strlen(tmp) < 2 )
-                {
-                    // No more code found
-                    len = strlen(mask_seq);
-                }else
-                {
-                    len = strlen(mask_seq) - strlen(tmp);
-                }
-                separator = g_strndup(mask_seq,len);
-
-                // Remove the current separator in 'mask_seq'
-                mask_seq = mask_seq + len;
-
-                // Try to find the separator in 'file_seq'
-                if ( (tmp=strstr(file_seq,separator)) == NULL )
-                {
-                    Log_Print(LOG_ERROR,_("Scan Error: can't find separator '%s' within '%s'"),separator,file_seq_utf8);
-                    separator[0] = 0; // Needed to avoid error when calculting 'len' below
-                }
-
-                // Get the string affected to the code (or the corresponding entry field)
-                len = strlen(file_seq) - (tmp!=NULL?strlen(tmp):0);
-                string = g_strndup(file_seq,len);
-
-                // Remove the current separator in 'file_seq'
-                file_seq = file_seq + strlen(string) + strlen(separator);
-                g_free(separator);
-
-                // We get the text affected to the code
-                mask_item->string = string;
-            }else
-            {
-                // We display the remaining text, affected to the code (no more data in 'mask_seq')
-                mask_item->string = g_strdup(file_seq);
-            }
-
-            // Add the filled mask_iten to the list
-            fill_tag_list = g_list_append(fill_tag_list,mask_item);
-        }
-
-        g_free(file_seq_utf8);
-
-        // Next sequences
-        mask_splitted_index++;
-        file_splitted_index++;
-        loop++;
-    }
-
-    g_free(filename_utf8);
-    g_strfreev(mask_splitted);
-    g_strfreev(file_splitted);
-
-    // The 'fill_tag_list' must be freed after use
-    return fill_tag_list;
-}
-
-void Scan_Fill_Tag_Generate_Preview (void)
-{
-    gchar *mask = NULL;
-    gchar *preview_text = NULL;
-    GList *fill_tag_list = NULL;
-    GList *l;
-
-    if (!ETCore->ETFileDisplayedList
-    ||  !ScannerWindow || !RenameFileMaskCombo || !FillTagPreviewLabel
-    ||  gtk_combo_box_get_active(GTK_COMBO_BOX(ScannerOptionCombo)) != SCANNER_FILL_TAG)
-        return;
-
-    mask = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(ScanTagMaskCombo)))));
-    if (!mask)
-        return;
-
-    preview_text = g_strdup("");
-    fill_tag_list = Scan_Generate_New_Tag_From_Mask(ETCore->ETFileDisplayed,mask);
-    for (l = fill_tag_list; l != NULL; l = g_list_next (l))
-    {
-        Scan_Mask_Item *mask_item = l->data;
-        gchar *tmp_code   = g_strdup_printf("%c",mask_item->code);
-        gchar *tmp_string = g_markup_printf_escaped("%s",mask_item->string); // To avoid problem with strings containing characters like '&'
-        gchar *tmp_preview_text = preview_text;
-
-        preview_text = g_strconcat(tmp_preview_text,"<b>","%",tmp_code," = ",
-                                   "</b>","<i>",tmp_string,"</i>",NULL);
-        g_free(tmp_code);
-        g_free(tmp_string);
-        g_free(tmp_preview_text);
-
-        tmp_preview_text = preview_text;
-        preview_text = g_strconcat(tmp_preview_text,"  ||  ",NULL);
-        g_free(tmp_preview_text);
-    }
-
-    Scan_Free_File_Fill_Tag_List(fill_tag_list);
-
-    if (GTK_IS_LABEL(FillTagPreviewLabel))
-    {
-        if (preview_text)
-        {
-            //gtk_label_set_text(GTK_LABEL(FillTagPreviewLabel),preview_text);
-            gtk_label_set_markup(GTK_LABEL(FillTagPreviewLabel),preview_text);
-        } else
-        {
-            gtk_label_set_text(GTK_LABEL(FillTagPreviewLabel),"");
-        }
-
-        // Force the window to be redrawed
-        gtk_widget_queue_resize(ScannerWindow);
-    }
-
-    g_free(mask);
-    g_free(preview_text);
-}
-
-static void
-Scan_Free_File_Fill_Tag_List (GList *list)
-{
-    GList *l;
-
-    list = g_list_first (list);
-
-    for (l = list; l != NULL; l = g_list_next (l))
-    {
-        if (l->data)
-        {
-            g_free (((Scan_Mask_Item *)l->data)->string);
-            g_free ((Scan_Mask_Item *)l->data);
-        }
-    }
-
-    g_list_free (list);
-}
-
-
-
-/**************************
- * Scanner To Rename File *
- **************************/
-/*
- * Uses tag information (displayed into tag entries) to rename file
- * Note: mask and source are read from the right to the left.
- * Note1: a mask code may be used severals times...
- */
-static void
-Scan_Rename_File_With_Mask (ET_File *ETFile)
-{
-    gchar *filename_generated_utf8 = NULL;
-    gchar *filename_generated = NULL;
-    gchar *filename_new_utf8 = NULL;
-    gchar *mask = NULL;
-    File_Name *FileName;
-
-    g_return_if_fail (ScannerWindow != NULL || RenameFileMaskCombo != NULL ||
-                      ETFile != NULL);
-
-    mask = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(RenameFileMaskCombo)))));
-    if (!mask) return;
-
-    // Note : if the first character is '/', we have a path with the filename,
-    // else we have only the filename. The both are in UTF-8.
-    filename_generated_utf8 = Scan_Generate_New_Filename_From_Mask(ETFile,mask,FALSE);
-    g_free(mask);
-
-    if (!filename_generated_utf8)
-        return;
-    if (g_utf8_strlen(filename_generated_utf8,-1)<1)
-    {
-        g_free(filename_generated_utf8);
-        return;
-    }
-
-    // Convert filename to file-system encoding
-    filename_generated = filename_from_display(filename_generated_utf8);
-    if (!filename_generated)
-    {
-        GtkWidget *msgdialog;
-        msgdialog = gtk_message_dialog_new(GTK_WINDOW(ScannerWindow),
-                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                             GTK_MESSAGE_ERROR,
-                             GTK_BUTTONS_CLOSE,
-                             _("Could not convert filename '%s' into system filename encoding"),
-                             filename_generated_utf8);
-        gtk_window_set_title(GTK_WINDOW(msgdialog),_("Filename translation"));
-
-        gtk_dialog_run(GTK_DIALOG(msgdialog));
-        gtk_widget_destroy(msgdialog);
-        g_free(filename_generated_utf8);
-        return;
-    }
-
-    /* Build the filename with the full path or relative to old path */
-    filename_new_utf8 = ET_File_Name_Generate(ETFile,filename_generated_utf8);
-    g_free(filename_generated);
-    g_free(filename_generated_utf8);
-
-    /* Set the new filename */
-    // Create a new 'File_Name' item
-    FileName = ET_File_Name_Item_New();
-    // Save changes of the 'File_Name' item
-    ET_Set_Filename_File_Name_Item(FileName,filename_new_utf8,NULL);
-
-    ET_Manage_Changes_Of_File_Data(ETFile,FileName,NULL);
-    g_free(filename_new_utf8);
-
-    Statusbar_Message (_("New filename successfully scanned"),TRUE);
-
-    filename_new_utf8 = g_path_get_basename(((File_Name *)ETFile->FileNameNew->data)->value_utf8);
-    Log_Print (LOG_OK, _("New filename successfully scanned: %s"),
-               filename_new_utf8);
-    g_free(filename_new_utf8);
-
-    return;
-}
-
-/*
- * Build the new filename using tag + mask
- * Used also to rename the directory (from the browser)
- * @param ETFile                     : the etfile to process
- * @param mask                       : the pattern to parse
- * @param no_dir_check_or_conversion : if FALSE, disable checking of a directory
- *      in the mask, and don't convert "illegal" characters. This is used in the
- *      function "Write_Playlist" for the content of the playlist.
- * Returns filename in UTF-8
- */
-gchar *Scan_Generate_New_Filename_From_Mask (ET_File *ETFile, gchar *mask, gboolean no_dir_check_or_conversion)
-{
-    gchar *tmp;
-    gchar **source = NULL;
-    gchar *path_utf8_cur = NULL;
-    gchar *filename_new_utf8 = NULL;
-    gchar *filename_tmp = NULL;
-    GList *rename_file_list = NULL;
-    GList *l;
-    File_Mask_Item *mask_item;
-    File_Mask_Item *mask_item_prev;
-    File_Mask_Item *mask_item_next;
-    gint counter = 0;
-
-    g_return_val_if_fail (ETFile != NULL && mask != NULL, NULL);
-
-    /*
-     * Check for a directory in the mask
-     */
-    if (!no_dir_check_or_conversion)
-    {
-        if (g_path_is_absolute(mask))
-        {
-            // Absolute directory
-        }else if (strrchr(mask,G_DIR_SEPARATOR)!=NULL) // This is '/' on UNIX machines and '\' under Windows
-        {
-            // Relative path => set beginning of the path
-            path_utf8_cur = g_path_get_dirname( ((File_Name *)ETFile->FileNameCur->data)->value_utf8 );
-        }
-    }
-
-
-    /*
-     * Parse the codes to generate a list (1rst item = 1rst code)
-     */
-    while ( mask!=NULL && (tmp=strrchr(mask,'%'))!=NULL && strlen(tmp)>1 )
-    {
-        // Mask contains some characters after the code ('%b__')
-        if (strlen(tmp)>2)
-        {
-            mask_item = g_malloc0(sizeof(File_Mask_Item));
-            if (counter)
-            {
-                if (strchr(tmp+2,G_DIR_SEPARATOR))
-                    mask_item->type = DIRECTORY_SEPARATOR;
-                else
-                    mask_item->type = SEPARATOR;
-            } else
-            {
-                mask_item->type = TRAILING_SEPARATOR;
-            }
-            mask_item->string = g_strdup(tmp+2);
-            rename_file_list = g_list_prepend(rename_file_list,mask_item);
-        }
-
-        // Now, parses the code to get the corresponding string (from tag)
-        source = Scan_Return_File_Tag_Field_From_Mask_Code((File_Tag *)ETFile->FileTag->data,tmp[1]);
-        mask_item = g_malloc0(sizeof(File_Mask_Item));
-        if (source && *source && strlen(*source)>0)
-        {
-            mask_item->type = FIELD;
-            mask_item->string = g_strdup(*source);
-
-            // Replace invalid characters for this field
-            /* Do not replace characters in a playlist information field. */
-            if (!no_dir_check_or_conversion)
-            {
-                ET_File_Name_Convert_Character(mask_item->string);
-
-                if (RFS_CONVERT_UNDERSCORE_AND_P20_INTO_SPACE)
-                {
-                    Scan_Convert_Underscore_Into_Space(mask_item->string);
-                    Scan_Convert_P20_Into_Space(mask_item->string);
-                }
-                if (RFS_CONVERT_SPACE_INTO_UNDERSCORE)
-                {
-                    Scan_Convert_Space_Into_Undescore(mask_item->string);
-                }
-                if (RFS_REMOVE_SPACES)
-                {
-                    Scan_Remove_Spaces(mask_item->string);
-                }
-            }
-        }else
-        {
-            mask_item->type = EMPTY_FIELD;
-            mask_item->string = NULL;
-        }
-        rename_file_list = g_list_prepend(rename_file_list,mask_item);
-        *tmp = '\0'; // Cut parsed data of mask
-        counter++; // To indicate that we made at least one loop to identifiate 'separator' or 'trailing_separator'
-    }
-
-    // It may have some characters before the last remaining code ('__%a')
-    if (mask!=NULL && strlen(mask)>0)
-    {
-        mask_item = g_malloc0(sizeof(File_Mask_Item));
-        mask_item->type = LEADING_SEPARATOR;
-        mask_item->string = g_strdup(mask);
-        rename_file_list = g_list_prepend(rename_file_list,mask_item);
-    }
-
-    if (!rename_file_list) return NULL;
-
-    /*
-     * For Debugging : display the "rename_file_list" list
-     */
-    /***{
-        GList *list = g_list_first(rename_file_list);
-        gint i = 0;
-        g_print("## rename_file_list - start\n");
-        while (list)
-        {
-            File_Mask_Item *mask_item = (File_Mask_Item *)list->data;
-            Mask_Item_Type  type      = mask_item->type;
-            gchar          *string    = mask_item->string;
-
-            //g_print("item %d : \n",i++);
-            //g_print("  - type   : '%s'\n",type==UNKNOWN?"UNKNOWN":type==LEADING_SEPARATOR?"LEADING_SEPARATOR":type==TRAILING_SEPARATOR?"TRAILING_SEPARATOR":type==SEPARATOR?"SEPARATOR":type==DIRECTORY_SEPARATOR?"DIRECTORY_SEPARATOR":type==FIELD?"FIELD":type==EMPTY_FIELD?"EMPTY_FIELD":"???");
-            //g_print("  - string : '%s'\n",string);
-            g_print("%d -> %s (%s) | ",i++,type==UNKNOWN?"UNKNOWN":type==LEADING_SEPARATOR?"LEADING_SEPARATOR":type==TRAILING_SEPARATOR?"TRAILING_SEPARATOR":type==SEPARATOR?"SEPARATOR":type==DIRECTORY_SEPARATOR?"DIRECTORY_SEPARATOR":type==FIELD?"FIELD":type==EMPTY_FIELD?"EMPTY_FIELD":"???",string);
-
-            list = list->next;
-        }
-        g_print("\n## rename_file_list - end\n\n");
-    }***/
-
-    /*
-     * Build the new filename with items placed into the list
-     * (read the list from the end to the beginning)
-     */
-    filename_new_utf8 = g_strdup("");
-
-    for (l = g_list_last (rename_file_list); l != NULL;
-         l = g_list_previous (l))
-    {
-        File_Mask_Item *mask_item = l->data;
-
-        if ( mask_item->type==TRAILING_SEPARATOR ) // Trailing characters of mask
-        {
-            // Doesn't write it if previous field is empty
-            if (l->prev
-                && ((File_Mask_Item *)l->prev->data)->type != EMPTY_FIELD)
-            {
-                filename_tmp = filename_new_utf8;
-                filename_new_utf8 = g_strconcat(mask_item->string,filename_new_utf8,NULL);
-                g_free(filename_tmp);
-            }
-        }else
-        if ( mask_item->type==EMPTY_FIELD )
-        // We don't concatenate the field value (empty) and the previous
-        // separator (except leading separator) to the filename.
-        // If the empty field is the 'first', we don't concatenate it, and the
-        // next separator too.
-        {
-            if (l->prev)
-            {
-                // The empty field isn't the first.
-                // If previous string is a separator, we don't use it, except if the next
-                // string is a FIELD (not empty)
-                mask_item_prev = l->prev->data;
-                if ( mask_item_prev->type==SEPARATOR )
-                {
-                    if (!(l->next
-                        && (mask_item_next = rename_file_list->next->data)
-                        && mask_item_next->type == FIELD))
-                    {
-                        l = l->prev;
-                    }
-                }
-            }else
-            if (l->next && (mask_item_next = l->next->data)
-                && mask_item_next->type == SEPARATOR)
-            // We are at the 'beginning' of the mask (so empty field is the first)
-            // and next field is a separator. As the separator may have been already added, we remove it
-            {
-                if ( filename_new_utf8 && mask_item_next->string && (strncmp(filename_new_utf8,mask_item_next->string,strlen(mask_item_next->string))==0) ) // To avoid crash if filename_new_utf8 is 'empty'
-                {
-                    filename_tmp = filename_new_utf8;
-                    filename_new_utf8 = g_strdup(filename_new_utf8+strlen(mask_item_next->string));
-                    g_free(filename_tmp);
-                 }
-            }
-
-        }else // SEPARATOR, FIELD, LEADING_SEPARATOR, DIRECTORY_SEPARATOR
-        {
-            filename_tmp = filename_new_utf8;
-            filename_new_utf8 = g_strconcat(mask_item->string,filename_new_utf8,NULL);
-            g_free(filename_tmp);
-        }
-    }
-
-    // Free the list
-    Scan_Free_File_Rename_List(rename_file_list);
-
-
-    // Add current path if relative path entered
-    if (path_utf8_cur)
-    {
-        filename_tmp = filename_new_utf8; // in UTF-8!
-        filename_new_utf8 = g_strconcat(path_utf8_cur,G_DIR_SEPARATOR_S,filename_new_utf8,NULL);
-        g_free(filename_tmp);
-        g_free(path_utf8_cur);
-    }
-
-    return filename_new_utf8; // in UTF-8!
-}
-
-void Scan_Rename_File_Generate_Preview (void)
-{
-    gchar *preview_text = NULL;
-    gchar *mask = NULL;
-
-    if (!ETCore->ETFileDisplayed
-    ||  !ScannerWindow || !RenameFileMaskCombo || !RenameFilePreviewLabel)
-        return;
-
-    if (gtk_combo_box_get_active(GTK_COMBO_BOX(ScannerOptionCombo)) != SCANNER_RENAME_FILE)
-        return;
-
-    mask = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(RenameFileMaskCombo)))));
-    if (!mask)
-        return;
-
-    preview_text = Scan_Generate_New_Filename_From_Mask(ETCore->ETFileDisplayed,mask,FALSE);
-
-    if (GTK_IS_LABEL(RenameFilePreviewLabel))
-    {
-        if (preview_text)
-        {
-            //gtk_label_set_text(GTK_LABEL(RenameFilePreviewLabel),preview_text);
-            gchar *tmp_string = g_markup_printf_escaped("%s",preview_text); // To avoid problem with strings containing characters like '&'
-            gchar *str = g_strdup_printf("<i>%s</i>",tmp_string);
-            gtk_label_set_markup(GTK_LABEL(RenameFilePreviewLabel),str);
-            g_free(tmp_string);
-            g_free(str);
-        } else
-        {
-            gtk_label_set_text(GTK_LABEL(RenameFilePreviewLabel),"");
-        }
-
-        // Force the window to be redrawed
-        gtk_widget_queue_resize(ScannerWindow);
-    }
-
-    g_free(mask);
-    g_free(preview_text);
-}
-
-
-static void
-Scan_Free_File_Rename_List (GList *list)
-{
-    GList *l;
-
-    for (l = list; l != NULL; l = g_list_next (l))
-    {
-        if (l->data)
-        {
-            g_free (((File_Mask_Item *)l->data)->string);
-            g_free ((File_Mask_Item *)l->data);
-        }
-    }
-
-    g_list_free (list);
-}
-
-/*
- * Adds the current path of the file to the mask on the "Rename File Scanner" entry
- */
-static void
-Scan_Rename_File_Prefix_Path (void)
-{
-    gint pos;
-    gchar *path_tmp;
-    const gchar *combo_text = NULL;
-    gchar *combo_tmp;
-    ET_File *ETFile          = ETCore->ETFileDisplayed;
-    gchar *filename_utf8_cur = ((File_Name *)ETFile->FileNameCur->data)->value_utf8;
-    gchar *path_utf8_cur;
-
-
-    // The path to prefix
-    path_utf8_cur = g_path_get_dirname(filename_utf8_cur);
-
-    // The current text in the combobox
-    combo_text = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(RenameFileMaskCombo))));
-    /*if (!g_utf8_validate(combo_text, -1, NULL))
-    {
-        combo_tmp = convert_to_utf8(combo_text);
-    }else
-    {
-        combo_tmp = g_strdup(combo_text);
-    }*/
-    combo_tmp = Try_To_Validate_Utf8_String(combo_text);
-
-    // If the path already exists we don't add it again
-    // Use g_utf8_collate_key instead of strncmp
-    if (combo_tmp && path_utf8_cur && strncmp(combo_tmp,path_utf8_cur,strlen(path_utf8_cur))!=0)
-    {
-        if (g_path_is_absolute(combo_tmp))
-        {
-            path_tmp = g_strdup(path_utf8_cur);
-        } else
-        {
-            path_tmp = g_strconcat(path_utf8_cur,G_DIR_SEPARATOR_S,NULL);
-        }
-	pos = 0;
-        gtk_editable_insert_text(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(RenameFileMaskCombo))),path_tmp, -1, &pos);
-        g_free(path_tmp);
-    }
-
-    g_free(path_utf8_cur);
-}
-
-
-/*******************************
- * Scanner To Rename Directory *
- *******************************/
-void Scan_Rename_Directory_Generate_Preview (void)
-{
-    gchar *preview_text = NULL;
-    gchar *mask = NULL;
-
-    if (!ETCore->ETFileDisplayed
-    ||  !RenameDirectoryWindow || !RenameDirectoryMaskCombo || !RenameDirectoryPreviewLabel)
-        return;
-
-    mask = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(RenameDirectoryMaskCombo)))));
-    if (!mask)
-        return;
-
-    preview_text = Scan_Generate_New_Filename_From_Mask(ETCore->ETFileDisplayed,mask,FALSE);
-
-    if (GTK_IS_LABEL(RenameDirectoryPreviewLabel))
-    {
-        if (preview_text)
-        {
-            //gtk_label_set_text(GTK_LABEL(RenameFilePreviewLabel),preview_text);
-            gchar *tmp_string = g_markup_printf_escaped("%s",preview_text); // To avoid problem with strings containing characters like '&'
-            gchar *str = g_strdup_printf("<i>%s</i>",tmp_string);
-            gtk_label_set_markup(GTK_LABEL(RenameDirectoryPreviewLabel),str);
-            g_free(tmp_string);
-            g_free(str);
-        } else
-        {
-            gtk_label_set_text(GTK_LABEL(RenameDirectoryPreviewLabel),"");
-        }
-
-        // Force the window to be redrawed else the preview label may be not placed correctly
-        gtk_widget_queue_resize(RenameDirectoryWindow);
-    }
-
-    g_free(mask);
-    g_free(preview_text);
-}
-
-gchar *Scan_Generate_New_Directory_Name_From_Mask (ET_File *ETFile, gchar *mask, gboolean no_dir_check_or_conversion)
-{
-    return Scan_Generate_New_Filename_From_Mask(ETFile,mask,no_dir_check_or_conversion);
-}
-
-
-
-/*****************************
- * Scanner To Process Fields *
- *****************************/
-/* See also functions : Convert_P20_And_Undescore_Into_Spaces, ... in easytag.c */
-static void
-Scan_Process_Fields (ET_File *ETFile)
-{
-    File_Name *FileName = NULL;
-    File_Tag  *FileTag  = NULL;
-    File_Name *st_filename;
-    File_Tag  *st_filetag;
-    gchar     *filename_utf8;
-    gchar     *string;
-
-    g_return_if_fail (ScannerWindow != NULL || ETFile != NULL);
-
-    st_filename = (File_Name *)ETFile->FileNameNew->data;
-    st_filetag  = (File_Tag  *)ETFile->FileTag->data;
-
-    /* Process the filename */
-    if (st_filename != NULL)
-    {
-        if (st_filename->value_utf8 && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFileNameField)))
-        {
-            gchar *string_utf8;
-            gchar *pos;
-
-            filename_utf8 = st_filename->value_utf8;
-
-            if (!FileName)
-                FileName = ET_File_Name_Item_New();
-
-            string = g_path_get_basename(filename_utf8);
-            // Remove the extension to set it to lower case (to avoid problem with undo)
-            if ((pos=strrchr(string,'.'))!=NULL) *pos = 0;
-
-            Scan_Process_Fields_Functions(&string);
-
-            string_utf8 = ET_File_Name_Generate(ETFile,string);
-            ET_Set_Filename_File_Name_Item(FileName,string_utf8,NULL);
-            g_free(string_utf8);
-            g_free(string);
-        }
-    }
-
-    /* Process data of the tag */
-    if (st_filetag != NULL)
-    {
-        // Title field
-        if (st_filetag->title && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessTitleField)))
-        {
-            if (!FileTag)
-            {
-                FileTag = ET_File_Tag_Item_New();
-                ET_Copy_File_Tag_Item(ETFile,FileTag);
-            }
-
-            string = g_strdup(st_filetag->title);
-
-            Scan_Process_Fields_Functions(&string);
-
-            ET_Set_Field_File_Tag_Item(&FileTag->title,string);
-
-            g_free(string);
-        }
-
-        // Artist field
-        if (st_filetag->artist && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessArtistField)))
-        {
-            if (!FileTag)
-            {
-                FileTag = ET_File_Tag_Item_New();
-                ET_Copy_File_Tag_Item(ETFile,FileTag);
-            }
-
-            string = g_strdup(st_filetag->artist);
-
-            Scan_Process_Fields_Functions(&string);
-
-            ET_Set_Field_File_Tag_Item(&FileTag->artist,string);
-
-            g_free(string);
-        }
-
-		// Album Artist field
-        if (st_filetag->album_artist && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessAlbumArtistField)))
-        {
-            if (!FileTag)
-            {
-                FileTag = ET_File_Tag_Item_New();
-                ET_Copy_File_Tag_Item(ETFile,FileTag);
-            }
-
-            string = g_strdup(st_filetag->album_artist);
-
-            Scan_Process_Fields_Functions(&string);
-
-            ET_Set_Field_File_Tag_Item(&FileTag->album_artist,string);
-
-            g_free(string);
-        }
-        // Album field
-        if (st_filetag->album && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessAlbumField)))
-        {
-            if (!FileTag)
-            {
-                FileTag = ET_File_Tag_Item_New();
-                ET_Copy_File_Tag_Item(ETFile,FileTag);
-            }
-
-            string = g_strdup(st_filetag->album);
-
-            Scan_Process_Fields_Functions(&string);
-
-            ET_Set_Field_File_Tag_Item(&FileTag->album,string);
-
-            g_free(string);
-        }
-
-        // Genre field
-        if (st_filetag->genre && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessGenreField)))
-        {
-            if (!FileTag)
-            {
-                FileTag = ET_File_Tag_Item_New();
-                ET_Copy_File_Tag_Item(ETFile,FileTag);
-            }
-
-            string = g_strdup(st_filetag->genre);
-
-            Scan_Process_Fields_Functions(&string);
-
-            ET_Set_Field_File_Tag_Item(&FileTag->genre,string);
-
-            g_free(string);
-        }
-
-        // Comment field
-        if (st_filetag->comment && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessCommentField)))
-        {
-            if (!FileTag)
-            {
-                FileTag = ET_File_Tag_Item_New();
-                ET_Copy_File_Tag_Item(ETFile,FileTag);
-            }
-
-            string = g_strdup(st_filetag->comment);
-
-            Scan_Process_Fields_Functions(&string);
-
-            ET_Set_Field_File_Tag_Item(&FileTag->comment,string);
-
-            g_free(string);
-        }
-
-        // Composer field
-        if (st_filetag->composer && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessComposerField)))
-        {
-            if (!FileTag)
-            {
-                FileTag = ET_File_Tag_Item_New();
-                ET_Copy_File_Tag_Item(ETFile,FileTag);
-            }
-
-            string = g_strdup(st_filetag->composer);
-
-            Scan_Process_Fields_Functions(&string);
-
-            ET_Set_Field_File_Tag_Item(&FileTag->composer,string);
-
-            g_free(string);
-        }
-
-        // Original artist field
-        if (st_filetag->orig_artist && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessOrigArtistField)))
-        {
-            if (!FileTag)
-            {
-                FileTag = ET_File_Tag_Item_New();
-                ET_Copy_File_Tag_Item(ETFile,FileTag);
-            }
-
-            string = g_strdup(st_filetag->orig_artist);
-
-            Scan_Process_Fields_Functions(&string);
-
-            ET_Set_Field_File_Tag_Item(&FileTag->orig_artist,string);
-
-            g_free(string);
-        }
-
-        // Copyright field
-        if (st_filetag->copyright && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessCopyrightField)))
-        {
-            if (!FileTag)
-            {
-                FileTag = ET_File_Tag_Item_New();
-                ET_Copy_File_Tag_Item(ETFile,FileTag);
-            }
-
-            string = g_strdup(st_filetag->copyright);
-
-            Scan_Process_Fields_Functions(&string);
-
-            ET_Set_Field_File_Tag_Item(&FileTag->copyright,string);
-
-            g_free(string);
-        }
-
-        // URL field
-        if (st_filetag->url && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessURLField)))
-        {
-            if (!FileTag)
-            {
-                FileTag = ET_File_Tag_Item_New();
-                ET_Copy_File_Tag_Item(ETFile,FileTag);
-            }
-
-            string = g_strdup(st_filetag->url);
-
-            Scan_Process_Fields_Functions(&string);
-
-            ET_Set_Field_File_Tag_Item(&FileTag->url,string);
-
-            g_free(string);
-        }
-
-        // 'Encoded by' field
-        if (st_filetag->encoded_by && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessEncodedByField)))
-        {
-            if (!FileTag)
-            {
-                FileTag = ET_File_Tag_Item_New();
-                ET_Copy_File_Tag_Item(ETFile,FileTag);
-            }
-
-            string = g_strdup(st_filetag->encoded_by);
-
-            Scan_Process_Fields_Functions(&string);
-
-            ET_Set_Field_File_Tag_Item(&FileTag->encoded_by,string);
-
-            g_free(string);
-        }
-    }
-
-    if (FileName && FileTag)
-    {
-        // Synchronize undo key of the both structures (used for the
-        // undo functions, as they are generated as the same time)
-        FileName->key = FileTag->key;
-    }
-    ET_Manage_Changes_Of_File_Data(ETFile,FileName,FileTag);
-
-}
-
-
-static void
-Scan_Process_Fields_Functions (gchar **string)
-{
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsConvertIntoSpace)))
-    {
-        Scan_Convert_Underscore_Into_Space(*string);
-        Scan_Convert_P20_Into_Space(*string);
-    }
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsConvertSpace)))
-        Scan_Convert_Space_Into_Undescore(*string);
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsInsertSpace)))
-        Scan_Process_Fields_Insert_Space(string);
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsOnlyOneSpace)))
-        Scan_Process_Fields_Keep_One_Space(*string);
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsConvert)))
-        Scan_Convert_Character(string);
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsAllUppercase)))
-        Scan_Process_Fields_All_Uppercase(*string);
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsAllDowncase)))
-        Scan_Process_Fields_All_Downcase(*string);
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsFirstLetterUppercase)))
-         Scan_Process_Fields_Letter_Uppercase(*string);
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsFirstLettersUppercase)))
-        Scan_Process_Fields_First_Letters_Uppercase(*string);
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsRemoveSpace)))
-        Scan_Process_Fields_Remove_Space(*string);
-
-}
-
-void Scan_Process_Fields_All_Uppercase (gchar *string)
-{
-    gchar *temp;
-    gchar temp2[6]; // Must have at least 6 bytes of space
-    gunichar c;
-
-    for (temp = string; *temp; temp = g_utf8_next_char(temp))
-    {
-        c = g_utf8_get_char(temp);
-        if (g_unichar_islower(c))
-            strncpy(temp, temp2, g_unichar_to_utf8(g_unichar_toupper(c), temp2));
-    }
-}
-
-void Scan_Process_Fields_All_Downcase (gchar *string)
-{
-    gchar *temp;
-    gchar temp2[6];
-    gunichar c;
-
-    for (temp = string; *temp; temp = g_utf8_next_char(temp))
-    {
-        c = g_utf8_get_char(temp);
-        if (g_unichar_isupper(c))
-            strncpy(temp, temp2, g_unichar_to_utf8(g_unichar_tolower(c), temp2));
-    }
-}
-
-void Scan_Process_Fields_Letter_Uppercase (gchar *string)
-{
-    gchar *temp;
-    gchar temp2[6];
-    gboolean set_to_upper_case = TRUE;
-    gunichar c;
-    gchar utf8_character[6];
-    gchar *word, *word1, *word2;
-
-    for (temp = string; *temp; temp = g_utf8_next_char(temp))
-    {
-        c = g_utf8_get_char(temp);
-        if (set_to_upper_case && g_unichar_islower(c))
-            strncpy(temp, temp2, g_unichar_to_utf8(g_unichar_toupper(c), temp2));
-        else if (!set_to_upper_case && g_unichar_isupper(c))
-            strncpy(temp, temp2, g_unichar_to_utf8(g_unichar_tolower(c), temp2));
-        set_to_upper_case = FALSE; // After the first time, all will be down case
-    }
-
-    temp = string;
-
-    // Uppercase again the word 'I' in english
-    while ( temp )
-    {
-        word = temp; // Needed if there is only one word
-        word1 = g_utf8_strchr(temp,-1,' ');
-        word2 = g_utf8_strchr(temp,-1,'_');
-
-        // Take the first string found (near beginning of string)
-        if (word1 && word2)
-            word = MIN(word1,word2);
-        else if (word1)
-            word = word1;
-        else if (word2)
-            word = word2;
-        else
-            // Last word of the string
-            break;
-
-        // Go to first character of the word (char. after ' ' or '_')
-        word = word+1;
-
-        // Set uppercase word 'I'
-        if (g_ascii_strncasecmp("I ", word, strlen("I ")) == 0)
-        {
-            c = g_utf8_get_char(word);
-            strncpy(word, utf8_character, g_unichar_to_utf8(g_unichar_toupper(c), utf8_character));
-        }
-
-        temp = word;
-    }
-}
-
-/*
- * 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)
-{
-/**** DANIEL TEST *****
-    gchar *iter;
-    gchar utf8_character[6];
-    gboolean set_to_upper_case = TRUE;
-    gunichar c;
-
-    for (iter = text; *iter; iter = g_utf8_next_char(iter))
-    {
-        c = g_utf8_get_char(iter);
-        if (set_to_upper_case && g_unichar_islower(c))
-            strncpy(iter, utf8_character, g_unichar_to_utf8(g_unichar_toupper(c), utf8_character));
-        else if (!set_to_upper_case && g_unichar_isupper(c))
-            strncpy(iter, utf8_character, g_unichar_to_utf8(g_unichar_tolower(c), utf8_character));
-
-        set_to_upper_case = (g_unichar_isalpha(c)
-                            || c == (gunichar)'.'
-                            || c == (gunichar)'\''
-                            || c == (gunichar)'`') ? FALSE : TRUE;
-    }
-****/
-/**** Barış Çiçek version ****/
-    gchar *word, *word1, *word2, *temp;
-    gint i, len;
-    gchar utf8_character[6];
-    gunichar c;
-    gboolean set_to_upper_case, set_to_upper_case_tmp;
-    // There have to be space at the end of words to seperate them from prefix
-    // Chicago Manual of Style "Heading caps" Capitalization Rules (CMS 1993, 282) (http://www.docstyles.com/cmscrib.htm#Note2)
-    const gchar * exempt[] =
-    {
-        "a ",       "a_",
-        "against ", "against_",
-        "an ",      "an_",
-        "and ",     "and_",
-        "at ",      "at_",
-        "between ", "between_",
-        "but ",     "but_",
-        //"feat. ",   "feat._", // Removed by Slash Bunny
-        "for ",     "for_",
-        "in ",      "in_",
-        "nor ",     "nor_",
-        "of ",      "of_",
-        //"off ",     "off_",   // Removed by Slash Bunny
-        "on ",      "on_",
-        "or ",      "or_",
-        //"over ",    "over_",  // Removed by Slash Bunny
-        "so ",      "so_",
-        "the ",     "the_",
-        "to ",      "to_",
-        "with ",    "with_",
-        "yet ",     "yet_",
-        NULL
-    };
-
-    if (!PFS_DONT_UPPER_SOME_WORDS)
-    {
-        exempt[0] = NULL;
-    }
-    Scan_Process_Fields_All_Downcase(string);
-
-    if (!g_utf8_validate(string,-1,NULL))
-    {
-        Log_Print(LOG_ERROR,"Scan_Process_Fields_First_Letters_Uppercase: Not a valid utf8! quiting");
-        return;
-    }
-    // Removes trailing whitespace
-    string = g_strchomp(string);
-
-    temp = string;
-
-    // If the word is a roman numeral, capitalize all of it
-    if ((len = Scan_Word_Is_Roman_Numeral(temp)))
-    {
-        gchar *tmp = g_utf8_strup (temp, len);
-        strncpy (string, tmp, len);
-        g_free (tmp);
-    } else
-    {
-        // Set first character to uppercase
-        c = g_utf8_get_char(temp);
-        strncpy(string, utf8_character, g_unichar_to_utf8(g_unichar_toupper(c), utf8_character));
-    }
-
-    // Uppercase first character of each word, except for 'exempt[]' words lists
-    while ( temp )
-    {
-        word = temp; // Needed if there is only one word
-        word1 = g_utf8_strchr(temp,-1,' ');
-        word2 = g_utf8_strchr(temp,-1,'_');
-
-        // Take the first string found (near beginning of string)
-        if (word1 && word2)
-            word = MIN(word1,word2);
-        else if (word1)
-            word = word1;
-        else if (word2)
-            word = word2;
-        else
-        {
-            // Last word of the string: the first letter is always uppercase,
-            // even if it's in the exempt list. This is a Chicago Manual of Style rule.
-            // Last Word In String - Should Capitalize Regardless of Word (Chicago Manual of Style)
-            c = g_utf8_get_char(word);
-            strncpy(word, utf8_character, g_unichar_to_utf8(g_unichar_toupper(c), utf8_character));
-            break;
-        }
-
-        // Go to first character of the word (char. after ' ' or '_')
-        word = word+1;
-
-        // If the word is a roman numeral, capitalize all of it
-        if ((len = Scan_Word_Is_Roman_Numeral(word)))
-        {
-            gchar *tmp = g_utf8_strup (temp, len);
-            strncpy (string, tmp, len);
-            g_free (tmp);
-        } else
-        {
-            // Set uppercase the first character of this word
-            c = g_utf8_get_char(word);
-            strncpy(word, utf8_character, g_unichar_to_utf8(g_unichar_toupper(c), utf8_character));
-
-            // Set lowercase the first character of this word if found in the exempt words list
-            for (i=0; exempt[i]!=NULL; i++)
-            {
-                if (g_ascii_strncasecmp(exempt[i], word, strlen(exempt[i])) == 0)
-                {
-                    c = g_utf8_get_char(word);
-                    strncpy(word, utf8_character, g_unichar_to_utf8(g_unichar_tolower(c), utf8_character));
-                    break;
-                }
-            }
-        }
-
-        temp = word;
-    }
-
-    // Uppercase letter placed after some characters like '(', '[', '{'
-    set_to_upper_case = FALSE;
-    for (temp = string; *temp; temp = g_utf8_next_char(temp))
-    {
-        c = g_utf8_get_char(temp);
-        set_to_upper_case_tmp = (  c == (gunichar)'('
-                                || c == (gunichar)'['
-                                || c == (gunichar)'{'
-                                || c == (gunichar)'"'
-                                || c == (gunichar)':'
-                                || c == (gunichar)'.'
-                                || c == (gunichar)'`'
-                                || c == (gunichar)'-'
-                                ) ? TRUE : FALSE;
-
-        if (set_to_upper_case && g_unichar_islower(c))
-            strncpy(temp, utf8_character, g_unichar_to_utf8(g_unichar_toupper(c), utf8_character));
-
-        set_to_upper_case = set_to_upper_case_tmp;
-    }
-
-}
-
-void Scan_Process_Fields_Remove_Space (gchar *string)
-{
-    gchar *tmp, *tmp1;
-
-    tmp = tmp1 = string;
-
-    while (*tmp)
-    {
-        while (*tmp == ' ')
-            tmp++;
-        if (*tmp)
-            *(tmp1++) = *(tmp++);
-    }
-    *tmp1 = '\0';
-}
-
-/*
- * The function inserts a space before an uppercase letter
- * It is needed to realloc the memory!
- */
-void Scan_Process_Fields_Insert_Space (gchar **string)
-{
-    gchar *iter;
-    gunichar c;
-    gint j;
-    guint string_length;
-    gchar *string1;
-
-    // FIX ME : we suppose that it will not grow more than 2 times its size...
-    string_length = 2 * strlen(*string);
-    //string1 = g_realloc(*string, string_length+1);
-    string1       = g_malloc(string_length+1);
-    strncpy(string1,*string,string_length);
-    string1[string_length]='\0';
-    g_free(*string);
-    *string = string1;
-
-    for (iter = g_utf8_next_char(*string); *iter; iter = g_utf8_next_char(iter)) // At start : g_utf8_next_char to not consider first "uppercase" letter
-    {
-        c = g_utf8_get_char(iter);
-
-        if (g_unichar_isupper(c))
-        {
-            for (j = strlen(iter); j > 0; j--)
-                *(iter + j) = *(iter + j - 1);
-            *iter = ' ';
-            iter++;
-        }
-    }
-}
-
-/*
- * The function removes the duplicated spaces
- * No need to reallocate
- */
-void Scan_Process_Fields_Keep_One_Space (gchar *string)
-{
-    gchar *tmp, *tmp1;
-
-    tmp = tmp1 = string;
-
-    // Remove multiple consecutive underscores and spaces.
-    while (*tmp1)
-    {
-        while (*tmp1 && *tmp1 != ' ' && *tmp1 != '_')
-            *(tmp++) = *(tmp1++);
-        if (!*tmp1)
-            break;
-        *(tmp++) = *(tmp1++);
-        while (*tmp1 == ' ' || *tmp1 == '_')
-            tmp1++;
-    }
-    *tmp = '\0';
-}
-
-/*
- * Function to replace underscore '_' by a space
- * No need to reallocate
- */
-void Scan_Convert_Underscore_Into_Space (gchar *string)
-{
-    gchar *tmp;
-
-    while ((tmp=strchr(string,'_'))!=NULL)
-        *tmp = ' ';
-}
-
-/*
- * Function to replace %20 by a space
- * No need to reallocate
- */
-void Scan_Convert_P20_Into_Space (gchar *string)
-{
-    gchar *tmp, *tmp1;
-
-    while ((tmp=strstr(string,"%20"))!=NULL)
-    {
-        tmp1 = tmp + 3;
-        *(tmp++) = ' ';
-        while (*tmp1)
-            *(tmp++) = *(tmp1++);
-        *tmp = '\0';
-    }
-}
-
-/*
- * Function to remove spaces
- * No need to reallocate
- */
-void Scan_Remove_Spaces (gchar *string)
-{
-  int nextnotspace = 0, pos = 0;
-
-  while(string[pos] != '\0')
-  {
-    if(string[pos] == ' ')
-    {
-      nextnotspace = pos;
-      while(string[++nextnotspace] == ' ');
-      string[pos] = string[nextnotspace];
-      string[nextnotspace] = ' ';
-      continue;
-    }
-    pos++;
-  }
-}
-
-/*
- * Function to replace space by '_'
- * No need to reallocate
- */
-void Scan_Convert_Space_Into_Undescore (gchar *string)
-{
-    gchar *tmp;
-
-    while ((tmp=strchr(string,' '))!=NULL)
-        *tmp = '_';
-}
-
-/*
- * Replace something with something else ;)
- * Here use Regular Expression, to search and replace.
- */
-static void
-Scan_Convert_Character (gchar **string)
-{
-    gchar *from;
-    gchar *to;
-    GRegex *regex;
-    GError *regex_error = NULL;
-    gchar *new_string;
-
-    from = gtk_editable_get_chars (GTK_EDITABLE (ProcessFieldsConvertFrom), 0,
-                                 -1);
-    to = gtk_editable_get_chars (GTK_EDITABLE (ProcessFieldsConvertTo), 0, -1);
-
-    regex = g_regex_new (from, 0, 0, &regex_error);
-    if (regex_error != NULL)
-    {
-        goto handle_error;
-    }
-
-    new_string = g_regex_replace (regex, *string, -1, 0, to, 0, &regex_error);
-    if (regex_error != NULL)
-    {
-        g_free (new_string);
-        g_regex_unref (regex);
-        goto handle_error;
-    }
-
-    /* Success. */
-    g_regex_unref (regex);
-    g_free (*string);
-    *string = new_string;
-
-out:
-    g_free (from);
-    g_free (to);
-    return;
-
-handle_error:
-    Log_Print (LOG_ERROR, _("Error while processing fields: %s"),
-               regex_error->message);
-
-    g_error_free (regex_error);
-
-    goto out;
-}
-
-/*
- * Quick roman numeral check (non-roman numerals may also return true)
- * Patch from Slash Bunny (2007.08.12)
- * (http://home.hiwaay.net/~lkseitz/math/roman/numerals.shtml)
- *    I = 1    (one)
- *    V = 5    (five)
- *    X = 10   (ten)
- *    L = 50   (fifty)
- *    C = 100  (one hundred)
- *    D = 500  (five hundred)
- *    M = 1000 (one thousand)
- */
-static gint
-Scan_Word_Is_Roman_Numeral (const gchar *text)
-{
-    const gchar *tmp;
-    gint  len;
-    gchar *buf = NULL;
-    gint   rn_int;
-    gchar *rn_char;
-
-    if (!ScannerWindow
-    ||  !ProcessFieldsDetectRomanNumerals
-    ||  !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsDetectRomanNumerals)))
-        return 0;
-    
-    tmp = text;
-    len = 0;
-
-    while (*tmp)
-    {
-        if (*tmp == (gunichar)'i'
-        ||  *tmp == (gunichar)'v'
-        ||  *tmp == (gunichar)'x'
-        ||  *tmp == (gunichar)'l'
-        ||  *tmp == (gunichar)'c'
-        ||  *tmp == (gunichar)'d'
-        ||  *tmp == (gunichar)'m')
-        {
-            // Found a roman numeral => continue
-            tmp++;
-            len++;
-        } else if (*tmp == ' '
-               ||  *tmp == '_'
-               ||  *tmp == '.'
-               ||  *tmp == ','
-               ||  *tmp == '-')
-        {
-            // A separator was found => end of word
-            // Check if it is a valid roman numeral
-            goto roman_numeral_found;
-            
-        } else
-        {
-            return 0;
-        }
-    }
-
-    // Found in last word of the string
-    
-roman_numeral_found:
-    // Check if it is a valid roman numeral
-    buf = g_strndup(text,len);
-    rn_int = roman2int(buf); // Convert the Roman numeral string to integer
-    
-    if (rn_int >= 0 )
-    {
-        // Some strings as "IIIII" or "CCCCC" are returned as valid, which is not correct...
-        // Same problem with: IC MIC IM MIM IL CIL XM MXM VC MVC VM MVM VL MVL LC MLC LD MLD LM MLM MDM 
-        // So we convert it again to a string, and compare to the initial one.
-        rn_char = (gchar *)int2roman(rn_int); // Convert the Roman numeral integer to string
-        if (rn_char
-        && strcasecmp(buf,rn_char)==0)
-        {
-            g_free(buf);
-            g_free(rn_char);
-            return len; // Roman numeral valid
-        }else
-        {
-            g_free(buf);
-            g_free(rn_char);
-            return 0;
-        }
-    }else
-    {
-        g_free(buf);
-        return 0;
-    }
-}
-
-
-
-/*
- * Taken from :
- *   Roman Numeral Conversion API (http://sourceforge.net/project/showfiles.php?group_id=211070)
- *    Copyright (c) 2007 David M. Syzdek <roman-project at syzdek.net>
- */
-/* Convert Roman numeral from integer to string */
-static const char *
-int2roman (int num)
-{
-    #define ROMAN_BUFF_LEN 512
-    
-    /* buffer for storing conversions */
-    char roman_string[ROMAN_BUFF_LEN];
-
-    /* wrap long2roman_r() with library buffer */
-    char *result = int2roman_r(num, roman_string, ROMAN_BUFF_LEN);
-   
-    if (!result)
-         return NULL;
-    return g_strdup(roman_string);
-}
-
-static char *
-int2roman_r (int num, char * str, size_t len)
-{
-   // local variables
-   unsigned pos;
-   unsigned u;
-   unsigned dividend;
-
-   g_return_val_if_fail (str != NULL, NULL);
-
-   // verify that number is withing boundaries
-   if ((num > 5000) || (num < 0))
-   {
-      return NULL;
-   };
-
-   // sets initial values
-   pos = 0;
-   memset(str, 0, len);
-   len--;
-
-   // checks for nullae
-   if (!(num))
-   {
-      str[0] = 'N';
-      return str;
-   };
-
-   // calculates thousands
-   dividend = num/1000;
-   if (dividend > (len-1))
-   {
-      return NULL;
-   };
-   for (u = 0; u < dividend; u++)
-      str[pos+u] = 'M';
-   num %= 1000;
-   pos += u;
-
-   // calculates hundreds
-   dividend = num/100;
-   if (dividend > (len-1-pos))
-   {
-      return NULL;
-   };
-   if (dividend == 9)
-   {
-      str[pos+0] = 'C';
-      str[pos+1] = 'M';
-      pos += 2;
-      dividend = 0;
-   };
-   if (dividend >= 5)
-   {
-      str[pos] = 'D';
-      dividend -= 5;
-      pos++;
-   };
-   if (dividend == 4)
-   {
-      str[pos+0] = 'C';
-      str[pos+1] = 'D';
-      dividend -= 4;
-      pos += 2;
-   };
-   for(u = 0; u < dividend; u++)
-      str[pos+u] = 'C';
-   pos += u;
-   num %= 100;
-
-   // calculates tens
-   dividend = num/10;
-   if (dividend > (len-1-pos))
-   {
-      return NULL;
-   };
-   if (dividend == 9)
-   {
-      str[pos+0] = 'X';
-      str[pos+1] = 'C';
-      dividend = 0;
-      pos += 2;
-   };
-   if (dividend >= 5)
-   {
-      str[pos+0] = 'L';
-      dividend -= 5;
-      pos++;
-   };
-   if (dividend == 4)
-   {
-      str[pos+0] = 'X';
-      str[pos+1] = 'L';
-      pos += 2;
-      dividend -= 4;
-   };
-   for (u = 0; u < dividend; u++)
-      str[pos+u] = 'X';
-   pos += u;
-   num %= 10;
-
-   // calculates ones
-   dividend = num;
-   if (dividend > (len-1-pos))
-   {
-      return NULL;
-   };
-   if (dividend == 9)
-   {
-      str[pos+0] = 'I';
-      str[pos+1] = 'X';
-      dividend = 0;
-      pos += 2;
-   };
-   if (dividend >= 5)
-   {
-      str[pos+0] = 'V';
-      dividend -= 5;
-      pos++;
-   };
-   if (dividend == 4)
-   {
-      str[pos+0] = 'I';
-      str[pos+1] = 'V';
-      pos += 2;
-      dividend -= 4;
-   };
-   for(u = 0; u < dividend; u++)
-      str[pos+u] = 'I';
-
-   /* ends function */
-   return str;
-}
-
-/* Convert Roman numeral from string to integer */
-static int
-roman2int (const char *str)
-{
-   // declares local vars
-   int      num;
-   unsigned i;
-   unsigned len;
-   unsigned last;
-   unsigned prevlast;
-
-   // checks args
-   if (!(str))
-   {
-      return(0);
-   };
-
-   // sets initial values 
-   num  = 0;
-   len  = strlen(str);
-   last = 1000;
-   prevlast = 1000;
-
-   // loops through characters
-   for(i = 0; i < len; i++)
-   {
-      switch(str[i])
-      {
-         case 'n':
-         case 'N':
-            if (strlen(str) > 1)
-            {
-               return(-1);
-            };
-            return(0);
-            break;
-         case 'i':
-         case 'I':
-            num  += 1;
-            // prevent patterns like IXI
-            if ((prevlast == 1) && (last != 1))
-            {
-               return(-1);
-            };
-            // prevent patterns like IIIII and VIIIII
-            if ((!(num%5)) || (!(num%10)))
-            {
-              return(-1);
-            };
-            // rotates value into history
-            prevlast   = last;
-            last  = 1;
-            break;
-         case 'v':
-         case 'V':
-            num += 5;
-            // tests for invalid syntax
-            if ( ((last <= 5) && (last != 1)) || (prevlast <= 5) )
-            {
-               return(-1);
-            }
-            // applies subtraction method & rotates value into history
-            if (last < 5)
-               num -= (last * 2);
-            prevlast  = last;
-            last = 5;
-            break;
-         case 'x':
-         case 'X':
-            num += 10;
-            // tests for invalid syntax
-            if ( ((prevlast < 10) && (last <= 10)) || ((last < 10) && (last != 1)) )
-            {
-               return(-1);
-            };
-            // prevent patterns like XXXXX and VXXXXX
-            if ((!(num%50)) || (!(num%100)))
-            {
-               return(-1);
-            };
-            // applies subtraction method & rotates value into history
-            if (last == 1)
-               num -= (last * 2);
-            prevlast  = last;
-            last = 10;
-            break;
-         case 'l':
-         case 'L':
-            num += 50;
-            // tests for invalid syntax
-            if ( ((last <= 50) && (last != 10)) || (prevlast <= 50) )
-            {
-               return(-1);
-            }
-            // applies subtraction method & rotates value into history
-            if (last < 50)
-               num -= (last * 2);
-            prevlast  = last;
-            last = 50;
-            break;
-         case 'c':
-         case 'C':
-            num += 100;
-            // tests for invalid syntax
-            if ( ((prevlast < 100) && (last <= 100)) || ((last < 100) && (last != 10)) )
-            {
-               return(-1);
-            };
-            // prevent patterns like CCCCC and VCCCCC
-            if ((!(num%500)) || (!(num%1000)))
-            {
-               return(-1);
-            };
-            // applies subtraction method & rotates value into history
-            if (last == 10)
-               num -= (last * 2);
-            prevlast  = last;
-            last = 100;
-            break;
-         case 'd':
-         case 'D':
-            num += 500;
-            // tests for invalid syntax
-            if ( ((last <= 500) && (last != 100)) || (prevlast <= 500) )
-            {
-               return(-1);
-            }
-            // applies subtraction method & rotates value into history
-            if (last < 500)
-               num -= (last * 2);
-            prevlast  = last;
-            last = 500;
-            break;
-         case 'm':
-         case 'M':
-            num += 1000;
-            // tests for invalid syntax
-            if ( ((prevlast < 1000) && (last <= 1000)) || ((last < 1000) && (last != 100)) )
-            {
-               return(-1);
-            };
-            // prevent patterns like MMMMM and VMMMMM
-            if ((!(num%5000)) || (!(num%10000)))
-            {
-               return(-1);
-            };
-            // applies subtraction method & rotates value into history
-            if (last == 100)
-               num -= (last * 2);
-            prevlast  = last;
-            last = 1000;
-            break;
-         default:
-            return(-1);
-      };
-   };
-
-   // ends function
-   return(num);
-}
-
-
-
-/*
- * Return the field of a 'File_Tag' structure corresponding to the mask code
- */
-static gchar
-**Scan_Return_File_Tag_Field_From_Mask_Code (File_Tag *FileTag, gchar code)
-{
-    switch (code)
-    {
-        case 't':    /* Title */
-            return &FileTag->title;
-        case 'a':    /* Artist */
-            return &FileTag->artist;
-        case 'b':    /* Album */
-            return &FileTag->album;
-        case 'd':    /* Disc Number */
-            return &FileTag->disc_number;
-        case 'x': /* Total number of discs. */
-            return &FileTag->disc_total;
-        case 'y':    /* Year */
-            return &FileTag->year;
-        case 'n':    /* Track */
-            return &FileTag->track;
-        case 'l':    /* Track Total */
-            return &FileTag->track_total;
-        case 'g':    /* Genre */
-            return &FileTag->genre;
-        case 'c':    /* Comment */
-            return &FileTag->comment;
-        case 'p':    /* Composer */
-            return &FileTag->composer;
-        case 'o':    /* Orig. Artist */
-            return &FileTag->orig_artist;
-        case 'r':    /* Copyright */
-            return &FileTag->copyright;
-        case 'u':    /* URL */
-            return &FileTag->url;
-        case 'e':    /* Encoded by */
-            return &FileTag->encoded_by;
-        case 'z':    /* Album Artist */
-            return &FileTag->album_artist;
-        case 'i':    /* Ignored */
-            return NULL;
-        default:
-            Log_Print(LOG_ERROR,"Scanner: Invalid code '%%%c' found!",code);
-            return NULL;
-    }
-}
-
-
-
-/******************
- * Scanner Window *
- ******************/
-void Open_ScannerWindow (gint scanner_type)
-{
-    GtkWidget *scan_button;
-    GtkWidget *ScanVBox;
-    GtkWidget *HBox1, *HBox2, *HBox4, *VBox, *hbox, *vbox;
-    GtkWidget *Table;
-    GtkWidget *Label;
-    GtkWidget *Button;
-    GIcon *new_folder;
-    GtkWidget *Icon;
-    GtkWidget *group;
-    GtkWidget *process_fields_convert_none;
-    GtkWidget *process_fields_case_none;
-    GtkWidget *radio_space_none;
-    GtkTreeViewColumn * column;
-    GtkCellRenderer *renderer;
-    GtkToggleAction *toggle_action;
-
-    /* Check if already opened */
-    if (ScannerWindow)
-    {
-        //gdk_window_show(ScannerWindow->window);
-        gtk_window_present(GTK_WINDOW(ScannerWindow));
-        if (ScannerOptionCombo)
-        {
-            gtk_combo_box_set_active(GTK_COMBO_BOX(ScannerOptionCombo), scanner_type);
-        }
-        return;
-    }
-
-    if ( scanner_type < SCANNER_FILL_TAG
-    ||   scanner_type > SCANNER_PROCESS_FIELDS)
-        scanner_type = SCANNER_FILL_TAG;
-
-    /* The window */
-    ScannerWindow = gtk_dialog_new_with_buttons (_("Tag and Filename Scan"),
-                                                 GTK_WINDOW (MainWindow),
-                                                 GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                 GTK_STOCK_CLOSE,
-                                                 GTK_RESPONSE_CLOSE, NULL);
-
-    /* 'Scan selected files' button */
-    scan_button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
-    /* TODO: Set related action to match AM_SCAN_FILES. */
-    gtk_button_set_label (GTK_BUTTON (scan_button), _("Scan Files"));
-    gtk_widget_set_can_default (scan_button, TRUE);
-    gtk_dialog_add_action_widget (GTK_DIALOG (ScannerWindow), scan_button,
-                                  GTK_RESPONSE_APPLY);
-    gtk_dialog_set_default_response (GTK_DIALOG (ScannerWindow),
-                                     GTK_RESPONSE_APPLY);
-    gtk_widget_show (scan_button);
-    gtk_widget_set_tooltip_text (scan_button, _("Scan selected files"));
-
-    /* The response signal handles close, scan and the delete event. */
-    g_signal_connect (G_OBJECT (ScannerWindow), "response",
-                      G_CALLBACK (et_scan_on_response), NULL);
-
-    /* The init position is defined below, because the scanner window must be
-     * shown before it can be moved. */
-
-    /* The main vbox */
-    ScanVBox = gtk_dialog_get_content_area (GTK_DIALOG (ScannerWindow));
-    gtk_container_set_border_width (GTK_CONTAINER (ScannerWindow), 6);
-    gtk_box_set_spacing (GTK_BOX (ScanVBox), 12);
-
-    /*
-     * The hbox for mode buttons + buttons + what to scan
-     */
-    HBox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0);
-    gtk_box_pack_start(GTK_BOX(ScanVBox),HBox1,FALSE,FALSE,0);
-
-    /* Option Menu */
-    Label = gtk_label_new(_("Scanner:"));
-    gtk_box_pack_start(GTK_BOX(HBox1),Label,FALSE,FALSE,0);
-
-    ScannerOptionCombo = gtk_combo_box_text_new();
-    gtk_box_pack_start(GTK_BOX (HBox1), ScannerOptionCombo, TRUE, TRUE, 2);
-    gtk_widget_set_size_request(ScannerOptionCombo, 160, -1);
-
-    /* Option for Tag */
-    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(ScannerOptionCombo),
-                                   _(Scanner_Option_Menu_Items[SCANNER_FILL_TAG]));
-
-    /* Option for FileName */
-    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(ScannerOptionCombo),
-                                   _(Scanner_Option_Menu_Items[SCANNER_RENAME_FILE]));
-
-    /* Option for ProcessFields */
-    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(ScannerOptionCombo),
-                              _(Scanner_Option_Menu_Items[SCANNER_PROCESS_FIELDS]));
-
-    /* Selection of the item made at the end of the function. */
-    gtk_widget_set_tooltip_text (ScannerOptionCombo,
-                                 _("Select the type of scanner to use"));
-    g_signal_connect(G_OBJECT(ScannerOptionCombo), "changed", G_CALLBACK(Scanner_Option_Menu_Activate_Item), NULL);
-
-    /* Options button */
-    Button = gtk_button_new();
-    Icon = gtk_image_new_from_stock(GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_BUTTON);
-    gtk_container_add(GTK_CONTAINER(Button),Icon);
-    gtk_box_pack_start(GTK_BOX(HBox1),Button,FALSE,FALSE,0);
-    gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-    gtk_widget_set_tooltip_text(Button,_("Scanner Preferences"));
-    g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(Scan_Option_Button),NULL);
-
-    /* Mask Editor button */
-    MaskEditorButton = gtk_toggle_button_new();
-    Icon = gtk_image_new_from_stock("easytag-mask", GTK_ICON_SIZE_BUTTON);
-    gtk_container_add(GTK_CONTAINER(MaskEditorButton),Icon);
-    gtk_box_pack_start(GTK_BOX(HBox1),MaskEditorButton,FALSE,FALSE,0);
-    gtk_button_set_relief(GTK_BUTTON(MaskEditorButton),GTK_RELIEF_NONE);
-    gtk_widget_set_tooltip_text(MaskEditorButton,_("Show / Hide Masks Editor"));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(MaskEditorButton),SCAN_MASK_EDITOR_BUTTON);
-    g_signal_connect(G_OBJECT(MaskEditorButton),"toggled",G_CALLBACK(Scan_Toggle_Mask_Editor_Button),NULL);
-
-    /* Legend button */
-    LegendButton = gtk_toggle_button_new();
-    Icon = gtk_image_new_from_stock(GTK_STOCK_HELP, GTK_ICON_SIZE_BUTTON);
-    gtk_container_add(GTK_CONTAINER(LegendButton),Icon);
-    gtk_box_pack_start(GTK_BOX(HBox1),LegendButton,FALSE,FALSE,0);
-    gtk_button_set_relief(GTK_BUTTON(LegendButton),GTK_RELIEF_NONE);
-    gtk_widget_set_tooltip_text(LegendButton,_("Show / Hide Legend"));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(LegendButton),SCAN_LEGEND_BUTTON);
-    g_signal_connect(G_OBJECT(LegendButton),"toggled",G_CALLBACK(Scan_Toggle_Legend_Button),NULL);
-
-    /*
-     * Frame for Scan Tag
-     */
-    ScanTagFrame = gtk_frame_new (_(Scanner_Option_Menu_Items[0]));
-    gtk_box_pack_start(GTK_BOX(ScanVBox),ScanTagFrame,FALSE,FALSE,0);
-
-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, BOX_SPACING);
-    gtk_container_add(GTK_CONTAINER(ScanTagFrame),vbox);
-    gtk_container_set_border_width(GTK_CONTAINER(vbox), 4);
-    gtk_widget_show(vbox);
-
-    /* The combo box + Status icon */
-    HBox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BOX_SPACING);
-    gtk_box_pack_start(GTK_BOX(vbox),HBox2,TRUE,TRUE,0);
-
-    // Set up list model which is used both by the combobox and the editor
-    ScanTagListModel = gtk_list_store_new(MASK_EDITOR_COUNT, G_TYPE_STRING);
-
-    // The combo box to select the mask to apply
-    ScanTagMaskCombo = gtk_combo_box_new_with_entry();
-    gtk_combo_box_set_model(GTK_COMBO_BOX(ScanTagMaskCombo), GTK_TREE_MODEL(ScanTagListModel));
-    g_object_unref (ScanTagListModel);
-    gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(ScanTagMaskCombo), MASK_EDITOR_TEXT);
-
-    gtk_box_pack_start(GTK_BOX(HBox2),ScanTagMaskCombo,TRUE,TRUE,2);
-    gtk_widget_set_tooltip_text(GTK_WIDGET(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(ScanTagMaskCombo)))),
-        _("Select or type in a mask using codes (see Legend) to parse "
-        "filename and path. Used to fill in tag fields"));
-    // Signal to generate preview (preview of the new tag values)
-    g_signal_connect_swapped(G_OBJECT(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(ScanTagMaskCombo)))),"changed",
-        G_CALLBACK(Scan_Fill_Tag_Generate_Preview),NULL);
-
-    // Load masks into the combobox from a file
-    Load_Scan_Tag_Masks_List(ScanTagListModel, MASK_EDITOR_TEXT, Scan_Masks);
-    if (SCAN_TAG_DEFAULT_MASK)
-    {
-        Add_String_To_Combo_List(ScanTagListModel, SCAN_TAG_DEFAULT_MASK);
-        gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(ScanTagMaskCombo))), SCAN_TAG_DEFAULT_MASK);
-    }else
-    {
-        gtk_combo_box_set_active(GTK_COMBO_BOX(ScanTagMaskCombo), 0);
-    }
-
-    // Mask status icon
-    // Signal connection to check if mask is correct into the mask entry
-    g_signal_connect (gtk_bin_get_child (GTK_BIN (ScanTagMaskCombo)),
-                      "changed", G_CALLBACK (entry_check_scan_tag_mask),
-                      NULL);
-
-    // Preview label
-    FillTagPreviewLabel = gtk_label_new (_("Fill tag preview"));
-    gtk_label_set_line_wrap(GTK_LABEL(FillTagPreviewLabel),TRUE);
-    gtk_widget_show(FillTagPreviewLabel);
-    gtk_box_pack_start(GTK_BOX(vbox),FillTagPreviewLabel,TRUE,TRUE,0);
-
-    /*
-     * Frame for Rename File
-     */
-    RenameFileFrame = gtk_frame_new (_(Scanner_Option_Menu_Items[1]));
-    gtk_box_pack_start(GTK_BOX(ScanVBox),RenameFileFrame,FALSE,FALSE,0);
-
-    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL,4);
-    gtk_container_add(GTK_CONTAINER(RenameFileFrame),vbox);
-    gtk_container_set_border_width(GTK_CONTAINER(vbox), 4);
-    gtk_widget_show(vbox);
-
-    /* The button to prefix path + combo box + Status icon */
-    HBox4 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,2);
-    gtk_box_pack_start(GTK_BOX(vbox),HBox4,TRUE,TRUE,0);
-
-    // Button to prefix path
-    RenameFilePrefixPathButton = gtk_button_new();
-    new_folder = g_themed_icon_new ("folder-new");
-    /* TODO: On Win32, GTK_ICON_SIZE_BUTTON enlarges the combobox. */
-    Icon = gtk_image_new_from_gicon (new_folder, GTK_ICON_SIZE_MENU);
-    g_object_unref (new_folder);
-    gtk_container_add(GTK_CONTAINER(RenameFilePrefixPathButton),Icon);
-    gtk_box_pack_start(GTK_BOX(HBox4),RenameFilePrefixPathButton,FALSE,FALSE,0);
-    gtk_button_set_relief(GTK_BUTTON(RenameFilePrefixPathButton),GTK_RELIEF_NONE);
-    g_signal_connect(G_OBJECT(RenameFilePrefixPathButton),"clicked",G_CALLBACK(Scan_Rename_File_Prefix_Path),NULL);
-    gtk_widget_set_tooltip_text(RenameFilePrefixPathButton,_("Prefix mask with current path"));
-
-    // Set up list model which is used both by the combobox and the editor
-    RenameFileListModel = gtk_list_store_new(MASK_EDITOR_COUNT, G_TYPE_STRING);
-
-    // The combo box to select the mask to apply
-    RenameFileMaskCombo = gtk_combo_box_new_with_entry();
-    gtk_combo_box_set_model(GTK_COMBO_BOX(RenameFileMaskCombo), GTK_TREE_MODEL(RenameFileListModel));
-    g_object_unref (RenameFileListModel);
-    gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(RenameFileMaskCombo), MASK_EDITOR_TEXT);
-
-    gtk_box_pack_start(GTK_BOX(HBox4),RenameFileMaskCombo,TRUE,TRUE,2);
-    gtk_container_set_border_width(GTK_CONTAINER(HBox4), 2);
-    gtk_widget_set_tooltip_text(GTK_WIDGET(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(RenameFileMaskCombo)))),
-        _("Select or type in a mask using codes (see Legend) to parse tag fields. "
-        "Used to rename the file.\nUse / to make directories. If the first character "
-        "is /, it's a absolute path, otherwise is relative to the old path."));
-    // Signal to generate preview (preview of the new filename)
-    g_signal_connect_swapped(G_OBJECT(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(RenameFileMaskCombo)))),"changed",
-        G_CALLBACK(Scan_Rename_File_Generate_Preview),NULL);
-
-    // Load masks into the combobox from a file
-    Load_Rename_File_Masks_List(RenameFileListModel, MASK_EDITOR_TEXT, Rename_File_Masks);
-    if (RENAME_FILE_DEFAULT_MASK)
-    {
-        Add_String_To_Combo_List(RenameFileListModel, RENAME_FILE_DEFAULT_MASK);
-        gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(RenameFileMaskCombo))), RENAME_FILE_DEFAULT_MASK);
-    }else
-    {
-        gtk_combo_box_set_active(GTK_COMBO_BOX(RenameFileMaskCombo), 0);
-    }
-
-    // Mask status icon
-    // Signal connection to check if mask is correct into the mask entry
-    g_signal_connect (gtk_bin_get_child (GTK_BIN (RenameFileMaskCombo)),
-                      "changed", G_CALLBACK (entry_check_rename_file_mask),
-                      NULL);
-
-    /* Preview label */
-    RenameFilePreviewLabel = gtk_label_new (_("Rename file preview"));
-    gtk_label_set_line_wrap(GTK_LABEL(RenameFilePreviewLabel),TRUE);
-    gtk_widget_show(RenameFilePreviewLabel);
-    gtk_box_pack_start(GTK_BOX(vbox),RenameFilePreviewLabel,TRUE,TRUE,0);
-
-    /*
-     * Frame for Processing Fields
-     */
-    ProcessFieldsFrame = gtk_frame_new (_(Scanner_Option_Menu_Items[2]));
-    gtk_box_pack_start(GTK_BOX(ScanVBox),ProcessFieldsFrame,FALSE,FALSE,0);
-
-    VBox = gtk_box_new (GTK_ORIENTATION_VERTICAL, BOX_SPACING);
-    gtk_container_add(GTK_CONTAINER(ProcessFieldsFrame),VBox);
-    gtk_container_set_border_width(GTK_CONTAINER(VBox), 4);
-    gtk_widget_show(VBox);
-
-    /* Group: select entry fields to process */
-    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0);
-    gtk_box_pack_start(GTK_BOX(VBox),hbox,FALSE,FALSE,2);
-    Label = gtk_label_new(_("Select fields:"));
-    gtk_box_pack_start (GTK_BOX (hbox), Label, FALSE, FALSE, 2);
-    gtk_widget_set_tooltip_text (Label,
-                                 _("The buttons on the right represent the "
-                                   "fields which can be processed. Select "
-                                   "those which interest you"));
-    // Advice for Translators: set the first letter of filename translated
-    ProcessFileNameField = gtk_toggle_button_new_with_label(   _("F"));
-    gtk_widget_set_tooltip_text (ProcessFileNameField,
-                                 _("Process filename field"));
-    // Advice for Translators: set the first letter of title translated
-    ProcessTitleField = gtk_toggle_button_new_with_label(      _("T"));
-    gtk_widget_set_tooltip_text(ProcessTitleField,             _("Process title field"));
-    // Advice for Translators: set the first letter of artist translated
-    ProcessArtistField = gtk_toggle_button_new_with_label(     _("Ar"));
-    gtk_widget_set_tooltip_text(ProcessArtistField,            _("Process file artist field"));
-    // Advice for Translators: set the first letter of album artist translated
-    ProcessAlbumArtistField = gtk_toggle_button_new_with_label(_("AA"));
-    gtk_widget_set_tooltip_text(ProcessAlbumArtistField,       _("Process album artist field"));
-    // Advice for Translators: set the first letter of album translated
-    ProcessAlbumField = gtk_toggle_button_new_with_label(      _("Al"));
-    gtk_widget_set_tooltip_text(ProcessAlbumField,             _("Process album field"));
-    // Advice for Translators: set the first letter of genre translated
-    ProcessGenreField = gtk_toggle_button_new_with_label(      _("G"));
-    gtk_widget_set_tooltip_text(ProcessGenreField,             _("Process genre field"));
-    // Advice for Translators: set the first letter of comment translated
-    ProcessCommentField = gtk_toggle_button_new_with_label(    _("Cm"));
-    gtk_widget_set_tooltip_text(ProcessCommentField,           _("Process comment field"));
-    // Advice for Translators: set the first letter of composer translated
-    ProcessComposerField = gtk_toggle_button_new_with_label(   _("Cp"));
-    gtk_widget_set_tooltip_text(ProcessComposerField,          _("Process composer field"));
-    // Advice for Translators: set the first letter of orig artist translated
-    ProcessOrigArtistField = gtk_toggle_button_new_with_label( _("O"));
-    gtk_widget_set_tooltip_text(ProcessOrigArtistField,        _("Process original artist field"));
-    // Advice for Translators: set the first letter of copyright translated
-    ProcessCopyrightField = gtk_toggle_button_new_with_label(  _("Cr"));
-    gtk_widget_set_tooltip_text(ProcessCopyrightField,         _("Process copyright field"));
-    // Advice for Translators: set the first letter of URL translated
-    ProcessURLField = gtk_toggle_button_new_with_label(        _("U"));
-    gtk_widget_set_tooltip_text(ProcessURLField,               _("Process URL field"));
-    // Advice for Translators: set the first letter of encoder name translated
-    ProcessEncodedByField = gtk_toggle_button_new_with_label(  _("E"));
-    gtk_widget_set_tooltip_text(ProcessEncodedByField,         _("Process encoder name field"));
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessFileNameField,   TRUE,TRUE,2);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessTitleField,      TRUE,TRUE,2);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessArtistField,     TRUE,TRUE,2);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessAlbumArtistField,TRUE,TRUE,2);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessAlbumField,      TRUE,TRUE,2);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessGenreField,      TRUE,TRUE,2);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessCommentField,    TRUE,TRUE,2);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessComposerField,   TRUE,TRUE,2);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessOrigArtistField, TRUE,TRUE,2);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessCopyrightField,  TRUE,TRUE,2);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessURLField,        TRUE,TRUE,2);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessEncodedByField,  TRUE,TRUE,2);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessFileNameField),   PROCESS_FILENAME_FIELD);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessTitleField),      PROCESS_TITLE_FIELD);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessArtistField),     PROCESS_ARTIST_FIELD);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessAlbumArtistField),PROCESS_ALBUM_ARTIST_FIELD);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessAlbumField),      PROCESS_ALBUM_FIELD);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessGenreField),      PROCESS_GENRE_FIELD);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessCommentField),    PROCESS_COMMENT_FIELD);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessComposerField),   PROCESS_COMPOSER_FIELD);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessOrigArtistField), PROCESS_ORIG_ARTIST_FIELD);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessCopyrightField),  PROCESS_COPYRIGHT_FIELD);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessURLField),        PROCESS_URL_FIELD);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessEncodedByField),  PROCESS_ENCODED_BY_FIELD);
-    g_signal_connect(G_OBJECT(ProcessFileNameField),   "toggled",G_CALLBACK(Select_Fields_Set_Sensitive),NULL);
-    g_signal_connect(G_OBJECT(ProcessTitleField),      "toggled",G_CALLBACK(Select_Fields_Set_Sensitive),NULL);
-    g_signal_connect(G_OBJECT(ProcessArtistField),     "toggled",G_CALLBACK(Select_Fields_Set_Sensitive),NULL);
-    g_signal_connect(G_OBJECT(ProcessAlbumArtistField),"toggled",G_CALLBACK(Select_Fields_Set_Sensitive),NULL);
-    g_signal_connect(G_OBJECT(ProcessAlbumField),      "toggled",G_CALLBACK(Select_Fields_Set_Sensitive),NULL);
-    g_signal_connect(G_OBJECT(ProcessGenreField),      "toggled",G_CALLBACK(Select_Fields_Set_Sensitive),NULL);
-    g_signal_connect(G_OBJECT(ProcessCommentField),    "toggled",G_CALLBACK(Select_Fields_Set_Sensitive),NULL);
-    g_signal_connect(G_OBJECT(ProcessComposerField),   "toggled",G_CALLBACK(Select_Fields_Set_Sensitive),NULL);
-    g_signal_connect(G_OBJECT(ProcessOrigArtistField), "toggled",G_CALLBACK(Select_Fields_Set_Sensitive),NULL);
-    g_signal_connect(G_OBJECT(ProcessCopyrightField),  "toggled",G_CALLBACK(Select_Fields_Set_Sensitive),NULL);
-    g_signal_connect(G_OBJECT(ProcessURLField),        "toggled",G_CALLBACK(Select_Fields_Set_Sensitive),NULL);
-    g_signal_connect(G_OBJECT(ProcessEncodedByField),  "toggled",G_CALLBACK(Select_Fields_Set_Sensitive),NULL);
-    /* The small buttons */
-    Button = gtk_button_new();
-    g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(Select_Fields_Invert_Selection),NULL);
-    gtk_box_pack_end (GTK_BOX(hbox), Button, FALSE, FALSE, 0);
-    Icon = gtk_image_new_from_stock ("easytag-invert-selection",
-                                     GTK_ICON_SIZE_BUTTON);
-    gtk_container_add(GTK_CONTAINER(Button),Icon);
-    gtk_widget_set_tooltip_text (Button, _("Invert selection"));
-    Button = gtk_button_new();
-    g_signal_connect(G_OBJECT(Button),"clicked",G_CALLBACK(Select_Fields_Select_Unselect_All),NULL);
-    gtk_box_pack_end (GTK_BOX(hbox), Button, FALSE, FALSE, 0);
-    Icon = gtk_image_new_from_icon_name ("edit-select-all",
-                                         GTK_ICON_SIZE_BUTTON);
-    gtk_container_add(GTK_CONTAINER(Button),Icon);
-    gtk_widget_set_tooltip_text (Button, _("Select/Unselect all"));
-
-    /* Group: character conversion */
-    group = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    gtk_box_pack_start (GTK_BOX (VBox), group, FALSE, FALSE, 0);
-    ProcessFieldsConvertIntoSpace = gtk_radio_button_new_with_label_from_widget (NULL, _("Convert '_' and '%20' to spaces"));
-    ProcessFieldsConvertSpace = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (ProcessFieldsConvertIntoSpace),
-                                                                             _("Convert ' ' to '_'"));
-    gtk_box_pack_start (GTK_BOX (group), ProcessFieldsConvertIntoSpace, FALSE,
-                        FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (group), ProcessFieldsConvertSpace, FALSE,
-                        FALSE, 0);
-    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,2);
-    gtk_box_pack_start (GTK_BOX (group), hbox, FALSE, FALSE, 0);
-    ProcessFieldsConvert = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (ProcessFieldsConvertIntoSpace),
-                                                                        _("Convert:"));
-    ProcessFieldsConvertTo        = gtk_entry_new();
-    ProcessFieldsConvertLabelTo   = gtk_label_new(_("to: ")); // A "space" at the end to allow another translation for "to :" (needed in French!)
-    ProcessFieldsConvertFrom      = gtk_entry_new();
-    //gtk_entry_set_max_length(GTK_ENTRY(ProcessFieldsConvertTo), 1); // Now, it isn't limited to one character
-    //gtk_entry_set_max_length(GTK_ENTRY(ProcessFieldsConvertFrom), 1);
-    gtk_widget_set_size_request(ProcessFieldsConvertTo,120,-1);
-    gtk_widget_set_size_request(ProcessFieldsConvertFrom,120,-1);
-    process_fields_convert_none = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (ProcessFieldsConvertIntoSpace),
-                                                                               _("Do not convert"));
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessFieldsConvert,       FALSE,FALSE,0);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessFieldsConvertFrom,   FALSE,FALSE,0);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessFieldsConvertLabelTo,FALSE,FALSE,0);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessFieldsConvertTo,     FALSE,FALSE,0);
-    gtk_box_pack_start (GTK_BOX (group), process_fields_convert_none, FALSE,
-                        FALSE, 0);
-    if (PROCESS_FIELDS_CONVERT_FROM)
-        gtk_entry_set_text(GTK_ENTRY(ProcessFieldsConvertFrom),PROCESS_FIELDS_CONVERT_FROM);
-    if (PROCESS_FIELDS_CONVERT_TO)
-        gtk_entry_set_text(GTK_ENTRY(ProcessFieldsConvertTo),PROCESS_FIELDS_CONVERT_TO);
-    /* Toggled signals */
-    g_signal_connect(G_OBJECT(ProcessFieldsConvert),         "toggled",G_CALLBACK(Process_Fields_Convert_Check_Button_Toggled),NULL);
-    /* Set check buttons to init value */
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessFieldsConvertIntoSpace),PF_CONVERT_INTO_SPACE);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessFieldsConvertSpace),PF_CONVERT_SPACE);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessFieldsConvert),PF_CONVERT);
-    /* Tooltips */
-    gtk_widget_set_tooltip_text(ProcessFieldsConvertIntoSpace,
-        _("The underscore character or the string '%20' are replaced by one space. "
-          "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."));
-    gtk_widget_set_tooltip_text(ProcessFieldsConvertSpace,
-        _("The space character is replaced by one underscore character. "
-          "Example, before: 'Text In An Entry', after: 'Text_In_An_Entry'."));
-    gtk_widget_set_tooltip_text(ProcessFieldsConvert,
-        _("Replace a string by another one. Note that the search is case sensitive."));
-
-    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0);
-    
-    /* Group: capitalize, ... */
-    group = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    gtk_box_pack_start (GTK_BOX (VBox), group, FALSE, FALSE, 0);
-    ProcessFieldsAllUppercase = gtk_radio_button_new_with_label_from_widget (NULL, _("Capitalize all"));
-    ProcessFieldsAllDowncase  = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (ProcessFieldsAllUppercase),
-                                                                             _("Lowercase all"));
-    ProcessFieldsFirstLetterUppercase  = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (ProcessFieldsAllUppercase),
-                                                                                      _("Capitalize first letter"));
-    ProcessFieldsFirstLettersUppercase = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (ProcessFieldsAllUppercase),
-                                                                                      _("Capitalize the first letter of each word"));
-    ProcessFieldsDetectRomanNumerals = gtk_check_button_new_with_label(_("Detect Roman numerals"));
-    process_fields_case_none = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (ProcessFieldsAllUppercase),
-                                                                            _("Do not change capitalization"));
-    gtk_box_pack_start (GTK_BOX (group), ProcessFieldsAllUppercase, FALSE,
-                        FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (group),ProcessFieldsAllDowncase, FALSE, FALSE,
-                        0);
-    gtk_box_pack_start (GTK_BOX (group),ProcessFieldsFirstLetterUppercase,
-                        FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (group), hbox, FALSE, FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessFieldsFirstLettersUppercase,FALSE,FALSE,0);
-    gtk_box_pack_start(GTK_BOX(hbox),ProcessFieldsDetectRomanNumerals,FALSE,FALSE,0);
-    gtk_box_pack_start (GTK_BOX (group), process_fields_case_none, FALSE,
-                        FALSE, 0);
-    /* Toggled signals */
-    g_signal_connect(G_OBJECT(ProcessFieldsFirstLettersUppercase),"toggled",G_CALLBACK(Process_Fields_First_Letters_Check_Button_Toggled),NULL);
-    /* Set check buttons to init value */
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessFieldsAllUppercase),PF_CONVERT_ALL_UPPERCASE);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessFieldsAllDowncase),PF_CONVERT_ALL_DOWNCASE);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessFieldsFirstLetterUppercase),PF_CONVERT_FIRST_LETTER_UPPERCASE);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessFieldsFirstLettersUppercase),PF_CONVERT_FIRST_LETTERS_UPPERCASE);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessFieldsDetectRomanNumerals),PF_DETECT_ROMAN_NUMERALS);
-    /* Tooltips */
-    gtk_widget_set_tooltip_text(ProcessFieldsAllUppercase,
-        _("Convert all words in all fields to upper case. "
-          "Example, before: 'Text IN AN entry', after: 'TEXT IN AN ENTRY'."));
-    gtk_widget_set_tooltip_text(ProcessFieldsAllDowncase,
-        _("Convert all words in all fields to lower case. "
-          "Example, before: 'TEXT IN an entry', after: 'text in an entry'."));
-    gtk_widget_set_tooltip_text(ProcessFieldsFirstLetterUppercase,
-        _("Convert the initial of the first word in all fields to upper case. "
-          "Example, before: 'text IN An ENTRY', after: 'Text in an entry'."));
-    gtk_widget_set_tooltip_text(ProcessFieldsFirstLettersUppercase,
-        _("Convert the initial of each word in all fields to upper case. "
-          "Example, before: 'Text in an ENTRY', after: 'Text In An Entry'."));
-    gtk_widget_set_tooltip_text(ProcessFieldsDetectRomanNumerals,
-        _("Force to convert to upper case the Roman numerals. "
-          "Example, before: 'ix. text in an entry', after: 'IX. Text In An Entry'."));
-
-    /* Group: insert/remove spaces */
-    group = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    gtk_box_pack_start (GTK_BOX (VBox), group, FALSE, FALSE, 0);
-    ProcessFieldsRemoveSpace = gtk_radio_button_new_with_label_from_widget (NULL, _("Remove spaces"));
-    ProcessFieldsInsertSpace = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (ProcessFieldsRemoveSpace),
-                                                                            _("Insert a space before uppercase letters"));
-    ProcessFieldsOnlyOneSpace = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (ProcessFieldsRemoveSpace),
-                                                                             _("Remove duplicate spaces and underscores"));
-    radio_space_none = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (ProcessFieldsRemoveSpace),
-                                                                    _("Do not change word separators"));
-    gtk_box_pack_start (GTK_BOX (group), ProcessFieldsRemoveSpace, FALSE,
-                        FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (group), ProcessFieldsInsertSpace, FALSE,
-                        FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (group), ProcessFieldsOnlyOneSpace, FALSE,
-                        FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (group), radio_space_none, FALSE, FALSE, 0);
-    /* Set check buttons to init value */
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessFieldsRemoveSpace),PF_REMOVE_SPACE);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessFieldsInsertSpace),PF_INSERT_SPACE);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessFieldsOnlyOneSpace),PF_ONLY_ONE_SPACE);
-    /* Tooltips */
-    gtk_widget_set_tooltip_text(ProcessFieldsRemoveSpace,
-        _("All spaces between words are removed. "
-          "Example, before: 'Text In An Entry', after: 'TextInAnEntry'."));
-    gtk_widget_set_tooltip_text(ProcessFieldsInsertSpace,
-        _("A space is inserted before each upper case letter. "
-          "Example, before: 'TextInAnEntry', after: 'Text In An Entry'."));
-    gtk_widget_set_tooltip_text(ProcessFieldsOnlyOneSpace,
-        _("Duplicate spaces and underscores are removed. "
-          "Example, before: 'Text__In__An   Entry', after: 'Text_In_An Entry'."));
-    Select_Fields_Set_Sensitive();
-
-    /*
-     * Frame to display codes legend
-     */
-    LegendFrame = gtk_frame_new (_("Legend"));
-    gtk_box_pack_start(GTK_BOX(ScanVBox),LegendFrame,FALSE,FALSE,0);
-    /* Legend labels */
-    Table = et_grid_new (3, 6);
-    gtk_container_add(GTK_CONTAINER(LegendFrame),Table);
-    gtk_container_set_border_width(GTK_CONTAINER(Table),4);
-    Label = gtk_label_new(_("%a: artist"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 0, 0, 1, 1, 6, 0);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%z: album artist"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 0, 1, 1, 1, 6, 0);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%b: album"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 0, 2, 1, 1, 6, 0);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%c: comment"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 0, 3, 1, 1, 6, 0);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%p: composer"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 0, 4, 1, 1, 6, 0);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%r: copyright"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 0, 5, 1, 1, 6, 0);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%d: disc number"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 1, 0, 1, 1, 6, 0);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%e: encoded by"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 1, 1, 1, 1, 6, 0);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%g: genre"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 1, 2, 1, 1, 6, 0);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%i: ignored"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 1, 3, 1, 1, 6, 0);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%l: number of tracks"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 1, 4, 1, 1, 6, 0);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%o: orig. artist"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 1, 5, 1, 1, 6, 0);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%n: track"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 2, 0, 1, 1, 6, 0);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%t: title"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 2, 1, 1, 1, 6, 0);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%u: URL"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 2, 2, 1, 1, 6, 0);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new (_("%x: number of discs"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 2, 3, 1, 1, 6, 0);
-    gtk_misc_set_alignment (GTK_MISC (Label), 0, 0.5);
-    Label = gtk_label_new(_("%y: year"));
-    et_grid_attach_margins (GTK_GRID (Table), Label, 2, 4, 1, 1, 6, 0);
-    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-
-    /*
-     * Masks Editor
-     */
-    MaskEditorFrame = gtk_frame_new (_("Mask Editor"));
-    gtk_box_pack_start(GTK_BOX(ScanVBox),MaskEditorFrame,FALSE,FALSE,0);
-    MaskEditorHBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,4);
-    gtk_container_add(GTK_CONTAINER(MaskEditorFrame),MaskEditorHBox);
-    gtk_container_set_border_width(GTK_CONTAINER(MaskEditorHBox), 4);
-
-    /* The editor part */
-    MaskEditorVBox = gtk_box_new(GTK_ORIENTATION_VERTICAL,2);
-    gtk_box_pack_start(GTK_BOX(MaskEditorHBox),MaskEditorVBox,TRUE,TRUE,0);
-    MaskEditorScrollWindow = gtk_scrolled_window_new(NULL,NULL);
-    gtk_box_pack_start(GTK_BOX(MaskEditorVBox),MaskEditorScrollWindow,TRUE,TRUE,0);
-    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(MaskEditorScrollWindow),
-                                   GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
-    gtk_widget_set_size_request(GTK_WIDGET(MaskEditorScrollWindow), -1, 101);
-
-    /* The list */
-    MaskEditorList = gtk_tree_view_new();
-    gtk_tree_view_set_model(GTK_TREE_VIEW(MaskEditorList), GTK_TREE_MODEL(ScanTagListModel));
-
-    renderer = gtk_cell_renderer_text_new();
-    column = gtk_tree_view_column_new_with_attributes(NULL,
-            renderer, "text", MASK_EDITOR_TEXT, NULL);
-    gtk_tree_view_append_column(GTK_TREE_VIEW(MaskEditorList), column);
-    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(MaskEditorList), FALSE);
-    gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(MaskEditorList)),
-                GTK_SELECTION_MULTIPLE);
-    gtk_tree_view_set_reorderable(GTK_TREE_VIEW(MaskEditorList), TRUE);
-    gtk_container_add(GTK_CONTAINER(MaskEditorScrollWindow), MaskEditorList);
-    g_signal_connect_after(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(MaskEditorList))),
-            "changed", G_CALLBACK(Mask_Editor_List_Row_Selected), NULL);
-    g_signal_connect(G_OBJECT(MaskEditorList), "key-press-event",
-        G_CALLBACK(Mask_Editor_List_Key_Press), NULL);
-    /* The entry */
-    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,2);
-    gtk_box_pack_start(GTK_BOX(MaskEditorVBox),hbox,FALSE,FALSE,0);
-    MaskEditorEntry = gtk_entry_new();
-    gtk_box_pack_start(GTK_BOX(hbox),MaskEditorEntry,TRUE,TRUE,2);
-    g_signal_connect(G_OBJECT(MaskEditorEntry),"changed",
-        G_CALLBACK(Mask_Editor_Entry_Changed),NULL);
-    // Mask status icon
-    // Signal connection to check if mask is correct into the mask entry
-    g_signal_connect (MaskEditorEntry,"changed",
-                      G_CALLBACK (entry_check_scan_tag_mask), NULL);
-
-    /* The buttons part */
-    MaskEditorVBox = gtk_box_new(GTK_ORIENTATION_VERTICAL,0);
-    gtk_box_pack_start(GTK_BOX(MaskEditorHBox),MaskEditorVBox,FALSE,FALSE,0);
-
-    /* New mask button */
-    MaskEditorNewButton = gtk_button_new();
-    Icon = gtk_image_new_from_stock(GTK_STOCK_NEW, GTK_ICON_SIZE_SMALL_TOOLBAR);
-    gtk_container_add(GTK_CONTAINER(MaskEditorNewButton),Icon);
-    gtk_box_pack_start(GTK_BOX(MaskEditorVBox),MaskEditorNewButton,FALSE,FALSE,0);
-    gtk_button_set_relief(GTK_BUTTON(MaskEditorNewButton),GTK_RELIEF_NONE);
-    gtk_widget_set_tooltip_text(MaskEditorNewButton,_("Create New Mask"));
-    g_signal_connect(G_OBJECT(MaskEditorNewButton),"clicked",
-        G_CALLBACK(Mask_Editor_List_New),NULL);
-
-    /* Move up mask button */
-    MaskEditorUpButton = gtk_button_new();
-    Icon = gtk_image_new_from_stock(GTK_STOCK_GO_UP, GTK_ICON_SIZE_SMALL_TOOLBAR);
-    gtk_container_add(GTK_CONTAINER(MaskEditorUpButton),Icon);
-    gtk_box_pack_start(GTK_BOX(MaskEditorVBox),MaskEditorUpButton,FALSE,FALSE,0);
-    gtk_button_set_relief(GTK_BUTTON(MaskEditorUpButton),GTK_RELIEF_NONE);
-    gtk_widget_set_tooltip_text(MaskEditorUpButton,_("Move Up this Mask"));
-    g_signal_connect(G_OBJECT(MaskEditorUpButton),"clicked",
-        G_CALLBACK(Mask_Editor_List_Move_Up),NULL);
-
-    /* Move down mask button */
-    MaskEditorDownButton = gtk_button_new();
-    Icon = gtk_image_new_from_stock(GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_SMALL_TOOLBAR);
-    gtk_container_add(GTK_CONTAINER(MaskEditorDownButton),Icon);
-    gtk_box_pack_start(GTK_BOX(MaskEditorVBox),MaskEditorDownButton,FALSE,FALSE,0);
-    gtk_button_set_relief(GTK_BUTTON(MaskEditorDownButton),GTK_RELIEF_NONE);
-    gtk_widget_set_tooltip_text(MaskEditorDownButton,_("Move Down this Mask"));
-    g_signal_connect(G_OBJECT(MaskEditorDownButton),"clicked",
-        G_CALLBACK(Mask_Editor_List_Move_Down),NULL);
-
-    /* Copy mask button */
-    MaskEditorCopyButton = gtk_button_new();
-    Icon = gtk_image_new_from_stock(GTK_STOCK_COPY, GTK_ICON_SIZE_SMALL_TOOLBAR);
-    gtk_container_add(GTK_CONTAINER(MaskEditorCopyButton),Icon);
-    gtk_box_pack_start(GTK_BOX(MaskEditorVBox),MaskEditorCopyButton,FALSE,FALSE,0);
-    gtk_button_set_relief(GTK_BUTTON(MaskEditorCopyButton),GTK_RELIEF_NONE);
-    gtk_widget_set_tooltip_text(MaskEditorCopyButton,_("Duplicate Mask"));
-    g_signal_connect(G_OBJECT(MaskEditorCopyButton),"clicked",
-        G_CALLBACK(Mask_Editor_List_Duplicate),NULL);
-
-    /* Add mask button */
-    MaskEditorAddButton = gtk_button_new();
-    Icon = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_SMALL_TOOLBAR);
-    gtk_container_add(GTK_CONTAINER(MaskEditorAddButton),Icon);
-    gtk_box_pack_start(GTK_BOX(MaskEditorVBox),MaskEditorAddButton,FALSE,FALSE,0);
-    gtk_button_set_relief(GTK_BUTTON(MaskEditorAddButton),GTK_RELIEF_NONE);
-    gtk_widget_set_tooltip_text(MaskEditorAddButton,_("Add Default Masks"));
-    g_signal_connect(G_OBJECT(MaskEditorAddButton),"clicked",
-        G_CALLBACK(Mask_Editor_List_Add),NULL);
-
-    /* Remove mask button */
-    MaskEditorRemoveButton = gtk_button_new();
-    Icon = gtk_image_new_from_stock(GTK_STOCK_REMOVE, GTK_ICON_SIZE_SMALL_TOOLBAR);
-    gtk_container_add(GTK_CONTAINER(MaskEditorRemoveButton),Icon);
-    gtk_box_pack_start(GTK_BOX(MaskEditorVBox),MaskEditorRemoveButton,FALSE,FALSE,0);
-    gtk_button_set_relief(GTK_BUTTON(MaskEditorRemoveButton),GTK_RELIEF_NONE);
-    gtk_widget_set_tooltip_text(MaskEditorRemoveButton,_("Remove Mask"));
-    g_signal_connect(G_OBJECT(MaskEditorRemoveButton),"clicked",
-        G_CALLBACK(Mask_Editor_List_Remove),NULL);
-
-    /* Save mask button */
-    MaskEditorSaveButton = gtk_button_new();
-    Icon = gtk_image_new_from_stock(GTK_STOCK_SAVE, GTK_ICON_SIZE_SMALL_TOOLBAR);
-    gtk_container_add(GTK_CONTAINER(MaskEditorSaveButton),Icon);
-    gtk_box_pack_end(GTK_BOX(MaskEditorVBox),MaskEditorSaveButton,FALSE,FALSE,0);
-    gtk_button_set_relief(GTK_BUTTON(MaskEditorSaveButton),GTK_RELIEF_NONE);
-    gtk_widget_set_tooltip_text(MaskEditorSaveButton,_("Save Masks"));
-    g_signal_connect(G_OBJECT(MaskEditorSaveButton),"clicked",
-        G_CALLBACK(Mask_Editor_List_Save_Button),NULL);
-
-    gtk_widget_show(ScanVBox);
-    gtk_widget_show_all(HBox1);
-    gtk_widget_show_all(HBox2);
-    gtk_widget_show_all(HBox4);
-    gtk_widget_show(ScannerWindow);
-
-    /* Init position of the scanner window */
-    Scan_Set_Scanner_Window_Init_Position();
-
-    /* To initialize the mask status icon and visibility */
-    g_signal_emit_by_name(G_OBJECT(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(ScanTagMaskCombo)))),"changed");
-    g_signal_emit_by_name(G_OBJECT(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(RenameFileMaskCombo)))),"changed");
-    g_signal_emit_by_name(G_OBJECT(MaskEditorEntry),"changed");
-    g_signal_emit_by_name(G_OBJECT(LegendButton),"toggled");        /* To hide legend frame */
-    g_signal_emit_by_name(G_OBJECT(MaskEditorButton),"toggled");    /* To hide mask editor frame */
-    g_signal_emit_by_name(G_OBJECT(ProcessFieldsConvert),"toggled");/* To enable / disable entries */
-    g_signal_emit_by_name(G_OBJECT(ProcessFieldsDetectRomanNumerals),"toggled");/* To enable / disable entries */
-
-    // Activate the current menu in the option menu
-    gtk_combo_box_set_active(GTK_COMBO_BOX(ScannerOptionCombo), scanner_type);
-
-    toggle_action = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (UIManager,
-                                                                  "/ToolBar/ShowScanner"));
-    if (!gtk_toggle_action_get_active (toggle_action))
-    {
-        gtk_toggle_action_set_active (toggle_action, TRUE);
-    }
-}
-
-/*
- * Select the scanner to run for the current ETFile
- */
-void Scan_Select_Mode_And_Run_Scanner (ET_File *ETFile)
-{
-    g_return_if_fail (ScannerWindow != NULL || ETFile != NULL);
-
-    if (gtk_combo_box_get_active(GTK_COMBO_BOX(ScannerOptionCombo)) == SCANNER_FILL_TAG)
-    {
-        /* Run Scanner Type: Scan Tag */
-        Scan_Tag_With_Mask(ETFile);
-    } else if (gtk_combo_box_get_active(GTK_COMBO_BOX(ScannerOptionCombo)) == SCANNER_RENAME_FILE)
-    {
-        /* Run Scanner Type: Rename File */
-        Scan_Rename_File_With_Mask(ETFile);
-    } else if (gtk_combo_box_get_active(GTK_COMBO_BOX(ScannerOptionCombo)) == SCANNER_PROCESS_FIELDS)
-    {
-        /* Run Scanner Type: Process Fields */
-        Scan_Process_Fields(ETFile);
-    }
-}
-
-/*
- * et_scan_show:
- * @action: the #GtkToggleAction that was activated
- * @user_data: user data set when the signal handler was connected
- *
- * Show the scanner window.
- */
-void
-et_scan_show (GtkAction *action, gpointer user_data)
-{
-    gboolean active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-
-    if (active)
-    {
-        if (!ScannerWindow)
-        {
-            Open_ScannerWindow (SCANNER_TYPE);
-        }
-        else
-        {
-            gtk_window_present (GTK_WINDOW (ScannerWindow));
-        }
-    }
-    else
-    {
-        ScannerWindow_Quit ();
-    }
-}
-
-
-/* Callback from Open_ScannerWindow */
-static void
-ScannerWindow_Quit (void)
-{
-    GtkToggleAction *toggle_action;
-
-    toggle_action = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (UIManager,
-                                                                  "/ToolBar/ShowScanner"));
-
-    if (gtk_toggle_action_get_active (toggle_action))
-    {
-        gtk_toggle_action_set_active (toggle_action, FALSE);
-    }
-
-    if (ScannerWindow)
-    {
-        ScannerWindow_Apply_Changes();
-
-        gtk_widget_destroy(ScannerWindow);
-        ScannerWindow     = NULL;
-        ScannerOptionCombo= NULL;
-
-        // To avoid crashs after tests
-        ScanTagMaskCombo              = NULL;
-        RenameFileMaskCombo           = NULL;
-        MaskEditorEntry               = NULL;
-        LegendFrame                   = NULL;
-        ProcessFieldsConvertIntoSpace = NULL;
-        ProcessFieldsConvertSpace     = NULL;
-        FillTagPreviewLabel           = NULL;
-        RenameFilePreviewLabel        = NULL;
-    }
-}
-
-
-/*
- * For the configuration file...
- */
-void ScannerWindow_Apply_Changes (void)
-{
-    if (ScannerWindow)
-    {
-        gint x, y;//, width, height;
-        GdkWindow *window;
-
-        window = gtk_widget_get_window(ScannerWindow);
-
-        if ( window && gdk_window_is_visible(window) && gdk_window_get_state(window)!=GDK_WINDOW_STATE_MAXIMIZED )
-        {
-            // Position and Origin of the scanner window
-            gdk_window_get_root_origin(window,&x,&y);
-            SCANNER_WINDOW_X = x;
-            SCANNER_WINDOW_Y = y;
-            //gdk_window_get_size(window,&width,&height);
-            //SCANNER_WINDOW_WIDTH  = width;
-            //SCANNER_WINDOW_HEIGHT = height;
-        }
-
-        // The scanner selected
-        SCANNER_TYPE = gtk_combo_box_get_active(GTK_COMBO_BOX(ScannerOptionCombo));
-
-        SCAN_MASK_EDITOR_BUTTON   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(MaskEditorButton));
-        SCAN_LEGEND_BUTTON        = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(LegendButton));
-
-        /* Group: select entries to process */
-        PROCESS_FILENAME_FIELD    = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFileNameField));
-        PROCESS_TITLE_FIELD       = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessTitleField));
-        PROCESS_ARTIST_FIELD      = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessArtistField));
-        PROCESS_ALBUM_ARTIST_FIELD= gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessAlbumArtistField));
-        PROCESS_ALBUM_FIELD       = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessAlbumField));
-        PROCESS_GENRE_FIELD       = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessGenreField));
-        PROCESS_COMMENT_FIELD     = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessCommentField));
-        PROCESS_COMPOSER_FIELD    = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessComposerField));
-        PROCESS_ORIG_ARTIST_FIELD = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessOrigArtistField));
-        PROCESS_COPYRIGHT_FIELD   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessCopyrightField));
-        PROCESS_URL_FIELD         = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessURLField));
-        PROCESS_ENCODED_BY_FIELD  = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessEncodedByField));
-
-        if (PROCESS_FIELDS_CONVERT_FROM) g_free(PROCESS_FIELDS_CONVERT_FROM);
-        PROCESS_FIELDS_CONVERT_FROM = g_strdup(gtk_entry_get_text(GTK_ENTRY(ProcessFieldsConvertFrom)));
-        if (PROCESS_FIELDS_CONVERT_TO) g_free(PROCESS_FIELDS_CONVERT_TO);
-        PROCESS_FIELDS_CONVERT_TO   = g_strdup(gtk_entry_get_text(GTK_ENTRY(ProcessFieldsConvertTo)));
-
-        /* Group: convert one character */
-        PF_CONVERT_INTO_SPACE     = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsConvertIntoSpace));
-        PF_CONVERT_SPACE          = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsConvertSpace));
-        PF_CONVERT                = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsConvert));
-
-        /* Group: capitalize */
-        PF_CONVERT_ALL_UPPERCASE           = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsAllUppercase));
-        PF_CONVERT_ALL_DOWNCASE            = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsAllDowncase));
-        PF_CONVERT_FIRST_LETTER_UPPERCASE  = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsFirstLetterUppercase));
-        PF_CONVERT_FIRST_LETTERS_UPPERCASE = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsFirstLettersUppercase));
-        PF_DETECT_ROMAN_NUMERALS           = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsDetectRomanNumerals));
-
-        /* Group: remove/insert space */
-        PF_REMOVE_SPACE   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsRemoveSpace));
-        PF_INSERT_SPACE   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsInsertSpace));
-        PF_ONLY_ONE_SPACE = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsOnlyOneSpace));
-
-        // Save default masks...
-        if (SCAN_TAG_DEFAULT_MASK) g_free(SCAN_TAG_DEFAULT_MASK);
-        SCAN_TAG_DEFAULT_MASK = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(ScanTagMaskCombo)))));
-        Add_String_To_Combo_List(ScanTagListModel, SCAN_TAG_DEFAULT_MASK);
-        Save_Rename_File_Masks_List(ScanTagListModel, MASK_EDITOR_TEXT);
-
-        if (RENAME_FILE_DEFAULT_MASK) g_free(RENAME_FILE_DEFAULT_MASK);
-        RENAME_FILE_DEFAULT_MASK = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(RenameFileMaskCombo)))));
-        Add_String_To_Combo_List(RenameFileListModel, RENAME_FILE_DEFAULT_MASK);
-        Save_Rename_File_Masks_List(RenameFileListModel, MASK_EDITOR_TEXT);
-
-    }
-}
-
-
-/* Callback from Option button */
-static void
-Scan_Option_Button (void)
-{
-    Open_OptionsWindow();
-    gtk_notebook_set_current_page(GTK_NOTEBOOK(OptionsNoteBook), OptionsNoteBook_Scanner_Page_Num);
-}
-
-
-/*
- * entry_check_rename_file_mask:
- * @entry: the entry for which to check the mask
- * @user_data: user data set when the signal was connected
- *
- * Display an icon in the entry if the current text contains an invalid mask
- * for scanning tags.
- */
-static void
-entry_check_scan_tag_mask (GtkEntry *entry, gpointer user_data)
-{
-    gchar *tmp  = NULL;
-    gchar *mask = NULL;
-    gint loop = 0;
-
-    g_return_if_fail (entry != NULL);
-
-    mask = g_strdup (gtk_entry_get_text (entry));
-    if (!mask || strlen(mask)<1)
-        goto Bad_Mask;
-
-    while (mask)
-    {
-        if ( (tmp=strrchr(mask,'%'))==NULL )
-        {
-            if (loop==0)
-                /* There is no code the first time => not accepted */
-                goto Bad_Mask;
-            else
-                /* There is no more code => accepted */
-                goto Good_Mask;
-        }
-        if ( strlen(tmp)>1
-        && (tmp[1]=='a' || tmp[1]=='b' || tmp[1]=='c' || tmp[1]=='d' || tmp[1]=='p' ||
-            tmp[1]=='r' || tmp[1]=='e' || tmp[1]=='g' || tmp[1]=='i' || tmp[1]=='l' ||
-            tmp[1]=='o' || tmp[1]=='n' || tmp[1]=='t' || tmp[1]=='u' || tmp[1]=='y' ) )
-        {
-            /* Code is correct */
-            *(mask+strlen(mask)-strlen(tmp)) = '\0';
-        }else
-        {
-            goto Bad_Mask;
-        }
-
-        /* Check the following code and separator */
-        if ( (tmp=strrchr(mask,'%'))==NULL )
-            /* There is no more code => accepted */
-            goto Good_Mask;
-
-        if ( strlen(tmp)>2
-        && (tmp[1]=='a' || tmp[1]=='b' || tmp[1]=='c' || tmp[1]=='d' || tmp[1]=='p' ||
-            tmp[1]=='r' || tmp[1]=='e' || tmp[1]=='g' || tmp[1]=='i' || tmp[1]=='l' ||
-            tmp[1]=='o' || tmp[1]=='n' || tmp[1]=='t' || tmp[1]=='u' || tmp[1]=='y' ) )
-        {
-            /* There is a separator and code is correct */
-            *(mask+strlen(mask)-strlen(tmp)) = '\0';
-        }else
-        {
-            goto Bad_Mask;
-        }
-        loop++;
-    }
-
-    Bad_Mask:
-        g_free(mask);
-        gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY,
-                                           "emblem-unreadable");
-        gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_SECONDARY,
-                                         _("Invalid scanner mask"));
-        return;
-
-    Good_Mask:
-        g_free(mask);
-        gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY,
-                                           NULL);
-}
-
-/*
- * entry_check_rename_file_mask:
- * @entry: the entry for which to check the mask
- * @user_data: user data set when the signal was connected
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
  *
- * Display an icon in the entry if the current text contains an invalid mask
- * for renaming files.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-void
-entry_check_rename_file_mask (GtkEntry *entry, gpointer user_data)
-{
-    gchar *tmp = NULL;
-    gchar *mask = NULL;
-
-    g_return_if_fail (entry != NULL);
-
-    mask = g_strdup (gtk_entry_get_text (entry));
-    if (!mask || strlen(mask)<1)
-        goto Bad_Mask;
-
-    // Not a valid path....
-    if ( strstr(mask,"//") != NULL
-    ||   strstr(mask,"./") != NULL
-    ||   strstr(mask,"data/") != NULL)
-        goto Bad_Mask;
-
-    while (mask)
-    {
-        if ( (tmp=strrchr(mask,'%'))==NULL )
-        {
-            /* There is no more code. */
-            /* No code in mask is accepted. */
-            goto Good_Mask;
-        }
-        if ( strlen(tmp)>1
-        && (tmp[1]=='a' || tmp[1]=='b' || tmp[1]=='c' || tmp[1]=='d' || tmp[1]=='p' ||
-            tmp[1]=='r' || tmp[1]=='e' || tmp[1]=='g' || tmp[1]=='i' || tmp[1]=='l' ||
-            tmp[1]=='o' || tmp[1]=='n' || tmp[1]=='t' || tmp[1]=='u' || tmp[1]=='y' ) )
-        {
-            /* The code is valid. */
-            /* No separator is accepted. */
-            *(mask+strlen(mask)-strlen(tmp)) = '\0';
-        }else
-        {
-            goto Bad_Mask;
-        }
-    }
-
-    Bad_Mask:
-        g_free(mask);
-        gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY,
-                                           "emblem-unreadable");
-        gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_SECONDARY,
-                                         _("Invalid scanner mask"));
-        return;
-
-    Good_Mask:
-        g_free(mask);
-        gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY,
-                                           NULL);
-}
-
-
-static void
-Scan_Toggle_Legend_Button (void)
-{
-    g_return_if_fail (LegendButton != NULL || LegendFrame != NULL);
-
-    if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(LegendButton)) )
-        gtk_widget_show_all(LegendFrame);
-    else
-        gtk_widget_hide(LegendFrame);
-}
-
-
-static void
-Scan_Toggle_Mask_Editor_Button (void)
-{
-    GtkTreeModel *treemodel;
-    GtkTreeSelection *selection;
-    GtkTreeIter iter;
-
-    g_return_if_fail (MaskEditorButton != NULL || MaskEditorFrame != NULL ||
-                      MaskEditorList != NULL);
-
-    if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(MaskEditorButton)) )
-    {
-        gtk_widget_show_all(MaskEditorFrame);
-
-        // Select first row in list
-        treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(MaskEditorList));
-        if (gtk_tree_model_get_iter_first(treemodel, &iter))
-        {
-            selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(MaskEditorList));
-            gtk_tree_selection_unselect_all(selection);
-            gtk_tree_selection_select_iter(selection, &iter);
-        }
-
-        // Update status of the icon box cause prev instruction show it for all cases
-        g_signal_emit_by_name(G_OBJECT(MaskEditorEntry),"changed");
-    }else
-    {
-        gtk_widget_hide(MaskEditorFrame);
-    }
-}
 
+#include "scan.h"
 
-
-static void
-Process_Fields_Convert_Check_Button_Toggled (GtkWidget *object)
-{
-    gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsConvertTo),gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(object)));
-    gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsConvertFrom),gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(object)));
-}
-
-static void
-Process_Fields_First_Letters_Check_Button_Toggled (GtkWidget *object)
-{
-    gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsDetectRomanNumerals),gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(object)));
-}
-
+#include <string.h>
 
 /*
- * Small buttons of Process Fields scanner
+ * Function to replace underscore '_' by a space. No need to reallocate.
  */
-static void
-Select_Fields_Invert_Selection (void)
-{
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessFileNameField),
-                                !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFileNameField)));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessTitleField),
-                                !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessTitleField)));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessArtistField),
-                                !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessArtistField)));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessAlbumArtistField),
-                                !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessAlbumArtistField)));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessAlbumField),
-                                !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessAlbumField)));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessGenreField),
-                                !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessGenreField)));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessCommentField),
-                                !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessCommentField)));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessComposerField),
-                                !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessComposerField)));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessOrigArtistField),
-                                !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessOrigArtistField)));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessCopyrightField),
-                                !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessCopyrightField)));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessURLField),
-                                !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessURLField)));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessEncodedByField),
-                                !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessEncodedByField)));
-}
-
-static void
-Select_Fields_Select_Unselect_All (void)
+void
+Scan_Convert_Underscore_Into_Space (gchar *string)
 {
-    static gboolean state = TRUE;
-
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessFileNameField),   state);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessTitleField),      state);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessArtistField),     state);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessAlbumArtistField),state);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessAlbumField),      state);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessGenreField),      state);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessCommentField),    state);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessComposerField),   state);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessOrigArtistField), state);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessCopyrightField),  state);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessURLField),        state);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ProcessEncodedByField),  state);
-    state = !state;
-}
+    gchar *tmp = string;
 
-/*
- * Set sensitive state of the processing check boxes : if no one is selected => all disabled
- */
-static void
-Select_Fields_Set_Sensitive (void)
-{
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFileNameField))
-    ||  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessTitleField))
-    ||  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessArtistField))
-    ||  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessAlbumArtistField))
-    ||  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessAlbumField))
-    ||  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessGenreField))
-    ||  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessCommentField))
-    ||  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessComposerField))
-    ||  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessOrigArtistField))
-    ||  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessCopyrightField))
-    ||  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessURLField))
-    ||  gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessEncodedByField)))
-    {
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsConvertIntoSpace),     TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsConvertSpace),         TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsConvert),              TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsConvertLabelTo),       TRUE);
-        // Activate the two entries only if the check box is activated, else keep them disabled
-        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsConvert)))
-        {
-            gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsConvertTo),        TRUE);
-            gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsConvertFrom),      TRUE);
-        }
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsAllUppercase),         TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsAllDowncase),          TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsFirstLetterUppercase), TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsFirstLettersUppercase),TRUE);
-        Process_Fields_First_Letters_Check_Button_Toggled (ProcessFieldsFirstLettersUppercase);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsRemoveSpace),          TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsInsertSpace),          TRUE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsOnlyOneSpace),         TRUE);
-    }else
+    while ((tmp = strchr (tmp, '_')) != NULL)
     {
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsConvertIntoSpace),     FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsConvertSpace),         FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsConvert),              FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsConvertTo),            FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsConvertLabelTo),       FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsConvertFrom),          FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsAllUppercase),         FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsAllDowncase),          FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsFirstLetterUppercase), FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsFirstLettersUppercase),FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsDetectRomanNumerals),  FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsRemoveSpace),          FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsInsertSpace),          FALSE);
-        gtk_widget_set_sensitive(GTK_WIDGET(ProcessFieldsOnlyOneSpace),         FALSE);
+        *tmp = ' ';
     }
 }
 
 /*
- * Callbacks from Mask Editor buttons
- */
-
-/*
- * Callback from the mask edit list
- * Previously known as Mask_Editor_List_Select_Row
+ * Function to replace %20 by a space. No need to reallocate.
  */
-static void
-Mask_Editor_List_Row_Selected (GtkTreeSelection* selection, gpointer data)
+void
+Scan_Convert_P20_Into_Space (gchar *string)
 {
-    GList *selectedRows;
-    gchar *text = NULL;
-    GtkTreePath *lastSelected;
-    GtkTreeIter lastFile;
-    GtkTreeModel *treemodel;
-    gboolean valid;
-
-    treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(MaskEditorList));
-
-    /* We must block the function, else the previous selected row will be modified */
-    g_signal_handlers_block_by_func(G_OBJECT(MaskEditorEntry),
-                                    G_CALLBACK(Mask_Editor_Entry_Changed),NULL);
-
-    selectedRows = gtk_tree_selection_get_selected_rows(selection, NULL);
-
-    /*
-     * At some point, we might get called when no rows are selected?
-     */
-    if (!selectedRows)
-    {
-        g_signal_handlers_unblock_by_func(G_OBJECT(MaskEditorEntry),
-                                          G_CALLBACK(Mask_Editor_Entry_Changed),NULL);
-        return;
-    }
+    gchar *tmp = string;
 
-    /* Get the text of the last selected row */
-    lastSelected = (GtkTreePath *)g_list_last(selectedRows)->data;
-
-    valid= gtk_tree_model_get_iter(treemodel, &lastFile, lastSelected);
-    if (valid)
+    while ((tmp = strstr (tmp, "%20")) != NULL)
     {
-        gtk_tree_model_get(treemodel, &lastFile, MASK_EDITOR_TEXT, &text, -1);
-
-        if (text)
-        {
-            gtk_entry_set_text(GTK_ENTRY(MaskEditorEntry),text);
-            g_free(text);
-        }
+        *(tmp++) = ' ';
+        strcpy (tmp, tmp + 2);
     }
-
-    g_signal_handlers_unblock_by_func(G_OBJECT(MaskEditorEntry),
-                                      G_CALLBACK(Mask_Editor_Entry_Changed),NULL);
-
-    g_list_free_full (selectedRows, (GDestroyNotify)gtk_tree_path_free);
-}
-
-
-/*
- * Add a new mask to the list
- */
-static void
-Mask_Editor_List_New (void)
-{
-    gchar *text = _("New_mask");
-    GtkTreeIter iter;
-    GtkTreeSelection *selection;
-    GtkTreeModel *treemodel;
-
-    g_return_if_fail (MaskEditorList != NULL);
-
-    selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(MaskEditorList));
-    treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(MaskEditorList));
-
-    gtk_list_store_insert(GTK_LIST_STORE(treemodel), &iter, 0);
-    gtk_list_store_set(GTK_LIST_STORE(treemodel), &iter, MASK_EDITOR_TEXT, text, -1);
-
-    gtk_tree_selection_unselect_all(selection);
-    gtk_tree_selection_select_iter(selection, &iter);
 }
 
 /*
- * Duplicate a mask on the list
+ * Function to replace space by '_'. No need to reallocate.
  */
-static void
-Mask_Editor_List_Duplicate (void)
-{
-    gchar *text = NULL;
-    GList *selectedRows;
-    GList *l;
-    GList *toInsert = NULL;
-    GtkTreeSelection *selection;
-    GtkTreeIter rowIter;
-    GtkTreeModel *treeModel;
-
-    g_return_if_fail (MaskEditorList != NULL);
-
-    selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(MaskEditorList));
-    selectedRows = gtk_tree_selection_get_selected_rows(selection, NULL);
-    treeModel = gtk_tree_view_get_model(GTK_TREE_VIEW(MaskEditorList));
-
-    if (!selectedRows)
-    {
-        Log_Print(LOG_ERROR,_("Copy: No row selected"));
-        return;
-    }
-
-    /* Loop through selected rows, duplicating them into a GList
-     * We cannot directly insert because the paths in selectedRows
-     * get out of date after an insertion */
-    for (l = selectedRows; l != NULL; l = g_list_next (l))
-    {
-        if (gtk_tree_model_get_iter (treeModel, &rowIter,
-                                     (GtkTreePath*)l->data))
-        {
-            gtk_tree_model_get(treeModel, &rowIter, MASK_EDITOR_TEXT, &text, -1);
-            toInsert = g_list_prepend (toInsert, text);
-        }
-    }
-
-    for (l = toInsert; l != NULL; l = g_list_next (l))
-    {
-        gtk_list_store_insert_with_values (GTK_LIST_STORE(treeModel), &rowIter,
-                                           0, MASK_EDITOR_TEXT,
-                                           (gchar *)l->data, -1);
-    }
-
-    // Set focus to the last inserted line
-    if (toInsert)
-        Mask_Editor_List_Set_Row_Visible(treeModel,&rowIter);
-
-    /* Free data no longer needed */
-    g_list_free_full (selectedRows, (GDestroyNotify)gtk_tree_path_free);
-    g_list_free_full (toInsert, (GDestroyNotify)g_free);
-}
-
-static void
-Mask_Editor_List_Add (void)
+void
+Scan_Convert_Space_Into_Underscore (gchar *string)
 {
-    gint i = 0;
-    GtkTreeModel *treemodel;
-    gchar *temp;
-
-    treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(MaskEditorList));
-
-    if (gtk_combo_box_get_active(GTK_COMBO_BOX(ScannerOptionCombo)) == SCANNER_FILL_TAG)
-    {
-        while(Scan_Masks[i])
-        {
-            /*if (!g_utf8_validate(Scan_Masks[i], -1, NULL))
-                temp = convert_to_utf8(Scan_Masks[i]);
-            else
-                temp = g_strdup(Scan_Masks[i]);*/
-            temp = Try_To_Validate_Utf8_String(Scan_Masks[i]);
+    gchar *tmp = string;
 
-            gtk_list_store_insert_with_values (GTK_LIST_STORE (treemodel),
-                                               NULL, G_MAXINT,
-                                               MASK_EDITOR_TEXT, temp, -1);
-            g_free(temp);
-            i++;
-        }
-    } else if (gtk_combo_box_get_active(GTK_COMBO_BOX(ScannerOptionCombo)) == SCANNER_RENAME_FILE)
+    while ((tmp = strchr (tmp, ' ')) != NULL)
     {
-        while(Rename_File_Masks[i])
-        {
-            /*if (!g_utf8_validate(Rename_File_Masks[i], -1, NULL))
-                temp = convert_to_utf8(Rename_File_Masks[i]);
-            else
-                temp = g_strdup(Rename_File_Masks[i]);*/
-            temp = Try_To_Validate_Utf8_String(Rename_File_Masks[i]);
-
-            gtk_list_store_insert_with_values (GTK_LIST_STORE (treemodel),
-                                               NULL, G_MAXINT,
-                                               MASK_EDITOR_TEXT, temp, -1);
-            g_free(temp);
-            i++;
-        }
+        *tmp = '_';
     }
 }
 
-/*
- * Remove the selected rows from the mask editor list
- */
-static void
-Mask_Editor_List_Remove (void)
+void
+Scan_Process_Fields_Remove_Space (gchar *string)
 {
-    GtkTreeSelection *selection;
-    GtkTreeIter iter;
-    GtkTreeModel *treemodel;
-
-    g_return_if_fail (MaskEditorList != NULL);
-
-    selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(MaskEditorList));
-    treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(MaskEditorList));
-
-    if (gtk_tree_selection_count_selected_rows(selection) == 0) {
-        Log_Print(LOG_ERROR,_("Remove: No row selected"));
-        return;
-    }
+    gchar *tmp, *tmp1;
 
-    if (!gtk_tree_model_get_iter_first(treemodel, &iter))
-        return;
+    tmp = tmp1 = string;
 
-    while (TRUE)
+    while (*tmp)
     {
-        if (gtk_tree_selection_iter_is_selected(selection, &iter))
-        {
-            if (!gtk_list_store_remove(GTK_LIST_STORE(treemodel), &iter))
-            {
-                break;
-            }
-        } else
-        {
-            if (!gtk_tree_model_iter_next(treemodel, &iter))
-            {
-                break;
-            }
-        }
+        while (*tmp == ' ')
+            tmp++;
+        if (*tmp)
+            *(tmp1++) = *(tmp++);
     }
+    *tmp1 = '\0';
 }
 
 /*
- * Move all selected rows up one place in the mask list
+ * Scan_Process_Fields_Insert_Space:
+ * @string: Input string
+ *
+ * This function will insert space before every uppercase character.
+ *
+ * Returns: A newly allocated string.
  */
-static void
-Mask_Editor_List_Move_Up (void)
+gchar *
+Scan_Process_Fields_Insert_Space (const gchar *string)
 {
-    GtkTreeSelection *selection;
-    GList *selectedRows;
-    GList *l;
-    GtkTreeIter currentFile;
-    GtkTreeIter nextFile;
-    GtkTreePath *currentPath;
-    GtkTreeModel *treemodel;
-
-    g_return_if_fail (MaskEditorList != NULL);
+    gchar *iter;
+    gunichar c;
+    GString *string1;
 
-    selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(MaskEditorList));
-    treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(MaskEditorList));
-    selectedRows = gtk_tree_selection_get_selected_rows(selection, NULL);
+    string1 = g_string_new ("");
+    g_string_append_c (string1, *string);
 
-    if (!selectedRows)
+    for (iter = g_utf8_next_char (string); *iter; iter = g_utf8_next_char (iter))
     {
-        Log_Print(LOG_ERROR,_("Move Up: No row selected"));
-        return;
-    }
+        c = g_utf8_get_char (iter);
 
-    for (l = selectedRows; l != NULL; l = g_list_next (l))
-    {
-        currentPath = (GtkTreePath *)l->data;
-        if (gtk_tree_model_get_iter(treemodel, &currentFile, currentPath))
+        if (g_unichar_isupper (c))
         {
-            /* Find the entry above the node... */
-            if (gtk_tree_path_prev(currentPath))
-            {
-                /* ...and if it exists, swap the two rows by iter */
-                gtk_tree_model_get_iter(treemodel, &nextFile, currentPath);
-                gtk_list_store_swap(GTK_LIST_STORE(treemodel), &currentFile, &nextFile);
-            }
+            g_string_append_c (string1, ' ');
         }
-    }
-
-    g_list_free_full (selectedRows, (GDestroyNotify)gtk_tree_path_free);
-}
-
-/*
- * Move all selected rows down one place in the mask list
- */
-static void
-Mask_Editor_List_Move_Down (void)
-{
-    GtkTreeSelection *selection;
-    GList *selectedRows;
-    GList *l;
-    GtkTreeIter currentFile;
-    GtkTreeIter nextFile;
-    GtkTreePath *currentPath;
-    GtkTreeModel *treemodel;
-
-    g_return_if_fail (MaskEditorList != NULL);
-
-    selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(MaskEditorList));
-    treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(MaskEditorList));
-    selectedRows = gtk_tree_selection_get_selected_rows(selection, NULL);
-
-    if (!selectedRows)
-    {
-        Log_Print(LOG_ERROR,_("Move Down: No row selected"));
-        return;
-    }
-
-    for (l = selectedRows; l != NULL; l = g_list_next (l))
-    {
-        currentPath = (GtkTreePath *)l->data;
 
-        if (gtk_tree_model_get_iter(treemodel, &currentFile, currentPath))
-        {
-            /* Find the entry below the node and swap the two nodes by iter */
-            gtk_tree_path_next(currentPath);
-            if (gtk_tree_model_get_iter(treemodel, &nextFile, currentPath))
-                gtk_list_store_swap(GTK_LIST_STORE(treemodel), &currentFile, &nextFile);
-        }
+        g_string_append_unichar (string1, c);
     }
 
-    g_list_free_full (selectedRows, (GDestroyNotify)gtk_tree_path_free);
+    return g_string_free (string1, FALSE);
 }
 
 /*
- * Set a row visible in the mask editor list (by scrolling the list)
+ * The function removes the duplicated spaces. No need to reallocate.
  */
-static void
-Mask_Editor_List_Set_Row_Visible (GtkTreeModel *treeModel, GtkTreeIter *rowIter)
+void
+Scan_Process_Fields_Keep_One_Space (gchar *string)
 {
-    /*
-     * TODO: Make this only scroll to the row if it is not visible
-     * (like in easytag GTK1)
-     * See function gtk_tree_view_get_visible_rect() ??
-     */
-    GtkTreePath *rowPath;
-
-    g_return_if_fail (treeModel != NULL);
-
-    rowPath = gtk_tree_model_get_path(treeModel, rowIter);
-    gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(MaskEditorList), rowPath, NULL, FALSE, 0, 0);
-    gtk_tree_path_free(rowPath);
-}
+    gchar *tmp, *tmp1;
 
-/*
- * Save the currently displayed mask list in the mask editor
- */
-static void
-Mask_Editor_List_Save_Button (void)
-{
-    Mask_Editor_Clean_Up_Masks_List();
+    tmp = tmp1 = string;
 
-    if (gtk_combo_box_get_active(GTK_COMBO_BOX(ScannerOptionCombo)) == SCANNER_FILL_TAG)
-    {
-        Save_Scan_Tag_Masks_List(ScanTagListModel, MASK_EDITOR_TEXT);
-    } else if (gtk_combo_box_get_active(GTK_COMBO_BOX(ScannerOptionCombo)) == SCANNER_RENAME_FILE)
+    // Remove multiple consecutive underscores and spaces.
+    while (*tmp1)
     {
-        Save_Rename_File_Masks_List(RenameFileListModel, MASK_EDITOR_TEXT);
+        while (*tmp1 && *tmp1 != ' ' && *tmp1 != '_')
+            *(tmp++) = *(tmp1++);
+        if (!*tmp1)
+            break;
+        *(tmp++) = *(tmp1++);
+        while (*tmp1 == ' ' || *tmp1 == '_')
+            tmp1++;
     }
+    *tmp = '\0';
 }
 
 /*
- * Clean up the currently displayed masks lists, ready for saving
+ * Function to remove spaces
+ * No need to reallocate
  */
-static void
-Mask_Editor_Clean_Up_Masks_List (void)
+void
+Scan_Remove_Spaces (gchar *string)
 {
-    gchar *text = NULL;
-    gchar *text1 = NULL;
-    GtkTreeIter currentIter;
-    GtkTreeIter itercopy;
-    GtkTreeModel *treemodel;
-
-    treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(MaskEditorList));
+  int nextnotspace = 0, pos = 0;
 
-    /* Remove blank and duplicate items */
-    if (gtk_tree_model_get_iter_first(treemodel, &currentIter))
+  while(string[pos] != '\0')
+  {
+    if(string[pos] == ' ')
     {
-
-        while(TRUE)
-        {
-            gtk_tree_model_get(treemodel, &currentIter, MASK_EDITOR_TEXT, &text, -1);
-
-            /* Check for blank entry */
-            if (text && g_utf8_strlen(text, -1) == 0)
-            {
-                g_free(text);
-
-                if (!gtk_list_store_remove(GTK_LIST_STORE(treemodel), &currentIter))
-                    break; /* No following entries */
-                else
-                    continue; /* Go on to next entry, which the remove function already moved onto for us */
-            }
-
-            /* Check for duplicate entries */
-            itercopy = currentIter;
-            if (!gtk_tree_model_iter_next(treemodel, &itercopy))
-            {
-                g_free(text);
-                break;
-            }
-
-            while(TRUE)
-            {
-                gtk_tree_model_get(treemodel, &itercopy, MASK_EDITOR_TEXT, &text1, -1);
-                if (text1 && g_utf8_collate(text,text1) == 0)
-                {
-                    g_free(text1);
-
-                    if (!gtk_list_store_remove(GTK_LIST_STORE(treemodel), &itercopy))
-                        break; /* No following entries */
-                    else
-                        continue; /* Go on to next entry, which the remove function already set iter to for us */
-
-                }
-                g_free(text1);
-                if (!gtk_tree_model_iter_next(treemodel, &itercopy))
-                    break;
-            }
-
-            g_free(text);
-
-            if (!gtk_tree_model_iter_next(treemodel, &currentIter))
-                break;
-        }
+      nextnotspace = pos;
+      while(string[++nextnotspace] == ' ');
+      string[pos] = string[nextnotspace];
+      string[nextnotspace] = ' ';
+      continue;
     }
+    pos++;
+  }
 }
 
-/*
- * Update the Mask List with the new value of the entry box
- */
-static void
-Mask_Editor_Entry_Changed (void)
+/* Returns a newly-allocated string. */
+gchar *
+Scan_Process_Fields_All_Uppercase (const gchar *string)
 {
-    GtkTreeSelection *selection;
-    GtkTreePath *firstSelected;
-    GtkTreeModel *treemodel;
-    GList *selectedRows;
-    GtkTreeIter row;
-    const gchar* text;
-
-    g_return_if_fail (MaskEditorList != NULL);
-
-    selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(MaskEditorList));
-    treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(MaskEditorList));
-    selectedRows = gtk_tree_selection_get_selected_rows(selection, NULL);
-
-    if (!selectedRows)
-    {
-        return;
-    }
-
-    firstSelected = (GtkTreePath *)g_list_first(selectedRows)->data;
-    text = gtk_entry_get_text(GTK_ENTRY(MaskEditorEntry));
-
-    if (gtk_tree_model_get_iter (treemodel, &row, firstSelected))
-    {
-        gtk_list_store_set(GTK_LIST_STORE(treemodel), &row, MASK_EDITOR_TEXT, text, -1);
-    }
-
-    g_list_free_full (selectedRows, (GDestroyNotify)gtk_tree_path_free);
+    return g_utf8_strup (string, -1);
 }
 
-/*
- * Actions when the a key is pressed into the masks editor clist
- */
-static gboolean
-Mask_Editor_List_Key_Press (GtkWidget *widget, GdkEvent *event)
+/* Returns a newly-allocated string. */
+gchar *
+Scan_Process_Fields_All_Downcase (const gchar *string)
 {
-    if (event && event->type == GDK_KEY_PRESS) {
-        GdkEventKey *kevent = (GdkEventKey *)event;
-
-        switch(kevent->keyval)
-        {
-            case GDK_KEY_Delete:
-                Mask_Editor_List_Remove();
-                break;
-/*          case GDK_KEY_Up:
-                Mask_Editor_Clist_Move_Up();
-                break;
-            case GDK_KEY_Down:
-                Mask_Editor_Clist_Move_Down();
-                break;
-*/      }
-    }
-    return TRUE;
+    return g_utf8_strdown (string, -1);
 }
 
-/*
- * Function when you select an item of the option menu
- */
-static void
-Scanner_Option_Menu_Activate_Item (GtkWidget *combo, gpointer data)
+/* Returns a newly-allocated string. */
+gchar *
+Scan_Process_Fields_Letter_Uppercase (const gchar *string)
 {
-    GtkRadioAction *radio_action;
+    const gchar *temp;
+    gchar temp2[6];
+    gboolean set_to_upper_case = TRUE;
+    gunichar c;
+    GString *string1;
 
-    radio_action = GTK_RADIO_ACTION (gtk_ui_manager_get_action (UIManager,
-                                                                "/MenuBar/ViewMenu/ScannerMenu/FillTag"));
-    SCANNER_TYPE = gtk_combo_box_get_active (GTK_COMBO_BOX (combo));
-    gtk_radio_action_set_current_value (radio_action, SCANNER_TYPE);
+    string1 = g_string_new ("");
 
-    switch (SCANNER_TYPE)
+    for (temp = string; *temp; temp = g_utf8_next_char (temp))
     {
-        case SCANNER_FILL_TAG:
-            gtk_widget_show(MaskEditorButton);
-            gtk_widget_show(LegendButton);
-            gtk_widget_show(ScanTagFrame);
-            gtk_widget_hide(RenameFileFrame);
-            gtk_widget_hide(ProcessFieldsFrame);
-            gtk_tree_view_set_model(GTK_TREE_VIEW(MaskEditorList), GTK_TREE_MODEL(ScanTagListModel));
-            Scan_Fill_Tag_Generate_Preview();
-            g_signal_emit_by_name(G_OBJECT(LegendButton),"toggled");        /* To hide or show legend frame */
-            g_signal_emit_by_name(G_OBJECT(MaskEditorButton),"toggled");    /* To hide or show mask editor frame */
-            break;
+        gchar *temp3;
+        int l;
 
-        case SCANNER_RENAME_FILE:
-            gtk_widget_show(MaskEditorButton);
-            gtk_widget_show(LegendButton);
-            gtk_widget_hide(ScanTagFrame);
-            gtk_widget_show(RenameFileFrame);
-            gtk_widget_hide(ProcessFieldsFrame);
-            gtk_tree_view_set_model(GTK_TREE_VIEW(MaskEditorList), GTK_TREE_MODEL(RenameFileListModel));
-            Scan_Rename_File_Generate_Preview();
-            g_signal_emit_by_name(G_OBJECT(LegendButton),"toggled");        /* To hide or show legend frame */
-            g_signal_emit_by_name(G_OBJECT(MaskEditorButton),"toggled");    /* To hide or show mask editor frame */
-            break;
+        c = g_utf8_get_char (temp);
+        l = g_unichar_to_utf8 (c, temp2);
 
-        case SCANNER_PROCESS_FIELDS:
-            gtk_widget_hide(MaskEditorButton);
-            gtk_widget_hide(LegendButton);
-            gtk_widget_hide(ScanTagFrame);
-            gtk_widget_hide(RenameFileFrame);
-            gtk_widget_show_all(ProcessFieldsFrame);
-            // Hide directly the frames to don't change state of the buttons!
-            gtk_widget_hide(LegendFrame);
-            gtk_widget_hide(MaskEditorFrame);
+        if (set_to_upper_case && g_unichar_islower(c))
+        {
+            temp3 = g_utf8_strup (temp2, l);
+            g_string_append (string1, temp3);
+            g_free (temp3);
+        }
+        else if (!set_to_upper_case && g_unichar_isupper(c))
+        {
+            temp3 = g_utf8_strdown (temp2, l);
+            g_string_append (string1, temp3);
+            g_free (temp3);
+        }
+        else
+        {
+            g_string_append_len (string1, temp2, l);
+        }
 
-            gtk_tree_view_set_model(GTK_TREE_VIEW(MaskEditorList), NULL);
-            break;
-    }
-}
+        /* Uppercase the word 'I' in english */
+        if (!set_to_upper_case &&
+            (*(temp - 1) == ' ' || *(temp - 1) == '_') &&
+            (*temp == 'i' || *temp == 'I') &&
+            (*(temp + 1) == ' ' || *(temp + 1) == '_'))
+        {
+            string1->str [string1->len - 1] = 'I';
+        }
 
-/*
- * Init the position of the scanner window
- */
-static void
-Scan_Set_Scanner_Window_Init_Position (void)
-{
-    if (ScannerWindow && SET_SCANNER_WINDOW_POSITION)
-    {
-        gtk_widget_realize(ScannerWindow);
-        gtk_window_move(GTK_WINDOW(ScannerWindow),SCANNER_WINDOW_X,SCANNER_WINDOW_Y);
+        /* After the first time, all will be lower case. */
+        set_to_upper_case = FALSE;
     }
-}
 
-/*
- * et_scan_on_response:
- * @dialog: the scanner window
- * @response_id: the #GtkResponseType corresponding to the dialog event
- * @user_data: user data set when the signal was connected
- *
- * Handle the response signal of the scanner dialog.
- */
-static void
-et_scan_on_response (GtkDialog *dialog, gint response_id, gpointer user_data)
-{
-    switch (response_id)
-    {
-        case GTK_RESPONSE_APPLY:
-            Action_Scan_Selected_Files ();
-            break;
-        case GTK_RESPONSE_DELETE_EVENT:
-        case GTK_RESPONSE_CLOSE:
-            ScannerWindow_Quit ();
-            break;
-        default:
-            g_assert_not_reached ();
-            break;
-    }
+    return g_string_free (string1, FALSE);
 }
diff --git a/src/scan.h b/src/scan.h
index 909f60d..8c54686 100644
--- a/src/scan.h
+++ b/src/scan.h
@@ -1,80 +1,35 @@
-/* scan.h - 2000/06/16 */
-/*
- *  EasyTAG - Tag editor for MP3 and Ogg Vorbis files
- *  Copyright (C) 2000-2003  Jerome Couderc <easytag at gmail.com>
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#ifndef ET_SCAN_H_
+#define ET_SCAN_H_
 
-#ifndef __SCAN_H__
-#define __SCAN_H__
-
-
-#include "et_core.h"
-
-/****************
- * Declarations *
- ****************/
-GtkWidget *ScannerWindow;
-
-
-enum
-{
-    SCANNER_FILL_TAG = 0,
-    SCANNER_RENAME_FILE,
-    SCANNER_PROCESS_FIELDS
-}; // Add a new item : Min and Max values used in Open_ScannerWindow
-
-enum {
-    MASK_EDITOR_TEXT,
-    MASK_EDITOR_COUNT
-};
-
-
-
-/**************
- * Prototypes *
- **************/
-
-void   Scan_Select_Mode_And_Run_Scanner     (ET_File *ETFile);
-gchar *Scan_Generate_New_Filename_From_Mask       (ET_File *ETFile, gchar *mask, gboolean no_dir_check_or_conversion);
-gchar *Scan_Generate_New_Directory_Name_From_Mask (ET_File *ETFile, gchar *mask, gboolean no_dir_check_or_conversion);
-void   Scan_Rename_File_Generate_Preview      (void);
-void   Scan_Fill_Tag_Generate_Preview         (void);
-void   Scan_Rename_Directory_Generate_Preview (void);
-
-void et_scan_show (GtkAction *action, gpointer user_data);
-
-void entry_check_rename_file_mask (GtkEntry *entry, gpointer user_data);
-
-void Scan_Process_Fields_All_Uppercase           (gchar *string);
-void Scan_Process_Fields_All_Downcase            (gchar *string);
-void Scan_Process_Fields_Letter_Uppercase        (gchar *string);
-void Scan_Process_Fields_First_Letters_Uppercase (gchar *string);
-void Scan_Process_Fields_Remove_Space            (gchar *string);
-void Scan_Process_Fields_Insert_Space            (gchar **string);
-void Scan_Process_Fields_Keep_One_Space          (gchar *string);
+#include <glib.h>
 
 void Scan_Convert_Underscore_Into_Space (gchar *string);
-void Scan_Convert_P20_Into_Space        (gchar *string);
-void Scan_Convert_Space_Into_Undescore  (gchar *string);
-void Scan_Remove_Spaces                 (gchar *string);
-
-void Init_ScannerWindow (void);
-void Open_ScannerWindow (gint scanner_type);
-void ScannerWindow_Apply_Changes (void);
-
-#endif /* __SCAN_H__ */
+void Scan_Convert_P20_Into_Space (gchar *string);
+void Scan_Convert_Space_Into_Underscore (gchar *string);
+void Scan_Process_Fields_Remove_Space (gchar *string);
+gchar* Scan_Process_Fields_Insert_Space (const gchar *string);
+void Scan_Process_Fields_Keep_One_Space (gchar *string);
+void Scan_Remove_Spaces (gchar *string);
+gchar* Scan_Process_Fields_All_Uppercase (const gchar *string);
+gchar* Scan_Process_Fields_All_Downcase (const gchar *string);
+gchar* Scan_Process_Fields_Letter_Uppercase (const gchar *string);
+
+#endif /* !ET_SCAN_H_ */
diff --git a/src/scan.c b/src/scan_dialog.c
similarity index 89%
copy from src/scan.c
copy to src/scan_dialog.c
index 1a0bf52..b9e175f 100644
--- a/src/scan.c
+++ b/src/scan_dialog.c
@@ -27,6 +27,8 @@
 #include <config.h>
 #include <glib/gi18n.h>
 
+#include "scan_dialog.h"
+
 #include "gtk2_compat.h"
 #include "scan.h"
 #include "easytag.h"
@@ -263,10 +265,6 @@ static void Mask_Editor_Clean_Up_Masks_List (void);
 
 static void Scanner_Option_Menu_Activate_Item (GtkWidget *widget, gpointer data);
 
-static int roman2int (const char *str);
-static const char *int2roman (int num);
-static char *int2roman_r (int num, char * str, size_t len);
-
 static void Scan_Convert_Character (gchar **string);
 static GList *Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask);
 static void Scan_Set_Scanner_Window_Init_Position (void);
@@ -427,8 +425,8 @@ Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask)
     }
     if (FTS_CONVERT_SPACE_INTO_UNDERSCORE)
     {
-        Scan_Convert_Space_Into_Undescore(mask);
-        Scan_Convert_Space_Into_Undescore(filename_utf8);
+        Scan_Convert_Space_Into_Underscore (mask);
+        Scan_Convert_Space_Into_Underscore (filename_utf8);
     }
 
 
@@ -807,7 +805,7 @@ gchar *Scan_Generate_New_Filename_From_Mask (ET_File *ETFile, gchar *mask, gbool
                 }
                 if (RFS_CONVERT_SPACE_INTO_UNDERSCORE)
                 {
-                    Scan_Convert_Space_Into_Undescore(mask_item->string);
+                    Scan_Convert_Space_Into_Underscore (mask_item->string);
                 }
                 if (RFS_REMOVE_SPACES)
                 {
@@ -1008,10 +1006,16 @@ Scan_Rename_File_Prefix_Path (void)
     gchar *path_tmp;
     const gchar *combo_text = NULL;
     gchar *combo_tmp;
-    ET_File *ETFile          = ETCore->ETFileDisplayed;
-    gchar *filename_utf8_cur = ((File_Name *)ETFile->FileNameCur->data)->value_utf8;
+    ET_File *ETFile = ETCore->ETFileDisplayed;
+    gchar *filename_utf8_cur;
     gchar *path_utf8_cur;
 
+    if (!ETFile)
+    {
+        return;
+    }
+
+    filename_utf8_cur = ((File_Name *)ETFile->FileNameCur->data)->value_utf8;
 
     // The path to prefix
     path_utf8_cur = g_path_get_dirname(filename_utf8_cur);
@@ -1362,10 +1366,15 @@ Scan_Process_Fields_Functions (gchar **string)
     }
 
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsConvertSpace)))
-        Scan_Convert_Space_Into_Undescore(*string);
+        Scan_Convert_Space_Into_Underscore (*string);
 
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsInsertSpace)))
-        Scan_Process_Fields_Insert_Space(string);
+    {
+        gchar *res;
+        res = Scan_Process_Fields_Insert_Space (*string);
+        g_free (*string);
+        *string = res;
+    }
 
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsOnlyOneSpace)))
         Scan_Process_Fields_Keep_One_Space(*string);
@@ -1374,101 +1383,35 @@ Scan_Process_Fields_Functions (gchar **string)
         Scan_Convert_Character(string);
 
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsAllUppercase)))
-        Scan_Process_Fields_All_Uppercase(*string);
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsAllDowncase)))
-        Scan_Process_Fields_All_Downcase(*string);
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsFirstLetterUppercase)))
-         Scan_Process_Fields_Letter_Uppercase(*string);
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsFirstLettersUppercase)))
-        Scan_Process_Fields_First_Letters_Uppercase(*string);
-
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsRemoveSpace)))
-        Scan_Process_Fields_Remove_Space(*string);
-
-}
-
-void Scan_Process_Fields_All_Uppercase (gchar *string)
-{
-    gchar *temp;
-    gchar temp2[6]; // Must have at least 6 bytes of space
-    gunichar c;
-
-    for (temp = string; *temp; temp = g_utf8_next_char(temp))
     {
-        c = g_utf8_get_char(temp);
-        if (g_unichar_islower(c))
-            strncpy(temp, temp2, g_unichar_to_utf8(g_unichar_toupper(c), temp2));
+        gchar *res;
+        res = Scan_Process_Fields_All_Uppercase (*string);
+        g_free (*string);
+        *string = res;
     }
-}
-
-void Scan_Process_Fields_All_Downcase (gchar *string)
-{
-    gchar *temp;
-    gchar temp2[6];
-    gunichar c;
 
-    for (temp = string; *temp; temp = g_utf8_next_char(temp))
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsAllDowncase)))
     {
-        c = g_utf8_get_char(temp);
-        if (g_unichar_isupper(c))
-            strncpy(temp, temp2, g_unichar_to_utf8(g_unichar_tolower(c), temp2));
+        gchar *res;
+        res = Scan_Process_Fields_All_Downcase (*string);
+        g_free (*string);
+        *string = res;
     }
-}
 
-void Scan_Process_Fields_Letter_Uppercase (gchar *string)
-{
-    gchar *temp;
-    gchar temp2[6];
-    gboolean set_to_upper_case = TRUE;
-    gunichar c;
-    gchar utf8_character[6];
-    gchar *word, *word1, *word2;
-
-    for (temp = string; *temp; temp = g_utf8_next_char(temp))
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsFirstLetterUppercase)))
     {
-        c = g_utf8_get_char(temp);
-        if (set_to_upper_case && g_unichar_islower(c))
-            strncpy(temp, temp2, g_unichar_to_utf8(g_unichar_toupper(c), temp2));
-        else if (!set_to_upper_case && g_unichar_isupper(c))
-            strncpy(temp, temp2, g_unichar_to_utf8(g_unichar_tolower(c), temp2));
-        set_to_upper_case = FALSE; // After the first time, all will be down case
+        gchar *res;
+        res = Scan_Process_Fields_Letter_Uppercase (*string);
+        g_free (*string);
+        *string = res;
     }
 
-    temp = string;
-
-    // Uppercase again the word 'I' in english
-    while ( temp )
-    {
-        word = temp; // Needed if there is only one word
-        word1 = g_utf8_strchr(temp,-1,' ');
-        word2 = g_utf8_strchr(temp,-1,'_');
-
-        // Take the first string found (near beginning of string)
-        if (word1 && word2)
-            word = MIN(word1,word2);
-        else if (word1)
-            word = word1;
-        else if (word2)
-            word = word2;
-        else
-            // Last word of the string
-            break;
-
-        // Go to first character of the word (char. after ' ' or '_')
-        word = word+1;
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsFirstLettersUppercase)))
+        Scan_Process_Fields_First_Letters_Uppercase(*string);
 
-        // Set uppercase word 'I'
-        if (g_ascii_strncasecmp("I ", word, strlen("I ")) == 0)
-        {
-            c = g_utf8_get_char(word);
-            strncpy(word, utf8_character, g_unichar_to_utf8(g_unichar_toupper(c), utf8_character));
-        }
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsRemoveSpace)))
+        Scan_Process_Fields_Remove_Space(*string);
 
-        temp = word;
-    }
 }
 
 /*
@@ -1535,7 +1478,10 @@ void Scan_Process_Fields_First_Letters_Uppercase (gchar *string)
     {
         exempt[0] = NULL;
     }
-    Scan_Process_Fields_All_Downcase(string);
+
+    temp = Scan_Process_Fields_All_Downcase (string);
+    g_free (string);
+    string = temp;
 
     if (!g_utf8_validate(string,-1,NULL))
     {
@@ -1590,8 +1536,8 @@ void Scan_Process_Fields_First_Letters_Uppercase (gchar *string)
         // If the word is a roman numeral, capitalize all of it
         if ((len = Scan_Word_Is_Roman_Numeral(word)))
         {
-            gchar *tmp = g_utf8_strup (temp, len);
-            strncpy (string, tmp, len);
+            gchar *tmp = g_utf8_strup (word, len);
+            strncpy (word, tmp, len);
             g_free (tmp);
         } else
         {
@@ -1637,145 +1583,6 @@ void Scan_Process_Fields_First_Letters_Uppercase (gchar *string)
 
 }
 
-void Scan_Process_Fields_Remove_Space (gchar *string)
-{
-    gchar *tmp, *tmp1;
-
-    tmp = tmp1 = string;
-
-    while (*tmp)
-    {
-        while (*tmp == ' ')
-            tmp++;
-        if (*tmp)
-            *(tmp1++) = *(tmp++);
-    }
-    *tmp1 = '\0';
-}
-
-/*
- * The function inserts a space before an uppercase letter
- * It is needed to realloc the memory!
- */
-void Scan_Process_Fields_Insert_Space (gchar **string)
-{
-    gchar *iter;
-    gunichar c;
-    gint j;
-    guint string_length;
-    gchar *string1;
-
-    // FIX ME : we suppose that it will not grow more than 2 times its size...
-    string_length = 2 * strlen(*string);
-    //string1 = g_realloc(*string, string_length+1);
-    string1       = g_malloc(string_length+1);
-    strncpy(string1,*string,string_length);
-    string1[string_length]='\0';
-    g_free(*string);
-    *string = string1;
-
-    for (iter = g_utf8_next_char(*string); *iter; iter = g_utf8_next_char(iter)) // At start : g_utf8_next_char to not consider first "uppercase" letter
-    {
-        c = g_utf8_get_char(iter);
-
-        if (g_unichar_isupper(c))
-        {
-            for (j = strlen(iter); j > 0; j--)
-                *(iter + j) = *(iter + j - 1);
-            *iter = ' ';
-            iter++;
-        }
-    }
-}
-
-/*
- * The function removes the duplicated spaces
- * No need to reallocate
- */
-void Scan_Process_Fields_Keep_One_Space (gchar *string)
-{
-    gchar *tmp, *tmp1;
-
-    tmp = tmp1 = string;
-
-    // Remove multiple consecutive underscores and spaces.
-    while (*tmp1)
-    {
-        while (*tmp1 && *tmp1 != ' ' && *tmp1 != '_')
-            *(tmp++) = *(tmp1++);
-        if (!*tmp1)
-            break;
-        *(tmp++) = *(tmp1++);
-        while (*tmp1 == ' ' || *tmp1 == '_')
-            tmp1++;
-    }
-    *tmp = '\0';
-}
-
-/*
- * Function to replace underscore '_' by a space
- * No need to reallocate
- */
-void Scan_Convert_Underscore_Into_Space (gchar *string)
-{
-    gchar *tmp;
-
-    while ((tmp=strchr(string,'_'))!=NULL)
-        *tmp = ' ';
-}
-
-/*
- * Function to replace %20 by a space
- * No need to reallocate
- */
-void Scan_Convert_P20_Into_Space (gchar *string)
-{
-    gchar *tmp, *tmp1;
-
-    while ((tmp=strstr(string,"%20"))!=NULL)
-    {
-        tmp1 = tmp + 3;
-        *(tmp++) = ' ';
-        while (*tmp1)
-            *(tmp++) = *(tmp1++);
-        *tmp = '\0';
-    }
-}
-
-/*
- * Function to remove spaces
- * No need to reallocate
- */
-void Scan_Remove_Spaces (gchar *string)
-{
-  int nextnotspace = 0, pos = 0;
-
-  while(string[pos] != '\0')
-  {
-    if(string[pos] == ' ')
-    {
-      nextnotspace = pos;
-      while(string[++nextnotspace] == ' ');
-      string[pos] = string[nextnotspace];
-      string[nextnotspace] = ' ';
-      continue;
-    }
-    pos++;
-  }
-}
-
-/*
- * Function to replace space by '_'
- * No need to reallocate
- */
-void Scan_Convert_Space_Into_Undescore (gchar *string)
-{
-    gchar *tmp;
-
-    while ((tmp=strchr(string,' '))!=NULL)
-        *tmp = '_';
-}
-
 /*
  * Replace something with something else ;)
  * Here use Regular Expression, to search and replace.
@@ -1826,417 +1633,80 @@ handle_error:
     goto out;
 }
 
-/*
- * Quick roman numeral check (non-roman numerals may also return true)
- * Patch from Slash Bunny (2007.08.12)
- * (http://home.hiwaay.net/~lkseitz/math/roman/numerals.shtml)
- *    I = 1    (one)
- *    V = 5    (five)
- *    X = 10   (ten)
- *    L = 50   (fifty)
- *    C = 100  (one hundred)
- *    D = 500  (five hundred)
- *    M = 1000 (one thousand)
- */
 static gint
 Scan_Word_Is_Roman_Numeral (const gchar *text)
 {
-    const gchar *tmp;
-    gint  len;
-    gchar *buf = NULL;
-    gint   rn_int;
-    gchar *rn_char;
-
-    if (!ScannerWindow
-    ||  !ProcessFieldsDetectRomanNumerals
-    ||  !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ProcessFieldsDetectRomanNumerals)))
-        return 0;
-    
-    tmp = text;
-    len = 0;
-
-    while (*tmp)
-    {
-        if (*tmp == (gunichar)'i'
-        ||  *tmp == (gunichar)'v'
-        ||  *tmp == (gunichar)'x'
-        ||  *tmp == (gunichar)'l'
-        ||  *tmp == (gunichar)'c'
-        ||  *tmp == (gunichar)'d'
-        ||  *tmp == (gunichar)'m')
-        {
-            // Found a roman numeral => continue
-            tmp++;
-            len++;
-        } else if (*tmp == ' '
-               ||  *tmp == '_'
-               ||  *tmp == '.'
-               ||  *tmp == ','
-               ||  *tmp == '-')
-        {
-            // A separator was found => end of word
-            // Check if it is a valid roman numeral
-            goto roman_numeral_found;
-            
-        } else
-        {
-            return 0;
-        }
-    }
+    /* No need for caseless strchr. */
+    static const gchar romans[] = "MmDdCcLlXxVvIi";
 
-    // Found in last word of the string
-    
-roman_numeral_found:
-    // Check if it is a valid roman numeral
-    buf = g_strndup(text,len);
-    rn_int = roman2int(buf); // Convert the Roman numeral string to integer
-    
-    if (rn_int >= 0 )
-    {
-        // Some strings as "IIIII" or "CCCCC" are returned as valid, which is not correct...
-        // Same problem with: IC MIC IM MIM IL CIL XM MXM VC MVC VM MVM VL MVL LC MLC LD MLD LM MLM MDM 
-        // So we convert it again to a string, and compare to the initial one.
-        rn_char = (gchar *)int2roman(rn_int); // Convert the Roman numeral integer to string
-        if (rn_char
-        && strcasecmp(buf,rn_char)==0)
-        {
-            g_free(buf);
-            g_free(rn_char);
-            return len; // Roman numeral valid
-        }else
-        {
-            g_free(buf);
-            g_free(rn_char);
-            return 0;
-        }
-    }else
+    gsize next_allowed = 0;
+    gsize prev = 0;
+    gsize count = 0;
+
+    const gchar *i;
+
+    if (!ScannerWindow || !ProcessFieldsDetectRomanNumerals
+        || !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ProcessFieldsDetectRomanNumerals)))
     {
-        g_free(buf);
         return 0;
     }
-}
 
+    for (i = text; *i; i++)
+    {
+        const char *s = strchr (romans, *i);
 
+        if (s)
+        {
+            gsize c = (s - romans) / 2;
 
-/*
- * Taken from :
- *   Roman Numeral Conversion API (http://sourceforge.net/project/showfiles.php?group_id=211070)
- *    Copyright (c) 2007 David M. Syzdek <roman-project at syzdek.net>
- */
-/* Convert Roman numeral from integer to string */
-static const char *
-int2roman (int num)
-{
-    #define ROMAN_BUFF_LEN 512
-    
-    /* buffer for storing conversions */
-    char roman_string[ROMAN_BUFF_LEN];
-
-    /* wrap long2roman_r() with library buffer */
-    char *result = int2roman_r(num, roman_string, ROMAN_BUFF_LEN);
-   
-    if (!result)
-         return NULL;
-    return g_strdup(roman_string);
-}
-
-static char *
-int2roman_r (int num, char * str, size_t len)
-{
-   // local variables
-   unsigned pos;
-   unsigned u;
-   unsigned dividend;
-
-   g_return_val_if_fail (str != NULL, NULL);
-
-   // verify that number is withing boundaries
-   if ((num > 5000) || (num < 0))
-   {
-      return NULL;
-   };
-
-   // sets initial values
-   pos = 0;
-   memset(str, 0, len);
-   len--;
-
-   // checks for nullae
-   if (!(num))
-   {
-      str[0] = 'N';
-      return str;
-   };
-
-   // calculates thousands
-   dividend = num/1000;
-   if (dividend > (len-1))
-   {
-      return NULL;
-   };
-   for (u = 0; u < dividend; u++)
-      str[pos+u] = 'M';
-   num %= 1000;
-   pos += u;
-
-   // calculates hundreds
-   dividend = num/100;
-   if (dividend > (len-1-pos))
-   {
-      return NULL;
-   };
-   if (dividend == 9)
-   {
-      str[pos+0] = 'C';
-      str[pos+1] = 'M';
-      pos += 2;
-      dividend = 0;
-   };
-   if (dividend >= 5)
-   {
-      str[pos] = 'D';
-      dividend -= 5;
-      pos++;
-   };
-   if (dividend == 4)
-   {
-      str[pos+0] = 'C';
-      str[pos+1] = 'D';
-      dividend -= 4;
-      pos += 2;
-   };
-   for(u = 0; u < dividend; u++)
-      str[pos+u] = 'C';
-   pos += u;
-   num %= 100;
-
-   // calculates tens
-   dividend = num/10;
-   if (dividend > (len-1-pos))
-   {
-      return NULL;
-   };
-   if (dividend == 9)
-   {
-      str[pos+0] = 'X';
-      str[pos+1] = 'C';
-      dividend = 0;
-      pos += 2;
-   };
-   if (dividend >= 5)
-   {
-      str[pos+0] = 'L';
-      dividend -= 5;
-      pos++;
-   };
-   if (dividend == 4)
-   {
-      str[pos+0] = 'X';
-      str[pos+1] = 'L';
-      pos += 2;
-      dividend -= 4;
-   };
-   for (u = 0; u < dividend; u++)
-      str[pos+u] = 'X';
-   pos += u;
-   num %= 10;
-
-   // calculates ones
-   dividend = num;
-   if (dividend > (len-1-pos))
-   {
-      return NULL;
-   };
-   if (dividend == 9)
-   {
-      str[pos+0] = 'I';
-      str[pos+1] = 'X';
-      dividend = 0;
-      pos += 2;
-   };
-   if (dividend >= 5)
-   {
-      str[pos+0] = 'V';
-      dividend -= 5;
-      pos++;
-   };
-   if (dividend == 4)
-   {
-      str[pos+0] = 'I';
-      str[pos+1] = 'V';
-      pos += 2;
-      dividend -= 4;
-   };
-   for(u = 0; u < dividend; u++)
-      str[pos+u] = 'I';
-
-   /* ends function */
-   return str;
-}
-
-/* Convert Roman numeral from string to integer */
-static int
-roman2int (const char *str)
-{
-   // declares local vars
-   int      num;
-   unsigned i;
-   unsigned len;
-   unsigned last;
-   unsigned prevlast;
-
-   // checks args
-   if (!(str))
-   {
-      return(0);
-   };
-
-   // sets initial values 
-   num  = 0;
-   len  = strlen(str);
-   last = 1000;
-   prevlast = 1000;
-
-   // loops through characters
-   for(i = 0; i < len; i++)
-   {
-      switch(str[i])
-      {
-         case 'n':
-         case 'N':
-            if (strlen(str) > 1)
-            {
-               return(-1);
-            };
-            return(0);
-            break;
-         case 'i':
-         case 'I':
-            num  += 1;
-            // prevent patterns like IXI
-            if ((prevlast == 1) && (last != 1))
-            {
-               return(-1);
-            };
-            // prevent patterns like IIIII and VIIIII
-            if ((!(num%5)) || (!(num%10)))
+            if (c < next_allowed)
             {
-              return(-1);
-            };
-            // rotates value into history
-            prevlast   = last;
-            last  = 1;
-            break;
-         case 'v':
-         case 'V':
-            num += 5;
-            // tests for invalid syntax
-            if ( ((last <= 5) && (last != 1)) || (prevlast <= 5) )
-            {
-               return(-1);
+                return 0;
             }
-            // applies subtraction method & rotates value into history
-            if (last < 5)
-               num -= (last * 2);
-            prevlast  = last;
-            last = 5;
-            break;
-         case 'x':
-         case 'X':
-            num += 10;
-            // tests for invalid syntax
-            if ( ((prevlast < 10) && (last <= 10)) || ((last < 10) && (last != 1)) )
-            {
-               return(-1);
-            };
-            // prevent patterns like XXXXX and VXXXXX
-            if ((!(num%50)) || (!(num%100)))
-            {
-               return(-1);
-            };
-            // applies subtraction method & rotates value into history
-            if (last == 1)
-               num -= (last * 2);
-            prevlast  = last;
-            last = 10;
-            break;
-         case 'l':
-         case 'L':
-            num += 50;
-            // tests for invalid syntax
-            if ( ((last <= 50) && (last != 10)) || (prevlast <= 50) )
+
+            if (c < prev)
             {
-               return(-1);
+                /* After subtraction, no more subtracted chars allowed. */
+                next_allowed = prev + 1;
             }
-            // applies subtraction method & rotates value into history
-            if (last < 50)
-               num -= (last * 2);
-            prevlast  = last;
-            last = 50;
-            break;
-         case 'c':
-         case 'C':
-            num += 100;
-            // tests for invalid syntax
-            if ( ((prevlast < 100) && (last <= 100)) || ((last < 100) && (last != 10)) )
-            {
-               return(-1);
-            };
-            // prevent patterns like CCCCC and VCCCCC
-            if ((!(num%500)) || (!(num%1000)))
-            {
-               return(-1);
-            };
-            // applies subtraction method & rotates value into history
-            if (last == 10)
-               num -= (last * 2);
-            prevlast  = last;
-            last = 100;
-            break;
-         case 'd':
-         case 'D':
-            num += 500;
-            // tests for invalid syntax
-            if ( ((last <= 500) && (last != 100)) || (prevlast <= 500) )
+            else if (c == prev)
             {
-               return(-1);
+                /* Allow indefinite repetition for m; three for c, x and i; and
+                 * none for d, l and v. */
+                if ((c && ++count > 3) || (c & 1))
+                {
+                    return 0;
+                }
+
+                /* No more subtraction. */
+                next_allowed = c;
             }
-            // applies subtraction method & rotates value into history
-            if (last < 500)
-               num -= (last * 2);
-            prevlast  = last;
-            last = 500;
-            break;
-         case 'm':
-         case 'M':
-            num += 1000;
-            // tests for invalid syntax
-            if ( ((prevlast < 1000) && (last <= 1000)) || ((last < 1000) && (last != 100)) )
+            else if (c && !(c & 1))
             {
-               return(-1);
-            };
-            // prevent patterns like MMMMM and VMMMMM
-            if ((!(num%5000)) || (!(num%10000)))
+                /* For first occurrence of c, x and i, allow "subtraction" from
+                 * 10 and 5 times self, reset counting. */
+                next_allowed = c - 2;
+                count = 1;
+            }
+
+            prev = c;
+        }
+        else
+        {
+            if (g_unichar_isalnum (g_utf8_get_char (i)))
             {
-               return(-1);
-            };
-            // applies subtraction method & rotates value into history
-            if (last == 100)
-               num -= (last * 2);
-            prevlast  = last;
-            last = 1000;
+                return 0;
+            }
+
             break;
-         default:
-            return(-1);
-      };
-   };
+        }
+    }
 
-   // ends function
-   return(num);
+    /* Return length of found Roman numeral. */
+    return i - text;
 }
 
 
-
 /*
  * Return the field of a 'File_Tag' structure corresponding to the mask code
  */
diff --git a/src/scan.h b/src/scan_dialog.h
similarity index 77%
copy from src/scan.h
copy to src/scan_dialog.h
index 909f60d..8dc8ef6 100644
--- a/src/scan.h
+++ b/src/scan_dialog.h
@@ -60,18 +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_All_Uppercase           (gchar *string);
-void Scan_Process_Fields_All_Downcase            (gchar *string);
-void Scan_Process_Fields_Letter_Uppercase        (gchar *string);
 void Scan_Process_Fields_First_Letters_Uppercase (gchar *string);
-void Scan_Process_Fields_Remove_Space            (gchar *string);
-void Scan_Process_Fields_Insert_Space            (gchar **string);
-void Scan_Process_Fields_Keep_One_Space          (gchar *string);
-
-void Scan_Convert_Underscore_Into_Space (gchar *string);
-void Scan_Convert_P20_Into_Space        (gchar *string);
-void Scan_Convert_Space_Into_Undescore  (gchar *string);
-void Scan_Remove_Spaces                 (gchar *string);
 
 void Init_ScannerWindow (void);
 void Open_ScannerWindow (gint scanner_type);
diff --git a/src/setting.c b/src/setting.c
index 03c888c..befcbc1 100644
--- a/src/setting.c
+++ b/src/setting.c
@@ -37,7 +37,7 @@
 #include "bar.h"
 #include "easytag.h"
 #include "charset.h"
-#include "scan.h"
+#include "scan_dialog.h"
 #include "log.h"
 #include "misc.h"
 #include "cddb.h"
@@ -374,8 +374,8 @@ void Init_Config_Variables (void)
     PANE_HANDLE_POSITION3           = 300;
     PANE_HANDLE_POSITION4           = 300;
     SHOW_HEADER_INFO                = 1;
-    CHANGED_FILES_DISPLAYED_TO_RED  = 1;
-    CHANGED_FILES_DISPLAYED_TO_BOLD = 0;
+    CHANGED_FILES_DISPLAYED_TO_RED  = 0;
+    CHANGED_FILES_DISPLAYED_TO_BOLD = 1;
 
     DATE_AUTO_COMPLETION                    = 1;
     NUMBER_TRACK_FORMATED                   = 1;
diff --git a/src/ui_manager.h b/src/ui_manager.h
index 8a064c6..c3d5454 100644
--- a/src/ui_manager.h
+++ b/src/ui_manager.h
@@ -177,7 +177,9 @@ static const gchar *ui_xml =
 "    </menu>"
 
 "    <menu action='HelpMenu'>"
+#ifndef G_OS_WIN32
 "      <menuitem action='HelpContents' />"
+#endif /* !G_OS_WIN32 */
 "      <menuitem action='About' />"
 "    </menu>"
 
diff --git a/src/vcedit.c b/src/vcedit.c
index bf083d9..06e7caa 100644
--- a/src/vcedit.c
+++ b/src/vcedit.c
@@ -66,6 +66,13 @@ static void vcedit_clear_internals(vcedit_state *state)
         vorbis_info_clear(state->vi);
         free(state->vi);
     }
+#ifdef ENABLE_OPUS
+    if (state->oi)
+    {
+        g_free (state->oi);
+    }
+#endif /* ENABLE_OPUS */
+
     g_object_unref (state->in);
     memset(state, 0, sizeof(*state));
 }
@@ -104,6 +111,12 @@ static int _commentheader_out(vcedit_state *state, ogg_packet *op)
         oggpack_write(&opb,0x03,8);
         _v_writestring(&opb,"vorbis", 6);
     }
+#ifdef ENABLE_OPUS
+    else if (state->oggtype == VCEDIT_IS_OPUS)
+    {
+        _v_writestring (&opb, "OpusTags", 8);
+    }
+#endif
 
     /* vendor */
     oggpack_write(&opb,strlen(vendor),32);
@@ -351,16 +364,29 @@ vcedit_open(vcedit_state *state, GFile *file, GError **error)
     {
         state->oggtype = VCEDIT_IS_OGGVORBIS;
     }
-#ifdef ENABLE_SPEEX
     else
     {
+#ifdef ENABLE_SPEEX
         // Done after "Ogg test" to avoid to display an error message in function
         // speex_packet_to_header when the file is not Speex.
         state->si = malloc(sizeof(SpeexHeader));
         if((state->si = speex_packet_to_header((char*)(&header_main)->packet,(&header_main)->bytes)))
             state->oggtype = VCEDIT_IS_SPEEX;
-    }
 #endif
+#ifdef ENABLE_OPUS
+        if (state->oggtype == VCEDIT_IS_UNKNOWN)
+        {
+            state->oi = g_malloc (sizeof (OpusHead));
+
+            if (opus_head_parse (state->oi,
+                                 (unsigned char*)(&header_main)->packet,
+                                 (&header_main)->bytes) == 0)
+            {
+                state->oggtype = VCEDIT_IS_OPUS;
+            }
+        }
+#endif
+    }
 
     if (state->oggtype == VCEDIT_IS_UNKNOWN)
     {
@@ -381,6 +407,11 @@ vcedit_open(vcedit_state *state, GFile *file, GError **error)
             headerpackets = 2 + state->si->extra_headers;
             break;
 #endif
+#ifdef ENABLE_OPUS
+        case VCEDIT_IS_OPUS:
+            header = &header_comments;
+            headerpackets = 2;
+#endif
     }
     i = 1;
     while(i<headerpackets)
@@ -434,6 +465,35 @@ vcedit_open(vcedit_state *state, GFile *file, GError **error)
                                     goto err;
                                     break;
                             }
+                            break;
+#ifdef ENABLE_OPUS
+                        case VCEDIT_IS_OPUS:
+                            switch (opus_tags_parse ((OpusTags *)state->vc,
+                                                     header->packet,
+                                                     header->bytes))
+                            {
+                                case OP_ENOTFORMAT:
+                                    g_set_error (error, ET_OGG_ERROR,
+                                                 ET_OGG_ERROR_HEADER,
+                                                 "Ogg Opus tags do not start with \"OpusTags\"");
+                                    goto err;
+                                    break;
+
+                                case OP_EFAULT:
+                                    g_set_error (error, ET_OGG_ERROR,
+                                                 ET_OGG_ERROR_HEADER,
+                                                 "Not enough memory to store Ogg Opus tags");
+                                    goto err;
+                                    break;
+
+                                case OP_EBADHEADER:
+                                    g_set_error (error, ET_OGG_ERROR,
+                                                 ET_OGG_ERROR_HEADER,
+                                                 "Ogg Opus tags do not follow the specification");
+                                    goto err;
+                                    break;
+                            }
+#endif
                     }
                     i++;
                 }
@@ -487,19 +547,27 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
     char *buffer;
     int bytes;
     int needflush=0, needout=0;
-    GFileOutputStream *ostream;
+    GOutputStream *ostream;
+    gchar *buf;
+    gsize size;
+    GFileInfo *fileinfo;
 
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-    ostream = g_file_replace (file, NULL, FALSE, G_FILE_CREATE_NONE,
-                              NULL, error);
-
-    if (!ostream)
+    fileinfo = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SIZE,
+                                  G_FILE_QUERY_INFO_NONE, NULL, error);
+    if (!fileinfo)
     {
         g_assert (error == NULL || *error != NULL);
         return FALSE;
     }
 
+    buf = g_malloc (g_file_info_get_size (fileinfo));
+    ostream = g_memory_output_stream_new (buf,
+                                          g_file_info_get_size (fileinfo),
+                                          g_realloc, g_free);
+    g_object_unref (fileinfo);
+
     state->eosin = 0;
     state->extrapage = 0;
 
@@ -522,16 +590,16 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
     ogg_stream_packetin(&streamout, &header_main);
     ogg_stream_packetin(&streamout, &header_comments);
 
-    if (state->oggtype != VCEDIT_IS_SPEEX)
+    if (state->oggtype == VCEDIT_IS_OGGVORBIS)
         ogg_stream_packetin(&streamout, &header_codebooks);
 
     while((result = ogg_stream_flush(&streamout, &ogout)))
     {
         gsize bytes_written;
 
-        if (!g_output_stream_write_all (G_OUTPUT_STREAM (ostream),
-                                        ogout.header, ogout.header_len,
-                                        &bytes_written, NULL, error))
+        if (!g_output_stream_write_all (ostream, ogout.header,
+                                        ogout.header_len, &bytes_written, NULL,
+                                        error))
         {
             g_debug ("Only %" G_GSIZE_FORMAT " bytes out of %ld bytes of data "
                      "were written", bytes_written, ogout.header_len);
@@ -539,9 +607,8 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
             goto cleanup;
         }
 
-        if (!g_output_stream_write_all (G_OUTPUT_STREAM (ostream), ogout.body,
-                                        ogout.body_len, &bytes_written, NULL,
-                                        error))
+        if (!g_output_stream_write_all (ostream, ogout.body, ogout.body_len,
+                                        &bytes_written, NULL, error))
         {
             g_debug ("Only %" G_GSIZE_FORMAT " bytes out of %ld bytes of data "
                      "were written", bytes_written, ogout.body_len);
@@ -554,26 +621,29 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
     {
         if(needflush)
         {
-            gsize bytes_written;
-
-            if (!g_output_stream_write_all (G_OUTPUT_STREAM (ostream),
-                                            ogout.header, ogout.header_len,
-                                            &bytes_written, NULL, error))
+            if (ogg_stream_flush (&streamout, &ogout))
             {
-                g_debug ("Only %" G_GSIZE_FORMAT " bytes out of %ld bytes of "
-                         "data were written", bytes_written, ogout.header_len);
-                g_assert (error == NULL || *error != NULL);
-                goto cleanup;
-            }
+                gsize bytes_written;
 
-            if (!g_output_stream_write_all (G_OUTPUT_STREAM (ostream),
-                                            ogout.body, ogout.body_len,
-                                            &bytes_written, NULL, error))
-            {
-                g_debug ("Only %" G_GSIZE_FORMAT " bytes out of %ld bytes of "
-                         "data were written", bytes_written, ogout.body_len);
-                g_assert (error == NULL || *error != NULL);
-                goto cleanup;
+                if (!g_output_stream_write_all (ostream, ogout.header,
+                                                ogout.header_len, &bytes_written,
+                                                NULL, error))
+                {
+                    g_debug ("Only %" G_GSIZE_FORMAT " bytes out of %ld bytes of "
+                             "data were written", bytes_written, ogout.header_len);
+                    g_assert (error == NULL || *error != NULL);
+                    goto cleanup;
+                }
+
+                if (!g_output_stream_write_all (ostream, ogout.body,
+                                                ogout.body_len, &bytes_written,
+                                                NULL, error))
+                {
+                    g_debug ("Only %" G_GSIZE_FORMAT " bytes out of %ld bytes of "
+                             "data were written", bytes_written, ogout.body_len);
+                    g_assert (error == NULL || *error != NULL);
+                    goto cleanup;
+                }
             }
         }
         else if(needout)
@@ -582,8 +652,8 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
             {
                 gsize bytes_written;
 
-                if (!g_output_stream_write_all (G_OUTPUT_STREAM (ostream),
-                                                ogout.header, ogout.header_len,
+                if (!g_output_stream_write_all (ostream, ogout.header,
+                                                ogout.header_len,
                                                 &bytes_written, NULL, error))
                 {
                     g_debug ("Only %" G_GSIZE_FORMAT " bytes out of %ld bytes "
@@ -593,9 +663,9 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
                     goto cleanup;
                 }
 
-                if (!g_output_stream_write_all (G_OUTPUT_STREAM (ostream),
-                                                ogout.body, ogout.body_len,
-                                                &bytes_written, NULL, error))
+                if (!g_output_stream_write_all (ostream, ogout.body,
+                                                ogout.body_len, &bytes_written,
+                                                NULL, error))
                 {
                     g_debug ("Only %" G_GSIZE_FORMAT " bytes out of %ld bytes "
                              "of data were written", bytes_written,
@@ -608,12 +678,22 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
 
         needflush=needout=0;
 
-        if (state->oggtype == VCEDIT_IS_OGGVORBIS)
+        if (state->oggtype == VCEDIT_IS_OGGVORBIS ||
+            state->oggtype == VCEDIT_IS_OPUS)
         {
-            int size;
-            size = _blocksize(state, &op);
-            granpos += size;
-
+            if (state->oggtype == VCEDIT_IS_OGGVORBIS)
+            {
+                int size;
+                size = _blocksize(state, &op);
+                granpos += size;
+            }
+#ifdef ENABLE_OPUS
+            else
+            {
+                granpos += opus_packet_get_samples_per_frame (op.packet,
+                                                              48000);
+            }
+#endif
             if(op.granulepos == -1)
             {
                 op.granulepos = granpos;
@@ -664,9 +744,9 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
     {
         gsize bytes_written;
 
-        if (!g_output_stream_write_all (G_OUTPUT_STREAM (ostream),
-                                        ogout.header, ogout.header_len,
-                                        &bytes_written, NULL, error))
+        if (!g_output_stream_write_all (ostream, ogout.header,
+                                        ogout.header_len, &bytes_written, NULL,
+                                        error))
         {
             g_debug ("Only %" G_GSIZE_FORMAT " bytes out of %ld bytes of data "
                      "were written", bytes_written, ogout.header_len);
@@ -674,9 +754,8 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
             goto cleanup;
         }
 
-        if (!g_output_stream_write_all (G_OUTPUT_STREAM (ostream), ogout.body,
-                                        ogout.body_len, &bytes_written, NULL,
-                                        error))
+        if (!g_output_stream_write_all (ostream, ogout.body, ogout.body_len,
+                                        &bytes_written, NULL, error))
         {
             g_debug ("Only %" G_GSIZE_FORMAT " bytes out of %ld bytes of data "
                      "were written", bytes_written, ogout.body_len);
@@ -689,9 +768,9 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
     {
         gsize bytes_written;
 
-        if (!g_output_stream_write_all (G_OUTPUT_STREAM (ostream),
-                                        ogout.header, ogout.header_len,
-                                        &bytes_written, NULL, error))
+        if (!g_output_stream_write_all (ostream, ogout.header,
+                                        ogout.header_len, &bytes_written, NULL,
+                                        error))
         {
             g_debug ("Only %" G_GSIZE_FORMAT " bytes out of %ld bytes of data "
                      "were written", bytes_written, ogout.header_len);
@@ -699,9 +778,8 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
             goto cleanup;
         }
 
-        if (!g_output_stream_write_all (G_OUTPUT_STREAM (ostream), ogout.body,
-                                        ogout.body_len, &bytes_written, NULL,
-                                        error))
+        if (!g_output_stream_write_all (ostream, ogout.body, ogout.body_len,
+                                        &bytes_written, NULL, error))
         {
             g_debug ("Only %" G_GSIZE_FORMAT " bytes out of %ld bytes of data "
                      "were written", bytes_written, ogout.body_len);
@@ -732,17 +810,17 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
 
                 /* Don't bother going through the rest, we can just
                  * write the page out now */
-                if (!g_output_stream_write_all (G_OUTPUT_STREAM (ostream),
-                                                ogout.header, ogout.header_len,
+                if (!g_output_stream_write_all (ostream, ogout.header,
+                                                ogout.header_len,
                                                 &bytes_written, NULL, error))
                 {
                     g_assert (error == NULL || *error != NULL);
                     goto cleanup;
                 }
 
-                if (!g_output_stream_write_all (G_OUTPUT_STREAM (ostream),
-                                                ogout.body, ogout.body_len,
-                                                &bytes_written, NULL, error))
+                if (!g_output_stream_write_all (ostream, ogout.body,
+                                                ogout.body_len, &bytes_written,
+                                                NULL, error))
                 {
                     g_assert (error == NULL || *error != NULL);
                     goto cleanup;
@@ -786,12 +864,39 @@ cleanup:
         }
     }
 
-    g_object_unref (ostream);
-
     if (error == NULL || *error != NULL)
+    {
+        g_object_unref (ostream);
+        return FALSE;
+    }
+
+    g_assert (error == NULL || *error == NULL);
+
+    if (!g_output_stream_close (ostream, NULL, error))
+    {
+        g_object_unref (ostream);
+        g_assert (error == NULL || *error != NULL);
         return FALSE;
+    }
 
     g_assert (error == NULL || *error == NULL);
+
+    buf = g_memory_output_stream_steal_data (G_MEMORY_OUTPUT_STREAM (ostream));
+    size = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (ostream));
+
+    /* Write the in-memory data back out to the original file. */
+    if (!g_file_replace_contents (file, buf, size, NULL, FALSE,
+                                  G_FILE_CREATE_NONE, NULL, NULL, error))
+    {
+       g_object_unref (ostream);
+       g_free (buf);
+       g_assert (error == NULL || *error != NULL);
+       return FALSE;
+    }
+
+    g_free (buf);
+    g_object_unref (ostream);
+
     return TRUE;
 }
 
diff --git a/src/vcedit.h b/src/vcedit.h
index e14d050..3c25eb8 100644
--- a/src/vcedit.h
+++ b/src/vcedit.h
@@ -19,6 +19,11 @@ extern "C" {
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
 
+#ifdef ENABLE_OPUS
+#include <opus/opus.h>
+#include <opus/opusfile.h>
+#endif
+
 #ifdef ENABLE_SPEEX
 #include <speex/speex.h>
 #include <speex/speex_header.h>
@@ -27,6 +32,7 @@ extern "C" {
 #define VCEDIT_IS_UNKNOWN   0
 #define VCEDIT_IS_SPEEX     1
 #define VCEDIT_IS_OGGVORBIS 2
+#define VCEDIT_IS_OPUS      3
 
 typedef struct {
     ogg_sync_state      *oy;
@@ -38,7 +44,9 @@ typedef struct {
 #ifdef ENABLE_SPEEX
     SpeexHeader         *si;
 #endif
-
+#ifdef ENABLE_OPUS
+    OpusHead            *oi;
+#endif
     GFileInputStream    *in;
     long        serial;
     unsigned char   *mainbuf;
diff --git a/src/win32/win32dep.c b/src/win32/win32dep.c
index d981f63..d8d05d1 100644
--- a/src/win32/win32dep.c
+++ b/src/win32/win32dep.c
@@ -58,26 +58,12 @@
  */
 #define _(x) gettext(x)
 
-
-/*
- * DATA STRUCTS
- */
-
-/* For shfolder.dll */
-typedef HRESULT (CALLBACK* LPFNSHGETFOLDERPATHA)(HWND, int, HANDLE, DWORD, LPSTR);
-typedef HRESULT (CALLBACK* LPFNSHGETFOLDERPATHW)(HWND, int, HANDLE, DWORD, LPWSTR);
-
 /*
  * LOCALS
  */
-static char *app_data_dir = NULL, *install_dir = NULL,
-	*lib_dir = NULL, *locale_dir = NULL;
-
-static HINSTANCE libeasytagdll_hInstance = 0;
+static char *install_dir = NULL, *locale_dir = NULL;
 
 /* Prototypes. */
-gboolean weasytag_read_reg_dword (HKEY rootkey, const char *subkey,
-                                  const char *valname, LPDWORD result);
 void str_replace_char (gchar *str, gchar in_char, gchar out_char);
 
 
@@ -85,458 +71,59 @@ void str_replace_char (gchar *str, gchar in_char, gchar out_char);
  *  PUBLIC CODE
  */
 
-/* Escape windows dir separators.  This is needed when paths are saved,
-   and on being read back have their '\' chars used as an escape char.
-   Returns an allocated string which needs to be freed.
-*/
-char *weasytag_escape_dirsep(const char *filename) {
-	int sepcount = 0;
-	const char *tmp = filename;
-	char *ret;
-	int cnt = 0;
-
-	g_return_val_if_fail(filename != NULL, NULL);
-
-	while(*tmp) {
-		if(*tmp == '\\')
-			sepcount++;
-		tmp++;
-	}
-	ret = g_malloc0(strlen(filename) + sepcount + 1);
-	while(*filename) {
-		ret[cnt] = *filename;
-		if(*filename == '\\')
-			ret[++cnt] = '\\';
-		filename++;
-		cnt++;
-	}
-	ret[cnt] = '\0';
-	return ret;
-}
+/* Determine Easytag Paths during Runtime */
+const gchar *
+weasytag_install_dir (void)
+{
+    static gboolean initialized = FALSE;
+
+    if (!initialized)
+    {
+        gchar *tmp;
 
-/* Determine whether the specified dll contains the specified procedure.
-   If so, load it (if not already loaded). */
-FARPROC weasytag_find_and_loadproc(const char *dllname, const char *procedure) {
-    HMODULE hmod;
-	BOOL did_load = FALSE;
-    FARPROC proc = 0;
-
-	if(!(hmod = GetModuleHandle(dllname))) {
-        //Log_Print(_("DLL '%s' not already loaded. Try loading it..."), dllname);
-        g_printf(_("DLL '%s' not already loaded. Try loading it..."), dllname);
-        g_print("\n");
-		if(!(hmod = LoadLibrary(dllname))) {
-            //Log_Print(_("DLL '%s' could not be loaded"), dllname);
-            g_print(_("DLL '%s' could not be loaded"), dllname);
-            g_print("\n");
+        tmp = g_win32_get_package_installation_directory_of_module (NULL);
+
+        if (tmp == NULL)
+        {
+            tmp = g_win32_error_message (GetLastError ());
+            g_debug ("GetModuleFileName error: %s", tmp);
+            g_free (tmp);
             return NULL;
         }
         else
-			did_load = TRUE;
-    }
-
-	if((proc = GetProcAddress(hmod, procedure))) {
-        //Log_Print(_("This version of '%s' contains '%s'"), dllname, procedure);
-        g_print(_("This version of '%s' contains '%s'"), dllname, procedure);
-        g_print("\n");
-        return proc;
-    }
-	else {
-        //Log_Print(_("Function '%s' not found in dll '%s'"), procedure, dllname);
-        g_print(_("Function '%s' not found in DLL '%s'"), procedure, dllname);
-        g_print("\n");
-		if(did_load) {
-            /* unload dll */
-            FreeLibrary(hmod);
+        {
+            install_dir = tmp;
+            initialized = TRUE;
         }
-        return NULL;
     }
-}
-
-/* Determine Easytag Paths during Runtime */
-
-/* Get paths to special Windows folders. */
-char *weasytag_get_special_folder(int folder_type) {
-	static LPFNSHGETFOLDERPATHA MySHGetFolderPathA = NULL;
-	static LPFNSHGETFOLDERPATHW MySHGetFolderPathW = NULL;
-	char *retval = NULL;
-
-	if (!MySHGetFolderPathW) {
-		MySHGetFolderPathW = (LPFNSHGETFOLDERPATHW)
-			weasytag_find_and_loadproc("shfolder.dll", "SHGetFolderPathW");
-	}
-
-	if (MySHGetFolderPathW) {
-		wchar_t utf_16_dir[MAX_PATH + 1];
-
-		if (SUCCEEDED(MySHGetFolderPathW(NULL, folder_type, NULL,
-						SHGFP_TYPE_CURRENT, utf_16_dir))) {
-			retval = g_utf16_to_utf8(utf_16_dir, -1, NULL, NULL, NULL);
-		}
-	}
-
-	if (!retval) {
-		if (!MySHGetFolderPathA) {
-			MySHGetFolderPathA = (LPFNSHGETFOLDERPATHA)
-				weasytag_find_and_loadproc("shfolder.dll", "SHGetFolderPathA");
-		}
-		if (MySHGetFolderPathA) {
-			char locale_dir[MAX_PATH + 1];
-
-			if (SUCCEEDED(MySHGetFolderPathA(NULL, folder_type, NULL,
-							SHGFP_TYPE_CURRENT, locale_dir))) {
-				retval = g_locale_to_utf8(locale_dir, -1, NULL, NULL, NULL);
-			}
-		}
-	}
-
-	return retval;
-}
-
-const char *weasytag_install_dir(void) {
-	static gboolean initialized = FALSE;
-
-	if (!initialized) {
-		char *tmp = NULL;
-		if (G_WIN32_HAVE_WIDECHAR_API()) {
-			wchar_t winstall_dir[MAXPATHLEN];
-			if (GetModuleFileNameW(NULL, winstall_dir,
-					MAXPATHLEN) > 0) {
-				tmp = g_utf16_to_utf8(winstall_dir, -1,
-					NULL, NULL, NULL);
-			}
-		} else {
-			gchar cpinstall_dir[MAXPATHLEN];
-			if (GetModuleFileNameA(NULL, cpinstall_dir,
-					MAXPATHLEN) > 0) {
-				tmp = g_locale_to_utf8(cpinstall_dir,
-					-1, NULL, NULL, NULL);
-			}
-		}
-
-		if (tmp == NULL) {
-			tmp = g_win32_error_message(GetLastError());
-            //Log_Print("GetModuleFileName error: %s", tmp);
-            g_print("GetModuleFileName error: %s", tmp);
-            g_print("\n");
-			g_free(tmp);
-			return NULL;
-		} else {
-			install_dir = g_path_get_dirname(tmp);
-			g_free(tmp);
-			initialized = TRUE;
-		}
-	}
-
-	return install_dir;
-}
-
-const char *weasytag_lib_dir(void) {
-	static gboolean initialized = FALSE;
-
-	if (!initialized) {
-		const char *inst_dir = weasytag_install_dir();
-		if (inst_dir != NULL) {
-			lib_dir = g_strdup (inst_dir);
-			initialized = TRUE;
-		} else {
-			return NULL;
-		}
-	}
-
-	return lib_dir;
-}
-
-const char *weasytag_locale_dir(void) {
-	static gboolean initialized = FALSE;
-
-	if (!initialized) {
-		const char *inst_dir = weasytag_install_dir();
-		if (inst_dir != NULL) {
-			locale_dir = g_build_filename (inst_dir, "..", "lib", "locale", NULL);
-			initialized = TRUE;
-		} else {
-			return NULL;
-		}
-	}
-
-	return locale_dir;
-}
-
-const char *weasytag_data_dir(void) {
-
-	if (!app_data_dir) {
-		/* Set app data dir, used by easytag_home_dir */
-		const char *newenv = g_getenv("EASYTAGHOME");
-		if (newenv)
-			app_data_dir = g_strdup(newenv);
-		else {
-			app_data_dir = weasytag_get_special_folder(CSIDL_APPDATA);
-			if (!app_data_dir)
-				app_data_dir = g_strdup("C:");
-		}
-
-        //ET_Win32_Path_Replace_Backslashes(app_data_dir);
-
-        //Log_Print(_("EasyTAG settings directory: '%s'"), app_data_dir);
-        g_print(_("EasyTAG settings directory: '%s'"), app_data_dir);
-        g_print("\n");
-	}
-
-	return app_data_dir;
-}
-
-/* Miscellaneous */
-
-gboolean weasytag_write_reg_string(HKEY rootkey, const char *subkey, const char *valname,
-		const char *value) {
-	HKEY reg_key;
-	gboolean success = FALSE;
-
-	if(G_WIN32_HAVE_WIDECHAR_API()) {
-		wchar_t *wc_subkey = g_utf8_to_utf16(subkey, -1, NULL,
-			NULL, NULL);
-
-		if(RegOpenKeyExW(rootkey, wc_subkey, 0,
-				KEY_SET_VALUE, &reg_key) == ERROR_SUCCESS) {
-			wchar_t *wc_valname = NULL;
-
-			if (valname)
-				wc_valname = g_utf8_to_utf16(valname, -1,
-					NULL, NULL, NULL);
-
-			if(value) {
-				wchar_t *wc_value = g_utf8_to_utf16(value, -1,
-					NULL, NULL, NULL);
-				int len = (wcslen(wc_value) * sizeof(wchar_t)) + 1;
-				if(RegSetValueExW(reg_key, wc_valname, 0, REG_SZ,
-						(LPBYTE)wc_value, len
-						) == ERROR_SUCCESS)
-					success = TRUE;
-				g_free(wc_value);
-			} else
-				if(RegDeleteValueW(reg_key, wc_valname) ==  ERROR_SUCCESS)
-					success = TRUE;
-
-			g_free(wc_valname);
-		}
-		g_free(wc_subkey);
-	} else {
-		char *cp_subkey = g_locale_from_utf8(subkey, -1, NULL,
-			NULL, NULL);
-		if(RegOpenKeyExA(rootkey, cp_subkey, 0,
-				KEY_SET_VALUE, &reg_key) == ERROR_SUCCESS) {
-			char *cp_valname = NULL;
-			if(valname)
-				cp_valname = g_locale_from_utf8(valname, -1,
-					NULL, NULL, NULL);
-
-			if (value) {
-				char *cp_value = g_locale_from_utf8(value, -1,
-					NULL, NULL, NULL);
-				int len = strlen(cp_value) + 1;
-				if(RegSetValueExA(reg_key, cp_valname, 0, REG_SZ,
-						cp_value, len
-						) == ERROR_SUCCESS)
-					success = TRUE;
-				g_free(cp_value);
-			} else
-				if(RegDeleteValueA(reg_key, cp_valname) ==  ERROR_SUCCESS)
-					success = TRUE;
-
-			g_free(cp_valname);
-		}
-		g_free(cp_subkey);
-	}
-
-	if(reg_key != NULL)
-		RegCloseKey(reg_key);
-
-	return success;
-}
-
-static HKEY _reg_open_key(HKEY rootkey, const char *subkey, REGSAM access) {
-	HKEY reg_key = NULL;
-	LONG rv;
-
-	if(G_WIN32_HAVE_WIDECHAR_API()) {
-		wchar_t *wc_subkey = g_utf8_to_utf16(subkey, -1, NULL,
-			NULL, NULL);
-		rv = RegOpenKeyExW(rootkey, wc_subkey, 0, access, &reg_key);
-		g_free(wc_subkey);
-	} else {
-		char *cp_subkey = g_locale_from_utf8(subkey, -1, NULL,
-			NULL, NULL);
-		rv = RegOpenKeyExA(rootkey, cp_subkey, 0, access, &reg_key);
-		g_free(cp_subkey);
-	}
-
-	if (rv != ERROR_SUCCESS) {
-		char *errmsg = g_win32_error_message(rv);
-		g_print("Could not open reg key '%s' subkey '%s'. Message: (%ld) %s\n",
-					((rootkey == HKEY_LOCAL_MACHINE) ? "HKLM" :
-					 (rootkey == HKEY_CURRENT_USER) ? "HKCU" :
-					  (rootkey == HKEY_CLASSES_ROOT) ? "HKCR" : "???"),
-					subkey, rv, errmsg);
-		g_free(errmsg);
-	}
-
-	return reg_key;
-}
 
-static gboolean _reg_read(HKEY reg_key, const char *valname, LPDWORD type, LPBYTE data, LPDWORD data_len) {
-	LONG rv;
-
-	if(G_WIN32_HAVE_WIDECHAR_API()) {
-		wchar_t *wc_valname = NULL;
-		if (valname)
-			wc_valname = g_utf8_to_utf16(valname, -1, NULL, NULL, NULL);
-		rv = RegQueryValueExW(reg_key, wc_valname, 0, type, data, data_len);
-		g_free(wc_valname);
-	} else {
-		char *cp_valname = NULL;
-		if(valname)
-			cp_valname = g_locale_from_utf8(valname, -1, NULL, NULL, NULL);
-		rv = RegQueryValueExA(reg_key, cp_valname, 0, type, data, data_len);
-		g_free(cp_valname);
-	}
-
-	if (rv != ERROR_SUCCESS) {
-		char *errmsg = g_win32_error_message(rv);
-		g_print("Could not read from reg key value '%s'. Message: (%ld) %s\n",
-					valname, rv, errmsg);
-		g_free(errmsg);
-	}
-
-	return (rv == ERROR_SUCCESS);
+    return install_dir;
 }
 
-gboolean weasytag_read_reg_dword(HKEY rootkey, const char *subkey, const char *valname, LPDWORD result) {
-
-	DWORD type;
-	DWORD nbytes;
-	HKEY reg_key = _reg_open_key(rootkey, subkey, KEY_QUERY_VALUE);
-	gboolean success = FALSE;
-
-	if(reg_key) {
-		if(_reg_read(reg_key, valname, &type, (LPBYTE)result, &nbytes))
-			success = TRUE;
-		RegCloseKey(reg_key);
-	}
-
-	return success;
-}
-
-char *weasytag_read_reg_string(HKEY rootkey, const char *subkey, const char *valname) {
-
-	DWORD type;
-	DWORD nbytes;
-	HKEY reg_key = _reg_open_key(rootkey, subkey, KEY_QUERY_VALUE);
-	char *result = NULL;
-
-	if(reg_key) {
-		if(_reg_read(reg_key, valname, &type, NULL, &nbytes) && type == REG_SZ) {
-			LPBYTE data;
-			if(G_WIN32_HAVE_WIDECHAR_API())
-				data = (LPBYTE) g_new(wchar_t, ((nbytes + 1) / sizeof(wchar_t)) + 1);
-			else
-				data = (LPBYTE) g_malloc(nbytes + 1);
-
-			if(_reg_read(reg_key, valname, &type, data, &nbytes)) {
-				if(G_WIN32_HAVE_WIDECHAR_API()) {
-					wchar_t *wc_temp = (wchar_t*) data;
-					wc_temp[nbytes / sizeof(wchar_t)] = '\0';
-					result = g_utf16_to_utf8(wc_temp, -1,
-						NULL, NULL, NULL);
-				} else {
-					char *cp_temp = (char*) data;
-					cp_temp[nbytes] = '\0';
-					result = g_locale_to_utf8(cp_temp, -1,
-						NULL, NULL, NULL);
-				}
-			}
-			g_free(data);
-		}
-		RegCloseKey(reg_key);
-	}
-
-	return result;
-}
-
-
-void weasytag_init(void) {
-    WORD wVersionRequested;
-    WSADATA wsaData;
-
-    //Log_Print(_("weasytag_init start..."));
-    g_print(_("weasytag_init start..."));
-    g_print("\n");
-    //Log_Print(_("EasyTAG version: %s"),VERSION);
-    //g_print(_("EasyTAG version: %s"),VERSION);
-    //g_print("\n");
-
-	g_print(_("GLib version: %u.%u.%u\n"),glib_major_version, glib_minor_version, glib_micro_version);
+const gchar *
+weasytag_locale_dir (void)
+{
+    static gboolean initialized = FALSE;
 
-    /* Winsock init */
-    wVersionRequested = MAKEWORD( 2, 2 );
-    WSAStartup( wVersionRequested, &wsaData );
+    if (!initialized)
+    {
+        const gchar *inst_dir = weasytag_install_dir ();
 
-    /* Confirm that the winsock DLL supports 2.2 */
-    /* Note that if the DLL supports versions greater than
-       2.2 in addition to 2.2, it will still return 2.2 in 
-       wVersion since that is the version we requested. */
-	if(LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) {
-        g_print("Could not find a usable WinSock DLL.  Oh well.\n");
-        WSACleanup();
+        if (inst_dir != NULL)
+        {
+            locale_dir = g_build_filename (inst_dir, "lib", "locale", NULL);
+            initialized = TRUE;
+        }
+        else
+        {
+            return NULL;
+        }
     }
 
-	/* Set Environmental Variables */
-
-    //Log_Print(_("weasytag_init end..."));
-    g_print(_("weasytag_init end..."));
-    g_print("\n");
+    return locale_dir;
 }
 
-/* Windows Cleanup */
-
-void weasytag_cleanup(void) {
-	//Log_Print("weasytag_cleanup");
-    g_print("weasytag_cleanup\n");
-
-    /* winsock cleanup */
-    WSACleanup();
-
-	g_free(app_data_dir);
-	app_data_dir = NULL;
-
-	libeasytagdll_hInstance = NULL;
-}
-
-/* DLL initializer */
-/* suppress gcc "no previous prototype" warning */
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
-	libeasytagdll_hInstance = hinstDLL;
-    return TRUE;
-}
-
-
-
-/* this is used by libmp4v2 : what is it doing here you think ? well...search! */
-gint
-gettimeofday (struct timeval *t, void *foo)
-{
-    struct _timeb temp;
-
-	if (t != 0) {
-        _ftime(&temp);
-        t->tv_sec = temp.time;              /* seconds since 1-1-1970 */
-        t->tv_usec = temp.millitm * 1000; 	/* microseconds */
-    }
-    return (0);
-}
-
-
+/* Miscellaneous */
 /* emulate the unix function */
 gint
 et_w32_mkstemp (gchar *template)
@@ -596,31 +183,10 @@ void ET_Win32_Path_Replace_Slashes (gchar *path)
 }
 
 /* find a default player executable */
-char*  ET_Win32_Get_Audio_File_Player (void)
+gchar *
+ET_Win32_Get_Audio_File_Player (void)
 {
-    char *key_value;
-    char *player;
-
-    if (key_value=weasytag_read_reg_string(HKEY_CURRENT_USER, "Software\\foobar2000", "InstallDir"))
-    {
-        player = g_strconcat(key_value, "\\foobar2000.exe", NULL);
-        g_free(key_value);
-        
-    }else if(key_value=weasytag_read_reg_string(HKEY_CURRENT_USER, "Software\\Winamp", ""))
-    {
-        player = g_strconcat(key_value, "\\winamp.exe", NULL);
-        g_free(key_value);
-        
-    }else
-    {
-        player = g_strdup("");
-    }
-     
-    //Log_Print(_("Audio player: '%s'"), player);
-    g_print(_("Audio player: '%s'"), player);
-    g_print("\n");
-
-    return player;
+    return g_strdup("");
 }
 
 gint
diff --git a/src/win32/win32dep.h b/src/win32/win32dep.h
index cb19ce3..59cf681 100644
--- a/src/win32/win32dep.h
+++ b/src/win32/win32dep.h
@@ -48,21 +48,10 @@ G_BEGIN_DECLS
  ** win32dep.c
  **/
 /* Windows helper functions */
-FARPROC weasytag_find_and_loadproc(const char *dllname, const char *procedure);
-char *weasytag_read_reg_string(HKEY rootkey, const char *subkey, const char *valname); /* needs to be g_free'd */
-gboolean weasytag_write_reg_string(HKEY rootkey, const char *subkey, const char *valname, const char *value);
-char *weasytag_escape_dirsep(const char *filename); /* needs to be g_free'd */
 
 /* Determine EasyTAG paths */
-char *weasytag_get_special_folder(int folder_type);
-const char *weasytag_install_dir(void);
-const char *weasytag_lib_dir(void);
-const char *weasytag_locale_dir(void);
-const char *weasytag_data_dir(void);
-
-/* init / cleanup */
-void weasytag_init(void);
-void weasytag_cleanup(void);
+const gchar * weasytag_install_dir (void);
+const gchar * weasytag_locale_dir (void);
 
 /* Misc */
 extern char *ET_Win32_Get_Audio_File_Player (void);
@@ -77,12 +66,6 @@ extern void  ET_Win32_Path_Replace_Slashes           (gchar *path);
 extern gint et_w32_mkstemp (char *template);
 #endif /* HAVE_MKSTEMP */
 
-#ifndef HAVE_GETTIMEOFDAY
-#define et_w32_gettimeofday gettimeofday
-extern gint et_w32_gettimeofday (struct timeval *tv,
-                                 /*struct timezone */ void *tz);
-#endif /* !HAVE_GETTIMEOFDAY */
-
 #ifndef HAVE_FTRUNCATE
 #define et_w32_ftruncate ftruncate
 extern gint et_w32_ftruncate (gint fd, off_t length);
@@ -101,10 +84,8 @@ extern gint et_w32_truncate (const gchar *path, off_t length);
  *  EasyTAG specific
  */
 #undef DATADIR
-#undef LIBDIR
 #undef LOCALEDIR
 #define DATADIR weasytag_install_dir()
-#define LIBDIR weasytag_lib_dir()
 #define LOCALEDIR weasytag_locale_dir()
 
 G_END_DECLS
diff --git a/tests/test-scan.c b/tests/test-scan.c
new file mode 100644
index 0000000..408537b
--- /dev/null
+++ b/tests/test-scan.c
@@ -0,0 +1,236 @@
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 Abhinav Jangda <abhijangda at hotmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "scan.h"
+
+/* TODO: Add more test strings. */
+
+static const gsize PERF_ITERATIONS = 500000;
+
+static void
+check_string (gchar *cases, gchar *result)
+{
+    gchar *string1, *string2;
+
+    string1 = g_utf8_normalize (cases, -1, G_NORMALIZE_ALL);
+    string2 = g_utf8_normalize (result, -1, G_NORMALIZE_ALL);
+
+    g_assert_cmpstr (string1, ==, string2);
+
+    g_free (string1);
+    g_free (string2);
+}
+
+static void
+scan_underscore_to_space (void)
+{
+    gsize i;
+    gchar *cases[] = {" ်0STRING ်0_A_B"};
+    gchar *results[] = {" ်0STRING ်0 A B"};
+
+    for (i = 0; i < G_N_ELEMENTS (cases); i++)
+    {
+        gchar *string;
+
+        string = g_strdup (cases[i]);
+        Scan_Convert_Underscore_Into_Space (string);
+        check_string (string, results[i]);
+
+        g_free (string);
+    }
+}
+
+static void
+scan_remove_space (void)
+{
+    gsize i;
+    gchar *cases[] = { " STR ING A   B " };
+    gchar *results[] = { "STRINGAB" };
+
+    for (i = 0; i < G_N_ELEMENTS (cases); i++)
+    {
+        gchar *string;
+
+        string = g_strdup (cases[i]);
+        Scan_Process_Fields_Remove_Space (string);
+        check_string (string, results[i]);
+
+        g_free (string);
+    }
+}
+
+static void
+scan_p20_to_space (void)
+{
+    gsize i;
+    gchar *cases[] = { "S%20T%20R%20", "%20ă b  %20c", "STЂR%20ING%20A%20B" };
+    gchar *results[] = { "S T R ", " ă b   c", "STЂR ING A B" };
+
+    for (i = 0; i < G_N_ELEMENTS (cases); i++)
+    {
+        gchar *string;
+
+        string = g_strdup (cases[i]);
+        Scan_Convert_P20_Into_Space (string);
+        check_string (string, results[i]);
+
+        g_free (string);
+    }
+}
+
+static void
+scan_insert_space (void)
+{
+    gsize i;
+    gchar *cases[] = { "STRINGAB", "StRiNgAb", "tRßiNgAb", "AՄՆ", "bՄԵ", "cՄԻ",
+                       "dՎՆ", "eՄԽ", "fꜲ"};
+    gchar *results[] = { "S T R I N G A B", "St Ri Ng Ab", "t Rßi Ng Ab",
+                         "A Մ Ն", "b Մ Ե", "c Մ Ի", "d Վ Ն", "e Մ Խ", "f Ꜳ" };
+
+    for (i = 0; i < G_N_ELEMENTS (cases); i++)
+    {
+        gchar *string, *res;
+
+        string = g_strdup (cases[i]);
+        res = Scan_Process_Fields_Insert_Space (string);
+        check_string (res, results[i]);
+
+        g_free (string);
+        g_free (res);
+    }
+}
+
+static void
+scan_all_uppercase (void)
+{
+    gsize i;
+    gchar *cases[] = { "stringab", "tRßiNgAb", "aʼnbcd", "lowΐer", "uppΰer",
+                       "sTRINGև", "ᾖᾀ", "pᾖp", "sAfflAs" };
+    gchar *results[] = { "STRINGAB", "TRSSINGAB", "AʼNBCD", "LOWΪ́ER", "UPPΫ́ER",
+                         "STRINGԵՒ", "ἮΙἈΙ", "PἮΙP", "SAFFLAS" };
+
+    for (i = 0; i < G_N_ELEMENTS (cases); i++)
+    {
+        gchar *string, *res;
+
+        string = g_strdup (cases[i]);
+        res = Scan_Process_Fields_All_Uppercase (string);
+        check_string (res, results[i]);
+
+        g_free (string);
+        g_free (res);
+    }
+}
+
+static void
+scan_all_lowercase (void)
+{
+    gsize i;
+    gchar *cases[] = { "STRINGAB", "tRßiNgAb", "SMALLß", "AAAԵՒBB", "ʼN",
+                       "PΪ́E", "ἮΙ", "Ϋ́E" };
+    gchar *results[] = { "stringab", "trßingab", "smallß", "aaaեւbb", "ʼn",
+                         "pΐe", "ἦι", "ΰe" };
+
+    for (i = 0; i < G_N_ELEMENTS (cases); i++)
+    {
+        gchar *string, *res;
+
+        string = g_strdup (cases[i]);
+        res = Scan_Process_Fields_All_Downcase (string);
+        check_string (res, results[i]);
+
+        g_free (string);
+        g_free (res);
+    }
+}
+
+static void
+scan_letter_uppercase (void)
+{
+    gsize i;
+    gchar *cases[] = { "st ri ng in ab", "tr ßi ng ab", "ßr ßi ng ab",
+                       "ßr i ng ab", "ßr mi ng ab", "I I ng ab", "ß I ng ab",
+                       "ßi ng ab" };
+    gchar *results[] = { "St ri ng in ab", "Tr ßi ng ab", "SSr ßi ng ab",
+                         "SSr I ng ab", "SSr mi ng ab", "I I ng ab",
+                         "SS I ng ab", "SSi ng ab" };
+
+    for (i = 0; i < G_N_ELEMENTS (cases); i++)
+    {
+        gchar *string, *res;
+
+        string = g_strdup (cases [i]);
+        res = Scan_Process_Fields_Letter_Uppercase (string);
+        check_string (res, results [i]);
+
+        g_free (string);
+        g_free (res);
+    }
+}
+
+static void
+scan_perf (gconstpointer user_data)
+{
+    gsize i;
+    gdouble time;
+
+    g_test_timer_start ();
+
+    for (i = 0; i < PERF_ITERATIONS; i++)
+    {
+        ((GTestFunc)user_data) ();
+    }
+
+    time = g_test_timer_elapsed ();
+
+    g_test_minimized_result (time, "%6.1f seconds", time);
+}
+
+int
+main (int argc, char** argv)
+{
+    g_test_init (&argc, &argv, NULL);
+
+    g_test_add_func ("/scan/underscore-to-space", scan_underscore_to_space);
+    g_test_add_func ("/scan/remove-space", scan_remove_space);
+    g_test_add_func ("/scan/P20-to-space", scan_p20_to_space);
+    g_test_add_func ("/scan/insert-space", scan_insert_space);
+    g_test_add_func ("/scan/all-uppercase", scan_all_uppercase);
+    g_test_add_func ("/scan/all-lowercase", scan_all_lowercase);
+    g_test_add_func ("/scan/letter-uppercase", scan_letter_uppercase);
+
+    if (g_test_perf ())
+    {
+        g_test_add_data_func ("/scan/perf/underscore-to-space",
+                              scan_underscore_to_space, scan_perf);
+        g_test_add_data_func ("/scan/perf/remove-space", scan_remove_space,
+                              scan_perf);
+        g_test_add_data_func ("/scan/perf/P20-to-space", scan_p20_to_space,
+                              scan_perf);
+        g_test_add_data_func ("/scan/perf/insert-space", scan_insert_space,
+                              scan_perf);
+        g_test_add_data_func ("/scan/perf/all-uppercase", scan_all_uppercase,
+                              scan_perf);
+        g_test_add_data_func ("/scan/perf/all-lowercase", scan_all_lowercase,
+                              scan_perf);
+        g_test_add_data_func ("/scan/perf/letter-uppercase",
+                              scan_letter_uppercase, scan_perf);
+    }
+
+    return g_test_run ();
+}

-- 
easytag packaging



More information about the pkg-multimedia-commits mailing list