[SCM] easytag/master: Imported Upstream version 2.3.3

amigadave-guest at users.alioth.debian.org amigadave-guest at users.alioth.debian.org
Sun Jan 4 13:42:45 UTC 2015


The following commit has been merged in the master branch:
commit 1d4f5c0a72471af53950ee2d0b5830226cf33eba
Author: David King <amigadave at amigadave.com>
Date:   Sun Jan 4 13:38:21 2015 +0000

    Imported Upstream version 2.3.3

diff --git a/ChangeLog b/ChangeLog
index eebe3b6..866de50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,909 @@
+commit e4c4e1a17c0a6c006f2e7e9669e68703bcad1367
+Author: David King <amigadave at amigadave.com>
+Date:   Wed Dec 31 19:21:12 2014 +0000
+
+    Update NEWS for 2.3.3 release
+
+M	NEWS
+M	SOURCES
+M	configure.ac
+
+commit a7fbff9745f87b883162585bdc88d2af31ddf084
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Dec 31 19:14:15 2014 +0000
+
+    Distribute easytag.manifest for MinGW build
+
+M	Makefile.am
+
+commit 88150f84f78fcae47a6b316eea6954aabe506597
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Dec 31 19:07:13 2014 +0000
+
+    Add stdlib.h include for malloc() under MinGW
+
+M	src/tags/vcedit.c
+
+commit ec35ca5930a91a50870a3988742dcd3a779a45c8
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Dec 31 19:03:37 2014 +0000
+
+    Add unistd.h include for SEEK_SET under MinGW
+
+M	src/tags/flac_private.c
+
+commit e87b62b58af12187bb66571dfeb8ad0212095af0
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Dec 31 12:10:04 2014 +0000
+
+    Add test for ET_File_Description functions
+
+M	Makefile.am
+A	tests/test-file_description.c
+
+commit 94da689bccf1dc291eebe08f2db2ae77e156f183
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Dec 31 11:08:57 2014 +0000
+
+    Simplify ET_Core from four functions to two
+
+    Remove the duplication of create/initialize and free/destroy to just
+    ET_Core_Create() and ET_Core_Free().
+
+M	src/application.c
+M	src/application_window.c
+M	src/easytag.c
+M	src/et_core.c
+M	src/et_core.h
+
+commit c5abfa4bb11ef3c00a41637310052254d74708b6
+Author: David King <amigadave at amigadave.com>
+Date:	Tue Dec 30 21:04:44 2014 +0000
+
+    Split ET_Core list handling code off to new file
+
+M	Makefile.am
+M	po/POTFILES.in
+M	src/application.c
+M	src/application_window.c
+M	src/browser.c
+M	src/easytag.c
+M	src/et_core.c
+M	src/file.c
+M	src/file.h
+M	src/file_area.c
+A	src/file_list.c
+A	src/file_list.h
+M	src/scan_dialog.h
+M	src/tag_area.c
+
+commit 103c20223cdbf9e6870d371fd3a7a82a317dca96
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 28 22:32:37 2014 +0000
+
+    Split majority of et_core.c out into new file.c
+
+M	Makefile.am
+M	po/POTFILES.in
+M	src/et_core.c
+M	src/et_core.h
+C097	src/et_core.c	src/file.c
+C077	src/et_core.h	src/file.h
+
+commit d639f6ca9e60726dcb0932c168c2cfbedf83183c
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 28 20:32:27 2014 +0000
+
+    Split ET_File_Description out to separate file
+
+M	Makefile.am
+M	src/easytag.c
+M	src/et_core.c
+M	src/et_core.h
+A	src/file_description.c
+A	src/file_description.h
+
+commit 7c12ed02a4b1707bcf791db34d2438d69dcd8715
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 28 20:08:27 2014 +0000
+
+    Move two more struct declarations to core_types.h
+
+M	src/core_types.h
+M	src/et_core.h
+
+commit 86f79e4b7093ef221eb30786366cf79896af486f
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 28 19:34:55 2014 +0000
+
+    Split off File_Tag to a separate file
+
+    Move most of the prototypes for functions that deal with File_Tag to a
+    separate file_tag.h header, and keep the remaining ones in et_core.h.
+
+M	Makefile.am
+M	src/et_core.c
+M	src/et_core.h
+A	src/file_tag.c
+A	src/file_tag.h
+
+commit bb9ce6f6bc4a4318c4b4b3dbc07079c91d04caff
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 28 18:58:30 2014 +0000
+
+    Move EtPicture declaration to picture.h
+
+M	src/et_core.h
+M	src/picture.h
+
+commit 9e855c1b482f11b3114d10cf0b0b48c87b90f931
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 28 18:41:22 2014 +0000
+
+    Split a couple of enums out to a new core_types.h
+
+    This should make it easier to split up the behemoth that is et_core.h.
+
+M	Makefile.am
+A	src/core_types.h
+M	src/et_core.h
+M	src/picture.h
+
+commit 3377420a6676718711d1b1f227703f3cca90054a
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 28 16:41:53 2014 +0000
+
+    Make ET_Set_Field_File_Tag_Item() static
+
+    Change the last uses of ET_Set_Field_File_Tag_Item() inside the
+    scanner
+    dialog to use the File_Tag struct setters instead.
+
+M	src/et_core.c
+M	src/et_core.h
+M	src/scan_dialog.c
+
+commit b1242ae8a868aa55a176ce7cebee173309701fdc
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 28 15:52:10 2014 +0000
+
+    Add File_Tag struct setters
+
+M	src/cddb_dialog.c
+M	src/et_core.c
+M	src/et_core.h
+M	src/scan_dialog.c
+M	src/tag_area.c
+
+commit 551629c3f63c071122a5fadb012f8ce37821111e
+Author: David King <amigadave at amigadave.com>
+Date:	Mon Dec 29 11:43:02 2014 +0000
+
+    Fix stripping disc number field from ID3v2.4 tags
+
+    As part of a change made in bug 726467, disc number handling for ID3
+    tags was modified to only allow digits and the '/' character in
+    the TPOS
+    field. A bogus check was added for ID3 tags, so that if saving a tag
+    with no content in the disc number field, the existing TPOS tag would
+    not be cleared.
+
+    Remove the erroneous check, as et_id3tag_get_tpos_from_file_tag()
+    safely
+    handles the disc number field being empty.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=742082
+
+M	src/tags/id3v24_tag.c
+
+commit ef551ae59259c5782a005b532716832c92458162
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 28 15:04:57 2014 +0000
+
+    Simplify ET_Set_Field_File_Tag_Item()
+
+    Return void rather than TRUE. Use a comparison against '\0'
+    rather than
+    using g_utf8_strlen(). Avoid a superfluous assignment to NULL.
+
+M	src/et_core.c
+M	src/et_core.h
+
+commit c17f82ba10ee4a908db90c86ca66e0dd18b6f53a
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 28 14:59:51 2014 +0000
+
+    Avoid warnings due to uninitialized values
+
+M	src/tag_area.c
+M	src/tags/ogg_tag.c
+
+commit 0019f3dc197585dc61bc34743b57b9ffff1bd9a9
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 28 11:33:24 2014 +0000
+
+    Refactor et_picture_new() to be more complete
+
+    Make et_picture_new() both create a new EtPicture instance and
+    initialize all the fields. Copy the description string and ref
+    the image
+    data GBytes. Adapt existing users (and tests) to the new interface.
+
+M	src/picture.c
+M	src/picture.h
+M	src/tag_area.c
+M	src/tags/flac_tag.c
+M	src/tags/id3v24_tag.c
+M	src/tags/mp4_tag.cc
+M	src/tags/ogg_tag.c
+M	tests/test-picture.c
+
+commit 411b45ede2bc9c46668cb0be90d72b5147b4e5c6
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 28 10:06:57 2014 +0000
+
+    Use new et_file_tag_set_picture()
+
+M	src/et_core.c
+M	src/tag_area.c
+M	src/tags/mp4_tag.cc
+
+commit 787810ab863d12ccf5f9dac3a2ec9692ddda606b
+Author: David King <amigadave at amigadave.com>
+Date:	Sat Dec 27 22:25:14 2014 +0000
+
+    Refactor ET_Set_Field_File_Tag_Picture()
+
+    Rename to et_file_tag_set_picture(). Rather than handling a EtPicture
+    **, take a File_Tag and set the picture field appropriately.
+
+M	src/et_core.c
+M	src/et_core.h
+M	src/tag_area.c
+
+commit 94dae722e611172961b619f5f97a49635ffb39ee
+Author: David King <amigadave at amigadave.com>
+Date:	Sat Dec 27 21:46:24 2014 +0000
+
+    Refactor ET_Get_Number_Of_Files_In_Directory()
+
+    Generate the collate key for the path once, rather than for each
+    iteration through the loop.
+
+M	src/et_core.c
+
+commit 1b3e8b1f0f4cfc21533fb6008b7fdef837c19e49
+Author: Мирослав Николић <miroslavnikolic at rocketmail.com>
+Date:	Sat Dec 27 13:36:44 2014 +0100
+
+    Updated Serbian translation
+
+M	po/sr.po
+M	po/sr at latin.po
+
+commit fad2eca29ba532fc386bb5a421169e31dbb9eff2
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Dec 26 22:36:39 2014 +0000
+
+    Fix Ctrl-clicking to toggle file selection
+
+    In the selection changed handler, only change the current file
+    shown in
+    the file and tag areas if it is selected. When unselecting, do not
+    update the current file.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=741980
+
+M	src/browser.c
+
+commit bfc1a7748b4856e04dd817ecae96a49ea65b07d3
+Author: Marek Černocký <marek at manet.cz>
+Date:	Fri Dec 26 12:09:27 2014 +0100
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit 8d099a706d1fa8eb67669cca31a44ac7444195a9
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Dec 24 15:00:29 2014 +0000
+
+    Add an invariant in Log_Print()
+
+    Return and log a critical message if EtLogArea has not been
+    initialized
+    when calling Log_Print().
+
+M	src/log.c
+
+commit b1a10faac70b6cf074f338f9dc3ae918ef2b1f30
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Dec 24 14:53:32 2014 +0000
+
+    Remove broken early logging code
+
+    The code to store a temporary list for logging messages during early
+    application startup was broken, and needs to be rethought.
+
+M	src/log.c
+
+commit 28396f3cc13171a14c9299af4d546707c31bcdf5
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Dec 24 14:43:45 2014 +0000
+
+    Avoid crash during config directory migration
+
+    Do not call Log_Print() during early application startup, to avoid the
+    situation before EtApplicationWindow and EtLogArea have been
+    instantiated where logging a message will fail.
+
+    https://retrace.fedoraproject.org/faf2/problems/552599/
+
+M	src/setting.c
+
+commit 153a2f2f822714d9157497f764824df1ff1b1a78
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Dec 24 12:58:12 2014 +0000
+
+    Fix double unref in et_rename_file() error path
+
+    https://retrace.fedoraproject.org/faf2/problems/558544/
+    https://retrace.fedoraproject.org/faf2/problems/552602/
+
+M	src/easytag.c
+
+commit 00f216188543d5460d4d10218e304f5fa70a418b
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Dec 24 09:37:09 2014 +0000
+
+    Add album artist support to APE tags
+
+M	src/tags/ape_tag.c
+M	src/tags/libapetag/apetaglib.h
+
+commit 2d7791969d689038e36c81575facf8d7e0673d3f
+Author: David King <amigadave at amigadave.com>
+Date:	Tue Dec 23 21:15:37 2014 +0000
+
+    Avoid compiler warning in et_flac_read_func()
+
+    Cast a GFileInputStream to a GInputStream when passed as the first
+    argument to g_input_stream_read().
+
+M	src/tags/flac_private.c
+
+commit d41c9b8b9b4d0baa2e697fd0592e50a433998b14
+Author: David King <amigadave at amigadave.com>
+Date:	Tue Dec 23 20:35:46 2014 +0000
+
+    Simplify the shared FLAC reading code
+
+    Make EtFlacWriteState extend EtFlacReadState, and use a single
+    callback
+    function for each of the read, seek, tell and EOF callbacks as
+    a result.
+
+M	src/tags/flac_header.c
+M	src/tags/flac_private.c
+M	src/tags/flac_private.h
+M	src/tags/flac_tag.c
+
+commit e49dac580f9d88380f1f44aabbc4a18f5f178446
+Author: David King <amigadave at amigadave.com>
+Date:	Tue Dec 23 20:01:35 2014 +0000
+
+    Use GIO for writing WavPack tags
+
+    Add a new EtWavpackWriteState struct, extended from EtWavpackState,
+    and
+    use it to store the IOStream during tag writing.
+
+M	src/tags/wavpack_private.c
+M	src/tags/wavpack_private.h
+M	src/tags/wavpack_tag.c
+
+commit 71dc1da626f0d32d4d8f0f983d12c11d86900114
+Author: David King <amigadave at amigadave.com>
+Date:	Tue Dec 23 18:20:15 2014 +0000
+
+    Use GIO for reading WavPack headers
+
+    Split out the WavpackStreamReader functions to a separate file,
+    so that
+    they can be shared between the header and tag functions.
+
+M	Makefile.am
+M	src/tags/wavpack_header.c
+A	src/tags/wavpack_private.c
+A	src/tags/wavpack_private.h
+M	src/tags/wavpack_tag.c
+
+commit 03b13fccbb6a712c70d64683f9d5860a7cb4d3d6
+Author: David King <amigadave at amigadave.com>
+Date:	Tue Dec 23 17:42:48 2014 +0000
+
+    Use GIO when reading WavPack tags
+
+M	src/tags/wavpack_tag.c
+
+commit 614529cee0caa215acbb989126b16c3bb4a3e3de
+Author: David King <amigadave at amigadave.com>
+Date:	Tue Dec 23 09:17:04 2014 +0000
+
+    Really fix the disc number padding check button
+
+    Rathar than fixing only the disc number padding spin button,
+    also update
+    the setting bound to the check button.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=741889
+
+M	src/preferences_dialog.c
+
+commit 786c97140d6afb78a806cf27d127fd75fc16e734
+Author: David King <amigadave at amigadave.com>
+Date:	Tue Dec 23 08:49:48 2014 +0000
+
+    Fix the disc number padding widgets
+
+    Bind the spin button for setting the disc number padding to the
+    tag-disc-length setting, and the corresponding check button to the
+    tag-disc-padded setting, rather than using the track number settings.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=741889
+
+M	src/preferences_dialog.c
+
+commit 3be9f9e912ec44e7d938d1f3b70b74f578a93268
+Author: Rafael Ferreira <rafael.f.f1 at gmail.com>
+Date:	Tue Dec 23 02:30:38 2014 +0000
+
+    Updated Brazilian Portuguese translation
+
+M	po/pt_BR.po
+
+commit da0cad5c8b08ed411c1cb356c86d2dd5a7b72f4d
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 21 22:33:25 2014 +0000
+
+    Fix string leak when reading WavPack tags
+
+M	src/tags/wavpack_tag.c
+
+commit 77c2379a132805b57ca3e31f497d9f67be88c51a
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 21 22:16:06 2014 +0000
+
+    Read the WavPack channel mask
+
+    Use WavpackGetChannelMask() to read the channel mask from the WavPack
+    header, and add a new et_wavpack_channel_mask_to_string() function to
+    format it for display.
+
+M	src/tags/wavpack_header.c
+
+commit adc40e02b6d177a2df5cbb154b1b6dfb9384a849
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 21 21:17:57 2014 +0000
+
+    Clear empty tag fields when saving WavPack tags
+
+    Refactor WavPack tag saving to use a new
+    et_wavpack_append_or_delete_tag_item() helper function. Call
+    WavpackDeleteTagItem() to delete a tag item if the item is empty.
+
+M	src/tags/wavpack_tag.c
+
+commit d2ed5f679a8c465297b542b38d1110be10ed1391
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 21 19:32:08 2014 +0000
+
+    Use memset() to zero out the WavPack read buffer
+
+M	src/tags/wavpack_tag.c
+
+commit fa6c9de17173f5234f4072fa615d5ee5e6b7ee52
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 21 19:30:33 2014 +0000
+
+    Support album artist in WavPack tags
+
+M	src/tags/wavpack_tag.c
+
+commit 1e4a307d4768c414c255d1896e4b9d74e7be746d
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 21 10:39:56 2014 +0000
+
+    Remove stray unused local CDDB code
+
+M	src/cddb_dialog.c
+
+commit 6532af69270ae1a030d48d389c13aa4bd122a190
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 21 10:37:09 2014 +0000
+
+    Use const when fetching File_Name from an ET_File
+
+M	src/application_window.c
+M	src/browser.c
+M	src/easytag.c
+M	src/et_core.c
+M	src/file_area.c
+M	src/playlist_dialog.c
+M	src/scan_dialog.c
+M	src/tag_area.c
+
+commit 928c5e111dc1aac5da8d9de0767c06eb4f456bbb
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 21 10:36:33 2014 +0000
+
+    Add -Werror=return-type to compiler flags
+
+M	configure.ac
+
+commit dc66588abaaf528d55a9f447ea923760289a08b0
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 21 09:55:26 2014 +0000
+
+    Remove unnecessary ftruncate() wrapper
+
+M	configure.ac
+M	src/win32/win32dep.c
+M	src/win32/win32dep.h
+
+commit 1342885c94e73a865b7775fae419f11171c85700
+Author: David King <amigadave at amigadave.com>
+Date:	Sat Dec 20 18:11:37 2014 +0000
+
+    Use GIO when reading and writing ID3v2.4 files
+
+M	src/tags/id3v24_tag.c
+
+commit d8a9e8889f8345f69a61993dbf1448c61cd76377
+Author: Balázs Úr <urbalazs at gmail.com>
+Date:	Sat Dec 20 11:03:55 2014 +0000
+
+    Updated Hungarian translation
+
+M	po/hu.po
+
+commit c0bb61c66ff0363894bd2919979b047ce80317f4
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Dec 19 22:19:34 2014 +0000
+
+    Use GIO when reading and writing list store files
+
+M	src/setting.c
+
+commit 6fcbdd18ef8177df92e09137e4d2d8649bffc92b
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Dec 18 17:44:38 2014 +0000
+
+    Use the GLib slice allocator where appropriate
+
+    When allocating structs, use the GLib slice allocator. Simplify some
+    allocation code to also zero-initialize the struct.
+
+M	src/cddb_dialog.c
+M	src/et_core.c
+M	src/log.c
+M	src/scan_dialog.c
+
+commit 06c9eeb5cdb78c4dab056b99c44596d1252f40db
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Dec 18 17:44:16 2014 +0000
+
+    Avoid superfluous use of sizeof(char)
+
+M	src/tags/id3_tag.c
+
+commit 15eec372a8b0162dad18c36a7463aad135831bfe
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Dec 18 17:43:32 2014 +0000
+
+    Simplify reading artwork description from Ogg tags
+
+M	src/tags/ogg_tag.c
+
+commit 18769d84f2deda03138cf86907197db0c258868e
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Dec 18 17:41:21 2014 +0000
+
+    Use a stack-allocated buffer for WavPack tags
+
+M	src/tags/wavpack_tag.c
+
+commit 9e312fa308724050b2945c1f993e7375bb72aafa
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Dec 18 16:59:39 2014 +0000
+
+    Fix double free in CDDB dialog error path
+
+M	src/cddb_dialog.c
+
+commit 8f48a76c0d97d72642fe83d715298d9fc073bd0c
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Dec 18 16:46:33 2014 +0000
+
+    Fix check for errors when writing WavPack tags
+
+M	src/tags/wavpack_tag.c
+
+commit 45248269bd07ae50e89a673c70e49b590855c057
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Dec 18 16:36:44 2014 +0000
+
+    Fix a double free when reading WavPack headers
+
+M	src/tags/wavpack_header.c
+
+commit bfde77327544d7b548c9fec113321e13e26d0638
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Dec 18 16:35:37 2014 +0000
+
+    Add G_SLICE=debug-blocks to test environment
+
+M	Makefile.am
+
+commit 593aa8f45e5d5256d5bb167394b8e872c253be47
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Dec 17 22:38:46 2014 +0000
+
+    Add a test for EtPicture boxed type copying
+
+M	tests/test-picture.c
+
+commit 1fdb2ef8382e0bbce97b60f4259a01dc961e1ff6
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Dec 17 22:18:16 2014 +0000
+
+    Fix Picture_Format_From_Data()
+
+    Check the result of memcmp() against 0. Extend the JPEG magic number.
+    Add a simple test.
+
+M	src/picture.c
+M	tests/test-picture.c
+
+commit 5e15d6ed841c10846a1b4695b69eb1589035b9c6
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Dec 17 18:18:16 2014 +0000
+
+    Fix memory leak when saving a temporary FLAC file
+
+M	src/tags/flac_tag.c
+
+commit 7a04dedf0a37a5da1fadb085b5693e67fc220107
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Dec 17 18:02:02 2014 +0000
+
+    Make EtPicture a boxed type
+
+    Rename Picture to EtPicture and define a boxed type with
+    G_DEFINE_BOXED_TYPE. Rename Picture functions to et_picture_*(). Fix a
+    memory leak when destroying the tag area tree view, by using an
+    EtPicture column in the list store. Update the EtPicture tests.
+
+M	data/tag_area.ui
+M	src/et_core.c
+M	src/et_core.h
+M	src/picture.c
+M	src/picture.h
+M	src/tag_area.c
+M	src/tags/flac_tag.c
+M	src/tags/id3_tag.c
+M	src/tags/id3v24_tag.c
+M	src/tags/mp4_tag.cc
+M	src/tags/ogg_tag.c
+M	tests/test-picture.c
+
+commit 2f38620fdfce98ed381ac9b72a6f8d82ca4d0c63
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Dec 17 17:10:39 2014 +0000
+
+    Use GBytes for image data inside Picture
+
+    Avoid many superfluous memory allocations when copying Picture
+    instances
+    by using GBytes instead of a bare pointer, and incrementing the
+    reference count when copying. Use the slice allocator to allocate
+    Picture instances. Avoid Picture->bytes from ever being NULL. Update
+    the
+    Picture tests.
+
+    Inspired by a report of excessive memory usage on the mailing list:
+
+    https://mail.gnome.org/archives/easytag-list/2014-December/msg00000.html
+
+M	src/et_core.c
+M	src/et_core.h
+M	src/picture.c
+M	src/picture.h
+M	src/tag_area.c
+M	src/tags/flac_tag.c
+M	src/tags/id3_tag.c
+M	src/tags/id3v24_tag.c
+M	src/tags/mp4_tag.cc
+M	src/tags/ogg_tag.c
+M	tests/test-picture.c
+
+commit 1dc1732e26b93a3ee792f13d0faaf18652ea4a71
+Author: David King <amigadave at amigadave.com>
+Date:	Tue Dec 16 20:25:25 2014 +0000
+
+    Remove many unnecessary include directives
+
+M	src/about.c
+M	src/application.c
+M	src/application.h
+M	src/application_window.c
+M	src/browser.c
+M	src/browser.h
+M	src/cddb_dialog.c
+M	src/charset.c
+M	src/easytag.c
+M	src/easytag.h
+M	src/et_core.c
+M	src/et_core.h
+M	src/log.c
+M	src/misc.c
+M	src/picture.c
+M	src/picture.h
+M	src/preferences_dialog.c
+M	src/scan_dialog.c
+M	src/setting.c
+M	src/status_bar.c
+M	src/tag_area.c
+M	src/tags/ape_tag.c
+M	src/tags/flac_header.c
+M	src/tags/flac_tag.c
+M	src/tags/id3_tag.c
+M	src/tags/id3v24_tag.c
+M	src/tags/monkeyaudio_header.c
+M	src/tags/mp4_tag.cc
+M	src/tags/mpeg_header.c
+M	src/tags/musepack_header.c
+M	src/tags/ogg_header.c
+M	src/tags/ogg_header.h
+M	src/tags/ogg_tag.c
+M	src/tags/opus_header.c
+M	src/tags/opus_tag.c
+M	src/tags/vcedit.c
+M	src/tags/vcedit.h
+M	src/tags/wavpack_header.c
+M	src/tags/wavpack_tag.c
+
+commit 790a379aa45523126630e58992fc83470f059079
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 14 22:06:46 2014 +0000
+
+    Allow the search dialog tree view to expand
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=741525
+
+M	data/search_dialog.ui
+
+commit 935318961603f506a3bdba80d4b46eed34131ae3
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 14 18:03:38 2014 +0000
+
+    Make crc32_file_with_ID3_tag() accept a GFile
+
+M	src/crc32.c
+M	src/crc32.h
+M	src/scan_dialog.c
+
+commit 1d227dc59cf47da8976d0d92ebab6cbaf5872879
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 14 15:52:16 2014 +0000
+
+    Refactor Vorbis comment code
+
+    Use the slice allocator. Move the state struct definition to the
+    source
+    file. Adjust coding style. Change the codec type defines to be a new
+    EtOggKind enum.
+
+M	src/tags/ogg_header.c
+M	src/tags/ogg_tag.c
+M	src/tags/vcedit.c
+M	src/tags/vcedit.h
+
+commit 699747408eeb2407ba9d5ed7babe472a500af25e
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 14 13:54:44 2014 +0000
+
+    Fix memory leak when loading a Speex file
+
+M	src/tags/vcedit.c
+
+commit 5167916b5ba9bfd4f7b01bc8ae0372aa6af5a344
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Dec 14 13:54:24 2014 +0000
+
+    Fix a memory leak when saving an Ogg file
+
+M	src/tags/ogg_tag.c
+
+commit 6202482e34567ba89f8ceab86469ccee0c41e0e5
+Author: Marek Černocký <marek at manet.cz>
+Date:	Sun Dec 14 14:13:43 2014 +0100
+
+    Fixed typo
+
+M	po/cs.po
+
+commit 97921e2978f9fa897302151522d385b829796aad
+Author: Muhammet Kara <muhammetk at gmail.com>
+Date:	Sat Dec 13 08:22:25 2014 +0000
+
+    Updated Turkish translation
+
+M	po/tr.po
+
+commit cf24bff29443f44bcdeb4862d7cb1e698befde5d
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Dec 11 22:11:02 2014 +0000
+
+    Fix memory leak in CDDB dialog error path
+
+M	src/cddb_dialog.c
+
+commit 21773c4bde88e344a5cbde8a3c4d76b4d7fe3aeb
+Author: David King <amigadave at amigadave.com>
+Date:	Tue Dec 9 23:01:02 2014 +0000
+
+    Relicense libapetag and vcedit.c to GPLv2+
+
+    Invoke Section 3 of the LGPL, and apply the terms of the GPL to
+    all the
+    LGPL portions of code inside EasyTAG, which include the APE tag
+    reading
+    code (libapetag) and the Vorbis comment parsing code (vcedit.c).
+
+M	Makefile.am
+M	data/easytag.appdata.xml.in
+D	src/tags/libapetag/COPYING.LGPL
+M	src/tags/libapetag/README.apetag
+M	src/tags/libapetag/apetaglib.c
+M	src/tags/libapetag/apetaglib.h
+M	src/tags/libapetag/id3v2_read.c
+M	src/tags/libapetag/id3v2_read.h
+M	src/tags/libapetag/info_mac.c
+M	src/tags/libapetag/info_mac.h
+M	src/tags/libapetag/info_mpc.c
+M	src/tags/libapetag/info_mpc.h
+M	src/tags/libapetag/is_tag.c
+M	src/tags/libapetag/is_tag.h
+M	src/tags/vcedit.c
+M	src/tags/vcedit.h
+
+commit d907c83e674a64dff5d9472349eab32e7bab5ea8
+Author: David King <amigadave at amigadave.com>
+Date:	Sat Dec 6 23:57:24 2014 +0000
+
+    Split off shared FLAC code to a separate file
+
+M	Makefile.am
+M	src/tags/flac_header.c
+A	src/tags/flac_private.c
+A	src/tags/flac_private.h
+M	src/tags/flac_tag.c
+
+commit ca5ef60eb3544908af0d7980cfa8ce9e2901a76a
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Oct 3 17:44:31 2014 +0100
+
+    Use GIO when reading and writing FLAC tags
+
+    Use the level 2 FLAC metadata interface to read and write FLAC tags,
+    using GIO for the IO callbacks.
+
+M	src/tags/flac_tag.c
+
 commit a80a55dc3f2a2c9cc8af53524e5f081bdf5b5f8c
 Author: David King <amigadave at amigadave.com>
-Date:   Sun Nov 30 21:38:33 2014 +0000
+Date:	Sun Nov 30 21:38:33 2014 +0000
 
     Update NEWS for 2.3.2 release
 
diff --git a/Makefile.am b/Makefile.am
index d208a8f..13eeede 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,7 +49,11 @@ easytag_SOURCES = \
 	src/easytag.c \
 	src/enums.c \
 	src/et_core.c \
+	src/file.c \
 	src/file_area.c \
+	src/file_description.c \
+	src/file_list.c \
+	src/file_tag.c \
 	src/load_files_dialog.c \
 	src/log.c \
 	src/main.c \
@@ -71,6 +75,7 @@ easytag_SOURCES = \
 	src/tags/libapetag/info_mpc.c \
 	src/tags/ape_tag.c \
 	src/tags/flac_header.c \
+	src/tags/flac_private.c \
 	src/tags/flac_tag.c \
 	src/tags/gio_wrapper.cc \
 	src/tags/id3_tag.c \
@@ -85,6 +90,7 @@ easytag_SOURCES = \
 	src/tags/opus_tag.c \
 	src/tags/vcedit.c \
 	src/tags/wavpack_header.c \
+	src/tags/wavpack_private.c \
 	src/tags/wavpack_tag.c \
 	src/win32/win32dep.c
 
@@ -98,10 +104,15 @@ easytag_headers = \
 	src/cddb_dialog.h \
 	src/charset.h \
 	src/crc32.h \
+	src/core_types.h \
 	src/dlm.h \
 	src/easytag.h \
 	src/et_core.h \
+	src/file.h \
 	src/file_area.h \
+	src/file_description.h \
+	src/file_list.h \
+	src/file_tag.h \
 	src/genres.h \
 	src/load_files_dialog.h \
 	src/log.h \
@@ -123,6 +134,7 @@ easytag_headers = \
 	src/tags/libapetag/info_mpc.h \
 	src/tags/ape_tag.h \
 	src/tags/flac_header.h \
+	src/tags/flac_private.h \
 	src/tags/flac_tag.h \
 	src/tags/gio_wrapper.h \
 	src/tags/id3_tag.h \
@@ -137,6 +149,7 @@ easytag_headers = \
 	src/tags/opus_tag.h \
 	src/tags/vcedit.h \
 	src/tags/wavpack_header.h \
+	src/tags/wavpack_private.h \
 	src/tags/wavpack_tag.h \
 	src/win32/win32dep.h
 
@@ -346,11 +359,11 @@ dist_noinst_DATA = \
 	data/org.gnome.EasyTAG.gresource.xml \
 	$(noinst_resource_files) \
 	src/tags/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff \
-	src/tags/libapetag/COPYING.LGPL \
 	src/tags/libapetag/README.apetag \
 	src/tags/libapetag/id3v2_read.c \
 	src/tags/libapetag/id3v2_read.h \
 	src/tags/mp4_header.cc \
+	src/win32/easytag.manifest \
 	src/win32/resource.h \
 	data/icons/win32/easytag.ico \
 	data/nsis/easytag-header.bmp \
@@ -371,7 +384,10 @@ tests/test-desktop-file-validate.sh: Makefile tests/.dstamp
 		chmod +x $@
 
 # Not automake built-in TESTS_ENVIRONMENT!
-TEST_ENVIRONMENT = MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
+TEST_ENVIRONMENT = \
+	MALLOC_CHECK_=2 \
+	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) \
+	G_SLICE=debug-blocks
 
 # test: run all tests.
 test: $(check_PROGRAMS)
@@ -409,6 +425,7 @@ test-report perf-report full-report: $(check_PROGRAMS)
 
 check_PROGRAMS = \
 	tests/test-dlm \
+	tests/test-file_description \
 	tests/test-misc \
 	tests/test-picture \
 	tests/test-scan
@@ -429,6 +446,22 @@ tests_test_dlm_SOURCES = \
 tests_test_dlm_LDADD = \
 	$(EASYTAG_LIBS)
 
+tests_test_file_description_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-I$(top_builddir) \
+	$(DEPRECATED_CPPFLAGS)
+
+tests_test_file_description_CFLAGS = \
+	$(WARN_CFLAGS) \
+	$(EASYTAG_CFLAGS)
+
+tests_test_file_description_SOURCES = \
+	tests/test-file_description.c \
+	src/file_description.c
+
+tests_test_file_description_LDADD = \
+	$(EASYTAG_LIBS)
+
 tests_test_misc_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/tags \
diff --git a/Makefile.in b/Makefile.in
index 16d0b83..5b065fa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -83,6 +83,7 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = easytag$(EXEEXT)
 @EASYTAG_ENABLE_TESTS_TRUE at check_PROGRAMS = tests/test-dlm$(EXEEXT) \
+ at EASYTAG_ENABLE_TESTS_TRUE@	tests/test-file_description$(EXEEXT) \
 @EASYTAG_ENABLE_TESTS_TRUE@	tests/test-misc$(EXEEXT) \
 @EASYTAG_ENABLE_TESTS_TRUE@	tests/test-picture$(EXEEXT) \
 @EASYTAG_ENABLE_TESTS_TRUE@	tests/test-scan$(EXEEXT)
@@ -184,7 +185,9 @@ am_easytag_OBJECTS = src/easytag-about.$(OBJEXT) \
 	src/easytag-charset.$(OBJEXT) src/easytag-crc32.$(OBJEXT) \
 	src/easytag-dlm.$(OBJEXT) src/easytag-easytag.$(OBJEXT) \
 	src/easytag-enums.$(OBJEXT) src/easytag-et_core.$(OBJEXT) \
-	src/easytag-file_area.$(OBJEXT) \
+	src/easytag-file.$(OBJEXT) src/easytag-file_area.$(OBJEXT) \
+	src/easytag-file_description.$(OBJEXT) \
+	src/easytag-file_list.$(OBJEXT) src/easytag-file_tag.$(OBJEXT) \
 	src/easytag-load_files_dialog.$(OBJEXT) \
 	src/easytag-log.$(OBJEXT) src/easytag-main.$(OBJEXT) \
 	src/easytag-misc.$(OBJEXT) src/easytag-picture.$(OBJEXT) \
@@ -202,6 +205,7 @@ am_easytag_OBJECTS = src/easytag-about.$(OBJEXT) \
 	src/tags/libapetag/easytag-info_mpc.$(OBJEXT) \
 	src/tags/easytag-ape_tag.$(OBJEXT) \
 	src/tags/easytag-flac_header.$(OBJEXT) \
+	src/tags/easytag-flac_private.$(OBJEXT) \
 	src/tags/easytag-flac_tag.$(OBJEXT) \
 	src/tags/easytag-gio_wrapper.$(OBJEXT) \
 	src/tags/easytag-id3_tag.$(OBJEXT) \
@@ -216,6 +220,7 @@ am_easytag_OBJECTS = src/easytag-about.$(OBJEXT) \
 	src/tags/easytag-opus_tag.$(OBJEXT) \
 	src/tags/easytag-vcedit.$(OBJEXT) \
 	src/tags/easytag-wavpack_header.$(OBJEXT) \
+	src/tags/easytag-wavpack_private.$(OBJEXT) \
 	src/tags/easytag-wavpack_tag.$(OBJEXT) \
 	src/win32/easytag-win32dep.$(OBJEXT)
 nodist_easytag_OBJECTS = src/easytag-resource.$(OBJEXT)
@@ -235,6 +240,18 @@ tests_test_dlm_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(tests_test_dlm_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
 	$@
+am__tests_test_file_description_SOURCES_DIST =  \
+	tests/test-file_description.c src/file_description.c
+ at EASYTAG_ENABLE_TESTS_TRUE@am_tests_test_file_description_OBJECTS = tests/tests_test_file_description-test-file_description.$(OBJEXT) \
+ at EASYTAG_ENABLE_TESTS_TRUE@	src/tests_test_file_description-file_description.$(OBJEXT)
+tests_test_file_description_OBJECTS =  \
+	$(am_tests_test_file_description_OBJECTS)
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_file_description_DEPENDENCIES =  \
+ at EASYTAG_ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1)
+tests_test_file_description_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(tests_test_file_description_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am__tests_test_misc_SOURCES_DIST = tests/test-misc.c src/misc.c
 @EASYTAG_ENABLE_TESTS_TRUE at am_tests_test_misc_OBJECTS = tests/tests_test_misc-test-misc.$(OBJEXT) \
 @EASYTAG_ENABLE_TESTS_TRUE@	src/tests_test_misc-misc.$(OBJEXT)
@@ -321,10 +338,12 @@ am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
 SOURCES = $(libnautilus_easytag_la_SOURCES) $(easytag_SOURCES) \
 	$(nodist_easytag_SOURCES) $(tests_test_dlm_SOURCES) \
+	$(tests_test_file_description_SOURCES) \
 	$(tests_test_misc_SOURCES) $(tests_test_picture_SOURCES) \
 	$(tests_test_scan_SOURCES)
 DIST_SOURCES = $(am__libnautilus_easytag_la_SOURCES_DIST) \
 	$(easytag_SOURCES) $(am__tests_test_dlm_SOURCES_DIST) \
+	$(am__tests_test_file_description_SOURCES_DIST) \
 	$(am__tests_test_misc_SOURCES_DIST) \
 	$(am__tests_test_picture_SOURCES_DIST) \
 	$(am__tests_test_scan_SOURCES_DIST)
@@ -813,7 +832,11 @@ easytag_SOURCES = \
 	src/easytag.c \
 	src/enums.c \
 	src/et_core.c \
+	src/file.c \
 	src/file_area.c \
+	src/file_description.c \
+	src/file_list.c \
+	src/file_tag.c \
 	src/load_files_dialog.c \
 	src/log.c \
 	src/main.c \
@@ -835,6 +858,7 @@ easytag_SOURCES = \
 	src/tags/libapetag/info_mpc.c \
 	src/tags/ape_tag.c \
 	src/tags/flac_header.c \
+	src/tags/flac_private.c \
 	src/tags/flac_tag.c \
 	src/tags/gio_wrapper.cc \
 	src/tags/id3_tag.c \
@@ -849,6 +873,7 @@ easytag_SOURCES = \
 	src/tags/opus_tag.c \
 	src/tags/vcedit.c \
 	src/tags/wavpack_header.c \
+	src/tags/wavpack_private.c \
 	src/tags/wavpack_tag.c \
 	src/win32/win32dep.c
 
@@ -862,10 +887,15 @@ easytag_headers = \
 	src/cddb_dialog.h \
 	src/charset.h \
 	src/crc32.h \
+	src/core_types.h \
 	src/dlm.h \
 	src/easytag.h \
 	src/et_core.h \
+	src/file.h \
 	src/file_area.h \
+	src/file_description.h \
+	src/file_list.h \
+	src/file_tag.h \
 	src/genres.h \
 	src/load_files_dialog.h \
 	src/log.h \
@@ -887,6 +917,7 @@ easytag_headers = \
 	src/tags/libapetag/info_mpc.h \
 	src/tags/ape_tag.h \
 	src/tags/flac_header.h \
+	src/tags/flac_private.h \
 	src/tags/flac_tag.h \
 	src/tags/gio_wrapper.h \
 	src/tags/id3_tag.h \
@@ -901,6 +932,7 @@ easytag_headers = \
 	src/tags/opus_tag.h \
 	src/tags/vcedit.h \
 	src/tags/wavpack_header.h \
+	src/tags/wavpack_private.h \
 	src/tags/wavpack_tag.h \
 	src/win32/win32dep.h
 
@@ -1023,11 +1055,11 @@ dist_noinst_DATA = \
 	data/org.gnome.EasyTAG.gresource.xml \
 	$(noinst_resource_files) \
 	src/tags/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff \
-	src/tags/libapetag/COPYING.LGPL \
 	src/tags/libapetag/README.apetag \
 	src/tags/libapetag/id3v2_read.c \
 	src/tags/libapetag/id3v2_read.h \
 	src/tags/mp4_header.cc \
+	src/win32/easytag.manifest \
 	src/win32/resource.h \
 	data/icons/win32/easytag.ico \
 	data/nsis/easytag-header.bmp \
@@ -1043,7 +1075,11 @@ dist_noinst_SCRIPTS = \
 
 
 # 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@TEST_ENVIRONMENT = \
+ at EASYTAG_ENABLE_TESTS_TRUE@	MALLOC_CHECK_=2 \
+ at EASYTAG_ENABLE_TESTS_TRUE@	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) \
+ at EASYTAG_ENABLE_TESTS_TRUE@	G_SLICE=debug-blocks
+
 @EASYTAG_ENABLE_TESTS_TRUE at tests_test_dlm_CPPFLAGS = \
 @EASYTAG_ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src \
 @EASYTAG_ENABLE_TESTS_TRUE@	-I$(top_builddir) \
@@ -1060,6 +1096,22 @@ dist_noinst_SCRIPTS = \
 @EASYTAG_ENABLE_TESTS_TRUE at tests_test_dlm_LDADD = \
 @EASYTAG_ENABLE_TESTS_TRUE@	$(EASYTAG_LIBS)
 
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_file_description_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_file_description_CFLAGS = \
+ at EASYTAG_ENABLE_TESTS_TRUE@	$(WARN_CFLAGS) \
+ at EASYTAG_ENABLE_TESTS_TRUE@	$(EASYTAG_CFLAGS)
+
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_file_description_SOURCES = \
+ at EASYTAG_ENABLE_TESTS_TRUE@	tests/test-file_description.c \
+ at EASYTAG_ENABLE_TESTS_TRUE@	src/file_description.c
+
+ at EASYTAG_ENABLE_TESTS_TRUE@tests_test_file_description_LDADD = \
+ at EASYTAG_ENABLE_TESTS_TRUE@	$(EASYTAG_LIBS)
+
 @EASYTAG_ENABLE_TESTS_TRUE at tests_test_misc_CPPFLAGS = \
 @EASYTAG_ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src \
 @EASYTAG_ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src/tags \
@@ -1323,8 +1375,16 @@ src/easytag-enums.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/easytag-et_core.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/easytag-file.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/easytag-file_area.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/easytag-file_description.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/easytag-file_list.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/easytag-file_tag.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/easytag-load_files_dialog.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/easytag-log.$(OBJEXT): src/$(am__dirstamp) \
@@ -1390,6 +1450,8 @@ src/tags/easytag-ape_tag.$(OBJEXT): src/tags/$(am__dirstamp) \
 	src/tags/$(DEPDIR)/$(am__dirstamp)
 src/tags/easytag-flac_header.$(OBJEXT): src/tags/$(am__dirstamp) \
 	src/tags/$(DEPDIR)/$(am__dirstamp)
+src/tags/easytag-flac_private.$(OBJEXT): src/tags/$(am__dirstamp) \
+	src/tags/$(DEPDIR)/$(am__dirstamp)
 src/tags/easytag-flac_tag.$(OBJEXT): src/tags/$(am__dirstamp) \
 	src/tags/$(DEPDIR)/$(am__dirstamp)
 src/tags/easytag-gio_wrapper.$(OBJEXT): src/tags/$(am__dirstamp) \
@@ -1418,6 +1480,8 @@ src/tags/easytag-vcedit.$(OBJEXT): src/tags/$(am__dirstamp) \
 	src/tags/$(DEPDIR)/$(am__dirstamp)
 src/tags/easytag-wavpack_header.$(OBJEXT): src/tags/$(am__dirstamp) \
 	src/tags/$(DEPDIR)/$(am__dirstamp)
+src/tags/easytag-wavpack_private.$(OBJEXT): src/tags/$(am__dirstamp) \
+	src/tags/$(DEPDIR)/$(am__dirstamp)
 src/tags/easytag-wavpack_tag.$(OBJEXT): src/tags/$(am__dirstamp) \
 	src/tags/$(DEPDIR)/$(am__dirstamp)
 src/win32/$(am__dirstamp):
@@ -1448,6 +1512,14 @@ src/tests_test_dlm-dlm.$(OBJEXT): src/$(am__dirstamp) \
 tests/test-dlm$(EXEEXT): $(tests_test_dlm_OBJECTS) $(tests_test_dlm_DEPENDENCIES) $(EXTRA_tests_test_dlm_DEPENDENCIES) tests/$(am__dirstamp)
 	@rm -f tests/test-dlm$(EXEEXT)
 	$(AM_V_CCLD)$(tests_test_dlm_LINK) $(tests_test_dlm_OBJECTS) $(tests_test_dlm_LDADD) $(LIBS)
+tests/tests_test_file_description-test-file_description.$(OBJEXT):  \
+	tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
+src/tests_test_file_description-file_description.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+tests/test-file_description$(EXEEXT): $(tests_test_file_description_OBJECTS) $(tests_test_file_description_DEPENDENCIES) $(EXTRA_tests_test_file_description_DEPENDENCIES) tests/$(am__dirstamp)
+	@rm -f tests/test-file_description$(EXEEXT)
+	$(AM_V_CCLD)$(tests_test_file_description_LINK) $(tests_test_file_description_OBJECTS) $(tests_test_file_description_LDADD) $(LIBS)
 tests/tests_test_misc-test-misc.$(OBJEXT): tests/$(am__dirstamp) \
 	tests/$(DEPDIR)/$(am__dirstamp)
 src/tests_test_misc-misc.$(OBJEXT): src/$(am__dirstamp) \
@@ -1499,7 +1571,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-easytag.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-enums.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-et_core.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-file.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-file_area.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-file_description.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-file_list.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-file_tag.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-load_files_dialog.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-main.Po at am__quote@
@@ -1516,11 +1592,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-status_bar.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/easytag-tag_area.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tests_test_dlm-dlm.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tests_test_file_description-file_description.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tests_test_misc-misc.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/$(DEPDIR)/tests_test_picture-picture.Po at am__quote@
 @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/tags/$(DEPDIR)/easytag-ape_tag.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/tags/$(DEPDIR)/easytag-flac_header.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/tags/$(DEPDIR)/easytag-flac_private.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/tags/$(DEPDIR)/easytag-flac_tag.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/tags/$(DEPDIR)/easytag-gio_wrapper.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/tags/$(DEPDIR)/easytag-id3_tag.Po at am__quote@
@@ -1535,6 +1613,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at src/tags/$(DEPDIR)/easytag-opus_tag.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/tags/$(DEPDIR)/easytag-vcedit.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/tags/$(DEPDIR)/easytag-wavpack_header.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at src/tags/$(DEPDIR)/easytag-wavpack_private.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/tags/$(DEPDIR)/easytag-wavpack_tag.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/tags/id3lib/$(DEPDIR)/easytag-c_wrapper.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at src/tags/libapetag/$(DEPDIR)/easytag-apetaglib.Po at am__quote@
@@ -1543,6 +1622,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at src/tags/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@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/tests_test_dlm-test-dlm.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/tests_test_file_description-test-file_description.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/tests_test_misc-test-misc.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/tests_test_picture-test-picture.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/tests_test_scan-test-scan.Po at am__quote@
@@ -1732,6 +1812,20 @@ src/easytag-et_core.obj: src/et_core.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-et_core.obj `if test -f 'src/et_core.c'; then $(CYGPATH_W) 'src/et_core.c'; else $(CYGPATH_W) '$(srcdir)/src/et_core.c'; fi`
 
+src/easytag-file.o: src/file.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-file.o -MD -MP -MF src/$(DEPDIR)/easytag-file.Tpo -c -o src/easytag-file.o `test -f 'src/file.c' || echo '$(srcdir)/'`src/file.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-file.Tpo src/$(DEPDIR)/easytag-file.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/file.c' object='src/easytag-file.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-file.o `test -f 'src/file.c' || echo '$(srcdir)/'`src/file.c
+
+src/easytag-file.obj: src/file.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-file.obj -MD -MP -MF src/$(DEPDIR)/easytag-file.Tpo -c -o src/easytag-file.obj `if test -f 'src/file.c'; then $(CYGPATH_W) 'src/file.c'; else $(CYGPATH_W) '$(srcdir)/src/file.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-file.Tpo src/$(DEPDIR)/easytag-file.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/file.c' object='src/easytag-file.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-file.obj `if test -f 'src/file.c'; then $(CYGPATH_W) 'src/file.c'; else $(CYGPATH_W) '$(srcdir)/src/file.c'; fi`
+
 src/easytag-file_area.o: src/file_area.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-file_area.o -MD -MP -MF src/$(DEPDIR)/easytag-file_area.Tpo -c -o src/easytag-file_area.o `test -f 'src/file_area.c' || echo '$(srcdir)/'`src/file_area.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-file_area.Tpo src/$(DEPDIR)/easytag-file_area.Po
@@ -1746,6 +1840,48 @@ src/easytag-file_area.obj: src/file_area.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-file_area.obj `if test -f 'src/file_area.c'; then $(CYGPATH_W) 'src/file_area.c'; else $(CYGPATH_W) '$(srcdir)/src/file_area.c'; fi`
 
+src/easytag-file_description.o: src/file_description.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-file_description.o -MD -MP -MF src/$(DEPDIR)/easytag-file_description.Tpo -c -o src/easytag-file_description.o `test -f 'src/file_description.c' || echo '$(srcdir)/'`src/file_description.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-file_description.Tpo src/$(DEPDIR)/easytag-file_description.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/file_description.c' object='src/easytag-file_description.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-file_description.o `test -f 'src/file_description.c' || echo '$(srcdir)/'`src/file_description.c
+
+src/easytag-file_description.obj: src/file_description.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-file_description.obj -MD -MP -MF src/$(DEPDIR)/easytag-file_description.Tpo -c -o src/easytag-file_description.obj `if test -f 'src/file_description.c'; then $(CYGPATH_W) 'src/file_description.c'; else $(CYGPATH_W) '$(srcdir)/src/file_description.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-file_description.Tpo src/$(DEPDIR)/easytag-file_description.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/file_description.c' object='src/easytag-file_description.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-file_description.obj `if test -f 'src/file_description.c'; then $(CYGPATH_W) 'src/file_description.c'; else $(CYGPATH_W) '$(srcdir)/src/file_description.c'; fi`
+
+src/easytag-file_list.o: src/file_list.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-file_list.o -MD -MP -MF src/$(DEPDIR)/easytag-file_list.Tpo -c -o src/easytag-file_list.o `test -f 'src/file_list.c' || echo '$(srcdir)/'`src/file_list.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-file_list.Tpo src/$(DEPDIR)/easytag-file_list.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/file_list.c' object='src/easytag-file_list.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-file_list.o `test -f 'src/file_list.c' || echo '$(srcdir)/'`src/file_list.c
+
+src/easytag-file_list.obj: src/file_list.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-file_list.obj -MD -MP -MF src/$(DEPDIR)/easytag-file_list.Tpo -c -o src/easytag-file_list.obj `if test -f 'src/file_list.c'; then $(CYGPATH_W) 'src/file_list.c'; else $(CYGPATH_W) '$(srcdir)/src/file_list.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-file_list.Tpo src/$(DEPDIR)/easytag-file_list.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/file_list.c' object='src/easytag-file_list.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-file_list.obj `if test -f 'src/file_list.c'; then $(CYGPATH_W) 'src/file_list.c'; else $(CYGPATH_W) '$(srcdir)/src/file_list.c'; fi`
+
+src/easytag-file_tag.o: src/file_tag.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-file_tag.o -MD -MP -MF src/$(DEPDIR)/easytag-file_tag.Tpo -c -o src/easytag-file_tag.o `test -f 'src/file_tag.c' || echo '$(srcdir)/'`src/file_tag.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-file_tag.Tpo src/$(DEPDIR)/easytag-file_tag.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/file_tag.c' object='src/easytag-file_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-file_tag.o `test -f 'src/file_tag.c' || echo '$(srcdir)/'`src/file_tag.c
+
+src/easytag-file_tag.obj: src/file_tag.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-file_tag.obj -MD -MP -MF src/$(DEPDIR)/easytag-file_tag.Tpo -c -o src/easytag-file_tag.obj `if test -f 'src/file_tag.c'; then $(CYGPATH_W) 'src/file_tag.c'; else $(CYGPATH_W) '$(srcdir)/src/file_tag.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-file_tag.Tpo src/$(DEPDIR)/easytag-file_tag.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/file_tag.c' object='src/easytag-file_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-file_tag.obj `if test -f 'src/file_tag.c'; then $(CYGPATH_W) 'src/file_tag.c'; else $(CYGPATH_W) '$(srcdir)/src/file_tag.c'; fi`
+
 src/easytag-load_files_dialog.o: src/load_files_dialog.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/easytag-load_files_dialog.o -MD -MP -MF src/$(DEPDIR)/easytag-load_files_dialog.Tpo -c -o src/easytag-load_files_dialog.o `test -f 'src/load_files_dialog.c' || echo '$(srcdir)/'`src/load_files_dialog.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/easytag-load_files_dialog.Tpo src/$(DEPDIR)/easytag-load_files_dialog.Po
@@ -2026,6 +2162,20 @@ src/tags/easytag-flac_header.obj: src/tags/flac_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/tags/easytag-flac_header.obj `if test -f 'src/tags/flac_header.c'; then $(CYGPATH_W) 'src/tags/flac_header.c'; else $(CYGPATH_W) '$(srcdir)/src/tags/flac_header.c'; fi`
 
+src/tags/easytag-flac_private.o: src/tags/flac_private.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/tags/easytag-flac_private.o -MD -MP -MF src/tags/$(DEPDIR)/easytag-flac_private.Tpo -c -o src/tags/easytag-flac_private.o `test -f 'src/tags/flac_private.c' || echo '$(srcdir)/'`src/tags/flac_private.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tags/$(DEPDIR)/easytag-flac_private.Tpo src/tags/$(DEPDIR)/easytag-flac_private.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tags/flac_private.c' object='src/tags/easytag-flac_private.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/tags/easytag-flac_private.o `test -f 'src/tags/flac_private.c' || echo '$(srcdir)/'`src/tags/flac_private.c
+
+src/tags/easytag-flac_private.obj: src/tags/flac_private.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/tags/easytag-flac_private.obj -MD -MP -MF src/tags/$(DEPDIR)/easytag-flac_private.Tpo -c -o src/tags/easytag-flac_private.obj `if test -f 'src/tags/flac_private.c'; then $(CYGPATH_W) 'src/tags/flac_private.c'; else $(CYGPATH_W) '$(srcdir)/src/tags/flac_private.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tags/$(DEPDIR)/easytag-flac_private.Tpo src/tags/$(DEPDIR)/easytag-flac_private.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tags/flac_private.c' object='src/tags/easytag-flac_private.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/tags/easytag-flac_private.obj `if test -f 'src/tags/flac_private.c'; then $(CYGPATH_W) 'src/tags/flac_private.c'; else $(CYGPATH_W) '$(srcdir)/src/tags/flac_private.c'; fi`
+
 src/tags/easytag-flac_tag.o: src/tags/flac_tag.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/tags/easytag-flac_tag.o -MD -MP -MF src/tags/$(DEPDIR)/easytag-flac_tag.Tpo -c -o src/tags/easytag-flac_tag.o `test -f 'src/tags/flac_tag.c' || echo '$(srcdir)/'`src/tags/flac_tag.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tags/$(DEPDIR)/easytag-flac_tag.Tpo src/tags/$(DEPDIR)/easytag-flac_tag.Po
@@ -2194,6 +2344,20 @@ src/tags/easytag-wavpack_header.obj: src/tags/wavpack_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/tags/easytag-wavpack_header.obj `if test -f 'src/tags/wavpack_header.c'; then $(CYGPATH_W) 'src/tags/wavpack_header.c'; else $(CYGPATH_W) '$(srcdir)/src/tags/wavpack_header.c'; fi`
 
+src/tags/easytag-wavpack_private.o: src/tags/wavpack_private.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/tags/easytag-wavpack_private.o -MD -MP -MF src/tags/$(DEPDIR)/easytag-wavpack_private.Tpo -c -o src/tags/easytag-wavpack_private.o `test -f 'src/tags/wavpack_private.c' || echo '$(srcdir)/'`src/tags/wavpack_private.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tags/$(DEPDIR)/easytag-wavpack_private.Tpo src/tags/$(DEPDIR)/easytag-wavpack_private.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tags/wavpack_private.c' object='src/tags/easytag-wavpack_private.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/tags/easytag-wavpack_private.o `test -f 'src/tags/wavpack_private.c' || echo '$(srcdir)/'`src/tags/wavpack_private.c
+
+src/tags/easytag-wavpack_private.obj: src/tags/wavpack_private.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/tags/easytag-wavpack_private.obj -MD -MP -MF src/tags/$(DEPDIR)/easytag-wavpack_private.Tpo -c -o src/tags/easytag-wavpack_private.obj `if test -f 'src/tags/wavpack_private.c'; then $(CYGPATH_W) 'src/tags/wavpack_private.c'; else $(CYGPATH_W) '$(srcdir)/src/tags/wavpack_private.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tags/$(DEPDIR)/easytag-wavpack_private.Tpo src/tags/$(DEPDIR)/easytag-wavpack_private.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tags/wavpack_private.c' object='src/tags/easytag-wavpack_private.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/tags/easytag-wavpack_private.obj `if test -f 'src/tags/wavpack_private.c'; then $(CYGPATH_W) 'src/tags/wavpack_private.c'; else $(CYGPATH_W) '$(srcdir)/src/tags/wavpack_private.c'; fi`
+
 src/tags/easytag-wavpack_tag.o: src/tags/wavpack_tag.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(easytag_CPPFLAGS) $(CPPFLAGS) $(easytag_CFLAGS) $(CFLAGS) -MT src/tags/easytag-wavpack_tag.o -MD -MP -MF src/tags/$(DEPDIR)/easytag-wavpack_tag.Tpo -c -o src/tags/easytag-wavpack_tag.o `test -f 'src/tags/wavpack_tag.c' || echo '$(srcdir)/'`src/tags/wavpack_tag.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tags/$(DEPDIR)/easytag-wavpack_tag.Tpo src/tags/$(DEPDIR)/easytag-wavpack_tag.Po
@@ -2264,6 +2428,34 @@ src/tests_test_dlm-dlm.obj: src/dlm.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) $(tests_test_dlm_CPPFLAGS) $(CPPFLAGS) $(tests_test_dlm_CFLAGS) $(CFLAGS) -c -o src/tests_test_dlm-dlm.obj `if test -f 'src/dlm.c'; then $(CYGPATH_W) 'src/dlm.c'; else $(CYGPATH_W) '$(srcdir)/src/dlm.c'; fi`
 
+tests/tests_test_file_description-test-file_description.o: tests/test-file_description.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_description_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_description_CFLAGS) $(CFLAGS) -MT tests/tests_test_file_description-test-file_description.o -MD -MP -MF tests/$(DEPDIR)/tests_test_file_description-test-file_description.Tpo -c -o tests/tests_test_file_description-test-file_description.o `test -f 'tests/test-file_description.c' || echo '$(srcdir)/'`tests/test-file_description.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_test_file_description-test-file_description.Tpo tests/$(DEPDIR)/tests_test_file_description-test-file_description.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/test-file_description.c' object='tests/tests_test_file_description-test-file_description.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_file_description_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_description_CFLAGS) $(CFLAGS) -c -o tests/tests_test_file_description-test-file_description.o `test -f 'tests/test-file_description.c' || echo '$(srcdir)/'`tests/test-file_description.c
+
+tests/tests_test_file_description-test-file_description.obj: tests/test-file_description.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_description_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_description_CFLAGS) $(CFLAGS) -MT tests/tests_test_file_description-test-file_description.obj -MD -MP -MF tests/$(DEPDIR)/tests_test_file_description-test-file_description.Tpo -c -o tests/tests_test_file_description-test-file_description.obj `if test -f 'tests/test-file_description.c'; then $(CYGPATH_W) 'tests/test-file_description.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-file_description.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_test_file_description-test-file_description.Tpo tests/$(DEPDIR)/tests_test_file_description-test-file_description.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tests/test-file_description.c' object='tests/tests_test_file_description-test-file_description.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_file_description_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_description_CFLAGS) $(CFLAGS) -c -o tests/tests_test_file_description-test-file_description.obj `if test -f 'tests/test-file_description.c'; then $(CYGPATH_W) 'tests/test-file_description.c'; else $(CYGPATH_W) '$(srcdir)/tests/test-file_description.c'; fi`
+
+src/tests_test_file_description-file_description.o: src/file_description.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_description_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_description_CFLAGS) $(CFLAGS) -MT src/tests_test_file_description-file_description.o -MD -MP -MF src/$(DEPDIR)/tests_test_file_description-file_description.Tpo -c -o src/tests_test_file_description-file_description.o `test -f 'src/file_description.c' || echo '$(srcdir)/'`src/file_description.c
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/tests_test_file_description-file_description.Tpo src/$(DEPDIR)/tests_test_file_description-file_description.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/file_description.c' object='src/tests_test_file_description-file_description.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_file_description_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_description_CFLAGS) $(CFLAGS) -c -o src/tests_test_file_description-file_description.o `test -f 'src/file_description.c' || echo '$(srcdir)/'`src/file_description.c
+
+src/tests_test_file_description-file_description.obj: src/file_description.c
+ at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_file_description_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_description_CFLAGS) $(CFLAGS) -MT src/tests_test_file_description-file_description.obj -MD -MP -MF src/$(DEPDIR)/tests_test_file_description-file_description.Tpo -c -o src/tests_test_file_description-file_description.obj `if test -f 'src/file_description.c'; then $(CYGPATH_W) 'src/file_description.c'; else $(CYGPATH_W) '$(srcdir)/src/file_description.c'; fi`
+ at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/tests_test_file_description-file_description.Tpo src/$(DEPDIR)/tests_test_file_description-file_description.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/file_description.c' object='src/tests_test_file_description-file_description.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_file_description_CPPFLAGS) $(CPPFLAGS) $(tests_test_file_description_CFLAGS) $(CFLAGS) -c -o src/tests_test_file_description-file_description.obj `if test -f 'src/file_description.c'; then $(CYGPATH_W) 'src/file_description.c'; else $(CYGPATH_W) '$(srcdir)/src/file_description.c'; fi`
+
 tests/tests_test_misc-test-misc.o: tests/test-misc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_test_misc_CPPFLAGS) $(CPPFLAGS) $(tests_test_misc_CFLAGS) $(CFLAGS) -MT tests/tests_test_misc-test-misc.o -MD -MP -MF tests/$(DEPDIR)/tests_test_misc-test-misc.Tpo -c -o tests/tests_test_misc-test-misc.o `test -f 'tests/test-misc.c' || echo '$(srcdir)/'`tests/test-misc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_test_misc-test-misc.Tpo tests/$(DEPDIR)/tests_test_misc-test-misc.Po
@@ -2956,6 +3148,13 @@ tests/test-dlm.log: tests/test-dlm$(EXEEXT)
 	--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-file_description.log: tests/test-file_description$(EXEEXT)
+	@p='tests/test-file_description$(EXEEXT)'; \
+	b='tests/test-file_description'; \
+	$(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-misc.log: tests/test-misc$(EXEEXT)
 	@p='tests/test-misc$(EXEEXT)'; \
 	b='tests/test-misc'; \
diff --git a/NEWS b/NEWS
index 1c16ab8..35ae841 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,33 @@
+2.3.3 - 2014-12-31 :
+====================
+
+    * Add album artist support for WavPack and APE tags
+    * Add channel mask reading support for WavPack tags
+    * Reduce memory usage when copying cover art, such as when modifying tags
+      which contain images
+    * Use GIO when reading and writing FLAC, ID3v2.4 and WavPack tags
+    * Use GIO for reading and writing list store files
+    * Fix an error check when saving WavPack tags
+    * Clear empty fields when saving WavPack tags
+    * Allow the search dialog tree view to expand to fill the dialog
+    * Fix the disc number preferences controls
+    * Fix a crash when migrating configuration directories
+    * Fix a double unref when renaming files
+    * Fix memory leaks in the CDDB dialog, Ogg tagging code, Speex tagging
+      code, FLAC tagging code, images tree view and the WavPack tagging code
+    * Fix stripping of disc number fields in ID3v2.4 tags
+    * Fix Ctrl-clicking to modify the file list selection
+    * Add an automated test for file type detection
+    * Refactoring of internal file list code
+    * Refactoring of FLAC and WavPack tagging code
+    * Relicense all code (excluding the Nautilus extension) under the GNU GPL
+      version 2 or later
+    * Мирослав Николић’s Serbian translation update
+    * Rafael Ferrera’s Brazilian Portuguese translation update
+    * Balázs Úr’s Hungarian translation update
+    * Marek Černocký’s Czech translation updates
+    * Muhammet Kara’s Turkish translation update
+
 2.3.2 - 2014-11-30 :
 ====================
 
diff --git a/config.h.in b/config.h.in
index e3041c7..0357cc0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -33,9 +33,6 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Define to 1 if you have the `ftruncate' function. */
-#undef HAVE_FTRUNCATE
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
diff --git a/configure b/configure
index 9efd70e..cfbe773 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.3.2.
+# Generated by GNU Autoconf 2.69 for EasyTAG 2.3.3.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=easytag>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='EasyTAG'
 PACKAGE_TARNAME='easytag'
-PACKAGE_VERSION='2.3.2'
-PACKAGE_STRING='EasyTAG 2.3.2'
+PACKAGE_VERSION='2.3.3'
+PACKAGE_STRING='EasyTAG 2.3.3'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=easytag'
 PACKAGE_URL='https://wiki.gnome.org/Apps/EasyTAG'
 
@@ -1431,7 +1431,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.3.2 to adapt to many kinds of systems.
+\`configure' configures EasyTAG 2.3.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1501,7 +1501,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of EasyTAG 2.3.2:";;
+     short | recursive ) echo "Configuration of EasyTAG 2.3.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1651,7 +1651,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-EasyTAG configure 2.3.2
+EasyTAG configure 2.3.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2050,7 +2050,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.3.2, which was
+It was created by EasyTAG $as_me 2.3.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2919,7 +2919,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='easytag'
- VERSION='2.3.2'
+ VERSION='2.3.3'
 
 
 # Some tools Automake needs.
@@ -18581,7 +18581,7 @@ $as_echo "$have_ws2" >&6; }
 fi
 
 
-warning_flags="-Wall -Wstrict-prototypes -Wnested-externs -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format-security -Werror=format=2 -Werror=missing-include-dirs -Werror=declaration-after-statement"
+warning_flags="-Wall -Wstrict-prototypes -Wnested-externs -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format-security -Werror=format=2 -Werror=missing-include-dirs -Werror=declaration-after-statement -Werror=return-type"
 
 realsave_CFLAGS="$CFLAGS"
 for option in $warning_flags; do
@@ -18673,7 +18673,7 @@ WARN_CXXFLAGS="$tested_cxx_warning_flags"
 DEPRECATED_CPPFLAGS="-DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -DG_DISABLE_DEPRECATED $GLIB_DEPRECATION_FLAGS $GTK_DEPRECATION_FLAGS"
 
 
-for ac_func in ftruncate mkstemp truncate
+for ac_func in mkstemp truncate
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -19483,7 +19483,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.3.2, which was
+This file was extended by EasyTAG $as_me 2.3.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19550,7 +19550,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.3.2
+EasyTAG config.status 2.3.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 29fc4ae..394b034 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.3.2], [https://bugzilla.gnome.org/enter_bug.cgi?product=easytag], [easytag], [https://wiki.gnome.org/Apps/EasyTAG])
+AC_INIT([EasyTAG], [2.3.3], [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])
@@ -344,7 +344,7 @@ AC_SEARCH_LIBS([gethostbyname], [nsl socket], [],
      AC_MSG_RESULT([$have_ws2])])
 
 dnl Check that the compiler accepts the given warning flags.
-warning_flags="-Wall -Wstrict-prototypes -Wnested-externs -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format-security -Werror=format=2 -Werror=missing-include-dirs -Werror=declaration-after-statement"
+warning_flags="-Wall -Wstrict-prototypes -Wnested-externs -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format-security -Werror=format=2 -Werror=missing-include-dirs -Werror=declaration-after-statement -Werror=return-type"
 
 realsave_CFLAGS="$CFLAGS"
 for option in $warning_flags; do
@@ -388,7 +388,7 @@ AC_SUBST([DEPRECATED_CPPFLAGS], ["-DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SING
 dnl -------------------------------
 dnl Checks for library functions.
 dnl -------------------------------
-AC_CHECK_FUNCS([ftruncate mkstemp truncate])
+AC_CHECK_FUNCS([mkstemp truncate])
 
 GLIB_GSETTINGS
 
diff --git a/data/easytag.appdata.xml.in b/data/easytag.appdata.xml.in
index e5f03e3..b820920 100644
--- a/data/easytag.appdata.xml.in
+++ b/data/easytag.appdata.xml.in
@@ -3,7 +3,7 @@
 <application>
     <id type="desktop">easytag.desktop</id>
     <metadata_license>CC0-1.0</metadata_license>
-    <project_license>GPL-2.0+ and LGPL-2.1+</project_license>
+    <project_license>GPL-2.0+</project_license>
 <!-- Name and summary taken from the desktop file. -->
     <_name>EasyTAG</_name>
     <_summary>Edit audio file metadata</_summary>
diff --git a/data/search_dialog.ui b/data/search_dialog.ui
index 104a9f4..ac59f19 100644
--- a/data/search_dialog.ui
+++ b/data/search_dialog.ui
@@ -67,6 +67,7 @@
         <child>
             <object class="GtkComboBox" id="search_combo">
                 <property name="has-entry">True</property>
+                <property name="hexpand">True</property>
                 <property name="entry-text-column">0</property>
                 <property name="tooltip-text" translatable="yes">Type the text to search for in the file list, or leave the field empty to display all files</property>
                 <property name="visible">True</property>
@@ -74,7 +75,6 @@
             <packing>
                 <property name="left-attach">1</property>
                 <property name="top-attach">0</property>
-                <property name="width">4</property>
             </packing>
         </child>
         <child>
@@ -85,7 +85,7 @@
                 <property name="visible">True</property>
             </object>
             <packing>
-                <property name="left-attach">5</property>
+                <property name="left-attach">2</property>
                 <property name="top-attach">0</property>
             </packing>
         </child>
@@ -101,9 +101,33 @@
             </packing>
         </child>
         <child>
-            <object class="GtkCheckButton" id="search_filename_check">
-                <property name="label" translatable="yes" comments="This option is for the previous 'in' option. For instance, translate this as 'Search' 'In:' 'the Filename'.">the Filename</property>
+            <object class="GtkBox" id="search_options_box">
+                <property name="spacing">6</property>
                 <property name="visible">True</property>
+                <child>
+                    <object class="GtkCheckButton" id="search_filename_check">
+                        <property name="label" translatable="yes" comments="This option is for the previous 'in' option. For instance, translate this as 'Search' 'In:' 'the Filename'.">the Filename</property>
+                        <property name="visible">True</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkCheckButton" id="search_tag_check">
+                        <property name="label" translatable="yes" comments="This option is for the previous 'in' option. For instance, translate this as 'Search' 'In:' 'the Tag'.">the Tag</property>
+                        <property name="visible">True</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkSeparator" id="search_separator">
+                        <property name="orientation">vertical</property>
+                        <property name="visible">True</property>
+                    </object>
+                </child>
+                <child>
+                    <object class="GtkCheckButton" id="search_case_check">
+                        <property name="label" translatable="yes">Case sensitive</property>
+                        <property name="visible">True</property>
+                    </object>
+                </child>
             </object>
             <packing>
                 <property name="left-attach">1</property>
@@ -111,43 +135,13 @@
             </packing>
         </child>
         <child>
-            <object class="GtkCheckButton" id="search_tag_check">
-                <property name="label" translatable="yes" comments="This option is for the previous 'in' option. For instance, translate this as 'Search' 'In:' 'the Tag'.">the Tag</property>
-                <property name="visible">True</property>
-            </object>
-            <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">1</property>
-            </packing>
-        </child>
-        <child>
-            <object class="GtkSeparator" id="search_separator">
-                <property name="orientation">vertical</property>
-                <property name="visible">True</property>
-            </object>
-            <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">1</property>
-            </packing>
-        </child>
-        <child>
-            <object class="GtkCheckButton" id="search_case_check">
-                <property name="label" translatable="yes">Case sensitive</property>
-                <property name="visible">True</property>
-            </object>
-            <packing>
-                <property name="left-attach">4</property>
-                <property name="top-attach">1</property>
-            </packing>
-        </child>
-        <child>
             <object class="GtkButton" id="search_close_button">
                 <property name="label" translatable="yes">_Close</property>
                 <property name="use-underline">True</property>
                 <property name="visible">True</property>
             </object>
             <packing>
-                <property name="left-attach">5</property>
+                <property name="left-attach">2</property>
                 <property name="top-attach">1</property>
             </packing>
         </child>
@@ -158,6 +152,7 @@
                 <property name="visible">True</property>
                 <child>
                     <object class="GtkTreeView" id="search_view">
+                        <property name="expand">True</property>
                         <property name="model">search_model</property>
                         <property name="sensitive">False</property>
                         <property name="visible">True</property>
@@ -367,7 +362,7 @@
             <packing>
                 <property name="left-attach">0</property>
                 <property name="top-attach">2</property>
-                <property name="width">6</property>
+                <property name="width">3</property>
             </packing>
         </child>
         <child>
@@ -377,7 +372,7 @@
             <packing>
                 <property name="left-attach">0</property>
                 <property name="top-attach">3</property>
-                <property name="width">6</property>
+                <property name="width">3</property>
             </packing>
         </child>
     </object>
diff --git a/data/tag_area.ui b/data/tag_area.ui
index daa05c0..f555fd6 100644
--- a/data/tag_area.ui
+++ b/data/tag_area.ui
@@ -9,7 +9,7 @@
         <columns>
             <column type="GdkPixbuf"/>
             <column type="gchararray"/>
-            <column type="gpointer"/>
+            <column type="EtPicture"/>
         </columns>
     </object>
     <object class="GtkListStore" id="track_combo_model">
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 195bbf3..0bcb991 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,6 +24,8 @@ src/charset.c
 src/easytag.c
 src/et_core.c
 src/file_area.c
+src/file_list.c
+src/file.c
 src/load_files_dialog.c
 src/log.c
 src/misc.c
diff --git a/po/cs.po b/po/cs.po
index 4a20017..1efffa0 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-11-18 04:15+0000\n"
-"PO-Revision-Date: 2014-11-18 09:19+0100\n"
+"POT-Creation-Date: 2014-12-26 04:16+0000\n"
+"PO-Revision-Date: 2014-12-26 12:08+0100\n"
 "Last-Translator: Marek Černocký <marek at manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list at gnome.org>\n"
 "Language: cs\n"
@@ -92,16 +92,16 @@ msgstr ""
 "Napište název programu, který se má spustit. Tomuto programu se předá "
 "aktuální složka jako parametr."
 
-#: ../data/browser.ui.h:4 ../src/misc.c:393 ../src/tag_area.c:1491
+#: ../data/browser.ui.h:4 ../src/browser.c:3773 ../src/tag_area.c:1479
 msgid "_Open"
 msgstr "_Otevřít"
 
 #: ../data/browser.ui.h:5 ../data/tag_area.ui.h:3
-#: ../src/application_window.c:322 ../src/application_window.c:336
-#: ../src/application_window.c:2619 ../src/application_window.c:2657
-#: ../src/browser.c:845 ../src/cddb_dialog.c:2303 ../src/easytag.c:495
-#: ../src/easytag.c:502 ../src/easytag.c:619 ../src/misc.c:391
-#: ../src/playlist_dialog.c:655 ../src/tag_area.c:1489 ../src/tag_area.c:1851
+#: ../src/application_window.c:323 ../src/application_window.c:337
+#: ../src/application_window.c:2685 ../src/application_window.c:2723
+#: ../src/browser.c:863 ../src/browser.c:3772 ../src/cddb_dialog.c:2297
+#: ../src/easytag.c:467 ../src/easytag.c:474 ../src/easytag.c:599
+#: ../src/playlist_dialog.c:658 ../src/tag_area.c:1477 ../src/tag_area.c:1840
 msgid "_Cancel"
 msgstr "_Zrušit"
 
@@ -121,7 +121,7 @@ msgstr ""
 "aktuální soubory jako parametr."
 
 #. Only directories changed
-#: ../data/browser.ui.h:9 ../data/menus.ui.h:99 ../src/easytag.c:585
+#: ../data/browser.ui.h:9 ../data/menus.ui.h:99 ../src/easytag.c:565
 msgid "Rename Directory"
 msgstr "Přejmenování složky"
 
@@ -161,7 +161,7 @@ msgstr "Zadejte název složky, kterou chcete procházet"
 msgid "Select a directory to browse"
 msgstr "Vyberte složku, kterou chcete procházet"
 
-#: ../data/browser.ui.h:18 ../src/easytag.c:1086
+#: ../data/browser.ui.h:18 ../src/easytag.c:1071
 msgid "No files"
 msgstr "žádný soubor"
 
@@ -228,7 +228,7 @@ msgstr "Poznámka"
 
 #: ../data/browser.ui.h:31 ../data/preferences_dialog.ui.h:71
 #: ../data/scan_dialog.ui.h:66 ../data/search_dialog.ui.h:21
-#: ../src/picture.c:224
+#: ../src/picture.c:212
 msgid "Composer"
 msgstr "Skladatel"
 
@@ -295,7 +295,7 @@ msgid "Track Name"
 msgstr "Název skladby"
 
 #: ../data/cddb_dialog.ui.h:13 ../data/preferences_dialog.ui.h:91
-#: ../src/picture.c:202
+#: ../src/picture.c:190
 msgid "Other"
 msgstr "Další"
 
@@ -418,12 +418,12 @@ msgid "Whether to use the DLM algorithm to match CDDB results to files"
 msgstr "Zda pro srovnání výsledků CDDB vůči souborům použít algoritmus DLM"
 
 #: ../data/cddb_dialog.ui.h:45 ../data/search_dialog.ui.h:10
-#: ../src/load_files_dialog.c:895 ../src/preferences_dialog.c:295
-#: ../src/scan_dialog.c:2259
+#: ../src/load_files_dialog.c:895 ../src/preferences_dialog.c:291
+#: ../src/scan_dialog.c:2261
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: ../data/cddb_dialog.ui.h:46 ../src/cddb_dialog.c:2304
+#: ../data/cddb_dialog.ui.h:46 ../src/cddb_dialog.c:2298
 #: ../src/load_files_dialog.c:896
 msgid "_Apply"
 msgstr "_Použít"
@@ -433,7 +433,7 @@ msgid "Load the selected lines or all lines (if no lines are selected)"
 msgstr "Načíst vybrané řádky nebo všechny řádky (pokud nejsou žádné vybrány)"
 
 #. Default values are MPEG data.
-#: ../data/file_area.ui.h:1 ../src/et_core.c:3034 ../src/file_area.c:192
+#: ../data/file_area.ui.h:1 ../src/et_core.c:3010 ../src/file_area.c:192
 msgid "File"
 msgstr "Soubor"
 
@@ -445,9 +445,9 @@ msgstr "0/0:"
 #. Version changed to encoder version
 #. Encoder version
 #: ../data/file_area.ui.h:3 ../src/file_area.c:193
-#: ../src/tags/flac_header.c:303 ../src/tags/monkeyaudio_header.c:89
-#: ../src/tags/musepack_header.c:93 ../src/tags/ogg_header.c:399
-#: ../src/tags/opus_header.c:225 ../src/tags/wavpack_header.c:86
+#: ../src/tags/flac_header.c:175 ../src/tags/monkeyaudio_header.c:88
+#: ../src/tags/musepack_header.c:92 ../src/tags/ogg_header.c:398
+#: ../src/tags/opus_header.c:223 ../src/tags/wavpack_header.c:141
 msgid "Encoder:"
 msgstr "Kodér:"
 
@@ -461,7 +461,7 @@ msgstr "Vzorkování:"
 
 #. Mode
 #: ../data/file_area.ui.h:6 ../src/file_area.c:197
-#: ../src/tags/mpeg_header.c:248
+#: ../src/tags/mpeg_header.c:247
 msgid "Mode:"
 msgstr "Režim:"
 
@@ -541,7 +541,7 @@ msgstr "_Nápověda"
 msgid "_About"
 msgstr "O _aplikaci"
 
-#: ../data/menus.ui.h:3 ../src/application_window.c:2658
+#: ../data/menus.ui.h:3 ../src/application_window.c:2724
 msgid "_Quit"
 msgstr "U_končit"
 
@@ -1717,8 +1717,7 @@ msgstr "Žádat potvrzení před ukončením aplikace"
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:119
 msgid ""
 "Whether to ask for confirmation from the user before quitting the application"
-msgstr ""
-"Zda žádat po uživateli potvrzení, než se provede ukončení aplikace"
+msgstr "Zda žádat po uživateli potvrzení, než se provede ukončení aplikace"
 
 #: ../data/preferences_dialog.ui.h:153
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:120
@@ -1731,8 +1730,8 @@ msgid ""
 "Whether to ask for confirmation from the user before writing tags to audio "
 "files"
 msgstr ""
-"Zda žádat po uživateli potvrzení, než se provede zápis štítků do "
-"zvukových souborů"
+"Zda žádat po uživateli potvrzení, než se provede zápis štítků do zvukových "
+"souborů"
 
 #: ../data/preferences_dialog.ui.h:155
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:122
@@ -1742,8 +1741,7 @@ msgstr "Žádat potvrzení před přejmenováním souboru"
 #: ../data/preferences_dialog.ui.h:156
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:123
 msgid "Whether to ask for confirmation from the user before renaming a file"
-msgstr ""
-"Zda žádat po uživateli potvrzení, než se provede přejmenování souboru"
+msgstr "Zda žádat po uživateli potvrzení, než se provede přejmenování souboru"
 
 #: ../data/preferences_dialog.ui.h:157
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:126
@@ -1764,8 +1762,7 @@ msgstr "Žádat potvrzení před zápisem seznamu k přehrání"
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:125
 msgid "Whether to ask for confirmation from the user before writing a playlist"
 msgstr ""
-"Zda žádat po uživateli potvrzení, než se provede zápis seznamu k "
-"přehrání"
+"Zda žádat po uživateli potvrzení, než se provede zápis seznamu k přehrání"
 
 #: ../data/preferences_dialog.ui.h:161
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:128
@@ -1956,7 +1953,7 @@ msgid "Rename file preview"
 msgstr "Náhled přejmenování souboru"
 
 #. Only filename changed
-#: ../data/scan_dialog.ui.h:51 ../src/easytag.c:594
+#: ../data/scan_dialog.ui.h:51 ../src/easytag.c:574
 msgid "Rename File"
 msgstr "Přejmenování souboru"
 
@@ -2078,7 +2075,7 @@ msgid "Spaces Conversions"
 msgstr "Převody mezer"
 
 #: ../data/scan_dialog.ui.h:89 ../data/org.gnome.EasyTAG.gschema.xml.h:153
-#: ../src/tag_area.c:875
+#: ../src/tag_area.c:876
 msgid "Remove spaces"
 msgstr "Odstranit mezery"
 
@@ -2112,7 +2109,7 @@ msgstr "Neměnit oddělovače slov"
 msgid "Character Conversions"
 msgstr "Převody znaků"
 
-#: ../data/scan_dialog.ui.h:98 ../src/tag_area.c:831
+#: ../data/scan_dialog.ui.h:98 ../src/tag_area.c:832
 #, no-c-format
 msgid "Convert ‘_’ and ‘%20’ to spaces"
 msgstr "Převést „_“ a „%20“ na mezery"
@@ -2126,7 +2123,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“"
 
-#: ../data/scan_dialog.ui.h:101 ../src/tag_area.c:837
+#: ../data/scan_dialog.ui.h:101 ../src/tag_area.c:838
 msgid "Convert spaces to underscores"
 msgstr "Převést mezery na podržítka"
 
@@ -2210,7 +2207,7 @@ msgstr "CD"
 msgid "Image Type"
 msgstr "Typ obrázku"
 
-#: ../data/tag_area.ui.h:2 ../src/picture.c:289
+#: ../data/tag_area.ui.h:2 ../src/picture.c:272
 msgid "Description"
 msgstr "Popis"
 
@@ -2218,7 +2215,7 @@ msgstr "Popis"
 msgid "_Accept"
 msgstr "_Přijmout"
 
-#: ../data/tag_area.ui.h:5 ../src/tag_area.c:3029
+#: ../data/tag_area.ui.h:5 ../src/tag_area.c:3019
 msgid "Tag"
 msgstr "Štítek"
 
@@ -2370,7 +2367,7 @@ msgstr "Upravit vlastnosti obrázku"
 msgid "Tag selected files with these images"
 msgstr "Nastavit vybraným souborům tyto obrázky"
 
-#: ../data/tag_area.ui.h:42 ../src/tag_area.c:3282 ../src/tag_area.c:3285
+#: ../data/tag_area.ui.h:42 ../src/tag_area.c:3272 ../src/tag_area.c:3275
 msgid "Images"
 msgstr "Obrázky"
 
@@ -2446,7 +2443,7 @@ msgstr "Hledat názvy souborů a štítků"
 msgid "CDDB Search…"
 msgstr "Hledat v CDDB…"
 
-#: ../data/toolbar.ui.h:28 ../src/cddb_dialog.c:2752
+#: ../data/toolbar.ui.h:28 ../src/cddb_dialog.c:2746
 msgid "CDDB Search"
 msgstr "Hledání v CDDB"
 
@@ -3086,194 +3083,213 @@ msgid "Open the selected files in EasyTAG"
 msgstr "Otevřít vybrané soubory v aplikaci EasyTAG"
 
 #. Translators: put your own name here to appear in the about dialog.
-#: ../src/about.c:90
+#: ../src/about.c:89
 msgid "translator-credits"
 msgstr "Marek Černocký <marek at manet.cz>"
 
-#: ../src/about.c:100
+#: ../src/about.c:99
 msgid "View and edit tags in audio files"
-msgstr "Zobrazování a ůpravy štítků ve zvukových souborech"
+msgstr "Zobrazování a úpravy štítků ve zvukových souborech"
 
 #: ../src/application.c:46
 msgid "Print the version and exit"
 msgstr "Vypsat verzi a skončit"
 
 #. Starting messages
-#: ../src/application.c:177
+#: ../src/application.c:176
 #, c-format
 msgid "Starting EasyTAG version %s…"
 msgstr "Spouští se EasyTAG verze %s…"
 
-#: ../src/application.c:182
+#: ../src/application.c:181
 #, c-format
 msgid "Variable EASYTAGLANG defined, setting locale ‘%s’"
 msgstr "Je definována proměnná EASYTAGLANG. Nastaví se národní prostředí: „%s“"
 
-#: ../src/application.c:187
+#: ../src/application.c:186
 #, c-format
 msgid "Setting locale: ‘%s’"
 msgstr "Nastavuje se národní prostředí: „%s“"
 
-#: ../src/application.c:193
+#: ../src/application.c:192
 #, c-format
 msgid "System locale is ‘%s’, using ‘%s’"
 msgstr "Národní prostředí systému je „%s“, používá se „%s“"
 
-#: ../src/application.c:198
+#: ../src/application.c:197
 msgid "Unable to create setting directories"
 msgstr "Nelze vytvořit složky s nastavením"
 
-#: ../src/application.c:339
+#: ../src/application.c:338
 #, c-format
 msgid "Website: %s"
 msgstr "Webové stránky: %s"
 
-#: ../src/application.c:348
+#: ../src/application.c:347
 msgid "- Tag and rename audio files"
 msgstr "– upravovat štítky a názvy zvukových souborů"
 
-#: ../src/application.c:432 ../src/et_core.c:679
+#: ../src/application.c:431 ../src/et_core.c:641
 #, c-format
 msgid "Error while querying information for file ‘%s’: %s"
 msgstr "Chyba při dotazování na informace o souboru „%s“: %s"
 
-#: ../src/application.c:496
+#: ../src/application.c:495
 #, c-format
 msgid "Cannot open path ‘%s’"
 msgstr "Nelze otevřít cestu „%s“"
 
-#: ../src/application_window.c:316 ../src/application_window.c:333
+#: ../src/application_window.c:317 ../src/application_window.c:334
 #, c-format
 msgid "Do you really want to delete the file ‘%s’?"
 msgstr "Opravdu chcete smazat soubor „%s“?"
 
-#: ../src/application_window.c:319 ../src/easytag.c:490 ../src/easytag.c:615
+#: ../src/application_window.c:320 ../src/easytag.c:462 ../src/easytag.c:595
 msgid "Repeat action for the remaining files"
 msgstr "Opakovat akci pro zbytek souborů"
 
-#: ../src/application_window.c:321
+#: ../src/application_window.c:322
 msgid "_Skip"
 msgstr "Pře_skočit"
 
-#: ../src/application_window.c:323 ../src/application_window.c:337
+#: ../src/application_window.c:324 ../src/application_window.c:338
 msgid "_Delete"
 msgstr "_Smazat"
 
-#: ../src/application_window.c:325 ../src/application_window.c:335
+#: ../src/application_window.c:326 ../src/application_window.c:336
 msgid "Delete File"
 msgstr "Vymazání souboru"
 
-#: ../src/application_window.c:362
+#: ../src/application_window.c:363
 #, c-format
 msgid "File ‘%s’ deleted"
 msgstr "Soubor „%s“ byl vymazán"
 
-#: ../src/application_window.c:539
+#: ../src/application_window.c:540
 #, c-format
 msgid "Cannot delete file ‘%s’"
 msgstr "Nelze smazat soubor „%s“"
 
-#: ../src/application_window.c:560
+#: ../src/application_window.c:561
 msgid "Some files were not deleted"
 msgstr "Některé soubory nebyly smazány"
 
-#: ../src/application_window.c:562
+#: ../src/application_window.c:563
 msgid "All files have been deleted"
 msgstr "Všechny soubory byly smazány"
 
-#: ../src/application_window.c:901
+#: ../src/application_window.c:902
 msgid "All tags have been removed"
 msgstr "Všechny štítky byly odmazány"
 
+#: ../src/application_window.c:1506 ../src/browser.c:355 ../src/browser.c:398
+#: ../src/browser.c:432 ../src/browser.c:4710 ../src/browser.c:4785
+#, c-format
+msgid "Failed to launch program ‘%s’"
+msgstr "Selhalo spuštění programu: %s"
+
 #. Quit EasyTAG.
-#: ../src/application_window.c:2580
+#: ../src/application_window.c:2646
 msgid "Normal exit"
 msgstr "Standardní ukončení"
 
-#: ../src/application_window.c:2617 ../src/browser.c:840
+#: ../src/application_window.c:2683 ../src/browser.c:858
 msgid "Some files have been modified but not saved"
 msgstr "Některé soubory byly změněny, ale neuloženy"
 
-#: ../src/application_window.c:2618 ../src/browser.c:844 ../src/easytag.c:273
-#: ../src/easytag.c:494 ../src/easytag.c:618 ../src/easytag.c:626
+#: ../src/application_window.c:2684 ../src/browser.c:862 ../src/easytag.c:247
+#: ../src/easytag.c:466 ../src/easytag.c:598 ../src/easytag.c:606
 msgid "_Discard"
 msgstr "Zaho_dit"
 
-#: ../src/application_window.c:2620 ../src/browser.c:846 ../src/easytag.c:274
-#: ../src/easytag.c:496 ../src/easytag.c:503 ../src/easytag.c:620
-#: ../src/easytag.c:627 ../src/playlist_dialog.c:656 ../src/tag_area.c:1853
+#: ../src/application_window.c:2686 ../src/browser.c:864 ../src/easytag.c:248
+#: ../src/easytag.c:468 ../src/easytag.c:475 ../src/easytag.c:600
+#: ../src/easytag.c:607 ../src/playlist_dialog.c:659 ../src/tag_area.c:1842
 msgid "_Save"
 msgstr "_Uložit"
 
-#: ../src/application_window.c:2624 ../src/application_window.c:2662
-#: ../src/easytag.c:279
+#: ../src/application_window.c:2690 ../src/application_window.c:2728
+#: ../src/easytag.c:253
 msgid "Quit"
 msgstr "Ukončit"
 
-#: ../src/application_window.c:2627
+#: ../src/application_window.c:2693
 msgid "Do you want to save them before quitting?"
 msgstr "Chcete je uložit, než skončíte?"
 
-#: ../src/application_window.c:2656
+#: ../src/application_window.c:2722
 msgid "Do you really want to quit?"
 msgstr "Opravdu chcete skončit?"
 
-#: ../src/browser.c:550
+#: ../src/browser.c:568
 msgid "New default directory selected for browser"
 msgstr "Nová výchozí složka vybraná pro prohlížeč"
 
-#: ../src/browser.c:843
+#: ../src/browser.c:861
 msgid "Do you want to save them before changing directory?"
 msgstr "Chcete je před tím, než se změní složka, uložit?"
 
-#: ../src/browser.c:850
+#: ../src/browser.c:868
 msgid "Confirm Directory Change"
 msgstr "Potvrzení změny složky"
 
-#: ../src/browser.c:2538
-msgid "<All albums>"
-msgstr "<všechna alba>"
+#: ../src/browser.c:2556
+msgid "All albums"
+msgstr "Všechna alba"
+
+#: ../src/browser.c:3809
+msgid "Select File"
+msgstr "Výběr souboru"
+
+#: ../src/browser.c:3816
+msgid "Select Directory"
+msgstr "Výběr složky"
 
-#: ../src/browser.c:4091
+#: ../src/browser.c:4199
 #, c-format
 msgid "Rename the directory ‘%s’ to:"
 msgstr "Přejmenovat složku „%s“ na:"
 
-#: ../src/browser.c:4231
+#: ../src/browser.c:4339
 msgid "You must type a directory name"
 msgstr "Musíte vyplnit název složky"
 
-#: ../src/browser.c:4232 ../src/browser.c:4254
+#: ../src/browser.c:4340 ../src/browser.c:4362
 msgid "Directory Name Error"
 msgstr "Chyba v názvu složky"
 
-#: ../src/browser.c:4250
+#: ../src/browser.c:4358
 #, 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:4253
+#: ../src/browser.c:4361
 msgid "Please use another name."
 msgstr "Použijte prosím jiný název."
 
-#: ../src/browser.c:4324
+#: ../src/browser.c:4433
 #, c-format
 msgid "The directory name ‘%s’ already exists."
 msgstr "Složka s názvem „%s“ již existuje."
 
-#: ../src/browser.c:4325 ../src/easytag.c:675
+#: ../src/browser.c:4434 ../src/easytag.c:655
 msgid "Rename File Error"
 msgstr "Chyba při přejmenování souboru"
 
-#: ../src/browser.c:4363 ../src/browser.c:4392
+#: ../src/browser.c:4472 ../src/browser.c:4501
 msgid "Rename Directory Error"
 msgstr "Chyba při přejmenování složky"
 
-#: ../src/browser.c:4431
+#: ../src/browser.c:4540
 msgid "Directory renamed"
 msgstr "Složka přejmenována"
 
-#: ../src/cddb_dialog.c:271
+#: ../src/browser.c:4702 ../src/browser.c:4777
+#, c-format
+msgid "Executed command ‘%s’"
+msgstr "Proveden příkaz „%s“"
+
+#: ../src/cddb_dialog.c:270
 #, c-format
 msgid ""
 "Album: ‘%s’, artist: ‘%s’, length: ‘%s’, year: ‘%s’, genre: ‘%s’, disc ID: "
@@ -3281,79 +3297,74 @@ msgid ""
 msgstr ""
 "Album: „%s“, umělec: „%s“, délka: „%s“, rok: „%s“, žánr: „%s“, ID disku: „%s“"
 
-#: ../src/cddb_dialog.c:587
+#: ../src/cddb_dialog.c:586
 #, c-format
 msgid "Resolving host '%s'…"
 msgstr "Hledá se server „%s“…"
 
-#: ../src/cddb_dialog.c:629
+#: ../src/cddb_dialog.c:628
 #, c-format
 msgid "Cannot create a new socket ‘%s’"
 msgstr "Nelze vytvořit nový soket: %s"
 
-#: ../src/cddb_dialog.c:643
+#: ../src/cddb_dialog.c:642
 msgid "Cannot set options on the newly-created socket"
 msgstr "Nelze upravit nastavení nově vytvořeného soketu"
 
 #. Open connection to the server.
-#: ../src/cddb_dialog.c:647
+#: ../src/cddb_dialog.c:646
 #, c-format
 msgid "Connecting to host ‘%s’, port ‘%d’…"
 msgstr "Probíhá připojování k serveru „%s“, port „%d“…"
 
-#: ../src/cddb_dialog.c:660
+#: ../src/cddb_dialog.c:659
 #, c-format
 msgid "Cannot connect to host ‘%s’: %s"
 msgstr "Nelze se připojit k serveru „%s“: %s"
 
-#: ../src/cddb_dialog.c:684
+#: ../src/cddb_dialog.c:683
 #, c-format
 msgid "Cannot resolve host ‘%s’: %s"
 msgstr "Nezdařilo se najít server „%s“: %s"
 
-#: ../src/cddb_dialog.c:697
+#: ../src/cddb_dialog.c:696
 #, c-format
 msgid "Connected to host ‘%s’"
 msgstr "Připojeno k serveru „%s“"
 
-#: ../src/cddb_dialog.c:784
+#: ../src/cddb_dialog.c:783
 #, c-format
 msgid "Error while writing CDDB results to file ‘%s’"
 msgstr "Chyba při zápisu výsledků CDDB do souboru „%s“"
 
-#: ../src/cddb_dialog.c:795
+#: ../src/cddb_dialog.c:794
 #, c-format
 msgid "Receiving data (%s)…"
 msgstr "Přijímají se data (%s)…"
 
-#: ../src/cddb_dialog.c:808
+#: ../src/cddb_dialog.c:807
 #, c-format
 msgid "Error when reading CDDB response ‘%s’"
 msgstr "Chyba při čtení odpovědi od CDDB „%s“"
 
-#: ../src/cddb_dialog.c:815
+#: ../src/cddb_dialog.c:814
 #, c-format
 msgid "Cannot create file ‘%s’: %s"
 msgstr "Nelze vytvořit soubor „%s“: %s"
 
-#: ../src/cddb_dialog.c:878
-#, c-format
-msgid "Cannot load file ‘%s’: %s"
-msgstr "Nelze načíst soubor „%s“: %s"
-
 #. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
 #. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
 #. Send the request
 #. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
 #. Send the request
-#: ../src/cddb_dialog.c:949 ../src/cddb_dialog.c:1595
-#: ../src/cddb_dialog.c:1933
+#: ../src/cddb_dialog.c:943 ../src/cddb_dialog.c:1589
+#: ../src/cddb_dialog.c:1927
 msgid "Sending request…"
 msgstr "Odesílá se požadavek…"
 
-#: ../src/cddb_dialog.c:953 ../src/cddb_dialog.c:1599
-#: ../src/cddb_dialog.c:1937 ../src/cddb_dialog.c:3496
+#: ../src/cddb_dialog.c:947 ../src/cddb_dialog.c:1593
+#: ../src/cddb_dialog.c:1931 ../src/cddb_dialog.c:3490
 #, c-format
 msgid "Cannot send the request ‘%s’"
 msgstr "Nelze odeslat požadavek „%s“"
@@ -3362,34 +3373,34 @@ msgstr "Nelze odeslat požadavek „%s“"
 #.
 #. * Read the answer
 #.
-#: ../src/cddb_dialog.c:965 ../src/cddb_dialog.c:1626
-#: ../src/cddb_dialog.c:3514
+#: ../src/cddb_dialog.c:959 ../src/cddb_dialog.c:1620
+#: ../src/cddb_dialog.c:3508
 msgid "Receiving data…"
 msgstr "Přijímají se data…"
 
-#: ../src/cddb_dialog.c:972 ../src/cddb_dialog.c:1633
-#: ../src/cddb_dialog.c:1968 ../src/cddb_dialog.c:3521
+#: ../src/cddb_dialog.c:966 ../src/cddb_dialog.c:1627
+#: ../src/cddb_dialog.c:1962 ../src/cddb_dialog.c:3515
 msgid "The server returned a bad response"
 msgstr "Server vrátil špatnou odpověď"
 
-#: ../src/cddb_dialog.c:988 ../src/cddb_dialog.c:1003
-#: ../src/cddb_dialog.c:1024 ../src/cddb_dialog.c:1646
-#: ../src/cddb_dialog.c:1984 ../src/cddb_dialog.c:3538
+#: ../src/cddb_dialog.c:982 ../src/cddb_dialog.c:997 ../src/cddb_dialog.c:1018
+#: ../src/cddb_dialog.c:1640 ../src/cddb_dialog.c:1978
+#: ../src/cddb_dialog.c:3532
 #, c-format
 msgid "The server returned a bad response ‘%s’"
 msgstr "Server vrátil špatnou odpověď „%s“"
 
 #. Load the track list of the album
-#: ../src/cddb_dialog.c:1239
+#: ../src/cddb_dialog.c:1233
 msgid "Loading album track list…"
 msgstr "Načítá se seznam skladeb z alba…"
 
-#: ../src/cddb_dialog.c:1793
+#: ../src/cddb_dialog.c:1787
 #, c-format
 msgid "Sorry, the web-based search is currently not available"
 msgstr "Bohužel, ale vyhledávání na webu není v tuto chvíli dostupné"
 
-#: ../src/cddb_dialog.c:1795 ../src/cddb_dialog.c:2155
+#: ../src/cddb_dialog.c:1789 ../src/cddb_dialog.c:2149
 #, c-format
 msgid "Found one matching album"
 msgid_plural "Found %d matching albums"
@@ -3397,52 +3408,52 @@ msgstr[0] "Nalezeno jedno odpovídajících album"
 msgstr[1] "Nalezena %d odpovídající alba"
 msgstr[2] "Nalezeno %d odpovídajících alb"
 
-#: ../src/cddb_dialog.c:1956
+#: ../src/cddb_dialog.c:1950
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)…"
 msgstr "Přijímají se data ze stránky %d (album %d/%d)…"
 
-#: ../src/cddb_dialog.c:1958
+#: ../src/cddb_dialog.c:1952
 #, c-format
 msgid "Receiving data of page %d…"
 msgstr "Přijímají se data ze stránky %d"
 
-#: ../src/cddb_dialog.c:2122
+#: ../src/cddb_dialog.c:2116
 #, c-format
 msgid "More results to load…"
 msgstr "Další výsledky k načtení…"
 
-#: ../src/cddb_dialog.c:2302
+#: ../src/cddb_dialog.c:2296
 msgid "The number of CDDB results does not match the number of selected files"
 msgstr "Počet výsledků CDDB neodpovídá počtu vybraných souborů"
 
-#: ../src/cddb_dialog.c:2308
+#: ../src/cddb_dialog.c:2302
 msgid "Write Tag from CDDB"
 msgstr "Zápis štítku z CDDB"
 
-#: ../src/cddb_dialog.c:3012
+#: ../src/cddb_dialog.c:3006
 msgid "Ready to search"
 msgstr "Připraveno k hledání"
 
-#: ../src/cddb_dialog.c:3100 ../src/load_files_dialog.c:261
-#: ../src/setting.c:245
+#: ../src/cddb_dialog.c:3094 ../src/load_files_dialog.c:261
+#: ../src/setting.c:325
 #, c-format
 msgid "Cannot open file ‘%s’: %s"
 msgstr "Nelze otevřít soubor „%s“: %s"
 
-#: ../src/cddb_dialog.c:3327
+#: ../src/cddb_dialog.c:3321
 #, c-format
 msgid "No file selected"
 msgstr "Není vybrán žádný soubor"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: ../src/cddb_dialog.c:3335
+#: ../src/cddb_dialog.c:3329
 #, c-format
 msgid "More than 99 files selected. Cannot send request"
 msgstr "Je vybráno více než 99 souborů. Nelze zaslat požadavek"
 
-#: ../src/cddb_dialog.c:3341
+#: ../src/cddb_dialog.c:3335
 #, c-format
 msgid "One file selected"
 msgid_plural "%d files selected"
@@ -3451,13 +3462,13 @@ msgstr[1] "Vybrány %d soubory"
 msgstr[2] "Vybráno %d souborů"
 
 #. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
-#: ../src/cddb_dialog.c:3486
+#: ../src/cddb_dialog.c:3480
 #, c-format
 msgid "Sending request (disc ID: %s, #tracks: %d, Disc length: %d)…"
 msgstr ""
 "Posílá se požadavek (ID disku: %s, číslo skladby: %d, délka disku: %d)…"
 
-#: ../src/cddb_dialog.c:3652
+#: ../src/cddb_dialog.c:3648
 #, c-format
 msgid "DiscID ‘%s’ gave one matching album"
 msgid_plural "DiscID ‘%s’ gave %d matching albums"
@@ -3465,152 +3476,152 @@ msgstr[0] "Identifikátor disku „%s“ poskytl jedno odpovídající album"
 msgstr[1] "Identifikátor disku „%s“ poskytl %d odpovídající alba"
 msgstr[2] "Identifikátor disku „%s“ poskytl %d odpovídajících alb"
 
-#: ../src/charset.c:49
+#: ../src/charset.c:46
 msgid "Arabic (IBM-864)"
 msgstr "Arabské (IBM-864)"
 
-#: ../src/charset.c:50
+#: ../src/charset.c:47
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabské (ISO-8859-6)"
 
-#: ../src/charset.c:51
+#: ../src/charset.c:48
 msgid "Arabic (Windows-1256)"
 msgstr "Arabské (Windows-1256)"
 
-#: ../src/charset.c:52
+#: ../src/charset.c:49
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltické (ISO-8859-13)"
 
-#: ../src/charset.c:53
+#: ../src/charset.c:50
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltické (ISO-8859-4)"
 
-#: ../src/charset.c:54
+#: ../src/charset.c:51
 msgid "Baltic (Windows-1257)"
 msgstr "Baltické (Windows-1257)"
 
-#: ../src/charset.c:55
+#: ../src/charset.c:52
 msgid "Celtic (ISO-8859-14)"
 msgstr "Keltské (ISO-8859-14)"
 
-#: ../src/charset.c:56
+#: ../src/charset.c:53
 msgid "Central European (IBM-852)"
 msgstr "Středoevropské (IBM-852)"
 
-#: ../src/charset.c:57
+#: ../src/charset.c:54
 msgid "Central European (ISO-8859-2)"
 msgstr "Středoevropské (ISO-8859-2)"
 
-#: ../src/charset.c:58
+#: ../src/charset.c:55
 msgid "Central European (Windows-1250)"
 msgstr "Středoevropské (Windows-1250)"
 
-#: ../src/charset.c:59
+#: ../src/charset.c:56
 msgid "Chinese Simplified (GB18030)"
 msgstr "Čínské zjednodušené (GB18030)"
 
-#: ../src/charset.c:60
+#: ../src/charset.c:57
 msgid "Chinese Simplified (GB2312)"
 msgstr "Čínské zjednodušené (GB2312)"
 
-#: ../src/charset.c:61
+#: ../src/charset.c:58
 msgid "Chinese Traditional (Big5)"
 msgstr "Čínské tradiční (Big5)"
 
-#: ../src/charset.c:62
+#: ../src/charset.c:59
 msgid "Chinese Traditional (Big5-HKSCS)"
 msgstr "Čínské tradiční (Big5-HKSCS)"
 
-#: ../src/charset.c:63
+#: ../src/charset.c:60
 msgid "Cyrillic (IBM-855)"
 msgstr "Azbuka (IBM-855)"
 
-#: ../src/charset.c:64
+#: ../src/charset.c:61
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Azbuka (ISO-8859-5)"
 
-#: ../src/charset.c:65
+#: ../src/charset.c:62
 msgid "Cyrillic (ISO-IR-111)"
 msgstr "Azbuka (ISO-IR-111)"
 
-#: ../src/charset.c:66
+#: ../src/charset.c:63
 msgid "Cyrillic (KOI8-R)"
 msgstr "Azbuka (KOI8-R)"
 
-#: ../src/charset.c:67
+#: ../src/charset.c:64
 msgid "Cyrillic (Windows-1251)"
 msgstr "Azbuka (Windows-1251)"
 
-#: ../src/charset.c:68
+#: ../src/charset.c:65
 msgid "Cyrillic/Russian (CP-866)"
 msgstr "Azbuka/Rusko (CP-866)"
 
-#: ../src/charset.c:69
+#: ../src/charset.c:66
 msgid "Cyrillic/Ukrainian (KOI8-U)"
 msgstr "Azbuka/Ukrajina (KOI8-U)"
 
-#: ../src/charset.c:70
+#: ../src/charset.c:67
 msgid "English (US-ASCII)"
 msgstr "Anglické (US-ASCII)"
 
-#: ../src/charset.c:71
+#: ../src/charset.c:68
 msgid "Greek (ISO-8859-7)"
 msgstr "Řecké (ISO-8859-7)"
 
-#: ../src/charset.c:72
+#: ../src/charset.c:69
 msgid "Greek (Windows-1253)"
 msgstr "Řecké (Windows-1253)"
 
-#: ../src/charset.c:73
+#: ../src/charset.c:70
 msgid "Hebrew (IBM-862)"
 msgstr "Hebrejské (IBM-862)"
 
-#: ../src/charset.c:74
+#: ../src/charset.c:71
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrejské (Windows-1255)"
 
-#: ../src/charset.c:75
+#: ../src/charset.c:72
 msgid "Japanese (EUC-JP)"
 msgstr "Japonské (EUC-JP)"
 
-#: ../src/charset.c:76
+#: ../src/charset.c:73
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonské (ISO-2022-JP)"
 
-#: ../src/charset.c:77
+#: ../src/charset.c:74
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonské (Shift_JIS)"
 
-#: ../src/charset.c:78
+#: ../src/charset.c:75
 msgid "Korean (EUC-KR)"
 msgstr "Korejské (EUC-KR)"
 
-#: ../src/charset.c:79
+#: ../src/charset.c:76
 msgid "Nordic (ISO-8859-10)"
 msgstr "Severské (ISO-8859-10)"
 
-#: ../src/charset.c:80
+#: ../src/charset.c:77
 msgid "South European (ISO-8859-3)"
 msgstr "Jihoevropské (ISO-8859-3)"
 
-#: ../src/charset.c:81
+#: ../src/charset.c:78
 msgid "Thai (TIS-620)"
 msgstr "Thajské (TIS-620)"
 
-#: ../src/charset.c:82
+#: ../src/charset.c:79
 msgid "Turkish (IBM-857)"
 msgstr "Turecké (IBM-857)"
 
-#: ../src/charset.c:83
+#: ../src/charset.c:80
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turecké (ISO-8859-9)"
 
-#: ../src/charset.c:84
+#: ../src/charset.c:81
 msgid "Turkish (Windows-1254)"
 msgstr "Turecké (Windows-1254)"
 
 #. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
-#: ../src/charset.c:86
+#: ../src/charset.c:83
 msgid "Unicode (UTF-8)"
 msgstr "Unikód (UTF-8)"
 
@@ -3618,54 +3629,54 @@ msgstr "Unikód (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:90
 msgid "Vietnamese (VISCII)"
 msgstr "Vietnamské (VISCII)"
 
-#: ../src/charset.c:94
+#: ../src/charset.c:91
 msgid "Vietnamese (Windows-1258)"
 msgstr "Vietnamské (Windows-1258)"
 
-#: ../src/charset.c:95
+#: ../src/charset.c:92
 msgid "Visual Hebrew (ISO-8859-8)"
 msgstr "Vizuální hebrejské (ISO-8859-8)"
 
-#: ../src/charset.c:96
+#: ../src/charset.c:93
 msgid "Western (IBM-850)"
 msgstr "Západní (IBM-850)"
 
-#: ../src/charset.c:97
+#: ../src/charset.c:94
 msgid "Western (ISO-8859-1)"
 msgstr "Západní (ISO-8859-1)"
 
-#: ../src/charset.c:98
+#: ../src/charset.c:95
 msgid "Western (ISO-8859-15)"
 msgstr "Západní (ISO-8859-15)"
 
-#: ../src/charset.c:99
+#: ../src/charset.c:96
 msgid "Western (Windows-1252)"
 msgstr "Západní (Windows-1252)"
 
-#: ../src/charset.c:511
+#: ../src/charset.c:508
 #, c-format
 msgid "The filename ‘%s’ could not be converted into UTF-8: %s"
 msgstr "Název souboru „%s“ nelze převést do UTF-8: %s"
 
-#: ../src/charset.c:513 ../src/charset.c:626 ../src/charset.c:691
+#: ../src/charset.c:510 ../src/charset.c:623 ../src/charset.c:688
 msgid "Invalid UTF-8"
 msgstr "Neplatné UTF-8"
 
-#: ../src/charset.c:624
+#: ../src/charset.c:621
 #, c-format
 msgid "The UTF-8 string ‘%s’ could not be converted into filename encoding: %s"
 msgstr "Řetězec „%s“ v UTF-8 nelze převést do kódování názvu souboru: %s"
 
-#: ../src/charset.c:689
+#: ../src/charset.c:686
 #, c-format
 msgid "The string ‘%s’ could not be converted into UTF-8: %s"
 msgstr "Řetězec „%s“ nelze převést do UTF-8: %s"
 
-#: ../src/easytag.c:269
+#: ../src/easytag.c:243
 #, c-format
 msgid "A file was changed by an external program"
 msgid_plural "%d files were changed by an external program"
@@ -3673,113 +3684,113 @@ 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:278
+#: ../src/easytag.c:252
 msgid "Do you want to continue saving the file?"
 msgstr "Chcete pokračovat v ukládání souboru?"
 
-#: ../src/easytag.c:339 ../src/easytag.c:360
+#: ../src/easytag.c:313 ../src/easytag.c:334
 msgid "Saving files was stopped"
 msgstr "Ukládání souborů bylo zastaveno"
 
-#: ../src/easytag.c:362
+#: ../src/easytag.c:336
 msgid "All files have been saved"
 msgstr "Všechny soubory byly uloženy"
 
-#: ../src/easytag.c:483
+#: ../src/easytag.c:455
 #, c-format
 msgid "Do you want to write the tag of file ‘%s’?"
 msgstr "Chcete zapsat štítek do souboru „%s“?"
 
-#: ../src/easytag.c:485
+#: ../src/easytag.c:457
 msgid "Confirm Tag Writing"
 msgstr "Potvrzení zápisu štítku"
 
 #. Directories and filename changed
-#: ../src/easytag.c:578
+#: ../src/easytag.c:558
 msgid "Rename File and Directory"
 msgstr "Přejmenovat soubor a složku"
 
-#: ../src/easytag.c:579
+#: ../src/easytag.c:559
 msgid "File and directory rename confirmation required"
 msgstr "Je požadováno schválení přejmenování souboru a složky"
 
-#: ../src/easytag.c:580
+#: ../src/easytag.c:560
 #, 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:586
+#: ../src/easytag.c:566
 msgid "Directory rename confirmation required"
 msgstr "Je požadováno schválení přejmenování složky"
 
-#: ../src/easytag.c:587
+#: ../src/easytag.c:567
 #, c-format
 msgid "Do you want to rename the directory ‘%s’ to ‘%s’?"
 msgstr "Chcete přejmenovat složku „%s“ na „%s“?"
 
-#: ../src/easytag.c:595
+#: ../src/easytag.c:575
 msgid "File rename confirmation required"
 msgstr "Je požadováno schválení přejmenování souboru"
 
-#: ../src/easytag.c:596
+#: ../src/easytag.c:576
 #, c-format
 msgid "Do you want to rename the file ‘%s’ to ‘%s’?"
 msgstr "Chcete přejmenovat soubor „%s“ na „%s“?"
 
-#: ../src/easytag.c:668
+#: ../src/easytag.c:648
 #, c-format
 msgid "Cannot rename file ‘%s’ to ‘%s’"
 msgstr "Nelze přejmenovat soubor „%s“ na „%s“"
 
-#: ../src/easytag.c:682
+#: ../src/easytag.c:662
 #, c-format
 msgid "Cannot rename file ‘%s’ to ‘%s’: %s"
 msgstr "Nelze přejmenovat soubor „%s“ na „%s“: %s"
 
-#: ../src/easytag.c:687
+#: ../src/easytag.c:667
 msgid "File(s) not renamed"
 msgstr "Soubor či soubory nebyly přejmenovány"
 
-#: ../src/easytag.c:867
+#: ../src/easytag.c:852
 #, c-format
 msgid "Writing tag of ‘%s’"
 msgstr "Zapisuje se štítek do „%s“"
 
-#: ../src/easytag.c:875
+#: ../src/easytag.c:860
 #, c-format
 msgid "Wrote tag of ‘%s’"
 msgstr "Zapsán štítek do „%s“"
 
-#: ../src/easytag.c:891
+#: ../src/easytag.c:876
 #, c-format
 msgid "Cannot write tag in file ‘%s’"
 msgstr "Nelze zapsat štítek do souboru „%s“"
 
-#: ../src/easytag.c:895
+#: ../src/easytag.c:880
 msgid "Tag Write Error"
 msgstr "Chyba při zápisu štítku"
 
-#: ../src/easytag.c:970 ../src/easytag.c:1198
+#: ../src/easytag.c:955 ../src/easytag.c:1183
 #, c-format
 msgid "Cannot read directory ‘%s’"
 msgstr "Nelze číst složku „%s“"
 
-#: ../src/easytag.c:974
+#: ../src/easytag.c:959
 msgid "Directory Read Error"
 msgstr "Chyba při čtení složky"
 
 #. Read the directory recursively
-#: ../src/easytag.c:995
+#: ../src/easytag.c:980
 #, c-format
 msgid "Search in progress…"
 msgstr "Probíhá hledání…"
 
-#: ../src/easytag.c:1019 ../src/et_core.c:2986
+#: ../src/easytag.c:1004 ../src/et_core.c:2962
 #, c-format
 msgid "File: ‘%s’"
 msgstr "Soubor: „%s“"
 
-#: ../src/easytag.c:1066
+#: ../src/easytag.c:1051
 #, c-format
 msgid "Found one file in this directory and subdirectories"
 msgid_plural "Found %d files in this directory and subdirectories"
@@ -3787,7 +3798,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:1073
+#: ../src/easytag.c:1058
 #, c-format
 msgid "Found one file in this directory"
 msgid_plural "Found %d files in this directory"
@@ -3795,62 +3806,62 @@ 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:1090
+#: ../src/easytag.c:1075
 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:1092
+#: ../src/easytag.c:1077
 msgid "No file found in this directory"
 msgstr "V této složce nebyl nalezen žádný soubor"
 
-#: ../src/easytag.c:1162
+#: ../src/easytag.c:1147
 #, c-format
 msgid "Error opening directory ‘%s’: %s"
 msgstr "Chyba otevírání složky „%s“: %s"
 
-#: ../src/easytag.c:1218
+#: ../src/easytag.c:1203
 msgid "Searching for audio files…"
 msgstr "Vyhledávají se zvukové soubory…"
 
-#: ../src/easytag.c:1219
+#: ../src/easytag.c:1204
 msgid "Searching"
 msgstr "Hledání"
 
-#: ../src/easytag.c:1220
+#: ../src/easytag.c:1205
 msgid "_Stop"
 msgstr "Za_stavit"
 
-#: ../src/et_core.c:545
+#: ../src/et_core.c:507
 #, c-format
 msgid "Error reading tag from Ogg file ‘%s’: %s"
 msgstr "Chyba při čtení štítku ze souboru ogg „%s“: %s"
 
-#: ../src/et_core.c:556
+#: ../src/et_core.c:518
 #, c-format
 msgid "Error reading tag from FLAC file ‘%s’: %s"
 msgstr "Chyba při čtení štítku ze souboru FLAC „%s“: %s"
 
-#: ../src/et_core.c:566
+#: ../src/et_core.c:528
 #, c-format
 msgid "Error reading APE tag from file ‘%s’: %s"
 msgstr "Chyba při čtení štítku APE ze souboru „%s“: %s"
 
-#: ../src/et_core.c:576
+#: ../src/et_core.c:538
 #, c-format
 msgid "Error reading tag from MP4 file ‘%s’: %s"
 msgstr "Chyba při čtení štítku ze souboru MP4 „%s“: %s"
 
-#: ../src/et_core.c:587
+#: ../src/et_core.c:549
 #, c-format
 msgid "Error reading tag from WavPack file ‘%s’: %s"
 msgstr "Chyba při čtení štítku ze souboru WavPack „%s“: %s"
 
-#: ../src/et_core.c:598
+#: ../src/et_core.c:560
 #, c-format
 msgid "Error reading tag from Opus file ‘%s’: %s"
 msgstr "Chyba při čtení štítku ze souboru Opus „%s“: %s"
 
-#: ../src/et_core.c:614
+#: ../src/et_core.c:576
 #, c-format
 msgid ""
 "The year value ‘%s’ seems to be invalid in file ‘%s’. The information will "
@@ -3859,13 +3870,13 @@ msgstr ""
 "Vypadá to, že údaj o roce „%s“ v souboru „%s“ je neplatný. Při uložení "
 "štítku bude tento údaj ztracen"
 
-#: ../src/et_core.c:749
+#: ../src/et_core.c:711
 #, c-format
 msgid "Automatic corrections applied for file ‘%s’"
 msgstr "Pro soubor „%s“ byly použity automatické korekce."
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:3010
+#: ../src/et_core.c:2986
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
@@ -3874,35 +3885,35 @@ msgstr[1] "%u soubory"
 msgstr[2] "%u souborů"
 
 #. Bitrate
-#: ../src/et_core.c:3041 ../src/tags/flac_header.c:307
-#: ../src/tags/monkeyaudio_header.c:83 ../src/tags/mp4_header.cc:144
-#: ../src/tags/mpeg_header.c:240 ../src/tags/musepack_header.c:87
-#: ../src/tags/ogg_header.c:411 ../src/tags/opus_header.c:229
-#: ../src/tags/wavpack_header.c:90
+#: ../src/et_core.c:3017 ../src/tags/flac_header.c:179
+#: ../src/tags/monkeyaudio_header.c:82 ../src/tags/mp4_header.cc:144
+#: ../src/tags/mpeg_header.c:239 ../src/tags/musepack_header.c:86
+#: ../src/tags/ogg_header.c:410 ../src/tags/opus_header.c:227
+#: ../src/tags/wavpack_header.c:145
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: ../src/et_core.c:3044 ../src/tags/flac_header.c:310
-#: ../src/tags/monkeyaudio_header.c:86 ../src/tags/mp4_header.cc:148
-#: ../src/tags/mpeg_header.c:245 ../src/tags/musepack_header.c:90
-#: ../src/tags/ogg_header.c:414 ../src/tags/opus_header.c:232
-#: ../src/tags/wavpack_header.c:93
+#: ../src/et_core.c:3020 ../src/tags/flac_header.c:182
+#: ../src/tags/monkeyaudio_header.c:85 ../src/tags/mp4_header.cc:148
+#: ../src/tags/mpeg_header.c:244 ../src/tags/musepack_header.c:89
+#: ../src/tags/ogg_header.c:413 ../src/tags/opus_header.c:230
+#: ../src/tags/wavpack_header.c:148
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/et_core.c:3173
+#: ../src/et_core.c:3149
 #, c-format
 msgid "Could not convert filename ‘%s’ to 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:3175
+#: ../src/et_core.c:3151
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Zkuste nastavit proměnnou prostředí G_FILENAME_ENCODING"
 
-#: ../src/et_core.c:3176 ../src/scan_dialog.c:719
+#: ../src/et_core.c:3152 ../src/scan_dialog.c:721
 msgid "Filename translation"
 msgstr "Překlad názvu souboru"
 
@@ -3944,169 +3955,151 @@ msgstr "Posunout tento řádek níž"
 msgid "Load Filenames From a Text File"
 msgstr "Načtení názvů souborů z textového souboru"
 
-#: ../src/misc.c:257
+#: ../src/misc.c:204
 msgid "You must type a program name"
 msgstr "Musíte vyplnit název programu"
 
-#: ../src/misc.c:258
+#: ../src/misc.c:205
 msgid "Program Name Error"
 msgstr "Chyba v názvu programu"
 
-#: ../src/misc.c:336
-#, c-format
-msgid "Executed command ‘%s’"
-msgstr "Proveden příkaz „%s“"
-
-#: ../src/misc.c:344 ../src/misc.c:455
-#, c-format
-msgid "Failed to launch program ‘%s’"
-msgstr "Selhalo spuštění programu: %s"
-
-#: ../src/misc.c:361
-msgid "Select File"
-msgstr "Výběr souboru"
-
-#: ../src/misc.c:367
-msgid "Select Directory"
-msgstr "Výběr složky"
-
-#: ../src/picture.c:186
+#: ../src/picture.c:174
 msgid "JPEG image"
 msgstr "Obrázek JPEG"
 
-#: ../src/picture.c:188
+#: ../src/picture.c:176
 msgid "PNG image"
 msgstr "Obrázek PNG"
 
-#: ../src/picture.c:190
+#: ../src/picture.c:178
 msgid "GIF image"
 msgstr "Obrázek GIF"
 
-#: ../src/picture.c:192
+#: ../src/picture.c:180
 msgid "Unknown image"
 msgstr "Neznámý obrázek"
 
-#: ../src/picture.c:204
+#: ../src/picture.c:192
 msgid "32×32 pixel PNG file icon"
 msgstr "Ikona souboru 32×32 pixelu PNG"
 
-#: ../src/picture.c:206
+#: ../src/picture.c:194
 msgid "Other file icon"
 msgstr "Jiná ikona souboru"
 
-#: ../src/picture.c:208
+#: ../src/picture.c:196
 msgid "Cover (front)"
 msgstr "Přebal (přední)"
 
-#: ../src/picture.c:210
+#: ../src/picture.c:198
 msgid "Cover (back)"
 msgstr "Přebal (zadní)"
 
-#: ../src/picture.c:212
+#: ../src/picture.c:200
 msgid "Leaflet page"
 msgstr "Stránka brožury"
 
-#: ../src/picture.c:214
+#: ../src/picture.c:202
 msgid "Media (such as label side of CD)"
 msgstr "Médium (např. potisklá strana CD)"
 
-#: ../src/picture.c:216
+#: ../src/picture.c:204
 msgid "Lead artist/lead performer/soloist"
 msgstr "Hlavní umělec/hlavní účinkující/sólista"
 
-#: ../src/picture.c:218
+#: ../src/picture.c:206
 msgid "Artist/performer"
 msgstr "Umělec/účinkující"
 
-#: ../src/picture.c:220
+#: ../src/picture.c:208
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: ../src/picture.c:222
+#: ../src/picture.c:210
 msgid "Band/Orchestra"
 msgstr "Skupina/orchestr"
 
-#: ../src/picture.c:226
+#: ../src/picture.c:214
 msgid "Lyricist/text writer"
 msgstr "Textař"
 
-#: ../src/picture.c:228
+#: ../src/picture.c:216
 msgid "Recording location"
 msgstr "Místo nahrávání"
 
-#: ../src/picture.c:230
+#: ../src/picture.c:218
 msgid "During recording"
 msgstr "Během nahrávání"
 
-#: ../src/picture.c:232
+#: ../src/picture.c:220
 msgid "During performance"
 msgstr "Během představení"
 
-#: ../src/picture.c:234
+#: ../src/picture.c:222
 msgid "Movie/video screen capture"
 msgstr "Zachytávání filmu/videa"
 
-#: ../src/picture.c:236
+#: ../src/picture.c:224
 msgid "A bright colored fish"
 msgstr "Pestrobarevná ryba"
 
-#: ../src/picture.c:238
+#: ../src/picture.c:226
 msgid "Illustration"
 msgstr "Ilustrace"
 
-#: ../src/picture.c:240
+#: ../src/picture.c:228
 msgid "Band/Artist logotype"
 msgstr "Logo skupiny/umělce"
 
-#: ../src/picture.c:242
+#: ../src/picture.c:230
 msgid "Publisher/studio logotype"
 msgstr "Logo vydavatele/studia"
 
-#: ../src/picture.c:246
+#: ../src/picture.c:234
 msgid "Unknown image type"
 msgstr "Neznámý typ obrázku"
 
-#: ../src/picture.c:276 ../src/picture.c:287
+#: ../src/picture.c:262 ../src/picture.c:271
 msgid "pixels"
 msgstr "pixely"
 
-#: ../src/picture.c:277 ../src/picture.c:288
+#: ../src/picture.c:262 ../src/picture.c:271
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/playlist_dialog.c:528
+#: ../src/playlist_dialog.c:531
 #, c-format
 msgid "Cannot write playlist file ‘%s’"
 msgstr "Nelze zapsat soubor „%s“ se seznamem k přehrání"
 
-#: ../src/playlist_dialog.c:532
+#: ../src/playlist_dialog.c:535
 msgid "Playlist File Error"
 msgstr "Chyba souboru se seznamem k přehrání"
 
-#: ../src/playlist_dialog.c:540
+#: ../src/playlist_dialog.c:543
 #, c-format
 msgid "Wrote playlist file ‘%s’"
 msgstr "Zapsán soubor „%s“ se seznamem k přehrání"
 
-#: ../src/playlist_dialog.c:622 ../src/scan_dialog.c:2770
-#: ../src/scan_dialog.c:2832
+#: ../src/playlist_dialog.c:625 ../src/scan_dialog.c:2772
+#: ../src/scan_dialog.c:2834
 msgid "Invalid scanner mask"
 msgstr "Neplatná maska průzkumníka"
 
-#: ../src/playlist_dialog.c:653
+#: ../src/playlist_dialog.c:656
 msgid "Generate Playlist"
 msgstr "Generování seznamu k přehrání"
 
 #. The window
-#: ../src/preferences_dialog.c:293
+#: ../src/preferences_dialog.c:289
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: ../src/preferences_dialog.c:1130
+#: ../src/preferences_dialog.c:1126
 msgid "The selected default path is invalid"
 msgstr "Vybraná výchozí cesta není platná"
 
-#: ../src/preferences_dialog.c:1132
+#: ../src/preferences_dialog.c:1128
 #, c-format
 msgid ""
 "Path: ‘%s’\n"
@@ -4115,7 +4108,7 @@ msgstr ""
 "Cesta: „%s“\n"
 "Chyba: %s"
 
-#: ../src/preferences_dialog.c:1136
+#: ../src/preferences_dialog.c:1132
 msgid "Invalid Path Error"
 msgstr "Chyba způsobená neplatnou cestou"
 
@@ -4124,63 +4117,63 @@ msgstr "Chyba způsobená neplatnou cestou"
 msgid "Cannot calculate CRC value of file ‘%s’"
 msgstr "Nelze vypočítat hodnotu kontrolního součtu pro soubor „%s“"
 
-#: ../src/scan_dialog.c:323
+#: ../src/scan_dialog.c:325
 msgid "Tag successfully scanned"
 msgstr "Štítek byl úspěšně prozkoumán"
 
-#: ../src/scan_dialog.c:326
+#: ../src/scan_dialog.c:328
 #, c-format
 msgid "Tag successfully scanned ‘%s’"
 msgstr "Štítek v souboru „%s“ byl úspěšně prozkoumán"
 
-#: ../src/scan_dialog.c:369
+#: ../src/scan_dialog.c:371
 #, c-format
 msgid "The extension ‘%s’ was not found in filename ‘%s’"
 msgstr "Přípona „%s“ nebyla v názvu souboru „%s“ nalezena"
 
-#: ../src/scan_dialog.c:459 ../src/scan_dialog.c:490
+#: ../src/scan_dialog.c:461 ../src/scan_dialog.c:492
 #, c-format
 msgid "Cannot find separator ‘%s’ within ‘%s’"
 msgstr "Nelze nalézt oddělovač „%s“ vrámci „%s“"
 
-#: ../src/scan_dialog.c:717
+#: ../src/scan_dialog.c:719
 #, 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/scan_dialog.c:742
+#: ../src/scan_dialog.c:744
 msgid "New filename successfully scanned"
 msgstr "Nový název souboru byl úspěšně prozkoumán"
 
-#: ../src/scan_dialog.c:746
+#: ../src/scan_dialog.c:748
 #, c-format
 msgid "New filename successfully scanned ‘%s’"
 msgstr "Nový název souboru „%s“ byl úspěšně prozkoumán"
 
-#: ../src/scan_dialog.c:1109
+#: ../src/scan_dialog.c:1111
 #, c-format
 msgid "Error while processing fields ‘%s’"
 msgstr "Chyba při zpracování polí: %s"
 
-#: ../src/scan_dialog.c:2040
+#: ../src/scan_dialog.c:2042
 msgid "New_mask"
 msgstr "Nová _maska"
 
 #. The window
-#: ../src/scan_dialog.c:2257
+#: ../src/scan_dialog.c:2259
 msgid "Tag and Filename Scan"
 msgstr "Průzkum štítků a názvů souborů"
 
 #. 'Scan selected files' button
-#: ../src/scan_dialog.c:2263
+#: ../src/scan_dialog.c:2265
 msgid "Scan Files"
 msgstr "Prozkoumat soubory"
 
-#: ../src/scan_dialog.c:2269
+#: ../src/scan_dialog.c:2271
 msgid "Scan selected files"
 msgstr "Prozkoumat vybrané soubory"
 
-#: ../src/scan_dialog.c:2907
+#: ../src/scan_dialog.c:2909
 msgid "All tags have been scanned"
 msgstr "Všechny štítky byly prozkoumány"
 
@@ -4200,239 +4193,214 @@ msgstr "Hledání souborů"
 msgid "Ready to search…"
 msgstr "Připraveno k hledání…"
 
-#: ../src/setting.c:142
-#, c-format
-msgid "Cannot create or open file ‘%s’: %s"
-msgstr "Nelze vytvořit nebo otevřít soubor „%s“: %s"
-
-#: ../src/setting.c:192
+#: ../src/setting.c:243
 #, c-format
 msgid "Cannot write list to file ‘%s’: %s"
 msgstr "Nelze zapsat seznam do souboru „%s“: %s"
 
-#: ../src/setting.c:210
-#, c-format
-msgid "Error while writing list file ‘%s’"
-msgstr "Chyba při zápisu seznamu do souboru „%s“"
-
 #. Fall back to defaults.
-#: ../src/setting.c:290
+#: ../src/setting.c:348
 msgid "Loading default ‘Fill Tag’ masks…"
 msgstr "Načítá se výchozí maska pro vyplnění štítků…"
 
 #. Fall back to defaults.
-#: ../src/setting.c:320
+#: ../src/setting.c:378
 msgid "Loading default ‘Rename File’ masks…"
 msgstr "Načítají se výchozí masky pro přejmenování souborů…"
 
-#: ../src/setting.c:406
-#, c-format
-msgid "Migrating configuration from directory ‘%s’ to ‘%s’"
-msgstr "Migruje se nastavení ze složky „%s“ do složky „%s“"
-
-#: ../src/setting.c:430
-#, c-format
-msgid "Failed to migrate configuration file ‘%s’"
-msgstr "Selhala migrace souboru s nastavením „%s“"
-
-#: ../src/setting.c:467
-#, c-format
-msgid "Cannot create directory ‘%s’: %s"
-msgstr "Nelze vytvořit složku „%s“: %s"
-
-#: ../src/status_bar.c:145
+#: ../src/status_bar.c:146
 msgid "Ready to start"
 msgstr "Připraveno ke spuštění"
 
-#: ../src/tag_area.c:187
+#: ../src/tag_area.c:186
 #, c-format
 msgid "Selected files tagged with title ‘%s’"
 msgstr "U vybraných souborů byl ve štítku nastaven název na „%s“"
 
-#: ../src/tag_area.c:192
+#: ../src/tag_area.c:191
 msgid "Removed title from selected files"
 msgstr "Z vybraných souborů byl ve štítku vymazán název"
 
-#: ../src/tag_area.c:209
+#: ../src/tag_area.c:208
 #, c-format
 msgid "Selected files tagged with artist ‘%s’"
 msgstr "U vybraných souborů byl ve štítku nastaven umělec na „%s“"
 
-#: ../src/tag_area.c:214
+#: ../src/tag_area.c:213
 msgid "Removed artist from selected files"
 msgstr "Z vybraných souborů byl ve štítku vymazán umělec"
 
-#: ../src/tag_area.c:230
+#: ../src/tag_area.c:229
 #, c-format
 msgid "Selected files tagged with album artist ‘%s’"
 msgstr "U vybraných souborů byl ve štítku nastaven umělec alba na „%s“"
 
-#: ../src/tag_area.c:235
+#: ../src/tag_area.c:234
 msgid "Removed album artist from selected files"
 msgstr "Z vybraných souborů byl ve štítku vymazán umělec alba"
 
-#: ../src/tag_area.c:252
+#: ../src/tag_area.c:251
 #, c-format
 msgid "Selected files tagged with album ‘%s’"
 msgstr "U vybraných souborů bylo ve štítku nastaveno album na „%s“"
 
-#: ../src/tag_area.c:257
+#: ../src/tag_area.c:256
 msgid "Removed album name from selected files"
 msgstr "Z vybraných souborů bylo ve štítku vymazáno album"
 
-#: ../src/tag_area.c:295
+#: ../src/tag_area.c:294
 #, c-format
 msgid "Selected files tagged with disc number ‘%s/%s’"
 msgstr "U vybraných souborů bylo ve štítku nastaveno číslo disku na „%s/%s“"
 
-#: ../src/tag_area.c:300
+#: ../src/tag_area.c:299
 #, c-format
 msgid "Selected files tagged with disc number like ‘xx’"
 msgstr "U vybraných souborů bylo ve štítku nastaveno číslo disku ve stylu „xx“"
 
-#: ../src/tag_area.c:305
+#: ../src/tag_area.c:304
 msgid "Removed disc number from selected files"
 msgstr "Z vybraných souborů bylo ve štítku vymazáno číslo disku"
 
-#: ../src/tag_area.c:322
+#: ../src/tag_area.c:321
 #, c-format
 msgid "Selected files tagged with year ‘%s’"
 msgstr "U vybraných souborů byl ve štítku nastaven rok na „%s“"
 
-#: ../src/tag_area.c:327
+#: ../src/tag_area.c:326
 msgid "Removed year from selected files"
 msgstr "Z vybraných souborů byl ve štítku vymazán rok"
 
-#: ../src/tag_area.c:354 ../src/tag_area.c:448
+#: ../src/tag_area.c:353 ../src/tag_area.c:447
 #, c-format
 msgid "Selected files tagged with track like ‘xx/%s’"
 msgstr "U vybraných souborů bylo ve štítku nastaveno pořadí v podobě „xx/%s“"
 
-#: ../src/tag_area.c:358
+#: ../src/tag_area.c:357
 #, c-format
 msgid "Selected files tagged with track like ‘xx’"
 msgstr "U vybraných souborů bylo ve štítku nastaveno pořadí v podobě „xx“"
 
-#: ../src/tag_area.c:363 ../src/tag_area.c:453
+#: ../src/tag_area.c:362 ../src/tag_area.c:452
 msgid "Removed track number from selected files"
 msgstr "Z vybraných souborů bylo ve štítku vymazáno číslo skladby"
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/tag_area.c:421
+#: ../src/tag_area.c:420
 #, c-format
 msgid "Selected tracks numbered sequentially"
 msgstr "Vybrané skladby byly ve štítku sekvenčně očíslovány"
 
-#: ../src/tag_area.c:470
+#: ../src/tag_area.c:469
 #, c-format
 msgid "Selected files tagged with genre ‘%s’"
 msgstr "U vybraných souborů byl ve štítku nastaven žánr na „%s“"
 
-#: ../src/tag_area.c:475
+#: ../src/tag_area.c:474
 msgid "Removed genre from selected files"
 msgstr "Z vybraných souborů byl ve štítku vymazán žánr"
 
-#: ../src/tag_area.c:499
+#: ../src/tag_area.c:498
 #, c-format
 msgid "Selected files tagged with comment ‘%s’"
 msgstr "U vybraných souborů byla ve štítku nastavena poznámka na „%s“"
 
-#: ../src/tag_area.c:504
+#: ../src/tag_area.c:503
 msgid "Removed comment from selected files"
 msgstr "Z vybraných souborů byla ve štítku vymazána poznámka"
 
-#: ../src/tag_area.c:520
+#: ../src/tag_area.c:519
 #, c-format
 msgid "Selected files tagged with composer ‘%s’"
 msgstr "U vybraných souborů byl ve štítku nastaven skladatel na „%s“"
 
-#: ../src/tag_area.c:525
+#: ../src/tag_area.c:524
 msgid "Removed composer from selected files"
 msgstr "Z vybraných souborů byl ve štítku vymazán skladatel"
 
-#: ../src/tag_area.c:542
+#: ../src/tag_area.c:541
 #, c-format
 msgid "Selected files tagged with original artist ‘%s’"
 msgstr "U vybraných souborů byl ve štítku nastaven původní umělec na „%s“"
 
-#: ../src/tag_area.c:547
+#: ../src/tag_area.c:546
 msgid "Removed original artist from selected files"
 msgstr "Z vybraných souborů byl ve štítku vymazán původní umělec"
 
-#: ../src/tag_area.c:564
+#: ../src/tag_area.c:563
 #, c-format
 msgid "Selected files tagged with copyright ‘%s’"
 msgstr "U vybraných souborů byl ve štítku nastaven copyright na „%s“"
 
-#: ../src/tag_area.c:569
+#: ../src/tag_area.c:568
 msgid "Removed copyright from selected files"
 msgstr "Z vybraných souborů byl ve štítku vymazán copyright"
 
-#: ../src/tag_area.c:586
+#: ../src/tag_area.c:585
 #, c-format
 msgid "Selected files tagged with URL ‘%s’"
 msgstr "U vybraných souborů byla ve štítku nastaven adresa URL na „%s“"
 
-#: ../src/tag_area.c:591
+#: ../src/tag_area.c:590
 msgid "Removed URL from selected files"
 msgstr "Z vybraných souborů byla ve štítku vymazána adresa URL"
 
-#: ../src/tag_area.c:608
+#: ../src/tag_area.c:607
 #, c-format
 msgid "Selected files tagged with encoder name ‘%s’"
 msgstr "U vybraných souborů byl ve štítku nastaven název kodéru na „%s“"
 
-#: ../src/tag_area.c:613
+#: ../src/tag_area.c:612
 msgid "Removed encoder name from selected files"
 msgstr "Z vybraných souborů byl ve štítku vymazán název kodéru"
 
-#: ../src/tag_area.c:647
+#: ../src/tag_area.c:648
 msgid "Selected files tagged with images"
 msgstr "U vybraných souborů byly ve štítku nastaveny obrázky"
 
-#: ../src/tag_area.c:651
+#: ../src/tag_area.c:652
 msgid "Removed images from selected files"
 msgstr "Z vybraných souborů byly ve štítku vymazány obrázky"
 
 #. Menu items
-#: ../src/tag_area.c:820
+#: ../src/tag_area.c:821
 msgid "Tag selected files with this field"
 msgstr "Nastavit vybraným souborům toto pole"
 
-#: ../src/tag_area.c:847
+#: ../src/tag_area.c:848
 msgid "All uppercase"
 msgstr "Vše velkými písmeny"
 
-#: ../src/tag_area.c:853
+#: ../src/tag_area.c:854
 msgid "All lowercase"
 msgstr "Vše malými písmeny"
 
-#: ../src/tag_area.c:859
+#: ../src/tag_area.c:860
 msgid "First letter uppercase"
 msgstr "První písmeno velké"
 
-#: ../src/tag_area.c:865
+#: ../src/tag_area.c:866
 msgid "First letter uppercase of each word"
 msgstr "První písmeno každého slova velké"
 
-#: ../src/tag_area.c:881
+#: ../src/tag_area.c:882
 msgid "Insert space before uppercase letter"
 msgstr "Vložit mezeru před velká písmena"
 
-#: ../src/tag_area.c:887
+#: ../src/tag_area.c:888
 msgid "Remove duplicate spaces or underscores"
 msgstr "Odstranit zdvojené mezery nebo podtržítka"
 
-#: ../src/tag_area.c:893
+#: ../src/tag_area.c:894
 msgid "Remove all text"
 msgstr "Odstranit všechen text"
 
-#: ../src/tag_area.c:1269 ../src/tag_area.c:1346
+#: ../src/tag_area.c:1256 ../src/tag_area.c:1334
 #, c-format
 msgid "Error parsing image data ‘%s’"
 msgstr "Chyba při zpracování dat obrázku: %s"
 
-#: ../src/tag_area.c:1328
+#: ../src/tag_area.c:1316
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer"
@@ -4440,120 +4408,120 @@ 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/tag_area.c:1335
+#: ../src/tag_area.c:1323
 msgid "Cannot display the image"
 msgstr "Nelze zobrazit obrázek"
 
-#: ../src/tag_area.c:1337
+#: ../src/tag_area.c:1325
 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/tag_area.c:1339
+#: ../src/tag_area.c:1327
 msgid "Load Image File"
 msgstr "Načtení souboru s obrázkem"
 
-#: ../src/tag_area.c:1383 ../src/tag_area.c:1408
+#: ../src/tag_area.c:1371 ../src/tag_area.c:1396
 #, c-format
 msgid "Image file not loaded ‘%s’"
 msgstr "Soubor s obrázkem nebyl načten: %s"
 
-#: ../src/tag_area.c:1400
+#: ../src/tag_area.c:1388
 #, c-format
 msgid "Cannot open file ‘%s’"
 msgstr "Nelze otevřít soubor „%s“"
 
-#: ../src/tag_area.c:1404
+#: ../src/tag_area.c:1392
 msgid "Image File Error"
 msgstr "Chyba souboru s obrázkem"
 
-#: ../src/tag_area.c:1415
+#: ../src/tag_area.c:1403
 msgid "Image file loaded"
 msgstr "Soubor s obrázkem načten"
 
-#: ../src/tag_area.c:1486
+#: ../src/tag_area.c:1474
 msgid "Add Images"
 msgstr "Přidání obrázků"
 
-#: ../src/tag_area.c:1497 ../src/tag_area.c:1861
+#: ../src/tag_area.c:1485 ../src/tag_area.c:1850
 msgid "All Files"
 msgstr "Všechny soubory"
 
-#: ../src/tag_area.c:1503 ../src/tag_area.c:1867
+#: ../src/tag_area.c:1491 ../src/tag_area.c:1856
 msgid "PNG and JPEG"
 msgstr "PNG a JPEG"
 
-#: ../src/tag_area.c:1647
+#: ../src/tag_area.c:1635
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Vlastnosti obrázku %d/%d"
 
-#: ../src/tag_area.c:1846
+#: ../src/tag_area.c:1835
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Ukládání obrázku %d/%d"
 
-#: ../src/tag_area.c:1923
+#: ../src/tag_area.c:1912
 #, c-format
 msgid "Image file not saved ‘%s’"
 msgstr "Soubor s obrázkem nebyl uložen: %s"
 
-#: ../src/tag_area.c:2266
+#: ../src/tag_area.c:2255
 msgid "Tag selected files with this genre"
 msgstr "Nastavit vybraným souborům tento žánr"
 
-#: ../src/tag_area.c:2996
+#: ../src/tag_area.c:2986
 msgid "ID3 Tag"
 msgstr "Štítek ID3"
 
-#: ../src/tag_area.c:3001
+#: ../src/tag_area.c:2991
 msgid "Ogg Vorbis Tag"
 msgstr "Štítek Ogg Vorbis"
 
-#: ../src/tag_area.c:3006
+#: ../src/tag_area.c:2996
 msgid "FLAC Vorbis Tag"
 msgstr "Štítek FLAC"
 
-#: ../src/tag_area.c:3010
+#: ../src/tag_area.c:3000
 msgid "APE Tag"
 msgstr "Štítek APE"
 
-#: ../src/tag_area.c:3014
+#: ../src/tag_area.c:3004
 msgid "MP4/M4A/AAC Tag"
 msgstr "Štítek MP4/M4A/AAC"
 
-#: ../src/tag_area.c:3019
+#: ../src/tag_area.c:3009
 msgid "Wavpack Tag"
 msgstr "Štítek Wavpack"
 
-#: ../src/tag_area.c:3024
+#: ../src/tag_area.c:3014
 msgid "Opus Tag"
 msgstr "Štítek Opus"
 
-#: ../src/tag_area.c:3264
+#: ../src/tag_area.c:3254
 #, c-format
 msgid "Images (%d)"
 msgstr "Obrázky (%d)"
 
-#: ../src/tags/ape_tag.c:66 ../src/tags/flac_tag.c:136
-#: ../src/tags/mp4_header.cc:58 ../src/tags/mp4_header.cc:67
-#: ../src/tags/mp4_tag.cc:66 ../src/tags/mp4_tag.cc:79
-#: ../src/tags/mp4_tag.cc:85 ../src/tags/ogg_header.c:228
+#: ../src/tags/ape_tag.c:63 ../src/tags/mp4_header.cc:58
+#: ../src/tags/mp4_header.cc:67 ../src/tags/mp4_tag.cc:65
+#: ../src/tags/mp4_tag.cc:78 ../src/tags/mp4_tag.cc:84
+#: ../src/tags/ogg_header.c:227
 #, c-format
 msgid "Error while opening file: %s"
 msgstr "Chyba při otevírání souboru: %s"
 
-#: ../src/tags/ape_tag.c:369
+#: ../src/tags/ape_tag.c:385
 msgid "Failed to write APE tag"
 msgstr "Selhal zápis štítku APE"
 
-#: ../src/tags/flac_header.c:213
+#: ../src/tags/flac_header.c:85 ../src/tags/flac_tag.c:123
 msgid "Error opening FLAC file"
 msgstr "Chyba při otevírání souboru FLAC"
 
-#: ../src/tags/flac_header.c:300
+#: ../src/tags/flac_header.c:172
 msgid "FLAC File"
 msgstr "Soubor FLAC"
 
@@ -4561,23 +4529,25 @@ msgstr "Soubor FLAC"
 #. Mode
 #. mpeg4ip library seems to always return -1
 #. Mode
-#: ../src/tags/flac_header.c:313 ../src/tags/mp4_header.cc:152
-#: ../src/tags/ogg_header.c:417 ../src/tags/opus_header.c:235
-#: ../src/tags/wavpack_header.c:96
+#: ../src/tags/flac_header.c:185 ../src/tags/mp4_header.cc:152
+#: ../src/tags/ogg_header.c:416 ../src/tags/opus_header.c:233
+#: ../src/tags/wavpack_header.c:151
 msgid "Channels:"
 msgstr "Kanály:"
 
-#: ../src/tags/flac_tag.c:857 ../src/tags/flac_tag.c:869
+#: ../src/tags/flac_tag.c:845 ../src/tags/flac_tag.c:878
+#: ../src/tags/flac_tag.c:892
 #, c-format
 msgid "Error while opening file ‘%s’ as FLAC: %s"
 msgstr "Chyba při otevírání souboru „%s“ jako FLAC: %s"
 
-#: ../src/tags/flac_tag.c:1130
+#: ../src/tags/flac_tag.c:1185 ../src/tags/flac_tag.c:1197
+#: ../src/tags/flac_tag.c:1217
 #, c-format
 msgid "Failed to write comments to file ‘%s’: %s"
 msgstr "Selhal zápis poznámek do souboru „%s“: %s"
 
-#: ../src/tags/id3_tag.c:211
+#: ../src/tags/id3_tag.c:206
 #, c-format
 msgid ""
 "As the following corrupted file ‘%s’ will cause an error in id3lib, it will "
@@ -4586,31 +4556,31 @@ msgstr ""
 "Protože by následující poškozený soubor „%s“ způsobil chybu v knihovně "
 "id3lib, nebude zpracován"
 
-#: ../src/tags/id3_tag.c:213
+#: ../src/tags/id3_tag.c:208
 msgid "Corrupted file"
 msgstr "Poškozený soubor"
 
-#: ../src/tags/id3_tag.c:595
+#: ../src/tags/id3_tag.c:596
 #, c-format
 msgid "Removed tag of ‘%s’"
 msgstr "Odstraněn štítek z „%s“"
 
-#: ../src/tags/id3_tag.c:602 ../src/tags/id3_tag.c:729
+#: ../src/tags/id3_tag.c:603 ../src/tags/id3_tag.c:730
 #, 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/tags/id3_tag.c:611 ../src/tags/id3_tag.c:692
+#: ../src/tags/id3_tag.c:612 ../src/tags/id3_tag.c:693
 #, 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/tags/id3_tag.c:637
+#: ../src/tags/id3_tag.c:638
 #, c-format
 msgid "Error while updating ID3v2 tag of ‘%s’: %s"
 msgstr "Chyba při aktualizaci štítku ID3v1 v „%s“: %s"
 
-#: ../src/tags/id3_tag.c:667
+#: ../src/tags/id3_tag.c:668
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
 "version of id3lib is buggy"
@@ -4618,7 +4588,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/tags/id3_tag.c:669
+#: ../src/tags/id3_tag.c:670
 #, c-format
 msgid ""
 "If you reload this file, some characters in the tag may not be displayed "
@@ -4637,121 +4607,98 @@ msgstr ""
 "\n"
 "Soubor: %s"
 
-#: ../src/tags/id3_tag.c:676
+#: ../src/tags/id3_tag.c:677
 msgid "Buggy id3lib"
 msgstr "Chybová id3lib"
 
-#: ../src/tags/id3_tag.c:717
+#: ../src/tags/id3_tag.c:718
 #, c-format
 msgid "Error while updating ID3v1 tag of ‘%s’: %s"
 msgstr "Chyba při aktualizaci štítku ID3v1 v „%s“: %s"
 
-#: ../src/tags/id3_tag.c:751
+#: ../src/tags/id3_tag.c:752
 msgid "No error reported"
 msgstr "Neohlášena žádná chyba"
 
-#: ../src/tags/id3_tag.c:753
+#: ../src/tags/id3_tag.c:754
 msgid "No available memory"
 msgstr "Není dostupná žádná pamět"
 
-#: ../src/tags/id3_tag.c:755
+#: ../src/tags/id3_tag.c:756
 msgid "No data to parse"
 msgstr "Žádná data ke zpracování"
 
-#: ../src/tags/id3_tag.c:757
+#: ../src/tags/id3_tag.c:758
 msgid "Improperly formatted data"
 msgstr "Chybně zformátovaná data"
 
-#: ../src/tags/id3_tag.c:759
+#: ../src/tags/id3_tag.c:760
 msgid "No buffer to write to"
 msgstr "Nebyla nalezena vyrovnávací paměť pro zápis"
 
-#: ../src/tags/id3_tag.c:761
+#: ../src/tags/id3_tag.c:762
 msgid "Buffer is too small"
 msgstr "Vyrovnávací paměť je příliš malá"
 
-#: ../src/tags/id3_tag.c:763
+#: ../src/tags/id3_tag.c:764
 msgid "Invalid frame ID"
 msgstr "Neplatné ID rámce"
 
-#: ../src/tags/id3_tag.c:765
+#: ../src/tags/id3_tag.c:766
 msgid "Requested field not found"
 msgstr "Požadované pole nebylo nalezeno"
 
-#: ../src/tags/id3_tag.c:767
+#: ../src/tags/id3_tag.c:768
 msgid "Unknown field type"
 msgstr "Neznámý typ pole"
 
-#: ../src/tags/id3_tag.c:769
+#: ../src/tags/id3_tag.c:770
 msgid "Tag is already attached to a file"
 msgstr "Štítek je již k souboru přiložen"
 
-#: ../src/tags/id3_tag.c:771
+#: ../src/tags/id3_tag.c:772
 msgid "Invalid tag version"
 msgstr "Neplatná verze štítku"
 
-#: ../src/tags/id3_tag.c:773
+#: ../src/tags/id3_tag.c:774
 msgid "No file to parse"
 msgstr "Žádný soubor ke zpracování"
 
-#: ../src/tags/id3_tag.c:775
+#: ../src/tags/id3_tag.c:776
 msgid "Attempting to write to a read-only file"
 msgstr "Pokus o zápis do souboru jen ke čtení"
 
-#: ../src/tags/id3_tag.c:777
+#: ../src/tags/id3_tag.c:778
 msgid "Error in compression/uncompression"
 msgstr "Chyba při komprimaci/dekomprimaci"
 
-#: ../src/tags/id3_tag.c:779
+#: ../src/tags/id3_tag.c:780
 msgid "Unknown error message"
 msgstr "Neznámá chybová zpráva"
 
-#: ../src/tags/id3_tag.c:1456
+#: ../src/tags/id3_tag.c:1457
 msgid "Error while creating temporary file"
 msgstr "Chyba při vytváření dočasného souboru"
 
-#: ../src/tags/id3v24_tag.c:137 ../src/tags/id3v24_tag.c:192
-#: ../src/tags/id3v24_tag.c:230 ../src/tags/id3v24_tag.c:241
+#: ../src/tags/id3v24_tag.c:132 ../src/tags/id3v24_tag.c:187
+#: ../src/tags/id3v24_tag.c:225 ../src/tags/id3v24_tag.c:236
 #: ../src/tags/id3v24_tag.c:941 ../src/tags/id3v24_tag.c:948
 #: ../src/tags/id3v24_tag.c:974 ../src/tags/id3v24_tag.c:1014
-#: ../src/tags/mp4_tag.cc:95
+#: ../src/tags/mp4_tag.cc:94
 msgid "Error reading tags from file"
 msgstr "Chyba při čtení štítků ze souboru"
 
-#. 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/tags/id3v24_tag.c:1678
-#, 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] "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/tags/id3v24_tag.c:1701
-#, c-format
-msgid "Cannot save tag of file ‘%s’"
-msgstr "Nelze uložit štítek do souboru „%s“"
-
-#: ../src/tags/id3v24_tag.c:1713
-#, c-format
-msgid "Size error while saving tag of ‘%s’"
-msgstr "Chyba velikosti při ukládání štítku „%s“"
-
-#: ../src/tags/monkeyaudio_header.c:47
+#: ../src/tags/monkeyaudio_header.c:46
 msgid "Error opening Monkey’s Audio file"
 msgstr "Chyba při otevírání zvukového soubor Monkey"
 
 #. Mode changed to profile name
-#: ../src/tags/monkeyaudio_header.c:79 ../src/tags/musepack_header.c:82
+#: ../src/tags/monkeyaudio_header.c:78 ../src/tags/musepack_header.c:81
 msgid "Profile:"
 msgstr "Profil:"
 
-#: ../src/tags/mp4_header.cc:68 ../src/tags/mp4_tag.cc:86
-#: ../src/tags/mp4_tag.cc:282
+#: ../src/tags/mp4_header.cc:68 ../src/tags/mp4_tag.cc:85
+#: ../src/tags/mp4_tag.cc:281
 msgid "MP4 format invalid"
 msgstr "Neplatný formát MP4"
 
@@ -4763,1259 +4710,103 @@ msgstr "Chyba při čtení vlastností ze souboru"
 msgid "MP4/AAC File"
 msgstr "Soubor MP4/AAC"
 
-#: ../src/tags/mp4_header.cc:140 ../src/tags/mpeg_header.c:236
+#: ../src/tags/mp4_header.cc:140 ../src/tags/mpeg_header.c:235
 #, c-format
 msgid "~%d kb/s"
 msgstr "~%d kb/s"
 
-#: ../src/tags/mp4_tag.cc:258 ../src/tags/mp4_tag.cc:275
-#: ../src/tags/mp4_tag.cc:281
+#: ../src/tags/mp4_tag.cc:257 ../src/tags/mp4_tag.cc:274
+#: ../src/tags/mp4_tag.cc:280
 #, c-format
 msgid "Error while opening file ‘%s’: %s"
 msgstr "Chyba při otevírání souboru: „%s“: %s"
 
-#: ../src/tags/mp4_tag.cc:293
+#: ../src/tags/mp4_tag.cc:292
 #, c-format
 msgid "Error reading tags from file ‘%s’"
 msgstr "Chyba při čtení štítků ze souboru „%s“"
 
-#: ../src/tags/mpeg_header.c:51
+#: ../src/tags/mpeg_header.c:50
 msgid "Stereo"
 msgstr "stereo"
 
-#: ../src/tags/mpeg_header.c:52
+#: ../src/tags/mpeg_header.c:51
 msgid "Joint stereo"
 msgstr "joint stereo"
 
-#: ../src/tags/mpeg_header.c:53
+#: ../src/tags/mpeg_header.c:52
 msgid "Dual channel"
 msgstr "dva kanály"
 
-#: ../src/tags/mpeg_header.c:54
+#: ../src/tags/mpeg_header.c:53
 msgid "Single channel"
 msgstr "jeden kanál"
 
-#: ../src/tags/mpeg_header.c:206
+#: ../src/tags/mpeg_header.c:205
 msgid "MP3 File"
 msgstr "Soubor MP3"
 
-#: ../src/tags/mpeg_header.c:209
+#: ../src/tags/mpeg_header.c:208
 msgid "MP2 File"
 msgstr "Soubor MP2"
 
 #. MPEG, Layer versions
-#: ../src/tags/mpeg_header.c:216
+#: ../src/tags/mpeg_header.c:215
 msgid "MPEG"
 msgstr "MPEG"
 
-#: ../src/tags/musepack_header.c:47
+#: ../src/tags/musepack_header.c:46
 msgid "Error opening Musepack file"
 msgstr "Chyba při otevírání souboru Musepack"
 
-#: ../src/tags/musepack_header.c:79
+#: ../src/tags/musepack_header.c:78
 msgid "MusePack File"
 msgstr "Soubor MusePack"
 
-#: ../src/tags/ogg_header.c:244
+#: ../src/tags/ogg_header.c:243
 msgid ""
 "The specified bitstream does not exist or the file has been initialized "
 "improperly"
 msgstr "Určený bitový proud neexistuje nebo byl soubor nesprávně inicializován"
 
-#: ../src/tags/ogg_header.c:263
+#: ../src/tags/ogg_header.c:262
 msgid "Read from media returned an error"
 msgstr "Při čtení z multimédia došlo k chybě"
 
-#: ../src/tags/ogg_header.c:266
+#: ../src/tags/ogg_header.c:265
 msgid "Bitstream is not Vorbis data"
 msgstr "Bitový proud neobsahuje data Vorbis"
 
-#: ../src/tags/ogg_header.c:269
+#: ../src/tags/ogg_header.c:268
 msgid "Vorbis version mismatch"
 msgstr "Neshoda verzí Vorbis"
 
-#: ../src/tags/ogg_header.c:272
+#: ../src/tags/ogg_header.c:271
 msgid "Invalid Vorbis bitstream header"
 msgstr "Neplatná hlavička bitového proudu Vorbis"
 
-#: ../src/tags/ogg_header.c:275
+#: ../src/tags/ogg_header.c:274
 msgid "Internal logic fault, indicates a bug or heap/stack corruption"
 msgstr ""
 "Vnitřní logické selhání signalizující chybu nebo poškození haldy/zásobníku"
 
-#: ../src/tags/ogg_header.c:326
+#: ../src/tags/ogg_header.c:325
 #, c-format
 msgid "Failed to open file as Vorbis: %s"
 msgstr "Selhalo otevření souboru jako Vorbis: %s"
 
-#: ../src/tags/ogg_header.c:389
+#: ../src/tags/ogg_header.c:388
 msgid "Ogg Vorbis File"
 msgstr "Soubor Ogg Vorbis"
 
-#: ../src/tags/ogg_header.c:392
+#: ../src/tags/ogg_header.c:391
 msgid "Speex File"
 msgstr "Soubor Speex"
 
-#: ../src/tags/opus_header.c:222
+#: ../src/tags/opus_header.c:220
 msgid "Opus File"
 msgstr "Soubor Opus"
 
-#: ../src/tags/wavpack_header.c:83
+#: ../src/tags/wavpack_header.c:138
 msgid "Wavpack File"
 msgstr "Soubor Wavpack"
-
-#, fuzzy
-#~ msgid "Error while opening file: '%s' (%s)."
-#~ msgstr "Chyba při otevírání souboru: „%s“: %s"
-
-#, fuzzy
-#~ msgid "Run a command on the selected files"
-#~ msgstr "Zahrnout pouze vybrané soubory"
-
-#, fuzzy
-#~ msgid "Clear the current selection"
-#~ msgstr "Zastavit probíhající činnost"
-
-#, fuzzy
-#~ msgid "Delete files"
-#~ msgstr "Vymazat soubory"
-
-#, fuzzy
-#~ msgid "S_can Files"
-#~ msgstr "Prozkoumat soubory"
-
-#~ msgid "_Undo Last Files Changes"
-#~ msgstr "_Vrátit poslední změny v souborech"
-
-#~ msgid "Undo last files changes"
-#~ msgstr "Vrátit poslední změny v souborech"
-
-#~ msgid "R_edo Last Files Changes"
-#~ msgstr "Zopakovat posl_ední změny v souborech"
-
-#~ msgid "Redo last files changes"
-#~ msgstr "Zopakovat poslední změny v souborech"
-
-#, fuzzy
-#~ msgid "Force saving files"
-#~ msgstr "V_ynutit uložení souborů"
-
-#, fuzzy
-#~ msgid "Undo Last Changes"
-#~ msgstr "neměnit"
-
-#~ msgid "Undo last changes"
-#~ msgstr "Vrátit poslední změny"
-
-#, fuzzy
-#~ msgid "Redo Last Changes"
-#~ msgstr "neměnit"
-
-#~ msgid "Redo last changes"
-#~ msgstr "Zopakovat poslední změny"
-
-#, fuzzy
-#~ msgid "Go to home directory"
-#~ msgstr "Domovská složka"
-
-#, fuzzy
-#~ msgid "Go to desktop directory"
-#~ msgstr "Složka Plocha"
-
-#, fuzzy
-#~ msgid "Go to documents directory"
-#~ msgstr "Složka Dokumenty"
-
-#, fuzzy
-#~ msgid "Go to downloads directory"
-#~ msgstr "Složka Stažené"
-
-#, fuzzy
-#~ msgid "Go to music directory"
-#~ msgstr "Složka Hudba"
-
-#, fuzzy
-#~ msgid "Go to parent directory"
-#~ msgstr "_Nadřazená složka"
-
-#, fuzzy
-#~ msgid "Go to default directory"
-#~ msgstr "Výchozí složka"
-
-#, fuzzy
-#~ msgid "Set current path as default"
-#~ msgstr "Nastavit aktuální cestu jako výchozí"
-
-#, fuzzy
-#~ msgid "Rename directory"
-#~ msgstr "Přejmenování složky"
-
-#, fuzzy
-#~ msgid "Reload directory"
-#~ msgstr "Znovu načíst složku"
-
-#, fuzzy
-#~ msgid "Run a command on the directory"
-#~ msgstr "V této složce nebyl nalezen žádný soubor"
-
-#, fuzzy
-#~ msgid "Reload directory tree"
-#~ msgstr "Znovu načíst složku"
-
-#, fuzzy
-#~ msgid "CDDB search"
-#~ msgstr "Hledání v CDDB"
-
-#, fuzzy
-#~ msgid "Load filenames from a text file"
-#~ msgstr "Načtení názvů souborů z textového souboru"
-
-#, fuzzy
-#~ msgid "Run audio player"
-#~ msgstr "Spustit přehrávač"
-
-#, fuzzy
-#~ msgid "About"
-#~ msgstr "O _aplikaci"
-
-#, fuzzy
-#~ msgid "_File Operations"
-#~ msgstr "Nastavení souborů"
-
-#, fuzzy
-#~ msgid "S_canner"
-#~ msgstr "Průzkumník"
-
-#, fuzzy
-#~ msgid "CDDB search files…"
-#~ msgstr "Hledat soubory v CDDB…"
-
-#, fuzzy
-#~ msgid "Tree Browser"
-#~ msgstr "Prohlížeč"
-
-#, fuzzy
-#~ msgid "View by directory tree"
-#~ msgstr "Procházet strom složek"
-
-#, fuzzy
-#~ msgid "_Fill Tags…"
-#~ msgstr "Vyplnit štítek"
-
-#, fuzzy
-#~ msgid "Fill tags"
-#~ msgstr "Vyplnit štítek"
-
-#, fuzzy
-#~ msgid "Rename files and directories"
-#~ msgstr "Přejmenovat soubo_ry a složky…"
-
-#, fuzzy
-#~ msgid "_Process Fields…"
-#~ msgstr "Zpracovat pole"
-
-#~ msgid "Could not merge UI, error was: %s\n"
-#~ msgstr "Nelze sloučit uživatelské rozhraní, chyba: %s\n"
-
-#~ msgid "Error: Searching for %s, could not find node %s in tree."
-#~ msgstr "Chyba: Hledá se %s, nelze najít uzel %s ve stromu."
-
-#~ msgid "Tree"
-#~ msgstr "Strom"
-
-#, fuzzy
-#~ msgid "Select a directory to browse."
-#~ msgstr "Vyberte složku, kterou chcete procházet"
-
-#~ msgid "Artist & Album"
-#~ msgstr "Umělec a album"
-
-#~ msgid "If activated, it will use masks to rename directory."
-#~ msgstr "Pokud je zapnuto, použijí se k přejmenování složky masky."
-
-#, fuzzy
-#~ msgid "Program to run:"
-#~ msgstr "Chyba v názvu programu"
-
-#~ msgid "Request CDDB"
-#~ msgstr "Požadavek na CDDB"
-
-#~ msgid "Use local CDDB"
-#~ msgstr "Použít místní CDDB"
-
-#~ msgid ""
-#~ "When activating this option, after loading the fields, the current "
-#~ "selected scanner will be ran (the scanner window must be opened)."
-#~ msgstr ""
-#~ "Při aktivaci této volby bude po načtení všech polí spuštěn aktuální "
-#~ "průzkumník (okno průzkumníka musí být otevřeno)."
-
-#~ msgid "Words:"
-#~ msgstr "Slova:"
-
-#, fuzzy
-#~ msgid "Search In:"
-#~ msgstr "Hledat:"
-
-#, fuzzy
-#~ msgid "All Fields"
-#~ msgstr "Všechny soubory"
-
-#, fuzzy
-#~ msgid "All Categories"
-#~ msgstr "Kategorie"
-
-#~ msgid "included: funk, soul, rap, pop, industrial, metal, etc."
-#~ msgstr "obsahuje: funk, soul, rap, pop, industrial, metal, atd."
-
-#~ msgid "movies, shows"
-#~ msgstr "filmy, show"
-
-#~ msgid "others that do not fit in the above categories"
-#~ msgstr "ostatní, které nespadá do předchozích kategorií"
-
-#, fuzzy
-#~ msgid "Enter the words to search in the list below"
-#~ msgstr ""
-#~ "Napište slova, která chcete vyhledat (oddělená pomocí mezery nebo „+“)"
-
-#, fuzzy
-#~ msgid "Search Next"
-#~ msgstr "Hledat:"
-
-#, fuzzy
-#~ msgid "Search Previous"
-#~ msgstr "Hledat soubory v CDDB…"
-
-#~ msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
-#~ msgstr ""
-#~ "Zobrazit pouze červené řádky (nebo všechny řádky) v seznamu „Umělec / "
-#~ "album“"
-
-#~ msgid "Set Into:"
-#~ msgstr "Nastavit do:"
-
-#, fuzzy
-#~ msgid "All"
-#~ msgstr "Al"
-
-#~ msgid ""
-#~ "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 ""
-#~ "Když zapnete tuto volbu, bude se k porovnání názvu z CDDB s názvem "
-#~ "souborů v aktuální složce používat Levenshteinův algoritmus (DLM: Damerau-"
-#~ "Levenshtein Metric) a vybere se nejlepší shoda. Toto se používá, když se "
-#~ "vybírá odpovídající zvukový soubor nebo se používají výsledky CDDB "
-#~ "namísto toho, aby se použilo přímo pořadí."
-
-#~ msgid "The path for 'Local CD Database' was not defined"
-#~ msgstr "Cesta k „Místní databázi CD“ není nastavená"
-
-#~ msgid "Enter it in the preferences window before using this search."
-#~ msgstr "Než začnete s hledáním, zadejte ji v okně předvoleb."
-
-#, fuzzy
-#~ msgid "Local CD search"
-#~ msgstr "Hledání v CDDB"
-
-#, fuzzy
-#~ msgid "Using libid3tag version %s"
-#~ msgstr "Neplatná verze štítku"
-
-#~ msgid "Using id3lib version %d.%d.%d"
-#~ msgstr "Používá se knihovna id3lib ve verzi %d.%d.%d"
-
-#~ msgid "Currently using locale '%s' (and eventually '%s')"
-#~ msgstr "Momentálně se používá národní prostředí „%s“ (a případně „%s“)"
-
-#~ msgid "Frequency:"
-#~ msgstr "Vzorkování:"
-
-#~ msgid "Select Mode and Mask, and redo the same action"
-#~ msgstr "Vyberte režim a masku a zopakujte stejnou akci"
-
-#, fuzzy
-#~ msgid "Files have been partially deleted"
-#~ msgstr "Všechny soubory byly smazány"
-
-#~ msgid "Tag(s) written"
-#~ msgstr "Štítek zapsán"
-
-#, fuzzy
-#~ msgid "Cannot write tag in file '%s' (%s)"
-#~ msgstr "Nelze zapsat štítek do souboru „%s“"
-
-#, fuzzy
-#~ msgid "Cannot read directory (%s)"
-#~ msgstr "Nelze číst složku „%s“"
-
-#, fuzzy
-#~ msgid "Convert ' ' to '_'"
-#~ msgstr "Převést „ “ na „_“"
-
-#, fuzzy
-#~ msgid "Error writing tag type %d to file %s (%s)"
-#~ msgstr "Chyba při zápisu štítku typu „%d“ do souboru „%s“: %s"
-
-#, fuzzy
-#~ msgid "Picture block isn't valid: '%s'"
-#~ msgstr "Blok s obrázkem není platný: %s"
-
-#, fuzzy
-#~ msgid "Error while reading file: '%s' (%s)"
-#~ msgstr "Chyba při čtení souboru „%s“: %s"
-
-#, fuzzy
-#~ msgid "Updated tag of '%s'"
-#~ msgstr "Aktualizován štítek v „%s“"
-
-#, fuzzy
-#~ msgid "Error while creating temporary file: '%s'"
-#~ msgstr "Chyba při vytváření dočasného souboru"
-
-#, fuzzy
-#~ msgid "Error while writing to file: '%s' (%s)"
-#~ msgstr "Chyba při zápisu do souboru „%s“: %s"
-
-#, fuzzy
-#~ msgid "M3U Playlist Name"
-#~ msgstr "Chyba souboru se seznamem skladeb"
-
-#, fuzzy
-#~ msgid "Playlist Options"
-#~ msgstr "Chyba souboru se seznamem skladeb"
-
-#~ msgid ""
-#~ "If activated, only the selected files will be written in the playlist "
-#~ "file. Else, all the files will be written."
-#~ msgstr ""
-#~ "Pokud je zapnuto, budou do seznamu skladeb zapsány pouze vybrané soubory. "
-#~ "Jinak budou zapsány všechny soubory."
-
-#, fuzzy
-#~ msgid "If activated, the playlist will be created in the parent directory."
-#~ msgstr "Vytvořit seznam skladeb v nadřazené složce"
-
-#~ msgid ""
-#~ "This option replaces the UNIX directory separator '/' into DOS separator "
-#~ "'\\'."
-#~ msgstr ""
-#~ "Tato volba nahrazuje oddělovač složek „/“ ze systému UNIX oddělovačem "
-#~ "„\\“ ze systému DOS."
-
-#, fuzzy
-#~ msgid "Playlist Content"
-#~ msgstr "Obsah"
-
-#, fuzzy
-#~ msgid "Move down the selected line"
-#~ msgstr "Posunout vybraný řádek výš"
-
-#~ msgid ""
-#~ "When activating this option, after loading the filenames, the current "
-#~ "selected scanner will be ran (the scanner window must be opened)."
-#~ 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)."
-
-#, fuzzy
-#~ msgid "Cannot retrieve file info (%s)"
-#~ msgstr "Nelze vytvořit soubor „%s“: %s"
-
-#, fuzzy
-#~ msgid "Can't open file '%s' (%s)"
-#~ msgstr "Nelze otevřít soubor „%s“: %s"
-
-#, fuzzy
-#~ msgid "Move down this line"
-#~ msgstr "Posunout tento řádek výš"
-
-#, fuzzy
-#~ msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
-#~ msgstr "Soubor Ogg Vorbis „%s“ obsahuje štítek ID3v2"
-
-#~ msgid "Error with 'loader_write': %s"
-#~ msgstr "Chyba při použití „loader_write“: %s"
-
-#~ msgid "Error with 'loader_close': %s"
-#~ msgstr "Chyba při použití „loader_close“: %s"
-
-#, fuzzy
-#~ msgid "Image Description:"
-#~ msgstr "Popis"
-
-#, fuzzy
-#~ msgid "Default directory:"
-#~ msgstr "Výchozí složka:"
-
-#~ msgid ""
-#~ "Specify the directory where your files are located. This path will be "
-#~ "loaded when EasyTAG starts without parameter."
-#~ msgstr ""
-#~ "Určete složku, kde jsou umístěny vaše soubory. Soubory z této cesty budou "
-#~ "načteny, pokud je EasyTAG spuštěn bez parametru."
-
-#~ 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 ""
-#~ "Při spuštění aplikace EasyTAG automaticky hledat soubory ve výchozí "
-#~ "složce. Poznámka: Tato cesta může být přepsána, pokud je programu předán "
-#~ "parametr (easytag /cesta_k/souborum_mp3)."
-
-#, fuzzy
-#~ msgid "Search subdirectories"
-#~ msgstr "Prohledávat skryté složky"
-
-#~ msgid ""
-#~ "This expands the selected node into the file browser to display the sub-"
-#~ "directories."
-#~ msgstr ""
-#~ "Tímto se rozbalí uzel v prohlížeči souborů, aby se zobrazily podsložky."
-
-#, fuzzy
-#~ msgid "Search hidden directories for files (directories starting by a '.')."
-#~ msgstr "Při procházení zobrazovat skryté složky"
-
-#, fuzzy
-#~ msgid "Misc"
-#~ msgstr "Ostatní"
-
-#, fuzzy
-#~ msgid "Show header information of file"
-#~ msgstr "Zapsat informace za použití názvu souboru"
-
-#~ msgid ""
-#~ "If activated, information about the file as the bitrate, the time, the "
-#~ "size, will be displayed under the filename entry."
-#~ msgstr ""
-#~ "Pokud je zapnuto, jsou pod polem s názvem souboru zobrazovány informace o "
-#~ "souboru, jako je datový tok, čas a velikost."
-
-#~ msgid "Sorting List Options"
-#~ msgstr "Volby řazení seznamu"
-
-#~ msgid "Sort the file list by:"
-#~ msgstr "Seřadit seznam souborů:"
-
-#, fuzzy
-#~ msgid "Ascending filename"
-#~ msgstr "Vzestupně podle názvu souboru"
-
-#, fuzzy
-#~ msgid "Descending filename"
-#~ msgstr "Sestupně podle názvu souboru"
-
-#, fuzzy
-#~ msgid "Ascending title"
-#~ msgstr "Vzestupně podle názvu skladby"
-
-#, fuzzy
-#~ msgid "Descending title"
-#~ msgstr "Sestupně podle názvu skladby"
-
-#, fuzzy
-#~ msgid "Ascending artist"
-#~ msgstr "Vzestupně podle umělce"
-
-#, fuzzy
-#~ msgid "Descending artist"
-#~ msgstr "Sestupně podle umělce"
-
-#, fuzzy
-#~ msgid "Ascending album artist"
-#~ msgstr "Vzestupně podle umělce alba"
-
-#, fuzzy
-#~ msgid "Descending album artist"
-#~ msgstr "Sestupně podle umělce alba"
-
-#, fuzzy
-#~ msgid "Ascending album"
-#~ msgstr "Vzestupně podle názvu alba"
-
-#, fuzzy
-#~ msgid "Descending album"
-#~ msgstr "Sestupně podle názvu alba"
-
-#, fuzzy
-#~ msgid "Ascending year"
-#~ msgstr "Vzestupně podle roku"
-
-#, fuzzy
-#~ msgid "Descending year"
-#~ msgstr "Sestupně podle roku"
-
-#, fuzzy
-#~ msgid "Ascending disc number"
-#~ msgstr "Vzestupně podle čísla skladby"
-
-#, fuzzy
-#~ msgid "Descending disc number"
-#~ msgstr "Sestupně podle čísla skladby"
-
-#, fuzzy
-#~ msgid "Ascending track number"
-#~ msgstr "Vzestupně podle čísla skladby"
-
-#, fuzzy
-#~ msgid "Descending track number"
-#~ msgstr "Sestupně podle čísla skladby"
-
-#, fuzzy
-#~ msgid "Ascending genre"
-#~ msgstr "Vzestupně podle žánru"
-
-#, fuzzy
-#~ msgid "Descending genre"
-#~ msgstr "Sestupně podle žánru"
-
-#, fuzzy
-#~ msgid "Ascending comment"
-#~ msgstr "Vzestupně podle poznámky"
-
-#, fuzzy
-#~ msgid "Descending comment"
-#~ msgstr "Sestupně podle poznámky"
-
-#, fuzzy
-#~ msgid "Ascending composer"
-#~ msgstr "Vzestupně podle skladatele"
-
-#, fuzzy
-#~ msgid "Descending composer"
-#~ msgstr "Sestupně podle skladatele"
-
-#, fuzzy
-#~ msgid "Ascending original artist"
-#~ msgstr "Vzestupně podle původního umělce"
-
-#, fuzzy
-#~ msgid "Descending original artist"
-#~ msgstr "Sestupně podle původního umělce"
-
-#, fuzzy
-#~ msgid "Ascending copyright"
-#~ msgstr "Vzestupně podle copyrightu"
-
-#, fuzzy
-#~ msgid "Descending copyright"
-#~ msgstr "Sestupně podle copyrightu"
-
-#, fuzzy
-#~ msgid "Ascending URL"
-#~ msgstr "Vzestupně podle adresy URL"
-
-#, fuzzy
-#~ msgid "Descending URL"
-#~ msgstr "Sestupně podle adresy URL"
-
-#, fuzzy
-#~ msgid "Ascending encoded by"
-#~ msgstr "Vzestupně podle názvu kodéru"
-
-#, fuzzy
-#~ msgid "Descending encoded by"
-#~ msgstr "Sestupně podle názvu kodéru"
-
-#, fuzzy
-#~ msgid "Ascending creation date"
-#~ msgstr "Vzestupně podle data vytvoření"
-
-#, fuzzy
-#~ msgid "Descending creation date"
-#~ msgstr "Sestupně podle data vytvoření"
-
-#~ msgid "Select the type of file sorting when loading a directory."
-#~ msgstr "Vyberte typ řazení souborů při načítání složky."
-
-#~ msgid "If activated, the sorting of the list will be dependent on the case."
-#~ msgstr ""
-#~ "Po zapnutí této volby se bude při řazení brát ohled na velikost písmen."
-
-#, fuzzy
-#~ msgid "File Audio Player"
-#~ msgstr "Spustit přehrávač"
-
-#~ msgid "Player to run:"
-#~ msgstr "Přehrávač:"
-
-#~ 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 ""
-#~ "Napište název programu, který používáte na přehrávání souborů. Některé "
-#~ "programy potřebují vložit i další argumenty (např. „xmms -p“)."
-
-#~ msgid "If activated, the log view would be visible in the main window."
-#~ msgstr ""
-#~ "Pokud je zapnuto, bude bude zobrazení protokolu viditelné v hlavním okně."
-
-#, fuzzy
-#~ msgid "File Options"
-#~ msgstr "Volby"
-
-#~ 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 ""
-#~ "Převést znaky neplatné pro souborové systémy FAT32/16 a ISO9660 + Joliet "
-#~ "(„\\“, „:“, „;“, „*“, „?“, „\"“, „<“, „>“, „|“) v názvu souboru, aby se "
-#~ "předešlo problémům při přejmenovávání souboru. Toto je užitečné při "
-#~ "přejmenovávání souborů podle štítků pomocí průzkumníka."
-
-#, fuzzy
-#~ msgid ""
-#~ "Update modification time of the parent directory of the file (recommended "
-#~ "when using Amarok)"
-#~ msgstr ""
-#~ "Zda při úpravách souborů aktualizovat údaj o čase změny u nadřazené složky"
-
-#~ msgid ""
-#~ "The modification time of the parent directory of the file will be updated "
-#~ "when saving tag the file. At the present time it is automatically done "
-#~ "only when renaming a file.\n"
-#~ "This feature is interesting when using applications like Amarok. For "
-#~ "performance reasons, they refresh file information by detecting changes "
-#~ "of the parent directory."
-#~ msgstr ""
-#~ "Při ukládání štítku do souboru se aktualizuje čas změny rodičovské složky "
-#~ "onoho souboru. V současnosti se to provádí automaticky jen při "
-#~ "přejmenování souboru.\n"
-#~ "Tato funkce se hodí, když používáte aplikace jako Amarok. Z výkonnostních "
-#~ "důvodů obnovují informace o souborech podle sledování změn rodičovských "
-#~ "složek."
-
-#, fuzzy
-#~ msgid "Character Set for Filename"
-#~ msgstr "Kódování znaků:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Rules to apply if some characters can't be converted to the system "
-#~ "character encoding when writing filename:"
-#~ msgstr ""
-#~ "Zobrazit chybovou zprávu, když znak nelze reprezentovat v cílovém "
-#~ "kódování znaků a zachovat původní znak"
-
-#~ 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 ""
-#~ "S touto volbou se zkusí převod do kódové stránky vašeho národního "
-#~ "prostředí (např.: ISO-8859-1 pro „fr“, KOI8-R pro „ru“, ISO-8859-2 pro "
-#~ "„cs“). Pokud se to nezdaří, zkusí se kódová stránka ISO-8859-1."
-
-#, fuzzy
-#~ msgid ""
-#~ "Force using the system character encoding and activate the transliteration"
-#~ msgstr ""
-#~ "Používat systémové kódování znaků a bez upozornění zahazovat "
-#~ "nepodporované znaky"
-
-#, fuzzy
-#~ 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 ""
-#~ "Zobrazit chybovou zprávu, když znak nelze reprezentovat v cílovém "
-#~ "kódování znaků a zachovat původní znak"
-
-#, fuzzy
-#~ msgid "Tag Settings"
-#~ msgstr "Nastavení souborů"
-
-#, fuzzy
-#~ msgid "Tag Options"
-#~ msgstr "Volby"
-
-#~ msgid "Auto completion of date if not complete"
-#~ msgstr "Automaticky doplnit datum, pokud není úplné"
-
-#~ 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 ""
-#~ "Zkusit doplnit rok, pokud vložíte jen poslední číslice data (například, "
-#~ "pokud současný rok je 2005: 5 => 2005, 4 => 2004, 6 => 1996, 95 => 1995…)."
-
-#~ msgid "Write the track field with the following number of digits:"
-#~ msgstr "Zapisovat pole s pořadím skladby s tímto počtem číslic:"
-
-#~ 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 ""
-#~ "Pokud je zapnuto, je pole pořadí skladby doplněno zleva nulami na zadanou "
-#~ "délku n číslic (Např. pro dvě číslice: „05“, „09“, „10“). Jinak se "
-#~ "ponechává původní hodnota."
-
-#~ msgid "Write the disc field with the following number of digits:"
-#~ msgstr "Zapisovat pole s číslem disku s tímto počtem číslic:"
-
-#~ msgid ""
-#~ "Tag field focus when switching files in list with shortcuts Page Up/Page "
-#~ "Down:"
-#~ msgstr ""
-#~ "Zaměření pole při přepínání souborů v seznamu klávesami Page Up/Page Down:"
-
-#, fuzzy
-#~ msgid "Keep focus to the same tag field"
-#~ msgstr "Zpracovávat tato pole štítku"
-
-#~ msgid "Return focus to the first tag field (i.e. 'Title' field)"
-#~ msgstr "Vrátit zaměření na prvního pole (tj. pole Název)"
-
-#, fuzzy
-#~ msgid "ID3 Tag Settings"
-#~ msgstr "Štítky ID3"
-
-#, fuzzy
-#~ msgid "ID3 Tag Rules"
-#~ msgstr "Štítky ID3"
-
-#~ 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 strip the whole tag when these seven standard data fields "
-#~ "have been set to blank."
-#~ msgstr ""
-#~ "Protože mohou štítky ID3v2 obsahovat i jiná data než Název, Autor, Album, "
-#~ "Rok, Skladba, Žánr nebo Poznámku (např. přiložený obrázek, text, …), "
-#~ "umožňuje tato volba vymazat celý štítek, pokud je těchto sedm "
-#~ "standardních polí prázdných."
-
-#~ msgid ""
-#~ "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to "
-#~ "the ID3v2.3 version."
-#~ msgstr ""
-#~ "Pokud je zapnuto, staré verze štítků ID3v2 (jako ID3v2.2) budou "
-#~ "aktualizovány na verzi ID3v2.3."
-
-#~ msgid "Use Compression"
-#~ msgstr "Používat komprimaci"
-
-#~ msgid "Write Genre in text only"
-#~ msgstr "Žánr zapisovat jen jako text"
-
-#~ msgid ""
-#~ "Don't use ID3v1 number references in genre tag. Enable this if you see "
-#~ "numbers as genre in your music player."
-#~ msgstr ""
-#~ "U štítku se žánrem nepoužívat číselník ID3v1. Zapněte, pokud ve svém "
-#~ "hudebním přehrávači vidíte místo názvů žánrů jen čísla."
-
-#~ 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 ""
-#~ "Pokud je zapnuto, bude se na začátek souborů MP3 přidávat nebo "
-#~ "aktualizovat štítek ID3v2.4. V opačném případě bude odstraněn."
-
-#~ msgid "Charset:"
-#~ msgstr "Znaková sada:"
-
-#~ msgid "Unicode type to use"
-#~ msgstr "Typ Unikódu, který se má používat"
-
-#~ msgid "Character set used to write the tag data in the file."
-#~ msgstr "Znaková sada použitá pro zápis dat štítku do souboru."
-
-#~ msgid "Additional settings for iconv():"
-#~ msgstr "Další nastavení pro iconv():"
-
-#~ msgid "No"
-#~ msgstr "Ne"
-
-#, fuzzy
-#~ msgid ""
-#~ "With this option, when a character cannot be represented in the target "
-#~ "character set, it isn't changed. But note that an error message will be "
-#~ "displayed for information."
-#~ msgstr ""
-#~ "Zobrazit chybovou zprávu, když znak nelze reprezentovat v cílovém "
-#~ "kódování znaků a zachovat původní znak"
-
-#~ msgid "//TRANSLIT"
-#~ msgstr "//TRANSLIT"
-
-#~ msgid "//IGNORE"
-#~ msgstr "//IGNORE"
-
-#~ msgid ""
-#~ "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
-#~ "files. Else it will be stripped."
-#~ msgstr ""
-#~ "Pokud je zapnuto, bude se na konec souborů MP3 přidávat nebo aktualizovat "
-#~ "štítek ID3v1. V opačném případě bude odstraněn."
-
-#, fuzzy
-#~ msgid "Character set used to write ID3v1 tag data in the file."
-#~ msgstr "Znaková sada pro zápis štítků ID3v1"
-
-#~ msgid "Non-standard:"
-#~ msgstr "Nestandardní:"
-
-#~ 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 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."
-#~ msgstr ""
-#~ "Tato znaková sada bude použita při čtení dat štítku k převodu každého "
-#~ "řetězce nalezeného v některém poli s předepsaným kódování ISO-8859-1 ve "
-#~ "štítku (pro štítky ID3v2 a/nebo ID3v1).\n"
-#~ "\n"
-#~ "Například:\n"
-#~ "  - V starší verzi EasyTAG můžete do pole s předepsaným kódování "
-#~ "ISO-8859-1 uložit řetězec v kódování UTF-8. To je špatně. Abyste převedli "
-#~ "takovýto štítek do Unikódu: zapněte tuto volbu a vyberte UTF-8. Musíte "
-#~ "zapnout rovněž předchozí volbu „Zkusit uložit štítky v ISO-8859-1. Když "
-#~ "to není možné, použít UNICODE (doporučeno).“ nebo „Štítky vždy ukládat ve "
-#~ "znakové sadě UNICODE“.\n"
-#~ "  - Pokud není použit Unikód, mohou uživatelé ruské národnosti vybrat "
-#~ "znakovou sadu „Windows-1251“, aby se načetly štítky zapsané pod Windows. "
-#~ "A „KOI8-R“, aby se načetly ty zapsané pod Unixovými systémy."
-
-#~ msgid "Character set used to read tag data in the file."
-#~ msgstr "Znaková sada použitá pro čtení dat štítků v souboru."
-
-#, fuzzy
-#~ msgid "Convert underscore character '_' and string '%20' to space ' '"
-#~ msgstr "Převádět podtržítka a „%20“ na mezery"
-
-#~ msgid ""
-#~ "If activated, this conversion will be used when applying a mask from the "
-#~ "scanner for tags."
-#~ msgstr ""
-#~ "Pokud je zapnuto, bude se v průzkumníku při použití masky pro štítky "
-#~ "používat tento převod."
-
-#, fuzzy
-#~ msgid "Rename File Scanner - Character Conversion"
-#~ msgstr "Převod znaků"
-
-#~ msgid ""
-#~ "If activated, this conversion will be used when applying a mask from the "
-#~ "scanner for filenames."
-#~ msgstr ""
-#~ "Pokud je zapnuto, bude se v průzkumníku při použití masky pro názvy "
-#~ "souborů používat tento převod."
-
-#, fuzzy
-#~ msgid "Process Fields Scanner - Character Conversion"
-#~ msgstr "Zpracovat pole"
-
-#~ msgid ""
-#~ "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 ""
-#~ "Nepřevádět první písmena slov na velká v případě předložek, členů a slov "
-#~ "jako feat., když používáte průzkumník „První písmeno každého slova "
-#~ "velké“ (např. získáte „Text in ans Entry“ namísto „Test In An Entry“)."
-
-#~ msgid ""
-#~ "Activate this option to open automatically the scanner window when "
-#~ "EasyTAG starts."
-#~ msgstr ""
-#~ "Zapněte tuto volbu pro automatické otevření okna průzkumníka po spuštění "
-#~ "aplikace EasyTAG."
-
-#~ 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 ""
-#~ "Pokud je zapnuto, průzkumník přepíše stávající text v polích novou "
-#~ "hodnotou. Pokud je vypnuto, budou vyplněny pouze prázdná pole štítku."
-
-#~ msgid ""
-#~ "Activate this option if you want to put the following string into the "
-#~ "comment field when using the 'Fill Tag' scanner."
-#~ msgstr ""
-#~ "Tuto volbu aktivujte v případě, že použijete průzkumníka „Vyplnit štítek“ "
-#~ "a chcete, aby byl následující řetězec vždy vložen do pole poznámky."
-
-#~ msgid ""
-#~ "Calculates the CRC-32 value of the file and writes it into the comment "
-#~ "field when using the 'Fill Tag' scanner."
-#~ msgstr ""
-#~ "V případě, že se použije průzkumníka „Vyplnit štítek“ vypočítá pro soubor "
-#~ "hodnotu kontrolního součtu CRC-32 a zapíše jej do pole s komentářem."
-
-#~ msgid "Name:"
-#~ msgstr "Název:"
-
-#~ msgid "Local CDDB"
-#~ msgstr "Místní CDDB"
-
-#, fuzzy
-#~ msgid "Path:"
-#~ msgstr "Cesta CGI:"
-
-#~ 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 ""
-#~ "Určuje složku, ve které je uložena místní databáze CD. Místní databáze "
-#~ "obsahuje těchto jedenáct složek: „blues“, „classical“, „country“, „data“, "
-#~ "„folk“, „jazz“, „newage“, „reggae“, „rock“, „soundtrack“ a „misc“."
-
-#, fuzzy
-#~ msgid "Proxy Settings"
-#~ msgstr "Nastavení souborů"
-
-#~ msgid "Set active the settings of the proxy server."
-#~ msgstr "Toto nastavení zapněte, pokud se má používat proxy."
-
-#, fuzzy
-#~ msgid "Name of the proxy server."
-#~ msgstr "Používat proxy server"
-
-#, fuzzy
-#~ msgid "Port of the proxy server."
-#~ msgstr "Používat proxy server"
-
-#~ msgid "Name of user for the the proxy server."
-#~ msgstr "Jméno uživatele pro proxy server."
-
-#~ msgid "Password of user for the proxy server."
-#~ msgstr "Heslo uživatele pro proxy server."
-
-#, fuzzy
-#~ msgid "Track Name List"
-#~ msgstr "Název skladby"
-
-#~ 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 ""
-#~ "Pokud je zapnuto, bude v případě výběru řádku v seznamu názvů skladeb "
-#~ "vybrán i odpovídající řádek v hlavním seznamu."
-
-#~ msgid "Confirm exit from program"
-#~ msgstr "Potvrzovat ukončení programu"
-
-#~ msgid ""
-#~ "If activated, opens a dialog box to ask confirmation before exiting the "
-#~ "program."
-#~ msgstr ""
-#~ "Pokud je zapnuto, otevře se dialogové okno s potvrzením před ukončením "
-#~ "programu."
-
-#~ msgid "Confirm changing directory when there are unsaved changes"
-#~ msgstr "Potvrzovat změnu složky, když jsou v ní neuložené změny"
-
-#~ msgid "(Example: %.*d_-_Track_name_1.mp3)"
-#~ msgstr "(Příklad: %.*d_-_Nazev_skladby_1.mp3)"
-
-#~ msgid "(Example: disc_%.*d_of_10/Track_name_1.mp3)"
-#~ msgstr "(Příklad: disk_%.*d_z_10/Nazev_skladby_1.mp3)"
-
-#, fuzzy
-#~ msgid "Configuration saved"
-#~ msgstr "Potvrzování"
-
-#, fuzzy
-#~ msgid "Configuration unchanged"
-#~ msgstr "Potvrzování"
-
-#~ msgid "The audio file player '%s' cannot be found"
-#~ msgstr "Hudební přehrávač „%s“ nebyl nalezen"
-
-#, fuzzy
-#~ msgid "Audio Player Error"
-#~ msgstr "Spustit přehrávač"
-
-#~ msgid "Scanner:"
-#~ msgstr "Průzkumník:"
-
-#~ msgid "Select the type of scanner to use"
-#~ msgstr "Vyberte druh průzkumníka, které se má použít"
-
-#~ msgid "Select fields:"
-#~ msgstr "Vyberte pole:"
-
-#~ msgid ""
-#~ "The buttons on the right represent the fields which can be processed. "
-#~ "Select those which interest you"
-#~ msgstr ""
-#~ "Tlačítka vpravo reprezentují pole, která se budou upravovat. Vyberte ta, "
-#~ "která chcete upravit."
-
-#~ msgid "F"
-#~ msgstr "F"
-
-#~ msgid "T"
-#~ msgstr "T"
-
-#~ msgid "Ar"
-#~ msgstr "Ar"
-
-#~ msgid "AA"
-#~ msgstr "AA"
-
-#~ msgid "Process album artist field"
-#~ msgstr "Upravit pole s autorem alba"
-
-#~ msgid "Al"
-#~ msgstr "Al"
-
-#~ msgid "G"
-#~ msgstr "G"
-
-#~ msgid "Cm"
-#~ msgstr "Cm"
-
-#~ msgid "Cp"
-#~ msgstr "Cp"
-
-#~ msgid "O"
-#~ msgstr "O"
-
-#~ msgid "Cr"
-#~ msgstr "Cr"
-
-#~ msgid "U"
-#~ msgstr "U"
-
-#~ msgid "E"
-#~ msgstr "E"
-
-#~ msgid "Select/Unselect all"
-#~ msgstr "Vybrat vše/zrušit výběr všeho"
-
-#~ msgid ""
-#~ "Convert all words in all fields to upper case. Example, before: 'Text IN "
-#~ "AN entry', after: 'TEXT IN AN ENTRY'."
-#~ 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“."
-
-#~ msgid ""
-#~ "Convert all words in all fields to lower case. Example, before: 'TEXT IN "
-#~ "an entry', after: 'text in an entry'."
-#~ 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“."
-
-#~ 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 ""
-#~ "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“."
-
-#~ 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 ""
-#~ "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“."
-
-#~ msgid ""
-#~ "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
-#~ "text in an entry', after: 'IX. Text In An Entry'."
-#~ 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“."
-
-#, fuzzy
-#~ msgid ""
-#~ "All spaces between words are removed. Example, before: 'Text In An "
-#~ "Entry', after: 'TextInAnEntry'."
-#~ 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“"
-
-#, fuzzy
-#~ msgid ""
-#~ "A space is inserted before each upper case letter. Example, before: "
-#~ "'TextInAnEntry', after: 'Text In An Entry'."
-#~ 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“"
-
-#, fuzzy
-#~ msgid ""
-#~ "Duplicate spaces and underscores are removed. Example, before: "
-#~ "'Text__In__An   Entry', after: 'Text_In_An Entry'."
-#~ 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“"
-
-#~ msgid "Move Up this Mask"
-#~ msgstr "Posunout masku nahoru"
-
-#~ msgid "Move Down this Mask"
-#~ msgstr "Posunout masku dolů"
-
-#~ msgid "Duplicate Mask"
-#~ msgstr "Duplikovat masku"
-
-#~ msgid "Remove Mask"
-#~ msgstr "Odebrat masku"
-
-#, fuzzy
-#~ msgid "Copy: No row selected"
-#~ msgstr "Není vybrán žádný soubor"
-
-#, fuzzy
-#~ msgid "Remove: No row selected"
-#~ msgstr "Z vybraných souborů byla ve štítku vymazána adresa URL"
-
-#, fuzzy
-#~ msgid "Move Up: No row selected"
-#~ msgstr "Z vybraných souborů byla ve štítku vymazána adresa URL"
-
-#~ msgid "Move Down: No row selected"
-#~ msgstr "Posun níž: Není vybrán žádný řádek"
-
-#, fuzzy
-#~ msgid "Error: Cannot write configuration file: %s (%s)"
-#~ msgstr "Nelze zapsat seznam do souboru „%s“: %s"
-
-#, fuzzy
-#~ msgid "Error while writing configuration file: %s"
-#~ msgstr "Chyba při zápisu do souboru „%s“: %s"
-
-#, fuzzy
-#~ msgid "Cannot open configuration file '%s' (%s)"
-#~ msgstr "Nelze otevřít soubor „%s“: %s"
-
-#~ msgid "Loading default configuration"
-#~ msgstr "Načítá se výchozí nastavení"
-
-#, fuzzy
-#~ msgid "Loading default 'Rename Directory' masks…"
-#~ msgstr "Načítají se výchozí masky pro přejmenování souborů…"
-
-#~ msgid "Invert selection"
-#~ msgstr "Invertovat výběr"
-
-#~ msgid "Error while creating temporary file ‘%s’"
-#~ msgstr "Chyba při vytváření dočasného souboru „%s“"
diff --git a/po/hu.po b/po/hu.po
index 871e149..4d04328 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3,19 +3,18 @@
 # Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # Szél Miklós <mukka at freemail.hu>, 2001.
-# Nagy Boldizsar <boldi01 at freemail.hu>, 2002, 2003, 2004.
+# Nagy Boldizsár <boldi01 at freemail.hu>, 2002, 2003, 2004.
 # Mészáros Csaba <csablak at freemail.hu>, 2005, 2006, 2007.
-# Balázs Úr <urbalazs at gmail dot com>, 2013, 2014.
-# Balázs Úr <urbalazs at gmail.com>, 2014.
+# Balázs Úr <urbalazs at gmail.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: 2014-06-11 19:50+0000\n"
-"PO-Revision-Date: 2014-06-30 22:23+0200\n"
+"POT-Creation-Date: 2014-09-25 15:17+0000\n"
+"PO-Revision-Date: 2014-12-20 00:27+0100\n"
 "Last-Translator: Balázs Úr <urbalazs at gmail.com>\n"
-"Language-Team: Hungarian <kde-i18n-doc at kde.org>\n"
+"Language-Team: Hungarian <openscope at googlegroups dot com>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,5066 +47,6564 @@ msgstr ""
 "és Windows alatt."
 
 #: ../data/easytag.desktop.in.h:1
-msgid "Sound File Metadata Editor"
+#| msgid "Sound File Metadata Editor"
+msgid "Audio File Metadata Editor"
 msgstr "Hangfájl metaadat szerkesztő"
 
 #: ../data/easytag.desktop.in.h:2
-msgid "Edit sound file metadata"
+#| msgid "Edit sound file metadata"
+msgid "Edit audio file metadata"
 msgstr "Hangfájl metaadatok szerkesztése"
 
 #. 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;címke;hang;"
+#| msgid "mp3;tag;audio;"
+msgid "mp3;tag;audio;music;"
+msgstr "mp3;címke;hang;zene;"
 
-#: ../nautilus-extension/nautilus-easytag.c:229
-msgid "Open in EasyTAG"
-msgstr "Megnyitás az EasyTAG programban"
-
-#: ../nautilus-extension/nautilus-easytag.c:230
-#| msgid "Clear the current selection"
-msgid "Open the current selected directory in EasyTAG"
-msgstr "A jelenleg kijelölt könyvtár megnyitása az EasyTAG programban"
+# böngésző menü
+#: ../data/browser.ui.h:1
+msgid "Browse Directory With"
+msgstr "Könyvtár böngészése ezzel"
 
-#: ../nautilus-extension/nautilus-easytag.c:247
-msgid "Open with EasyTAG"
-msgstr "Megnyitás az EasyTAG programmal"
+#: ../data/browser.ui.h:2
+msgid "Run Program"
+msgstr "Program futtatása"
 
-# Fájl menü
-#: ../nautilus-extension/nautilus-easytag.c:248
-#| msgid "Scan selected files"
-msgid "Open selected files in EasyTAG"
-msgstr "A kijelölt fájlok megnyitása az EasyTAG programban"
+# bubble help?
+#: ../data/browser.ui.h:3
+#| msgid ""
+#| "Enter the program to run. It will receive the current directory as "
+#| "parameter."
+msgid ""
+"Enter the program to run; it will receive the current directory as a "
+"parameter"
+msgstr ""
+"Adja meg a futtatandó programot; az aktuális könyvtárat fogja megkapni "
+"paraméterként"
+
+#: ../data/browser.ui.h:4 ../src/misc.c:393 ../src/tag_area.c:1483
+msgid "_Open"
+msgstr "Meg_nyitás"
+
+#: ../data/browser.ui.h:5 ../data/tag_area.ui.h:3
+#: ../src/application_window.c:322 ../src/application_window.c:336
+#: ../src/application_window.c:2612 ../src/application_window.c:2650
+#: ../src/browser.c:848 ../src/cddb_dialog.c:2262 ../src/easytag.c:516
+#: ../src/easytag.c:523 ../src/easytag.c:640 ../src/misc.c:391
+#: ../src/playlist_dialog.c:655 ../src/tag_area.c:1481 ../src/tag_area.c:1843
+#| msgid " Cancel "
+msgid "_Cancel"
+msgstr "Mé_gse"
+
+#: ../data/browser.ui.h:6
+#| msgid " Execute "
+msgid "_Execute"
+msgstr "_Futtatás"
+
+#: ../data/browser.ui.h:7
+msgid "Open Files With"
+msgstr "Fájlok megnyitás ezzel"
 
-#. Translators: put your own name here to appear in the about dialog.
-#: ../src/about.c:89
-msgid "translator-credits"
+#: ../data/browser.ui.h:8
+#| msgid ""
+#| "Enter the program to run. It will receive the current file as parameter."
+msgid ""
+"Enter the program to run; it will receive the current files as a parameter"
 msgstr ""
-"Mészáros Csaba <csablak at freemail.hu>\n"
-"Nagy Boldizsar <boldi01 at freemail.hu>\n"
-"Szél Miklós <mukka at freemail.hu>\n"
-"Úr Balázs <urbalazs at gmail.com>"
+"Adja meg a futtatandó programot; az aktuális fájlokat fogja megkapni "
+"paraméterként"
 
-#: ../src/about.c:99
-msgid "View and edit tags in audio files"
-msgstr "Hangfájlokban lévő címkék megtekintése és szerkesztése"
+#. Only directories changed
+#: ../data/browser.ui.h:9 ../data/menus.ui.h:99 ../src/easytag.c:606
+msgid "Rename Directory"
+msgstr "Könyvtár átnevezése"
 
-#: ../src/ape_tag.c:61 ../src/id3v24_tag.c:113 ../src/mp4_header.cc:45
-#: ../src/mp4_header.cc:58 ../src/mp4_tag.cc:69 ../src/mp4_tag.cc:85
-#: ../src/mp4_tag.cc:90 ../src/mp4_tag.cc:262 ../src/mp4_tag.cc:278
-#: ../src/mp4_tag.cc:283
-#, c-format
-msgid "Error while opening file: '%s' (%s)."
-msgstr "Hiba a(z) „%s” fájl megnyitása közben (%s)."
+#: ../data/browser.ui.h:10
+#| msgid "User Name:"
+msgid "Literal name:"
+msgstr "Literálnév:"
 
-#: ../src/application.c:32
-msgid "Print the version and exit"
-msgstr "A verzió kiírása és kilépés"
+#: ../data/browser.ui.h:11 ../data/playlist_dialog.ui.h:2
+msgid "Use mask:"
+msgstr "Használandó maszk:"
 
-#: ../src/application.c:84
-#, c-format
-msgid "Website: %s"
-msgstr "Weboldal: %s"
+#: ../data/browser.ui.h:12 ../data/org.gnome.EasyTAG.gschema.xml.h:186
+#| msgid "Unable to create setting directories"
+msgid "Whether to use a mask when renaming directories"
+msgstr "Használjon-e maszkot könyvtárak átnevezésekor"
 
-#: ../src/application.c:93
-msgid "- Tag and rename audio files"
-msgstr "- Hangfájlok címkézése és átnevezése"
+# bubblehelp
+#: ../data/browser.ui.h:13
+#| msgid ""
+#| "Select or type in a mask using codes (see Legend in Scanner Window) to "
+#| "rename the directory from tag fields."
+msgid ""
+"Select or type in a mask using codes (see Legend in Scanner Window) to "
+"rename the directory from tag fields"
+msgstr ""
+"Maszk kiválasztása vagy begépelése kódok használatával (lásd a "
+"jelmagyarázatot a feldolgozó ablakban) a könyvtár átnevezéséhez a "
+"címkemezőkből"
 
-# Menüsor
-#.
-#. * Main Menu Actions
-#.
-#: ../src/bar.c:155
-msgid "_File"
-msgstr "_Fájl"
+#: ../data/browser.ui.h:14
+msgid "Rename directory preview"
+msgstr "Könyvtár átnevezés előnézet"
 
-# Fájl menü
-#: ../src/bar.c:156
-msgid "Sort List by Tag"
-msgstr "Lista rendezése címke szerint"
+#: ../data/browser.ui.h:15
+#| msgid "Rename File"
+msgid "_Rename"
+msgstr "Át_nevezés"
 
-# Fájl menü
-#: ../src/bar.c:159
-msgid "Sort List by Property"
-msgstr "Lista rendezése tulajdonság szerint"
+#: ../data/browser.ui.h:16
+#| msgid "Enter a directory to browse."
+msgid "Choose a directory to show in the browser"
+msgstr "Válasszon egy könyvtárat a böngészőben való megjelenítéshez"
 
-#: ../src/bar.c:160
-msgid "Ascending by filename"
-msgstr "Fájlnév szerint növekvően"
+#: ../data/browser.ui.h:17 ../src/application.c:129
+msgid "Select a directory to browse"
+msgstr "Válassza ki az átvizsgálandó könyvtárat"
 
-#: ../src/bar.c:161
-msgid "Descending by filename"
-msgstr "Fájlnév szerint csökkenően"
+#: ../data/browser.ui.h:18 ../src/easytag.c:1037
+msgid "No files"
+msgstr "Nincsenek fájlok"
 
-#: ../src/bar.c:162
-msgid "Ascending by creation date"
-msgstr "Létrehozás időpontja szerint növekvően"
+#: ../data/browser.ui.h:19 ../data/cddb_dialog.ui.h:10
+#: ../data/preferences_dialog.ui.h:61 ../data/scan_dialog.ui.h:57
+#: ../data/search_dialog.ui.h:13
+msgid "Artist"
+msgstr "Előadó"
 
-#: ../src/bar.c:163
-msgid "Descending by creation date"
-msgstr "Létrehozás időpontja szerint csökkenően"
+#: ../data/browser.ui.h:20
+msgid "# Albums"
+msgstr "# Albumok"
 
-#: ../src/bar.c:164
-msgid "Ascending by track number"
-msgstr "Sorszám szerint növekvően"
+#: ../data/browser.ui.h:21
+msgid "# Files"
+msgstr "# Fájlok"
 
-#: ../src/bar.c:165
-msgid "Descending by track number"
-msgstr "Sorszám szerint csökkenően"
+#: ../data/browser.ui.h:22 ../data/cddb_dialog.ui.h:11
+#: ../data/preferences_dialog.ui.h:63 ../data/scan_dialog.ui.h:60
+#: ../data/search_dialog.ui.h:15
+msgid "Album"
+msgstr "Album"
 
-#: ../src/bar.c:166
-msgid "Ascending by title"
-msgstr "Cím szerint növekvően"
+#: ../data/browser.ui.h:23 ../data/cddb_dialog.ui.h:35
+#: ../data/playlist_dialog.ui.h:1 ../data/scan_dialog.ui.h:53
+#: ../data/search_dialog.ui.h:11
+msgid "Filename"
+msgstr "Fájlnév"
 
-#: ../src/bar.c:167
-msgid "Descending by title"
-msgstr "Cím szerint csökkenően"
+#: ../data/browser.ui.h:24 ../data/cddb_dialog.ui.h:36
+#: ../data/preferences_dialog.ui.h:59 ../data/scan_dialog.ui.h:55
+#: ../data/search_dialog.ui.h:12
+msgid "Title"
+msgstr "Cím"
 
-#: ../src/bar.c:168
-msgid "Ascending by artist"
-msgstr "Előadó szerint növekvően"
+#: ../data/browser.ui.h:25 ../data/scan_dialog.ui.h:59
+#: ../data/search_dialog.ui.h:14
+msgid "Album Artist"
+msgstr "Album előadója"
 
-#: ../src/bar.c:169
-msgid "Descending by artist"
-msgstr "Előadó szerint csökkenően"
+#: ../data/browser.ui.h:26 ../data/cddb_dialog.ui.h:37
+#: ../data/search_dialog.ui.h:17
+msgid "Year"
+msgstr "Év"
 
-#: ../src/bar.c:170
-msgid "Ascending by album artist"
-msgstr "Album előadó szerint növekvően"
+#: ../data/browser.ui.h:27
+msgid "Disc"
+msgstr "Lemez"
 
-#: ../src/bar.c:171
-msgid "Descending by album artist"
-msgstr "Album előadó szerint csökkenően"
+#: ../data/browser.ui.h:28 ../data/search_dialog.ui.h:18
+msgid "Track"
+msgstr "Szám"
 
-#: ../src/bar.c:172
-msgid "Ascending by album"
-msgstr "Album szerint növekvően"
+#: ../data/browser.ui.h:29 ../data/cddb_dialog.ui.h:40
+#: ../data/preferences_dialog.ui.h:65 ../data/scan_dialog.ui.h:62
+#: ../data/search_dialog.ui.h:19
+msgid "Genre"
+msgstr "Műfaj"
 
-#: ../src/bar.c:173
-msgid "Descending by album"
-msgstr "Album szerint csökkenően"
+#: ../data/browser.ui.h:30 ../data/preferences_dialog.ui.h:67
+#: ../data/scan_dialog.ui.h:64 ../data/search_dialog.ui.h:20
+msgid "Comment"
+msgstr "Megjegyzés"
 
-#: ../src/bar.c:174
-msgid "Ascending by year"
-msgstr "Év szerint növekvően"
+#: ../data/browser.ui.h:31 ../data/preferences_dialog.ui.h:69
+#: ../data/scan_dialog.ui.h:66 ../data/search_dialog.ui.h:21
+#: ../src/picture.c:223
+msgid "Composer"
+msgstr "Zeneszerző"
 
-#: ../src/bar.c:175
-msgid "Descending by year"
-msgstr "Év szerint csökkenően"
+#: ../data/browser.ui.h:32 ../data/search_dialog.ui.h:22
+msgid "Original Artist"
+msgstr "Eredeti előadó"
 
-#: ../src/bar.c:176
-msgid "Ascending by genre"
-msgstr "Műfaj szerint növekvően"
+#: ../data/browser.ui.h:33 ../data/scan_dialog.ui.h:70
+#: ../data/search_dialog.ui.h:23
+msgid "Copyright"
+msgstr "Szerzői jog"
 
-#: ../src/bar.c:177
-msgid "Descending by genre"
-msgstr "Műfaj szerint csökkenően"
+#: ../data/browser.ui.h:34 ../data/scan_dialog.ui.h:72
+#: ../data/search_dialog.ui.h:24
+msgid "URL"
+msgstr "URL"
 
-#: ../src/bar.c:178
-msgid "Ascending by comment"
-msgstr "Megjegyzés szerint növekvően"
+#: ../data/browser.ui.h:35 ../data/scan_dialog.ui.h:74
+#: ../data/search_dialog.ui.h:25
+msgid "Encoded By"
+msgstr "Kódolta"
 
-#: ../src/bar.c:179
-msgid "Descending by comment"
-msgstr "Megjegyzés szerint csökkenően"
+#: ../data/cddb_dialog.ui.h:1
+#| msgid "Search:"
+msgid "Search"
+msgstr "Keresés"
 
-#: ../src/bar.c:180
-msgid "Ascending by composer"
-msgstr "Zeneszerző szerint növekvően"
+#: ../data/cddb_dialog.ui.h:2
+#| msgid "Enter the words to search (separated by a space or '+')"
+msgid "Enter the words to search (separated by a space or ‘+’)"
+msgstr "Írja be a keresendő szavakat (szóközzel vagy „+” jellel elválasztva)"
 
-#: ../src/bar.c:181
-msgid "Descending by composer"
-msgstr "Zeneszerző szerint csökkenően"
+#: ../data/cddb_dialog.ui.h:3
+#| msgid "Search:"
+msgid "_Search"
+msgstr "_Keresés"
 
-#: ../src/bar.c:182
-msgid "Ascending by original artist"
-msgstr "Eredeti előadó szerint növekvően"
+# bubble help
+#: ../data/cddb_dialog.ui.h:4
+#, fuzzy
+#| msgid ""
+#| "Request automatically the CDDB using the selected files (the order is "
+#| "important) to generate the CddbID"
+msgid ""
+"Generate the CDDB disc ID using the selected files (the order is important)"
+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/bar.c:183
-msgid "Descending by original artist"
-msgstr "Eredeti előadó szerint csökkenően"
+# Fájl menü
+#: ../data/cddb_dialog.ui.h:5
+#, fuzzy
+#| msgid "Scan selected files"
+msgid "Search Using Selected _Files"
+msgstr "A kijelölt fájlok vizsgálata"
 
-#: ../src/bar.c:184
-msgid "Ascending by copyright"
-msgstr "Szerzői jog szerint növekvően"
+#: ../data/cddb_dialog.ui.h:6 ../data/toolbar.ui.h:31
+msgid "Stop"
+msgstr "Leállítás"
 
-#: ../src/bar.c:185
-msgid "Descending by copyright"
-msgstr "Szerzői jog szerint csökkenően"
+#: ../data/cddb_dialog.ui.h:7
+msgid "Stop the search"
+msgstr "A keresés leállítása"
 
-#: ../src/bar.c:186
-msgid "Ascending by URL"
-msgstr "URL szerint növekvően"
+#: ../data/cddb_dialog.ui.h:8
+#| msgid "Manual Search"
+msgid "Manual Search Options"
+msgstr "Kézi keresési beállítások"
 
-#: ../src/bar.c:187
-msgid "Descending by URL"
-msgstr "URL szerint csökkenően"
+# ikon megjegyzés
+#: ../data/cddb_dialog.ui.h:9
+msgid "Search Fields"
+msgstr "Keresési mezők"
 
-#. 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 "Kódoló neve szerint növekvően"
+#: ../data/cddb_dialog.ui.h:12
+msgid "Track Name"
+msgstr "Szám neve"
 
-#. 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 "Kódoló neve szerint csökkenően"
+#: ../data/cddb_dialog.ui.h:13 ../data/preferences_dialog.ui.h:89
+#: ../src/picture.c:201
+msgid "Other"
+msgstr "Egyéb"
 
-#: ../src/bar.c:194
-msgid "Ascending by file type"
-msgstr "Fájltípus szerint növekvően"
+#: ../data/cddb_dialog.ui.h:14
+msgid "Categories"
+msgstr "Kategóriák"
 
-#: ../src/bar.c:195
-msgid "Descending by file type"
-msgstr "Fájltípus szerint csökkenően"
+#: ../data/cddb_dialog.ui.h:15
+msgid "Blues"
+msgstr "Blues"
 
-#: ../src/bar.c:196
-msgid "Ascending by file size"
-msgstr "Fájlméret szerint növekvően"
+#: ../data/cddb_dialog.ui.h:16
+msgid "Classical"
+msgstr "Klasszikus"
 
-#: ../src/bar.c:197
-msgid "Descending by file size"
-msgstr "Fájlméret szerint csökkenően"
+#: ../data/cddb_dialog.ui.h:17
+msgid "Country"
+msgstr "Country"
 
-#: ../src/bar.c:198
-msgid "Ascending by duration"
-msgstr "Időtartam szerint növekvően"
+#: ../data/cddb_dialog.ui.h:18
+msgid "Folk"
+msgstr "Folk"
 
-#: ../src/bar.c:199
-msgid "Descending by duration"
-msgstr "Időtartam szerint csökkenően"
+#: ../data/cddb_dialog.ui.h:19
+msgid "Jazz"
+msgstr "Jazz"
 
-#: ../src/bar.c:200
-msgid "Ascending by bitrate"
-msgstr "Bitráta szerint növekvően"
+#: ../data/cddb_dialog.ui.h:20
+msgid "Misc."
+msgstr "Egyéb"
 
-#: ../src/bar.c:201
-msgid "Descending by bitrate"
-msgstr "Bitráta szerint csökkenően"
+#: ../data/cddb_dialog.ui.h:21
+msgid "New Age"
+msgstr "Új kor"
 
-#: ../src/bar.c:202
-msgid "Ascending by samplerate"
-msgstr "Minőség szerint növekvően"
+#: ../data/cddb_dialog.ui.h:22
+msgid "Reggae"
+msgstr "Reggae"
 
-#: ../src/bar.c:203
-msgid "Descending by samplerate"
-msgstr "Minőség szerint csökkenően"
+#: ../data/cddb_dialog.ui.h:23
+msgid "Rock"
+msgstr "Rock"
 
-#: ../src/bar.c:205
-msgid "Open Files With…"
-msgstr "Fájlok megnyitás ezzel…"
+#: ../data/cddb_dialog.ui.h:24
+msgid "Soundtrack"
+msgstr "Filmzene"
 
-#: ../src/bar.c:206
-msgid "Run a command on the selected files"
-msgstr "Parancs futtatása a kijelölt fájlokon"
+#: ../data/cddb_dialog.ui.h:25
+#| msgid "Results:"
+msgid "Results"
+msgstr "Eredmények"
 
-#: ../src/bar.c:209
-msgid "Select all"
-msgstr "Összes kijelölése"
+#: ../data/cddb_dialog.ui.h:26
+msgid "Artist / Album"
+msgstr "Előadó / Album"
 
-# Fájl menü és bubble help egyben
-#: ../src/bar.c:210
-msgid "Unselect All"
-msgstr "Kijelölés megszüntetése"
+#: ../data/cddb_dialog.ui.h:27
+msgid "Category"
+msgstr "Kategória"
 
-#: ../src/bar.c:211
-msgid "Clear the current selection"
-msgstr "A jelenlegi kijelölés törlése"
+# bubble help
+#: ../data/cddb_dialog.ui.h:28
+#, fuzzy
+#| 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."
+msgid ""
+"Select lines from which tags will be applied to your files list. All lines "
+"will be processed if no line is selected.\\nYou can also reorder lines in "
+"this list before using the ‘apply’ button"
+msgstr ""
+"Válassza ki az „Alkalmazni” kívánt sorokat a fájlok listájából. Az összes "
+"sor feldolgozásra kerül, ha nincs sor kiválasztva.\n"
+"Át is rendezheti a sorokat ebben a listában, mielőtt az „Alkalmaz” gombot "
+"használná."
 
-# Fájl menü
-#: ../src/bar.c:214
-msgid "Invert File Selection"
-msgstr "Fájlkijelölés megfordítása"
+#: ../data/cddb_dialog.ui.h:29
+msgid "#"
+msgstr "#"
 
-#: ../src/bar.c:215
-msgid "Invert file selection"
-msgstr "Fájlkijelölés megfordítása"
+#: ../data/cddb_dialog.ui.h:30
+msgid "Duration"
+msgstr "Időtartam"
 
-# Fájl menü
-#: ../src/bar.c:217
-msgid "Delete Files"
-msgstr "Fájlok törlése"
+#: ../data/cddb_dialog.ui.h:31
+msgid "Select all lines"
+msgstr "Minden sor kijelölése"
 
-# Fájl menü
-#: ../src/bar.c:217
-msgid "Delete files"
-msgstr "Fájlok törlése"
+#: ../data/cddb_dialog.ui.h:32
+#| msgid "Invert lines selection"
+msgid "Invert line selection"
+msgstr "Sorok kijelölésének megfordítása"
 
-# Fájl menü
-#: ../src/bar.c:218
-msgid "_First File"
-msgstr "_Első fájl"
+#: ../data/cddb_dialog.ui.h:33
+msgid "Unselect all lines"
+msgstr "Minden sor kijelölésének megszüntetése"
 
-# ikon megjegyzés
-#: ../src/bar.c:219
-msgid "First file"
-msgstr "Első fájl"
-
-# Fájl menü
-#: ../src/bar.c:220
-msgid "_Previous File"
-msgstr "Elő_ző fájl"
-
-# ikon megjegyzés
-#: ../src/bar.c:220
-msgid "Previous file"
-msgstr "Előző fájl"
-
-# Fájl menü
-#: ../src/bar.c:221
-msgid "_Next File"
-msgstr "_Következő fájl"
-
-# ikon megjegyzés
-#: ../src/bar.c:221
-msgid "Next file"
-msgstr "Következő fájl"
-
-# Fájl menü
-#: ../src/bar.c:222
-msgid "_Last File"
-msgstr "_Utolsó fájl"
-
-# ikon megjegyzés
-#: ../src/bar.c:223
-msgid "Last file"
-msgstr "Utolsó fájl"
-
-# Fájl menü
-#: ../src/bar.c:224
-msgid "S_can Files"
-msgstr "Fájlok _vizsgálata"
-
-# Fájl menü
-#: ../src/bar.c:225 ../src/scan_dialog.c:1818
-msgid "Scan selected files"
-msgstr "A kijelölt fájlok vizsgálata"
-
-# Fájl menü
-#: ../src/bar.c:226
-msgid "_Remove Tags"
-msgstr "Címkék _eltávolítása"
+#: ../data/cddb_dialog.ui.h:34 ../data/menus.ui.h:24
+#| msgid "Fill Tag"
+msgid "Fill Tags"
+msgstr "Címkék kitöltése"
 
-# ikon megjegyzés
-#: ../src/bar.c:227
-msgid "Remove tags"
-msgstr "Címkék eltávolítása"
+#: ../data/cddb_dialog.ui.h:38
+msgid "Track #"
+msgstr "Szám #"
 
-# Fájl menü
-#: ../src/bar.c:228
-msgid "_Undo Last Files Changes"
-msgstr "_Utolsó fájlmódosítások visszavonása"
+#: ../data/cddb_dialog.ui.h:39
+msgid "# Tracks"
+msgstr "# Számok"
 
-# Fájl menü
-#: ../src/bar.c:229
-msgid "Undo last files changes"
-msgstr "Utolsó fájlmódosítások visszavonása"
+#: ../data/cddb_dialog.ui.h:41 ../data/load_files_dialog.ui.h:13
+msgid "Run the current scanner for each file"
+msgstr "Az jelenlegi feldolgozó futtatása minden fájlra"
 
-# Fő menü
-#: ../src/bar.c:231
-msgid "R_edo Last Files Changes"
-msgstr "U_tolsó fájlmódosítások ismétlése"
+#: ../data/cddb_dialog.ui.h:42 ../data/org.gnome.EasyTAG.gschema.xml.h:38
+msgid ""
+"Whether to run the tag scanner, with the current settings, on the CDDB "
+"results"
+msgstr ""
 
-# ikon megjegyzés
-#: ../src/bar.c:232
-msgid "Redo last files changes"
-msgstr "Utolsó fájlmódosítások ismétlése"
+#: ../data/cddb_dialog.ui.h:43
+msgid "Match lines with the Levenshtein algorithm"
+msgstr "Sorok megfeleltetése a Levenshtein algoritmussal"
 
-# Fő menü
-#: ../src/bar.c:234
-msgid "_Save Files"
-msgstr "Fájlok _mentése"
+#: ../data/cddb_dialog.ui.h:44 ../data/preferences_dialog.ui.h:146
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:24
+msgid "Whether to use the DLM algorithm to match CDDB results to files"
+msgstr ""
 
-#: ../src/bar.c:235
-msgid "Save changes to selected files"
-msgstr "Változtatások mentése a kijelölt fájlokba"
+#: ../data/cddb_dialog.ui.h:45 ../data/search_dialog.ui.h:10
+#: ../src/load_files_dialog.c:895 ../src/preferences_dialog.c:294
+#: ../src/scan_dialog.c:2243
+#| msgid " Close "
+msgid "_Close"
+msgstr "_Bezárás"
 
-# Fájl menü
-#: ../src/bar.c:237
-msgid "_Force Save Files"
-msgstr "Fájlok ké_nyszerített mentése"
+#: ../data/cddb_dialog.ui.h:46 ../src/cddb_dialog.c:2263
+#: ../src/load_files_dialog.c:896
+#| msgid " Apply "
+msgid "_Apply"
+msgstr "_Alkalmaz"
 
-# ikon megjegyzés
-#: ../src/bar.c:238
-msgid "Force saving files"
-msgstr "Fájlok kényszerített mentése"
+#: ../data/cddb_dialog.ui.h:47
+#, fuzzy
+#| msgid "Load the selected lines or all lines (if no line selected)."
+msgid "Load the selected lines or all lines (if no lines are selected)"
+msgstr "A kijelölt sorok vagy minden sor (ha nincs kjelölés) betöltése."
 
-# Fájl menü
-#: ../src/bar.c:240
-msgid "Undo Last Changes"
-msgstr "Utolsó változtatások visszavonása"
+#. Default values are MPEG data.
+#: ../data/file_area.ui.h:1 ../src/et_core.c:2911 ../src/file_area.c:192
+msgid "File"
+msgstr "Fájl"
 
-# Fájl menü
-#: ../src/bar.c:240
-msgid "Undo last changes"
-msgstr "Utolsó változtatások visszavonása"
+#: ../data/file_area.ui.h:2
+msgid "0/0:"
+msgstr "0/0:"
 
-# ikon megjegyzés
-#: ../src/bar.c:241
-msgid "Redo Last Changes"
-msgstr "Utolsó változtatások ismétlése"
+#. Nothing to display
+#. Version changed to encoder version
+#. Encoder version
+#: ../data/file_area.ui.h:3 ../src/file_area.c:193
+#: ../src/tags/flac_header.c:205 ../src/tags/monkeyaudio_header.c:93
+#: ../src/tags/musepack_header.c:97 ../src/tags/ogg_header.c:418
+#: ../src/tags/opus_header.c:228 ../src/tags/wavpack_header.c:82
+msgid "Encoder:"
+msgstr "Kódoló:"
 
-# ikon megjegyzés
-#: ../src/bar.c:241
-msgid "Redo last changes"
-msgstr "Utolsó változtatások ismétlése"
+#: ../data/file_area.ui.h:4
+msgid "Bitrate:"
+msgstr "Bitsebesség:"
 
-# Fő menü
-#: ../src/bar.c:242
-msgid "_Quit"
-msgstr "_Kilépés"
+#: ../data/file_area.ui.h:5
+msgid "Sample rate:"
+msgstr "Mintavételezés:"
 
-# ikon megjegyzés
-#: ../src/bar.c:242 ../src/easytag.c:2424 ../src/easytag.c:4559
-#: ../src/easytag.c:4591
-msgid "Quit"
-msgstr "Kilépés"
+#. Mode
+#: ../data/file_area.ui.h:6 ../src/file_area.c:197
+#: ../src/tags/mpeg_header.c:231
+msgid "Mode:"
+msgstr "Mód:"
 
-# Menüsor
-#: ../src/bar.c:245
-msgid "_Browser"
-msgstr "_Böngésző"
+#: ../data/file_area.ui.h:7
+msgid "Size:"
+msgstr "Méret:"
 
-# Böngésző menü
-#: ../src/bar.c:246
-msgid "_Home Directory"
-msgstr "_Saját könyvtár"
+#: ../data/file_area.ui.h:8
+msgid "Duration:"
+msgstr "Időtartam:"
 
-# ikon megjegyzés
-#: ../src/bar.c:247
-msgid "Go to home directory"
-msgstr "Ugrás a kezdő könyvtárra"
+#: ../data/log_area.ui.h:1 ../data/preferences_dialog.ui.h:14
+msgid "Log"
+msgstr "Napló"
 
-# Ikon megjegyzés
-#: ../src/bar.c:249
-msgid "Desktop Directory"
-msgstr "Asztal könyvtár"
+#: ../data/load_files_dialog.ui.h:1
+msgid "File:"
+msgstr "Fájl:"
 
-# Ikon megjegyzés
-#: ../src/bar.c:250
-msgid "Go to desktop directory"
-msgstr "Ugrás az asztal könyvtárra"
+#: ../data/load_files_dialog.ui.h:2
+#, fuzzy
+#| msgid "Content of Text File"
+msgid "Choose a Text File"
+msgstr "A szövegfájl tartalma"
 
-# ikon megjegyzés
-#: ../src/bar.c:252
-msgid "Documents Directory"
-msgstr "Dokumentumok könyvtár"
+#: ../data/load_files_dialog.ui.h:3
+#| msgid " Load "
+msgid "_Load"
+msgstr "_Betöltés"
 
-# ikon megjegyzés
-#: ../src/bar.c:253
-msgid "Go to documents directory"
-msgstr "Ugrás a dokumentumok könyvtárra"
+#: ../data/load_files_dialog.ui.h:4
+msgid "Content of Text File"
+msgstr "A szövegfájl tartalma"
 
-# ikon megjegyzés
-#: ../src/bar.c:255
-msgid "Downloads Directory"
-msgstr "Letöltések könyvtár"
+#: ../data/load_files_dialog.ui.h:5
+msgid "Insert a blank line before the selected line"
+msgstr "Üres sor beszúrása a kijelölt sor elé"
 
-# ikon megjegyzés
-#: ../src/bar.c:256
-msgid "Go to downloads directory"
-msgstr "Ugrás a letöltések könyvtárra"
+# Sor törlése - volt régen.
+#: ../data/load_files_dialog.ui.h:6
+msgid "Delete the selected line"
+msgstr "A kijelölt sor törlése"
 
-# ikon megjegyzés
-#: ../src/bar.c:258
-msgid "Music Directory"
-msgstr "Zene könyvtár"
+#: ../data/load_files_dialog.ui.h:7 ../src/load_files_dialog.c:636
+#: ../src/load_files_dialog.c:739
+msgid "Delete all blank lines"
+msgstr "Minden üres sor törlése"
 
-# ikon megjegyzés
-#: ../src/bar.c:259
-msgid "Go to music directory"
-msgstr "Ugrás a zene könyvtárra"
+#: ../data/load_files_dialog.ui.h:8
+#| msgid "Move up the selected line"
+msgid "Move the selected line up"
+msgstr "Kijelölt sor mozgatása fel"
 
-#: ../src/bar.c:261
-msgid "_Parent Directory"
-msgstr "S_zülő könyvtár"
+#: ../data/load_files_dialog.ui.h:9
+#| msgid "Move up the selected line"
+msgid "Move the selected line down"
+msgstr "Kijelölt sor mozgatása le"
 
-#: ../src/bar.c:262
-msgid "Go to parent directory"
-msgstr "Ugrás a szülő könyvtárba"
+#: ../data/load_files_dialog.ui.h:10 ../src/load_files_dialog.c:654
+#: ../src/load_files_dialog.c:757
+msgid "Reload"
+msgstr "Újratöltés"
 
-# Ikon megjegyzés
-#: ../src/bar.c:264
-msgid "_Default Directory"
-msgstr "_Alapértelmezett könyvtár"
+#: ../data/load_files_dialog.ui.h:11
+msgid "List of Files"
+msgstr "Fájlok listája"
 
-# Ikon megjegyzés
-#: ../src/bar.c:265
-msgid "Go to default directory"
-msgstr "Ugrás az alapértelmezett könyvtárra"
+#: ../data/load_files_dialog.ui.h:12
+msgid "Selected line:"
+msgstr "Kijelölt sor:"
 
-# Böngésző menü
-#: ../src/bar.c:267
-msgid "Set _Current Path as Default"
-msgstr "_Jelenlegi útvonal alapértelmezetté tétele"
+#: ../data/load_files_dialog.ui.h:14
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:129
+#, fuzzy
+#| msgid "Run the current scanner for each file"
+msgid "Whether to run the current scanner on files loaded from a text file"
+msgstr "Az jelenlegi feldolgozó futtatása minden fájlra"
 
-# ikon megjegyzés
-#: ../src/bar.c:267
-msgid "Set current path as default"
-msgstr "Jelenlegi útvonal alapértelmezetté tétele"
+# Menüsor
+#: ../data/menus.ui.h:1
+msgid "_Help"
+msgstr "_Súgó"
 
-#: ../src/bar.c:268
-msgid "Rename Directory…"
-msgstr "Könyvtár átnevezése…"
+#: ../data/menus.ui.h:2
+msgid "_About"
+msgstr "_Névjegy"
 
-#: ../src/bar.c:268
-msgid "Rename directory"
-msgstr "Könyvtár átnevezése"
+# Fő menü
+#: ../data/menus.ui.h:3 ../src/application_window.c:2651
+msgid "_Quit"
+msgstr "_Kilépés"
 
-# böngésző menü
-#: ../src/bar.c:269
-msgid "Reload Directory"
-msgstr "Könyvtár újratöltése"
+# Menüsor
+#: ../data/menus.ui.h:4
+msgid "_File"
+msgstr "_Fájl"
 
-# böngésző menü
-#: ../src/bar.c:270
-msgid "Reload directory"
-msgstr "Könyvtár újratöltése"
+#: ../data/menus.ui.h:5
+msgid "Open Files With…"
+msgstr "Fájlok megnyitás ezzel…"
 
-# böngésző menü
-#: ../src/bar.c:273
-msgid "Browse Directory With…"
-msgstr "Könyvtár böngészése ezzel…"
+# egyéb menü
+#: ../data/menus.ui.h:6
+msgid "Run Audio Player"
+msgstr "Zenelejátszó futtatása"
 
-#: ../src/bar.c:274
-msgid "Run a command on the directory"
-msgstr "Parancs futtatása a könyvtáron"
+# Fájl menü
+#: ../data/menus.ui.h:7 ../data/toolbar.ui.h:23
+msgid "Invert File Selection"
+msgstr "Fájlkijelölés megfordítása"
 
-# böngésző menü
-#: ../src/bar.c:276
-msgid "_Collapse Tree"
-msgstr "Fa össze_csukása"
+# Fájl menü
+#: ../data/menus.ui.h:8
+msgid "Delete Files"
+msgstr "Fájlok törlése"
 
-# böngésző menü
-#: ../src/bar.c:277
-msgid "Collapse directory tree"
-msgstr "Könyvtárfa összecsukása"
+#: ../data/menus.ui.h:9
+#, fuzzy
+#| msgid "Find Files"
+msgid "Undo for File"
+msgstr "Fájlok keresése"
 
-#: ../src/bar.c:278
-msgid "_Reload Tree"
-msgstr "Fa új_ratöltése"
+#: ../data/menus.ui.h:10
+msgid "Redo for File"
+msgstr ""
 
-# böngésző menü
-#: ../src/bar.c:279
-msgid "Reload directory tree"
-msgstr "Könyvtárfa újratöltése"
+# Fő menü
+#: ../data/menus.ui.h:11 ../data/toolbar.ui.h:17
+msgid "_Save Files"
+msgstr "Fájlok _mentése"
 
-# Menüsor
-#: ../src/bar.c:282
-msgid "S_canner Mode"
-msgstr "Fel_dolgozó mód"
+# Fájl menü
+#: ../data/menus.ui.h:12
+msgid "_Force Save Files"
+msgstr "Fájlok ké_nyszerített mentése"
 
-#: ../src/bar.c:284
-msgid "_Miscellaneous"
-msgstr "_Egyebek"
+#: ../data/menus.ui.h:13
+msgid "_Edit"
+msgstr "S_zerkesztés"
 
-#: ../src/bar.c:285
+#: ../data/menus.ui.h:14 ../data/toolbar.ui.h:25
 msgid "_Find…"
 msgstr "_Keresés…"
 
-#: ../src/bar.c:286
-msgid "Search filenames and tags"
-msgstr "Fájlnevek és címkék keresése"
-
-#: ../src/bar.c:288
-msgid "CDD_B Search…"
-msgstr "CD-adat_bázis keresés…"
-
-# ikon megjegyzés
-#: ../src/bar.c:289
-msgid "CDDB search"
-msgstr "CD-adatbázis keresés"
-
-# egyéb menü
-#: ../src/bar.c:291
-msgid "Load Filenames From a Text File…"
-msgstr "Fájlnevek betöltése szövegfájlból…"
-
-#: ../src/bar.c:292
-msgid "Load filenames from a text file"
-msgstr "Fájlnevek betöltése szövegfájlból"
-
-#: ../src/bar.c:294
-msgid "Generate Playlist…"
-msgstr "Lejátszólista előállítása…"
+#: ../data/menus.ui.h:15
+#| msgid "Select all"
+msgid "Select All"
+msgstr "Összes kijelölése"
 
-#: ../src/bar.c:295
-msgid "Generate a playlist"
-msgstr "Lejátszólista előállítása"
+# Fájl menü és bubble help egyben
+#: ../data/menus.ui.h:16
+msgid "Unselect All"
+msgstr "Kijelölés megszüntetése"
 
-# egyéb menü
-#: ../src/bar.c:297 ../src/bar.c:328 ../src/bar.c:329 ../src/bar.c:330
-msgid "Run Audio Player"
-msgstr "Zenelejátszó futtatása"
+#: ../data/menus.ui.h:17
+msgid "Undo"
+msgstr "Visszavonás"
 
-# egyéb menü
-#: ../src/bar.c:298 ../src/bar.c:328 ../src/bar.c:329 ../src/bar.c:330
-msgid "Run audio player"
-msgstr "Zenelejátszó futtatása"
+#: ../data/menus.ui.h:18
+msgid "Redo"
+msgstr "Újra"
 
-#: ../src/bar.c:301
-msgid "_Edit"
-msgstr "S_zerkesztés"
+# Fájl menü
+#: ../data/menus.ui.h:19 ../data/toolbar.ui.h:11
+msgid "_Remove Tags"
+msgstr "Címkék _eltávolítása"
 
 # beállítások menü
-#: ../src/bar.c:302
+#: ../data/menus.ui.h:20
 msgid "_Preferences"
 msgstr "_Beállítások"
 
-#. The window
-#: ../src/bar.c:303 ../src/prefs.c:110
-msgid "Preferences"
-msgstr "Beállítások"
-
-#: ../src/bar.c:305
+#: ../data/menus.ui.h:21
 msgid "_View"
 msgstr "_Nézet"
 
-#: ../src/bar.c:306
-msgid "_Go"
-msgstr "_Ugrás"
+#: ../data/menus.ui.h:22
+#| msgid "_Show Scanner"
+msgid "Show Scanner"
+msgstr "Feldolgozó megjelenítése"
 
 # Menüsor
-#: ../src/bar.c:308
-msgid "_Help"
-msgstr "_Súgó"
+#: ../data/menus.ui.h:23
+#| msgid "S_canner Mode"
+msgid "Scanner Mode"
+msgstr "Feldolgozó mód"
+
+#: ../data/menus.ui.h:25
+#| msgid "_Rename Files and Directories…"
+msgid "Rename Files and Directories"
+msgstr "Fájlok és könyvtárak átnevezése"
 
-#: ../src/bar.c:311
-msgid "_Contents"
-msgstr "_Tartalom"
+#: ../data/menus.ui.h:26 ../data/scan_dialog.ui.h:107
+msgid "Process Fields"
+msgstr "Mezök feldolgozása"
 
-#: ../src/bar.c:312
-msgid "Show help"
-msgstr "Súgó megjelenítése"
+#: ../data/menus.ui.h:27 ../data/toolbar.ui.h:19
+#| msgid "Directory renamed"
+msgid "Directory Tree"
+msgstr "Könyvtárfa"
 
-#: ../src/bar.c:314
-msgid "_About"
-msgstr "_Névjegy"
+#: ../data/menus.ui.h:28 ../data/toolbar.ui.h:21
+#| msgid "Artist and Album"
+msgid "Artists and Albums"
+msgstr "Előadók és albumok"
 
-#: ../src/bar.c:314
-msgid "About"
-msgstr "Névjegy"
+# Fájl menü
+#: ../data/menus.ui.h:29
+msgid "Sort List by Tag"
+msgstr "Lista rendezése címke szerint"
 
-#.
-#. * Following items are on toolbar but not on menu
-#.
-#: ../src/bar.c:320
-msgid "Stop the current action"
-msgstr "Jelenlegi művelet leállítása"
+#: ../data/menus.ui.h:30
+msgid "Ascending by track number"
+msgstr "Sorszám szerint növekvően"
 
-#.
-#. * Popup menu's Actions
-#.
-#: ../src/bar.c:326
-msgid "_File Operations"
-msgstr "_Fájlműveletek"
+#: ../data/menus.ui.h:31
+msgid "Descending by track number"
+msgstr "Sorszám szerint csökkenően"
 
-# Menüsor
-#: ../src/bar.c:327
-msgid "S_canner"
-msgstr "Fel_dolgozó"
+#: ../data/menus.ui.h:32
+msgid "Ascending by title"
+msgstr "Cím szerint növekvően"
 
-#: ../src/bar.c:331
-msgid "CDDB Search Files…"
-msgstr "Fájl keresése CD-adatbázisban…"
+#: ../data/menus.ui.h:33
+msgid "Descending by title"
+msgstr "Cím szerint csökkenően"
 
-#: ../src/bar.c:331
-msgid "CDDB search files…"
-msgstr "Fájl keresése CD-adatbázisban"
+#: ../data/menus.ui.h:34
+msgid "Ascending by artist"
+msgstr "Előadó szerint növekvően"
 
-#. { 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:335
-msgid "Clear log"
-msgstr "Napló törlése"
+#: ../data/menus.ui.h:35
+msgid "Descending by artist"
+msgstr "Előadó szerint csökkenően"
 
-# böngésző menü
-#. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Subdirectories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: ../src/bar.c:342
-msgid "Browse _Subdirectories"
-msgstr "_Alkönyvtárak böngészése"
+#: ../data/menus.ui.h:36
+msgid "Ascending by album artist"
+msgstr "Album előadó szerint növekvően"
 
-# böngésző menü
-#: ../src/bar.c:342
-msgid "Browse subdirectories"
-msgstr "Alkönyvtárak böngészése"
+#: ../data/menus.ui.h:37
+msgid "Descending by album artist"
+msgstr "Album előadó szerint csökkenően"
 
-#: ../src/bar.c:346
-msgid "Show Hidden Directories"
-msgstr "Rejtett könyvtárak megjelenítése"
+#: ../data/menus.ui.h:38
+msgid "Ascending by album"
+msgstr "Album szerint növekvően"
 
-#: ../src/bar.c:346
-msgid "Show hidden directories"
-msgstr "Rejtett könyvtárak megjelenítése"
+#: ../data/menus.ui.h:39
+msgid "Descending by album"
+msgstr "Album szerint csökkenően"
 
-#: ../src/bar.c:348
-msgid "_Show Scanner"
-msgstr "Feldolgozó _megjelenítése"
+#: ../data/menus.ui.h:40
+msgid "Ascending by year"
+msgstr "Év szerint növekvően"
 
-#: ../src/bar.c:349
-msgid "Show scanner"
-msgstr "Feldolgozó megjelenítése"
+#: ../data/menus.ui.h:41
+msgid "Descending by year"
+msgstr "Év szerint csökkenően"
 
-#: ../src/bar.c:355
-msgid "Tree Browser"
-msgstr "Fa böngésző"
+#: ../data/menus.ui.h:42
+msgid "Ascending by genre"
+msgstr "Műfaj szerint növekvően"
 
-#: ../src/bar.c:356
-msgid "View by directory tree"
-msgstr "Könyvtárfa szerinti nézet"
+#: ../data/menus.ui.h:43
+msgid "Descending by genre"
+msgstr "Műfaj szerint csökkenően"
 
-#: ../src/bar.c:358
-msgid "Artist and Album"
-msgstr "Előadó és album"
+#: ../data/menus.ui.h:44
+msgid "Ascending by comment"
+msgstr "Megjegyzés szerint növekvően"
 
-#: ../src/bar.c:359
-msgid "View by artist and album"
-msgstr "Előadó és album szerinti nézet"
+#: ../data/menus.ui.h:45
+msgid "Descending by comment"
+msgstr "Megjegyzés szerint csökkenően"
 
-# feldolgozó menü
-#: ../src/bar.c:364
-msgid "_Fill Tags…"
-msgstr "Címkék _kitöltése…"
+#: ../data/menus.ui.h:46
+msgid "Ascending by composer"
+msgstr "Zeneszerző szerint növekvően"
 
-#: ../src/bar.c:365
-msgid "Fill tags"
-msgstr "Címkék kitöltése"
+#: ../data/menus.ui.h:47
+msgid "Descending by composer"
+msgstr "Zeneszerző szerint csökkenően"
 
-#: ../src/bar.c:367
-msgid "_Rename Files and Directories…"
-msgstr "Fájlok és könyvtárak át_nevezése…"
+#: ../data/menus.ui.h:48
+msgid "Ascending by original artist"
+msgstr "Eredeti előadó szerint növekvően"
 
-#: ../src/bar.c:368
-msgid "Rename files and directories"
-msgstr "Fájlok és könyvtárak átnevezése"
+#: ../data/menus.ui.h:49
+msgid "Descending by original artist"
+msgstr "Eredeti előadó szerint csökkenően"
 
-#: ../src/bar.c:370
-msgid "_Process Fields…"
-msgstr "Mezök fel_dolgozása…"
+#: ../data/menus.ui.h:50
+msgid "Ascending by copyright"
+msgstr "Szerzői jog szerint növekvően"
 
-#: ../src/bar.c:370 ../src/scan_dialog.c:184
-msgid "Process Fields"
-msgstr "Mezök feldolgozása"
+#: ../data/menus.ui.h:51
+msgid "Descending by copyright"
+msgstr "Szerzői jog szerint csökkenően"
 
-#: ../src/bar.c:428
-#, c-format
-msgid "Could not merge UI, error was: %s\n"
-msgstr "Az UI egyesítése nem lehetséges, a hiba: %s\n"
+#: ../data/menus.ui.h:52
+msgid "Ascending by URL"
+msgstr "URL szerint növekvően"
 
-#: ../src/bar.c:535
-msgid "Ready to start"
-msgstr "Indításra kész"
+#: ../data/menus.ui.h:53
+msgid "Descending by URL"
+msgstr "URL szerint csökkenően"
 
-#: ../src/browser.c:376
-msgid "New default path for files selected"
-msgstr "Új alapértelmezett útvonal kiválasztva a fájlokhoz"
+#: ../data/menus.ui.h:54
+msgid "Ascending by encoder name"
+msgstr "Kódoló neve szerint növekvően"
 
-#: ../src/browser.c:678 ../src/easytag.c:4555
-msgid "Some files have been modified but not saved"
-msgstr "Néhány fájl módosult de nincs elmentve"
+#: ../data/menus.ui.h:55
+msgid "Descending by encoder name"
+msgstr "Kódoló neve szerint csökkenően"
 
-#: ../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?"
+# Fájl menü
+#: ../data/menus.ui.h:56
+msgid "Sort List by Property"
+msgstr "Lista rendezése tulajdonság szerint"
 
-#: ../src/browser.c:683
-msgid "Confirm Directory Change"
-msgstr "Könyvtárváltás megerősítése"
+#: ../data/menus.ui.h:57
+msgid "Ascending by filename"
+msgstr "Fájlnév szerint növekvően"
 
-#: ../src/browser.c:2152
-msgid "<All albums>"
-msgstr "<Minden album>"
+#: ../data/menus.ui.h:58
+msgid "Descending by filename"
+msgstr "Fájlnév szerint csökkenően"
 
-#: ../src/browser.c:2613
-#, 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."
+#: ../data/menus.ui.h:59
+msgid "Ascending by creation date"
+msgstr "Létrehozás időpontja szerint növekvően"
 
-#: ../src/browser.c:3107 ../src/browser.c:3185
-msgid "Tree"
-msgstr "Fa"
+#: ../data/menus.ui.h:60
+msgid "Descending by creation date"
+msgstr "Létrehozás időpontja szerint csökkenően"
 
-#: ../src/browser.c:3108 ../src/cddb.c:803 ../src/misc.c:1899
-msgid "Filename"
-msgstr "Fájlnév"
+#: ../data/menus.ui.h:61
+msgid "Ascending by file type"
+msgstr "Fájltípus szerint növekvően"
 
-#: ../src/browser.c:3108 ../src/cddb.c:804 ../src/misc.c:1900
-#: ../src/prefs.c:643
-msgid "Title"
-msgstr "Cím"
+#: ../data/menus.ui.h:62
+msgid "Descending by file type"
+msgstr "Fájltípus szerint csökkenően"
 
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Artist".
-#: ../src/browser.c:3109 ../src/browser.c:3116 ../src/cddb.c:483
-#: ../src/cddb.c:805 ../src/misc.c:1901 ../src/prefs.c:644
-msgid "Artist"
-msgstr "Előadó"
+#: ../data/menus.ui.h:63
+msgid "Ascending by file size"
+msgstr "Fájlméret szerint növekvően"
 
-#: ../src/browser.c:3109 ../src/misc.c:1902
-msgid "Album Artist"
-msgstr "Album előadója"
+#: ../data/menus.ui.h:64
+msgid "Descending by file size"
+msgstr "Fájlméret szerint csökkenően"
 
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Album".
-#: ../src/browser.c:3110 ../src/browser.c:3118 ../src/cddb.c:486
-#: ../src/cddb.c:806 ../src/misc.c:1903 ../src/prefs.c:645
-msgid "Album"
-msgstr "Album"
+#: ../data/menus.ui.h:65
+msgid "Ascending by duration"
+msgstr "Időtartam szerint növekvően"
 
-#: ../src/browser.c:3110 ../src/cddb.c:807 ../src/misc.c:1905
-msgid "Year"
-msgstr "Év"
+#: ../data/menus.ui.h:66
+msgid "Descending by duration"
+msgstr "Időtartam szerint csökkenően"
 
-#: ../src/browser.c:3110
-msgid "Disc"
-msgstr "Lemez"
+#: ../data/menus.ui.h:67
+#| msgid "Ascending by bitrate"
+msgid "Ascending by bit rate"
+msgstr "Bitsebesség szerint növekvően"
 
-#: ../src/browser.c:3111 ../src/misc.c:1906
-msgid "Track"
-msgstr "Szám"
+#: ../data/menus.ui.h:68
+#| msgid "Descending by bitrate"
+msgid "Descending by bit rate"
+msgstr "Bitsebesség szerint csökkenően"
 
-#: ../src/browser.c:3111 ../src/cddb.c:810 ../src/misc.c:1907
-#: ../src/prefs.c:646
-msgid "Genre"
-msgstr "Műfaj"
+#: ../data/menus.ui.h:69
+#, fuzzy
+#| msgid "Ascending by samplerate"
+msgid "Ascending by sample rate"
+msgstr "Minőség szerint növekvően"
 
-#: ../src/browser.c:3112 ../src/misc.c:1908 ../src/prefs.c:647
-msgid "Comment"
-msgstr "Megjegyzés"
+#: ../data/menus.ui.h:70
+#, fuzzy
+#| msgid "Descending by samplerate"
+msgid "Descending by sample rate"
+msgstr "Minőség szerint csökkenően"
 
-#: ../src/browser.c:3112 ../src/misc.c:1909 ../src/picture.c:884
-#: ../src/prefs.c:648
-msgid "Composer"
-msgstr "Zeneszerző"
+# böngésző menü
+#: ../data/menus.ui.h:71
+#| msgid "_Collapse Tree"
+msgid "Collapse Tree"
+msgstr "Fa összecsukása"
 
-#: ../src/browser.c:3113 ../src/misc.c:1910
-msgid "Original Artist"
-msgstr "Eredeti előadó"
+#: ../data/menus.ui.h:72
+#| msgid "_Reload Tree"
+msgid "Reload Tree"
+msgstr "Fa újratöltése"
 
-#: ../src/browser.c:3114 ../src/misc.c:1911
-msgid "Copyright"
-msgstr "Szerzői jog"
+# böngésző menü
+#: ../data/menus.ui.h:73
+msgid "Reload Directory"
+msgstr "Könyvtár újratöltése"
 
-#: ../src/browser.c:3114 ../src/misc.c:1912
-msgid "URL"
-msgstr "URL"
+#: ../data/menus.ui.h:74
+msgid "Show Hidden Directories"
+msgstr "Rejtett könyvtárak megjelenítése"
 
-#: ../src/browser.c:3115 ../src/misc.c:1913
-msgid "Encoded By"
-msgstr "Kódolta"
+# Menüsor
+#: ../data/menus.ui.h:75
+msgid "_Browser"
+msgstr "_Böngésző"
 
-#: ../src/browser.c:3116
-msgid "# Albums"
-msgstr "# Albumok"
+# Böngésző menü
+#: ../data/menus.ui.h:76
+msgid "Set _Current Path as Default"
+msgstr "_Jelenlegi útvonal alapértelmezetté tétele"
 
-#: ../src/browser.c:3117 ../src/browser.c:3118
-msgid "# Files"
-msgstr "# Fájlok"
+#: ../data/menus.ui.h:77
+msgid "Rename Directory…"
+msgstr "Könyvtár átnevezése…"
 
-#: ../src/browser.c:3143
-msgid "Enter a directory to browse."
-msgstr "Adja meg az átvizsgálandó könyvtárat."
+# böngésző menü
+#: ../data/menus.ui.h:78
+msgid "Browse Directory With…"
+msgstr "Könyvtár böngészése ezzel…"
 
-#: ../src/browser.c:3152
-msgid "Select a directory to browse."
-msgstr "Válassza ki az átvizsgálandó könyvtárat."
+# böngésző menü
+#: ../data/menus.ui.h:79
+msgid "Browse _Subdirectories"
+msgstr "_Alkönyvtárak böngészése"
 
-#.
-#. * The label for displaying number of files in path (without subdirs)
-#.
-#. Translators: No files, as in "0 files".
-#: ../src/browser.c:3159 ../src/easytag.c:3463
-msgid "No files"
-msgstr "Nincsenek fájlok"
+#: ../data/menus.ui.h:80
+msgid "_Miscellaneous"
+msgstr "_Egyebek"
 
-#: ../src/browser.c:3237
-msgid "Artist & Album"
-msgstr "Előadó és album"
+#: ../data/menus.ui.h:81
+msgid "CDD_B Search…"
+msgstr "CD-adat_bázis keresés…"
 
-#. Only directories changed
-#: ../src/browser.c:3601 ../src/easytag.c:2875
-msgid "Rename Directory"
-msgstr "Könyvtár átnevezése"
+# egyéb menü
+#: ../data/menus.ui.h:82
+msgid "Load Filenames From a Text File…"
+msgstr "Fájlnevek betöltése szövegfájlból…"
 
-#: ../src/browser.c:3623
-#, c-format
-msgid "Rename the directory '%s' to:"
-msgstr "A(z) „%s” könyvtár átnevezése erre:"
+#: ../data/menus.ui.h:83 ../data/toolbar.ui.h:29
+msgid "Generate Playlist…"
+msgstr "Lejátszólista előállítása…"
 
-#: ../src/browser.c:3642 ../src/misc.c:1168
-msgid "Use mask:"
-msgstr "Használandó maszk:"
+#: ../data/menus.ui.h:84
+msgid "_Go"
+msgstr "_Ugrás"
 
-# bubblehelp
-#: ../src/browser.c:3645
-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."
+# Böngésző menü
+#: ../data/menus.ui.h:85
+msgid "_Home Directory"
+msgstr "_Saját könyvtár"
 
-# bubblehelp
-#: ../src/browser.c:3663
-msgid ""
-"Select or type in a mask using codes (see Legend in Scanner Window) to "
-"rename the directory from tag fields."
-msgstr ""
-"Maszk kiválasztása vagy begépelése kódok használatával (lásd a "
-"jelmagyarázatot a feldolgozó ablakban) a könyvtár átnevezéséhez a "
-"címkemezőkből."
+# Ikon megjegyzés
+#: ../data/menus.ui.h:86
+msgid "Desktop Directory"
+msgstr "Asztal könyvtár"
 
-#. Preview label
-#: ../src/browser.c:3687
-msgid "Rename directory preview"
-msgstr "Könyvtár átnevezés előnézet"
+# ikon megjegyzés
+#: ../data/menus.ui.h:87
+msgid "Documents Directory"
+msgstr "Dokumentumok könyvtár"
 
-#: ../src/browser.c:3779
-msgid "You must type a directory name"
-msgstr "Meg kell adnia egy könyvtárnevet"
+# ikon megjegyzés
+#: ../data/menus.ui.h:88
+msgid "Downloads Directory"
+msgstr "Letöltések könyvtár"
 
-#: ../src/browser.c:3780 ../src/browser.c:3801
-msgid "Directory Name Error"
-msgstr "Könyvtárnév hiba"
+# ikon megjegyzés
+#: ../data/menus.ui.h:89
+msgid "Music Directory"
+msgstr "Zene könyvtár"
 
-#: ../src/browser.c:3798
-#, c-format
-msgid "Could not convert '%s' into filename encoding."
-msgstr "„%s” nem alakítható át fájlnév kódolássá."
+#: ../data/menus.ui.h:90
+msgid "_Parent Directory"
+msgstr "S_zülő könyvtár"
 
-#: ../src/browser.c:3800
-msgid "Please use another name"
-msgstr "Kérem használjon egy másik nevet"
+# Ikon megjegyzés
+#: ../data/menus.ui.h:91
+msgid "_Default Directory"
+msgstr "_Alapértelmezett könyvtár"
 
-#: ../src/browser.c:3870
-#, c-format
-msgid "The directory name '%s' already exists"
-msgstr "Már létezik „%s” nevű könyvtár"
+# Fájl menü
+#: ../data/menus.ui.h:92 ../data/toolbar.ui.h:1
+msgid "_First File"
+msgstr "_Első fájl"
 
-#: ../src/browser.c:3871 ../src/easytag.c:2958
-msgid "Rename File Error"
-msgstr "Fájl átnevezési hiba"
+# Fájl menü
+#: ../data/menus.ui.h:93
+#| msgid "_Previous File"
+msgid "Previous File"
+msgstr "Előző fájl"
 
-# böngésző menü
-#: ../src/browser.c:3909 ../src/browser.c:3938
-msgid "Rename Directory Error"
-msgstr "Könyvtár átnevezési hiba"
+# Fájl menü
+#: ../data/menus.ui.h:94 ../data/toolbar.ui.h:5
+msgid "_Next File"
+msgstr "_Következő fájl"
 
-#: ../src/browser.c:3976
-msgid "Directory renamed"
-msgstr "Könyvtár átnevezve"
+# Fájl menü
+#: ../data/menus.ui.h:95 ../data/toolbar.ui.h:7
+msgid "_Last File"
+msgstr "_Utolsó fájl"
 
-# böngésző menü
-#: ../src/browser.c:4012
-msgid "Browse Directory With"
-msgstr "Könyvtár böngészése ezzel"
+# Böngésző menü
+#: ../data/menus.ui.h:96
+#| msgid "_Home Directory"
+msgid "Home Directory"
+msgstr "Saját könyvtár"
 
-#: ../src/browser.c:4028 ../src/browser.c:4154
-msgid "Program to run:"
-msgstr "Futtatandó program:"
+# Ikon megjegyzés
+#: ../data/menus.ui.h:97
+#| msgid "_Default Directory"
+msgid "Default Directory"
+msgstr "Alapértelmezett könyvtár"
 
-# bubble help?
-#: ../src/browser.c:4040
-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."
+# Böngésző menü
+#: ../data/menus.ui.h:98
+#| msgid "Set _Current Path as Default"
+msgid "Set Current Path as Default"
+msgstr "Jelenlegi útvonal alapértelmezetté tétele"
 
-#: ../src/browser.c:4134
-msgid "Open Files With"
-msgstr "Fájlok megnyitás ezzel"
+# böngésző menü
+#: ../data/menus.ui.h:100
+#| msgid "Browse _Subdirectories"
+msgid "Browse Subdirectories"
+msgstr "Alkönyvtárak böngészése"
+
+#: ../data/menus.ui.h:101
+msgid "Invert Selection"
+msgstr "Kijelölés megfordítása"
+
+#: ../data/menus.ui.h:102
+msgid "CDDB Search Files…"
+msgstr "Fájl keresése CD-adatbázisban…"
+
+#: ../data/menus.ui.h:103
+#| msgid "_Find…"
+msgid "Find…"
+msgstr "Keresés…"
+
+#: ../data/menus.ui.h:104
+#| msgid "Clear log"
+msgid "Clear Log"
+msgstr "Napló törlése"
+
+#: ../data/playlist_dialog.ui.h:3
+msgid "Use directory name"
+msgstr "Könyvtár nevének használata"
+
+#: ../data/playlist_dialog.ui.h:4
+#| msgid "Log Options"
+msgid "Options"
+msgstr "Beállítások"
 
-#: ../src/browser.c:4166
+#: ../data/playlist_dialog.ui.h:5
+msgid "Include only the selected files"
+msgstr "Csak a kijelölt fájlokat tartalmazza"
+
+#: ../data/playlist_dialog.ui.h:6 ../data/org.gnome.EasyTAG.gschema.xml.h:162
 msgid ""
-"Enter the program to run. It will receive the current file as parameter."
+"Whether to use only the selected files or all files when creating playlists"
 msgstr ""
-"Adja meg a futtatandó programot. Az aktuális fájlt fogja megkapni "
-"paraméterként."
 
-#: ../src/cddb.c:313
-msgid "Artist / Album"
-msgstr "Előadó / Album"
+#: ../data/playlist_dialog.ui.h:7
+msgid "Use full path for files in playlist"
+msgstr "Teljes elérési út használata a lejátszólistában"
 
-#: ../src/cddb.c:313
-msgid "Category"
-msgstr "Kategória"
+#: ../data/playlist_dialog.ui.h:8
+msgid "Use relative path for files in playlist"
+msgstr "Relatív elérési út használata a lejátszólistában"
 
-#. 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 "Szám neve"
+#: ../data/playlist_dialog.ui.h:9
+msgid "Create playlist in the parent directory"
+msgstr "Lejátszólista létrehozása a szülő könyvtárban"
 
-#: ../src/cddb.c:314
-msgid "Duration"
-msgstr "Időtartam"
+#: ../data/playlist_dialog.ui.h:10 ../data/org.gnome.EasyTAG.gschema.xml.h:166
+#, fuzzy
+#| msgid "Create playlist in the parent directory"
+msgid "Whether to create the playlist in the parent directory"
+msgstr "Lejátszólista létrehozása a szülő könyvtárban"
 
-# ikon megjegyzés
-#: ../src/cddb.c:326
-msgid "CDDB Search"
-msgstr "CDDB keresés"
+#: ../data/playlist_dialog.ui.h:11
+msgid "Use DOS directory separator"
+msgstr "DOS könyvtárelválasztó használata"
 
-#.
-#. * 1 - Page for automatic search (generate the CDDBId from files)
-#.
-#: ../src/cddb.c:346
-msgid "Automatic Search"
-msgstr "Automatikus keresés"
+#: ../data/playlist_dialog.ui.h:12 ../data/org.gnome.EasyTAG.gschema.xml.h:168
+msgid ""
+"Whether to use backslash as directory separator when generating playlists"
+msgstr ""
+
+#: ../data/playlist_dialog.ui.h:13
+#| msgid "_Contents"
+msgid "Content"
+msgstr "Tartalom"
+
+#: ../data/playlist_dialog.ui.h:14
+msgid "Write only list of files"
+msgstr "Csak fájlok listájának írása"
+
+#: ../data/playlist_dialog.ui.h:15
+#| msgid "Write info using filename"
+msgid "Write information using filename"
+msgstr "Információk írása a fájlnév használatával"
+
+#: ../data/playlist_dialog.ui.h:16
+#| msgid "Write info using:"
+msgid "Write information using:"
+msgstr "Információk írása ezek használatával:"
+
+#: ../data/preferences_dialog.ui.h:1
+msgid "Browser"
+msgstr "Böngésző"
+
+# Ikon megjegyzés
+#: ../data/preferences_dialog.ui.h:2
+#| msgid "_Default Directory"
+msgid "Default Directory:"
+msgstr "Alapértelmezett könyvtár:"
+
+#: ../data/preferences_dialog.ui.h:3 ../data/org.gnome.EasyTAG.gschema.xml.h:4
+#, fuzzy
+#| msgid "New default path for files selected"
+msgid "The default path to search for music files"
+msgstr "Új alapértelmezett útvonal kiválasztva a fájlokhoz"
+
+#: ../data/preferences_dialog.ui.h:4
+msgid ""
+"Load on startup the default directory or the directory passed as argument"
+msgstr ""
+"Induláskor töltődjön be az alapértelmezett könyvtár vagy a könyvtár kerüljön "
+"átadásra paraméterként"
 
-#: ../src/cddb.c:356
-msgid "Request CDDB"
-msgstr "CDDB kérése"
+#: ../data/preferences_dialog.ui.h:5 ../data/org.gnome.EasyTAG.gschema.xml.h:2
+msgid ""
+"Whether to load the default path (or the path passed as an argument) on "
+"application startup"
+msgstr ""
+
+# böngésző menü
+#: ../data/preferences_dialog.ui.h:6 ../data/org.gnome.EasyTAG.gschema.xml.h:5
+msgid "Browse subdirectories"
+msgstr "Alkönyvtárak böngészése"
 
 # bubble help
-#: ../src/cddb.c:366
+#: ../data/preferences_dialog.ui.h:7 ../data/org.gnome.EasyTAG.gschema.xml.h:6
+#, fuzzy
+#| msgid ""
+#| "Search subdirectories for files when reading a directory into the tree."
 msgid ""
-"Request automatically the CDDB using the selected files (the order is "
-"important) to generate the CddbID"
+"Whether to search subdirectories for audio files when reading a directory in "
+"the browser"
 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"
+"Fájlok keresése az alkönyvtárakban, amikor könyvtár beolvasásra kerül a fába."
 
-#: ../src/cddb.c:377 ../src/cddb.c:457
-msgid "Stop the search"
-msgstr "A keresés leállítása"
+#: ../data/preferences_dialog.ui.h:8 ../data/org.gnome.EasyTAG.gschema.xml.h:9
+#, fuzzy
+#| msgid "Show subdirectories when selecting a directory"
+msgid "Expand the subdirectories of the selected directory"
+msgstr "Alkönyvtárak megjelenítése könyvtár kijelölésekor"
+
+#: ../data/preferences_dialog.ui.h:9
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:10
+msgid ""
+"Whether to expand the subdirectories of a node in the directory browser when "
+"selecting it"
+msgstr ""
 
-#. Check box to run the scanner
-#: ../src/cddb.c:384
-msgid "Use local CDDB"
-msgstr "Helyi CD-adatbázis használata"
+#: ../data/preferences_dialog.ui.h:10
+msgid "Search hidden directories"
+msgstr "Rejtett könyvtárak keresése"
 
 # bubble help
-#: ../src/cddb.c:387 ../src/cddb.c:850
+#: ../data/preferences_dialog.ui.h:11
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:8
+#, fuzzy
+#| msgid ""
+#| "Search subdirectories for files when reading a directory into the tree."
 msgid ""
-"When activating this option, after loading the fields, the current selected "
-"scanner will be ran (the scanner window must be opened)."
+"Whether to show hidden directories when showing a directory in the browser"
 msgstr ""
-"Ha aktiválja ezt a lehetőséget, akkor a mezők betöltése után a jelenleg "
-"kiválasztott feldolgozó lesz futtatva (a feldolgozóablaknak nyitva kell "
-"lennie)."
+"Fájlok keresése az alkönyvtárakban, amikor könyvtár beolvasásra kerül a fába."
 
-#.
-#. * 2 - Page for manual search
-#.
-#: ../src/cddb.c:404
-msgid "Manual Search"
-msgstr "Kézi keresés"
+#: ../data/preferences_dialog.ui.h:12
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:53
+msgid "Sort files case-sensitively"
+msgstr ""
 
-#: ../src/cddb.c:416
-msgid "Words:"
-msgstr "Szavak:"
+#: ../data/preferences_dialog.ui.h:13
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:54
+msgid "Whether file sorting is case-sensitive"
+msgstr ""
 
-#: ../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)"
+#: ../data/preferences_dialog.ui.h:15
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:59
+#| msgid "Show help"
+msgid "Show the log"
+msgstr "A napló megjelenítése"
 
-#.
-#. * Search options
-#.
-#: ../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: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:492 ../src/picture.c:862 ../src/prefs.c:807
-msgid "Other"
-msgstr "Egyéb"
+#: ../data/preferences_dialog.ui.h:16
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:60
+#, fuzzy
+#| msgid "Center of the main window"
+msgid "Whether to show the log in the main window"
+msgstr "A főablak közepén"
+
+#: ../data/preferences_dialog.ui.h:17
+#| msgid "Max number of lines:"
+msgid "Maximum number of lines:"
+msgstr "Sorok legnagyobb száma:"
+
+#: ../data/preferences_dialog.ui.h:18
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:58
+msgid "The maximum number of lines to keep in the log"
+msgstr "A naplóban megtartandó sorok legnagyobb száma"
+
+#: ../data/preferences_dialog.ui.h:19
+#| msgid "General:\n"
+msgid "General"
+msgstr "Általános"
+
+#: ../data/preferences_dialog.ui.h:20
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:49
+msgid "Show audio file header summary"
+msgstr ""
 
-#. 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 "Minden kategóriában"
+#: ../data/preferences_dialog.ui.h:21
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:50
+msgid ""
+"Whether to show header information, such as bit rate and duration, for audio "
+"files"
+msgstr ""
 
-#. 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"
+#: ../data/preferences_dialog.ui.h:22
+msgid "Display changed files in list using:"
+msgstr "Módosított fájlok megjelenítése a listában:"
 
-#. 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 "Klasszikus"
+#: ../data/preferences_dialog.ui.h:23
+msgid "Red color"
+msgstr "Piros színnel"
 
-#. 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"
+#: ../data/preferences_dialog.ui.h:24
+msgid "Bold style"
+msgstr "Félkövér stílussal"
 
-#. 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"
+#: ../data/preferences_dialog.ui.h:25
+#| msgid "User Interface"
+msgid "Interface"
+msgstr "Felület"
 
-#. 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"
+# Menüsor
+#: ../data/preferences_dialog.ui.h:26
+msgid "File Settings"
+msgstr "Fájl beállítások"
 
-#. 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 "Egyéb"
+#: ../data/preferences_dialog.ui.h:27
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:45
+#, fuzzy
+#| msgid "Preserve modification time of the file"
+msgid "Preserve modification time when writing files"
+msgstr "A fájl módosítási idejének megőrzése"
 
-#. 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 "Új kor"
+#: ../data/preferences_dialog.ui.h:28
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:46
+#, fuzzy
+#| msgid "Preserve modification time of the file"
+msgid "Whether to preserve the existing modification time when editing files"
+msgstr "A fájl módosítási idejének megőrzése"
 
-#. 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"
+#: ../data/preferences_dialog.ui.h:29
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:47
+#, fuzzy
+#| msgid "Preserve modification time of the file"
+msgid "Update parent directory modification time when writing files"
+msgstr "A fájl módosítási idejének megőrzése"
 
-#. 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"
+# bubble help
+#: ../data/preferences_dialog.ui.h:30
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:48
+#, fuzzy
+#| msgid ""
+#| "Preserve the modification time (in file properties) when saving the file."
+msgid ""
+"Whether to update the modification time on the parent directory when editing "
+"files"
+msgstr ""
+"A módosítás idejének megőrzése (a fájltulajdonságokban) a fájl mentésekor."
 
-#. 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 "Filmzene"
+#: ../data/preferences_dialog.ui.h:31
+#| msgid "Filename"
+msgid "Filenames"
+msgstr "Fájlnevek"
 
-#: ../src/cddb.c:587
-msgid "included: funk, soul, rap, pop, industrial, metal, etc."
-msgstr "beleértve: funk, soul, rap, pop, industrial, metal, stb."
+#: ../data/preferences_dialog.ui.h:32
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:193
+#| msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
+msgid "Replace illegal characters when renaming"
+msgstr "Szabálytalan karakterek cseréje átnevezéskor"
 
-#: ../src/cddb.c:588
-msgid "movies, shows"
-msgstr "filmek, tv műsorok"
+#: ../data/preferences_dialog.ui.h:33
+msgid ""
+"Convert characters which cannot be represented in filenames on the FAT32/16 "
+"and Joliet filesystems (‘\\’, ‘:’, ‘;’, ‘*’, ‘?’, ‘\"’, ‘<’, ‘>’, ‘|’)"
+msgstr ""
 
-#: ../src/cddb.c:589
-msgid "others that do not fit in the above categories"
-msgstr "egyéb fel nem sorolt kategóriák"
+#: ../data/preferences_dialog.ui.h:34
+msgid "Convert filename extension to:"
+msgstr "Fájlnév kiterjesztés átalakítása:"
 
-#. Button to display/hide the categories
-#: ../src/cddb.c:592
-msgid "Categories"
-msgstr "Kategóriák"
+#: ../data/preferences_dialog.ui.h:35
+msgid "Lower Case"
+msgstr "Kisbetűsre"
 
-#.
-#. * Results command
-#.
-#: ../src/cddb.c:600
-msgid "Results:"
-msgstr "Eredmények:"
+# bubble help
+#: ../data/preferences_dialog.ui.h:36
+#| msgid "For example, the extension will be converted to '.mp3'"
+msgid "For example, the extension will be converted to ‘.mp3’"
+msgstr "Például a kiterjesztés „.mp3”-ra lesz átalakítva"
 
-#: ../src/cddb.c:606 ../src/misc.c:1947
-msgid "Search:"
-msgstr "Keresés:"
+#: ../data/preferences_dialog.ui.h:37
+msgid "Upper Case"
+msgstr "Nagybetűsre"
 
 # bubble help
-#: ../src/cddb.c:620
-msgid "Enter the words to search in the list below"
-msgstr "Írja be a keresendő szavakat a lenti listába"
+#: ../data/preferences_dialog.ui.h:38
+#| msgid "For example, the extension will be converted to '.MP3'"
+msgid "For example, the extension will be converted to ‘.MP3’"
+msgstr "Például a kiterjesztés „.MP3”-ra lesz átalakítva"
+
+#: ../data/preferences_dialog.ui.h:39
+msgid "No Change"
+msgstr "Nincs változtatás"
 
-#: ../src/cddb.c:632
-msgid "Search Next"
-msgstr "Következő keresése"
+# bubble help
+#: ../data/preferences_dialog.ui.h:40
+#| msgid "The extension will not be converted"
+msgid "The extension will not be modified"
+msgstr "A kiterjesztés nem változik"
+
+#: ../data/preferences_dialog.ui.h:41
+#| msgid "Filename translation"
+msgid "Filename Encoding"
+msgstr "Fájlnév kódolás"
 
-#: ../src/cddb.c:638
-msgid "Search Previous"
-msgstr "Előző keresése"
+#: ../data/preferences_dialog.ui.h:42
+msgid "Try another character encoding"
+msgstr "Próbáljon másik karakter kódolást"
 
-#: ../src/cddb.c:649
-msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
+#: ../data/preferences_dialog.ui.h:43
+msgid ""
+"Try to use the encoding associated with your locale and if this fails, try "
+"the ISO-8859-1 character encoding"
 msgstr ""
-"Csak a piros sorokat (vagy mindegyik sort) jelenítse meg az „Előadó / Album” "
-"listában"
 
-#: ../src/cddb.c:655
-msgid "Unselect all lines"
-msgstr "Minden sor kijelölésének megszüntetése"
+#: ../data/preferences_dialog.ui.h:44
+#, fuzzy
+#| msgid "Try another character encoding"
+msgid "Transliterate characters into the system character encoding"
+msgstr "Próbáljon másik karakter kódolást"
 
-#: ../src/cddb.c:661
-msgid "Invert lines selection"
-msgstr "Sorok kijelölésének megfordítása"
+#: ../data/preferences_dialog.ui.h:45
+msgid ""
+"Replace unsupported characters with a similar character from the target "
+"character encoding"
+msgstr ""
 
-#: ../src/cddb.c:670
-msgid "Select all lines"
-msgstr "Minden sor kijelölése"
+#: ../data/preferences_dialog.ui.h:46
+#, fuzzy
+#| msgid ""
+#| "Force using the system character encoding and silently discard some "
+#| "characters"
+msgid ""
+"Use the system character encoding and silently discard unsupported characters"
+msgstr ""
+"A rendszer karakterkódolásának erőltetett használata és csendben néhány "
+"karakter elvetése"
 
-# bubble help
-#: ../src/cddb.c:788
+#: ../data/preferences_dialog.ui.h:47
+#, fuzzy
+#| msgid ""
+#| "With this option, when a character cannot be represented in the target "
+#| "character set, it will be silently discarded."
 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."
+"Discard characters which cannot be represented in the target character "
+"encoding"
 msgstr ""
-"Válassza ki az „Alkalmazni” kívánt sorokat a fájlok listájából. Az összes "
-"sor feldolgozásra kerül, ha nincs sor kiválasztva.\n"
-"Át is rendezheti a sorokat ebben a listában, mielőtt az „Alkalmaz” gombot "
-"használná."
+"Ezzel a beállítással ha nem ábrázolható egy karakter a cél "
+"karakterkészletben, akkor az csendben elvetésre kerül."
 
-#.
-#. * Apply results to fields...
-#.
-#: ../src/cddb.c:795
-msgid "Set Into:"
-msgstr "Beállítás ebbe:"
+#: ../data/preferences_dialog.ui.h:48
+#| msgid "File"
+msgid "Files"
+msgstr "Fájlok"
 
-#: ../src/cddb.c:801
-msgid "All"
-msgstr "MInden mező"
+#: ../data/preferences_dialog.ui.h:49
+msgid "Automatically complete date field"
+msgstr ""
 
-#: ../src/cddb.c:808
-msgid "Track #"
-msgstr "Szám #"
+#: ../data/preferences_dialog.ui.h:50
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:94
+msgid "Whether to automatically complete the date tag"
+msgstr ""
 
-#: ../src/cddb.c:809
-msgid "# Tracks"
-msgstr "# Számok"
+#: ../data/preferences_dialog.ui.h:51
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:103
+msgid "Preserve the tag field focus"
+msgstr ""
 
-#. Check box to run the scanner
-#: ../src/cddb.c:847 ../src/misc.c:2988
-msgid "Run the current scanner for each file"
-msgstr "Az jelenlegi feldolgozó futtatása minden fájlra"
+#: ../data/preferences_dialog.ui.h:52
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:104
+msgid "Whether to preserve focus on the current tag field when switching file"
+msgstr ""
 
-#. Check box to use DLM (also used in the preferences window)
-#: ../src/cddb.c:854
-msgid "Match lines with the Levenshtein algorithm"
-msgstr "Sorok megfeleltetése a Levenshtein algoritmussal"
+#: ../data/preferences_dialog.ui.h:53
+msgid "Pad the number of digits in the disc field to:"
+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: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 "
-"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 ""
-"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."
-
-#: ../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."
+#: ../data/preferences_dialog.ui.h:54
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:96
+#, fuzzy
+#| msgid "Whether to pad the disc field with leading zeroes"
+msgid "Whether the disc number tag field should be padded with leading zeroes"
+msgstr "Legyen-e kitöltve a lemez mező vezető nullákkal"
 
-#: ../src/cddb.c:881
-msgid "Ready to search"
-msgstr "Keresésre kész"
+#: ../data/preferences_dialog.ui.h:55
+msgid "Pad the number of digits in the track field to:"
+msgstr ""
 
-#: ../src/cddb.c:1352
-#, c-format
+#: ../data/preferences_dialog.ui.h:56
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:100
+#, fuzzy
+#| msgid "Whether to pad the disc field with leading zeroes"
+msgid "Whether the track number tag field should be padded with leading zeroes"
+msgstr "Legyen-e kitöltve a lemez mező vezető nullákkal"
+
+#: ../data/preferences_dialog.ui.h:57
+#| msgid "Tag Splitting"
+msgid "Splitting"
+msgstr "Felosztás"
+
+#: ../data/preferences_dialog.ui.h:58
 msgid ""
-"Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
+"For Vorbis tags, selected fields will be split at dashes and saved as "
+"separate tags"
 msgstr ""
-"Album: „%s”, előadó: „%s”, hossz: „%s”, év: „%s”, műfaj: „%s”, azonosító: "
-"„%s”"
+"A Vorbis címkéknél a kiválasztott mezők felosztásra kerülnek a kötőjeleknél "
+"és különálló címkékként lesznek elmentve"
 
-#: ../src/cddb.c:1588
-#, c-format
-msgid "Resolving host '%s'…"
-msgstr "A(z) „%s” név feloldása…"
+#: ../data/preferences_dialog.ui.h:60
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:204
+msgid "Whether to split title fields at a “ - ” separator in Ogg comments"
+msgstr ""
 
-#: ../src/cddb.c:1629
-#, c-format
-msgid "Cannot create a new socket (%s)"
-msgstr "Nem hozható létre új foglalat (%s)"
+#: ../data/preferences_dialog.ui.h:62
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:206
+msgid "Whether to split artist fields at a “ - ” separator in Ogg comments"
+msgstr ""
 
-#: ../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"
+#: ../data/preferences_dialog.ui.h:64
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:208
+msgid "Whether to split album fields at a “ - ” separator in Ogg comments"
+msgstr ""
 
-#. Open connection to the server.
-#: ../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…"
+#: ../data/preferences_dialog.ui.h:66
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:210
+msgid "Whether to split genre fields at a “ - ” separator in Ogg comments"
+msgstr ""
 
-#: ../src/cddb.c:1660
-#, c-format
-msgid "Cannot connect to host '%s' (%s)"
-msgstr "Nem lehet kapcsolódni a(z) „%s” géphez (%s)"
+#: ../data/preferences_dialog.ui.h:68
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:212
+msgid "Whether to split comment fields at a “ - ” separator in Ogg comments"
+msgstr ""
 
-#: ../src/cddb.c:1684
-#, c-format
-msgid "Cannot resolve host '%s' (%s)"
-msgstr "Nem oldható fel a(z) „%s” gép (%s)"
+#: ../data/preferences_dialog.ui.h:70
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:214
+msgid "Whether to split composer fields at a “ - ” separator in Ogg comments"
+msgstr ""
 
-#: ../src/cddb.c:1697
-#, c-format
-msgid "Connected to host '%s'"
-msgstr "Kapcsolódva a(z) „%s” géphez"
+#: ../data/preferences_dialog.ui.h:71
+msgid "Original artist"
+msgstr "Eredeti előadó"
 
-#: ../src/cddb.c:1778
-#, c-format
-msgid "Error while writing CDDB results to file '%s'"
-msgstr "Hiba a CD-adatbázis eredményeinek fájlba írása közben: „%s”"
+#: ../data/preferences_dialog.ui.h:72
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:216
+msgid ""
+"Whether to split original artist fields at a “ - ” separator in Ogg comments"
+msgstr ""
 
-#: ../src/cddb.c:1789
-#, c-format
-msgid "Receiving data (%s)…"
-msgstr "Adatok fogadása (%s)…"
+#: ../data/preferences_dialog.ui.h:73
+msgid "Tags"
+msgstr "Címkék"
 
-#: ../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:1808
-#, c-format
-msgid "Cannot create file '%s' (%s)"
-msgstr "Nem hozható létre a(z) „%s” fájl (%s)"
+#: ../data/preferences_dialog.ui.h:74
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:63
+#, fuzzy
+#| msgid "Strip tags if all fields are set to blank"
+msgid "Strip ID3 tags if all ID3 tags are empty"
+msgstr "Címkék törlése, ha minden mező üresre van állítva"
 
-#: ../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)"
+#: ../data/preferences_dialog.ui.h:75
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:64
+msgid ""
+"Whether to remove the ID3 tag from the audio file if all the individual tag "
+"fields are empty"
+msgstr ""
 
-#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
-#. Send the request
-#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
-#. Send the request
-#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
-#. Send the request
-#: ../src/cddb.c:2314 ../src/cddb.c:2643 ../src/cddb.c:3516
-msgid "Sending request…"
-msgstr "Kérés küldése…"
+#: ../data/preferences_dialog.ui.h:76
+#, fuzzy
+#| msgid "Character Set for reading ID3 tags"
+msgid "Non-standard encoding for reading ID3 tags:"
+msgstr "Karakterkészlet az ID3 címkék olvasásához"
 
-#: ../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)"
+#: ../data/preferences_dialog.ui.h:77
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:62
+msgid "Whether to use a non-standard character encoding when reading ID3 tags"
+msgstr ""
 
-#.
-#. * Read the answer
-#.
-#. Read the answer
-#: ../src/cddb.c:2344 ../src/cddb.c:3230 ../src/cddb.c:3529
-msgid "Receiving data…"
-msgstr "Adatok fogadása…"
+#: ../data/preferences_dialog.ui.h:78
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:72
+#, fuzzy
+#| msgid "Character Set for reading ID3 tags"
+msgid "Choose the character set to be used when reading ID3v1 and ID3v2 tags"
+msgstr "Karakterkészlet az ID3 címkék olvasásához"
 
-#: ../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"
+#: ../data/preferences_dialog.ui.h:79
+#| msgid "ID3v2 tags"
+msgid "ID3v2"
+msgstr "ID3v2"
 
-#: ../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"
+#: ../data/preferences_dialog.ui.h:80
+msgid "Write ID3v2 tag"
+msgstr "ID3v2 címke írása"
 
-#: ../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"
+#: ../data/preferences_dialog.ui.h:81
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:74
+msgid "Whether to write ID3v2 tags when writing ID3 tags into audio files"
+msgstr ""
 
-#: ../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ó"
+#: ../data/preferences_dialog.ui.h:82
+msgid "Version:"
+msgstr "Verzió:"
 
-#: ../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)…"
+#: ../data/preferences_dialog.ui.h:83
+#| msgid ""
+#| "Select the ID3v2 tag version to write:\n"
+#| " - ID3v2.3 is written using id3lib,\n"
+#| " - ID3v2.4 is written using libid3tag (recommended)."
+msgid ""
+"Select the ID3v2 tag version to write:\n"
+" • ID3v2.3 is written using id3lib,\n"
+" • ID3v2.4 is written using libid3tag (recommended)"
+msgstr ""
+"Az ID3v2 címkeverzió kiválasztása íráshoz:\n"
+" • ID3v2.3 címke id3lib használatával,\n"
+" • ID3v2.4 címke libid3tag használatával (ajánlott)"
 
-#: ../src/cddb.c:2666
-#, c-format
-msgid "Receiving data of page %d…"
-msgstr "A(z) %d. oldal adatainak fogadása…"
+#: ../data/preferences_dialog.ui.h:86
+#| msgid "Try another character encoding"
+msgid "Character encoding:"
+msgstr "Karakterkódolás:"
 
-#: ../src/cddb.c:2830
-#, c-format
-msgid "More results to load…"
-msgstr "További betöltendő eredmények…"
+# src/trans.h:267
+#: ../data/preferences_dialog.ui.h:87
+#| msgid "Unicode "
+msgid "Unicode"
+msgstr "Unicode"
 
-#: ../src/cddb.c:2959
-#, c-format
-msgid "No file selected"
-msgstr "Nincs fájl kiválasztva"
+#: ../data/preferences_dialog.ui.h:88
+msgid ""
+"Choose the Unicode character encoding to be used when writing ID3v2 tags"
+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: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"
+#: ../data/preferences_dialog.ui.h:90
+msgid ""
+"Override the standard Unicode character encoding to be used when writing "
+"ID3v2 tags"
+msgstr ""
 
-#: ../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"
+#: ../data/preferences_dialog.ui.h:91
+msgid "When encoding conversion fails:"
+msgstr ""
 
-#: ../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"
+#: ../data/preferences_dialog.ui.h:92
+msgid "Report error"
+msgstr "Hiba jelentése"
 
-#. 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 "Írja be azt a tulajdonságok ablakba, mielőtt ezt a keresést használja."
+#: ../data/preferences_dialog.ui.h:93
+#, fuzzy
+#| msgid ""
+#| "With this option, when a character cannot be represented in the target "
+#| "character set, it will be silently discarded."
+msgid ""
+"Display an error message when a character cannot be represented in the "
+"target character encoding and keep the original character"
+msgstr ""
+"Ezzel a beállítással ha nem ábrázolható egy karakter a cél "
+"karakterkészletben, akkor az csendben elvetésre kerül."
 
-#: ../src/cddb.c:3061
-msgid "Local CD search"
-msgstr "Helyi CD keresés"
+#: ../data/preferences_dialog.ui.h:94
+msgid "Transliterate"
+msgstr ""
 
-#. 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 "Kérés küldése (CddbId: %s, #számok: %d, Lemez hossz: %d)…"
+#: ../data/preferences_dialog.ui.h:95
+#| msgid "Disc"
+msgid "Discard"
+msgstr "Eldobás"
 
-#: ../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"
+#: ../data/preferences_dialog.ui.h:96
+msgid "Automatically convert old ID3v2 tag versions"
+msgstr "A régi ID3v2 címkeverziók automatikus átalakítása"
 
-#: ../src/cddb.c:3460
-#, c-format
-msgid "Can't load file: '%s' (%s)."
-msgstr "Nem tölthető be a fájl: „%s” (%s)."
+#: ../data/preferences_dialog.ui.h:97
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:78
+msgid ""
+"Whether to convert ID3 tags written against old version of the "
+"specification, such as ID3v2.2, to newer ones, such as ID3v2.3 or ID3v2.4"
+msgstr ""
 
-#. Load the track list of the album
-#: ../src/cddb.c:3759
-msgid "Loading album track list…"
-msgstr "Az album számlistájának betöltése…"
+#: ../data/preferences_dialog.ui.h:98
+#| msgid "Use CRC32"
+msgid "Use CRC-32"
+msgstr "CRC-32 használata"
 
-#: ../src/cddb.c:3958
-msgid "The number of CDDB results does not match the number of selected files"
+#: ../data/preferences_dialog.ui.h:99
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:82
+msgid "Whether to embed a CRC-32 checksum of the audio file data in ID3v2 tags"
 msgstr ""
-"A CD-adatbázis eredményeinek száma nem egyezik a kijelölt fájlok számával"
 
-#: ../src/cddb.c:3962
-msgid "Write Tag from CDDB"
-msgstr "Címke írása a CD-adatbázisból"
+#: ../data/preferences_dialog.ui.h:100
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:79
+#| msgid "Set Compression in the ID3v2 tags"
+msgid "Compress data in ID3v2 tags"
+msgstr "Adatok tömörítése az ID3v2 címkékben"
 
-#: ../src/charset.c:47
-msgid "Arabic (IBM-864)"
-msgstr "Arab (IBM-864)"
+#: ../data/preferences_dialog.ui.h:101
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:80
+#, fuzzy
+#| msgid "Set Compression in the ID3v2 tags"
+msgid "Whether to compress data in ID3v2 tags"
+msgstr "Tömörítés beállítása az ID3v2 címkékben"
 
-# src/trans.h:230
-#: ../src/charset.c:48
-msgid "Arabic (ISO-8859-6)"
-msgstr "Arab (ISO-8859-6)"
+#: ../data/preferences_dialog.ui.h:102
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:83
+msgid "Use text-only genre in ID3v2 tags"
+msgstr ""
 
-# src/trans.h:231
-#: ../src/charset.c:49
-msgid "Arabic (Windows-1256)"
-msgstr "Arab (Windows-1256)"
+#: ../data/preferences_dialog.ui.h:103
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:84
+msgid ""
+"Whether to use only a string, and not the integer-base ID3v1 genre field, "
+"when writing a genre field to ID3v2 tags"
+msgstr ""
 
-# src/trans.h:229
-#: ../src/charset.c:50
-msgid "Baltic (ISO-8859-13)"
-msgstr "Balti (ISO-8859-13)"
+#: ../data/preferences_dialog.ui.h:104
+#| msgid "ID3v1 tags"
+msgid "ID3v1"
+msgstr "ID3v1"
 
-# src/trans.h:230
-#: ../src/charset.c:51
-msgid "Baltic (ISO-8859-4)"
-msgstr "Balti (ISO-8859-4)"
+#: ../data/preferences_dialog.ui.h:105
+#| msgid "Write ID3v1.x tag"
+msgid "Write ID3v1 tag"
+msgstr "ID3v1 címke írása"
 
-# src/trans.h:231
-#: ../src/charset.c:52
-msgid "Baltic (Windows-1257)"
-msgstr "Balti (Windows-1257)"
+#: ../data/preferences_dialog.ui.h:106
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:66
+msgid "Whether to write ID3v1 tags when writing ID3 tags into audio files"
+msgstr ""
 
-# src/trans.h:232
-#: ../src/charset.c:53
-msgid "Celtic (ISO-8859-14)"
-msgstr "Kelta (ISO-8859-14)"
+#: ../data/preferences_dialog.ui.h:107
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "Choose the character set to be used when writing ID3v1 tag"
+msgstr "Karakterkészlet az ID3 címkék írásához"
 
-# src/trans.h:233
-#: ../src/charset.c:54
-msgid "Central European (IBM-852)"
-msgstr "Közép-európai (IBM-852)"
+#: ../data/preferences_dialog.ui.h:108
+#| msgid "ID3 Tag"
+msgid "ID3 Tags"
+msgstr "ID3 címkék"
 
-# src/trans.h:234
-#: ../src/charset.c:55
-msgid "Central European (ISO-8859-2)"
-msgstr "Közép-európai (ISO-8859-2)"
+#: ../data/preferences_dialog.ui.h:109
+#| msgid "Fill Tag Scanner - Character Conversion"
+msgid "Character Conversion"
+msgstr "Karakterátalakítás"
 
-# src/trans.h:236
-#: ../src/charset.c:56
-msgid "Central European (Windows-1250)"
-msgstr "Közép-európai (Windows-1250)"
+#: ../data/preferences_dialog.ui.h:110
+#, fuzzy
+#| msgid "Fill Tag"
+msgid "Fill Tag Scanner"
+msgstr "Címke kitöltése"
 
-# src/trans.h:238
-#: ../src/charset.c:57
-msgid "Chinese Simplified (GB18030)"
-msgstr "Egyszerűsített kínai (GB18030)"
+#: ../data/preferences_dialog.ui.h:112
+#, no-c-format
+#| msgid "Convert '_' and '%20' to spaces"
+msgid "Convert underscores and ‘%20’ to spaces"
+msgstr "Aláhúzások és a „%20” átalakítása szóközökre"
 
-# src/trans.h:237
-#: ../src/charset.c:58
-msgid "Chinese Simplified (GB2312)"
-msgstr "Egyszerűsített kínai (GB2312)"
+#: ../data/preferences_dialog.ui.h:114
+#, no-c-format
+#| msgid "Convert space ' ' to underscore '_'"
+msgid "Convert spaces and ‘%20’ to underscores"
+msgstr "Szóközök és a „%20” átalakítása aláhúzásra"
 
-# src/trans.h:240
-#: ../src/charset.c:59
-msgid "Chinese Traditional (Big5)"
-msgstr "Hagyományos kínai (Big5)"
+#: ../data/preferences_dialog.ui.h:115
+msgid "No conversion"
+msgstr "Nincs átalakítás"
 
-# src/trans.h:240
-#: ../src/charset.c:60
-msgid "Chinese Traditional (Big5-HKSCS)"
-msgstr "Hagyományos kínai (Big5-HKSCS)"
+#: ../data/preferences_dialog.ui.h:116
+#, fuzzy
+#| msgid "Rename File and Directory"
+msgid "Rename File and Directory Scanner"
+msgstr "Fájl és könyvtár átnevezése"
 
-# src/trans.h:243
-#: ../src/charset.c:61
-msgid "Cyrillic (IBM-855)"
-msgstr "Cirill (IBM-855)"
+#: ../data/preferences_dialog.ui.h:117
+#, fuzzy
+#| msgid "Process Fields"
+msgid "Process Fields Scanner"
+msgstr "Mezök feldolgozása"
 
-# src/trans.h:244
-#: ../src/charset.c:62
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cirill (ISO-8859-5)"
+#: ../data/preferences_dialog.ui.h:118
+#, fuzzy
+#| msgid "Capitalize the first letter of each word"
+msgid "Upper-case the first letters of all words"
+msgstr "Minden szó első betűje legyen nagybetű"
 
-# src/trans.h:245
-#: ../src/charset.c:63
-msgid "Cyrillic (ISO-IR-111)"
-msgstr "Cirill (ISO-IR-111)"
+#: ../data/preferences_dialog.ui.h:119
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:148
+msgid ""
+"Whether to upper-case the first letter of all words, including prepositions "
+"and other short words such as “feat.”, when processing tag fields"
+msgstr ""
 
-# src/trans.h:243
-#: ../src/charset.c:64
-msgid "Cyrillic (KOI8-R)"
-msgstr "Cirill (KOI8-R)"
+#: ../data/preferences_dialog.ui.h:120
+msgid "Fields"
+msgstr "Mezők"
 
-# src/trans.h:246
-#: ../src/charset.c:65
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cirill (Windows-1251)"
+#: ../data/preferences_dialog.ui.h:121
+msgid "Overwrite fields when scanning tags"
+msgstr "Mezők felülírása a címkék feldolgozásakor"
 
-# src/trans.h:247
-#: ../src/charset.c:66
-msgid "Cyrillic/Russian (CP-866)"
-msgstr "Cirill/Orosz (CP-866)"
+#: ../data/preferences_dialog.ui.h:122
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:109
+msgid ""
+"Whether to overwrite the tag field values when filling tags. Otherwise, only "
+"blank tag fields will be filled"
+msgstr ""
 
-# src/trans.h:248
-#: ../src/charset.c:67
-msgid "Cyrillic/Ukrainian (KOI8-U)"
-msgstr "Cirill/Ukrán (KOI8-U)"
+#: ../data/preferences_dialog.ui.h:123
+msgid "Set this text as default comment:"
+msgstr "Ezen szöveg beállítása alapértelmezett megjegyzésként:"
 
-# src/trans.h:293
-#: ../src/charset.c:68
-msgid "English (US-ASCII)"
-msgstr "Angol (US-ASCII)"
+#: ../data/preferences_dialog.ui.h:124
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:111
+msgid ""
+"Whether to set the comment tag field to the provided default value when "
+"filling tags"
+msgstr ""
 
-# src/trans.h:250
-#: ../src/charset.c:69
-msgid "Greek (ISO-8859-7)"
-msgstr "Görög (ISO-8859-7)"
+#: ../data/preferences_dialog.ui.h:125
+#, fuzzy
+#| msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
+msgid "Use CRC-32 as the default comment (for files with ID3 tags only)"
+msgstr ""
+"CRC32 használata alapértelmezett megjegyzésként (csak ID3 címkékkel "
+"rendelkező fájloknál)."
 
-# src/trans.h:252
-#: ../src/charset.c:70
-msgid "Greek (Windows-1253)"
-msgstr "Görög (Windows-1253)"
+#: ../data/preferences_dialog.ui.h:126
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:115
+#, fuzzy
+#| msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
+msgid ""
+"Whether to use the CRC-32 of the audio file data as the default comment, for "
+"files with ID3 tags only"
+msgstr ""
+"CRC32 használata alapértelmezett megjegyzésként (csak ID3 címkékkel "
+"rendelkező fájloknál)."
 
-# src/trans.h:274
-#: ../src/charset.c:71
-msgid "Hebrew (IBM-862)"
-msgstr "Héber (IBM-862)"
+#: ../data/preferences_dialog.ui.h:127
+msgid "Scanner"
+msgstr "Feldolgozó"
 
-# src/trans.h:252
-#: ../src/charset.c:72
-msgid "Hebrew (Windows-1255)"
-msgstr "Héber (Windows-1255)"
+#: ../data/preferences_dialog.ui.h:128
+#, fuzzy
+#| msgid "Automatic Search"
+msgid "Automatic Search Servers"
+msgstr "Automatikus keresés"
 
-# src/trans.h:254
-#: ../src/charset.c:73
-msgid "Japanese (EUC-JP)"
-msgstr "Japán (EUC-JP)"
+#: ../data/preferences_dialog.ui.h:129
+#, fuzzy
+#| msgid "Host Name:"
+msgid "Host:"
+msgstr "Gépnév:"
 
-# src/trans.h:255
-#: ../src/charset.c:74
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japán (ISO-2022-JP)"
+#: ../data/preferences_dialog.ui.h:130
+msgid "Port:"
+msgstr "Port:"
+
+#: ../data/preferences_dialog.ui.h:131
+msgid "CGI Path:"
+msgstr "CGI útvonal:"
+
+#: ../data/preferences_dialog.ui.h:132
+#, fuzzy
+#| msgid "Manual Search"
+msgid "Manual Search Server"
+msgstr "Kézi keresés"
+
+#: ../data/preferences_dialog.ui.h:133
+msgid "Proxy"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:134
+#, fuzzy
+#| msgid "Use a proxy"
+msgid "Use a proxy server"
+msgstr "Proxy használata"
+
+#: ../data/preferences_dialog.ui.h:135
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:28
+msgid "Whether to access remote CDDB through a proxy"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:136
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:30
+msgid "Hostname for a proxy to access remote CDDB"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:137
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:32
+msgid "Port for a proxy to access remote CDDB"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:138
+#, fuzzy
+#| msgid "User Name:"
+msgid "User:"
+msgstr "Felhasználónév:"
+
+#: ../data/preferences_dialog.ui.h:139
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:34
+msgid "Username for a proxy to access remote CDDB"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:140
+#, fuzzy
+#| msgid "User Password:"
+msgid "Password:"
+msgstr "Felhasználói jelszó:"
+
+#: ../data/preferences_dialog.ui.h:141
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:36
+msgid "Password for a proxy to access remote CDDB"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:142
+#, fuzzy
+#| msgid "Results:"
+msgid "Results List"
+msgstr "Eredmények:"
+
+#: ../data/preferences_dialog.ui.h:143
+#, fuzzy
+#| msgid ""
+#| "Select corresponding audio file (according position or DLM if activated "
+#| "below)"
+msgid ""
+"Select corresponding file (according to position or DLM if activated below)"
+msgstr ""
+"A megfelelő hangfájl kiválasztása (pozíció vagy DLM szerint, ha lent "
+"aktiválva van)"
+
+#: ../data/preferences_dialog.ui.h:144
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:26
+msgid ""
+"Whether to select the file in the file list which matches the position in "
+"the CDDB results list"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:145
+#, fuzzy
+#| msgid ""
+#| "Use the Levenshtein algorithm (DLM) to match lines (using title) with "
+#| "audio files (using filename)"
+msgid ""
+"Use the Levenshtein algorithm (DLM) to match results (using title) with "
+"audio files (using filename)"
+msgstr ""
+"A Levenshtein algoritmus (DLM) használata sorok (cím használata) "
+"párosításához a hangfájlokkal (fájlnév használata)"
+
+#: ../data/preferences_dialog.ui.h:147
+msgid "CDDB"
+msgstr "CD-adatbázis"
+
+#: ../data/preferences_dialog.ui.h:148
+msgid "Confirmation"
+msgstr "Megerősítés"
+
+#: ../data/preferences_dialog.ui.h:149
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:116
+#, fuzzy
+#| msgid "Confirm writing of playlist"
+msgid "Confirm before quitting the application"
+msgstr "Lejátszólista írásának megerősítése"
+
+#: ../data/preferences_dialog.ui.h:150
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:117
+msgid ""
+"Whether to ask for confirmation from the user before quitting the application"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:151
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:118
+#, fuzzy
+#| msgid "Confirm writing of file tag"
+msgid "Confirm before writing tags"
+msgstr "Fájlcímke írásának megerősítése"
+
+#: ../data/preferences_dialog.ui.h:152
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:119
+msgid ""
+"Whether to ask for confirmation from the user before writing tags to audio "
+"files"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:153
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:120
+#, fuzzy
+#| msgid "Confirm renaming of file"
+msgid "Confirm before renaming a file"
+msgstr "Fájl átnevezésének megerősítése"
+
+#: ../data/preferences_dialog.ui.h:154
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:121
+msgid "Whether to ask for confirmation from the user before renaming a file"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:155
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:124
+#, fuzzy
+#| msgid "Confirm deleting of file"
+msgid "Confirm before deleting a file"
+msgstr "Fájl törlésének megerősítése"
+
+#: ../data/preferences_dialog.ui.h:156
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:125
+msgid "Whether to ask for confirmation from the user before deleting a file"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:157
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:122
+#, fuzzy
+#| msgid "Confirm writing of playlist"
+msgid "Confirm before writing a playlist"
+msgstr "Lejátszólista írásának megerősítése"
+
+#: ../data/preferences_dialog.ui.h:158
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:123
+msgid "Whether to ask for confirmation from the user before writing a playlist"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:159
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:126
+#, fuzzy
+#| msgid "Confirm renaming of file"
+msgid "Confirm before losing unsaved changes to files"
+msgstr "Fájl átnevezésének megerősítése"
+
+#: ../data/preferences_dialog.ui.h:160
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:127
+msgid ""
+"Whether to ask for confirmation from the user before performing an operation "
+"that would lose unsaved changes on files"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:161
+#, fuzzy
+#| msgid "Scanner Window"
+msgid "Scanner Dialog"
+msgstr "Feldolgozóablak"
+
+#: ../data/preferences_dialog.ui.h:162
+#, fuzzy
+#| msgid "Open the Scanner Window on startup"
+msgid "Show the scanner dialog on startup"
+msgstr "Feldolgozóablak megnyitása indításkor"
+
+#: ../data/preferences_dialog.ui.h:163
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:200
+#, fuzzy
+#| msgid "Open the Scanner Window on startup"
+msgid "Whether to show the scanner window on application startup"
+msgstr "Feldolgozóablak megnyitása indításkor"
+
+#: ../data/preferences_dialog.ui.h:164
+msgid "Application"
+msgstr ""
+
+#: ../data/scan_dialog.ui.h:1
+#, fuzzy
+#| msgid ""
+#| "Select or type in a mask using codes (see Legend) to parse filename and "
+#| "path. Used to fill in tag fields"
+msgid ""
+"Select or type in a mask using codes (see Legend) to parse filename and "
+"directory. Used to fill in tag fields"
+msgstr ""
+"Maszk kiválasztása vagy begépelése kódok használatával (lásd a "
+"jelmagyarázatot) a fájlnév és útvonal feldolgozásához. Felhasználásra kerül "
+"a címkemezők kitöltéséhez."
+
+#: ../data/scan_dialog.ui.h:2
+msgid "Fill tag preview"
+msgstr "Címke kitöltése előnézet"
+
+#: ../data/scan_dialog.ui.h:3
+msgid "Mask Editor"
+msgstr "Maszkszerkesztő"
+
+#: ../data/scan_dialog.ui.h:4
+#, fuzzy
+#| msgid "Create New Mask"
+msgid "Create a new mask"
+msgstr "Új maszk létrehozása"
+
+#: ../data/scan_dialog.ui.h:5
+#, fuzzy
+#| msgid "Move up the selected line"
+msgid "Move the selected mask up"
+msgstr "Kijelölt sor mozgatása fel"
+
+#: ../data/scan_dialog.ui.h:6
+#, fuzzy
+#| msgid "Move up the selected line"
+msgid "Move the selected mask down"
+msgstr "Kijelölt sor mozgatása fel"
+
+# Sor törlése - volt régen.
+#: ../data/scan_dialog.ui.h:7
+#, fuzzy
+#| msgid "Delete the selected line"
+msgid "Duplicate the selected mask"
+msgstr "A kijelölt sor törlése"
+
+#: ../data/scan_dialog.ui.h:8
+#, fuzzy
+#| msgid "Add Default Masks"
+msgid "Add default masks"
+msgstr "Alapértelmezett maszkok hozzáadása"
+
+#: ../data/scan_dialog.ui.h:9
+#, fuzzy
+#| msgid "Move up the selected line"
+msgid "Remove the selected mask"
+msgstr "Kijelölt sor mozgatása fel"
+
+#: ../data/scan_dialog.ui.h:10
+#, fuzzy
+#| msgid "Save Masks"
+msgid "Save masks"
+msgstr "Maszkok mentése"
+
+#: ../data/scan_dialog.ui.h:11
+msgid "Legend"
+msgstr "Jelmagyarázat"
+
+#: ../data/scan_dialog.ui.h:13
+#, no-c-format
+msgid "%a: artist"
+msgstr "%a: előadó"
+
+#: ../data/scan_dialog.ui.h:15
+#, fuzzy, no-c-format
+#| msgid "%z: album artist"
+msgid "%a: album artist"
+msgstr "%z: album előadó"
+
+#: ../data/scan_dialog.ui.h:17
+#, no-c-format
+msgid "%b: album"
+msgstr "%b: album"
+
+#: ../data/scan_dialog.ui.h:19
+#, no-c-format
+msgid "%c: comment"
+msgstr "%c: megjegyzés"
+
+#: ../data/scan_dialog.ui.h:21
+#, no-c-format
+msgid "%p: composer"
+msgstr "%p: zeneszerző"
+
+#: ../data/scan_dialog.ui.h:23
+#, no-c-format
+msgid "%r: copyright"
+msgstr "%r: szerzői jog"
+
+#: ../data/scan_dialog.ui.h:25
+#, no-c-format
+msgid "%d: disc number"
+msgstr "%d: lemez száma"
+
+#: ../data/scan_dialog.ui.h:27
+#, no-c-format
+msgid "%e: encoded by"
+msgstr "%e: kódoló neve"
+
+#: ../data/scan_dialog.ui.h:29
+#, no-c-format
+msgid "%g: genre"
+msgstr "%g: műfaj"
+
+#: ../data/scan_dialog.ui.h:31
+#, no-c-format
+msgid "%i: ignored"
+msgstr "%i: mellőzött"
+
+#: ../data/scan_dialog.ui.h:33
+#, no-c-format
+msgid "%l: number of tracks"
+msgstr "%l: sávok száma"
+
+#: ../data/scan_dialog.ui.h:35
+#, fuzzy, no-c-format
+#| msgid "%o: orig. artist"
+msgid "%o: original artist"
+msgstr "%o: eredeti előadó"
+
+#: ../data/scan_dialog.ui.h:37
+#, no-c-format
+msgid "%n: track"
+msgstr "%n: szám"
+
+#: ../data/scan_dialog.ui.h:39
+#, no-c-format
+msgid "%t: title"
+msgstr "%t: cím"
+
+#: ../data/scan_dialog.ui.h:41
+#, no-c-format
+msgid "%u: URL"
+msgstr "%u: URL"
+
+#: ../data/scan_dialog.ui.h:43
+#, no-c-format
+msgid "%x: number of discs"
+msgstr "%x: lemezek száma"
+
+#: ../data/scan_dialog.ui.h:45
+#, no-c-format
+msgid "%y: year"
+msgstr "%y: év"
+
+#: ../data/scan_dialog.ui.h:46
+msgid "Fill Tag"
+msgstr "Címke kitöltése"
+
+# bubble help
+#: ../data/scan_dialog.ui.h:47
+#, fuzzy
+#| msgid "Prefix mask with current path"
+msgid "Prefix mask with current directory"
+msgstr "Előtag maszk a jelenlegi útvonallal"
+
+#: ../data/scan_dialog.ui.h:48
+#, fuzzy
+#| 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."
+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 is an "
+"absolute path, otherwise is relative to the old path"
+msgstr ""
+"Maszk kiválasztása vagy begépelése kódok használatával (lásd a "
+"jelmagyarázatot) a címkemezők feldolgozásához. Felhasználásra kerül a fájl "
+"átnevezéséhez.\n"
+"Használja a / jelet könyvtárak létrehozásához. Ha az első karakter a / jel, "
+"akkor ez egy abszolút elérési út, egyébként relatív a régi útvonalhoz."
+
+#: ../data/scan_dialog.ui.h:50
+msgid "Rename file preview"
+msgstr "Fájl átnevezése előnézet"
+
+#. Only filename changed
+#: ../data/scan_dialog.ui.h:51 ../src/easytag.c:615
+msgid "Rename File"
+msgstr "Fájl átnevezése"
+
+#: ../data/scan_dialog.ui.h:52
+#, fuzzy
+#| msgid "Fields"
+msgid "Tag Fields"
+msgstr "Mezők"
+
+# bubble help
+#: ../data/scan_dialog.ui.h:54
+#, fuzzy
+#| msgid "Process filename field"
+msgid "Process filename"
+msgstr "Fájlnév mező feldolgozása"
+
+# bubble help
+#: ../data/scan_dialog.ui.h:56
+msgid "Process title field"
+msgstr "A cím mező feldolgozása"
+
+# bubble help
+#: ../data/scan_dialog.ui.h:58
+#, fuzzy
+#| msgid "Process file artist field"
+msgid "Process artist field"
+msgstr "Az előadó mező feldolgozása"
+
+# bubble help
+#: ../data/scan_dialog.ui.h:61
+msgid "Process album field"
+msgstr "Az album mező feldolgozása"
+
+# bubble help
+#: ../data/scan_dialog.ui.h:63
+msgid "Process genre field"
+msgstr "A műfaj mező feldolgozása"
+
+# bubble help
+#: ../data/scan_dialog.ui.h:65
+msgid "Process comment field"
+msgstr "A megjegyzés mező feldolgozása"
+
+# bubble help
+#: ../data/scan_dialog.ui.h:67
+msgid "Process composer field"
+msgstr "A zeneszerző mező feldolgozása"
+
+#: ../data/scan_dialog.ui.h:68
+#, fuzzy
+#| msgid "Orig. artist:"
+msgid "Orig. Artist"
+msgstr "Eredeti előadó:"
+
+# bubble help
+#: ../data/scan_dialog.ui.h:69
+msgid "Process original artist field"
+msgstr "Az eredeti előadó mező feldolgozása"
+
+# bubble help
+#: ../data/scan_dialog.ui.h:71
+msgid "Process copyright field"
+msgstr "A szerzői jog mező feldolgozása"
+
+# bubble help
+#: ../data/scan_dialog.ui.h:73
+msgid "Process URL field"
+msgstr "Az URL mező feldolgozása"
+
+# bubble help
+#: ../data/scan_dialog.ui.h:75
+#, fuzzy
+#| msgid "Process encoder name field"
+msgid "Process encoded-by field"
+msgstr "A kódoló neve mező feldolgozása"
+
+#: ../data/scan_dialog.ui.h:76
+#, fuzzy
+#| msgid "Capitalize all"
+msgid "Capitalization"
+msgstr "Összes nagy kezdőbetűsre"
+
+#: ../data/scan_dialog.ui.h:77
+msgid "Capitalize all"
+msgstr "Összes nagy kezdőbetűsre"
+
+#: ../data/scan_dialog.ui.h:78 ../data/org.gnome.EasyTAG.gschema.xml.h:142
+msgid ""
+"Whether to upper-case all characters of the tag when processing tag fields"
+msgstr ""
+
+#: ../data/scan_dialog.ui.h:79
+msgid "Lowercase all"
+msgstr "Összes kisbetűsre"
+
+#: ../data/scan_dialog.ui.h:80 ../data/org.gnome.EasyTAG.gschema.xml.h:140
+msgid ""
+"Whether to lower-case all characters of the tag when processing tag fields"
+msgstr ""
+
+#: ../data/scan_dialog.ui.h:81
+msgid "Capitalize first letter"
+msgstr "Első betű nagybetűsre"
+
+#: ../data/scan_dialog.ui.h:82 ../data/org.gnome.EasyTAG.gschema.xml.h:144
+msgid ""
+"Whether to upper-case the first letter of the tag when processing tag fields"
+msgstr ""
+
+#: ../data/scan_dialog.ui.h:83
+msgid "Capitalize the first letter of each word"
+msgstr "Minden szó első betűje legyen nagybetű"
+
+#: ../data/scan_dialog.ui.h:84 ../data/org.gnome.EasyTAG.gschema.xml.h:146
+#, fuzzy
+#| msgid ""
+#| "Don't uppercase first letter of words for some prepositions and articles."
+msgid ""
+"Whether to upper-case the first letter of each word when processing tag "
+"fields"
+msgstr ""
+"Ne kezdje nagybetűvel a szavak első betűjét elöljárószók és névelők esetén."
+
+#: ../data/scan_dialog.ui.h:85
+msgid "Detect Roman numerals"
+msgstr "Római számok felismerése"
+
+#: ../data/scan_dialog.ui.h:86 ../data/org.gnome.EasyTAG.gschema.xml.h:150
+msgid ""
+"Whether to detect Roman numerals when applying upper-case conversions while "
+"processing tag fields"
+msgstr ""
+
+#: ../data/scan_dialog.ui.h:87
+msgid "Do not change capitalization"
+msgstr "Ne változtassa meg a kis- és nagybetűket"
+
+#: ../data/scan_dialog.ui.h:88
+msgid "Spaces Conversions"
+msgstr ""
+
+#: ../data/scan_dialog.ui.h:89 ../data/org.gnome.EasyTAG.gschema.xml.h:151
+#: ../src/tag_area.c:875
+msgid "Remove spaces"
+msgstr "Szóközök eltávolítása"
+
+#: ../data/scan_dialog.ui.h:90 ../data/org.gnome.EasyTAG.gschema.xml.h:152
+msgid "Whether to remove all spaces when processing tag fields"
+msgstr ""
+
+#: ../data/scan_dialog.ui.h:91
+msgid "Insert a space before uppercase letters"
+msgstr "Szóköz beszúrása minden nagybetű elé"
+
+#: ../data/scan_dialog.ui.h:92 ../data/org.gnome.EasyTAG.gschema.xml.h:154
+msgid ""
+"Whether to insert spaces before capital letters when processing tag fields"
+msgstr ""
+
+#: ../data/scan_dialog.ui.h:93
+msgid "Remove duplicate spaces and underscores"
+msgstr "Dupla szóközök és alsóvonások eltávolítása"
+
+#: ../data/scan_dialog.ui.h:94 ../data/org.gnome.EasyTAG.gschema.xml.h:156
+#, fuzzy
+#| msgid "Remove duplicate spaces and underscores"
+msgid ""
+"Whether to remove duplicate spaces and underscores when processing tag fields"
+msgstr "Dupla szóközök és alsóvonások eltávolítása"
+
+#: ../data/scan_dialog.ui.h:95
+msgid "Do not change word separators"
+msgstr "Ne változtassa meg a szóelválasztókat"
+
+#: ../data/scan_dialog.ui.h:96
+#, fuzzy
+#| msgid "Fill Tag Scanner - Character Conversion"
+msgid "Character Conversions"
+msgstr "Címke kitöltése feldolgozó - Karakterátalakítás"
+
+#: ../data/scan_dialog.ui.h:98 ../src/tag_area.c:831
+#, fuzzy, no-c-format
+#| msgid "Convert '_' and '%20' to spaces"
+msgid "Convert ‘_’ and ‘%20’ to spaces"
+msgstr "Az „_” és a „%20” átalakítása szóközre"
+
+# bubble help
+#: ../data/scan_dialog.ui.h:100
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The underscore character or the string '%20' are replaced by one space. "
+#| "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
+msgid ""
+"The underscore character or the string ‘%20’ is replaced by one space. "
+"Example, before: ‘Text%20In%20An_Entry‘, after: ‘Text In An Entry’"
+msgstr ""
+"Az alsóvonás karakter és a „%20” karakterlánc cserélve lesz egy szóközre. "
+"Például előtte: „Szöveg%20egy%20bejegyzés_tartalmában”, utána: „Szöveg egy "
+"bejegyzés tartalmában”."
+
+#: ../data/scan_dialog.ui.h:101 ../src/tag_area.c:837
+#, fuzzy
+#| msgid "Convert ' ' to '_'"
+msgid "Convert ‘ ’ to ‘_’"
+msgstr "A „ ” átalakítása erre: „_”"
+
+# bubble help
+#: ../data/scan_dialog.ui.h:102
+#, fuzzy
+#| msgid ""
+#| "The space character is replaced by one underscore character. Example, "
+#| "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
+msgid ""
+"The space character is replaced by one underscore character. Example, "
+"before: ‘Text In An Entry’, after: ‘Text_In_An_Entry’"
+msgstr ""
+"A szóköz 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”."
+
+#: ../data/scan_dialog.ui.h:103
+msgid "Convert:"
+msgstr "Átalakítás:"
+
+#: ../data/scan_dialog.ui.h:104
+#, fuzzy
+#| msgid ""
+#| "Replace a string by another one. Note that the search is case sensitive."
+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."
+
+#: ../data/scan_dialog.ui.h:105
+msgid "to: "
+msgstr "ebbe: "
+
+#: ../data/scan_dialog.ui.h:106
+msgid "Do not convert"
+msgstr "Ne alakítsa át"
+
+#: ../data/scan_dialog.ui.h:108
+msgid "Show / Hide Masks Editor"
+msgstr "Maszkszerkesztő megjelenítése / elrejtése"
+
+#: ../data/scan_dialog.ui.h:109
+msgid "Show / Hide Legend"
+msgstr "Jelmagyarázat megjelenítése / elrejtése"
+
+#: ../data/scan_dialog.ui.h:110
+msgid "Scanner Preferences"
+msgstr "Feldolgozó beállítások"
+
+#: ../data/search_dialog.ui.h:1
+msgid "Search:"
+msgstr "Keresés:"
+
+#: ../data/search_dialog.ui.h:2
+#, fuzzy
+#| msgid ""
+#| "Type the word to search into files. Or type nothing to display all files."
+msgid ""
+"Type the text to search for in the file list, or leave the field empty to "
+"display all files"
+msgstr ""
+"Írja be a fájlban keresendő szót. Vagy ne írjon be semmit az összes fájl "
+"megjelenítéséhez."
+
+#: ../data/search_dialog.ui.h:3
+#| msgid "_Find…"
+msgid "_Find"
+msgstr "_Keresés"
+
+#: ../data/search_dialog.ui.h:4
+msgid "In:"
+msgstr "Ebben:"
+
+#. This option is for the previous 'in' option. For instance, translate this as 'Search' 'In:' 'the Filename'.
+#: ../data/search_dialog.ui.h:6
+msgid "the Filename"
+msgstr "a fájlnévben"
+
+#. This option is for the previous 'in' option. For instance, translate this as 'Search' 'In:' 'the Tag'.
+#: ../data/search_dialog.ui.h:8
+msgid "the Tag"
+msgstr "a címkében"
+
+#: ../data/search_dialog.ui.h:9
+msgid "Case sensitive"
+msgstr "Kis- és nagybetűs"
+
+#: ../data/search_dialog.ui.h:16
+msgid "CD"
+msgstr "CD"
+
+#: ../data/tag_area.ui.h:1
+msgid "Image Type"
+msgstr "Képtípus"
+
+#: ../data/tag_area.ui.h:2 ../src/picture.c:288
+msgid "Description"
+msgstr "Leírás"
+
+#: ../data/tag_area.ui.h:4
+msgid "_Accept"
+msgstr ""
+
+#: ../data/tag_area.ui.h:5 ../src/tag_area.c:3021
+msgid "Tag"
+msgstr "Címke"
+
+#: ../data/tag_area.ui.h:6
+msgid "Title:"
+msgstr "Cím:"
+
+# bubble help
+#: ../data/tag_area.ui.h:7
+msgid "Tag selected files with this title"
+msgstr "A kijelölt fájlok címkézése ezzel a címmel"
+
+#: ../data/tag_area.ui.h:8
+msgid "Artist:"
+msgstr "Előadó:"
+
+# bubble help
+#: ../data/tag_area.ui.h:9
+msgid "Tag selected files with this artist"
+msgstr "A kijelölt fájlok címkézése ezzel az előadóval"
+
+#: ../data/tag_area.ui.h:10
+msgid "Album artist:"
+msgstr "Album előadója:"
+
+# bubble help
+#: ../data/tag_area.ui.h:11
+msgid "Tag selected files with this album artist"
+msgstr "A kijelölt fájlok címkézése ezzel az album előadóval"
+
+#: ../data/tag_area.ui.h:12
+msgid "Album:"
+msgstr "Album:"
+
+#: ../data/tag_area.ui.h:13
+msgid "Tag selected files with this album name"
+msgstr "A kijelölt fájlok címkézése ezzel az albumnévvel"
+
+#: ../data/tag_area.ui.h:14
+msgid "CD:"
+msgstr "CD:"
+
+#: ../data/tag_area.ui.h:15
+msgid "Tag selected files with this disc number"
+msgstr "A kijelölt fájlok címkézése ezzel a lemezszámmal"
+
+#: ../data/tag_area.ui.h:16
+msgid "Year:"
+msgstr "Év:"
+
+#: ../data/tag_area.ui.h:17
+msgid "Tag selected files with this year"
+msgstr "A kijelölt fájlok címkézése ezzel az évszámmal"
+
+#: ../data/tag_area.ui.h:18
+#, fuzzy
+#| msgid ""
+#| "Number selected tracks sequentially. Starts at 01 in each subdirectory."
+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."
+
+#: ../data/tag_area.ui.h:19
+msgid "Track #:"
+msgstr "Szám #:"
+
+#: ../data/tag_area.ui.h:20
+#, fuzzy
+#| msgid ""
+#| "Set the number of files, in the same directory of the displayed file, to "
+#| "the selected tracks."
+msgid ""
+"Set the number of files, in the same directory of the displayed file, to the "
+"selected tracks"
+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."
+
+#: ../data/tag_area.ui.h:21
+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"
+
+#: ../data/tag_area.ui.h:22
+msgid "Genre:"
+msgstr "Műfaj:"
+
+#: ../data/tag_area.ui.h:23
+msgid "Comment:"
+msgstr "Megjegyzés:"
+
+#: ../data/tag_area.ui.h:24
+msgid "Tag selected files with this comment"
+msgstr "A kijelölt fájlok címkézése ezzel a megjegyzéssel"
+
+#: ../data/tag_area.ui.h:25
+msgid "Composer:"
+msgstr "Zeneszerző:"
+
+#: ../data/tag_area.ui.h:26
+msgid "Tag selected files with this composer"
+msgstr "A kijelölt fájlok címkézése ezzel a zeneszerzővel "
+
+#: ../data/tag_area.ui.h:27
+msgid "Orig. artist:"
+msgstr "Eredeti előadó:"
+
+#: ../data/tag_area.ui.h:28
+msgid "Tag selected files with this original artist"
+msgstr "A kijelölt fájlok címkézése ezzel az eredeti előadóval"
+
+#: ../data/tag_area.ui.h:29
+msgid "Copyright:"
+msgstr "Szerzői jog:"
+
+#: ../data/tag_area.ui.h:30
+msgid "Tag selected files with this copyright"
+msgstr "A kijelölt fájlok címkézése ezzel a szerzői joggal"
+
+#: ../data/tag_area.ui.h:31
+msgid "URL:"
+msgstr "URL:"
+
+#: ../data/tag_area.ui.h:32
+msgid "Tag selected files with this URL"
+msgstr "A kijelölt fájlok címkézése ezzel az URL-lel"
+
+#: ../data/tag_area.ui.h:33
+msgid "Encoded by:"
+msgstr "Kódolta:"
+
+#: ../data/tag_area.ui.h:34
+msgid "Tag selected files with this encoder name"
+msgstr "A kijelölt fájlok címkézése a kódoló nevével"
+
+#: ../data/tag_area.ui.h:35
+msgid "Common"
+msgstr "Közös"
+
+#: ../data/tag_area.ui.h:36
+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"
+
+#: ../data/tag_area.ui.h:37
+msgid "Add images to the tag"
+msgstr "Képek hozzáadása a címkéhez"
+
+#: ../data/tag_area.ui.h:38
+msgid "Remove selected images from the tag"
+msgstr "A kijelölt képek eltávolítása a címkéből"
+
+#: ../data/tag_area.ui.h:39
+msgid "Save the selected images to files"
+msgstr "A kijelölt képek mentése fájlokba"
+
+#: ../data/tag_area.ui.h:40
+msgid "Edit image properties"
+msgstr "Képtulajdonságok szerkesztése"
+
+#: ../data/tag_area.ui.h:41
+msgid "Tag selected files with these images"
+msgstr "A kijelölt fájlok címkézése ezekkel a képekkel"
+
+#: ../data/tag_area.ui.h:42 ../src/tag_area.c:3274 ../src/tag_area.c:3277
+msgid "Images"
+msgstr "Képek"
+
+# ikon megjegyzés
+#: ../data/toolbar.ui.h:2
+msgid "First file"
+msgstr "Első fájl"
+
+# Fájl menü
+#: ../data/toolbar.ui.h:3
+msgid "_Previous File"
+msgstr "Elő_ző fájl"
+
+# ikon megjegyzés
+#: ../data/toolbar.ui.h:4
+msgid "Previous file"
+msgstr "Előző fájl"
+
+# ikon megjegyzés
+#: ../data/toolbar.ui.h:6
+msgid "Next file"
+msgstr "Következő fájl"
+
+# ikon megjegyzés
+#: ../data/toolbar.ui.h:8
+msgid "Last file"
+msgstr "Utolsó fájl"
+
+#: ../data/toolbar.ui.h:9
+msgid "_Show Scanner"
+msgstr "Feldolgozó _megjelenítése"
+
+#: ../data/toolbar.ui.h:10
+msgid "Show scanner"
+msgstr "Feldolgozó megjelenítése"
+
+# ikon megjegyzés
+#: ../data/toolbar.ui.h:12
+msgid "Remove tags"
+msgstr "Címkék eltávolítása"
+
+#: ../data/toolbar.ui.h:13
+msgid "_Undo"
+msgstr ""
+
+#: ../data/toolbar.ui.h:14
+#, fuzzy
+#| msgid "Found one file"
+#| msgid_plural "Found %d files"
+msgid "Undo for file"
+msgstr "Egy fájl található"
+
+#: ../data/toolbar.ui.h:15
+msgid "R_edo"
+msgstr ""
+
+#: ../data/toolbar.ui.h:16
+#, fuzzy
+#| msgid "Read-only file"
+msgid "Redo for file"
+msgstr "Csak olvasható fájl"
+
+#: ../data/toolbar.ui.h:18
+msgid "Save changes to selected files"
+msgstr "Változtatások mentése a kijelölt fájlokba"
+
+# böngésző menü
+#: ../data/toolbar.ui.h:20
+#, fuzzy
+#| msgid "Collapse directory tree"
+msgid "Browse directory tree"
+msgstr "Könyvtárfa összecsukása"
+
+#: ../data/toolbar.ui.h:22
+#, fuzzy
+#| msgid "View by artist and album"
+msgid "Browse artists and albums"
+msgstr "Előadó és album szerinti nézet"
+
+#: ../data/toolbar.ui.h:24
+msgid "Invert file selection"
+msgstr "Fájlkijelölés megfordítása"
+
+#: ../data/toolbar.ui.h:26
+msgid "Search filenames and tags"
+msgstr "Fájlnevek és címkék keresése"
+
+#: ../data/toolbar.ui.h:27
+#, fuzzy
+#| msgid "CDD_B Search…"
+msgid "CDDB Search…"
+msgstr "CD-adat_bázis keresés…"
+
+# ikon megjegyzés
+#: ../data/toolbar.ui.h:28 ../src/cddb_dialog.c:2675
+msgid "CDDB Search"
+msgstr "CDDB keresés"
+
+#: ../data/toolbar.ui.h:30
+msgid "Generate a playlist"
+msgstr "Lejátszólista előállítása"
+
+#: ../data/toolbar.ui.h:32
+msgid "Stop the current action"
+msgstr "Jelenlegi művelet leállítása"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:1
+#, fuzzy
+#| msgid "Ready to start"
+msgid "Load on startup"
+msgstr "Indításra kész"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:3
+#, fuzzy
+#| msgid "Add Default Masks"
+msgid "Default path"
+msgstr "Alapértelmezett maszkok hozzáadása"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:7
+#, fuzzy
+#| msgid "Show hidden directories"
+msgid "Show hidden directories while browsing"
+msgstr "Rejtett könyvtárak megjelenítése"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:11
+#, fuzzy
+#| msgid "Server Settings for Automatic Search"
+msgid "CDDB server hostname for automatic search"
+msgstr "Kiszolgáló beállítások az automatikus kereséshez"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:12
+#, fuzzy
+#| msgid "Server Settings for Automatic Search"
+msgid "The CDDB server to use for the automatic search"
+msgstr "Kiszolgáló beállítások az automatikus kereséshez"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:13
+#, fuzzy
+#| msgid "Server Settings for Automatic Search"
+msgid "CDDB server port for automatic search"
+msgstr "Kiszolgáló beállítások az automatikus kereséshez"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:14
+#, fuzzy
+#| msgid "Server Settings for Automatic Search"
+msgid "The CDDB server port to use for the automatic search"
+msgstr "Kiszolgáló beállítások az automatikus kereséshez"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:15
+#, fuzzy
+#| msgid "Server Settings for Automatic Search"
+msgid "CDDB server path for automatic search"
+msgstr "Kiszolgáló beállítások az automatikus kereséshez"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:16
+#, fuzzy
+#| msgid "Server Settings for Automatic Search"
+msgid "The CDDB server path to use for the automatic search"
+msgstr "Kiszolgáló beállítások az automatikus kereséshez"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:17
+#, fuzzy
+#| msgid "Server Settings for Manual Search"
+msgid "CDDB server hostname for manual search"
+msgstr "Kiszolgáló beállítások a kézi kereséshez"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:18
+#, fuzzy
+#| msgid "Server Settings for Manual Search"
+msgid "The CDDB server to use for a manual search"
+msgstr "Kiszolgáló beállítások a kézi kereséshez"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:19
+#, fuzzy
+#| msgid "Server Settings for Manual Search"
+msgid "CDDB server port for manual search"
+msgstr "Kiszolgáló beállítások a kézi kereséshez"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:20
+#, fuzzy
+#| msgid "Server Settings for Manual Search"
+msgid "The CDDB server port to use for a manual search"
+msgstr "Kiszolgáló beállítások a kézi kereséshez"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:21
+#, fuzzy
+#| msgid "Server Settings for Manual Search"
+msgid "CDDB server path for manual search"
+msgstr "Kiszolgáló beállítások a kézi kereséshez"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:22
+#, fuzzy
+#| msgid "Server Settings for Manual Search"
+msgid "The CDDB server path to use for a manual search"
+msgstr "Kiszolgáló beállítások a kézi kereséshez"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:23
+#, fuzzy
+#| msgid "Error while writing CDDB results to file '%s'"
+msgid "Use DLM to match CDDB results to files"
+msgstr "Hiba a CD-adatbázis eredményeinek fájlba írása közben: „%s”"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:25
+msgid ""
+"Select the file with the position which matches the position of the CDDB "
+"result"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:27
+msgid "Enable proxy for remote CDDB"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:29
+msgid "CDDB proxy hostname"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:31
+msgid "CDDB proxy port"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:33
+msgid "CDDB proxy username"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:35
+msgid "CDDB proxy password"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:37
+msgid "Run the scanner on CDDB results"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:39
+msgid "The fields to use in a manual CDDB search"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:40
+msgid "Which fields to search for matches of the returned CDDB results"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:41
+msgid "The categories to use in a CDDB search"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:42
+msgid "Which categories to search for matches in the returned CDDB results"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:43
+msgid "The tag fields to set when matching against CDDB results"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:44
+msgid ""
+"Which tag fields should be set when matching against selected files and CDDB "
+"results"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:51
+#, fuzzy
+#| msgid "Display changed files in list using:"
+msgid "Show changed files in bold"
+msgstr "Módosított fájlok megjelenítése a listában:"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:52
+msgid ""
+"Whether to highlight changed files in the file list by making them bold, or "
+"alternatively by making them red"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:55
+msgid "How to sort audio files in the file list"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:56
+msgid "Sort files in ascending or descending order for the selected type"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:57
+#, fuzzy
+#| msgid "Max number of lines:"
+msgid "Number of log lines"
+msgstr "Sorok maximális száma:"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:61
+#, fuzzy
+#| msgid "Character Set for reading ID3 tags"
+msgid "Use a non-standard character encoding when reading ID3 tags"
+msgstr "Karakterkészlet az ID3 címkék olvasásához"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:65
+#, fuzzy
+#| msgid "Write ID3v1.x tag"
+msgid "Write ID3v1 tags"
+msgstr "ID3v1.x címke írása"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:67
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "The character set for writing ID3v1 tags"
+msgstr "Karakterkészlet az ID3 címkék írásához"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:68
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "Choose the character set to be used when writing ID3v1 tags"
+msgstr "Karakterkészlet az ID3 címkék írásához"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:69
+msgid "Encoding options when writing ID3v1 tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:70
+msgid ""
+"Additional options to pass to iconv() when converting between encodings when "
+"writing ID3v1 tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:71
+#, fuzzy
+#| msgid "Character Set for reading ID3 tags"
+msgid "The character set for reading ID3v1 and ID3v2 tags"
+msgstr "Karakterkészlet az ID3 címkék olvasásához"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:73
+#, fuzzy
+#| msgid "Write ID3v2 tag"
+msgid "Write ID3v2 tags"
+msgstr "ID3v2 címke írása"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:75
+msgid "Enable ID3v2.4 support"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:76
+msgid "Whether to write ID3v2.4 tags when ID3v2 support is enabled"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:77
+#, fuzzy
+#| msgid "Automatically convert old ID3v2 tag versions"
+msgid "Convert old ID3 tag versions to new ones"
+msgstr "A régi ID3v2 címkeverziók automatikus átalakítása"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:81
+#, fuzzy
+#| msgid "Set CRC32 in the ID3v2 tags"
+msgid "Use CRC-32 in ID3v2 tags"
+msgstr "CRC32 beállítása az ID3v2 címkékben"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:85
+#, fuzzy
+#| msgid "Try another character encoding"
+msgid "Use Unicode character encoding in ID3v2 tags"
+msgstr "Próbáljon másik karakter kódolást"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:86
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "Whether to use a Unicode character set when writing ID3v2 tags"
+msgstr "Karakterkészlet az ID3 címkék írásához"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:87
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "The Unicode character set for writing ID3v2 tags"
+msgstr "Karakterkészlet az ID3 címkék írásához"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:88
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "Choose the Unicode character set to be used when writing ID3v2 tags"
+msgstr "Karakterkészlet az ID3 címkék írásához"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:89
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "The character set for writing ID3v2 tags"
+msgstr "Karakterkészlet az ID3 címkék írásához"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:90
+msgid ""
+"Override the typical Unicode character set to be used when writing ID3v2 tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:91
+msgid "Encoding options when writing ID3v2 tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:92
+msgid ""
+"Additional options to pass to iconv() when converting between encodings when "
+"writing ID3v2 tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:93
+msgid "Automatically complete the date"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:95
+msgid "Pad the disc number tag field"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:97
+msgid "The length of the disc number field"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:98
+msgid ""
+"The length of the disc number field, which controls if the field is padded "
+"with leading zeroes"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:99
+msgid "Pad the track number tag field"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:101
+msgid "The length of the track number field"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:102
+msgid ""
+"The length of the track number field, which controls if the field is padded "
+"with leading zeroes"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:105
+msgid "Convert spaces and underscores when filling tag fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:107
+#, no-c-format
+msgid ""
+"Whether to convert to spaces (and %20) or underscores when filling tag "
+"fields from filenames"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:108
+msgid "Overwrite tag field"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:110
+#, fuzzy
+#| msgid "Set this text as default comment:"
+msgid "Set the default comment"
+msgstr "Ezen szöveg beállítása alapértelmezett megjegyzésként:"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:112
+msgid "Default comment for filling tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:113
+msgid "The default comment to use when filling tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:114
+#, fuzzy
+#| msgid "Set this text as default comment:"
+msgid "Use the CRC-32 as the default comment"
+msgstr "Ezen szöveg beállítása alapértelmezett megjegyzésként:"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:128
+#, fuzzy
+#| msgid "Run the current scanner for each file"
+msgid "Run the current scanner when loading filenames from a file"
+msgstr "Az jelenlegi feldolgozó futtatása minden fájlra"
+
+# bubble help
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:130
+#, fuzzy
+#| msgid "Process title field"
+msgid "Process these tag fields"
+msgstr "A cím mező feldolgozása"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:131
+msgid "The tag fields to process when using the scanner"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:132
+#, fuzzy
+#| msgid "Overwrite fields when scanning tags"
+msgid "Convert tag fields when processing"
+msgstr "Mezők felülírása a címkék feldolgozásakor"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:134
+#, no-c-format
+msgid ""
+"Whether to convert to spaces (and %20), underscores or other characters when "
+"processing tag fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:135
+#, fuzzy
+#| msgid "Try another character encoding"
+msgid "Convert characters in tags"
+msgstr "Próbáljon másik karakter kódolást"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:136
+msgid ""
+"Whether to convert characters of the tag from one value to another when "
+"processing tag fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:137
+msgid "Convert the following characters when processing tag fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:138
+msgid ""
+"Replace any matched sequence of characters with this string when processing "
+"tag fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:139
+#, fuzzy
+#| msgid "Lowercase all"
+msgid "Lower-case all characters"
+msgstr "Összes kisbetűsre"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:141
+msgid "Upper-case all characters"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:143
+#, fuzzy
+#| msgid "Capitalize the first letter of each word"
+msgid "Upper-case the first letter of the tag"
+msgstr "Minden szó első betűje legyen nagybetű"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:145
+#, fuzzy
+#| msgid "Capitalize the first letter of each word"
+msgid "Upper-case the first letter of each word"
+msgstr "Minden szó első betűje legyen nagybetű"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:147
+msgid "Upper-case prepositions"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:149
+#, fuzzy
+#| msgid "Detect Roman numerals"
+msgid "Detect roman numerals"
+msgstr "Római számok felismerése"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:153
+#, fuzzy
+#| msgid "Insert space before uppercase letter"
+msgid "Insert spaces before capital letters"
+msgstr "Szóköz beszúrása minden nagybetű elé"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:155
+#, fuzzy
+#| msgid "Remove duplicate spaces or underscores"
+msgid "Remove duplicate spaces"
+msgstr "Dupla szóközök vagy alsóvonások eltávolítása"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:157
+#, fuzzy
+#| msgid "Playlist File Error"
+msgid "Playlist filename mask"
+msgstr "Lejátszólista fájl hiba"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:158
+msgid "The default filename mask to use for a new playlist"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:159
+msgid "Use a filename mask when generating a playlist"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:160
+msgid "Whether to use a filename mask when creating playlists"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:161
+#, fuzzy
+#| msgid "Create playlist in the parent directory"
+msgid "Create playlists with only the selected files"
+msgstr "Lejátszólista létrehozása a szülő könyvtárban"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:163
+#, fuzzy
+#| msgid "Use relative path for files in playlist"
+msgid "Use relative paths when creating playlists"
+msgstr "Relatív elérési út használata a lejátszólistában"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:164
+#, fuzzy
+#| msgid "Use relative path for files in playlist"
+msgid "Whether to use relative paths for files when creating playlists"
+msgstr "Relatív elérési út használata a lejátszólistában"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:165
+#, fuzzy
+#| msgid "Create playlist in the parent directory"
+msgid "Create the playlist in the parent directory"
+msgstr "Lejátszólista létrehozása a szülő könyvtárban"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:167
+#, fuzzy
+#| msgid "Use full path for files in playlist"
+msgid "Use DOS separators for playlists"
+msgstr "Teljes elérési út használata a lejátszólistában"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:169
+#, fuzzy
+#| msgid "Generate a playlist"
+msgid "Content of generated playlists"
+msgstr "Lejátszólista előállítása"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:170
+msgid ""
+"Write a plain list of files, include extended information from the filename "
+"or extended information using a supplied mask"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:171
+msgid "Playlist default mask"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:172
+#, fuzzy
+#| msgid "Use full path for files in playlist"
+msgid "The default mask to use for files in a playlist"
+msgstr "Teljes elérési út használata a lejátszólistában"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:173
+msgid "Search for files case-sensitively"
+msgstr ""
 
-# src/trans.h:256
-#: ../src/charset.c:75
-msgid "Japanese (Shift_JIS)"
-msgstr "Japán (Shift JIS)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:174
+msgid "Whether matches when searching for files are case-sensitive"
+msgstr ""
 
-# src/trans.h:257
-#: ../src/charset.c:76
-msgid "Korean (EUC-KR)"
-msgstr "Koreai (EUC-KR)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:175
+#, fuzzy
+#| msgid "Search a file"
+msgid "Search in filenames"
+msgstr "Fájl keresése"
 
-# src/trans.h:258
-#: ../src/charset.c:77
-msgid "Nordic (ISO-8859-10)"
-msgstr "Északi (ISO-8859-10)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:176
+msgid "Perform the search on filenames"
+msgstr ""
 
-# src/trans.h:260
-#: ../src/charset.c:78
-msgid "South European (ISO-8859-3)"
-msgstr "Dél-európai (ISO-8859-3)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:177
+#, fuzzy
+#| msgid "Searching"
+msgid "Search in tags"
+msgstr "Keresés"
 
-# src/trans.h:261
-#: ../src/charset.c:79
-msgid "Thai (TIS-620)"
-msgstr "Thai (TIS-620)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:178
+msgid "Perform the search on tags"
+msgstr ""
 
-# src/trans.h:262
-#: ../src/charset.c:80
-msgid "Turkish (IBM-857)"
-msgstr "Török (IBM-857)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:179
+#, fuzzy
+#| msgid "Error reading tags from file: '%s'"
+msgid "Mask for filling tags from filenames"
+msgstr "Hiba a címkék fájlból olvasása közben: „%s”"
 
-# src/trans.h:263
-#: ../src/charset.c:81
-msgid "Turkish (ISO-8859-9)"
-msgstr "Török (ISO-8859-9)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:180
+msgid ""
+"The default mask to use when automatically filling tags with information "
+"from filenames"
+msgstr ""
 
-# src/trans.h:265
-#: ../src/charset.c:82
-msgid "Turkish (Windows-1254)"
-msgstr "Török (Windows-1254)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:181
+#, fuzzy
+#| msgid "Confirm renaming of file"
+msgid "Mask for renaming files"
+msgstr "Fájl átnevezésének megerősítése"
 
-# src/trans.h:267
-#. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
-#: ../src/charset.c:84
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:182
+#, fuzzy
+#| msgid "Repeat action for the remaining files"
+msgid "The default mask to use when renaming files"
+msgstr "Művelet ismétlése a hátralevő fájlokra"
 
-# src/trans.h:269
-#. {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:91
-msgid "Vietnamese (VISCII)"
-msgstr "Vietnámi (VISCII)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:183
+#, fuzzy
+#| msgid "Unable to create setting directories"
+msgid "Mask for renaming directories"
+msgstr "Nem lehet létrehozni a beállítás könyvtárakat"
 
-# src/trans.h:271
-#: ../src/charset.c:92
-msgid "Vietnamese (Windows-1258)"
-msgstr "Vietnámi (Windows-1258)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:184
+msgid "The default mask to use when renaming directories"
+msgstr ""
 
-# src/trans.h:272
-#: ../src/charset.c:93
-msgid "Visual Hebrew (ISO-8859-8)"
-msgstr "Vizuális héber (ISO-8859-8)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:185
+#, fuzzy
+#| msgid "Unable to create setting directories"
+msgid "Use a mask when renaming directories"
+msgstr "Nem lehet létrehozni a beállítás könyvtárakat"
 
-# src/trans.h:274
-#: ../src/charset.c:94
-msgid "Western (IBM-850)"
-msgstr "Nyugati (IBM-850)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:187
+#, fuzzy
+#| msgid "Convert space ' ' to underscore '_'"
+msgid "Convert spaces and underscores when renaming files"
+msgstr "Szóköz „ ” átalakítása alsóvonásra „_”"
 
-# src/trans.h:275
-#: ../src/charset.c:95
-msgid "Western (ISO-8859-1)"
-msgstr "Nyugati (ISO-8859-1)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:188
+msgid "Whether to convert to spaces or underscores when renaming files"
+msgstr ""
 
-# src/trans.h:276
-#: ../src/charset.c:96
-msgid "Western (ISO-8859-15)"
-msgstr "Nyugati (ISO-8859-15)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:189
+msgid "How to modify filename extensions when renaming"
+msgstr ""
 
-# src/trans.h:278
-#: ../src/charset.c:97
-msgid "Western (Windows-1252)"
-msgstr "Nyugati (Windows-1252)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:190
+msgid ""
+"Change the file extension to all lower-case, all upper-case or do not change "
+"it"
+msgstr ""
 
-#: ../src/charset.c:511
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:191
+msgid "Encoding options when renaming files"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:192
+msgid ""
+"If the encoding of the filename does not match the filesystem encoding, "
+"choose whether to try another encoding, approximate the filesystem encoding "
+"with transliteration or discard the offending characters"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:194
+#, fuzzy
+#| msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
+msgid ""
+"Whether to replace illegal characters in a filename when using the rename "
+"function"
+msgstr ""
+"Szabálytalan karakterek cseréje a fájlnevekben (Windows és CD-ROM számára)"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:195
+#, fuzzy
+#| msgid "Show / Hide Masks Editor"
+msgid "Show the scanner mask editor"
+msgstr "Maszkszerkesztő megjelenítése / elrejtése"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:196
+msgid "Whether to show the scanner mask editor in the tag scanner"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:197
+#, fuzzy
+#| msgid "Show scanner"
+msgid "Show the scanner legend"
+msgstr "Feldolgozó megjelenítése"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:198
+#, fuzzy
+#| msgid "Whether to pad the disc field with leading zeroes"
+msgid "Whether to show the scanner legend in the tag scanner"
+msgstr "Legyen-e kitöltve a lemez mező vezető nullákkal"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:199
+#, fuzzy
+#| msgid "Open the Scanner Window on startup"
+msgid "Show the scanner window on startup"
+msgstr "Feldolgozóablak megnyitása indításkor"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:201
+msgid "The scan mode"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:202
+msgid "Which type of scan to show in the scanner"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:203
+msgid "Split Ogg title fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:205
+msgid "Split Ogg artist fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:207
+msgid "Split Ogg album fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:209
+msgid "Split Ogg genre fields"
+msgstr ""
+
+# bubble help
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:211
+#, fuzzy
+#| msgid "Process comment field"
+msgid "Split Ogg comment fields"
+msgstr "A megjegyzés mező feldolgozása"
+
+# bubble help
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:213
+#, fuzzy
+#| msgid "Process composer field"
+msgid "Split Ogg composer fields"
+msgstr "A zeneszerző mező feldolgozása"
+
+# bubble help
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:215
+#, fuzzy
+#| msgid "Process original artist field"
+msgid "Split Ogg original artist fields"
+msgstr "Az eredeti előadó mező feldolgozása"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:217
+msgid "Page to show in the preferences dialog"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:218
+msgid "The page in the notebook of the preferences dialog"
+msgstr ""
+
+#: ../nautilus-extension/nautilus-easytag.c:229
+msgid "Open in EasyTAG"
+msgstr "Megnyitás az EasyTAG programban"
+
+#: ../nautilus-extension/nautilus-easytag.c:230
+#, fuzzy
+#| msgid "Open the current selected directory in EasyTAG"
+msgid "Open the selected directory in EasyTAG"
+msgstr "A jelenleg kijelölt könyvtár megnyitása az EasyTAG programban"
+
+#: ../nautilus-extension/nautilus-easytag.c:247
+msgid "Open with EasyTAG"
+msgstr "Megnyitás az EasyTAG programmal"
+
+# Fájl menü
+#: ../nautilus-extension/nautilus-easytag.c:248
+#, fuzzy
+#| msgid "Open selected files in EasyTAG"
+msgid "Open the selected files in EasyTAG"
+msgstr "A kijelölt fájlok megnyitása az EasyTAG programban"
+
+#. Translators: put your own name here to appear in the about dialog.
+#: ../src/about.c:90
+msgid "translator-credits"
+msgstr ""
+"Mészáros Csaba <csablak at freemail.hu>\n"
+"Nagy Boldizsar <boldi01 at freemail.hu>\n"
+"Szél Miklós <mukka at freemail.hu>\n"
+"Úr Balázs <urbalazs at gmail.com>"
+
+#: ../src/about.c:100
+msgid "View and edit tags in audio files"
+msgstr "Hangfájlokban lévő címkék megtekintése és szerkesztése"
+
+#: ../src/application.c:46
+msgid "Print the version and exit"
+msgstr "A verzió kiírása és kilépés"
+
+#. Starting messages
+#: ../src/application.c:177
 #, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
-msgstr "A fájlnév („%s”) nem alakítható át UTF-8 kódolásra (%s)."
+msgid "Starting EasyTAG version %s (PID: %d)…"
+msgstr "Az EasyTAG %s verziójának indítása (PID: %d)…"
 
-# src/trans.h:267
-#: ../src/charset.c:512 ../src/charset.c:611 ../src/charset.c:674
-msgid "Invalid UTF-8"
-msgstr "Érvénytelen UTF-8"
+#: ../src/application.c:183
+#, fuzzy, c-format
+#| msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
+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/application.c:188
+#, fuzzy, c-format
+#| msgid "Setting locale: '%s'"
+msgid "Setting locale: ‘%s’"
+msgstr "Területi beállítás beállítása: „%s”"
 
-#: ../src/charset.c:610
+#: ../src/application.c:194
 #, c-format
-msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
-msgstr "A UTF-8 karakterlánc („%s”) nem alakítható át fájlnév kódolássá (%s)."
+msgid "System locale is ‘%s’, using ‘%s’"
+msgstr ""
+
+#: ../src/application.c:199
+msgid "Unable to create setting directories"
+msgstr "Nem lehet létrehozni a beállítás könyvtárakat"
+
+#: ../src/application.c:340
+#, c-format
+msgid "Website: %s"
+msgstr "Weboldal: %s"
+
+#: ../src/application.c:349
+msgid "- Tag and rename audio files"
+msgstr "- Hangfájlok címkézése és átnevezése"
+
+#: ../src/application.c:433 ../src/et_core.c:630 ../src/et_core.c:644
+#, fuzzy, c-format
+#| msgid "Error while querying information for 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/application.c:497
+#, fuzzy, c-format
+#| msgid "Cannot open path '%s'"
+msgid "Cannot open path ‘%s’"
+msgstr "Nem nyitható meg az útvonal: „%s”"
+
+#: ../src/application_window.c:316 ../src/application_window.c:333
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the file '%s'?"
+msgid "Do you really want to delete the file ‘%s’?"
+msgstr "Biztosan törölni szeretné a(z) „%s” fájlt?"
+
+#: ../src/application_window.c:319 ../src/easytag.c:511 ../src/easytag.c:636
+msgid "Repeat action for the remaining files"
+msgstr "Művelet ismétlése a hátralevő fájlokra"
+
+#: ../src/application_window.c:321
+msgid "_Skip"
+msgstr ""
+
+# Fájl menü
+#: ../src/application_window.c:323 ../src/application_window.c:337
+#, fuzzy
+#| msgid "Delete File"
+msgid "_Delete"
+msgstr "Fájl törlése"
+
+# Fájl menü
+#: ../src/application_window.c:325 ../src/application_window.c:335
+msgid "Delete File"
+msgstr "Fájl törlése"
+
+#: ../src/application_window.c:362
+#, fuzzy, c-format
+#| msgid "File '%s' deleted"
+msgid "File ‘%s’ deleted"
+msgstr "A(z) „%s” fájl törölve"
+
+#: ../src/application_window.c:539
+#, fuzzy, c-format
+#| msgid "Cannot delete file (%s)"
+msgid "Cannot delete file ‘%s’"
+msgstr "Nem törölhető a fájl (%s)"
+
+#: ../src/application_window.c:560
+#, fuzzy
+#| msgid "All files have been deleted"
+msgid "Some files were not deleted"
+msgstr "Minden fájl törölve"
+
+#: ../src/application_window.c:562
+msgid "All files have been deleted"
+msgstr "Minden fájl törölve"
+
+#: ../src/application_window.c:901
+msgid "All tags have been removed"
+msgstr "Minden címke eltávolítva"
+
+#. Quit EasyTAG.
+#: ../src/application_window.c:2573
+#, fuzzy
+#| msgid "EasyTAG: Normal exit."
+msgid "Normal exit"
+msgstr "EasyTAG: Normális kilépés."
+
+#: ../src/application_window.c:2610 ../src/browser.c:843
+msgid "Some files have been modified but not saved"
+msgstr "Néhány fájl módosult de nincs elmentve"
+
+#: ../src/application_window.c:2611 ../src/browser.c:847 ../src/easytag.c:294
+#: ../src/easytag.c:515 ../src/easytag.c:639 ../src/easytag.c:647
+#, fuzzy
+#| msgid "Disc"
+msgid "_Discard"
+msgstr "Lemez"
+
+#: ../src/application_window.c:2613 ../src/browser.c:849 ../src/easytag.c:295
+#: ../src/easytag.c:517 ../src/easytag.c:524 ../src/easytag.c:641
+#: ../src/easytag.c:648 ../src/playlist_dialog.c:656 ../src/tag_area.c:1845
+#, fuzzy
+#| msgid "Save"
+msgid "_Save"
+msgstr "Mentés"
+
+# ikon megjegyzés
+#: ../src/application_window.c:2617 ../src/application_window.c:2655
+#: ../src/easytag.c:300
+msgid "Quit"
+msgstr "Kilépés"
+
+#: ../src/application_window.c:2620
+msgid "Do you want to save them before quitting?"
+msgstr "El szeretné menteni azokat kilépés előtt?"
+
+#: ../src/application_window.c:2649
+msgid "Do you really want to quit?"
+msgstr "Biztosan ki szeretne lépni?"
+
+#: ../src/browser.c:553
+#, fuzzy
+#| msgid "Select a directory to browse"
+msgid "New default directory selected for browser"
+msgstr "Válassza ki az átvizsgálandó könyvtárat"
 
-#: ../src/charset.c:673
-#, c-format
-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)."
+#: ../src/browser.c:846
+#, fuzzy
+#| msgid "Do you want to save them before changing the directory?"
+msgid "Do you want to save them before changing directory?"
+msgstr "El szeretné menteni azokat, mielőtt könyvtárat vált?"
 
-#. Starting messages
-#: ../src/easytag.c:185
-#, c-format
-msgid "Starting EasyTAG version %s (PID: %d)…"
-msgstr "Az EasyTAG %s verziójának indítása (PID: %d)…"
+#: ../src/browser.c:853
+msgid "Confirm Directory Change"
+msgstr "Könyvtárváltás megerősítése"
 
-#: ../src/easytag.c:187
-#, c-format
-msgid "Using libid3tag version %s"
-msgstr "A(z) %s verziójú libid3tag használata"
+#: ../src/browser.c:2531
+msgid "<All albums>"
+msgstr "<Minden album>"
 
-#: ../src/easytag.c:190
-#, c-format
-msgid "Using id3lib version %d.%d.%d"
-msgstr "A(z) %d.%d.%d verziójú id3lib használata"
+#: ../src/browser.c:4139
+#, fuzzy, c-format
+#| msgid "Rename the directory '%s' to:"
+msgid "Rename the directory ‘%s’ to:"
+msgstr "A(z) „%s” könyvtár átnevezése erre:"
 
-#: ../src/easytag.c:196
-#, c-format
-msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
-msgstr ""
-"Az EASYTAGLANG változó meghatározva. Területi beállítás beállítása: „%s”"
+#: ../src/browser.c:4279
+msgid "You must type a directory name"
+msgstr "Meg kell adnia egy könyvtárnevet"
 
-#: ../src/easytag.c:198
-#, c-format
-msgid "Setting locale: '%s'"
-msgstr "Területi beállítás beállítása: „%s”"
+#: ../src/browser.c:4280 ../src/browser.c:4302
+msgid "Directory Name Error"
+msgstr "Könyvtárnév hiba"
 
-#: ../src/easytag.c:203
-#, c-format
-msgid "Currently using locale '%s' (and eventually '%s')"
-msgstr "A jelenleg használt területi beállítások: „%s” (és végül „%s”)"
+#: ../src/browser.c:4298
+#, fuzzy, c-format
+#| msgid "Could not convert '%s' into filename encoding."
+msgid "Could not convert ‘%s’ into filename encoding"
+msgstr "„%s” nem alakítható át fájlnév kódolássá."
 
-#: ../src/easytag.c:210
-msgid "Unable to create setting directories"
-msgstr "Nem lehet létrehozni a beállítás könyvtárakat"
+#: ../src/browser.c:4301
+#, fuzzy
+#| msgid "Please use another name"
+msgid "Please use another name."
+msgstr "Kérem használjon egy másik nevet"
 
-#: ../src/easytag.c:427 ../src/et_core.c:638 ../src/et_core.c:650
-#, c-format
-msgid "Error while querying information for file: '%s' (%s)"
-msgstr "Hiba a fájl információinak lekérése közben: „%s” (%s)"
+#: ../src/browser.c:4372
+#, fuzzy, c-format
+#| msgid "The directory name '%s' already exists"
+msgid "The directory name ‘%s’ already exists."
+msgstr "Már létezik „%s” nevű könyvtár"
 
-#: ../src/easytag.c:490
-#, c-format
-msgid "Cannot open path '%s'"
-msgstr "Nem nyitható meg az útvonal: „%s”"
+#: ../src/browser.c:4373 ../src/easytag.c:696
+msgid "Rename File Error"
+msgstr "Fájl átnevezési hiba"
 
-#.
-#. * Browser
-#.
-#: ../src/easytag.c:583 ../src/prefs.c:142
-msgid "Browser"
-msgstr "Böngésző"
+# böngésző menü
+#: ../src/browser.c:4411 ../src/browser.c:4440
+msgid "Rename Directory Error"
+msgstr "Könyvtár átnevezési hiba"
 
-#: ../src/easytag.c:605 ../src/et_core.c:2858
-msgid "File"
-msgstr "Fájl"
+#: ../src/browser.c:4479
+msgid "Directory renamed"
+msgstr "Könyvtár átnevezve"
 
-#. Default values are MPs data
-#. 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:637 ../src/easytag.c:4226 ../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 "Kódoló:"
+#: ../src/cddb_dialog.c:271
+#, fuzzy, c-format
+#| msgid ""
+#| "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
+msgid ""
+"Album: ‘%s’, artist: ‘%s’, length: ‘%s’, year: ‘%s’, genre: ‘%s’, disc ID: "
+"‘%s’"
+msgstr ""
+"Album: „%s”, előadó: „%s”, hossz: „%s”, év: „%s”, műfaj: „%s”, azonosító: "
+"„%s”"
 
-#: ../src/easytag.c:645
-msgid "Bitrate:"
-msgstr "Bitsebesség:"
+#: ../src/cddb_dialog.c:589
+#, c-format
+msgid "Resolving host '%s'…"
+msgstr "A(z) „%s” név feloldása…"
 
-#. Translators: Please try to keep this string as short as possible as it
-#. * is shown in a narrow column.
-#: ../src/easytag.c:655
-msgid "Frequency:"
-msgstr "Frekvencia:"
+#: ../src/cddb_dialog.c:631
+#, fuzzy, c-format
+#| msgid "Cannot create a new socket (%s)"
+msgid "Cannot create a new socket ‘%s’"
+msgstr "Nem hozható létre új foglalat (%s)"
 
-#. Mode
-#: ../src/easytag.c:666 ../src/easytag.c:4230 ../src/mpeg_header.c:216
-msgid "Mode:"
-msgstr "Mód:"
+#: ../src/cddb_dialog.c:645
+msgid "Cannot set options on the newly-created socket"
+msgstr "Nem lehet beállítani a kapcsolókat az újonnan létrehozott foglalathoz"
 
-#: ../src/easytag.c:673
-msgid "Size:"
-msgstr "Méret:"
+#. Open connection to the server.
+#: ../src/cddb_dialog.c:649
+#, fuzzy, c-format
+#| msgid "Connecting to host '%s', port '%d'…"
+msgid "Connecting to host ‘%s’, port ‘%d’…"
+msgstr "Kapcsolódás a(z) „%s” géphez a „%d” porton…"
 
-#: ../src/easytag.c:680
-msgid "Duration:"
-msgstr "Időtartam:"
+#: ../src/cddb_dialog.c:662
+#, fuzzy, c-format
+#| msgid "Cannot connect to host '%s' (%s)"
+msgid "Cannot connect to host ‘%s’: %s"
+msgstr "Nem lehet kapcsolódni a(z) „%s” géphez (%s)"
 
-#. Main Frame
-#: ../src/easytag.c:726 ../src/et_core.c:2788
-msgid "Tag"
-msgstr "Címke"
+#: ../src/cddb_dialog.c:686
+#, fuzzy, c-format
+#| msgid "Cannot resolve host '%s' (%s)"
+msgid "Cannot resolve host ‘%s’: %s"
+msgstr "Nem oldható fel a(z) „%s” gép (%s)"
 
-#.
-#. * 1 - Page for common tag fields
-#.
-#: ../src/easytag.c:748
-msgid "Common"
-msgstr "Közös"
+#: ../src/cddb_dialog.c:699
+#, fuzzy, c-format
+#| msgid "Connected to host '%s'"
+msgid "Connected to host ‘%s’"
+msgstr "Kapcsolódva a(z) „%s” géphez"
 
-#. Title
-#: ../src/easytag.c:755
-msgid "Title:"
-msgstr "Cím:"
+#: ../src/cddb_dialog.c:786
+#, fuzzy, c-format
+#| msgid "Error while writing CDDB results to file '%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”"
 
-# bubble help
-#: ../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"
+#: ../src/cddb_dialog.c:797
+#, c-format
+msgid "Receiving data (%s)…"
+msgstr "Adatok fogadása (%s)…"
 
-#. Artist
-#: ../src/easytag.c:774
-msgid "Artist:"
-msgstr "Előadó:"
+#: ../src/cddb_dialog.c:810
+#, fuzzy, c-format
+#| msgid "Error when reading CDDB response (%s)"
+msgid "Error when reading CDDB response ‘%s’"
+msgstr "Hiba történt a CDDB válasz olvasásakor (%s)"
 
-# bubble help
-#: ../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"
+#: ../src/cddb_dialog.c:817
+#, fuzzy, c-format
+#| msgid "Cannot create file '%s' (%s)"
+msgid "Cannot create file ‘%s’: %s"
+msgstr "Nem hozható létre a(z) „%s” fájl (%s)"
 
-#. Album Artist
-#: ../src/easytag.c:793
-msgid "Album artist:"
-msgstr "Album előadója:"
+#: ../src/cddb_dialog.c:879
+#, fuzzy, c-format
+#| msgid "Can't load file: '%s' (%s)."
+msgid "Cannot load file ‘%s’: %s"
+msgstr "Nem tölthető be a fájl: „%s” (%s)."
 
-# bubble help
-#: ../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"
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#: ../src/cddb_dialog.c:950 ../src/cddb_dialog.c:1553
+#: ../src/cddb_dialog.c:1891
+msgid "Sending request…"
+msgstr "Kérés küldése…"
 
-#. Album
-#: ../src/easytag.c:812
-msgid "Album:"
-msgstr "Album:"
+#: ../src/cddb_dialog.c:954 ../src/cddb_dialog.c:1557
+#: ../src/cddb_dialog.c:1895 ../src/cddb_dialog.c:3408
+#, fuzzy, c-format
+#| msgid "Cannot send the request (%s)"
+msgid "Cannot send the request ‘%s’"
+msgstr "Nem küldhető el a kérés (%s)"
 
-#: ../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"
+#. Read the answer
+#.
+#. * Read the answer
+#.
+#: ../src/cddb_dialog.c:966 ../src/cddb_dialog.c:1584
+#: ../src/cddb_dialog.c:3424
+msgid "Receiving data…"
+msgstr "Adatok fogadása…"
 
-#. Disc Number
-#: ../src/easytag.c:831
-msgid "CD:"
-msgstr "CD:"
+#: ../src/cddb_dialog.c:973 ../src/cddb_dialog.c:1591
+#: ../src/cddb_dialog.c:1926 ../src/cddb_dialog.c:3431
+msgid "The server returned a bad response"
+msgstr "A kiszolgáló rossz választ adott vissza"
 
-#: ../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"
+#: ../src/cddb_dialog.c:989 ../src/cddb_dialog.c:1005
+#: ../src/cddb_dialog.c:1604 ../src/cddb_dialog.c:1942
+#: ../src/cddb_dialog.c:3446
+#, fuzzy, c-format
+#| msgid "The server returned a bad response: %s"
+msgid "The server returned a bad response ‘%s’"
+msgstr "A kiszolgáló rossz választ adott vissza: %s"
 
-#. Year
-#: ../src/easytag.c:853
-msgid "Year:"
-msgstr "Év:"
+#. Load the track list of the album
+#: ../src/cddb_dialog.c:1195
+msgid "Loading album track list…"
+msgstr "Az album számlistájának betöltése…"
 
-#: ../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/cddb_dialog.c:1751
+#, 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/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."
+#: ../src/cddb_dialog.c:1753 ../src/cddb_dialog.c:2113
+#, 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ó"
 
-#. To have enough space to display the icon
-#. To have enough space to display the icon
-#: ../src/easytag.c:896
-msgid "Track #:"
-msgstr "Szám #:"
+#: ../src/cddb_dialog.c:1914
+#, c-format
+msgid "Receiving data of page %d (album %d/%d)…"
+msgstr "A(z) %d. oldal adatainak fogadása (album %d/%d)…"
 
-#: ../src/easytag.c:927
-msgid ""
-"Set the number of files, in the same directory of the displayed file, to the "
-"selected tracks."
-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/cddb_dialog.c:1916
+#, c-format
+msgid "Receiving data of page %d…"
+msgstr "A(z) %d. oldal adatainak fogadása…"
 
-#: ../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"
+#: ../src/cddb_dialog.c:2080
+#, c-format
+msgid "More results to load…"
+msgstr "További betöltendő eredmények…"
 
-#. Genre
-#: ../src/easytag.c:951
-msgid "Genre:"
-msgstr "Műfaj:"
+#: ../src/cddb_dialog.c:2261
+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/easytag.c:979
-msgid "Tag selected files with this genre"
-msgstr "A kijelölt fájlok címkézése ezzel a műfajjal"
+#: ../src/cddb_dialog.c:2267
+msgid "Write Tag from CDDB"
+msgstr "Címke írása a CD-adatbázisból"
 
-#. Comment
-#: ../src/easytag.c:984
-msgid "Comment:"
-msgstr "Megjegyzés:"
+#: ../src/cddb_dialog.c:2935
+msgid "Ready to search"
+msgstr "Keresésre kész"
 
-#: ../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"
+#: ../src/cddb_dialog.c:3023 ../src/load_files_dialog.c:261
+#: ../src/setting.c:247
+#, fuzzy, c-format
+#| msgid "Cannot open file '%s' (%s)"
+msgid "Cannot open file ‘%s’: %s"
+msgstr "Nem nyitható meg a(z) „%s” fájl (%s)"
 
-#. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
-#. Composer (name of the composers)
-#: ../src/easytag.c:1018
-msgid "Composer:"
-msgstr "Zeneszerző:"
+#: ../src/cddb_dialog.c:3245
+#, c-format
+msgid "No file selected"
+msgstr "Nincs fájl kiválasztva"
 
-#: ../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 "
+#. 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_dialog.c:3253
+#, 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"
 
-#. 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 "Eredeti előadó:"
+#: ../src/cddb_dialog.c:3259
+#, 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/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"
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: ../src/cddb_dialog.c:3398
+#, fuzzy, c-format
+#| msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"
+msgid "Sending request (disc ID: %s, #tracks: %d, Disc length: %d)…"
+msgstr "Kérés küldése (CddbId: %s, #számok: %d, Lemez hossz: %d)…"
 
-#. Copyright
-#: ../src/easytag.c:1059
-msgid "Copyright:"
-msgstr "Szerzői jog:"
+#: ../src/cddb_dialog.c:3559
+#, fuzzy, c-format
+#| msgid "DiscID '%s' gave one matching album"
+#| msgid_plural "DiscID '%s' gave %d matching albums"
+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/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"
+#: ../src/charset.c:49
+msgid "Arabic (IBM-864)"
+msgstr "Arab (IBM-864)"
 
-#. URL
-#: ../src/easytag.c:1079
-msgid "URL:"
-msgstr "URL:"
+# src/trans.h:230
+#: ../src/charset.c:50
+msgid "Arabic (ISO-8859-6)"
+msgstr "Arab (ISO-8859-6)"
 
-#: ../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"
+# src/trans.h:231
+#: ../src/charset.c:51
+msgid "Arabic (Windows-1256)"
+msgstr "Arab (Windows-1256)"
 
-#. Encoded by
-#: ../src/easytag.c:1099
-msgid "Encoded by:"
-msgstr "Kódolta:"
+# src/trans.h:229
+#: ../src/charset.c:52
+msgid "Baltic (ISO-8859-13)"
+msgstr "Balti (ISO-8859-13)"
 
-#: ../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"
+# src/trans.h:230
+#: ../src/charset.c:53
+msgid "Baltic (ISO-8859-4)"
+msgstr "Balti (ISO-8859-4)"
 
-#.
-#. * 2 - Page for extra tag fields
-#.
-#: ../src/easytag.c:1146 ../src/et_core.c:3230 ../src/et_core.c:3233
-msgid "Images"
-msgstr "Képek"
+# src/trans.h:231
+#: ../src/charset.c:54
+msgid "Baltic (Windows-1257)"
+msgstr "Balti (Windows-1257)"
 
-#: ../src/easytag.c:1170
-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/trans.h:232
+#: ../src/charset.c:55
+msgid "Celtic (ISO-8859-14)"
+msgstr "Kelta (ISO-8859-14)"
 
-#: ../src/easytag.c:1219
-msgid "Add images to the tag"
-msgstr "Képek hozzáadása a címkéhez"
+# src/trans.h:233
+#: ../src/charset.c:56
+msgid "Central European (IBM-852)"
+msgstr "Közép-európai (IBM-852)"
 
-#: ../src/easytag.c:1237
-msgid "Remove selected images from the tag"
-msgstr "A kijelölt képek eltávolítása a címkéből"
+# src/trans.h:234
+#: ../src/charset.c:57
+msgid "Central European (ISO-8859-2)"
+msgstr "Közép-európai (ISO-8859-2)"
 
-#: ../src/easytag.c:1248
-msgid "Save the selected images to files"
-msgstr "A kijelölt képek mentése fájlokba"
+# src/trans.h:236
+#: ../src/charset.c:58
+msgid "Central European (Windows-1250)"
+msgstr "Közép-európai (Windows-1250)"
 
-#: ../src/easytag.c:1259
-msgid "Edit image properties"
-msgstr "Képtulajdonságok szerkesztése"
+# src/trans.h:238
+#: ../src/charset.c:59
+msgid "Chinese Simplified (GB18030)"
+msgstr "Egyszerűsített kínai (GB18030)"
 
-#: ../src/easytag.c:1270
-msgid "Tag selected files with these images"
-msgstr "A kijelölt fájlok címkézése ezekkel a képekkel"
+# src/trans.h:237
+#: ../src/charset.c:60
+msgid "Chinese Simplified (GB2312)"
+msgstr "Egyszerűsített kínai (GB2312)"
 
-#: ../src/easytag.c:1328
-#, c-format
-msgid "Selected files tagged with title '%s'."
-msgstr "A kijelölt fájlok megcímkézve a címmel: „%s”."
+# src/trans.h:240
+#: ../src/charset.c:61
+msgid "Chinese Traditional (Big5)"
+msgstr "Hagyományos kínai (Big5)"
 
-#: ../src/easytag.c:1330
-msgid "Removed title from selected files."
-msgstr "A cím eltávolítva a kijelölt fájlokból."
+# src/trans.h:240
+#: ../src/charset.c:62
+msgid "Chinese Traditional (Big5-HKSCS)"
+msgstr "Hagyományos kínai (Big5-HKSCS)"
 
-#: ../src/easytag.c:1345
-#, c-format
-msgid "Selected files tagged with artist '%s'."
-msgstr "A kijelölt fájlok megcímkézve az előadóval: „%s”."
+# src/trans.h:243
+#: ../src/charset.c:63
+msgid "Cyrillic (IBM-855)"
+msgstr "Cirill (IBM-855)"
 
-#: ../src/easytag.c:1347
-msgid "Removed artist from selected files."
-msgstr "Az előadó eltávolítva a kijelölt fájlokból."
+# src/trans.h:244
+#: ../src/charset.c:64
+msgid "Cyrillic (ISO-8859-5)"
+msgstr "Cirill (ISO-8859-5)"
 
-#: ../src/easytag.c:1361
-#, 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/trans.h:245
+#: ../src/charset.c:65
+msgid "Cyrillic (ISO-IR-111)"
+msgstr "Cirill (ISO-IR-111)"
 
-#: ../src/easytag.c:1363
-msgid "Removed album artist from selected files."
-msgstr "Az album előadó eltávolítva a kijelölt fájlokból."
+# src/trans.h:243
+#: ../src/charset.c:66
+msgid "Cyrillic (KOI8-R)"
+msgstr "Cirill (KOI8-R)"
 
-#: ../src/easytag.c:1378
-#, c-format
-msgid "Selected files tagged with album '%s'."
-msgstr "A kijelölt fájlok megcímkézve az albummal: „%s”."
+# src/trans.h:246
+#: ../src/charset.c:67
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cirill (Windows-1251)"
 
-#: ../src/easytag.c:1380
-msgid "Removed album name from selected files."
-msgstr "Az albumnév eltávolítva a kijelölt fájlokból."
+# src/trans.h:247
+#: ../src/charset.c:68
+msgid "Cyrillic/Russian (CP-866)"
+msgstr "Cirill/Orosz (CP-866)"
 
-#: ../src/easytag.c:1417
-#, c-format
-msgid "Selected files tagged with disc number '%s/%s'."
-msgstr "A kijelölt fájlok megcímkézve a lemezszámmal: „%s/%s”."
+# src/trans.h:248
+#: ../src/charset.c:69
+msgid "Cyrillic/Ukrainian (KOI8-U)"
+msgstr "Cirill/Ukrán (KOI8-U)"
 
-#: ../src/easytag.c:1422
-#, c-format
-msgid "Selected files tagged with disc number like 'xx'."
-msgstr "A kijelölt fájlok megcímkézve a lemezszámmal úgymint „xx”."
+# src/trans.h:293
+#: ../src/charset.c:70
+msgid "English (US-ASCII)"
+msgstr "Angol (US-ASCII)"
 
-#: ../src/easytag.c:1427
-msgid "Removed disc number from selected files."
-msgstr "A lemezszám eltávolítva a kijelölt fájlokból."
+# src/trans.h:250
+#: ../src/charset.c:71
+msgid "Greek (ISO-8859-7)"
+msgstr "Görög (ISO-8859-7)"
 
-#: ../src/easytag.c:1443
-#, c-format
-msgid "Selected files tagged with year '%s'."
-msgstr "A kijelölt fájlok megcímkézve az évszámmal: „%s”."
+# src/trans.h:252
+#: ../src/charset.c:72
+msgid "Greek (Windows-1253)"
+msgstr "Görög (Windows-1253)"
 
-#: ../src/easytag.c:1445
-msgid "Removed year from selected files."
-msgstr "Az évszám eltávolítva a kijelölt fájlokból."
+# src/trans.h:274
+#: ../src/charset.c:73
+msgid "Hebrew (IBM-862)"
+msgstr "Héber (IBM-862)"
 
-#: ../src/easytag.c:1471 ../src/easytag.c:1561
-#, 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/trans.h:252
+#: ../src/charset.c:74
+msgid "Hebrew (Windows-1255)"
+msgstr "Héber (Windows-1255)"
 
-#: ../src/easytag.c:1474
-#, 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/trans.h:254
+#: ../src/charset.c:75
+msgid "Japanese (EUC-JP)"
+msgstr "Japán (EUC-JP)"
 
-#: ../src/easytag.c:1478 ../src/easytag.c:1564
-msgid "Removed track number from selected files."
-msgstr "A szám sorszáma eltávolítva a kijelölt fájlokból."
+# src/trans.h:255
+#: ../src/charset.c:76
+msgid "Japanese (ISO-2022-JP)"
+msgstr "Japán (ISO-2022-JP)"
 
-#. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1534
-#, c-format
-msgid "Selected tracks numbered sequentially."
-msgstr "A kijelölt számok növekvően sorszámozva."
+# src/trans.h:256
+#: ../src/charset.c:77
+msgid "Japanese (Shift_JIS)"
+msgstr "Japán (Shift JIS)"
 
-#: ../src/easytag.c:1580
-#, c-format
-msgid "Selected files tagged with genre '%s'."
-msgstr "A kijelölt fájlok megcímkézve a műfajjal: „%s”."
+# src/trans.h:257
+#: ../src/charset.c:78
+msgid "Korean (EUC-KR)"
+msgstr "Koreai (EUC-KR)"
 
-#: ../src/easytag.c:1582
-msgid "Removed genre from selected files."
-msgstr "A műfaj eltávolítva a kijelölt fájlokból."
+# src/trans.h:258
+#: ../src/charset.c:79
+msgid "Nordic (ISO-8859-10)"
+msgstr "Északi (ISO-8859-10)"
 
-#: ../src/easytag.c:1604
-#, c-format
-msgid "Selected files tagged with comment '%s'."
-msgstr "A kijelölt fájlok megcímkézve a megjegyzéssel: „%s”."
+# src/trans.h:260
+#: ../src/charset.c:80
+msgid "South European (ISO-8859-3)"
+msgstr "Dél-európai (ISO-8859-3)"
 
-#: ../src/easytag.c:1606
-msgid "Removed comment from selected files."
-msgstr "A megjegyzés eltávolítva a kijelölt fájlokból."
+# src/trans.h:261
+#: ../src/charset.c:81
+msgid "Thai (TIS-620)"
+msgstr "Thai (TIS-620)"
 
-#: ../src/easytag.c:1620
-#, c-format
-msgid "Selected files tagged with composer '%s'."
-msgstr "A kijelölt fájlok megcímkézve a zeneszerzővel: „%s”."
+# src/trans.h:262
+#: ../src/charset.c:82
+msgid "Turkish (IBM-857)"
+msgstr "Török (IBM-857)"
 
-#: ../src/easytag.c:1622
-msgid "Removed composer from selected files."
-msgstr "A zeneszerző eltávolítva a kijelölt fájlokból."
+# src/trans.h:263
+#: ../src/charset.c:83
+msgid "Turkish (ISO-8859-9)"
+msgstr "Török (ISO-8859-9)"
 
-#: ../src/easytag.c:1637
-#, 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/trans.h:265
+#: ../src/charset.c:84
+msgid "Turkish (Windows-1254)"
+msgstr "Török (Windows-1254)"
 
-#: ../src/easytag.c:1639
-msgid "Removed original artist from selected files."
-msgstr "Az eredeti előadó eltávolítva a kijelölt fájlokból."
+# src/trans.h:267
+#. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
+#: ../src/charset.c:86
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
 
-#: ../src/easytag.c:1654
-#, c-format
-msgid "Selected files tagged with copyright '%s'."
-msgstr "A kijelölt fájlok megcímkézve a szerzői joggal: „%s”."
+# src/trans.h:269
+#. {N_("Unicode (UTF-16BE)"),                "UTF-16BE"      },
+#. {N_("Unicode (UTF-16LE)"),                "UTF-16LE"      },
+#. {N_("Unicode (UTF-32BE)"),                "UTF-32BE"      },
+#. {N_("Unicode (UTF-32LE)"),                "UTF-32LE"      },
+#: ../src/charset.c:93
+msgid "Vietnamese (VISCII)"
+msgstr "Vietnámi (VISCII)"
 
-#: ../src/easytag.c:1656
-msgid "Removed copyright from selected files."
-msgstr "A szerzői jog eltávolítva a kijelölt fájlokból."
+# src/trans.h:271
+#: ../src/charset.c:94
+msgid "Vietnamese (Windows-1258)"
+msgstr "Vietnámi (Windows-1258)"
 
-#: ../src/easytag.c:1671
-#, c-format
-msgid "Selected files tagged with URL '%s'."
-msgstr "A kijelölt fájlok megcímkézve az URL-lel: „%s”."
+# src/trans.h:272
+#: ../src/charset.c:95
+msgid "Visual Hebrew (ISO-8859-8)"
+msgstr "Vizuális héber (ISO-8859-8)"
 
-#: ../src/easytag.c:1673
-msgid "Removed URL from selected files."
-msgstr "Az URL eltávolítva a kijelölt fájlokból."
+# src/trans.h:274
+#: ../src/charset.c:96
+msgid "Western (IBM-850)"
+msgstr "Nyugati (IBM-850)"
 
-#: ../src/easytag.c:1688
-#, 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/trans.h:275
+#: ../src/charset.c:97
+msgid "Western (ISO-8859-1)"
+msgstr "Nyugati (ISO-8859-1)"
 
-#: ../src/easytag.c:1690
-msgid "Removed encoder name from selected files."
-msgstr "A kodoló neve eltávolítva a kijelölt fájlokból."
+# src/trans.h:276
+#: ../src/charset.c:98
+msgid "Western (ISO-8859-15)"
+msgstr "Nyugati (ISO-8859-15)"
 
-#: ../src/easytag.c:1722
-msgid "Selected files tagged with images."
-msgstr "A kijelölt fájlok megcímkézve a képekkel."
+# src/trans.h:278
+#: ../src/charset.c:99
+msgid "Western (Windows-1252)"
+msgstr "Nyugati (Windows-1252)"
 
-#: ../src/easytag.c:1724
-msgid "Removed images from selected files."
-msgstr "A képek eltávolítva a kijelölt fájlokból."
+#: ../src/charset.c:511
+#, fuzzy, c-format
+#| msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
+msgid "The filename ‘%s’ could not be converted into UTF-8: %s"
+msgstr "A fájlnév („%s”) nem alakítható át UTF-8 kódolásra (%s)."
 
-#: ../src/easytag.c:2005
-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/trans.h:267
+#: ../src/charset.c:513 ../src/charset.c:626 ../src/charset.c:691
+msgid "Invalid UTF-8"
+msgstr "Érvénytelen UTF-8"
 
-#: ../src/easytag.c:2057
-msgid "All tags have been scanned"
-msgstr "Minden címke feldolgozva"
+#: ../src/charset.c:624
+#, fuzzy, c-format
+#| msgid ""
+#| "The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
+msgid "The UTF-8 string ‘%s’ could not be converted into filename encoding: %s"
+msgstr "A UTF-8 karakterlánc („%s”) nem alakítható át fájlnév kódolássá (%s)."
 
-#: ../src/easytag.c:2113
-msgid "All tags have been removed"
-msgstr "Minden címke eltávolítva"
+#: ../src/charset.c:689
+#, fuzzy, c-format
+#| msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
+msgid "The string ‘%s’ could not be converted into UTF-8: %s"
+msgstr "A karatterlánc („%s”) nem alakítható át UTF-8 kódolásra (%s)."
 
-#: ../src/easytag.c:2418
-#, c-format
+#: ../src/easytag.c:290
+#, fuzzy, c-format
+#| msgid "A file was changed by an external program"
+#| msgid_plural "%d files were changed by an external program."
 msgid "A file was changed by an external program"
-msgid_plural "%d files were 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:299
 msgid "Do you want to continue saving the file?"
 msgstr "Szeretné folytatni a fájl mentését?"
 
-#: ../src/easytag.c:2481 ../src/easytag.c:2501
+#: ../src/easytag.c:360 ../src/easytag.c:381
 msgid "Saving files was stopped"
 msgstr "A fájlok mentése le lett állítva"
 
-#: ../src/easytag.c:2503
+#: ../src/easytag.c:383
 msgid "All files have been saved"
 msgstr "Minden fájl elmentve"
 
-#: ../src/easytag.c:2638
-#, c-format
-msgid "Cannot delete file (%s)"
-msgstr "Nem törölhető a fájl (%s)"
-
-#: ../src/easytag.c:2659
-msgid "Files have been partially deleted"
-msgstr "A fájlok részlegesen törölve"
-
-#: ../src/easytag.c:2661
-msgid "All files have been deleted"
-msgstr "Minden fájl törölve"
-
-#: ../src/easytag.c:2777
-#, c-format
-msgid "Do you want to write the tag of file '%s'?"
+#: ../src/easytag.c:504
+#, fuzzy, c-format
+#| msgid "Do you want to write the tag of file '%s'?"
+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:2779
+#: ../src/easytag.c:506
 msgid "Confirm Tag Writing"
 msgstr "Címke írásának megerősítése"
 
-#: ../src/easytag.c:2784 ../src/easytag.c:2904 ../src/easytag.c:3167
-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:2868 ../src/scan_dialog.c:183
+#: ../src/easytag.c:599
 msgid "Rename File and Directory"
 msgstr "Fájl és könyvtár átnevezése"
 
-#: ../src/easytag.c:2869
+#: ../src/easytag.c:600
 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:2870
-#, c-format
-msgid "Do you want to rename the file and directory '%s' to '%s'?"
+#: ../src/easytag.c:601
+#, fuzzy, c-format
+#| msgid "Do you want to rename the file and directory '%s' to '%s'?"
+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:2876
+#: ../src/easytag.c:607
 msgid "Directory rename confirmation required"
 msgstr "A könyvtár átnevezése megerősítést igényel"
 
-#: ../src/easytag.c:2877
-#, c-format
-msgid "Do you want to rename the directory '%s' to '%s'?"
+#: ../src/easytag.c:608
+#, fuzzy, c-format
+#| msgid "Do you want to rename the directory '%s' to '%s'?"
+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:2883
-msgid "Rename File"
-msgstr "Fájl átnevezése"
-
-#: ../src/easytag.c:2884
+#: ../src/easytag.c:616
 msgid "File rename confirmation required"
 msgstr "A fájl átnevezése megerősítést igényel"
 
-#: ../src/easytag.c:2885
-#, c-format
-msgid "Do you want to rename the file '%s' to '%s'?"
+#: ../src/easytag.c:617
+#, fuzzy, c-format
+#| msgid "Do you want to rename the file '%s' to '%s'?"
+msgid "Do you want to rename the file ‘%s’ to ‘%s’?"
 msgstr "Szeretné átnevezni a fájlt („%s”) erre: „%s”?"
 
-#: ../src/easytag.c:2951
-#, c-format
-msgid "Cannot rename file '%s' to '%s'"
+#: ../src/easytag.c:689
+#, fuzzy, c-format
+#| msgid "Cannot rename file '%s' to '%s'"
+msgid "Cannot rename file ‘%s’ to ‘%s’"
 msgstr "Nem nevezhető át a(z) „%s” fájl erre: „%s”"
 
-#: ../src/easytag.c:2965
-#, c-format
-msgid "Cannot rename file '%s' to '%s': %s"
+#: ../src/easytag.c:703
+#, fuzzy, c-format
+#| msgid "Cannot rename file '%s' to '%s': %s"
+msgid "Cannot rename file ‘%s’ to ‘%s’: %s"
 msgstr "Nem nevezhető át a(z) „%s” fájl erre: „%s”: %s"
 
-#: ../src/easytag.c:2969
+#: ../src/easytag.c:708
 msgid "File(s) not renamed"
 msgstr "A fájlok nem lettek átnevezve"
 
-#: ../src/easytag.c:3081
-#, c-format
-msgid "Writing tag of '%s'"
+#: ../src/easytag.c:821
+#, fuzzy, c-format
+#| msgid "Writing tag of '%s'"
+msgid "Writing tag of ‘%s’"
 msgstr "„%s” címkéjének írása"
 
-#: ../src/easytag.c:3088
+#: ../src/easytag.c:830
 msgid "Tag(s) written"
 msgstr "Címkék kiírva"
 
-#: ../src/easytag.c:3103
-#, c-format
-msgid "Cannot write tag in file '%s' (%s)"
-msgstr "Nem írható címke a(z) „%s” fájlba (%s)"
-
-#: ../src/easytag.c:3116
-#, c-format
-msgid "Cannot write tag in file '%s'"
+#: ../src/easytag.c:843
+#, fuzzy, c-format
+#| msgid "Cannot write tag in file '%s'"
+msgid "Cannot write tag in file ‘%s’"
 msgstr "Nem írható címke a(z) „%s” fájlba"
 
-#: ../src/easytag.c:3119
-msgid "Tag Write Error"
-msgstr "Címkeírási hiba"
-
-#: ../src/easytag.c:3164 ../src/easytag.c:3178
-#, 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:3170 ../src/easytag.c:3180
-msgid "Delete File"
-msgstr "Fájl törlése"
-
-#: ../src/easytag.c:3205
-#, c-format
-msgid "File '%s' deleted"
-msgstr "A(z) „%s” fájl törölve"
+#: ../src/easytag.c:847
+msgid "Tag Write Error"
+msgstr "Címkeírási hiba"
 
-#: ../src/easytag.c:3340
-#, c-format
-msgid "Cannot read directory '%s'"
+#: ../src/easytag.c:921 ../src/easytag.c:1149
+#, fuzzy, c-format
+#| msgid "Cannot read directory '%s'"
+msgid "Cannot read directory ‘%s’"
 msgstr "A(z) „%s” könyvtár nem olvasható"
 
-#: ../src/easytag.c:3344
+#: ../src/easytag.c:925
 msgid "Directory Read Error"
 msgstr "Könyvtárolvasási hiba"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3365
+#: ../src/easytag.c:946
 #, c-format
 msgid "Search in progress…"
 msgstr "Keresés folyamatban…"
 
-#: ../src/easytag.c:3388 ../src/et_core.c:2865
-#, c-format
-msgid "File: '%s'"
+#: ../src/easytag.c:970 ../src/et_core.c:2863
+#, fuzzy, c-format
+#| msgid "File: '%s'"
+msgid "File: ‘%s’"
 msgstr "Fájl: „%s”"
 
-#: ../src/easytag.c:3438
+#: ../src/easytag.c:1017
 #, c-format
 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:3445
+#: ../src/easytag.c:1024
 #, c-format
 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:3467
+#: ../src/easytag.c:1041
 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:3469
+#: ../src/easytag.c:1043
 msgid "No file found in this directory"
 msgstr "Ebben a könyvtárban nem található fájl"
 
-#: ../src/easytag.c:3537
-#, c-format
-msgid "Error opening directory '%s' (%s)"
+#: ../src/easytag.c:1113
+#, fuzzy, c-format
+#| msgid "Error opening directory '%s' (%s)"
+msgid "Error opening directory ‘%s’: %s"
 msgstr "Hiba a könyvtár megnyitása közben: „%s” (%s)"
 
-#: ../src/easytag.c:3573
-#, c-format
-msgid "Cannot read directory (%s)"
-msgstr "A könyvtár nem olvasható (%s)"
-
-#: ../src/easytag.c:3593
+#: ../src/easytag.c:1169
 msgid "Searching for audio files…"
 msgstr "Hangfájlok keresése…"
 
-#: ../src/easytag.c:3594
+#: ../src/easytag.c:1170
 msgid "Searching"
 msgstr "Keresés"
 
-#: ../src/easytag.c:4260
-msgid "Select a directory to browse"
-msgstr "Válassza ki az átvizsgálandó könyvtárat"
-
-#. Menu items
-#: ../src/easytag.c:4406
-msgid "Tag selected files with this field"
-msgstr "A kijelölt fájlok címkézése ezzel a mezővel"
-
-#: ../src/easytag.c:4418 ../src/scan_dialog.c:2128
-msgid "Convert '_' and '%20' to spaces"
-msgstr "Az „_” és a „%20” átalakítása szóközre"
-
-#: ../src/easytag.c:4425 ../src/scan_dialog.c:2130
-msgid "Convert ' ' to '_'"
-msgstr "A „ ” átalakítása erre: „_”"
-
-#: ../src/easytag.c:4436
-msgid "All uppercase"
-msgstr "MINDENT NAGYBETŰSRE"
-
-#: ../src/easytag.c:4443
-msgid "All lowercase"
-msgstr "mindent kisbetűsre"
-
-#: ../src/easytag.c:4450
-msgid "First letter uppercase"
-msgstr "Első betű legyen nagybetű"
-
-#: ../src/easytag.c:4457
-msgid "First letter uppercase of each word"
-msgstr "Minden Szó Első Betűje Legyen Nagybetű"
-
-#: ../src/easytag.c:4468 ../src/prefs.c:1023 ../src/scan_dialog.c:2254
-msgid "Remove spaces"
-msgstr "Szóközök eltávolítása"
-
-#: ../src/easytag.c:4475
-msgid "Insert space before uppercase letter"
-msgstr "Szóköz beszúrása minden nagybetű elé"
-
-#: ../src/easytag.c:4482
-msgid "Remove duplicate spaces or underscores"
-msgstr "Dupla szóközök vagy alsóvonások eltávolítása"
-
-#: ../src/easytag.c:4489
-msgid "Remove all text"
-msgstr "Minden szöveg eltávolítása"
-
-#: ../src/easytag.c:4508
-msgid "EasyTAG: Normal exit."
-msgstr "EasyTAG: Normális kilépés."
-
-#: ../src/easytag.c:4560
-msgid "Do you want to save them before quitting?"
-msgstr "El szeretné menteni azokat kilépés előtt?"
-
-#: ../src/easytag.c:4587
-msgid "Do you really want to quit?"
-msgstr "Biztosan ki szeretne lépni?"
+#: ../src/easytag.c:1171
+msgid "_Stop"
+msgstr ""
 
-#: ../src/et_core.c:551
-#, c-format
-msgid "Error reading tag from ogg file (%s)"
+#: ../src/et_core.c:541
+#, fuzzy, c-format
+#| msgid "Error reading tag from ogg 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:580
-#, c-format
-msgid "Error reading tag from Opus file (%s)"
+#: ../src/et_core.c:570
+#, fuzzy, c-format
+#| msgid "Error reading tag from Opus file (%s)"
+msgid "Error reading tag from Opus file ‘%s’"
 msgstr "Hiba a címkék olvasása közben az Opus fájlból (%s)"
 
-#: ../src/et_core.c:723
-#, c-format
-msgid "Automatic corrections applied for file '%s'."
+#: ../src/et_core.c:717
+#, fuzzy, c-format
+#| msgid "Automatic corrections applied for file '%s'."
+msgid "Automatic corrections applied for file ‘%s’"
 msgstr "Automatikus javítások alkalmazva a(z) „%s” fájlhoz."
 
-#: ../src/et_core.c:2748
-msgid "ID3 Tag"
-msgstr "ID3 címke"
-
-#: ../src/et_core.c:2754
-msgid "Ogg Vorbis Tag"
-msgstr "Ogg Vorbis címke"
-
-#: ../src/et_core.c:2760
-msgid "FLAC Vorbis Tag"
-msgstr "FLAC Vorbis címke"
-
-#: ../src/et_core.c:2765
-msgid "APE Tag"
-msgstr "APE címke"
-
-#: ../src/et_core.c:2770
-msgid "MP4/M4A/AAC Tag"
-msgstr "MP4/M4A/AAC címke"
-
-#: ../src/et_core.c:2776
-msgid "Wavpack Tag"
-msgstr "Wavpack címke"
-
-#: ../src/et_core.c:2782
-msgid "Opus Tag"
-msgstr "Opus címke"
-
-#: ../src/et_core.c:2802
-msgid "MP3 File"
-msgstr "MP3 fájl"
-
-#: ../src/et_core.c:2806
-msgid "MP2 File"
-msgstr "MP2 fájl"
-
-#: ../src/et_core.c:2812
-msgid "Ogg Vorbis File"
-msgstr "Ogg Vorbis fájl"
-
-# ikon megjegyzés
-#: ../src/et_core.c:2818
-msgid "Speex File"
-msgstr "Speex fájl"
-
-#: ../src/et_core.c:2824
-msgid "FLAC File"
-msgstr "FLAC fájl"
-
-#: ../src/et_core.c:2829
-msgid "MusePack File"
-msgstr "MusePack fájl"
-
-#: ../src/et_core.c:2833
-msgid "Monkey's Audio File"
-msgstr "Monkey's hangfájl"
-
-#: ../src/et_core.c:2838
-msgid "MP4/AAC File"
-msgstr "MP4/AAC fájl"
-
-#: ../src/et_core.c:2844
-msgid "Wavpack File"
-msgstr "Wavpack fájl"
-
-#: ../src/et_core.c:2850
-msgid "Opus File"
-msgstr "Opus fájl"
-
-#: ../src/et_core.c:2909 ../src/et_core.c:2964
-msgid "File not found"
-msgstr "A fájl nem található"
-
-#: ../src/et_core.c:2914
-#, c-format
-msgid "Cannot query file information (%s)"
-msgstr "Nem kérdezhetők le a fájlinformációk (%s)"
-
-#: ../src/et_core.c:2948
-msgid "Read-only file"
-msgstr "Csak olvasható fájl"
-
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:3012
+#: ../src/et_core.c:2887
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
 msgstr[0] "Egy fájl"
 msgstr[1] "%u fájl"
 
-#: ../src/et_core.c:3216
-#, c-format
-msgid "Images (%d)"
-msgstr "Képek (%d)"
-
 #. Bitrate
-#: ../src/et_core.c:3258 ../src/flac_header.c:205
-#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.cc:132
-#: ../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
+#: ../src/et_core.c:2918 ../src/tags/flac_header.c:209
+#: ../src/tags/monkeyaudio_header.c:87 ../src/tags/mp4_header.cc:140
+#: ../src/tags/mpeg_header.c:223 ../src/tags/musepack_header.c:91
+#: ../src/tags/ogg_header.c:430 ../src/tags/opus_header.c:232
+#: ../src/tags/wavpack_header.c:86
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: ../src/et_core.c:3263 ../src/flac_header.c:210
-#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.cc:137
-#: ../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
+#: ../src/et_core.c:2921 ../src/tags/flac_header.c:212
+#: ../src/tags/monkeyaudio_header.c:90 ../src/tags/mp4_header.cc:144
+#: ../src/tags/mpeg_header.c:228 ../src/tags/musepack_header.c:94
+#: ../src/tags/ogg_header.c:433 ../src/tags/opus_header.c:235
+#: ../src/tags/wavpack_header.c:89
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/et_core.c:3409 ../src/scan_dialog.c:688
-#, c-format
-msgid "Could not convert filename '%s' into system filename encoding"
+#: ../src/et_core.c:3052
+#, fuzzy, c-format
+#| msgid "Could not convert filename '%s' into system filename encoding"
+msgid "Could not convert filename ‘%s’ to system filename encoding"
 msgstr "Nem alakítható át a(z) „%s” fájlnév rendszer fájlnév kodolássá"
 
-#: ../src/et_core.c:3411
+#: ../src/et_core.c:3054
 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:3412 ../src/scan_dialog.c:690
+#: ../src/et_core.c:3055 ../src/scan_dialog.c:712
 msgid "Filename translation"
 msgstr "Fájlnév fordítások"
 
-#: ../src/et_core.c:4117
-#, c-format
-msgid "Error writing tag type %d to file %s (%s)"
+#: ../src/et_core.c:3512
+#, fuzzy, c-format
+#| msgid "Error writing tag type %d 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)"
 
-#. Mode
-#. Mode
-#. mpeg4ip library seems to always return -1
-#. Mode
-#: ../src/flac_header.c:215 ../src/mp4_header.cc:143 ../src/ogg_header.c:411
-#: ../src/opus_header.c:237 ../src/wavpack_header.c:88
-msgid "Channels:"
-msgstr "Csatornák:"
-
-#: ../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 "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:304
-#, c-format
-msgid ""
-"The year value '%s' seems to be invalid in file '%s'. The information will "
-"be lost while saving tag."
-msgstr ""
-"Az év értéke („%s”) érvénytelennek tűnik a(z) „%s” fájlban. Az információk "
-"el fognak veszni a címke mentése során."
-
-#: ../src/flac_tag.c:1061
-#, c-format
-msgid "Picture block isn't valid: '%s'"
-msgstr "A képblokk nem érvényes: „%s”"
-
-#: ../src/flac_tag.c:1094
-#, c-format
-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:1161
-#, c-format
-msgid "Written tag of '%s'"
-msgstr "A(z) „%s” címkéje kiírva"
-
-#: ../src/id3_tag.c:205
-#, c-format
-msgid "Error while reading file: '%s' (%s)"
-msgstr "Hiba a fájl olvasása közben: „%s” (%s)"
-
-#: ../src/id3_tag.c:217
-#, c-format
-msgid ""
-"As the following corrupted file '%s' will cause an error in id3lib, it will "
-"not be processed"
-msgstr ""
-"Amint a következő sérült fájl („%s”) hibát fog okozni az id3lib fájlban, az "
-"nem lesz feldolgozva"
-
-#: ../src/id3_tag.c:219
-msgid "Corrupted file"
-msgstr "Sérült fájl"
-
-#: ../src/id3_tag.c:592
-#, c-format
-msgid "Removed tag of '%s'"
-msgstr "A(z) „%s” címkéje eltávolítva"
-
-#: ../src/id3_tag.c:596 ../src/id3_tag.c:696
-#, 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:598 ../src/id3_tag.c:668
-#, 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:617
-#, 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:645
-msgid ""
-"You have tried to save this tag to Unicode but it was detected that your "
-"version of id3lib is buggy"
-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:647
-#, 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 is available in "
-"the EasyTAG package sources.\n"
-"Note that this message will appear only once.\n"
-"\n"
-"File: %s"
-msgstr ""
-"Ha újratölti ezt a fájlt, néhány karakter hibásan fog megjelenni. Kérjük "
-"alkalmazza az src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff "
-"javítócsomagot az id3lib fájlra, amely elérhető az EasyTAG "
-"csomagforrásokban.\n"
-"Figyeljen arra, hogy ez az üzenet csak egyszer fog megjelenni.\n"
-"\n"
-"File: %s"
-
-#: ../src/id3_tag.c:654
-msgid "Buggy id3lib"
-msgstr "Hibás id3lib"
-
-#: ../src/id3_tag.c:688
-#, 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:702 ../src/id3v24_tag.c:1108
-#, c-format
-msgid "Updated tag of '%s'"
-msgstr "A(z) „%s” címkéje frissítve"
-
-#: ../src/id3_tag.c:721
-msgid "No error reported"
-msgstr "Nem történt hiba"
-
-#: ../src/id3_tag.c:723
-msgid "No available memory"
-msgstr "Nincs elérhető memória"
-
-#: ../src/id3_tag.c:725
-msgid "No data to parse"
-msgstr "Nincs feldolgozandó adat"
-
-#: ../src/id3_tag.c:727
-msgid "Improperly formatted data"
-msgstr "Helytelenül formázott adatok"
-
-#: ../src/id3_tag.c:729
-msgid "No buffer to write to"
-msgstr "Nincs írható puffer"
-
-#: ../src/id3_tag.c:731
-msgid "Buffer is too small"
-msgstr "A puffer túl kicsi"
-
-#: ../src/id3_tag.c:733
-msgid "Invalid frame ID"
-msgstr "Érvénytelen keret azonosító"
-
-#: ../src/id3_tag.c:735
-msgid "Requested field not found"
-msgstr "A kért mező nem található"
-
-#: ../src/id3_tag.c:737
-msgid "Unknown field type"
-msgstr "Ismeretlen mezőtípus"
-
-#: ../src/id3_tag.c:739
-msgid "Tag is already attached to a file"
-msgstr "A címke már csatolva van egy fájlhoz"
-
-#: ../src/id3_tag.c:741
-msgid "Invalid tag version"
-msgstr "Érvénytelen címke verzió"
-
-#: ../src/id3_tag.c:743
-msgid "No file to parse"
-msgstr "Nincs feldolgozandó fájl"
-
-#: ../src/id3_tag.c:745
-msgid "Attempting to write to a read-only file"
-msgstr "Írási kísérlet csak olvasható fájlba"
-
-#: ../src/id3_tag.c:747
-msgid "Error in compression/uncompression"
-msgstr "Hiba a tömörítésben/kibontásban"
+#: ../src/file_area.c:279 ../src/file_area.c:334
+msgid "File not found"
+msgstr "A fájl nem található"
 
-#: ../src/id3_tag.c:749
-msgid "Unknown error message"
-msgstr "Ismeretlen hibaüzenet"
+#: ../src/file_area.c:284 ../src/load_files_dialog.c:221
+#, fuzzy, c-format
+#| msgid "Cannot query file information (%s)"
+msgid "Cannot query file information ‘%s’"
+msgstr "Nem kérdezhetők le a fájlinformációk (%s)"
 
-#: ../src/id3_tag.c:1357
-#, c-format
-msgid "Error while creating temporary file: '%s'"
-msgstr "Hiba az átmeneti fájl létrehozása közben: „%s”"
+#: ../src/file_area.c:318
+msgid "Read-only file"
+msgstr "Csak olvasható fájl"
 
-#: ../src/id3_tag.c:1364
-msgid "Error while creating temporary file"
-msgstr "Hiba az átmeneti fájl létrehozása közben"
+#: ../src/load_files_dialog.c:291
+#, fuzzy, c-format
+#| msgid "Error reading file (%s)"
+msgid "Error reading file ‘%s’"
+msgstr "Hiba a fájl olvasása közben (%s)"
 
-#: ../src/id3_tag.c:1384
-#, c-format
-msgid "Error while writing to file: '%s' (%s)"
-msgstr "Hiba a fájl írása közben: „%s” (%s)"
+#: ../src/load_files_dialog.c:628 ../src/load_files_dialog.c:731
+msgid "Insert a blank line"
+msgstr "Üres sor beszúrása"
 
-#. 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:1563
-#, 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] "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/load_files_dialog.c:632 ../src/load_files_dialog.c:735
+msgid "Delete this line"
+msgstr "Aktuális sor törlése"
 
-#: ../src/id3v24_tag.c:1584
-#, c-format
-msgid "Cannot save tag of file '%s'"
-msgstr "Nem menthető a(z) „%s” fájl címkéje"
+#: ../src/load_files_dialog.c:643 ../src/load_files_dialog.c:746
+#, fuzzy
+#| msgid "Move up this line"
+msgid "Move this line up"
+msgstr "Aktuális sor mozgatása fel"
 
-#: ../src/id3v24_tag.c:1595
-#, c-format
-msgid "Size error while saving tag of '%s'"
-msgstr "Mérethiba a(z) „%s” címkéjének mentése közben"
+#: ../src/load_files_dialog.c:647 ../src/load_files_dialog.c:750
+#, fuzzy
+#| msgid "Move up this line"
+msgid "Move this line down"
+msgstr "Aktuális sor mozgatása fel"
 
-#: ../src/log.c:100
-msgid "Log"
-msgstr "Napló"
+# egyéb menü
+#: ../src/load_files_dialog.c:893
+msgid "Load Filenames From a Text File"
+msgstr "Fájlnevek betöltése szövegfájlból"
 
-#: ../src/misc.c:716
+#: ../src/misc.c:257
 msgid "You must type a program name"
 msgstr "Meg kell adnia egy programnevet"
 
-#: ../src/misc.c:717
+#: ../src/misc.c:258
 msgid "Program Name Error"
 msgstr "Programnév hiba"
 
-#: ../src/misc.c:796
-#, c-format
-msgid "Executed command: %s"
+#: ../src/misc.c:336
+#, fuzzy, c-format
+#| msgid "Executed command: %s"
+msgid "Executed command ‘%s’"
 msgstr "Végrehajtott parancs: %s"
 
-#: ../src/misc.c:803
-#, c-format
-msgid "Failed to launch program: %s"
+#: ../src/misc.c:344 ../src/misc.c:455
+#, fuzzy, c-format
+#| msgid "Failed to launch program: %s"
+msgid "Failed to launch program ‘%s’"
 msgstr "Nem sikerült indítani a programot: %s"
 
 # Fájl menü
-#: ../src/misc.c:820
+#: ../src/misc.c:361
 msgid "Select File"
 msgstr "Fájl kiválasztása"
 
-#: ../src/misc.c:826
+#: ../src/misc.c:367
 msgid "Select Directory"
 msgstr "Könyvtár kiválasztása"
 
-#: ../src/misc.c:1138
-msgid "Generate Playlist"
-msgstr "Lejátszólista előállítása"
+#: ../src/picture.c:185
+msgid "JPEG image"
+msgstr "JPEG-kép"
 
-#: ../src/misc.c:1162
-msgid "M3U Playlist Name"
-msgstr "M3U lejátszólista neve"
+#: ../src/picture.c:187
+msgid "PNG image"
+msgstr "PNG-kép"
 
-#: ../src/misc.c:1177
-msgid "Use directory name"
-msgstr "Könyvtár nevének használata"
+#: ../src/picture.c:189
+msgid "GIF image"
+msgstr "GIF-kép"
 
-#. Playlist options
-#: ../src/misc.c:1194
-msgid "Playlist Options"
-msgstr "Lejátszólista beállításai"
+#: ../src/picture.c:191
+msgid "Unknown image"
+msgstr "Ismeretlen kép"
 
-#: ../src/misc.c:1200
-msgid "Include only the selected files"
-msgstr "Csak a kijelölt fájlokat tartalmazza"
+#: ../src/picture.c:203
+#, fuzzy
+#| msgid "32x32 pixel PNG file icon"
+msgid "32×32 pixel PNG file icon"
+msgstr "32x32 képpontos PNG fájl ikon"
 
-#: ../src/misc.c:1203
-msgid ""
-"If activated, only the selected files will be written in the playlist file. "
-"Else, all the files will be written."
-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/picture.c:205
+msgid "Other file icon"
+msgstr "Egyéb fájl ikon"
 
-#: ../src/misc.c:1206
-msgid "Use full path for files in playlist"
-msgstr "Teljes elérési út használata a lejátszólistában"
+#: ../src/picture.c:207
+msgid "Cover (front)"
+msgstr "Borító (első)"
 
-#: ../src/misc.c:1209
-msgid "Use relative path for files in playlist"
-msgstr "Relatív elérési út használata a lejátszólistában"
+#: ../src/picture.c:209
+msgid "Cover (back)"
+msgstr "Borító (hátsó)"
 
-#. Create playlist in parent directory
-#: ../src/misc.c:1215
-msgid "Create playlist in the parent directory"
-msgstr "Lejátszólista létrehozása a szülő könyvtárban"
+#: ../src/picture.c:211
+msgid "Leaflet page"
+msgstr "Szórólap oldal"
 
-#: ../src/misc.c:1218
-msgid "If activated, the playlist will be created in the parent directory."
-msgstr "Ha aktivált, a lejátszólista a szülő könyvtárban kerül létrehozásra."
+#: ../src/picture.c:213
+#, fuzzy
+#| msgid "Media (e.g. label side of CD)"
+msgid "Media (such as label side of CD)"
+msgstr "Média (például a CD címke oldala)"
 
-#. DOS Separator
-#: ../src/misc.c:1222
-msgid "Use DOS directory separator"
-msgstr "DOS könyvtárelválasztó használata"
+#: ../src/picture.c:215
+msgid "Lead artist/lead performer/soloist"
+msgstr "Vezető szerző / vezető előadó / szólista"
 
-#: ../src/misc.c:1228
-msgid ""
-"This option replaces the UNIX directory separator '/' into DOS separator "
-"'\\'."
-msgstr ""
-"Ez a beállítás lecseréli a „/” UNIX könyvtárválasztót a „\\” DOS "
-"elválasztóra."
+#: ../src/picture.c:217
+msgid "Artist/performer"
+msgstr "Szerző / előadó"
 
-#: ../src/misc.c:1237
-msgid "Playlist Content"
-msgstr "Lejátszólista tartalma"
+#: ../src/picture.c:219
+msgid "Conductor"
+msgstr "Karmester"
 
-#: ../src/misc.c:1243
-msgid "Write only list of files"
-msgstr "Csak fájlok listájának írása"
+#: ../src/picture.c:221
+msgid "Band/Orchestra"
+msgstr "Banda / Zenekar"
 
-#: ../src/misc.c:1247
-msgid "Write info using filename"
-msgstr "Információk írása a fájlnév használatával"
+#: ../src/picture.c:225
+msgid "Lyricist/text writer"
+msgstr "Dalszövegíró / szövegíró"
 
-#: ../src/misc.c:1250
-msgid "Write info using:"
-msgstr "Információk írása ezek használatával:"
+#: ../src/picture.c:227
+msgid "Recording location"
+msgstr "Felvétel helyszíne"
 
-#: ../src/misc.c:1464
-#, c-format
-msgid "Cannot write playlist file '%s'"
+#: ../src/picture.c:229
+msgid "During recording"
+msgstr "Felvétel közben"
+
+#: ../src/picture.c:231
+msgid "During performance"
+msgstr "Előadás közben"
+
+#: ../src/picture.c:233
+msgid "Movie/video screen capture"
+msgstr "Film / videófelvétel"
+
+#: ../src/picture.c:235
+msgid "A bright colored fish"
+msgstr "Egy világos színes hal"
+
+#: ../src/picture.c:237
+msgid "Illustration"
+msgstr "Illusztráció"
+
+#: ../src/picture.c:239
+msgid "Band/Artist logotype"
+msgstr "Banda / Előadó logója"
+
+#: ../src/picture.c:241
+msgid "Publisher/studio logotype"
+msgstr "Kiadó / stúdió logója"
+
+#: ../src/picture.c:245
+msgid "Unknown image type"
+msgstr "Ismeretlen képtípus"
+
+#: ../src/picture.c:275 ../src/picture.c:286
+msgid "pixels"
+msgstr "képpont"
+
+#: ../src/picture.c:276 ../src/picture.c:287
+msgid "Type"
+msgstr "Típus"
+
+#: ../src/playlist_dialog.c:528
+#, fuzzy, c-format
+#| msgid "Cannot write playlist file '%s'"
+msgid "Cannot write playlist file ‘%s’"
 msgstr "A(z) „%s” lejátszólista fájl nem írható"
 
-#: ../src/misc.c:1468
+#: ../src/playlist_dialog.c:532
 msgid "Playlist File Error"
 msgstr "Lejátszólista fájl hiba"
 
-#: ../src/misc.c:1476
-#, c-format
-msgid "Written playlist file '%s'"
+#: ../src/playlist_dialog.c:540
+#, fuzzy, c-format
+#| msgid "Written playlist file '%s'"
+msgid "Wrote playlist file ‘%s’"
 msgstr "A(z) „%s” lejátszólista fájl kiírva"
 
-#: ../src/misc.c:1540 ../src/scan_dialog.c:2747 ../src/scan_dialog.c:2809
+#: ../src/playlist_dialog.c:622 ../src/scan_dialog.c:2754
+#: ../src/scan_dialog.c:2816
 msgid "Invalid scanner mask"
 msgstr "Érvénytelen feldolgozómaszk"
 
-#: ../src/misc.c:1904
-msgid "CD"
-msgstr "CD"
+#: ../src/playlist_dialog.c:653
+msgid "Generate Playlist"
+msgstr "Lejátszólista előállítása"
 
-#: ../src/misc.c:1926
-msgid "Find Files"
-msgstr "Fájlok keresése"
+#. The window
+#: ../src/preferences_dialog.c:292
+msgid "Preferences"
+msgstr "Beállítások"
+
+#: ../src/preferences_dialog.c:1124
+#, fuzzy
+#| msgid "The selected path for 'Default path to files' is invalid"
+msgid "The selected default path is invalid"
+msgstr ""
+"A kiválasztott útvonal az „Alapértelmezett útvonal a fájlokhoz” esetén "
+"érvénytelen"
 
-#: ../src/misc.c:1958
+#: ../src/preferences_dialog.c:1126
+#, fuzzy, c-format
+#| msgid ""
+#| "Path: '%s'\n"
+#| "Error: %s"
 msgid ""
-"Type the word to search into files. Or type nothing to display all files."
+"Path: ‘%s’\n"
+"Error: %s"
 msgstr ""
-"Írja be a fájlban keresendő szót. Vagy ne írjon be semmit az összes fájl "
-"megjelenítéséhez."
+"Útvonal: „%s”\n"
+"Hiba: %s"
 
-#. Where...
-#: ../src/misc.c:1964
-msgid "In:"
-msgstr "Ebben:"
+#: ../src/preferences_dialog.c:1130
+msgid "Invalid Path Error"
+msgstr "Érvénytelen útvonal hiba"
 
-#. Translators: This option is for the previous 'in' option. For instance,
-#. * translate this as "Search" "In:" "the Filename".
-#: ../src/misc.c:1969
-msgid "the Filename"
-msgstr "a fájlnévben"
+#: ../src/scan_dialog.c:303
+#, fuzzy, c-format
+#| msgid "Cannot calculate CRC value of file (%s)"
+msgid "Cannot calculate CRC value of file ‘%s’"
+msgstr "Nem lehet kiszámítani a fájl CRC értékét (%s)"
 
-#. 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:1975
-msgid "the Tag"
-msgstr "a címkében"
+#: ../src/scan_dialog.c:319
+msgid "Tag successfully scanned"
+msgstr "A címke sikeresen feldolgozva"
 
-#. Property of the search
-#: ../src/misc.c:1986 ../src/prefs.c:335
-msgid "Case sensitive"
-msgstr "Kis- és nagybetűs"
+#: ../src/scan_dialog.c:322
+#, fuzzy, c-format
+#| msgid "Tag successfully scanned: %s"
+msgid "Tag successfully scanned ‘%s’"
+msgstr "A címke sikeresen feldolgozva: %s"
 
-#: ../src/misc.c:2213
-msgid "Ready to search…"
-msgstr "Keresésre kész…"
+#: ../src/scan_dialog.c:365
+#, fuzzy, c-format
+#| msgid ""
+#| "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
+msgid "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_dialog.c:455 ../src/scan_dialog.c:486
+#, fuzzy, c-format
+#| msgid "Scan Error: can't find separator '%s' within '%s'"
+msgid "Cannot find separator ‘%s’ within ‘%s’"
+msgstr "Feldolgozási hiba: nem található a(z) „%s” elválasztó ebben: „%s”"
+
+#: ../src/scan_dialog.c:710
+#, fuzzy, c-format
+#| msgid "Could not convert filename '%s' into system filename encoding"
+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/scan_dialog.c:735
+msgid "New filename successfully scanned"
+msgstr "Az új fájlnév sikeresen feldolgozva"
+
+#: ../src/scan_dialog.c:739
+#, fuzzy, c-format
+#| msgid "New filename successfully scanned: %s"
+msgid "New filename successfully scanned ‘%s’"
+msgstr "Az új fájlnév sikeresen feldolgozva: %s"
+
+#: ../src/scan_dialog.c:1095
+#, fuzzy, c-format
+#| msgid "Error while processing fields: %s"
+msgid "Error while processing fields ‘%s’"
+msgstr "Hiba a mezők feldolgozása közben: %s"
+
+#: ../src/scan_dialog.c:2024
+msgid "New_mask"
+msgstr "Új_maszk"
+
+#. The window
+#: ../src/scan_dialog.c:2241
+msgid "Tag and Filename Scan"
+msgstr "Címke és fájlnév feldolgozás"
+
+# ikon megjegyzés
+#. 'Scan selected files' button
+#: ../src/scan_dialog.c:2247
+msgid "Scan Files"
+msgstr "Fájlok vizsgálata"
+
+# Fájl menü
+#: ../src/scan_dialog.c:2253
+msgid "Scan selected files"
+msgstr "A kijelölt fájlok vizsgálata"
+
+#: ../src/scan_dialog.c:2891
+msgid "All tags have been scanned"
+msgstr "Minden címke feldolgozva"
 
-#: ../src/misc.c:2433
+#: ../src/search_dialog.c:542
 #, c-format
 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 a Text File"
-msgstr "Fájlnevek betöltése szövegfájlból"
+#: ../src/search_dialog.c:591
+msgid "Find Files"
+msgstr "Fájlok keresése"
 
-#: ../src/misc.c:2747
-msgid "File:"
-msgstr "Fájl:"
+#: ../src/search_dialog.c:675
+msgid "Ready to search…"
+msgstr "Keresésre kész…"
 
-#. Button 'load'
-#. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: ../src/misc.c:2766
-msgid " Load "
-msgstr " Betöltés "
+#: ../src/setting.c:144
+#, fuzzy, c-format
+#| msgid "Cannot create or open file '%s' (%s)"
+msgid "Cannot create or open file ‘%s’: %s"
+msgstr "Nem hozható létre vagy nem nyitható meg a fájl: „%s” (%s)"
 
-#: ../src/misc.c:2784
-msgid "Content of Text File"
-msgstr "A szövegfájl tartalma"
+#: ../src/setting.c:194
+#, fuzzy, c-format
+#| msgid "Error: Cannot write list to file: %s (%s)"
+msgid "Cannot write list to file ‘%s’: %s"
+msgstr "Hiba: A lista nem írható fájlba: %s (%s)"
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2805 ../src/misc.c:2900
-msgid "Insert a blank line before the selected line"
-msgstr "Üres sor beszúrása a kijelölt sor elé"
+#: ../src/setting.c:212
+#, fuzzy, c-format
+#| msgid "Error while writing list file: %s"
+msgid "Error while writing list file ‘%s’"
+msgstr "Hiba a listafájl írása közben: %s"
 
-# 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
-msgid "Delete the selected line"
-msgstr "A kijelölt sor törlése"
+#. Fall back to defaults.
+#: ../src/setting.c:292
+#, fuzzy
+#| msgid "Loading default 'Fill Tag' masks…"
+msgid "Loading default ‘Fill Tag’ masks…"
+msgstr "Alapértelmezett „Címke kitöltése” maszkok betöltése…"
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2823 ../src/misc.c:2918 ../src/misc.c:3399
-msgid "Delete all blank lines"
-msgstr "Minden üres sor törlése"
+#. Fall back to defaults.
+#: ../src/setting.c:322
+#, fuzzy
+#| msgid "Loading default 'Rename File' masks…"
+msgid "Loading default ‘Rename File’ masks…"
+msgstr "Alapértelmezett „Fájl átnevezése” maszkok betöltése…"
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2835 ../src/misc.c:2930
-msgid "Move up the selected line"
-msgstr "Kijelölt sor mozgatása fel"
+#: ../src/setting.c:409
+#, fuzzy, c-format
+#| msgid "Migrating configuration from directory '%s' to '%s'"
+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”"
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2844 ../src/misc.c:2939
-msgid "Move down the selected line"
-msgstr "Kijelölt sor mozgatása le"
+#: ../src/setting.c:433
+#, fuzzy, c-format
+#| msgid "Failed to migrate configuration file '%s'"
+msgid "Failed to migrate configuration file ‘%s’"
+msgstr "A(z) „%s” beállítófájl költöztetése nem sikerült"
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2856 ../src/misc.c:2951 ../src/misc.c:3423
-msgid "Reload"
-msgstr "Újratöltés"
+#: ../src/setting.c:470
+#, fuzzy, c-format
+#| msgid "Cannot create target directory '%s': %s"
+msgid "Cannot create directory ‘%s’: %s"
+msgstr "Nem hozható létre a(z) „%s” célkönyvtár: %s"
 
-#: ../src/misc.c:2878
-msgid "List of Files"
-msgstr "Fájlok listája"
+#: ../src/status_bar.c:145
+msgid "Ready to start"
+msgstr "Indításra kész"
+
+#: ../src/tag_area.c:187
+#, fuzzy, c-format
+#| msgid "Selected files tagged with title '%s'."
+msgid "Selected files tagged with title ‘%s’"
+msgstr "A kijelölt fájlok megcímkézve a címmel: „%s”."
+
+#: ../src/tag_area.c:192
+#, fuzzy
+#| msgid "Removed title from selected files."
+msgid "Removed title from selected files"
+msgstr "A cím eltávolítva a kijelölt fájlokból."
+
+#: ../src/tag_area.c:209
+#, fuzzy, c-format
+#| msgid "Selected files tagged with artist '%s'."
+msgid "Selected files tagged with artist ‘%s’"
+msgstr "A kijelölt fájlok megcímkézve az előadóval: „%s”."
+
+#: ../src/tag_area.c:214
+#, fuzzy
+#| msgid "Removed artist from selected files."
+msgid "Removed artist from selected files"
+msgstr "Az előadó eltávolítva a kijelölt fájlokból."
+
+#: ../src/tag_area.c:230
+#, fuzzy, c-format
+#| msgid "Selected files tagged with album artist '%s'."
+msgid "Selected files tagged with album artist ‘%s’"
+msgstr "A kijelölt fájlok megcímkézve az album előadóval: „%s”."
+
+#: ../src/tag_area.c:235
+#, fuzzy
+#| msgid "Removed album artist from selected files."
+msgid "Removed album artist from selected files"
+msgstr "Az album előadó eltávolítva a kijelölt fájlokból."
+
+#: ../src/tag_area.c:252
+#, fuzzy, c-format
+#| msgid "Selected files tagged with album '%s'."
+msgid "Selected files tagged with album ‘%s’"
+msgstr "A kijelölt fájlok megcímkézve az albummal: „%s”."
+
+#: ../src/tag_area.c:257
+#, fuzzy
+#| msgid "Removed album name from selected files."
+msgid "Removed album name from selected files"
+msgstr "Az albumnév eltávolítva a kijelölt fájlokból."
+
+#: ../src/tag_area.c:295
+#, fuzzy, c-format
+#| msgid "Selected files tagged with disc number '%s/%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/tag_area.c:300
+#, fuzzy, c-format
+#| msgid "Selected files tagged with disc number like 'xx'."
+msgid "Selected files tagged with disc number like ‘xx’"
+msgstr "A kijelölt fájlok megcímkézve a lemezszámmal úgymint „xx”."
+
+#: ../src/tag_area.c:305
+#, fuzzy
+#| msgid "Removed disc number from selected files."
+msgid "Removed disc number from selected files"
+msgstr "A lemezszám eltávolítva a kijelölt fájlokból."
+
+#: ../src/tag_area.c:322
+#, fuzzy, c-format
+#| msgid "Selected files tagged with year '%s'."
+msgid "Selected files tagged with year ‘%s’"
+msgstr "A kijelölt fájlok megcímkézve az évszámmal: „%s”."
+
+#: ../src/tag_area.c:327
+#, fuzzy
+#| msgid "Removed year from selected files."
+msgid "Removed year from selected files"
+msgstr "Az évszám eltávolítva a kijelölt fájlokból."
+
+#: ../src/tag_area.c:354 ../src/tag_area.c:448
+#, fuzzy, c-format
+#| msgid "Selected files tagged with track like 'xx/%s'."
+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/tag_area.c:358
+#, fuzzy, c-format
+#| msgid "Selected files tagged with track like 'xx'."
+msgid "Selected files tagged with track like ‘xx’"
+msgstr "A kijelölt fájlok megcímkézve a megadott számmal mint „xx”."
+
+#: ../src/tag_area.c:363 ../src/tag_area.c:453
+#, fuzzy
+#| msgid "Removed track number from selected files."
+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/tag_area.c:421
+#, fuzzy, c-format
+#| msgid "Selected tracks numbered sequentially."
+msgid "Selected tracks numbered sequentially"
+msgstr "A kijelölt számok növekvően sorszámozva."
 
-#: ../src/misc.c:2973
-msgid "Selected line:"
-msgstr "Kijelölt sor:"
+#: ../src/tag_area.c:470
+#, fuzzy, c-format
+#| msgid "Selected files tagged with genre '%s'."
+msgid "Selected files tagged with genre ‘%s’"
+msgstr "A kijelölt fájlok megcímkézve a műfajjal: „%s”."
 
-# bubble help
-#: ../src/misc.c:2991
-msgid ""
-"When activating this option, after loading the filenames, the current "
-"selected scanner will be ran (the scanner window must be opened)."
-msgstr ""
-"Ha aktiválja ezt a lehetőséget, akkor a fájlnevek betöltése után a jelenleg "
-"kiválasztott feldolgozó lesz futtatva (a feldolgozóablaknak nyitva kell "
-"lennie)."
+#: ../src/tag_area.c:475
+#, fuzzy
+#| msgid "Removed genre from selected files."
+msgid "Removed genre from selected files"
+msgstr "A műfaj eltávolítva a kijelölt fájlokból."
 
-#: ../src/misc.c:3078
-#, c-format
-msgid "Cannot retrieve file info (%s)"
-msgstr "Nem fogadhatók a fájlinformációk (%s)"
+#: ../src/tag_area.c:499
+#, fuzzy, c-format
+#| msgid "Selected files tagged with comment '%s'."
+msgid "Selected files tagged with comment ‘%s’"
+msgstr "A kijelölt fájlok megcímkézve a megjegyzéssel: „%s”."
 
-#: ../src/misc.c:3141
-#, c-format
-msgid "Can't open file '%s' (%s)"
-msgstr "Nem nyitható meg a(z) „%s” fájl (%s)"
+#: ../src/tag_area.c:504
+#, fuzzy
+#| msgid "Removed comment from selected files."
+msgid "Removed comment from selected files"
+msgstr "A megjegyzés eltávolítva a kijelölt fájlokból."
 
-#: ../src/misc.c:3170
-#, c-format
-msgid "Error reading file (%s)"
-msgstr "Hiba a fájl olvasása közben (%s)"
+#: ../src/tag_area.c:520
+#, fuzzy, c-format
+#| msgid "Selected files tagged with composer '%s'."
+msgid "Selected files tagged with composer ‘%s’"
+msgstr "A kijelölt fájlok megcímkézve a zeneszerzővel: „%s”."
 
-#: ../src/misc.c:3387
-msgid "Insert a blank line"
-msgstr "Üres sor beszúrása"
+#: ../src/tag_area.c:525
+#, fuzzy
+#| msgid "Removed composer from selected files."
+msgid "Removed composer from selected files"
+msgstr "A zeneszerző eltávolítva a kijelölt fájlokból."
 
-#: ../src/misc.c:3393
-msgid "Delete this line"
-msgstr "Aktuális sor törlése"
+#: ../src/tag_area.c:542
+#, fuzzy, c-format
+#| msgid "Selected files tagged with original artist '%s'."
+msgid "Selected files tagged with original artist ‘%s’"
+msgstr "A kijelölt fájlok megcímkézve az eredeti előadóval: „%s”."
 
-#: ../src/misc.c:3408
-msgid "Move up this line"
-msgstr "Aktuális sor mozgatása fel"
+#: ../src/tag_area.c:547
+#, fuzzy
+#| msgid "Removed original artist from selected files."
+msgid "Removed original artist from selected files"
+msgstr "Az eredeti előadó eltávolítva a kijelölt fájlokból."
 
-#: ../src/misc.c:3414
-msgid "Move down this line"
-msgstr "Aktuális sor mozgatása le"
+#: ../src/tag_area.c:564
+#, fuzzy, c-format
+#| msgid "Selected files tagged with copyright '%s'."
+msgid "Selected files tagged with copyright ‘%s’"
+msgstr "A kijelölt fájlok megcímkézve a szerzői joggal: „%s”."
 
-#. Mode changed to profile name
-#: ../src/monkeyaudio_header.c:78 ../src/musepack_header.c:80
-#, c-format
-msgid "Profile:"
-msgstr "Profil:"
+#: ../src/tag_area.c:569
+#, fuzzy
+#| msgid "Removed copyright from selected files."
+msgid "Removed copyright from selected files"
+msgstr "A szerzői jog eltávolítva a kijelölt fájlokból."
 
-#: ../src/mp4_header.cc:59 ../src/mp4_tag.cc:91 ../src/mp4_tag.cc:284
-msgid "MP4 format invalid"
-msgstr "Érvénytelen MP4 formátum"
+#: ../src/tag_area.c:586
+#, fuzzy, c-format
+#| msgid "Selected files tagged with URL '%s'."
+msgid "Selected files tagged with URL ‘%s’"
+msgstr "A kijelölt fájlok megcímkézve az URL-lel: „%s”."
 
-#: ../src/mp4_header.cc:69
-#, c-format
-msgid "Error reading properties from file: '%s'"
-msgstr "Hiba a tulajdonságok fájlból olvasása közben: „%s”"
+#: ../src/tag_area.c:591
+#, fuzzy
+#| msgid "Removed URL from selected files."
+msgid "Removed URL from selected files"
+msgstr "Az URL eltávolítva a kijelölt fájlokból."
 
-#: ../src/mp4_header.cc:130 ../src/mpeg_header.c:204
-#, c-format
-msgid "~%d kb/s"
-msgstr "~%d kb/s"
+#: ../src/tag_area.c:608
+#, fuzzy, c-format
+#| msgid "Selected files tagged with encoder name '%s'."
+msgid "Selected files tagged with encoder name ‘%s’"
+msgstr "A kijelölt fájlok megcímkézve a kódoló nevével: „%s”."
 
-#: ../src/mp4_tag.cc:101 ../src/mp4_tag.cc:293
-#, c-format
-msgid "Error reading tags from file: '%s'"
-msgstr "Hiba a címkék fájlból olvasása közben: „%s”"
+#: ../src/tag_area.c:613
+#, fuzzy
+#| msgid "Removed encoder name from selected files."
+msgid "Removed encoder name from selected files"
+msgstr "A kodoló neve eltávolítva a kijelölt fájlokból."
 
-#: ../src/mpeg_header.c:64
-msgid "Stereo"
-msgstr "Sztereó"
+#: ../src/tag_area.c:647
+#, fuzzy
+#| msgid "Selected files tagged with images."
+msgid "Selected files tagged with images"
+msgstr "A kijelölt fájlok megcímkézve a képekkel."
 
-#: ../src/mpeg_header.c:65
-msgid "Joint stereo"
-msgstr "Joint sztereó"
+#: ../src/tag_area.c:651
+#, fuzzy
+#| msgid "Removed images from selected files."
+msgid "Removed images from selected files"
+msgstr "A képek eltávolítva a kijelölt fájlokból."
 
-#: ../src/mpeg_header.c:66
-msgid "Dual channel"
-msgstr "Két csatornás"
+#. Menu items
+#: ../src/tag_area.c:820
+msgid "Tag selected files with this field"
+msgstr "A kijelölt fájlok címkézése ezzel a mezővel"
 
-#: ../src/mpeg_header.c:67
-msgid "Single channel"
-msgstr "Egy csatornás"
+#: ../src/tag_area.c:847
+msgid "All uppercase"
+msgstr "MINDENT NAGYBETŰSRE"
 
-#. MPEG, Layer versions
-#: ../src/mpeg_header.c:194
-msgid "MPEG"
-msgstr "MPEG"
+#: ../src/tag_area.c:853
+msgid "All lowercase"
+msgstr "mindent kisbetűsre"
 
-#. FIXME: Pass error back to calling function.
-#: ../src/ogg_header.c:227
-#, c-format
-msgid "Error while opening file: '%s' (%s)"
-msgstr "Hiba a(z) „%s” fájl megnyitása közben (%s)"
+#: ../src/tag_area.c:859
+msgid "First letter uppercase"
+msgstr "Első betű legyen nagybetű"
 
-#: ../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: a megadott adatfolyam nem létezik, vagy a fájl helytelenül lett "
-"előkészítve (fájl: „%s”)."
+#: ../src/tag_area.c:865
+msgid "First letter uppercase of each word"
+msgstr "Minden Szó Első Betűje Legyen Nagybetű"
 
-#: ../src/ogg_header.c:279
-#, c-format
-msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
-msgstr "Ogg Vorbis: Hiba a médiából történő olvasás közben (fájl: „%s”)."
+#: ../src/tag_area.c:881
+msgid "Insert space before uppercase letter"
+msgstr "Szóköz beszúrása minden nagybetű elé"
 
-#: ../src/ogg_header.c:282
-#, c-format
-msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
-msgstr "Ogg Vorbis: Az adatfolyam nem Vorbis adat (fájl: „%s”)."
+#: ../src/tag_area.c:887
+msgid "Remove duplicate spaces or underscores"
+msgstr "Dupla szóközök vagy alsóvonások eltávolítása"
 
-#: ../src/ogg_header.c:285
-#, c-format
-msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
-msgstr "Ogg Vorbis: A Vorbis verzió nem megfelelő (fájl: „%s”)."
+#: ../src/tag_area.c:893
+msgid "Remove all text"
+msgstr "Minden szöveg eltávolítása"
 
-#: ../src/ogg_header.c:288
+#: ../src/tag_area.c:1269 ../src/tag_area.c:1346 ../src/tags/ogg_tag.c:1047
+#: ../src/tags/ogg_tag.c:1062
 #, c-format
-msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
-msgstr "Ogg Vorbis: Érvénytelen Vorbis adatfolyam fejléc (fájl: „%s”)."
+msgid "Error parsing image data ‘%s’"
+msgstr ""
 
-#: ../src/ogg_header.c:291
-#, c-format
+#: ../src/tag_area.c:1328
+#, fuzzy
+#| msgid ""
+#| "Cannot display the image because not enough data has been read to "
+#| "determine how to create the image buffer."
 msgid ""
-"Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack corruption "
-"(file: '%s')."
+"Cannot display the image because not enough data has been read to determine "
+"how to create the image buffer"
 msgstr ""
-"Ogg Vorbis: Belső logikai hiba, amely hibára vagy kupac/verem sérülésre utal "
-"(fájl: „%s”)."
-
-#: ../src/ogg_header.c:337
-#, c-format
-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)."
+"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/ogg_tag.c:706 ../src/ogg_tag.c:881
-#, 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/tag_area.c:1335
+msgid "Cannot display the image"
+msgstr "Nem jeleníthető meg a kép"
 
-#: ../src/ogg_tag.c:1030 ../src/picture.c:1082
-#, c-format
-msgid "Error with 'loader_write': %s"
-msgstr "Hiba a „loader_write” közben: %s"
+#: ../src/tag_area.c:1337
+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/ogg_tag.c:1045 ../src/picture.c:1005
-#, c-format
-msgid "Error with 'loader_close': %s"
-msgstr "Hiba a „loader_close” közben: %s"
+#: ../src/tag_area.c:1339
+msgid "Load Image File"
+msgstr "Képfájl betöltése"
 
-#: ../src/picture.c:244 ../src/picture.c:269
-#, c-format
-msgid "Image file not loaded: %s"
+#: ../src/tag_area.c:1383 ../src/tag_area.c:1408
+#, fuzzy, c-format
+#| msgid "Image file not loaded: %s"
+msgid "Image file not loaded ‘%s’"
 msgstr "A képfájl nincs betöltve: %s"
 
-#: ../src/picture.c:261
-#, c-format
-msgid "Cannot open file: '%s'"
+#: ../src/tag_area.c:1400
+#, fuzzy, c-format
+#| msgid "Cannot open file: '%s'"
+msgid "Cannot open file ‘%s’"
 msgstr "Nem nyitható meg a fájl: „%s”"
 
-#: ../src/picture.c:265
+#: ../src/tag_area.c:1404
 msgid "Image File Error"
 msgstr "Képfájl hiba"
 
-#: ../src/picture.c:276
+#: ../src/tag_area.c:1415
 msgid "Image file loaded"
 msgstr "A képfájl betöltve"
 
-#: ../src/picture.c:334
+#: ../src/tag_area.c:1478
 msgid "Add Images"
 msgstr "Képek hozzáadása"
 
-#: ../src/picture.c:344 ../src/picture.c:701
+#: ../src/tag_area.c:1489 ../src/tag_area.c:1853
 msgid "All Files"
 msgstr "Minden fájl"
 
-#: ../src/picture.c:350 ../src/picture.c:707
+#: ../src/tag_area.c:1495 ../src/tag_area.c:1859
 msgid "PNG and JPEG"
 msgstr "PNG és JPEG"
 
-#: ../src/picture.c:477
+#: ../src/tag_area.c:1639
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Képtulajdonságok %d/%d"
 
-#: ../src/picture.c:503
-msgid "Image Type"
-msgstr "Képtípus"
-
-#. Description of the picture
-#: ../src/picture.c:561
-msgid "Image Description:"
-msgstr "Kép leírása:"
-
-#: ../src/picture.c:688
+#: ../src/tag_area.c:1838
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Kép mentése %d/%d"
 
-#: ../src/picture.c:763
-#, c-format
-msgid "Image file not saved: %s"
+#: ../src/tag_area.c:1915
+#, fuzzy, c-format
+#| msgid "Image file not saved: %s"
+msgid "Image file not saved ‘%s’"
 msgstr "A képfájl nincs mentve: %s"
 
-#: ../src/picture.c:846
-msgid "JPEG image"
-msgstr "JPEG-kép"
-
-#: ../src/picture.c:848
-msgid "PNG image"
-msgstr "PNG-kép"
-
-#: ../src/picture.c:850
-msgid "GIF image"
-msgstr "GIF-kép"
-
-#: ../src/picture.c:852
-msgid "Unknown image"
-msgstr "Ismeretlen kép"
+#: ../src/tag_area.c:2258
+msgid "Tag selected files with this genre"
+msgstr "A kijelölt fájlok címkézése ezzel a műfajjal"
 
-#: ../src/picture.c:864
-msgid "32x32 pixel PNG file icon"
-msgstr "32x32 képpontos PNG fájl ikon"
+#: ../src/tag_area.c:2988
+msgid "ID3 Tag"
+msgstr "ID3 címke"
 
-#: ../src/picture.c:866
-msgid "Other file icon"
-msgstr "Egyéb fájl ikon"
+#: ../src/tag_area.c:2993
+msgid "Ogg Vorbis Tag"
+msgstr "Ogg Vorbis címke"
 
-#: ../src/picture.c:868
-msgid "Cover (front)"
-msgstr "Borító (első)"
+#: ../src/tag_area.c:2998
+msgid "FLAC Vorbis Tag"
+msgstr "FLAC Vorbis címke"
 
-#: ../src/picture.c:870
-msgid "Cover (back)"
-msgstr "Borító (hátsó)"
+#: ../src/tag_area.c:3002
+msgid "APE Tag"
+msgstr "APE címke"
 
-#: ../src/picture.c:872
-msgid "Leaflet page"
-msgstr "Szórólap oldal"
+#: ../src/tag_area.c:3006
+msgid "MP4/M4A/AAC Tag"
+msgstr "MP4/M4A/AAC címke"
 
-#: ../src/picture.c:874
-msgid "Media (e.g. label side of CD)"
-msgstr "Média (például a CD címke oldala)"
+#: ../src/tag_area.c:3011
+msgid "Wavpack Tag"
+msgstr "Wavpack címke"
 
-#: ../src/picture.c:876
-msgid "Lead artist/lead performer/soloist"
-msgstr "Vezető szerző / vezető előadó / szólista"
+#: ../src/tag_area.c:3016
+msgid "Opus Tag"
+msgstr "Opus címke"
 
-#: ../src/picture.c:878
-msgid "Artist/performer"
-msgstr "Szerző / előadó"
+#: ../src/tag_area.c:3256
+#, c-format
+msgid "Images (%d)"
+msgstr "Képek (%d)"
 
-#: ../src/picture.c:880
-msgid "Conductor"
-msgstr "Karmester"
+#. FIXME: Pass error back to calling function.
+#: ../src/tags/ape_tag.c:61 ../src/tags/id3v24_tag.c:114
+#: ../src/tags/mp4_header.cc:46 ../src/tags/mp4_header.cc:59
+#: ../src/tags/mp4_tag.cc:70 ../src/tags/mp4_tag.cc:86
+#: ../src/tags/mp4_tag.cc:91 ../src/tags/mp4_tag.cc:263
+#: ../src/tags/mp4_tag.cc:279 ../src/tags/mp4_tag.cc:284
+#: ../src/tags/ogg_header.c:226
+#, fuzzy, 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)"
 
-#: ../src/picture.c:882
-msgid "Band/Orchestra"
-msgstr "Banda / Zenekar"
+#: ../src/tags/flac_header.c:202
+msgid "FLAC File"
+msgstr "FLAC fájl"
 
-#: ../src/picture.c:886
-msgid "Lyricist/text writer"
-msgstr "Dalszövegíró / szövegíró"
+#. Mode
+#. Mode
+#. mpeg4ip library seems to always return -1
+#. Mode
+#: ../src/tags/flac_header.c:215 ../src/tags/mp4_header.cc:148
+#: ../src/tags/ogg_header.c:436 ../src/tags/opus_header.c:238
+#: ../src/tags/wavpack_header.c:92
+msgid "Channels:"
+msgstr "Csatornák:"
 
-#: ../src/picture.c:888
-msgid "Recording location"
-msgstr "Felvétel helyszíne"
+#: ../src/tags/flac_tag.c:132 ../src/tags/flac_tag.c:856
+#: ../src/tags/flac_tag.c:867
+#, fuzzy, c-format
+#| msgid "Error while opening file: '%s' as FLAC (%s)."
+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/picture.c:890
-msgid "During recording"
-msgstr "Felvétel közben"
+#: ../src/tags/flac_tag.c:356 ../src/tags/ogg_tag.c:306
+#, fuzzy, c-format
+#| msgid ""
+#| "The year value '%s' seems to be invalid in file '%s'. The information "
+#| "will be lost while saving tag."
+msgid ""
+"The year value ‘%s’ seems to be invalid in file ‘%s’. The information will "
+"be lost when saving"
+msgstr ""
+"Az év értéke („%s”) érvénytelennek tűnik a(z) „%s” fájlban. Az információk "
+"el fognak veszni a címke mentése során."
 
-#: ../src/picture.c:892
-msgid "During performance"
-msgstr "Előadás közben"
+#: ../src/tags/flac_tag.c:1087
+#, c-format
+#| msgid "Picture block isn't valid: '%s'"
+msgid "Picture block is invalid ‘%s’"
+msgstr "A képblokk nem érvényes: „%s”"
 
-#: ../src/picture.c:894
-msgid "Movie/video screen capture"
-msgstr "Film / videófelvétel"
+#: ../src/tags/flac_tag.c:1123
+#, c-format
+#| msgid "Error: Failed to write comments to file '%s' (%s)."
+msgid "Failed to write comments to file ‘%s’: %s"
+msgstr "Nem sikerült a megjegyzések írása a(z) „%s” fájlba: %s"
 
-#: ../src/picture.c:896
-msgid "A bright colored fish"
-msgstr "Egy világos színes hal"
+#: ../src/tags/flac_tag.c:1129 ../src/tags/ogg_tag.c:1178
+#, c-format
+#| msgid "Written tag of '%s'"
+msgid "Wrote tag of ‘%s’"
+msgstr "A(z) „%s” címkéje kiírva"
 
-#: ../src/picture.c:898
-msgid "Illustration"
-msgstr "Illusztráció"
+#: ../src/tags/id3_tag.c:205
+#, c-format
+#| msgid "Error while reading file: '%s' (%s)"
+msgid "Error while reading file ‘%s’: %s"
+msgstr "Hiba a(z) „%s” fájl olvasása közben: %s"
 
-#: ../src/picture.c:900
-msgid "Band/Artist logotype"
-msgstr "Banda / Előadó logója"
+#: ../src/tags/id3_tag.c:217
+#, c-format
+#| msgid ""
+#| "As the following corrupted file '%s' will cause an error in id3lib, it "
+#| "will not be processed"
+msgid ""
+"As the following corrupted file ‘%s’ will cause an error in id3lib, it will "
+"not be processed"
+msgstr ""
+"Amint a következő sérült fájl („%s”) hibát fog okozni az id3lib fájlban, az "
+"nem lesz feldolgozva"
 
-#: ../src/picture.c:902
-msgid "Publisher/studio logotype"
-msgstr "Kiadó / stúdió logója"
+#: ../src/tags/id3_tag.c:219
+msgid "Corrupted file"
+msgstr "Sérült fájl"
 
-#: ../src/picture.c:906
-msgid "Unknown image type"
-msgstr "Ismeretlen képtípus"
+#: ../src/tags/id3_tag.c:597
+#, c-format
+#| msgid "Removed tag of '%s'"
+msgid "Removed tag of ‘%s’"
+msgstr "A(z) „%s” címkéje eltávolítva"
 
-#: ../src/picture.c:936 ../src/picture.c:947
-msgid "pixels"
-msgstr "képpont"
+#: ../src/tags/id3_tag.c:604 ../src/tags/id3_tag.c:727
+#, c-format
+#| msgid "Error while removing ID3v1 tag of '%s' (%s)"
+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/picture.c:937 ../src/picture.c:948
-msgid "Type"
-msgstr "Típus"
+#: ../src/tags/id3_tag.c:612 ../src/tags/id3_tag.c:692
+#, c-format
+#| msgid "Error while removing ID3v2 tag of '%s' (%s)"
+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/picture.c:949
-msgid "Description"
-msgstr "Leírás"
+#: ../src/tags/id3_tag.c:637
+#, c-format
+#| msgid "Error while updating ID3v2 tag of '%s' (%s)"
+msgid "Error while updating ID3v2 tag of ‘%s’: %s"
+msgstr "Hiba történt a(z) „%s” ID3v2 címkéjének frissítésekor: %s"
 
-#: ../src/picture.c:1065
+#: ../src/tags/id3_tag.c:668
 msgid ""
-"Cannot display the image because not enough data has been read to determine "
-"how to create the image buffer."
+"You have tried to save this tag to Unicode but it was detected that your "
+"version of id3lib is buggy"
 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:1072
-msgid "Cannot display the image"
-msgstr "Nem jeleníthető meg a kép"
+"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/picture.c:1074
+#: ../src/tags/id3_tag.c:670
+#, c-format
 msgid ""
-"Not enough data has been read to determine how to create the image buffer."
+"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"
 msgstr ""
-"Nem lett elegendő adat beolvasva annak meghatározásához, hogy hogyan jöjjön "
-"létre a képpuffer."
+"Ha újratölti ezt a fájlt, néhány karakter hibásan fog megjelenni. Kérjük "
+"alkalmazza az src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff "
+"javítócsomagot az id3lib fájlra, amely elérhető az EasyTAG "
+"csomagforrásokban.\n"
+"Figyeljen arra, hogy ez az üzenet csak egyszer fog megjelenni.\n"
+"\n"
+"File: %s"
+
+#: ../src/tags/id3_tag.c:677
+msgid "Buggy id3lib"
+msgstr "Hibás id3lib"
 
-#: ../src/picture.c:1076
-msgid "Load Image File"
-msgstr "Képfájl betöltése"
+#: ../src/tags/id3_tag.c:716
+#, c-format
+#| msgid "Error while updating ID3v1 tag of '%s' (%s)"
+msgid "Error while updating ID3v1 tag of ‘%s’: %s"
+msgstr "Hiba történt a(z) „%s” ID3v1 címkéjének frissítésekor: %s"
 
-# Ikon megjegyzés
-#. Label
-#: ../src/prefs.c:152
-msgid "Default directory:"
-msgstr "Alapértelmezett könyvtár:"
+#: ../src/tags/id3_tag.c:736 ../src/tags/id3v24_tag.c:1152
+#, c-format
+#| msgid "Updated tag of '%s'"
+msgid "Updated tag of ‘%s’"
+msgstr "A(z) „%s” címkéje frissítve"
 
-#: ../src/prefs.c:165
-msgid ""
-"Specify the directory where your files are located. This path will be loaded "
-"when EasyTAG starts without parameter."
-msgstr ""
-"Adja meg azt a könyvtárat, ahol a fájljai találhatók. Ez az útvonal kerül "
-"betöltésre, amikor az EasyTAG paraméterek nélkül indul."
+#: ../src/tags/id3_tag.c:756
+msgid "No error reported"
+msgstr "Nem történt hiba"
 
-#. Load directory on startup
-#: ../src/prefs.c:186
-msgid ""
-"Load on startup the default directory or the directory passed as argument"
-msgstr ""
-"Induláskor töltődjön be az alapértelmezett könyvtár vagy a könyvtár kerüljön "
-"átadásra paraméterként"
+#: ../src/tags/id3_tag.c:758
+msgid "No available memory"
+msgstr "Nincs elérhető memória"
 
-#: ../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 ""
-"Fájlok automatikus keresése az EasyTAG indulásakor az alapértelmezett "
-"könyvtárba. Figyeljen arra, hogy ez az útvonal felülbírálásra kerülhet az "
-"easytag számára átadott paraméterrel (easytag /útvonal/mp3_fájlok)."
+#: ../src/tags/id3_tag.c:760
+msgid "No data to parse"
+msgstr "Nincs feldolgozandó adat"
 
-#. Browse subdirectories
-#: ../src/prefs.c:194
-msgid "Search subdirectories"
-msgstr "Alkönyvtárak keresése"
+#: ../src/tags/id3_tag.c:762
+msgid "Improperly formatted data"
+msgstr "Helytelenül formázott adatok"
 
-# bubble help
-#: ../src/prefs.c:197
-msgid "Search subdirectories for files when reading a directory into the tree."
-msgstr ""
-"Fájlok keresése az alkönyvtárakban, amikor könyvtár beolvasásra kerül a fába."
+#: ../src/tags/id3_tag.c:764
+msgid "No buffer to write to"
+msgstr "Nincs írható puffer"
 
-#. Open the node to show subdirectories
-#: ../src/prefs.c:201
-msgid "Show subdirectories when selecting a directory"
-msgstr "Alkönyvtárak megjelenítése könyvtár kijelölésekor"
+#: ../src/tags/id3_tag.c:766
+msgid "Buffer is too small"
+msgstr "A puffer túl kicsi"
 
-# not necessary (hungarian)
-# bubble help
-#: ../src/prefs.c:205
-msgid ""
-"This expands the selected node into the file browser to display the sub-"
-"directories."
-msgstr ""
-"Ez nyitja ki a fájlböngészőben kijelölt csomópontot az alkönyvtárak "
-"megjelenítéséhez."
+#: ../src/tags/id3_tag.c:768
+msgid "Invalid frame ID"
+msgstr "Érvénytelen keret azonosító"
 
-#. Browse hidden directories
-#: ../src/prefs.c:209
-msgid "Search hidden directories"
-msgstr "Rejtett könyvtárak keresése"
+#: ../src/tags/id3_tag.c:770
+msgid "Requested field not found"
+msgstr "A kért mező nem található"
 
-# bubble help
-#: ../src/prefs.c:214
-msgid "Search hidden directories for files (directories starting by a '.')."
-msgstr ""
-"Fájlok keresése rejtett könyvtárakban (a „.” karakterrel kezdődő "
-"könyvtárakban)."
+#: ../src/tags/id3_tag.c:772
+msgid "Unknown field type"
+msgstr "Ismeretlen mezőtípus"
 
-#.
-#. * Misc
-#.
-#: ../src/prefs.c:222
-msgid "Misc"
-msgstr "Egyéb"
+#: ../src/tags/id3_tag.c:774
+msgid "Tag is already attached to a file"
+msgstr "A címke már csatolva van egy fájlhoz"
 
-#. User interface
-#: ../src/prefs.c:228
-msgid "User Interface"
-msgstr "Felhasználói felület"
+#: ../src/tags/id3_tag.c:776
+msgid "Invalid tag version"
+msgstr "Érvénytelen címke verzió"
 
-#. Show header infos
-#: ../src/prefs.c:235
-msgid "Show header information of file"
-msgstr "A fájl fejléc információinak megjelenítése"
+#: ../src/tags/id3_tag.c:778
+msgid "No file to parse"
+msgstr "Nincs feldolgozandó fájl"
 
-# bubble help
-#: ../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 ""
-"Ha aktivált, információkat fog megjeleníteni a fájlról (bitráta, idő, méret) "
-"a fájlnév bejegyzés alatt."
+#: ../src/tags/id3_tag.c:780
+msgid "Attempting to write to a read-only file"
+msgstr "Írási kísérlet csak olvasható fájlba"
 
-#: ../src/prefs.c:244
-msgid "Display changed files in list using:"
-msgstr "Módosított fájlok megjelenítése a listában:"
+#: ../src/tags/id3_tag.c:782
+msgid "Error in compression/uncompression"
+msgstr "Hiba a tömörítésben/kibontásban"
 
-#: ../src/prefs.c:247
-msgid "Red color"
-msgstr "Piros színnel"
+#: ../src/tags/id3_tag.c:784
+msgid "Unknown error message"
+msgstr "Ismeretlen hibaüzenet"
 
-#: ../src/prefs.c:253
-msgid "Bold style"
-msgstr "Félkövér stílussal"
+#: ../src/tags/id3_tag.c:1454
+#, c-format
+#| msgid "Error while creating temporary file: '%s'"
+msgid "Error while creating temporary file ‘%s’"
+msgstr "Hiba az átmeneti fájl létrehozása közben: „%s”"
 
-#. Sorting List Options
-#: ../src/prefs.c:259
-msgid "Sorting List Options"
-msgstr "Lista rendezési beállítások"
+#: ../src/tags/id3_tag.c:1461
+msgid "Error while creating temporary file"
+msgstr "Hiba az átmeneti fájl létrehozása közben"
 
-#. Sorting method
-#: ../src/prefs.c:268
-msgid "Sort the file list by:"
-msgstr "Fájllista rendezése:"
+#: ../src/tags/id3_tag.c:1481
+#, c-format
+#| msgid "Error while writing to file: '%s' (%s)"
+msgid "Error while writing to file ‘%s’: %s"
+msgstr "Hiba a(z) „%s” fájlba írása közben: %s"
 
-#: ../src/prefs.c:278
-msgid "Ascending filename"
-msgstr "Fájlnév szerint növekvően"
+#. 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/tags/id3v24_tag.c:1642
+#, 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] "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/prefs.c:280
-msgid "Descending filename"
-msgstr "Fájlnév szerint csökkenően"
+#: ../src/tags/id3v24_tag.c:1663
+#, c-format
+#| msgid "Cannot save tag of file '%s'"
+msgid "Cannot save tag of file ‘%s’"
+msgstr "Nem menthető a(z) „%s” fájl címkéje"
 
-#: ../src/prefs.c:281
-msgid "Ascending title"
-msgstr "Cím szerint növekvően"
+#: ../src/tags/id3v24_tag.c:1675
+#, c-format
+#| msgid "Size error while saving tag of '%s'"
+msgid "Size error while saving tag of ‘%s’"
+msgstr "Mérethiba a(z) „%s” címkéjének mentése közben"
 
-#: ../src/prefs.c:282
-msgid "Descending title"
-msgstr "Cím szerint csökkenően"
+#. Mode changed to profile name
+#: ../src/tags/monkeyaudio_header.c:83 ../src/tags/musepack_header.c:86
+msgid "Profile:"
+msgstr "Profil:"
 
-#: ../src/prefs.c:283
-msgid "Ascending artist"
-msgstr "Előadó szerint növekvően"
+#: ../src/tags/mp4_header.cc:60 ../src/tags/mp4_tag.cc:92
+#: ../src/tags/mp4_tag.cc:285
+msgid "MP4 format invalid"
+msgstr "Érvénytelen MP4 formátum"
 
-#: ../src/prefs.c:284
-msgid "Descending artist"
-msgstr "Előadó szerint csökkenően"
+#: ../src/tags/mp4_header.cc:70
+#, c-format
+#| msgid "Error reading properties from file: '%s'"
+msgid "Error reading properties from file ‘%s’"
+msgstr "Hiba a tulajdonságok olvasásakor a következő fájlból: „%s”"
 
-#: ../src/prefs.c:286
-msgid "Ascending album artist"
-msgstr "Album előadó szerint növekvően"
+#: ../src/tags/mp4_header.cc:127
+msgid "MP4/AAC File"
+msgstr "MP4/AAC fájl"
 
-#: ../src/prefs.c:288
-msgid "Descending album artist"
-msgstr "Album előadó szerint csökkenően"
+#: ../src/tags/mp4_header.cc:136 ../src/tags/mpeg_header.c:219
+#, c-format
+msgid "~%d kb/s"
+msgstr "~%d kb/s"
 
-#: ../src/prefs.c:289
-msgid "Ascending album"
-msgstr "Album szerint növekvően"
+#: ../src/tags/mp4_tag.cc:102 ../src/tags/mp4_tag.cc:294
+#, c-format
+#| msgid "Error reading tags from file: '%s'"
+msgid "Error reading tags from file ‘%s’"
+msgstr "Hiba a címkék olvasásakor a következő fájlból: „%s”"
 
-#: ../src/prefs.c:290
-msgid "Descending album"
-msgstr "Album szerint csökkenően"
+#: ../src/tags/mpeg_header.c:52
+msgid "Stereo"
+msgstr "Sztereó"
 
-#: ../src/prefs.c:291
-msgid "Ascending year"
-msgstr "Év szerint növekvően"
+#: ../src/tags/mpeg_header.c:53
+msgid "Joint stereo"
+msgstr "Joint sztereó"
 
-#: ../src/prefs.c:292
-msgid "Descending year"
-msgstr "Év szerint csökkenően"
+#: ../src/tags/mpeg_header.c:54
+msgid "Dual channel"
+msgstr "Két csatornás"
 
-#: ../src/prefs.c:294
-msgid "Ascending disc number"
-msgstr "Lemezszám szerint növekvően"
+#: ../src/tags/mpeg_header.c:55
+msgid "Single channel"
+msgstr "Egy csatornás"
 
-#: ../src/prefs.c:296
-msgid "Descending disc number"
-msgstr "Lemezszám szerint csökkenően"
+#: ../src/tags/mpeg_header.c:189
+msgid "MP3 File"
+msgstr "MP3 fájl"
 
-#: ../src/prefs.c:298
-msgid "Ascending track number"
-msgstr "Szám szerint növekvően"
+#: ../src/tags/mpeg_header.c:192
+msgid "MP2 File"
+msgstr "MP2 fájl"
 
-#: ../src/prefs.c:300
-msgid "Descending track number"
-msgstr "Szám szerint csökkenően"
+#. MPEG, Layer versions
+#: ../src/tags/mpeg_header.c:199
+msgid "MPEG"
+msgstr "MPEG"
 
-#: ../src/prefs.c:301
-msgid "Ascending genre"
-msgstr "Műfaj szerint növekvően"
+#: ../src/tags/musepack_header.c:83
+msgid "MusePack File"
+msgstr "MusePack fájl"
 
-#: ../src/prefs.c:302
-msgid "Descending genre"
-msgstr "Műfaj szerint csökkenően"
+#: ../src/tags/ogg_header.c:243
+#, c-format
+#| msgid ""
+#| "Ogg Vorbis: The specified bitstream does not exist or the file has been "
+#| "initialized improperly (file: '%s')."
+msgid ""
+"The specified bitstream does not exist or the file has been initialized "
+"improperly (file: ‘%s’)"
+msgstr ""
+"A megadott adatfolyam nem létezik, vagy a fájl helytelenül lett előkészítve "
+"(fájl: „%s”)"
 
-#: ../src/prefs.c:303
-msgid "Ascending comment"
-msgstr "Megjegyzés szerint növekvően"
+#: ../src/tags/ogg_header.c:281
+#, c-format
+#| msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
+msgid "Read from media returned an error (file: ‘%s’)"
+msgstr "Hiba a médiából történő olvasás közben (fájl: „%s”)"
 
-#: ../src/prefs.c:304
-msgid "Descending comment"
-msgstr "Megjegyzés szerint csökkenően"
+#: ../src/tags/ogg_header.c:286
+#, c-format
+#| msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
+msgid "Bitstream is not Vorbis data (file: ‘%s’)"
+msgstr "Az adatfolyam nem Vorbis adat (fájl: „%s”)"
 
-#: ../src/prefs.c:306
-msgid "Ascending composer"
-msgstr "Zeneszerző szerint növekvően"
+#: ../src/tags/ogg_header.c:291
+#, c-format
+#| msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
+msgid "Vorbis version mismatch (file: ‘%s’)"
+msgstr "A Vorbis verzió nem megfelelő (fájl: „%s”)"
 
-#: ../src/prefs.c:308
-msgid "Descending composer"
-msgstr "Zeneszerző szerint csökkenően"
+#: ../src/tags/ogg_header.c:296
+#, c-format
+#| msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
+msgid "Invalid Vorbis bitstream header (file: ‘%s’)"
+msgstr "Érvénytelen Vorbis adatfolyam fejléc (fájl: „%s”)"
 
-#: ../src/prefs.c:310
-msgid "Ascending original artist"
-msgstr "Eredeti előadó szerint növekvően"
+#: ../src/tags/ogg_header.c:301
+#, c-format
+#| msgid ""
+#| "Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack "
+#| "corruption (file: '%s')."
+msgid ""
+"Internal logic fault, indicates a bug or heap/stack corruption (file: ‘%s’)"
+msgstr ""
+"Belső logikai hiba, amely hibára vagy kupac/verem sérülésre utal (fájl: „%s”)"
 
-#: ../src/prefs.c:312
-msgid "Descending original artist"
-msgstr "Eredeti előadó szerint csökkenően"
+#: ../src/tags/ogg_header.c:349
+#, c-format
+#| msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
+msgid "Failed to open file ‘%s’ as Vorbis: %s"
+msgstr "Nem sikerült a(z) „%s” fájl Vorbisként való megnyitása: %s"
 
-#: ../src/prefs.c:314
-msgid "Ascending copyright"
-msgstr "Szerzői jog szerint növekvően"
+#: ../src/tags/ogg_header.c:408
+msgid "Ogg Vorbis File"
+msgstr "Ogg Vorbis fájl"
 
-#: ../src/prefs.c:316
-msgid "Descending copyright"
-msgstr "Szerzői jog szerint csökkenően"
+# ikon megjegyzés
+#: ../src/tags/ogg_header.c:411
+msgid "Speex File"
+msgstr "Speex fájl"
 
-#: ../src/prefs.c:318
-msgid "Ascending URL"
-msgstr "URL szerint növekvően"
+#: ../src/tags/ogg_tag.c:711 ../src/tags/ogg_tag.c:888
+#, c-format
+#| msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
+msgid "The Ogg Vorbis file ‘%s’ contains an ID3v2 tag"
+msgstr "Az Ogg Vorbis fájl „%s” ID3v2 címkét tartalmaz"
 
-#: ../src/prefs.c:320
-msgid "Descending URL"
-msgstr "URL szerint csökkenően"
+#: ../src/tags/opus_header.c:225
+msgid "Opus File"
+msgstr "Opus fájl"
 
-#: ../src/prefs.c:322
-msgid "Ascending encoded by"
-msgstr "Kódoló neve szerint növekvően"
+#: ../src/tags/wavpack_header.c:79
+msgid "Wavpack File"
+msgstr "Wavpack fájl"
 
-#: ../src/prefs.c:324
-msgid "Descending encoded by"
-msgstr "Kódoló neve szerint csökkenően"
+#~ msgid "Error while opening file: '%s' (%s)."
+#~ msgstr "Hiba a(z) „%s” fájl megnyitása közben (%s)."
 
-#: ../src/prefs.c:326
-msgid "Ascending creation date"
-msgstr "Létrehozás dátuma szerint növekvően"
+#~ msgid "Run a command on the selected files"
+#~ msgstr "Parancs futtatása a kijelölt fájlokon"
 
-#: ../src/prefs.c:328
-msgid "Descending creation date"
-msgstr "Létrehozás dátuma szerint csökkenően"
+#~ msgid "Clear the current selection"
+#~ msgstr "A jelenlegi kijelölés törlése"
 
-# bubble help
-#: ../src/prefs.c:332
-msgid "Select the type of file sorting when loading a directory."
-msgstr "A fájlrendezés típusának kiválasztása könyvtár betöltésekor."
+# Fájl menü
+#~ msgid "Delete files"
+#~ msgstr "Fájlok törlése"
 
-# bubble help
-#: ../src/prefs.c:344
-msgid "If activated, the sorting of the list will be dependent on the case."
-msgstr "Ha aktivált, a lista rendezése a függeni fog a kis- és nagybetűktől."
+# Fájl menü
+#~ msgid "S_can Files"
+#~ msgstr "Fájlok _vizsgálata"
 
-#. File Player
-#: ../src/prefs.c:348
-msgid "File Audio Player"
-msgstr "Fájl zenelejátszó"
+# Fájl menü
+#~ msgid "_Undo Last Files Changes"
+#~ msgstr "_Utolsó fájlmódosítások visszavonása"
 
-#: ../src/prefs.c:360
-msgid "Player to run:"
-msgstr "Futtatandó lejátszó:"
+# Fájl menü
+#~ msgid "Undo last files changes"
+#~ msgstr "Utolsó fájlmódosítások visszavonása"
 
-# bubble help
-#: ../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 ""
-"Adja meg a fájlok lejátszásához használandó programot. Néhány paraméter "
-"átadható a programnak (mint „xmms -p”), mielőtt fájlokat fogadna egyéb "
-"paraméterként."
+# Fő menü
+#~ msgid "R_edo Last Files Changes"
+#~ msgstr "U_tolsó fájlmódosítások ismétlése"
 
-#. Log options
-#: ../src/prefs.c:384
-msgid "Log Options"
-msgstr "Napló beállítások"
+# ikon megjegyzés
+#~ msgid "Redo last files changes"
+#~ msgstr "Utolsó fájlmódosítások ismétlése"
 
-#. Show / hide log view
-#: ../src/prefs.c:391
-msgid "Show log view in main window"
-msgstr "Naplónézet megjelenítése a főablakban"
+# ikon megjegyzés
+#~ msgid "Force saving files"
+#~ msgstr "Fájlok kényszerített mentése"
 
-#: ../src/prefs.c:394
-msgid "If activated, the log view would be visible in the main window."
-msgstr "Ha aktívált, a naplónézet az a főablakban lesz látható."
+# Fájl menü
+#~ msgid "Undo Last Changes"
+#~ msgstr "Utolsó változtatások visszavonása"
 
-#: ../src/prefs.c:400
-msgid "Max number of lines:"
-msgstr "Sorok maximális száma:"
+# Fájl menü
+#~ msgid "Undo last changes"
+#~ msgstr "Utolsó változtatások visszavonása"
 
-# Menüsor
-#. 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);
-#.
-#.
-#. * File Settings
-#.
-#: ../src/prefs.c:418
-msgid "File Settings"
-msgstr "Fájl beállítások"
+# ikon megjegyzés
+#~ msgid "Redo Last Changes"
+#~ msgstr "Utolsó változtatások ismétlése"
 
-#. File (name) Options
-#: ../src/prefs.c:424
-msgid "File Options"
-msgstr "Fájl beállítások"
+# ikon megjegyzés
+#~ msgid "Redo last changes"
+#~ msgstr "Utolsó változtatások ismétlése"
 
-#: ../src/prefs.c:430
-msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
-msgstr ""
-"Szabálytalan karakterek cseréje a fájlnevekben (Windows és CD-ROM számára)"
+# ikon megjegyzés
+#~ msgid "Go to home directory"
+#~ msgstr "Ugrás a kezdő könyvtárra"
 
-# bubble help
-#: ../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 ""
-"A szabálytalan karakterek átalakítása FAT32/16 és ISO9660 + Joliet "
-"fájlrendszerek számára („\\”, „:”, „;”, „*”, „?”, „\"”, „<”, „>”, „|”) az "
-"átnevezéskor felmerülő problémák megelőzésére. Ez akkor hasznos, ha a fájlok "
-"a címkéből lesznek átnevezve a feldolgozóval."
-
-#. Extension case (lower/upper?)
-#: ../src/prefs.c:441
-msgid "Convert filename extension to:"
-msgstr "Fájlnév kiterjesztés átalakítása:"
+# Ikon megjegyzés
+#~ msgid "Go to desktop directory"
+#~ msgstr "Ugrás az asztal könyvtárra"
 
-#: ../src/prefs.c:444
-msgid "Lower Case"
-msgstr "Kisbetűsre"
+# ikon megjegyzés
+#~ msgid "Go to documents directory"
+#~ msgstr "Ugrás a dokumentumok könyvtárra"
 
-# bubble help
-#: ../src/prefs.c:447
-msgid "For example, the extension will be converted to '.mp3'"
-msgstr "Például a kiterjesztés „.mp3”-ra lesz átalakítva"
+# ikon megjegyzés
+#~ msgid "Go to downloads directory"
+#~ msgstr "Ugrás a letöltések könyvtárra"
 
-#: ../src/prefs.c:450
-msgid "Upper Case"
-msgstr "Nagybetűsre"
+# ikon megjegyzés
+#~ msgid "Go to music directory"
+#~ msgstr "Ugrás a zene könyvtárra"
 
-# bubble help
-#: ../src/prefs.c:453
-msgid "For example, the extension will be converted to '.MP3'"
-msgstr "Például a kiterjesztés „.MP3”-ra lesz átalakítva"
+#~ msgid "Go to parent directory"
+#~ msgstr "Ugrás a szülő könyvtárba"
 
-#: ../src/prefs.c:456
-msgid "No Change"
-msgstr "Nincs változtatás"
+# Ikon megjegyzés
+#~ msgid "Go to default directory"
+#~ msgstr "Ugrás az alapértelmezett könyvtárra"
 
-# bubble help
-#: ../src/prefs.c:459
-msgid "The extension will not be converted"
-msgstr "A kiterjesztés nem lesz átalakítva"
+# ikon megjegyzés
+#~ msgid "Set current path as default"
+#~ msgstr "Jelenlegi útvonal alapértelmezetté tétele"
 
-#. Preserve modification time
-#: ../src/prefs.c:462
-msgid "Preserve modification time of the file"
-msgstr "A fájl módosítási idejének megőrzése"
+#~ msgid "Rename directory"
+#~ msgstr "Könyvtár átnevezése"
 
-# bubble help
-#: ../src/prefs.c:465
-msgid ""
-"Preserve the modification time (in file properties) when saving the file."
-msgstr ""
-"A módosítás idejének megőrzése (a fájltulajdonságokban) a fájl mentésekor."
+# böngésző menü
+#~ msgid "Reload directory"
+#~ msgstr "Könyvtár újratöltése"
 
-#. Change directory modification time
-#: ../src/prefs.c:469
-msgid ""
-"Update modification time of the parent directory of the file (recommended "
-"when using Amarok)"
-msgstr ""
-"A fájl szülőkönyvtár módosítási idejének frissítése (ajánlott az Amarok "
-"használatakor)"
+#~ msgid "Run a command on the directory"
+#~ msgstr "Parancs futtatása a könyvtáron"
 
-#: ../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 "
-"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."
-msgstr ""
-"A fájl szülőkönyvtár módosítási ideje frissítve lesz, amikor a fájl menti a "
-"címkét. Jelenleg ez csak akkor történik automatikusan, amikor átnevez egy "
-"fájlt.\n"
-"Ez a szolgáltatás akkor érdekes, amikor egy olyan alkalmazást használ mint "
-"az Amarok. Teljesítménybeli okokból ezek a programok a fájlinformációkat a "
-"szülőkönyvtár módosulásának észlelésekor frissítik."
-
-#. Character Set for Filename
-#: ../src/prefs.c:481
-msgid "Character Set for Filename"
-msgstr "Karakterkészlet a fájlnévhez"
-
-#. Rules for character set
-#: ../src/prefs.c:493
-msgid ""
-"Rules to apply if some characters can't be converted to the system character "
-"encoding when writing filename:"
-msgstr ""
-"Alkalmazandó szabályok, ha néhány karakter nem alakítható át a rendszer "
-"karakterkódolására a fájlnév írásakor:"
+# böngésző menü
+#~ msgid "Reload directory tree"
+#~ msgstr "Könyvtárfa újratöltése"
 
-#: ../src/prefs.c:499
-msgid "Try another character encoding"
-msgstr "Próbáljon másik karakter kódolást"
+# ikon megjegyzés
+#~ msgid "CDDB search"
+#~ msgstr "CD-adatbázis keresés"
 
-#: ../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 ""
-"Ezzel a beállítással megpróbálja az átalakítást a területi beállítások "
-"szereint (például: ISO-8859-1 „fr”-hez, KOI8-R „ru”-hoz, ISO-8859-2 „ro”-"
-"hoz).Ha ez nem sikerül, akkor az ISO-8859-1 karakterkódolást fogja "
-"megpróbálni."
+#~ msgid "Load filenames from a text file"
+#~ msgstr "Fájlnevek betöltése szövegfájlból"
 
-#: ../src/prefs.c:510
-msgid ""
-"Force using the system character encoding and activate the transliteration"
-msgstr ""
-"A rendszer karakterkódolásának erőltetett használata és az átírás aktiválása"
+# egyéb menü
+#~ msgid "Run audio player"
+#~ msgstr "Zenelejátszó futtatása"
 
-#: ../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 ""
-"Ezzel a beállítással ha nem ábrázolható egy karakter a cél "
-"karakterkészletben, közelítő megoldásként egy vagy több hasonlóan kinéző "
-"karakterrel helyettesíti."
+#~ msgid "About"
+#~ msgstr "Névjegy"
 
-#: ../src/prefs.c:520
-msgid ""
-"Force using the system character encoding and silently discard some "
-"characters"
-msgstr ""
-"A rendszer karakterkódolásának erőltetett használata és csendben néhány "
-"karakter elvetése"
+#~ msgid "_File Operations"
+#~ msgstr "_Fájlműveletek"
 
-#: ../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 ""
-"Ezzel a beállítással ha nem ábrázolható egy karakter a cél "
-"karakterkészletben, akkor az csendben elvetésre kerül."
+# Menüsor
+#~ msgid "S_canner"
+#~ msgstr "Fel_dolgozó"
 
-#.
-#. * Tag Settings
-#.
-#: ../src/prefs.c:533
-msgid "Tag Settings"
-msgstr "Címke beállítások"
+#~ msgid "CDDB search files…"
+#~ msgstr "Fájl keresése CD-adatbázisban"
 
-#. Tag Options
-#: ../src/prefs.c:539
-msgid "Tag Options"
-msgstr "Címke beállítások"
+#~ msgid "Tree Browser"
+#~ msgstr "Fa böngésző"
 
-#: ../src/prefs.c:545
-msgid "Auto completion of date if not complete"
-msgstr "Dátum automatikus kiegészítése, ha nem teljes"
+#~ msgid "View by directory tree"
+#~ msgstr "Könyvtárfa szerinti nézet"
 
-# bubble help
-#: ../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 ""
-"Megpróbálja kiegészíteni az év mezöt, ha csak a dátum utolsó számait adja "
-"meg (például ha a jelenlegi év 2005: 5 => 2005, 4 => 2004, 6 => 1996, 95 => "
-"1995…)."
+# feldolgozó menü
+#~ msgid "_Fill Tags…"
+#~ msgstr "Címkék _kitöltése…"
 
-#: ../src/prefs.c:556
-msgid "Write the track field with the following number of digits:"
-msgstr "A szám mező írása a következő számú számjegyekkel:"
+#~ msgid "Fill tags"
+#~ msgstr "Címkék kitöltése"
 
-# bubble help
-#: ../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 ""
-"Ha aktivált, a szám mezőbe a „0” szám használatának kitöltésével lesz beírva "
-"a megadott szám „n” számjegye (például két számjeggyel: „05”, „09”, „10”…). "
-"Egyébként megtartja a „nyers” szám értéket."
+#~ msgid "Rename files and directories"
+#~ msgstr "Fájlok és könyvtárak átnevezése"
 
-#: ../src/prefs.c:578
-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:"
+#~ msgid "_Process Fields…"
+#~ msgstr "Mezök fel_dolgozása…"
 
-#: ../src/prefs.c:583
-msgid "Whether to pad the disc field with leading zeroes"
-msgstr "Legyen-e kitöltve a lemez mező vezető nullákkal"
+#~ msgid "Could not merge UI, error was: %s\n"
+#~ msgstr "Az UI egyesítése nem lehetséges, a hiba: %s\n"
 
-#: ../src/prefs.c:613
-msgid ""
-"Tag field focus when switching files in list with shortcuts Page Up/Page "
-"Down:"
-msgstr ""
-"Címkemező fókusz a listában lévő fájlok váltásakor a Page Up/Page Down "
-"gyorsbillentyűkkel:"
+#~ 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/prefs.c:619
-msgid "Keep focus to the same tag field"
-msgstr "A fókusz megtartása ugyanazon a címkemezőn"
+#~ msgid "Tree"
+#~ msgstr "Fa"
 
-#: ../src/prefs.c:625
-msgid "Return focus to the first tag field (i.e. 'Title' field)"
-msgstr "A fókusz visszatérése az első címkemezőre (azaz a „Cím” mező)"
+#~ msgid "Select a directory to browse."
+#~ msgstr "Válassza ki az átvizsgálandó könyvtárat."
 
-#. 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 "Címke felosztása"
+#~ msgid "Artist & Album"
+#~ msgstr "Előadó és album"
 
-#: ../src/prefs.c:639
-msgid ""
-"For Vorbis tags, selected fields will be split at dashes and saved as "
-"separate tags"
-msgstr ""
-"A Vorbis címkéknél a kiválasztott mezők felosztásra kerülnek a kötőjeleknél "
-"és különálló címkékként lesznek elmentve"
+# bubblehelp
+#~ 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."
 
-#: ../src/prefs.c:649
-msgid "Original artist"
-msgstr "Eredeti előadó"
+#~ msgid "Program to run:"
+#~ msgstr "Futtatandó program:"
 
-#.
-#. * ID3 Tag Settings
-#.
-#: ../src/prefs.c:670
-msgid "ID3 Tag Settings"
-msgstr "ID3 címke beállítások"
-
-#. Tag Rules frame
-#: ../src/prefs.c:679
-msgid "ID3 Tag Rules"
-msgstr "ID3 címke szabályok"
-
-#. Strip tag when fields (managed by EasyTAG) are empty
-#: ../src/prefs.c:691
-msgid "Strip tags if all fields are set to blank"
-msgstr "Címkék törlése, ha minden mező üresre van állítva"
+#~ msgid "Request CDDB"
+#~ msgstr "CDDB kérése"
 
-# 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 image, lyrics…), this option allows you to "
-"strip the whole tag when these seven standard data fields have been set to "
-"blank."
-msgstr ""
-"Mivel az ID3v2 címkék tartalmazhatnak más adatokat is a címen, előadón, "
-"albumon, évszámon, számon, műfajon vagy megjegyzésen kívül (mint csatolt "
-"képek, dalszövegek…), ezért ez a beállítás lehetővé teszi a teljes címke "
-"törlését, amikor ez a hét szabványos adatmező üresre van állítva."
-
-#. Convert old ID3v2 tag version
-#: ../src/prefs.c:700
-msgid "Automatically convert old ID3v2 tag versions"
-msgstr "A régi ID3v2 címkeverziók automatikus átalakítása"
+#~ msgid "Use local CDDB"
+#~ msgstr "Helyi CD-adatbázis használata"
 
 # bubble help
-#: ../src/prefs.c:703
-msgid ""
-"If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
-"ID3v2.3 version."
-msgstr ""
-"Ha aktivált, a régi ID3v2 címkeverzió (mint ID3v2.2) frissítve lesz az "
-"ID3v2.3 verzióra."
+#~ msgid ""
+#~ "When activating this option, after loading the fields, the current "
+#~ "selected scanner will be ran (the scanner window must be opened)."
+#~ msgstr ""
+#~ "Ha aktiválja ezt a lehetőséget, akkor a mezők betöltése után a jelenleg "
+#~ "kiválasztott feldolgozó lesz futtatva (a feldolgozóablaknak nyitva kell "
+#~ "lennie)."
 
-#. Use CRC32
-#: ../src/prefs.c:707
-msgid "Use CRC32"
-msgstr "CRC32 használata"
+#~ msgid "Words:"
+#~ msgstr "Szavak:"
 
-#: ../src/prefs.c:710
-msgid "Set CRC32 in the ID3v2 tags"
-msgstr "CRC32 beállítása az ID3v2 címkékben"
+#~ msgid "Search In:"
+#~ msgstr "Keresés helye:"
 
-#. Use Compression
-#: ../src/prefs.c:713
-msgid "Use Compression"
-msgstr "Tömörítés használata"
+#~ msgid "All Fields"
+#~ msgstr "Minden mezőben"
 
-#: ../src/prefs.c:717
-msgid "Set Compression in the ID3v2 tags"
-msgstr "Tömörítés beállítása az ID3v2 címkékben"
+#~ msgid "All Categories"
+#~ msgstr "Minden kategóriában"
 
-#. Write Genre in text
-#: ../src/prefs.c:720
-msgid "Write Genre in text only"
-msgstr "Műfaj írása csak szövegben"
+#~ msgid "included: funk, soul, rap, pop, industrial, metal, etc."
+#~ msgstr "beleértve: funk, soul, rap, pop, industrial, metal, stb."
 
-#: ../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 használja az ID3v1 számhivatkozásokat a műfaj címkében. Akkor "
-"engedélyezze ezt, ha műfajként látja a számokat a zenelejátszójában."
+#~ msgid "movies, shows"
+#~ msgstr "filmek, tv műsorok"
 
-#. Character Set for writing ID3 tag
-#: ../src/prefs.c:727
-msgid "Character Set for writing ID3 tags"
-msgstr "Karakterkészlet az ID3 címkék írásához"
+#~ msgid "others that do not fit in the above categories"
+#~ msgstr "egyéb fel nem sorolt kategóriák"
 
-#. ID3v2 tags
-#: ../src/prefs.c:734
-msgid "ID3v2 tags"
-msgstr "ID3v2 címkék"
+# bubble help
+#~ msgid "Enter the words to search in the list below"
+#~ msgstr "Írja be a keresendő szavakat a lenti listába"
 
-#. Write ID3v2 tag
-#: ../src/prefs.c:747
-msgid "Write ID3v2 tag"
-msgstr "ID3v2 címke írása"
+#~ msgid "Search Next"
+#~ msgstr "Következő keresése"
 
-# bubble help
-#: ../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 ""
-"Ha aktivált, az ID3v2.4 címke hozzá lesz adva vagy frissítve lesz az MP3 "
-"fájlok kezdeténél. Egyébként törlésre kerül."
+#~ msgid "Search Previous"
+#~ msgstr "Előző keresése"
 
-#. ID3v2 tag version
-#: ../src/prefs.c:757
-msgid "Version:"
-msgstr "Verzió:"
+#~ 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/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 ""
-"Az ID3v2 címkeverzió kiválasztása íráshoz:\n"
-" - ID3v2.3 címke id3lib használatával,\n"
-" - ID3v2.4 címke libid3tag használatával (ajánlott)."
+#~ msgid "Set Into:"
+#~ msgstr "Beállítás ebbe:"
 
-#. Charset
-#. Id3V1 writing character set
-#: ../src/prefs.c:778 ../src/prefs.c:882
-msgid "Charset:"
-msgstr "Karakterkészlet:"
+#~ msgid "All"
+#~ msgstr "MInden mező"
 
-# src/trans.h:267
-#. Unicode
-#: ../src/prefs.c:783
-msgid "Unicode "
-msgstr "Unicode "
+#~ msgid ""
+#~ "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 ""
+#~ "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."
 
-#: ../src/prefs.c:791
-msgid "Unicode type to use"
-msgstr "A használandó Unicode típus"
+#~ msgid "The path for 'Local CD Database' was not defined"
+#~ msgstr "A „Helyi CD-adatbázis” útvonala nem volt meghatározva"
 
-# bubble help
-#: ../src/prefs.c:815
-msgid "Character set used to write the tag data in the file."
-msgstr "A címkeadatok fájlba írására használt karakterkészlet."
+#~ 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."
 
-#. ID3v2 Additional iconv() options
-#. ID3V1 Additional iconv() options
-#: ../src/prefs.c:825 ../src/prefs.c:894
-msgid "Additional settings for iconv():"
-msgstr "További beállítások az iconv() programhoz:"
+#~ msgid "Local CD search"
+#~ msgstr "Helyi CD keresés"
 
-#: ../src/prefs.c:831 ../src/prefs.c:900
-msgid "No"
-msgstr "Nem"
+#~ msgid "Using libid3tag version %s"
+#~ msgstr "A(z) %s verziójú libid3tag használata"
 
-#: ../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 ""
-"Ezzel a beállítással ha nem ábrázolható egy karakter a cél "
-"karakterkészletben, akkor az nem lesz módosítva. De figyeljen arra, hogy egy "
-"hibaüzenet fog megjelenítésre kerülni az információhoz."
+#~ msgid "Using id3lib version %d.%d.%d"
+#~ msgstr "A(z) %d.%d.%d verziójú id3lib használata"
 
-#: ../src/prefs.c:840 ../src/prefs.c:909
-msgid "//TRANSLIT"
-msgstr "//ÁTÍR"
+#~ 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/prefs.c:850 ../src/prefs.c:919
-msgid "//IGNORE"
-msgstr "//KIHAGY"
+#~ msgid "Frequency:"
+#~ msgstr "Frekvencia:"
 
-#. ID3v1 tags
-#: ../src/prefs.c:859
-msgid "ID3v1 tags"
-msgstr "ID3v1 címkék"
+#~ msgid "Select Mode and Mask, and redo the same action"
+#~ msgstr "Válasszon módot és maszkot, és ismételje meg a műveletet"
 
-#. Write ID3v1 tag
-#: ../src/prefs.c:873
-msgid "Write ID3v1.x tag"
-msgstr "ID3v1.x címke írása"
+#~ msgid "Files have been partially deleted"
+#~ msgstr "A fájlok részlegesen törölve"
 
-# bubble help
-#: ../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 ""
-"Ha aktivált, az ID3v1 címke hozzá lesz adva vagy frissítve lesz az MP3 "
-"fájlok végén. Egyébként törlésre kerül."
+#~ msgid "Cannot write tag in file '%s' (%s)"
+#~ msgstr "Nem írható címke a(z) „%s” fájlba (%s)"
 
-# bubble help
-#: ../src/prefs.c:890
-msgid "Character set used to write ID3v1 tag data in the file."
-msgstr "Az ID3v1 címkeadatok fájlba írására használt karakterkészlet."
+#~ msgid "Cannot read directory (%s)"
+#~ msgstr "A könyvtár nem olvasható (%s)"
 
-#. Character Set for reading tag
-#: ../src/prefs.c:928
-msgid "Character Set for reading ID3 tags"
-msgstr "Karakterkészlet az ID3 címkék olvasásához"
+#~ msgid "Monkey's Audio File"
+#~ msgstr "Monkey's hangfájl"
 
-# Jerome - this is not standard?
-#: ../src/prefs.c:942
-msgid "Non-standard:"
-msgstr "Nem szabványos:"
+#~ msgid "M3U Playlist Name"
+#~ msgstr "M3U lejátszólista neve"
 
-#: ../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 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."
-msgstr ""
-"Ez a karakterkészlet lesz használva a címkeadatok olvasásakor, a címke "
-"ISO-8859-1 mezőjében található minden karakterlánc átalakításakor (ID3v2 és/"
-"vagy ID3v1 címkéhez).\n"
-"\n"
-"Például:\n"
-"  - Az EasyTAG előző verziójában el tudta menteni az UTF-8 karakterláncokat "
-"egy ISO-8859-1 mezőben. Ez nem helyes. Ezen címkék Unicode-ba történő "
-"átalakításához: aktiválja ezt a beállítást és válassza az UTF-8-at. Szintén "
-"aktiválnia kell a lenti „Címkék mentésének kísérlete ISO-8859-1 kódolással. "
-"Ha ez nem lehetséges, akkor UNICODE használata (javasolt)” vagy „Mindig "
-"UNICODE karakterkészletbe mentse a címkéket” beállítást.\n"
-"  - Ha a Unicode nem volt használva, az orosz emberek választhatják a "
-"„Windows-1251” karakterkészletet a Windows alatt írt címkék betöltéséhez. És "
-"a „KOI8-R” használható a Unix rendszerek alatt írt címkék betöltéséhez."
+#~ msgid "Playlist Options"
+#~ msgstr "Lejátszólista beállításai"
 
-# bubble help
-#: ../src/prefs.c:966
-msgid "Character set used to read tag data in the file."
-msgstr "A címkeadatok fájlból olvasására használt karakterkészlet."
+#~ msgid ""
+#~ "If activated, only the selected files will be written in the playlist "
+#~ "file. Else, all the files will be written."
+#~ 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."
 
-#.
-#. * Scanner
-#.
-#: ../src/prefs.c:980
-msgid "Scanner"
-msgstr "Feldolgozó"
+#~ 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."
 
-#. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: ../src/prefs.c:990
-msgid "Fill Tag Scanner - Character Conversion"
-msgstr "Címke kitöltése feldolgozó - Karakterátalakítás"
+#~ msgid ""
+#~ "This option replaces the UNIX directory separator '/' into DOS separator "
+#~ "'\\'."
+#~ msgstr ""
+#~ "Ez a beállítás lecseréli a „/” UNIX könyvtárválasztót a „\\” DOS "
+#~ "elválasztóra."
 
-#: ../src/prefs.c:996 ../src/prefs.c:1021
-msgid "Convert underscore character '_' and string '%20' to space ' '"
-msgstr ""
-"Az alsóvonás karakter „_” és a „%20” karakterlánc átalakítása szóközre „ ”"
+#~ msgid "Playlist Content"
+#~ msgstr "Lejátszólista tartalma"
 
-#: ../src/prefs.c:998 ../src/prefs.c:1022
-msgid "Convert space ' ' to underscore '_'"
-msgstr "Szóköz „ ” átalakítása alsóvonásra „_”"
+#~ msgid "Move down the selected line"
+#~ msgstr "Kijelölt sor mozgatása le"
 
 # bubble help
-#: ../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 ""
-"Ha aktivált, ez az átalakítás akkor lesz használva, amikor a feldolgozóból "
-"alkalmazva lesz egy maszk a címkékhez."
+#~ msgid ""
+#~ "When activating this option, after loading the filenames, the current "
+#~ "selected scanner will be ran (the scanner window must be opened)."
+#~ msgstr ""
+#~ "Ha aktiválja ezt a lehetőséget, akkor a fájlnevek betöltése után a "
+#~ "jelenleg kiválasztott feldolgozó lesz futtatva (a feldolgozóablaknak "
+#~ "nyitva kell lennie)."
 
-#. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: ../src/prefs.c:1016
-msgid "Rename File Scanner - Character Conversion"
-msgstr "Fájl átnevezés feldolgozó - Karakterátalakítás"
+#~ msgid "Cannot retrieve file info (%s)"
+#~ msgstr "Nem fogadhatók a fájlinformációk (%s)"
 
-# bubble help
-#: ../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 ""
-"Ha aktivált, ez az átalakítás akkor lesz használva, amikor a feldolgozóból "
-"alkalmazva lesz egy maszk a fájlnevekhez."
+#~ msgid "Can't open file '%s' (%s)"
+#~ msgstr "Nem nyitható meg a(z) „%s” fájl (%s)"
 
-#. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: ../src/prefs.c:1040
-msgid "Process Fields Scanner - Character Conversion"
-msgstr "Mezők feldolgozása feldolgozó  - Karakterátalakítás"
+#~ msgid "Move down this line"
+#~ msgstr "Aktuális sor mozgatása le"
 
-#. 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 ""
-"Ne kezdje nagybetűvel a szavak első betűjét elöljárószók és névelők esetén."
+#~ msgid "Error with 'loader_write': %s"
+#~ msgstr "Hiba a „loader_write” közben: %s"
 
-# bubble help
-#: ../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 "
-"word' (for example, you will obtain 'Text in an Entry' instead of 'Text In "
-"An Entry')."
-msgstr ""
-"Ne alakítsa át az olyan szavak első betűjét mint az elöljárószók, névelők és "
-"a feat. alakúak, amikor az „Az összes szó első betűje legyen nagybetű” "
-"feldolgozót használja (például a „Szöveg egy Bejegyzésben” használata a "
-"„Szöveg Egy Bejegyzésben” helyett)."
-
-#. Properties of the scanner window
-#: ../src/prefs.c:1057
-msgid "Scanner Window"
-msgstr "Feldolgozóablak"
+#~ msgid "Error with 'loader_close': %s"
+#~ msgstr "Hiba a „loader_close” közben: %s"
 
-#: ../src/prefs.c:1063
-msgid "Open the Scanner Window on startup"
-msgstr "Feldolgozóablak megnyitása indításkor"
+#~ msgid "Image Description:"
+#~ msgstr "Kép leírása:"
 
-# bubble help
-#: ../src/prefs.c:1066
-msgid ""
-"Activate this option to open automatically the scanner window when EasyTAG "
-"starts."
-msgstr ""
-"Aktiválja ezt a beállítást a feldolgozóablak automatikus megnyitásához az "
-"EasyTAG indításkor."
+# Ikon megjegyzés
+#~ msgid "Default directory:"
+#~ msgstr "Alapértelmezett könyvtár:"
 
-#. Other options
-#: ../src/prefs.c:1071
-msgid "Fields"
-msgstr "Mezők"
+#~ msgid ""
+#~ "Specify the directory where your files are located. This path will be "
+#~ "loaded when EasyTAG starts without parameter."
+#~ msgstr ""
+#~ "Adja meg azt a könyvtárat, ahol a fájljai találhatók. Ez az útvonal kerül "
+#~ "betöltésre, amikor az EasyTAG paraméterek nélkül indul."
 
-#. Overwrite text into tag fields
-#: ../src/prefs.c:1078
-msgid "Overwrite fields when scanning tags"
-msgstr "Mezők felülírása a címkék feldolgozásakor"
+#~ 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 ""
+#~ "Fájlok automatikus keresése az EasyTAG indulásakor az alapértelmezett "
+#~ "könyvtárba. Figyeljen arra, hogy ez az útvonal felülbírálásra kerülhet az "
+#~ "easytag számára átadott paraméterrel (easytag /útvonal/mp3_fájlok)."
 
-# bubble help
-#: ../src/prefs.c:1081
-msgid ""
-"If activated, the scanner will replace existing text in fields by the new "
-"one. If deactivated, only blank fields of the tag will be filled."
-msgstr ""
-"Ha aktivált, a feldolgozó ki fogja cserélni a mezőkben már létező szöveget "
-"az újra. Ha nem aktivált, csak a címke üres mezői lesznek kitöltve."
+#~ msgid "Search subdirectories"
+#~ msgstr "Alkönyvtárak keresése"
 
-#: ../src/prefs.c:1092
-msgid "Set this text as default comment:"
-msgstr "Ezen szöveg beállítása alapértelmezett megjegyzésként:"
+# not necessary (hungarian)
+# bubble help
+#~ msgid ""
+#~ "This expands the selected node into the file browser to display the sub-"
+#~ "directories."
+#~ msgstr ""
+#~ "Ez nyitja ki a fájlböngészőben kijelölt csomópontot az alkönyvtárak "
+#~ "megjelenítéséhez."
 
 # bubble help
-#: ../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 ""
-"Aktiválja ezt a beállítást, ha a következő karakterláncot szeretné betenni a "
-"megjegyzés mezőbe a „Címke kitöltése” feldolgozó használatakor."
+#~ msgid "Search hidden directories for files (directories starting by a '.')."
+#~ msgstr ""
+#~ "Fájlok keresése rejtett könyvtárakban (a „.” karakterrel kezdődő "
+#~ "könyvtárakban)."
 
-#. CRC32 comment
-#: ../src/prefs.c:1113
-msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
-msgstr ""
-"CRC32 használata alapértelmezett megjegyzésként (csak ID3 címkékkel "
-"rendelkező fájloknál)."
+#~ msgid "Misc"
+#~ msgstr "Egyéb"
 
-#: ../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 ""
-"Kiszámítja a fájl CRC-32 értékét és beírja azt a megjegyzés mezőbe a „Címke "
-"kitöltése” feldolgozó használatakor."
+#~ msgid "Show header information of file"
+#~ msgstr "A fájl fejléc információinak megjelenítése"
 
-#.
-#. * CDDB
-#.
-#: ../src/prefs.c:1128
-msgid "CDDB"
-msgstr "CD-adatbázis"
+# bubble help
+#~ msgid ""
+#~ "If activated, information about the file as the bitrate, the time, the "
+#~ "size, will be displayed under the filename entry."
+#~ msgstr ""
+#~ "Ha aktivált, információkat fog megjeleníteni a fájlról (bitráta, idő, "
+#~ "méret) a fájlnév bejegyzés alatt."
 
-#. CDDB Server Settings (Automatic Search)
-#: ../src/prefs.c:1134
-msgid "Server Settings for Automatic Search"
-msgstr "Kiszolgáló beállítások az automatikus kereséshez"
+#~ msgid "Sorting List Options"
+#~ msgstr "Lista rendezési beállítások"
 
-#: ../src/prefs.c:1143 ../src/prefs.c:1182 ../src/prefs.c:1216
-msgid "Name:"
-msgstr "Név:"
+#~ msgid "Sort the file list by:"
+#~ msgstr "Fájllista rendezése:"
 
-#: ../src/prefs.c:1162 ../src/prefs.c:1190 ../src/prefs.c:1225
-#: ../src/prefs.c:1310
-msgid "Port:"
-msgstr "Port:"
+#~ msgid "Ascending filename"
+#~ msgstr "Fájlnév szerint növekvően"
 
-#: ../src/prefs.c:1172 ../src/prefs.c:1200 ../src/prefs.c:1234
-msgid "CGI Path:"
-msgstr "CGI útvonal:"
+#~ msgid "Descending filename"
+#~ msgstr "Fájlnév szerint csökkenően"
 
-#. CDDB Server Settings (Manual Search)
-#: ../src/prefs.c:1208
-msgid "Server Settings for Manual Search"
-msgstr "Kiszolgáló beállítások a kézi kereséshez"
+#~ msgid "Ascending title"
+#~ msgstr "Cím szerint növekvően"
 
-#. Local access for CDDB (Automatic Search)
-#: ../src/prefs.c:1242
-msgid "Local CDDB"
-msgstr "Helyi CD-adatbázis"
+#~ msgid "Descending title"
+#~ msgstr "Cím szerint csökkenően"
 
-#: ../src/prefs.c:1250
-msgid "Path:"
-msgstr "Útvonal:"
+#~ msgid "Ascending artist"
+#~ msgstr "Előadó szerint növekvően"
 
-#: ../src/prefs.c:1262
-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”."
-
-#. CDDB Proxy Settings
-#: ../src/prefs.c:1288
-msgid "Proxy Settings"
-msgstr "Proxy beállítások"
-
-#: ../src/prefs.c:1297
-msgid "Use a proxy"
-msgstr "Proxy használata"
+#~ msgid "Descending artist"
+#~ msgstr "Előadó szerint csökkenően"
 
-# bubble help
-#: ../src/prefs.c:1300
-msgid "Set active the settings of the proxy server."
-msgstr "A proxy-kiszolgáló beállításainak aktiválása."
+#~ msgid "Ascending album artist"
+#~ msgstr "Album előadó szerint növekvően"
 
-#: ../src/prefs.c:1302
-msgid "Host Name:"
-msgstr "Gépnév:"
+#~ msgid "Descending album artist"
+#~ msgstr "Album előadó szerint csökkenően"
 
-#: ../src/prefs.c:1309
-msgid "Name of the proxy server."
-msgstr "Proxy-kiszolgáló neve."
+#~ msgid "Ascending album"
+#~ msgstr "Album szerint növekvően"
 
-# bubble help
-#: ../src/prefs.c:1317
-msgid "Port of the proxy server."
-msgstr "Proxy-kiszolgáló portja."
+#~ msgid "Descending album"
+#~ msgstr "Album szerint csökkenően"
 
-#: ../src/prefs.c:1321
-msgid "User Name:"
-msgstr "Felhasználónév:"
+#~ msgid "Ascending year"
+#~ msgstr "Év szerint növekvően"
 
-# bubble help
-#: ../src/prefs.c:1328
-msgid "Name of user for the the proxy server."
-msgstr "A felhasználó neve a proxy-kiszolgálóhoz."
+#~ msgid "Descending year"
+#~ msgstr "Év szerint csökkenően"
 
-#: ../src/prefs.c:1329
-msgid "User Password:"
-msgstr "Felhasználói jelszó:"
+#~ msgid "Ascending disc number"
+#~ msgstr "Lemezszám szerint növekvően"
 
-# bubble help
-#: ../src/prefs.c:1338
-msgid "Password of user for the proxy server."
-msgstr "A felhasználó jelszava a proxy-kiszolgálóhoz."
+#~ msgid "Descending disc number"
+#~ msgstr "Lemezszám szerint csökkenően"
 
-#. Track Name list (CDDB results)
-#: ../src/prefs.c:1343
-msgid "Track Name List"
-msgstr "Számnév lista"
+#~ msgid "Ascending track number"
+#~ msgstr "Szám szerint növekvően"
 
-#: ../src/prefs.c:1350
-msgid ""
-"Select corresponding audio file (according position or DLM if activated "
-"below)"
-msgstr ""
-"A megfelelő hangfájl kiválasztása (pozíció vagy DLM szerint, ha lent "
-"aktiválva van)"
+#~ msgid "Descending track number"
+#~ msgstr "Szám szerint csökkenően"
 
-#: ../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 ""
-"Ha aktivált, egy sor kiválasztásakor a számnevek listájából, a fő listából a "
-"megfelelő hangfájl is kiválasztásra kerül."
+#~ msgid "Ascending genre"
+#~ msgstr "Műfaj szerint növekvően"
 
-#. Check box to use DLM (also used in the cddb window)
-#: ../src/prefs.c:1359
-msgid ""
-"Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
-"files (using filename)"
-msgstr ""
-"A Levenshtein algoritmus (DLM) használata sorok (cím használata) "
-"párosításához a hangfájlokkal (fájlnév használata)"
+#~ msgid "Descending genre"
+#~ msgstr "Műfaj szerint csökkenően"
 
-#.
-#. * Confirmation
-#.
-#: ../src/prefs.c:1374
-msgid "Confirmation"
-msgstr "Megerősítés"
+#~ msgid "Ascending comment"
+#~ msgstr "Megjegyzés szerint növekvően"
 
-#: ../src/prefs.c:1379
-msgid "Confirm exit from program"
-msgstr "Programból való kilépés megerősítése"
+#~ msgid "Descending comment"
+#~ msgstr "Megjegyzés szerint csökkenően"
 
-# bubble help
-#: ../src/prefs.c:1382
-msgid ""
-"If activated, opens a dialog box to ask confirmation before exiting the "
-"program."
-msgstr ""
-"Ha aktivált, megnyit egy párbeszéddobozt a programból való kilépés "
-"megerősítéséhez."
+#~ msgid "Ascending composer"
+#~ msgstr "Zeneszerző szerint növekvően"
 
-#: ../src/prefs.c:1385
-msgid "Confirm writing of file tag"
-msgstr "Fájlcímke írásának megerősítése"
+#~ msgid "Descending composer"
+#~ msgstr "Zeneszerző szerint csökkenően"
 
-#: ../src/prefs.c:1389
-msgid "Confirm renaming of file"
-msgstr "Fájl átnevezésének megerősítése"
+#~ msgid "Ascending original artist"
+#~ msgstr "Eredeti előadó szerint növekvően"
 
-#: ../src/prefs.c:1393
-msgid "Confirm deleting of file"
-msgstr "Fájl törlésének megerősítése"
+#~ msgid "Descending original artist"
+#~ msgstr "Eredeti előadó szerint csökkenően"
 
-#: ../src/prefs.c:1397
-msgid "Confirm writing of playlist"
-msgstr "Lejátszólista írásának megerősítése"
+#~ msgid "Ascending copyright"
+#~ msgstr "Szerzői jog szerint növekvően"
 
-#: ../src/prefs.c:1401
-msgid "Confirm changing directory when there are unsaved changes"
-msgstr "Könyvtár váltásának megerősítése, ha el nem mentett módosítások vannak"
+#~ msgid "Descending copyright"
+#~ msgstr "Szerzői jog szerint csökkenően"
 
-# not necessary hungarian. I do not understand.
-#. 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 "(Például: %.*d_-_Szam_neve_1.mp3)"
+#~ msgid "Ascending URL"
+#~ msgstr "URL szerint növekvően"
 
-# not necessary hungarian. I do not understand.
-#. 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 "(Például: lemez_%.*d_of_10/Szam_neve_1.mp3)"
+#~ msgid "Descending URL"
+#~ msgstr "URL szerint csökkenően"
 
-#: ../src/prefs.c:1614 ../src/setting.c:904
-msgid "Configuration saved"
-msgstr "A beállítások elmentve"
+#~ msgid "Ascending encoded by"
+#~ msgstr "Kódoló neve szerint növekvően"
 
-#: ../src/prefs.c:1622
-msgid "Configuration unchanged"
-msgstr "A beállítások nem változtak"
+#~ msgid "Descending encoded by"
+#~ msgstr "Kódoló neve szerint csökkenően"
 
-#: ../src/prefs.c:1713
-msgid "The selected path for 'Default path to files' is invalid"
-msgstr ""
-"A kiválasztott útvonal az „Alapértelmezett útvonal a fájlokhoz” esetén "
-"érvénytelen"
+#~ msgid "Ascending creation date"
+#~ msgstr "Létrehozás dátuma szerint növekvően"
 
-#: ../src/prefs.c:1715
-#, c-format
-msgid ""
-"Path: '%s'\n"
-"Error: %s"
-msgstr ""
-"Útvonal: „%s”\n"
-"Hiba: %s"
+#~ msgid "Descending creation date"
+#~ msgstr "Létrehozás dátuma szerint csökkenően"
 
-#: ../src/prefs.c:1717
-msgid "Invalid Path Error"
-msgstr "Érvénytelen útvonal hiba"
+# bubble help
+#~ msgid "Select the type of file sorting when loading a directory."
+#~ msgstr "A fájlrendezés típusának kiválasztása könyvtár betöltésekor."
 
-#: ../src/prefs.c:1831
-#, c-format
-msgid "The audio file player '%s' cannot be found"
-msgstr "A(z) „%s” zenelejátszó nem található"
+# bubble help
+#~ msgid "If activated, the sorting of the list will be dependent on the case."
+#~ msgstr ""
+#~ "Ha aktivált, a lista rendezése a függeni fog a kis- és nagybetűktől."
 
-# egyéb menü
-#: ../src/prefs.c:1833
-msgid "Audio Player Error"
-msgstr "Zenelejátszó hiba"
+#~ msgid "File Audio Player"
+#~ msgstr "Fájl zenelejátszó"
 
-#: ../src/scan_dialog.c:182
-msgid "Fill Tag"
-msgstr "Címke kitöltése"
+#~ msgid "Player to run:"
+#~ msgstr "Futtatandó lejátszó:"
 
-#: ../src/scan_dialog.c:356
-#, c-format
-msgid "Cannot calculate CRC value of file (%s)"
-msgstr "Nem lehet kiszámítani a fájl CRC értékét (%s)"
+# bubble help
+#~ 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 ""
+#~ "Adja meg a fájlok lejátszásához használandó programot. Néhány paraméter "
+#~ "átadható a programnak (mint „xmms -p”), mielőtt fájlokat fogadna egyéb "
+#~ "paraméterként."
 
-#: ../src/scan_dialog.c:371
-msgid "Tag successfully scanned"
-msgstr "A címke sikeresen feldolgozva"
+#~ msgid "Show log view in main window"
+#~ msgstr "Naplónézet megjelenítése a főablakban"
 
-#: ../src/scan_dialog.c:373
-#, c-format
-msgid "Tag successfully scanned: %s"
-msgstr "A címke sikeresen feldolgozva: %s"
+#~ msgid "If activated, the log view would be visible in the main window."
+#~ msgstr "Ha aktívált, a naplónézet az a főablakban lesz látható."
 
-#: ../src/scan_dialog.c:414
-#, c-format
-msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
-msgstr ""
-"Címke feldolgozó: különös… a(z) „%s” kiterjesztés nem található a(z) „%s” "
-"fájlnévben"
+#~ msgid "File Options"
+#~ msgstr "Fájl beállítások"
 
-#: ../src/scan_dialog.c:496 ../src/scan_dialog.c:525
-#, c-format
-msgid "Scan Error: can't find separator '%s' within '%s'"
-msgstr "Feldolgozási hiba: nem található a(z) „%s” elválasztó ebben: „%s”"
+# bubble help
+#~ 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 ""
+#~ "A szabálytalan karakterek átalakítása FAT32/16 és ISO9660 + Joliet "
+#~ "fájlrendszerek számára („\\”, „:”, „;”, „*”, „?”, „\"”, „<”, „>”, „|”) az "
+#~ "átnevezéskor felmerülő problémák megelőzésére. Ez akkor hasznos, ha a "
+#~ "fájlok a címkéből lesznek átnevezve a feldolgozóval."
 
-#: ../src/scan_dialog.c:712
-msgid "New filename successfully scanned"
-msgstr "Az új fájlnév sikeresen feldolgozva"
+#~ msgid ""
+#~ "Update modification time of the parent directory of the file (recommended "
+#~ "when using Amarok)"
+#~ msgstr ""
+#~ "A fájl szülőkönyvtár módosítási idejének frissítése (ajánlott az Amarok "
+#~ "használatakor)"
 
-#: ../src/scan_dialog.c:715
-#, c-format
-msgid "New filename successfully scanned: %s"
-msgstr "Az új fájlnév sikeresen feldolgozva: %s"
+#~ msgid ""
+#~ "The modification time of the parent directory of the file will be updated "
+#~ "when saving tag the file. At the present time it is automatically done "
+#~ "only when renaming a file.\n"
+#~ "This feature is interesting when using applications like Amarok. For "
+#~ "performance reasons, they refresh file information by detecting changes "
+#~ "of the parent directory."
+#~ msgstr ""
+#~ "A fájl szülőkönyvtár módosítási ideje frissítve lesz, amikor a fájl menti "
+#~ "a címkét. Jelenleg ez csak akkor történik automatikusan, amikor átnevez "
+#~ "egy fájlt.\n"
+#~ "Ez a szolgáltatás akkor érdekes, amikor egy olyan alkalmazást használ "
+#~ "mint az Amarok. Teljesítménybeli okokból ezek a programok a "
+#~ "fájlinformációkat a szülőkönyvtár módosulásának észlelésekor frissítik."
 
-#: ../src/scan_dialog.c:1632
-#, c-format
-msgid "Error while processing fields: %s"
-msgstr "Hiba a mezők feldolgozása közben: %s"
+#~ msgid "Character Set for Filename"
+#~ msgstr "Karakterkészlet a fájlnévhez"
 
-#. The window
-#: ../src/scan_dialog.c:1802
-msgid "Tag and Filename Scan"
-msgstr "Címke és fájlnév feldolgozás"
+#~ msgid ""
+#~ "Rules to apply if some characters can't be converted to the system "
+#~ "character encoding when writing filename:"
+#~ msgstr ""
+#~ "Alkalmazandó szabályok, ha néhány karakter nem alakítható át a rendszer "
+#~ "karakterkódolására a fájlnév írásakor:"
 
-# ikon megjegyzés
-#. TODO: Set related action to match AM_SCAN_FILES.
-#: ../src/scan_dialog.c:1811
-msgid "Scan Files"
-msgstr "Fájlok vizsgálata"
+#~ 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 ""
+#~ "Ezzel a beállítással megpróbálja az átalakítást a területi beállítások "
+#~ "szereint (például: ISO-8859-1 „fr”-hez, KOI8-R „ru”-hoz, ISO-8859-2 „ro”-"
+#~ "hoz).Ha ez nem sikerül, akkor az ISO-8859-1 karakterkódolást fogja "
+#~ "megpróbálni."
 
-#. Option Menu
-#: ../src/scan_dialog.c:1839
-msgid "Scanner:"
-msgstr "Feldolgozó: "
+#~ msgid ""
+#~ "Force using the system character encoding and activate the transliteration"
+#~ msgstr ""
+#~ "A rendszer karakterkódolásának erőltetett használata és az átírás "
+#~ "aktiválása"
 
-#: ../src/scan_dialog.c:1860
-msgid "Select the type of scanner to use"
-msgstr "A használandó feldolgozó típusának kiválasztása"
+#~ msgid ""
+#~ "With this option, when a character cannot be represented in the target "
+#~ "character set, it can be approximated through one or several similarly "
+#~ "looking characters."
+#~ msgstr ""
+#~ "Ezzel a beállítással ha nem ábrázolható egy karakter a cél "
+#~ "karakterkészletben, közelítő megoldásként egy vagy több hasonlóan kinéző "
+#~ "karakterrel helyettesíti."
 
-#: ../src/scan_dialog.c:1869
-msgid "Scanner Preferences"
-msgstr "Feldolgozó beállítások"
+#~ msgid "Tag Settings"
+#~ msgstr "Címke beállítások"
 
-#: ../src/scan_dialog.c:1878
-msgid "Show / Hide Masks Editor"
-msgstr "Maszkszerkesztő megjelenítése / elrejtése"
+#~ msgid "Tag Options"
+#~ msgstr "Címke beállítások"
 
-#: ../src/scan_dialog.c:1888
-msgid "Show / Hide Legend"
-msgstr "Jelmagyarázat megjelenítése / elrejtése"
+#~ msgid "Auto completion of date if not complete"
+#~ msgstr "Dátum automatikus kiegészítése, ha nem teljes"
 
-#: ../src/scan_dialog.c:1918
-msgid ""
-"Select or type in a mask using codes (see Legend) to parse filename and "
-"path. Used to fill in tag fields"
-msgstr ""
-"Maszk kiválasztása vagy begépelése kódok használatával (lásd a "
-"jelmagyarázatot) a fájlnév és útvonal feldolgozásához. Felhasználásra kerül "
-"a címkemezők kitöltéséhez."
+# bubble help
+#~ 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 ""
+#~ "Megpróbálja kiegészíteni az év mezöt, ha csak a dátum utolsó számait adja "
+#~ "meg (például ha a jelenlegi év 2005: 5 => 2005, 4 => 2004, 6 => 1996, 95 "
+#~ "=> 1995…)."
 
-#. Preview label
-#: ../src/scan_dialog.c:1942
-msgid "Fill tag preview"
-msgstr "Címke kitöltése előnézet"
+#~ msgid "Write the track field with the following number of digits:"
+#~ msgstr "A szám mező írása a következő számú számjegyekkel:"
 
 # bubble help
-#: ../src/scan_dialog.c:1972
-msgid "Prefix mask with current path"
-msgstr "Előtag maszk a jelenlegi útvonallal"
-
-#: ../src/scan_dialog.c:1986
-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 ""
-"Maszk kiválasztása vagy begépelése kódok használatával (lásd a "
-"jelmagyarázatot) a címkemezők feldolgozásához. Felhasználásra kerül a fájl "
-"átnevezéséhez.\n"
-"Használja a / jelet könyvtárak létrehozásához. Ha az első karakter a / jel, "
-"akkor ez egy abszolút elérési út, egyébként relatív a régi útvonalhoz."
+#~ 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 ""
+#~ "Ha aktivált, a szám mezőbe a „0” szám használatának kitöltésével lesz "
+#~ "beírva a megadott szám „n” számjegye (például két számjeggyel: „05”, "
+#~ "„09”, „10”…). Egyébként megtartja a „nyers” szám értéket."
 
-#. Preview label
-#: ../src/scan_dialog.c:2011
-msgid "Rename file preview"
-msgstr "Fájl átnevezése előnézet"
+#~ 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:"
 
-#: ../src/scan_dialog.c:2030
-msgid "Select fields:"
-msgstr "Mezők kijelölése:"
+#~ msgid ""
+#~ "Tag field focus when switching files in list with shortcuts Page Up/Page "
+#~ "Down:"
+#~ msgstr ""
+#~ "Címkemező fókusz a listában lévő fájlok váltásakor a Page Up/Page Down "
+#~ "gyorsbillentyűkkel:"
 
-# bubble help
-#: ../src/scan_dialog.c:2033
-msgid ""
-"The buttons on the right represent the fields which can be processed. Select "
-"those which interest you"
-msgstr ""
-"A jobbra lévő gombok ábrázolják azokat a mezőket, amelyeket fel lehet "
-"dolgozni. Válassza ki azokat, amelyek érdeklik."
+#~ msgid "Keep focus to the same tag field"
+#~ msgstr "A fókusz megtartása ugyanazon a címkemezőn"
 
-#. Advice for Translators: set the first letter of filename translated
-#: ../src/scan_dialog.c:2037
-msgid "F"
-msgstr "F"
+#~ msgid "Return focus to the first tag field (i.e. 'Title' field)"
+#~ msgstr "A fókusz visszatérése az első címkemezőre (azaz a „Cím” mező)"
 
-# bubble help
-#: ../src/scan_dialog.c:2039
-msgid "Process filename field"
-msgstr "Fájlnév mező feldolgozása"
+#~ msgid "ID3 Tag Settings"
+#~ msgstr "ID3 címke beállítások"
 
-#. Advice for Translators: set the first letter of title translated
-#: ../src/scan_dialog.c:2041
-msgid "T"
-msgstr "C"
+#~ msgid "ID3 Tag Rules"
+#~ msgstr "ID3 címke szabályok"
 
 # bubble help
-#: ../src/scan_dialog.c:2042
-msgid "Process title field"
-msgstr "A cím mező feldolgozása"
-
-#. Advice for Translators: set the first letter of artist translated
-#: ../src/scan_dialog.c:2044
-msgid "Ar"
-msgstr "E"
+#~ 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 strip the whole tag when these seven standard data fields "
+#~ "have been set to blank."
+#~ msgstr ""
+#~ "Mivel az ID3v2 címkék tartalmazhatnak más adatokat is a címen, előadón, "
+#~ "albumon, évszámon, számon, műfajon vagy megjegyzésen kívül (mint csatolt "
+#~ "képek, dalszövegek…), ezért ez a beállítás lehetővé teszi a teljes címke "
+#~ "törlését, amikor ez a hét szabványos adatmező üresre van állítva."
 
 # bubble help
-#: ../src/scan_dialog.c:2045
-msgid "Process file artist field"
-msgstr "Az előadó mező feldolgozása"
+#~ msgid ""
+#~ "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to "
+#~ "the ID3v2.3 version."
+#~ msgstr ""
+#~ "Ha aktivált, a régi ID3v2 címkeverzió (mint ID3v2.2) frissítve lesz az "
+#~ "ID3v2.3 verzióra."
 
-#. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan_dialog.c:2047
-msgid "AA"
-msgstr "AE"
+#~ msgid "Use Compression"
+#~ msgstr "Tömörítés használata"
 
-# bubble help
-#: ../src/scan_dialog.c:2048
-msgid "Process album artist field"
-msgstr "Az album előadója mező feldolgozása"
+#~ msgid "Write Genre in text only"
+#~ msgstr "Műfaj írása csak szövegben"
 
-#. Advice for Translators: set the first letter of album translated
-#: ../src/scan_dialog.c:2050
-msgid "Al"
-msgstr "A"
+#~ msgid ""
+#~ "Don't use ID3v1 number references in genre tag. Enable this if you see "
+#~ "numbers as genre in your music player."
+#~ msgstr ""
+#~ "Ne használja az ID3v1 számhivatkozásokat a műfaj címkében. Akkor "
+#~ "engedélyezze ezt, ha műfajként látja a számokat a zenelejátszójában."
 
 # bubble help
-#: ../src/scan_dialog.c:2051
-msgid "Process album field"
-msgstr "Az album mező feldolgozása"
+#~ msgid ""
+#~ "If activated, an ID3v2.4 tag will be added or updated at the beginning of "
+#~ "the MP3 files. Else it will be stripped."
+#~ msgstr ""
+#~ "Ha aktivált, az ID3v2.4 címke hozzá lesz adva vagy frissítve lesz az MP3 "
+#~ "fájlok kezdeténél. Egyébként törlésre kerül."
 
-#. Advice for Translators: set the first letter of genre translated
-#: ../src/scan_dialog.c:2053
-msgid "G"
-msgstr "M"
+#~ msgid "Charset:"
+#~ msgstr "Karakterkészlet:"
+
+#~ msgid "Unicode type to use"
+#~ msgstr "A használandó Unicode típus"
 
 # bubble help
-#: ../src/scan_dialog.c:2054
-msgid "Process genre field"
-msgstr "A műfaj mező feldolgozása"
+#~ msgid "Character set used to write the tag data in the file."
+#~ msgstr "A címkeadatok fájlba írására használt karakterkészlet."
 
-#. Advice for Translators: set the first letter of comment translated
-#: ../src/scan_dialog.c:2056
-msgid "Cm"
-msgstr "MJ"
+#~ msgid "Additional settings for iconv():"
+#~ msgstr "További beállítások az iconv() programhoz:"
 
-# bubble help
-#: ../src/scan_dialog.c:2057
-msgid "Process comment field"
-msgstr "A megjegyzés mező feldolgozása"
+#~ msgid "No"
+#~ msgstr "Nem"
 
-#. Advice for Translators: set the first letter of composer translated
-#: ../src/scan_dialog.c:2059
-msgid "Cp"
-msgstr "Z"
+#~ msgid ""
+#~ "With this option, when a character cannot be represented in the target "
+#~ "character set, it isn't changed. But note that an error message will be "
+#~ "displayed for information."
+#~ msgstr ""
+#~ "Ezzel a beállítással ha nem ábrázolható egy karakter a cél "
+#~ "karakterkészletben, akkor az nem lesz módosítva. De figyeljen arra, hogy "
+#~ "egy hibaüzenet fog megjelenítésre kerülni az információhoz."
 
-# bubble help
-#: ../src/scan_dialog.c:2060
-msgid "Process composer field"
-msgstr "A zeneszerző mező feldolgozása"
+#~ msgid "//TRANSLIT"
+#~ msgstr "//ÁTÍR"
 
-#. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan_dialog.c:2062
-msgid "O"
-msgstr "EE"
+#~ msgid "//IGNORE"
+#~ msgstr "//KIHAGY"
 
 # bubble help
-#: ../src/scan_dialog.c:2063
-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_dialog.c:2065
-msgid "Cr"
-msgstr "Sz"
+#~ msgid ""
+#~ "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
+#~ "files. Else it will be stripped."
+#~ msgstr ""
+#~ "Ha aktivált, az ID3v1 címke hozzá lesz adva vagy frissítve lesz az MP3 "
+#~ "fájlok végén. Egyébként törlésre kerül."
 
 # bubble help
-#: ../src/scan_dialog.c:2066
-msgid "Process copyright field"
-msgstr "A szerzői jog mező feldolgozása"
+#~ msgid "Character set used to write ID3v1 tag data in the file."
+#~ msgstr "Az ID3v1 címkeadatok fájlba írására használt karakterkészlet."
+
+# Jerome - this is not standard?
+#~ msgid "Non-standard:"
+#~ msgstr "Nem szabványos:"
 
-#. Advice for Translators: set the first letter of URL translated
-#: ../src/scan_dialog.c:2068
-msgid "U"
-msgstr "U"
+#~ 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 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."
+#~ msgstr ""
+#~ "Ez a karakterkészlet lesz használva a címkeadatok olvasásakor, a címke "
+#~ "ISO-8859-1 mezőjében található minden karakterlánc átalakításakor (ID3v2 "
+#~ "és/vagy ID3v1 címkéhez).\n"
+#~ "\n"
+#~ "Például:\n"
+#~ "  - Az EasyTAG előző verziójában el tudta menteni az UTF-8 "
+#~ "karakterláncokat egy ISO-8859-1 mezőben. Ez nem helyes. Ezen címkék "
+#~ "Unicode-ba történő átalakításához: aktiválja ezt a beállítást és válassza "
+#~ "az UTF-8-at. Szintén aktiválnia kell a lenti „Címkék mentésének kísérlete "
+#~ "ISO-8859-1 kódolással. Ha ez nem lehetséges, akkor UNICODE használata "
+#~ "(javasolt)” vagy „Mindig UNICODE karakterkészletbe mentse a címkéket” "
+#~ "beállítást.\n"
+#~ "  - Ha a Unicode nem volt használva, az orosz emberek választhatják a "
+#~ "„Windows-1251” karakterkészletet a Windows alatt írt címkék betöltéséhez. "
+#~ "És a „KOI8-R” használható a Unix rendszerek alatt írt címkék betöltéséhez."
 
 # bubble help
-#: ../src/scan_dialog.c:2069
-msgid "Process URL field"
-msgstr "Az URL mező feldolgozása"
+#~ msgid "Character set used to read tag data in the file."
+#~ msgstr "A címkeadatok fájlból olvasására használt karakterkészlet."
 
-#. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan_dialog.c:2071
-msgid "E"
-msgstr "K"
+#~ msgid "Convert underscore character '_' and string '%20' to space ' '"
+#~ msgstr ""
+#~ "Az alsóvonás karakter „_” és a „%20” karakterlánc átalakítása szóközre „ ”"
 
 # bubble help
-#: ../src/scan_dialog.c:2072
-msgid "Process encoder name field"
-msgstr "A kódoló neve mező feldolgozása"
-
-#: ../src/scan_dialog.c:2116
-msgid "Invert selection"
-msgstr "Kijelölés megfordítása"
+#~ msgid ""
+#~ "If activated, this conversion will be used when applying a mask from the "
+#~ "scanner for tags."
+#~ msgstr ""
+#~ "Ha aktivált, ez az átalakítás akkor lesz használva, amikor a "
+#~ "feldolgozóból alkalmazva lesz egy maszk a címkékhez."
 
-#: ../src/scan_dialog.c:2123
-msgid "Select/Unselect all"
-msgstr "Összes kijelölése / Kijelölés megszüntetése"
+#~ msgid "Rename File Scanner - Character Conversion"
+#~ msgstr "Fájl átnevezés feldolgozó - Karakterátalakítás"
 
-#: ../src/scan_dialog.c:2138
-msgid "Convert:"
-msgstr "Átalakítás:"
+# bubble help
+#~ msgid ""
+#~ "If activated, this conversion will be used when applying a mask from the "
+#~ "scanner for filenames."
+#~ msgstr ""
+#~ "Ha aktivált, ez az átalakítás akkor lesz használva, amikor a "
+#~ "feldolgozóból alkalmazva lesz egy maszk a fájlnevekhez."
 
-#: ../src/scan_dialog.c:2140
-msgid "to: "
-msgstr "ebbe: "
+#~ msgid "Process Fields Scanner - Character Conversion"
+#~ msgstr "Mezők feldolgozása feldolgozó  - Karakterátalakítás"
 
-#: ../src/scan_dialog.c:2147
-msgid "Do not convert"
-msgstr "Ne alakítsa át"
+# bubble help
+#~ msgid ""
+#~ "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 alakítsa át az olyan szavak első betűjét mint az elöljárószók, névelők "
+#~ "és a feat. alakúak, amikor az „Az összes szó első betűje legyen nagybetű” "
+#~ "feldolgozót használja (például a „Szöveg egy Bejegyzésben” használata a "
+#~ "„Szöveg Egy Bejegyzésben” helyett)."
 
 # bubble help
-#: ../src/scan_dialog.c:2177
-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 ""
-"Az alsóvonás karakter és a „%20” karakterlánc cserélve lesz egy szóközre. "
-"Például előtte: „Szöveg%20egy%20bejegyzés_tartalmában”, utána: „Szöveg egy "
-"bejegyzés tartalmában”."
+#~ msgid ""
+#~ "Activate this option to open automatically the scanner window when "
+#~ "EasyTAG starts."
+#~ msgstr ""
+#~ "Aktiválja ezt a beállítást a feldolgozóablak automatikus megnyitásához az "
+#~ "EasyTAG indításkor."
 
 # bubble help
-#: ../src/scan_dialog.c:2180
-msgid ""
-"The space character is replaced by one underscore character. Example, "
-"before: 'Text In An Entry', after: 'Text_In_An_Entry'."
-msgstr ""
-"A szóköz 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”."
+#~ msgid ""
+#~ "If activated, the scanner will replace existing text in fields by the new "
+#~ "one. If deactivated, only blank fields of the tag will be filled."
+#~ msgstr ""
+#~ "Ha aktivált, a feldolgozó ki fogja cserélni a mezőkben már létező "
+#~ "szöveget az újra. Ha nem aktivált, csak a címke üres mezői lesznek "
+#~ "kitöltve."
 
-#: ../src/scan_dialog.c:2183
-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."
+# bubble help
+#~ msgid ""
+#~ "Activate this option if you want to put the following string into the "
+#~ "comment field when using the 'Fill Tag' scanner."
+#~ msgstr ""
+#~ "Aktiválja ezt a beállítást, ha a következő karakterláncot szeretné "
+#~ "betenni a megjegyzés mezőbe a „Címke kitöltése” feldolgozó használatakor."
 
-#: ../src/scan_dialog.c:2190
-msgid "Capitalize all"
-msgstr "Összes nagy kezdőbetűsre"
+#~ msgid ""
+#~ "Calculates the CRC-32 value of the file and writes it into the comment "
+#~ "field when using the 'Fill Tag' scanner."
+#~ msgstr ""
+#~ "Kiszámítja a fájl CRC-32 értékét és beírja azt a megjegyzés mezőbe a "
+#~ "„Címke kitöltése” feldolgozó használatakor."
 
-#: ../src/scan_dialog.c:2192
-msgid "Lowercase all"
-msgstr "Összes kisbetűsre"
+#~ msgid "Name:"
+#~ msgstr "Név:"
 
-#: ../src/scan_dialog.c:2194
-msgid "Capitalize first letter"
-msgstr "Első betű nagybetűsre"
+#~ msgid "Local CDDB"
+#~ msgstr "Helyi CD-adatbázis"
 
-#: ../src/scan_dialog.c:2196
-msgid "Capitalize the first letter of each word"
-msgstr "Minden szó első betűje legyen nagybetű"
+#~ msgid "Path:"
+#~ msgstr "Útvonal:"
 
-#: ../src/scan_dialog.c:2197
-msgid "Detect Roman numerals"
-msgstr "Római számok felismerése"
+#~ 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”."
 
-#: ../src/scan_dialog.c:2199
-msgid "Do not change capitalization"
-msgstr "Ne változtassa meg a kis- és nagybetűket"
+#~ msgid "Proxy Settings"
+#~ msgstr "Proxy beállítások"
 
 # bubble help
-#: ../src/scan_dialog.c:2236
-msgid ""
-"Convert all words in all fields to upper case. Example, before: 'Text IN AN "
-"entry', after: 'TEXT IN AN ENTRY'."
-msgstr ""
-"Az összes szó nagybetűsre alakítása minden mezőben. Például előtte: „Szöveg "
-"EGY bejegyzésben”, utána: „SZÖVEG EGY BEJEGYZÉSBEN”."
+#~ msgid "Set active the settings of the proxy server."
+#~ msgstr "A proxy-kiszolgáló beállításainak aktiválása."
 
-# bubble help
-#: ../src/scan_dialog.c:2239
-msgid ""
-"Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
-"entry', after: 'text in an entry'."
-msgstr ""
-"Az összes szó kisbetűsre alakítása minden mezőben. Például előtte: „SZÖVEG "
-"EGY bejegyzésben”, utána: „szöveg egy bejegyzésben”."
+#~ msgid "Name of the proxy server."
+#~ msgstr "Proxy-kiszolgáló neve."
 
 # bubble help
-#: ../src/scan_dialog.c:2242
-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 ""
-"Az első szó kezdetének nagybetűsre alakítása minden mezőben. Például előtte: "
-"„Szöveg EGY Bejegyzésben”, utána: „Szöveg egy bejegyzésben”."
+#~ msgid "Port of the proxy server."
+#~ msgstr "Proxy-kiszolgáló portja."
 
 # bubble help
-#: ../src/scan_dialog.c:2245
-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 ""
-"Az összes szó kezdetének nagybetűsre alakítása minden mezőben. Például "
-"előtte: „Szöveg egy BEJEGYZÉSBEN”, utána: „Szöveg Egy Bejegyzésben”."
+#~ msgid "Name of user for the the proxy server."
+#~ msgstr "A felhasználó neve a proxy-kiszolgálóhoz."
 
 # bubble help
-#: ../src/scan_dialog.c:2248
-msgid ""
-"Force to convert to upper case the Roman numerals. Example, before: 'ix. "
-"text in an entry', after: 'IX. Text In An Entry'."
-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”."
+#~ msgid "Password of user for the proxy server."
+#~ msgstr "A felhasználó jelszava a proxy-kiszolgálóhoz."
 
-#: ../src/scan_dialog.c:2256
-msgid "Insert a space before uppercase letters"
-msgstr "Szóköz beszúrása minden nagybetű elé"
+#~ msgid "Track Name List"
+#~ msgstr "Számnév lista"
 
-#: ../src/scan_dialog.c:2258
-msgid "Remove duplicate spaces and underscores"
-msgstr "Dupla szóközök és alsóvonások eltávolítása"
+#~ msgid ""
+#~ "If activated, when selecting a line in the list of tracks name, the "
+#~ "corresponding audio file in the main list will be also selected."
+#~ msgstr ""
+#~ "Ha aktivált, egy sor kiválasztásakor a számnevek listájából, a fő "
+#~ "listából a megfelelő hangfájl is kiválasztásra kerül."
 
-#: ../src/scan_dialog.c:2260
-msgid "Do not change word separators"
-msgstr "Ne változtassa meg a szóelválasztókat"
+#~ msgid "Confirm exit from program"
+#~ msgstr "Programból való kilépés megerősítése"
 
 # bubble help
-#: ../src/scan_dialog.c:2282
-msgid ""
-"All spaces between words are removed. Example, before: 'Text In An Entry', "
-"after: 'TextInAnEntry'."
-msgstr ""
-"Az összes szóköz eltávolítása a szavak közül. Például előtte: „Szöveg Egy "
-"Bejegyzésben”, utána: „SzövegEgyBejegyzésben”."
+#~ msgid ""
+#~ "If activated, opens a dialog box to ask confirmation before exiting the "
+#~ "program."
+#~ msgstr ""
+#~ "Ha aktivált, megnyit egy párbeszéddobozt a programból való kilépés "
+#~ "megerősítéséhez."
 
-# bubble help
-#: ../src/scan_dialog.c:2285
-msgid ""
-"A space is inserted before each upper case letter. Example, before: "
-"'TextInAnEntry', after: 'Text In An Entry'."
-msgstr ""
-"Egy szóköz beszúrása minden nagybetű elé. Például előtte: "
-"„SzövegEgyBejegyzésben”, utána: „Szöveg Egy Bejegyzésben”."
+#~ msgid "Confirm changing directory when there are unsaved changes"
+#~ msgstr ""
+#~ "Könyvtár váltásának megerősítése, ha el nem mentett módosítások vannak"
 
-# bubble help
-#: ../src/scan_dialog.c:2288
-msgid ""
-"Duplicate spaces and underscores are removed. Example, before: "
-"'Text__In__An   Entry', after: 'Text_In_An Entry'."
-msgstr ""
-"Dupla szóközök vagy alsóvonások eltávolítása. Például előtte: „Szöveg__Egy   "
-"Bejegyzésben”, utána: „Szöveg_Egy Bejegyzésben”."
+# not necessary hungarian. I do not understand.
+#~ msgid "(Example: %.*d_-_Track_name_1.mp3)"
+#~ msgstr "(Például: %.*d_-_Szam_neve_1.mp3)"
 
-#.
-#. * Frame to display codes legend
-#.
-#: ../src/scan_dialog.c:2295
-msgid "Legend"
-msgstr "Jelmagyarázat"
+# not necessary hungarian. I do not understand.
+#~ msgid "(Example: disc_%.*d_of_10/Track_name_1.mp3)"
+#~ msgstr "(Például: lemez_%.*d_of_10/Szam_neve_1.mp3)"
 
-#: ../src/scan_dialog.c:2301
-#, c-format
-msgid "%a: artist"
-msgstr "%a: előadó"
+#~ msgid "Configuration saved"
+#~ msgstr "A beállítások elmentve"
 
-#: ../src/scan_dialog.c:2304
-msgid "%z: album artist"
-msgstr "%z: album előadó"
+#~ msgid "Configuration unchanged"
+#~ msgstr "A beállítások nem változtak"
 
-#: ../src/scan_dialog.c:2307
-msgid "%b: album"
-msgstr "%b: album"
+#~ msgid "The audio file player '%s' cannot be found"
+#~ msgstr "A(z) „%s” zenelejátszó nem található"
 
-#: ../src/scan_dialog.c:2310
-#, c-format
-msgid "%c: comment"
-msgstr "%c: megjegyzés"
+# egyéb menü
+#~ msgid "Audio Player Error"
+#~ msgstr "Zenelejátszó hiba"
 
-#: ../src/scan_dialog.c:2313
-#, c-format
-msgid "%p: composer"
-msgstr "%p: zeneszerző"
+#~ msgid "Scanner:"
+#~ msgstr "Feldolgozó: "
 
-#: ../src/scan_dialog.c:2316
-msgid "%r: copyright"
-msgstr "%r: szerzői jog"
+#~ msgid "Select the type of scanner to use"
+#~ msgstr "A használandó feldolgozó típusának kiválasztása"
 
-#: ../src/scan_dialog.c:2319
-#, c-format
-msgid "%d: disc number"
-msgstr "%d: lemez száma"
+#~ msgid "Select fields:"
+#~ msgstr "Mezők kijelölése:"
 
-#: ../src/scan_dialog.c:2322
-#, c-format
-msgid "%e: encoded by"
-msgstr "%e: kódoló neve"
+# bubble help
+#~ msgid ""
+#~ "The buttons on the right represent the fields which can be processed. "
+#~ "Select those which interest you"
+#~ msgstr ""
+#~ "A jobbra lévő gombok ábrázolják azokat a mezőket, amelyeket fel lehet "
+#~ "dolgozni. Válassza ki azokat, amelyek érdeklik."
 
-#: ../src/scan_dialog.c:2325
-#, c-format
-msgid "%g: genre"
-msgstr "%g: műfaj"
+#~ msgid "F"
+#~ msgstr "F"
 
-#: ../src/scan_dialog.c:2328
-#, c-format
-msgid "%i: ignored"
-msgstr "%i: mellőzött"
+#~ msgid "T"
+#~ msgstr "C"
 
-#: ../src/scan_dialog.c:2331
-msgid "%l: number of tracks"
-msgstr "%l: sávok száma"
+#~ msgid "Ar"
+#~ msgstr "E"
 
-#: ../src/scan_dialog.c:2334
-#, c-format
-msgid "%o: orig. artist"
-msgstr "%o: eredeti előadó"
+#~ msgid "AA"
+#~ msgstr "AE"
 
-#: ../src/scan_dialog.c:2337
-#, c-format
-msgid "%n: track"
-msgstr "%n: szám"
+# bubble help
+#~ msgid "Process album artist field"
+#~ msgstr "Az album előadója mező feldolgozása"
 
-#: ../src/scan_dialog.c:2340
-msgid "%t: title"
-msgstr "%t: cím"
+#~ msgid "Al"
+#~ msgstr "A"
 
-#: ../src/scan_dialog.c:2343
-#, c-format
-msgid "%u: URL"
-msgstr "%u: URL"
+#~ msgid "G"
+#~ msgstr "M"
 
-#: ../src/scan_dialog.c:2346
-#, c-format
-msgid "%x: number of discs"
-msgstr "%x: lemezek száma"
+#~ msgid "Cm"
+#~ msgstr "MJ"
 
-#: ../src/scan_dialog.c:2349
-msgid "%y: year"
-msgstr "%y: év"
+#~ msgid "Cp"
+#~ msgstr "Z"
 
-#.
-#. * Masks Editor
-#.
-#: ../src/scan_dialog.c:2356
-msgid "Mask Editor"
-msgstr "Maszkszerkesztő"
+#~ msgid "O"
+#~ msgstr "EE"
 
-#: ../src/scan_dialog.c:2410
-msgid "Create New Mask"
-msgstr "Új maszk létrehozása"
+#~ msgid "Cr"
+#~ msgstr "Sz"
 
-#: ../src/scan_dialog.c:2420
-msgid "Move Up this Mask"
-msgstr "Maszk felfelé mozgatása"
+#~ msgid "U"
+#~ msgstr "U"
 
-#: ../src/scan_dialog.c:2430
-msgid "Move Down this Mask"
-msgstr "Maszk lefelé mozgatása"
+#~ msgid "E"
+#~ msgstr "K"
 
-#: ../src/scan_dialog.c:2440
-msgid "Duplicate Mask"
-msgstr "Maszk kettőzése"
+#~ msgid "Invert selection"
+#~ msgstr "Kijelölés megfordítása"
 
-#: ../src/scan_dialog.c:2450
-msgid "Add Default Masks"
-msgstr "Alapértelmezett maszkok hozzáadása"
+#~ msgid "Select/Unselect all"
+#~ msgstr "Összes kijelölése / Kijelölés megszüntetése"
 
-#: ../src/scan_dialog.c:2460
-msgid "Remove Mask"
-msgstr "Maszk eltávolítása"
+# bubble help
+#~ msgid ""
+#~ "Convert all words in all fields to upper case. Example, before: 'Text IN "
+#~ "AN entry', after: 'TEXT IN AN ENTRY'."
+#~ msgstr ""
+#~ "Az összes szó nagybetűsre alakítása minden mezőben. Például előtte: "
+#~ "„Szöveg EGY bejegyzésben”, utána: „SZÖVEG EGY BEJEGYZÉSBEN”."
 
-#: ../src/scan_dialog.c:2470
-msgid "Save Masks"
-msgstr "Maszkok mentése"
+# bubble help
+#~ msgid ""
+#~ "Convert all words in all fields to lower case. Example, before: 'TEXT IN "
+#~ "an entry', after: 'text in an entry'."
+#~ msgstr ""
+#~ "Az összes szó kisbetűsre alakítása minden mezőben. Például előtte: "
+#~ "„SZÖVEG EGY bejegyzésben”, utána: „szöveg egy bejegyzésben”."
 
-#: ../src/scan_dialog.c:3050
-msgid "New_mask"
-msgstr "Új_maszk"
+# bubble help
+#~ 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 ""
+#~ "Az első szó kezdetének nagybetűsre alakítása minden mezőben. Például "
+#~ "előtte: „Szöveg EGY Bejegyzésben”, utána: „Szöveg egy bejegyzésben”."
 
-#: ../src/scan_dialog.c:3089
-msgid "Copy: No row selected"
-msgstr "Másolás: Nincs kijelölt sor"
+# bubble help
+#~ 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 ""
+#~ "Az összes szó kezdetének nagybetűsre alakítása minden mezőben. Például "
+#~ "előtte: „Szöveg egy BEJEGYZÉSBEN”, utána: „Szöveg Egy Bejegyzésben”."
 
-#: ../src/scan_dialog.c:3182
-msgid "Remove: No row selected"
-msgstr "Eltávolítás: Nincs kijelölt sor"
+# bubble help
+#~ msgid ""
+#~ "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
+#~ "text in an entry', after: 'IX. Text In An Entry'."
+#~ 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_dialog.c:3229
-msgid "Move Up: No row selected"
-msgstr "Felfelé mozgatás: Nincs kijelölt sor"
+# bubble help
+#~ msgid ""
+#~ "All spaces between words are removed. Example, before: 'Text In An "
+#~ "Entry', after: 'TextInAnEntry'."
+#~ msgstr ""
+#~ "Az összes szóköz eltávolítása a szavak közül. Például előtte: „Szöveg Egy "
+#~ "Bejegyzésben”, utána: „SzövegEgyBejegyzésben”."
 
-#: ../src/scan_dialog.c:3273
-msgid "Move Down: No row selected"
-msgstr "Lefelé mozgatás: Nincs kijelölt sor"
+# bubble help
+#~ msgid ""
+#~ "A space is inserted before each upper case letter. Example, before: "
+#~ "'TextInAnEntry', after: 'Text In An Entry'."
+#~ msgstr ""
+#~ "Egy szóköz beszúrása minden nagybetű elé. Például előtte: "
+#~ "„SzövegEgyBejegyzésben”, utána: „Szöveg Egy Bejegyzésben”."
 
-#: ../src/setting.c:924
-#, c-format
-msgid "Error: Cannot write configuration file: %s (%s)"
-msgstr "Hiba: A beállító fájl nem írható: %s (%s)"
+# bubble help
+#~ msgid ""
+#~ "Duplicate spaces and underscores are removed. Example, before: "
+#~ "'Text__In__An   Entry', after: 'Text_In_An Entry'."
+#~ msgstr ""
+#~ "Dupla szóközök vagy alsóvonások eltávolítása. Például előtte: "
+#~ "„Szöveg__Egy   Bejegyzésben”, utána: „Szöveg_Egy Bejegyzésben”."
 
-#: ../src/setting.c:944 ../src/setting.c:961 ../src/setting.c:981
-#, c-format
-msgid "Error while writing configuration file: %s"
-msgstr "Hiba a beállítófájl írása közben: %s"
+#~ msgid "Move Up this Mask"
+#~ msgstr "Maszk felfelé mozgatása"
 
-#: ../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)"
+#~ msgid "Move Down this Mask"
+#~ msgstr "Maszk lefelé mozgatása"
 
-#: ../src/setting.c:1102
-msgid "Loading default configuration"
-msgstr "Alapértelmezett beállítások betöltése"
+#~ msgid "Duplicate Mask"
+#~ msgstr "Maszk kettőzése"
 
-#: ../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)"
+#~ msgid "Remove Mask"
+#~ msgstr "Maszk eltávolítása"
 
-#: ../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)"
+#~ msgid "Copy: No row selected"
+#~ msgstr "Másolás: Nincs kijelölt sor"
 
-#: ../src/setting.c:1221
-#, c-format
-msgid "Error while writing list file: %s"
-msgstr "Hiba a listafájl írása közben: %s"
+#~ msgid "Remove: No row selected"
+#~ msgstr "Eltávolítás: Nincs kijelölt sor"
 
-#. Fall back to defaults
-#: ../src/setting.c:1301
-msgid "Loading default 'Fill Tag' masks…"
-msgstr "Alapértelmezett „Címke kitöltése” maszkok betöltése…"
+#~ msgid "Move Up: No row selected"
+#~ msgstr "Felfelé mozgatás: Nincs kijelölt sor"
 
-#. Fall back to defaults
-#: ../src/setting.c:1331
-msgid "Loading default 'Rename File' masks…"
-msgstr "Alapértelmezett „Fájl átnevezése” maszkok betöltése…"
+#~ msgid "Move Down: No row selected"
+#~ msgstr "Lefelé mozgatás: Nincs kijelölt sor"
 
-#. Fall back to defaults
-#: ../src/setting.c:1357
-msgid "Loading default 'Rename Directory' masks…"
-msgstr "Alapértelmezett „Könyvtár átnevezése” maszkok betöltése…"
+#~ msgid "Error: Cannot write configuration file: %s (%s)"
+#~ msgstr "Hiba: A beállító fájl nem írható: %s (%s)"
 
-#: ../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”"
+#~ msgid "Error while writing configuration file: %s"
+#~ msgstr "Hiba a beállítófájl írása közben: %s"
 
-#: ../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"
+#~ msgid "Cannot open configuration file '%s' (%s)"
+#~ msgstr "A(z) „%s” beállító fájl nem nyitható meg (%s)"
 
-#: ../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)"
+#~ msgid "Loading default configuration"
+#~ msgstr "Alapértelmezett beállítások betöltése"
+
+#~ msgid "Loading default 'Rename Directory' masks…"
+#~ msgstr "Alapértelmezett „Könyvtár átnevezése” maszkok betöltése…"
+
+#~ msgid "Error: Cannot create directory '%s' (%s)"
+#~ msgstr "Hiba: Nem lehet létrehozni a könyvtárat: „%s” (%s)"
 
 #~ msgid "File contains no audio track: '%s'"
 #~ msgstr "A fájl nem tartalmaz hangszámot: „%s”"
@@ -5363,9 +6860,6 @@ msgstr "Hiba: Nem lehet létrehozni a könyvtárat: „%s” (%s)"
 #~ msgid "Cannot create target directory '%s'"
 #~ msgstr "Nem hozható létre a(z) „%s” célkönyvtár"
 
-#~ msgid "Cannot create target directory '%s': %s"
-#~ msgstr "Nem hozható létre a(z) „%s” célkönyvtár: %s"
-
 #~ msgid "Renamed file '%s' to '%s'"
 #~ msgstr "A(z) „%s” fájl átnevezve erre: „%s”"
 
@@ -5458,9 +6952,6 @@ msgstr "Hiba: Nem lehet létrehozni a könyvtárat: „%s” (%s)"
 #~ msgid "Do you want to save anyway, overwriting the file?"
 #~ msgstr "Mindenképp szeretné menteni a fájl felülírásával?"
 
-#~ msgid "Save"
-#~ msgstr "Mentés"
-
 #~ msgid "Unknown picture type"
 #~ msgstr "Ismeretlen kép típus"
 
@@ -5580,9 +7071,6 @@ msgstr "Hiba: Nem lehet létrehozni a könyvtárat: „%s” (%s)"
 #~ msgid "File Link Broken"
 #~ msgstr "Törött fájlhivatkozás"
 
-#~ msgid "Search a file"
-#~ msgstr "Fájl keresése"
-
 #~ msgid "Message Dialog Position"
 #~ msgstr "Üzenet párbeszédablak helyzete"
 
@@ -5593,9 +7081,6 @@ msgstr "Hiba: Nem lehet létrehozni a könyvtárat: „%s” (%s)"
 #~ msgid "Let the Window Manager to place the windows."
 #~ msgstr "Az ablakkezelő helyezze el az ablakokat."
 
-#~ msgid "Center of the main window"
-#~ msgstr "A főablak közepén"
-
 # bubble help
 #~ msgid "Windows should be placed in the center of the main window."
 #~ msgstr "Az ablakok a főablak közepére kerüljenek."
@@ -5627,9 +7112,6 @@ msgstr "Hiba: Nem lehet létrehozni a könyvtárat: „%s” (%s)"
 #~ msgid "Scanner Options"
 #~ msgstr "Feldolgozó beállításai"
 
-#~ msgid "Invert Selection"
-#~ msgstr "Kijelölés megfordítása"
-
 #~ 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 "
@@ -5770,9 +7252,6 @@ msgstr "Hiba: Nem lehet létrehozni a könyvtárat: „%s” (%s)"
 #~ msgid "Translations:\n"
 #~ msgstr "Fordítások:\n"
 
-#~ msgid "General:\n"
-#~ msgstr "Általános:\n"
-
 #~ msgid "Changes"
 #~ msgstr "Módosítások"
 
@@ -5815,11 +7294,6 @@ msgstr "Hiba: Nem lehet létrehozni a könyvtárat: „%s” (%s)"
 #~ msgid "Search _File(s)…"
 #~ msgstr "Fájl keresése..."
 
-# ikon megjegyzés
-#, fuzzy
-#~ msgid "Search File(s)…"
-#~ msgstr "Fájl keresése..."
-
 #, fuzzy
 #~ msgid "… file(s)"
 #~ msgstr "%u fájl"
@@ -6101,18 +7575,6 @@ msgstr "Hiba: Nem lehet létrehozni a könyvtárat: „%s” (%s)"
 #~ msgid " No "
 #~ msgstr " Nem "
 
-#~ msgid " Apply "
-#~ msgstr " Alkalmaz "
-
-#~ msgid " Cancel "
-#~ msgstr " Mégsem "
-
-#~ msgid " Close "
-#~ msgstr " Bezár "
-
-#~ msgid " Execute "
-#~ msgstr " Futtatás "
-
 #~ msgid " Search "
 #~ msgstr "Keresés "
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4bb419d..a521a29 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,10 +8,9 @@
 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-06-11 19:50+0000\n"
-"PO-Revision-Date: 2014-06-16 10:07-0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=easytag&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-12-21 22:39+0000\n"
+"PO-Revision-Date: 2014-12-23 00:29-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,4945 +18,5418 @@ 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.5\n"
+"X-Generator: Poedit 1.7.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 ""
-"Veja e edite etiquetas de arquivos MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg "
-"Speex, Ogg Vorbis, MusePack, Monkey's Audio e WavPack."
+#. Name and summary taken from the desktop file.
+#: ../data/easytag.appdata.xml.in.h:2 ../data/easytag.desktop.in.h:1
+msgid "EasyTAG"
+msgstr "EasyTAG"
 
-#: ../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 ../data/easytag.desktop.in.h:3
+msgid "Edit audio file metadata"
+msgstr "Edite metadados de arquivo de áudio"
 
-#: ../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.appdata.xml.in.h:4
+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.desktop.in.h:1
-msgid "Sound File Metadata Editor"
-msgstr "Editor de metadados de arquivo de som"
+#: ../data/easytag.appdata.xml.in.h:5
+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:6
+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:2
-msgid "Edit sound file metadata"
-msgstr "Edite metadados de arquivo de som"
+msgid "Audio File Metadata Editor"
+msgstr "Editor de metadados de arquivo de áudio"
 
 #. 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;audio;som;"
-
-#: ../nautilus-extension/nautilus-easytag.c:229
-msgid "Open in EasyTAG"
-msgstr "Abrir no EasyTAG"
-
-#: ../nautilus-extension/nautilus-easytag.c:230
-msgid "Open the current selected directory in EasyTAG"
-msgstr "Abre o diretório selecionado no EasyTAG"
+#: ../data/easytag.desktop.in.h:5
+msgid "mp3;tag;audio;music;"
+msgstr "mp3;tag;etiqueta;áudio;audio;som;música;music;"
 
-#: ../nautilus-extension/nautilus-easytag.c:247
+#: ../data/easytag-nautilus.metainfo.xml.in.h:1 ../nautilus-extension/nautilus-easytag.c:247
 msgid "Open with EasyTAG"
 msgstr "Abrir com EasyTAG"
 
-#: ../nautilus-extension/nautilus-easytag.c:248
-msgid "Open selected files in EasyTAG"
-msgstr "Abre os arquivos selecionados no EasyTAG"
-
-#. Translators: put your own name here to appear in the about dialog.
-#: ../src/about.c:89
-msgid "translator-credits"
-msgstr ""
-"doutor.zero <doutor.zero at gmail.com>, 2005, 2007, 2008\n"
-"Enrico Nicoletto <liverig at gmail.com>, 2013, 2014\n"
-"Rafael Ferreira <rafael.f.f1 at gmail.com>, 2013, 2014"
-
-#: ../src/about.c:99
-msgid "View and edit tags in audio files"
-msgstr "Veja e edite etiquetas em arquivos de áudio"
+#: ../data/easytag-nautilus.metainfo.xml.in.h:2
+msgid "Open directories and audio files with EasyTAG using the context menu"
+msgstr "Abre diretórios e arquivos de áudio com EasyTAG usando o menu de contexto"
 
-#: ../src/ape_tag.c:61 ../src/id3v24_tag.c:113 ../src/mp4_header.cc:45
-#: ../src/mp4_header.cc:58 ../src/mp4_tag.cc:69 ../src/mp4_tag.cc:85
-#: ../src/mp4_tag.cc:90 ../src/mp4_tag.cc:262 ../src/mp4_tag.cc:278
-#: ../src/mp4_tag.cc:283
-#, c-format
-msgid "Error while opening file: '%s' (%s)."
-msgstr "Erro ao abrir arquivo: \"%s\" (%s)."
+#: ../data/browser.ui.h:1
+msgid "Browse Directory With"
+msgstr "Navegar no diretório com"
 
-#: ../src/application.c:32
-msgid "Print the version and exit"
-msgstr "Mostra a versão e sai"
+#: ../data/browser.ui.h:2
+msgid "Run Program"
+msgstr "Executar programa"
 
-#: ../src/application.c:84
-#, c-format
-msgid "Website: %s"
-msgstr "Site: %s"
+#: ../data/browser.ui.h:3
+msgid "Enter the program to run; it will receive the current directory as a parameter"
+msgstr "Digite o nome do programa para executar; Ele receberá o diretório atual como parâmetro"
 
-#: ../src/application.c:93
-msgid "- Tag and rename audio files"
-msgstr " - Etiquete e renomeie arquivos de áudio"
+#: ../data/browser.ui.h:4 ../src/browser.c:3773 ../src/tag_area.c:1479
+msgid "_Open"
+msgstr "_Abrir"
 
-#.
-#. * Main Menu Actions
-#.
-#: ../src/bar.c:155
-msgid "_File"
-msgstr "_Arquivo"
+#: ../data/browser.ui.h:5 ../data/tag_area.ui.h:3 ../src/application_window.c:323 ../src/application_window.c:337 ../src/application_window.c:2685 ../src/application_window.c:2723 ../src/browser.c:863 ../src/browser.c:3772 ../src/cddb_dialog.c:2297
+#: ../src/easytag.c:467 ../src/easytag.c:474 ../src/easytag.c:599 ../src/playlist_dialog.c:658 ../src/tag_area.c:1477 ../src/tag_area.c:1840
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: ../src/bar.c:156
-msgid "Sort List by Tag"
-msgstr "Organizar a lista por etiqueta"
+#: ../data/browser.ui.h:6
+msgid "_Execute"
+msgstr "_Executar"
 
-#: ../src/bar.c:159
-msgid "Sort List by Property"
-msgstr "Organizar a lista pela propriedade"
+#: ../data/browser.ui.h:7
+msgid "Open Files With"
+msgstr "Abrir arquivos com"
 
-#: ../src/bar.c:160
-msgid "Ascending by filename"
-msgstr "Ascendente pelo nome do arquivo"
+#: ../data/browser.ui.h:8
+msgid "Enter the program to run; it will receive the current files as a parameter"
+msgstr "Digite o nome do programa para executar; Ele receberá os arquivos atuais como parâmetro"
 
-#: ../src/bar.c:161
-msgid "Descending by filename"
-msgstr "Descendente pelo nome do arquivo"
+#. Only directories changed
+#: ../data/browser.ui.h:9 ../data/menus.ui.h:99 ../src/easytag.c:565
+msgid "Rename Directory"
+msgstr "Renomear diretório"
 
-#: ../src/bar.c:162
-msgid "Ascending by creation date"
-msgstr "Ascendente pela data de criação"
+#: ../data/browser.ui.h:10
+msgid "Literal name:"
+msgstr "Nome literal:"
 
-#: ../src/bar.c:163
-msgid "Descending by creation date"
-msgstr "Descendente pela data de criação"
+#: ../data/browser.ui.h:11 ../data/playlist_dialog.ui.h:2
+msgid "Use mask:"
+msgstr "Usar a máscara:"
 
-#: ../src/bar.c:164
-msgid "Ascending by track number"
-msgstr "Ascendente pelo número da faixa"
+#: ../data/browser.ui.h:12 ../data/org.gnome.EasyTAG.gschema.xml.h:188
+msgid "Whether to use a mask when renaming directories"
+msgstr "Se deve ser usada uma máscara ao renomear diretórios"
 
-#: ../src/bar.c:165
-msgid "Descending by track number"
-msgstr "Descendente pelo número da faixa"
+#: ../data/browser.ui.h:13
+msgid "Select or type in a mask using codes (see Legend in Scanner Window) to rename the directory from tag fields"
+msgstr "Selecione ou digite em uma máscara usando códigos (veja a legenda na janela do verificador) para renomear o diretório à partir dos campos das etiquetas"
 
-#: ../src/bar.c:166
-msgid "Ascending by title"
-msgstr "Ascendente pelo título"
+#: ../data/browser.ui.h:14
+msgid "Rename directory preview"
+msgstr "Visualização da renomeação do diretório"
 
-#: ../src/bar.c:167
-msgid "Descending by title"
-msgstr "Descendente pelo título"
+#: ../data/browser.ui.h:15
+msgid "_Rename"
+msgstr "_Renomear"
 
-#: ../src/bar.c:168
-msgid "Ascending by artist"
-msgstr "Ascendente pelo artista"
+#: ../data/browser.ui.h:16
+msgid "Choose a directory to show in the browser"
+msgstr "Escolha um diretório para mostrar no navegador"
 
-#: ../src/bar.c:169
-msgid "Descending by artist"
-msgstr "Descendente pelo artista"
+#: ../data/browser.ui.h:17 ../src/application.c:129
+msgid "Select a directory to browse"
+msgstr "Seleciona um diretório para navegar"
 
-#: ../src/bar.c:170
-msgid "Ascending by album artist"
-msgstr "Ascendente pelo artista do álbum"
+#: ../data/browser.ui.h:18 ../src/easytag.c:1074
+msgid "No files"
+msgstr "Nenhum arquivo"
 
-#: ../src/bar.c:171
-msgid "Descending by album artist"
-msgstr "Descendente pelo artista do álbum"
+#: ../data/browser.ui.h:19 ../data/cddb_dialog.ui.h:10 ../data/preferences_dialog.ui.h:63 ../data/scan_dialog.ui.h:57 ../data/search_dialog.ui.h:13
+msgid "Artist"
+msgstr "Artista"
 
-#: ../src/bar.c:172
-msgid "Ascending by album"
-msgstr "Ascendente pelo álbum"
+#: ../data/browser.ui.h:20
+msgid "# Albums"
+msgstr "# álbuns"
 
-#: ../src/bar.c:173
-msgid "Descending by album"
-msgstr "Descendente pelo álbum"
+#: ../data/browser.ui.h:21
+msgid "# Files"
+msgstr "# arquivos"
 
-#: ../src/bar.c:174
-msgid "Ascending by year"
-msgstr "Ascendente pelo ano"
+#: ../data/browser.ui.h:22 ../data/cddb_dialog.ui.h:11 ../data/preferences_dialog.ui.h:65 ../data/scan_dialog.ui.h:60 ../data/search_dialog.ui.h:15
+msgid "Album"
+msgstr "Álbum"
 
-#: ../src/bar.c:175
-msgid "Descending by year"
-msgstr "Descendente pelo ano"
+#: ../data/browser.ui.h:23 ../data/cddb_dialog.ui.h:35 ../data/playlist_dialog.ui.h:1 ../data/scan_dialog.ui.h:53 ../data/search_dialog.ui.h:11
+msgid "Filename"
+msgstr "Nome do arquivo"
 
-#: ../src/bar.c:176
-msgid "Ascending by genre"
-msgstr "Ascendente pelo gênero"
+#: ../data/browser.ui.h:24 ../data/cddb_dialog.ui.h:36 ../data/preferences_dialog.ui.h:61 ../data/scan_dialog.ui.h:55 ../data/search_dialog.ui.h:12
+msgid "Title"
+msgstr "Título"
 
-#: ../src/bar.c:177
-msgid "Descending by genre"
-msgstr "Descendente pelo gênero"
+#: ../data/browser.ui.h:25 ../data/scan_dialog.ui.h:59 ../data/search_dialog.ui.h:14
+msgid "Album Artist"
+msgstr "Artista do álbum"
 
-#: ../src/bar.c:178
-msgid "Ascending by comment"
-msgstr "Ascendente pelo comentário"
+#: ../data/browser.ui.h:26 ../data/cddb_dialog.ui.h:37 ../data/search_dialog.ui.h:17
+msgid "Year"
+msgstr "Ano"
 
-#: ../src/bar.c:179
-msgid "Descending by comment"
-msgstr "Descendente pelo comentário"
+#: ../data/browser.ui.h:27
+msgid "Disc"
+msgstr "Disco"
 
-#: ../src/bar.c:180
-msgid "Ascending by composer"
-msgstr "Ascendente pelo compositor"
+#: ../data/browser.ui.h:28 ../data/search_dialog.ui.h:18
+msgid "Track"
+msgstr "Faixa"
 
-#: ../src/bar.c:181
-msgid "Descending by composer"
-msgstr "Descendente pelo compositor"
+#: ../data/browser.ui.h:29 ../data/cddb_dialog.ui.h:40 ../data/preferences_dialog.ui.h:67 ../data/scan_dialog.ui.h:62 ../data/search_dialog.ui.h:19
+msgid "Genre"
+msgstr "Gênero"
 
-#: ../src/bar.c:182
-msgid "Ascending by original artist"
-msgstr "Ascendente pelo artista original"
+#: ../data/browser.ui.h:30 ../data/preferences_dialog.ui.h:69 ../data/scan_dialog.ui.h:64 ../data/search_dialog.ui.h:20
+msgid "Comment"
+msgstr "Comentário"
 
-#: ../src/bar.c:183
-msgid "Descending by original artist"
-msgstr "Descendente pelo artista original"
+#: ../data/browser.ui.h:31 ../data/preferences_dialog.ui.h:71 ../data/scan_dialog.ui.h:66 ../data/search_dialog.ui.h:21 ../src/picture.c:212
+msgid "Composer"
+msgstr "Compositor"
 
-#: ../src/bar.c:184
-msgid "Ascending by copyright"
-msgstr "Ascendente pelo copyright"
+#: ../data/browser.ui.h:32 ../data/search_dialog.ui.h:22
+msgid "Original Artist"
+msgstr "Artista original"
 
-#: ../src/bar.c:185
-msgid "Descending by copyright"
-msgstr "Descendente pelo copyright"
+#: ../data/browser.ui.h:33 ../data/scan_dialog.ui.h:70 ../data/search_dialog.ui.h:23
+msgid "Copyright"
+msgstr "Copyright"
 
-#: ../src/bar.c:186
-msgid "Ascending by URL"
-msgstr "Ascendente pela URL"
+#: ../data/browser.ui.h:34 ../data/scan_dialog.ui.h:72 ../data/search_dialog.ui.h:24
+msgid "URL"
+msgstr "URL"
 
-#: ../src/bar.c:187
-msgid "Descending by URL"
-msgstr "Descendente pela URL"
+#: ../data/browser.ui.h:35 ../data/scan_dialog.ui.h:74 ../data/search_dialog.ui.h:25
+msgid "Encoded By"
+msgstr "Codificado por"
 
-#. 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 "Ascendente pelo nome do codificador"
+#: ../data/cddb_dialog.ui.h:1
+msgid "Search"
+msgstr "Pesquisar"
 
-#. 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 "Descendente pelo nome do codificador"
+#: ../data/cddb_dialog.ui.h:2
+msgid "Enter the words to search (separated by a space or ‘+’)"
+msgstr "Digite as palavras para pesquisar (separadas por um espaço ou \"+\")"
 
-#: ../src/bar.c:194
-msgid "Ascending by file type"
-msgstr "Ascendente pelo tipo do arquivo"
+#: ../data/cddb_dialog.ui.h:3
+msgid "_Search"
+msgstr "Pe_squisar"
 
-#: ../src/bar.c:195
-msgid "Descending by file type"
-msgstr "Descendente pelo tipo do arquivo"
+#: ../data/cddb_dialog.ui.h:4
+msgid "Search Using Selected _Files"
+msgstr "Pesquisar usando _arquivos selecionados"
 
-#: ../src/bar.c:196
-msgid "Ascending by file size"
-msgstr "Ascendente pelo tamanho do arquivo"
+#: ../data/cddb_dialog.ui.h:5
+msgid "Generate the CDDB disc ID using the selected files (the order is important)"
+msgstr "Gera o ID de disco do CDDB usando os arquivos selecionados (a ordem é importante)"
 
-#: ../src/bar.c:197
-msgid "Descending by file size"
-msgstr "Descendente pelo tamanho do arquivo"
+#: ../data/cddb_dialog.ui.h:6 ../data/toolbar.ui.h:31
+msgid "Stop"
+msgstr "Parar"
 
-#: ../src/bar.c:198
-msgid "Ascending by duration"
-msgstr "Ascendente pela duração"
+#: ../data/cddb_dialog.ui.h:7
+msgid "Stop the search"
+msgstr "Para a pesquisa"
 
-#: ../src/bar.c:199
-msgid "Descending by duration"
-msgstr "Descendente pela duração"
+#: ../data/cddb_dialog.ui.h:8
+msgid "Manual Search Options"
+msgstr "Opções de pesquisa manual"
 
-#: ../src/bar.c:200
-msgid "Ascending by bitrate"
-msgstr "Ascendente pela taxa de bits"
+#: ../data/cddb_dialog.ui.h:9
+msgid "Search Fields"
+msgstr "Pesquisar campos"
 
-#: ../src/bar.c:201
-msgid "Descending by bitrate"
-msgstr "Descendente pela taxa de bits"
+#: ../data/cddb_dialog.ui.h:12
+msgid "Track Name"
+msgstr "Nome da faixa"
 
-#: ../src/bar.c:202
-msgid "Ascending by samplerate"
-msgstr "Ascendente pela taxa de amostragem"
+#: ../data/cddb_dialog.ui.h:13 ../data/preferences_dialog.ui.h:91 ../src/picture.c:190
+msgid "Other"
+msgstr "Outro"
 
-#: ../src/bar.c:203
-msgid "Descending by samplerate"
-msgstr "Descendente pela taxa de amostragem"
+#: ../data/cddb_dialog.ui.h:14
+msgid "Categories"
+msgstr "Categorias"
 
-#: ../src/bar.c:205
-msgid "Open Files With…"
-msgstr "Abrir arquivos com…"
+#: ../data/cddb_dialog.ui.h:15
+msgid "Blues"
+msgstr "Blues"
 
-#: ../src/bar.c:206
-msgid "Run a command on the selected files"
-msgstr "Executa um comando nos arquivos selecionados"
+#: ../data/cddb_dialog.ui.h:16
+msgid "Classical"
+msgstr "Clássico"
 
-#: ../src/bar.c:209
-msgid "Select all"
-msgstr "Seleciona tudo"
+#: ../data/cddb_dialog.ui.h:17
+msgid "Country"
+msgstr "Country"
 
-#: ../src/bar.c:210
-msgid "Unselect All"
-msgstr "Desmarcar tudo"
+#: ../data/cddb_dialog.ui.h:18
+msgid "Folk"
+msgstr "Folk"
 
-#: ../src/bar.c:211
-msgid "Clear the current selection"
-msgstr "Limpa a seleção atual"
+#: ../data/cddb_dialog.ui.h:19
+msgid "Jazz"
+msgstr "Jazz"
 
-#: ../src/bar.c:214
-msgid "Invert File Selection"
-msgstr "Inverter a seleção de arquivo"
+#: ../data/cddb_dialog.ui.h:20
+msgid "Misc."
+msgstr "Diversas"
 
-#: ../src/bar.c:215
-msgid "Invert file selection"
-msgstr "Inverte a seleção de arquivo"
+# Em que pese a tradução "Nova era" ser aceitável, conheço esta categoria apenas como "New age", portanto mantive -- Rafael
+#: ../data/cddb_dialog.ui.h:21
+msgid "New Age"
+msgstr "New age"
 
-#: ../src/bar.c:217
-msgid "Delete Files"
-msgstr "Excluir arquivos"
+#: ../data/cddb_dialog.ui.h:22
+msgid "Reggae"
+msgstr "Reggae"
 
-#: ../src/bar.c:217
-msgid "Delete files"
-msgstr "Exclui arquivos"
+#: ../data/cddb_dialog.ui.h:23
+msgid "Rock"
+msgstr "Rock"
 
-#: ../src/bar.c:218
-msgid "_First File"
-msgstr "_Primeiro arquivo"
+#: ../data/cddb_dialog.ui.h:24
+msgid "Soundtrack"
+msgstr "Trilha sonora"
 
-#: ../src/bar.c:219
-msgid "First file"
-msgstr "Primeiro arquivo"
+#: ../data/cddb_dialog.ui.h:25
+msgid "Results"
+msgstr "Resultados"
 
-#: ../src/bar.c:220
-msgid "_Previous File"
-msgstr "Arquivo _anterior"
+#: ../data/cddb_dialog.ui.h:26
+msgid "Artist / Album"
+msgstr "Artista / álbum"
 
-#: ../src/bar.c:220
-msgid "Previous file"
-msgstr "Arquivo anterior"
+#: ../data/cddb_dialog.ui.h:27
+msgid "Category"
+msgstr "Categoria"
 
-#: ../src/bar.c:221
-msgid "_Next File"
-msgstr "P_róximo arquivo"
+#: ../data/cddb_dialog.ui.h:28
+msgid "Select lines from which tags will be applied to your files list. All lines will be processed if no line is selected.\\nYou can also reorder lines in this list before using the ‘apply’ button"
+msgstr "Seleciona as linhas cujas etiquetas serão aplicadas em sua lista de arquivos. Todas as linhas serão processadas se nenhuma linha for selecionada.\\nVocê também pode reordenar as linhas nessa lista antes de usar o botão \"aplicar\"."
 
-#: ../src/bar.c:221
-msgid "Next file"
-msgstr "Próximo arquivo"
+#: ../data/cddb_dialog.ui.h:29
+msgid "#"
+msgstr "#"
 
-#: ../src/bar.c:222
-msgid "_Last File"
-msgstr "Úl_timo arquivo"
+#: ../data/cddb_dialog.ui.h:30
+msgid "Duration"
+msgstr "Duração"
 
-#: ../src/bar.c:223
-msgid "Last file"
-msgstr "Último arquivo"
+#: ../data/cddb_dialog.ui.h:31
+msgid "Select all lines"
+msgstr "Selecionar todas as linhas"
 
-#: ../src/bar.c:224
-msgid "S_can Files"
-msgstr "V_erificar arquivos"
+#: ../data/cddb_dialog.ui.h:32
+msgid "Invert line selection"
+msgstr "Inverter seleção de linha"
 
-#: ../src/bar.c:225 ../src/scan_dialog.c:1818
-msgid "Scan selected files"
-msgstr "Verificar os arquivos selecionados"
+#: ../data/cddb_dialog.ui.h:33
+msgid "Unselect all lines"
+msgstr "Desmarcar todas as linhas"
 
-#: ../src/bar.c:226
-msgid "_Remove Tags"
-msgstr "_Remover etiquetas"
+#: ../data/cddb_dialog.ui.h:34 ../data/menus.ui.h:24
+msgid "Fill Tags"
+msgstr "Preencher etiquetas"
 
-#: ../src/bar.c:227
-msgid "Remove tags"
-msgstr "Remove etiquetas"
+#: ../data/cddb_dialog.ui.h:38
+msgid "Track #"
+msgstr "Faixa #"
 
-#: ../src/bar.c:228
-msgid "_Undo Last Files Changes"
-msgstr "_Desfazer a última modificação nos arquivos"
+#: ../data/cddb_dialog.ui.h:39
+msgid "# Tracks"
+msgstr "# faixas"
 
-#: ../src/bar.c:229
-msgid "Undo last files changes"
-msgstr "Desfaz a última modificação nos arquivos"
+#: ../data/cddb_dialog.ui.h:41 ../data/load_files_dialog.ui.h:13
+msgid "Run the current scanner for each file"
+msgstr "Executar a verificação atual para cada arquivo"
 
-#: ../src/bar.c:231
-msgid "R_edo Last Files Changes"
-msgstr "Re_fazer a última modificação nos arquivos"
+#: ../data/cddb_dialog.ui.h:42 ../data/org.gnome.EasyTAG.gschema.xml.h:38
+msgid "Whether to run the tag scanner, with the current settings, on the CDDB results"
+msgstr "Se deve ser executado verificador de etiqueta, com as configurações atuais, nos resultados do CDDB"
 
-#: ../src/bar.c:232
-msgid "Redo last files changes"
-msgstr "Refaz a última modificação nos arquivos"
+#: ../data/cddb_dialog.ui.h:43
+msgid "Match lines with the Levenshtein algorithm"
+msgstr "Coincidir linhas com o algoritmo Levenshtein"
 
-#: ../src/bar.c:234
-msgid "_Save Files"
-msgstr "_Salvar arquivos"
+#: ../data/cddb_dialog.ui.h:44 ../data/preferences_dialog.ui.h:148 ../data/org.gnome.EasyTAG.gschema.xml.h:24
+msgid "Whether to use the DLM algorithm to match CDDB results to files"
+msgstr "Se deve ser usado o algoritmo DLM para corresponder resultados CDDB com arquivos"
 
-#: ../src/bar.c:235
-msgid "Save changes to selected files"
-msgstr "Salva alterações nos arquivos selecionados"
+#: ../data/cddb_dialog.ui.h:45 ../data/search_dialog.ui.h:10 ../src/load_files_dialog.c:895 ../src/preferences_dialog.c:291 ../src/scan_dialog.c:2261
+msgid "_Close"
+msgstr "_Fechar"
 
-#: ../src/bar.c:237
-msgid "_Force Save Files"
-msgstr "_Forçar salvamento de arquivos"
+#: ../data/cddb_dialog.ui.h:46 ../src/cddb_dialog.c:2298 ../src/load_files_dialog.c:896
+msgid "_Apply"
+msgstr "Aplicar"
 
-#: ../src/bar.c:238
-msgid "Force saving files"
-msgstr "Força o salvamento dos arquivos"
+#: ../data/cddb_dialog.ui.h:47
+msgid "Load the selected lines or all lines (if no lines are selected)"
+msgstr "Carrega as linhas selecionadas ou todas as linhas (se nenhuma linha estiver selecionada)."
 
-#: ../src/bar.c:240
-msgid "Undo Last Changes"
-msgstr "Desfazer últimas modificações"
+#. Default values are MPEG data.
+#: ../data/file_area.ui.h:1 ../src/et_core.c:3010 ../src/file_area.c:192
+msgid "File"
+msgstr "Arquivo"
 
-#: ../src/bar.c:240
-msgid "Undo last changes"
-msgstr "Desfaz as últimas modificações"
+#: ../data/file_area.ui.h:2
+msgid "0/0:"
+msgstr "0/0:"
 
-#: ../src/bar.c:241
-msgid "Redo Last Changes"
-msgstr "Refazer últimas modificações"
+#. Nothing to display
+#. Version changed to encoder version
+#. Encoder version
+#: ../data/file_area.ui.h:3 ../src/file_area.c:193 ../src/tags/flac_header.c:175 ../src/tags/monkeyaudio_header.c:88 ../src/tags/musepack_header.c:92 ../src/tags/ogg_header.c:398 ../src/tags/opus_header.c:223 ../src/tags/wavpack_header.c:115
+msgid "Encoder:"
+msgstr "Codificador:"
 
-#: ../src/bar.c:241
-msgid "Redo last changes"
-msgstr "Refaz as últimas modificações"
+#: ../data/file_area.ui.h:4
+msgid "Bitrate:"
+msgstr "Taxa de bits:"
 
-#: ../src/bar.c:242
-msgid "_Quit"
-msgstr "Sa_ir"
+#: ../data/file_area.ui.h:5
+msgid "Sample rate:"
+msgstr "Taxa de amostragem:"
 
-#: ../src/bar.c:242 ../src/easytag.c:2424 ../src/easytag.c:4559
-#: ../src/easytag.c:4591
-msgid "Quit"
-msgstr "Sair"
+#. Mode
+#: ../data/file_area.ui.h:6 ../src/file_area.c:197 ../src/tags/mpeg_header.c:247
+msgid "Mode:"
+msgstr "Modo:"
 
-#: ../src/bar.c:245
-msgid "_Browser"
-msgstr "_Navegador"
+#: ../data/file_area.ui.h:7
+msgid "Size:"
+msgstr "Tamanho:"
 
-#: ../src/bar.c:246
-msgid "_Home Directory"
-msgstr "_Pasta pessoal"
+#: ../data/file_area.ui.h:8
+msgid "Duration:"
+msgstr "Duração:"
 
-#: ../src/bar.c:247
-msgid "Go to home directory"
-msgstr "Ir para a pasta pessoal"
+#: ../data/log_area.ui.h:1 ../data/preferences_dialog.ui.h:14
+msgid "Log"
+msgstr "Log"
 
-#: ../src/bar.c:249
-msgid "Desktop Directory"
-msgstr "Área de trabalho"
+#: ../data/load_files_dialog.ui.h:1
+msgid "File:"
+msgstr "Arquivo:"
 
-#: ../src/bar.c:250
-msgid "Go to desktop directory"
-msgstr "Ir para o diretório da área de trabalho"
+#: ../data/load_files_dialog.ui.h:2
+msgid "Choose a Text File"
+msgstr "Escolha um arquivo texto"
 
-#: ../src/bar.c:252
-msgid "Documents Directory"
-msgstr "Documentos"
+#: ../data/load_files_dialog.ui.h:3
+msgid "_Load"
+msgstr "_Carregar"
 
-# Nome do diretório é maiúsculo, motivo pelo qual mantive assim no meio da mensagem
-#: ../src/bar.c:253
-msgid "Go to documents directory"
-msgstr "Ir para o diretório de documentos"
+#: ../data/load_files_dialog.ui.h:4
+msgid "Content of Text File"
+msgstr "Conteúdo do arquivo texto"
 
-#: ../src/bar.c:255
-msgid "Downloads Directory"
-msgstr "Downloads"
+#: ../data/load_files_dialog.ui.h:5
+msgid "Insert a blank line before the selected line"
+msgstr "Inserir uma linha em branco antes da linha selecionada"
 
-#: ../src/bar.c:256
-msgid "Go to downloads directory"
-msgstr "Ir para o diretório de downloads"
+#: ../data/load_files_dialog.ui.h:6
+msgid "Delete the selected line"
+msgstr "Excluir a linha selecionada"
 
-#: ../src/bar.c:258
-msgid "Music Directory"
-msgstr "Músicas"
+#: ../data/load_files_dialog.ui.h:7 ../src/load_files_dialog.c:636 ../src/load_files_dialog.c:739
+msgid "Delete all blank lines"
+msgstr "Excluir todas as linhas em branco"
 
-#: ../src/bar.c:259
-msgid "Go to music directory"
-msgstr "Ir para o diretório de músicas"
+#: ../data/load_files_dialog.ui.h:8
+msgid "Move the selected line up"
+msgstr "Mover a linha selecionada para cima"
 
-#: ../src/bar.c:261
-msgid "_Parent Directory"
-msgstr "Diretório su_perior"
+#: ../data/load_files_dialog.ui.h:9
+msgid "Move the selected line down"
+msgstr "Mover a linha selecionada para baixo"
 
-#: ../src/bar.c:262
-msgid "Go to parent directory"
-msgstr "Ir para o diretório superior"
+#: ../data/load_files_dialog.ui.h:10 ../src/load_files_dialog.c:654 ../src/load_files_dialog.c:757
+msgid "Reload"
+msgstr "Recarregar"
 
-#: ../src/bar.c:264
-msgid "_Default Directory"
-msgstr "Diretório pa_drão"
+#: ../data/load_files_dialog.ui.h:11
+msgid "List of Files"
+msgstr "Lista dos arquivos"
 
-#: ../src/bar.c:265
-msgid "Go to default directory"
-msgstr "Ir para o diretório padrão"
+#: ../data/load_files_dialog.ui.h:12
+msgid "Selected line:"
+msgstr "Linha selecionada:"
 
-#: ../src/bar.c:267
-msgid "Set _Current Path as Default"
-msgstr "Definir o _caminho atual como padrão"
+#: ../data/load_files_dialog.ui.h:14 ../data/org.gnome.EasyTAG.gschema.xml.h:131
+msgid "Whether to run the current scanner on files loaded from a text file"
+msgstr "Se deve ser executado a verificação atual em arquivos carregados de um arquivo texto"
 
-#: ../src/bar.c:267
-msgid "Set current path as default"
-msgstr "Define o caminho atual como padrão"
+#: ../data/menus.ui.h:1
+msgid "_Help"
+msgstr "Aj_uda"
 
-#: ../src/bar.c:268
-msgid "Rename Directory…"
-msgstr "Renomear diretório…"
+#: ../data/menus.ui.h:2
+msgid "_About"
+msgstr "_Sobre"
 
-#: ../src/bar.c:268
-msgid "Rename directory"
-msgstr "Renomeia um diretório"
+#: ../data/menus.ui.h:3 ../src/application_window.c:2724
+msgid "_Quit"
+msgstr "Sa_ir"
 
-#: ../src/bar.c:269
-msgid "Reload Directory"
-msgstr "Recarregar diretório"
+#: ../data/menus.ui.h:4
+msgid "_File"
+msgstr "_Arquivo"
 
-#: ../src/bar.c:270
-msgid "Reload directory"
-msgstr "Recarrega um diretório"
+#: ../data/menus.ui.h:5
+msgid "Open Files With…"
+msgstr "Abrir arquivos com…"
 
-#: ../src/bar.c:273
-msgid "Browse Directory With…"
-msgstr "Navegar no pasta com…"
+#: ../data/menus.ui.h:6
+msgid "Run Audio Player"
+msgstr "Executar reprodutor de áudio"
 
-#: ../src/bar.c:274
-msgid "Run a command on the directory"
-msgstr "Executa um comando neste diretório"
+#: ../data/menus.ui.h:7 ../data/toolbar.ui.h:23
+msgid "Invert File Selection"
+msgstr "Inverter a seleção de arquivo"
 
-#: ../src/bar.c:276
-msgid "_Collapse Tree"
-msgstr "Re_colher árvore"
+#: ../data/menus.ui.h:8
+msgid "Delete Files"
+msgstr "Excluir arquivos"
 
-#: ../src/bar.c:277
-msgid "Collapse directory tree"
-msgstr "Recolhe uma árvore de diretórios"
+#: ../data/menus.ui.h:9
+msgid "Undo for File"
+msgstr "Desfazer para arquivo"
 
-#: ../src/bar.c:278
-msgid "_Reload Tree"
-msgstr "_Recarregar árvore"
+#: ../data/menus.ui.h:10
+msgid "Redo for File"
+msgstr "Refazer para arquivo"
 
-#: ../src/bar.c:279
-msgid "Reload directory tree"
-msgstr "Recarrega uma árvore de diretórios"
+#: ../data/menus.ui.h:11 ../data/toolbar.ui.h:17
+msgid "_Save Files"
+msgstr "_Salvar arquivos"
 
-#: ../src/bar.c:282
-msgid "S_canner Mode"
-msgstr "Modo v_erificador"
+#: ../data/menus.ui.h:12
+msgid "_Force Save Files"
+msgstr "_Forçar salvamento de arquivos"
 
-#: ../src/bar.c:284
-msgid "_Miscellaneous"
-msgstr "_Miscelânea"
+#: ../data/menus.ui.h:13
+msgid "_Edit"
+msgstr "_Editar"
 
-#: ../src/bar.c:285
+#: ../data/menus.ui.h:14 ../data/toolbar.ui.h:25
 msgid "_Find…"
 msgstr "_Localizar…"
 
-#: ../src/bar.c:286
-msgid "Search filenames and tags"
-msgstr "Pesquisa nomes de arquivos e etiquetas"
-
-#: ../src/bar.c:288
-msgid "CDD_B Search…"
-msgstr "Pesquisar no CDD_B…"
-
-#: ../src/bar.c:289
-msgid "CDDB search"
-msgstr "Pesquisa no CDDB"
-
-#: ../src/bar.c:291
-msgid "Load Filenames From a Text File…"
-msgstr "Carregar nomes dos arquivos de um arquivo texto…"
-
-#: ../src/bar.c:292
-msgid "Load filenames from a text file"
-msgstr "Carrega os nomes dos arquivos de um arquivo texto"
-
-#: ../src/bar.c:294
-msgid "Generate Playlist…"
-msgstr "Gerar uma lista de reprodução…"
+#: ../data/menus.ui.h:15
+msgid "Select All"
+msgstr "Selecionar tudo"
 
-#: ../src/bar.c:295
-msgid "Generate a playlist"
-msgstr "Gera uma lista de reprodução"
+#: ../data/menus.ui.h:16
+msgid "Unselect All"
+msgstr "Desmarcar tudo"
 
-#: ../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"
+#: ../data/menus.ui.h:17
+msgid "Undo"
+msgstr "Desfazer"
 
-#: ../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"
+#: ../data/menus.ui.h:18
+msgid "Redo"
+msgstr "Refazer"
 
-#: ../src/bar.c:301
-msgid "_Edit"
-msgstr "_Editar"
+#: ../data/menus.ui.h:19 ../data/toolbar.ui.h:11
+msgid "_Remove Tags"
+msgstr "_Remover etiquetas"
 
-#: ../src/bar.c:302
+#: ../data/menus.ui.h:20
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#. The window
-#: ../src/bar.c:303 ../src/prefs.c:110
-msgid "Preferences"
-msgstr "Preferências"
-
-#: ../src/bar.c:305
+#: ../data/menus.ui.h:21
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/bar.c:306
-msgid "_Go"
-msgstr "_Ir"
+#: ../data/menus.ui.h:22
+msgid "Show Scanner"
+msgstr "Mostrar o verificador"
 
-#: ../src/bar.c:308
-msgid "_Help"
-msgstr "Aj_uda"
+#: ../data/menus.ui.h:23
+msgid "Scanner Mode"
+msgstr "Modo verificador"
 
-#: ../src/bar.c:311
-msgid "_Contents"
-msgstr "Su_mário"
+#: ../data/menus.ui.h:25
+msgid "Rename Files and Directories"
+msgstr "Renomear arquivos e diretórios"
 
-#: ../src/bar.c:312
-msgid "Show help"
-msgstr "Mostrar ajuda"
+#: ../data/menus.ui.h:26 ../data/scan_dialog.ui.h:107
+msgid "Process Fields"
+msgstr "Processa campos"
 
-#: ../src/bar.c:314
-msgid "_About"
-msgstr "_Sobre"
+#: ../data/menus.ui.h:27 ../data/toolbar.ui.h:19
+msgid "Directory Tree"
+msgstr "Árvore de diretórios"
 
-#: ../src/bar.c:314
-msgid "About"
-msgstr "Sobre"
+#: ../data/menus.ui.h:28 ../data/toolbar.ui.h:21
+msgid "Artists and Albums"
+msgstr "Artistas e álbuns"
 
-#.
-#. * Following items are on toolbar but not on menu
-#.
-#: ../src/bar.c:320
-msgid "Stop the current action"
-msgstr "Para a ação atual"
+#: ../data/menus.ui.h:29
+msgid "Sort List by Tag"
+msgstr "Organizar a lista por etiqueta"
 
-#.
-#. * Popup menu's Actions
-#.
-#: ../src/bar.c:326
-msgid "_File Operations"
-msgstr "_Operação em arquivos"
+#: ../data/menus.ui.h:30
+msgid "Ascending by track number"
+msgstr "Ascendente pelo número da faixa"
 
-#: ../src/bar.c:327
-msgid "S_canner"
-msgstr "V_erificador"
+#: ../data/menus.ui.h:31
+msgid "Descending by track number"
+msgstr "Descendente pelo número da faixa"
 
-#: ../src/bar.c:331
-msgid "CDDB Search Files…"
-msgstr "Pesquisar no CDDB pelos arquivos…"
+#: ../data/menus.ui.h:32
+msgid "Ascending by title"
+msgstr "Ascendente pelo título"
 
-#: ../src/bar.c:331
-msgid "CDDB search files…"
-msgstr "Pesquisar no CDDB pelos arquivos…"
+#: ../data/menus.ui.h:33
+msgid "Descending by title"
+msgstr "Descendente pelo título"
 
-#. { 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:335
-msgid "Clear log"
-msgstr "Limpar log"
+#: ../data/menus.ui.h:34
+msgid "Ascending by artist"
+msgstr "Ascendente pelo artista"
 
-#. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Subdirectories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: ../src/bar.c:342
-msgid "Browse _Subdirectories"
-msgstr "Navegar nos _subdiretórios"
+#: ../data/menus.ui.h:35
+msgid "Descending by artist"
+msgstr "Descendente pelo artista"
 
-#: ../src/bar.c:342
-msgid "Browse subdirectories"
-msgstr "Navega nos subdiretórios"
+#: ../data/menus.ui.h:36
+msgid "Ascending by album artist"
+msgstr "Ascendente pelo artista do álbum"
 
-#: ../src/bar.c:346
-msgid "Show Hidden Directories"
-msgstr "Mostrar diretórios ocultos"
+#: ../data/menus.ui.h:37
+msgid "Descending by album artist"
+msgstr "Descendente pelo artista do álbum"
 
-#: ../src/bar.c:346
-msgid "Show hidden directories"
-msgstr "Mostra os diretórios ocultos"
+#: ../data/menus.ui.h:38
+msgid "Ascending by album"
+msgstr "Ascendente pelo álbum"
 
-#: ../src/bar.c:348
-msgid "_Show Scanner"
-msgstr "Mo_strar o verificador"
+#: ../data/menus.ui.h:39
+msgid "Descending by album"
+msgstr "Descendente pelo álbum"
 
-#: ../src/bar.c:349
-msgid "Show scanner"
-msgstr "Mostra o verificador"
+#: ../data/menus.ui.h:40
+msgid "Ascending by year"
+msgstr "Ascendente pelo ano"
 
-#: ../src/bar.c:355
-msgid "Tree Browser"
-msgstr "Navegador de árvore"
+#: ../data/menus.ui.h:41
+msgid "Descending by year"
+msgstr "Descendente pelo ano"
 
-#: ../src/bar.c:356
-msgid "View by directory tree"
-msgstr "Vê por árvore de diretórios"
+#: ../data/menus.ui.h:42
+msgid "Ascending by genre"
+msgstr "Ascendente pelo gênero"
 
-#: ../src/bar.c:358
-msgid "Artist and Album"
-msgstr "Artista e álbum"
+#: ../data/menus.ui.h:43
+msgid "Descending by genre"
+msgstr "Descendente pelo gênero"
 
-#: ../src/bar.c:359
-msgid "View by artist and album"
-msgstr "Vê por artista e álbum"
+#: ../data/menus.ui.h:44
+msgid "Ascending by comment"
+msgstr "Ascendente pelo comentário"
 
-#: ../src/bar.c:364
-msgid "_Fill Tags…"
-msgstr "Pr_eencher etiquetas…"
+#: ../data/menus.ui.h:45
+msgid "Descending by comment"
+msgstr "Descendente pelo comentário"
 
-#: ../src/bar.c:365
-msgid "Fill tags"
-msgstr "Preenche etiquetas"
+#: ../data/menus.ui.h:46
+msgid "Ascending by composer"
+msgstr "Ascendente pelo compositor"
 
-#: ../src/bar.c:367
-msgid "_Rename Files and Directories…"
-msgstr "_Renomear arquivos e diretórios…"
+#: ../data/menus.ui.h:47
+msgid "Descending by composer"
+msgstr "Descendente pelo compositor"
 
-#: ../src/bar.c:368
-msgid "Rename files and directories"
-msgstr "Renomeia arquivos e diretórios"
+#: ../data/menus.ui.h:48
+msgid "Ascending by original artist"
+msgstr "Ascendente pelo artista original"
 
-#: ../src/bar.c:370
-msgid "_Process Fields…"
-msgstr "_Processar campos…"
+#: ../data/menus.ui.h:49
+msgid "Descending by original artist"
+msgstr "Descendente pelo artista original"
 
-#: ../src/bar.c:370 ../src/scan_dialog.c:184
-msgid "Process Fields"
-msgstr "Processa campos"
+#: ../data/menus.ui.h:50
+msgid "Ascending by copyright"
+msgstr "Ascendente pelo copyright"
 
-#: ../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"
+#: ../data/menus.ui.h:51
+msgid "Descending by copyright"
+msgstr "Descendente pelo copyright"
 
-#: ../src/bar.c:535
-msgid "Ready to start"
-msgstr "Pronto para começar"
+#: ../data/menus.ui.h:52
+msgid "Ascending by URL"
+msgstr "Ascendente pela URL"
 
-#: ../src/browser.c:376
-msgid "New default path for files selected"
-msgstr "Novo caminho padrão para arquivos selecionados"
+#: ../data/menus.ui.h:53
+msgid "Descending by URL"
+msgstr "Descendente pela URL"
 
-#: ../src/browser.c:678 ../src/easytag.c:4555
-msgid "Some files have been modified but not saved"
-msgstr "Alguns arquivos foram modificados, mas não salvos"
+#: ../data/menus.ui.h:54
+msgid "Ascending by encoder name"
+msgstr "Ascendente pelo nome do codificador"
 
-#: ../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?"
+#: ../data/menus.ui.h:55
+msgid "Descending by encoder name"
+msgstr "Descendente pelo nome do codificador"
 
-#: ../src/browser.c:683
-msgid "Confirm Directory Change"
-msgstr "Confirmar alteração do diretório"
+#: ../data/menus.ui.h:56
+msgid "Sort List by Property"
+msgstr "Organizar a lista pela propriedade"
 
-#: ../src/browser.c:2152
-msgid "<All albums>"
-msgstr "<Todos os álbuns>"
+#: ../data/menus.ui.h:57
+msgid "Ascending by filename"
+msgstr "Ascendente pelo nome do arquivo"
 
-#: ../src/browser.c:2613
-#, 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."
+#: ../data/menus.ui.h:58
+msgid "Descending by filename"
+msgstr "Descendente pelo nome do arquivo"
 
-#: ../src/browser.c:3107 ../src/browser.c:3185
-msgid "Tree"
-msgstr "Árvore"
+#: ../data/menus.ui.h:59
+msgid "Ascending by creation date"
+msgstr "Ascendente pela data de criação"
 
-#: ../src/browser.c:3108 ../src/cddb.c:803 ../src/misc.c:1899
-msgid "Filename"
-msgstr "Nome do arquivo"
+#: ../data/menus.ui.h:60
+msgid "Descending by creation date"
+msgstr "Descendente pela data de criação"
 
-#: ../src/browser.c:3108 ../src/cddb.c:804 ../src/misc.c:1900
-#: ../src/prefs.c:643
-msgid "Title"
-msgstr "Título"
+#: ../data/menus.ui.h:61
+msgid "Ascending by file type"
+msgstr "Ascendente pelo tipo do arquivo"
 
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Artist".
-#: ../src/browser.c:3109 ../src/browser.c:3116 ../src/cddb.c:483
-#: ../src/cddb.c:805 ../src/misc.c:1901 ../src/prefs.c:644
-msgid "Artist"
-msgstr "Artista"
+#: ../data/menus.ui.h:62
+msgid "Descending by file type"
+msgstr "Descendente pelo tipo do arquivo"
 
-#: ../src/browser.c:3109 ../src/misc.c:1902
-msgid "Album Artist"
-msgstr "Artista do álbum"
+#: ../data/menus.ui.h:63
+msgid "Ascending by file size"
+msgstr "Ascendente pelo tamanho do arquivo"
 
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Album".
-#: ../src/browser.c:3110 ../src/browser.c:3118 ../src/cddb.c:486
-#: ../src/cddb.c:806 ../src/misc.c:1903 ../src/prefs.c:645
-msgid "Album"
-msgstr "Álbum"
+#: ../data/menus.ui.h:64
+msgid "Descending by file size"
+msgstr "Descendente pelo tamanho do arquivo"
 
-#: ../src/browser.c:3110 ../src/cddb.c:807 ../src/misc.c:1905
-msgid "Year"
-msgstr "Ano"
+#: ../data/menus.ui.h:65
+msgid "Ascending by duration"
+msgstr "Ascendente pela duração"
 
-#: ../src/browser.c:3110
-msgid "Disc"
-msgstr "Disco"
+#: ../data/menus.ui.h:66
+msgid "Descending by duration"
+msgstr "Descendente pela duração"
 
-#: ../src/browser.c:3111 ../src/misc.c:1906
-msgid "Track"
-msgstr "Faixa"
+#: ../data/menus.ui.h:67
+msgid "Ascending by bit rate"
+msgstr "Ascendente pela taxa de bits"
 
-#: ../src/browser.c:3111 ../src/cddb.c:810 ../src/misc.c:1907
-#: ../src/prefs.c:646
-msgid "Genre"
-msgstr "Gênero"
+#: ../data/menus.ui.h:68
+msgid "Descending by bit rate"
+msgstr "Descendente pela taxa de bits"
 
-#: ../src/browser.c:3112 ../src/misc.c:1908 ../src/prefs.c:647
-msgid "Comment"
-msgstr "Comentário"
+#: ../data/menus.ui.h:69
+msgid "Ascending by sample rate"
+msgstr "Ascendente pela taxa de amostragem"
 
-#: ../src/browser.c:3112 ../src/misc.c:1909 ../src/picture.c:884
-#: ../src/prefs.c:648
-msgid "Composer"
-msgstr "Compositor"
+#: ../data/menus.ui.h:70
+msgid "Descending by sample rate"
+msgstr "Descendente pela taxa de amostragem"
 
-#: ../src/browser.c:3113 ../src/misc.c:1910
-msgid "Original Artist"
-msgstr "Artista original"
+#: ../data/menus.ui.h:71
+msgid "Collapse Tree"
+msgstr "Recolher árvore"
 
-#: ../src/browser.c:3114 ../src/misc.c:1911
-msgid "Copyright"
-msgstr "Copyright"
+#: ../data/menus.ui.h:72
+msgid "Reload Tree"
+msgstr "Recarregar árvore"
 
-#: ../src/browser.c:3114 ../src/misc.c:1912
-msgid "URL"
-msgstr "URL"
+#: ../data/menus.ui.h:73
+msgid "Reload Directory"
+msgstr "Recarregar diretório"
 
-#: ../src/browser.c:3115 ../src/misc.c:1913
-msgid "Encoded By"
-msgstr "Codificado por"
+#: ../data/menus.ui.h:74
+msgid "Show Hidden Directories"
+msgstr "Mostrar diretórios ocultos"
 
-#: ../src/browser.c:3116
-msgid "# Albums"
-msgstr "# álbuns"
+#: ../data/menus.ui.h:75
+msgid "_Browser"
+msgstr "_Navegador"
 
-#: ../src/browser.c:3117 ../src/browser.c:3118
-msgid "# Files"
-msgstr "# arquivos"
+#: ../data/menus.ui.h:76
+msgid "Set _Current Path as Default"
+msgstr "Definir o _caminho atual como padrão"
 
-#: ../src/browser.c:3143
-msgid "Enter a directory to browse."
-msgstr "Digite o nome de um diretório para navegar."
+#: ../data/menus.ui.h:77
+msgid "Rename Directory…"
+msgstr "Renomear diretório…"
 
-#: ../src/browser.c:3152
-msgid "Select a directory to browse."
-msgstr "Selecione um diretório para navegar."
+#: ../data/menus.ui.h:78
+msgid "Browse Directory With…"
+msgstr "Navegar no pasta com…"
 
-#.
-#. * The label for displaying number of files in path (without subdirs)
-#.
-#. Translators: No files, as in "0 files".
-#: ../src/browser.c:3159 ../src/easytag.c:3463
-msgid "No files"
-msgstr "Nenhum arquivo"
+#: ../data/menus.ui.h:79
+msgid "Browse _Subdirectories"
+msgstr "Navegar nos _subdiretórios"
 
-#: ../src/browser.c:3237
-msgid "Artist & Album"
-msgstr "Artista & álbum"
+#: ../data/menus.ui.h:80
+msgid "_Miscellaneous"
+msgstr "_Miscelânea"
 
-#. Only directories changed
-#: ../src/browser.c:3601 ../src/easytag.c:2875
-msgid "Rename Directory"
-msgstr "Renomear diretório"
+#: ../data/menus.ui.h:81
+msgid "CDD_B Search…"
+msgstr "Pesquisa no CDD_B…"
 
-#: ../src/browser.c:3623
-#, c-format
-msgid "Rename the directory '%s' to:"
-msgstr "Renomear o diretório \"%s\" para:"
+#: ../data/menus.ui.h:82
+msgid "Load Filenames From a Text File…"
+msgstr "Carregar nomes dos arquivos de um arquivo texto…"
 
-#: ../src/browser.c:3642 ../src/misc.c:1168
-msgid "Use mask:"
-msgstr "Usar a máscara:"
+#: ../data/menus.ui.h:83 ../data/toolbar.ui.h:29
+msgid "Generate Playlist…"
+msgstr "Gerar uma lista de reprodução…"
 
-#: ../src/browser.c:3645
-msgid "If activated, it will use masks to rename directory."
-msgstr "Se ativada, máscaras serão usadas para renomear o diretório."
+#: ../data/menus.ui.h:84
+msgid "_Go"
+msgstr "_Ir"
 
-#: ../src/browser.c:3663
-msgid ""
-"Select or type in a mask using codes (see Legend in Scanner Window) to "
-"rename the directory from tag fields."
-msgstr ""
-"Selecione ou digite em uma máscara usando códigos (veja a legenda na janela "
-"do verificador) para renomear o diretório à partir dos campos das etiquetas."
+#: ../data/menus.ui.h:85
+msgid "_Home Directory"
+msgstr "_Pasta pessoal"
 
-#. Preview label
-#: ../src/browser.c:3687
-msgid "Rename directory preview"
-msgstr "Visualização da renomeação do diretório"
+#: ../data/menus.ui.h:86
+msgid "Desktop Directory"
+msgstr "Área de trabalho"
 
-#: ../src/browser.c:3779
-msgid "You must type a directory name"
-msgstr "Você deve digitar um nome para o diretório"
+#: ../data/menus.ui.h:87
+msgid "Documents Directory"
+msgstr "Documentos"
 
-#: ../src/browser.c:3780 ../src/browser.c:3801
-msgid "Directory Name Error"
-msgstr "Erro no nome do diretório"
+#: ../data/menus.ui.h:88
+msgid "Downloads Directory"
+msgstr "Downloads"
 
-#: ../src/browser.c:3798
-#, 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."
+#: ../data/menus.ui.h:89
+msgid "Music Directory"
+msgstr "Músicas"
 
-#: ../src/browser.c:3800
-msgid "Please use another name"
-msgstr "Por favor, use um outro nome"
+#: ../data/menus.ui.h:90
+msgid "_Parent Directory"
+msgstr "Diretório su_perior"
 
-#: ../src/browser.c:3870
-#, c-format
-msgid "The directory name '%s' already exists"
-msgstr "O nome do diretório \"%s\" já existe"
+#: ../data/menus.ui.h:91
+msgid "_Default Directory"
+msgstr "Diretório pa_drão"
 
-#: ../src/browser.c:3871 ../src/easytag.c:2958
-msgid "Rename File Error"
-msgstr "Erro ao renomear o arquivo"
+#: ../data/menus.ui.h:92 ../data/toolbar.ui.h:1
+msgid "_First File"
+msgstr "_Primeiro arquivo"
 
-#: ../src/browser.c:3909 ../src/browser.c:3938
-msgid "Rename Directory Error"
-msgstr "Erro ao renomear o diretório"
+#: ../data/menus.ui.h:93
+msgid "Previous File"
+msgstr "Arquivo anterior"
 
-#: ../src/browser.c:3976
-msgid "Directory renamed"
-msgstr "Diretório renomeado"
+#: ../data/menus.ui.h:94 ../data/toolbar.ui.h:5
+msgid "_Next File"
+msgstr "P_róximo arquivo"
 
-#: ../src/browser.c:4012
-msgid "Browse Directory With"
-msgstr "Navegar no diretório com"
+#: ../data/menus.ui.h:95 ../data/toolbar.ui.h:7
+msgid "_Last File"
+msgstr "Úl_timo arquivo"
 
-#: ../src/browser.c:4028 ../src/browser.c:4154
-msgid "Program to run:"
-msgstr "Programa para executar:"
+#: ../data/menus.ui.h:96
+msgid "Home Directory"
+msgstr "Pasta pessoal"
 
-#: ../src/browser.c:4040
-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."
+#: ../data/menus.ui.h:97
+msgid "Default Directory"
+msgstr "Diretório padrão"
 
-#: ../src/browser.c:4134
-msgid "Open Files With"
-msgstr "Abrir arquivos com"
+#: ../data/menus.ui.h:98
+msgid "Set Current Path as Default"
+msgstr "Definir o caminho atual como padrão"
 
-#: ../src/browser.c:4166
-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."
+#: ../data/menus.ui.h:100
+msgid "Browse Subdirectories"
+msgstr "Navegar nos subdiretórios"
 
-#: ../src/cddb.c:313
-msgid "Artist / Album"
-msgstr "Artista / álbum"
+#: ../data/menus.ui.h:101
+msgid "Invert Selection"
+msgstr "Inverter Seleção"
 
-#: ../src/cddb.c:313
-msgid "Category"
-msgstr "Categoria"
+#: ../data/menus.ui.h:102
+msgid "CDDB Search Files…"
+msgstr "Pesquisar no CDDB pelos arquivos…"
 
-#. 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 "Nome da faixa"
+#: ../data/menus.ui.h:103
+msgid "Find…"
+msgstr "Localizar…"
 
-#: ../src/cddb.c:314
-msgid "Duration"
-msgstr "Duração"
+#: ../data/menus.ui.h:104
+msgid "Clear Log"
+msgstr "Limpar log"
 
-#: ../src/cddb.c:326
-msgid "CDDB Search"
-msgstr "Pesquisar no CDDB"
+#: ../data/playlist_dialog.ui.h:3
+msgid "Use directory name"
+msgstr "Usar o nome do diretório"
 
-#.
-#. * 1 - Page for automatic search (generate the CDDBId from files)
-#.
-#: ../src/cddb.c:346
-msgid "Automatic Search"
-msgstr "Pesquisa automática"
+#: ../data/playlist_dialog.ui.h:4
+msgid "Options"
+msgstr "Opções"
 
-#: ../src/cddb.c:356
-msgid "Request CDDB"
-msgstr "Requisitar CDDB"
+#: ../data/playlist_dialog.ui.h:5
+msgid "Include only the selected files"
+msgstr "Incluir apenas os arquivos selecionados"
 
-#: ../src/cddb.c:366
-msgid ""
-"Request automatically the CDDB using the selected files (the order is "
-"important) to generate the CddbID"
-msgstr ""
-"Requisita automaticamente o CDDB usando os arquivos selecionados (a ordem é "
-"importante) para gerar o CddbID"
+#: ../data/playlist_dialog.ui.h:6 ../data/org.gnome.EasyTAG.gschema.xml.h:164
+msgid "Whether to use only the selected files or all files when creating playlists"
+msgstr "Se devem ser usados apenas os arquivos selecionados ou todos os arquivos ao criar listas de reprodução"
 
-#: ../src/cddb.c:377 ../src/cddb.c:457
-msgid "Stop the search"
-msgstr "Parar a pesquisa"
+#: ../data/playlist_dialog.ui.h:7
+msgid "Use full path for files in playlist"
+msgstr "Usar o caminho absoluto para os arquivos na lista de reprodução"
 
-#. Check box to run the scanner
-#: ../src/cddb.c:384
-msgid "Use local CDDB"
-msgstr "Usar o CDDB local"
+#: ../data/playlist_dialog.ui.h:8
+msgid "Use relative path for files in playlist"
+msgstr "Usar o caminho relativo para os arquivos na lista de reprodução"
 
-#: ../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 ""
-"Ao ativar esta opção, após o carregamento dos campos, a verificação "
-"selecionada será executada (a janela do verificador deverá estar aberta)."
+#: ../data/playlist_dialog.ui.h:9
+msgid "Create playlist in the parent directory"
+msgstr "Criar uma lista de reprodução no diretório superior"
 
-#.
-#. * 2 - Page for manual search
-#.
-#: ../src/cddb.c:404
-msgid "Manual Search"
-msgstr "Pesquisa manual"
+#: ../data/playlist_dialog.ui.h:10 ../data/org.gnome.EasyTAG.gschema.xml.h:168
+msgid "Whether to create the playlist in the parent directory"
+msgstr "Se deve ser criada a lista de reprodução no diretório superior"
 
-#: ../src/cddb.c:416
-msgid "Words:"
-msgstr "Palavras:"
+#: ../data/playlist_dialog.ui.h:11
+msgid "Use DOS directory separator"
+msgstr "Usar separador de diretório DOS"
 
-#: ../src/cddb.c:429
-msgid "Enter the words to search (separated by a space or '+')"
-msgstr "Digite as palavras para pesquisar (separadas por um espaço ou \"+\")"
+#: ../data/playlist_dialog.ui.h:12 ../data/org.gnome.EasyTAG.gschema.xml.h:170
+msgid "Whether to use backslash as directory separator when generating playlists"
+msgstr "Se deve ser usado contrabarra como separador de diretórios ao gera listas de reprodução"
 
-#.
-#. * Search options
-#.
-#: ../src/cddb.c:469
-msgid "Search In:"
-msgstr "Pesquisar em:"
-
-#. 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 "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:862 ../src/prefs.c:807
-msgid "Other"
-msgstr "Outro"
+#: ../data/playlist_dialog.ui.h:13
+msgid "Content"
+msgstr "Sumário"
 
-#. 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 "Todas as categorias"
+#: ../data/playlist_dialog.ui.h:14
+msgid "Write only list of files"
+msgstr "Gravar somente a lista dos arquivos"
 
-#. 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"
+#: ../data/playlist_dialog.ui.h:15
+msgid "Write information using filename"
+msgstr "Gravar informações usando o nome do arquivo"
 
-#. 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 "Clássico"
+#: ../data/playlist_dialog.ui.h:16
+msgid "Write information using:"
+msgstr "Gravar informações usando:"
 
-#. 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"
+#: ../data/preferences_dialog.ui.h:1
+msgid "Browser"
+msgstr "Navegador"
 
-#. 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"
+#: ../data/preferences_dialog.ui.h:2
+msgid "Default Directory:"
+msgstr "Diretório padrão:"
 
-#. 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"
+#: ../data/preferences_dialog.ui.h:3 ../data/org.gnome.EasyTAG.gschema.xml.h:4
+msgid "The default path to search for music files"
+msgstr "O caminho padrão para pesquisar por arquivos de música"
 
-#. 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 "Diversas"
+#: ../data/preferences_dialog.ui.h:4
+msgid "Load on startup the default directory or the directory passed as argument"
+msgstr "Carregar na inicialização o diretório padrão ou o diretório passado como argumento"
 
-# Em que pese a tradução "Nova era" ser aceitável, conheço esta categoria apenas como "New age", portanto mantive -- Rafael
-#. 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"
+#: ../data/preferences_dialog.ui.h:5 ../data/org.gnome.EasyTAG.gschema.xml.h:2
+msgid "Whether to load the default path (or the path passed as an argument) on application startup"
+msgstr "Se deve ser carregado o caminho padrão (ou o caminho passado como um argumento) na inicialização de aplicativo"
 
-#. 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"
+#: ../data/preferences_dialog.ui.h:6 ../data/org.gnome.EasyTAG.gschema.xml.h:5
+msgid "Browse subdirectories"
+msgstr "Navegar pelos subdiretórios"
 
-#. 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"
+#: ../data/preferences_dialog.ui.h:7 ../data/org.gnome.EasyTAG.gschema.xml.h:6
+msgid "Whether to search subdirectories for audio files when reading a directory in the browser"
+msgstr "Se devem ser pesquisados os sbudiretórios por arquivos de áudio ao ler um diretório no navegador"
 
-#. 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 "Trilha sonora"
+#: ../data/preferences_dialog.ui.h:8 ../data/org.gnome.EasyTAG.gschema.xml.h:9
+msgid "Expand the subdirectories of the selected directory"
+msgstr "Expandir os subdiretórios do diretório selecionado"
 
-#: ../src/cddb.c:587
-msgid "included: funk, soul, rap, pop, industrial, metal, etc."
-msgstr "incluindo: funk, soul, rap, pop, industrial, metal, etc."
+#: ../data/preferences_dialog.ui.h:9 ../data/org.gnome.EasyTAG.gschema.xml.h:10
+msgid "Whether to expand the subdirectories of a node in the directory browser when selecting it"
+msgstr "Se devem ser expandidos os subdiretórios de um nó no navegador de diretório ao selecioná-lo"
 
-#: ../src/cddb.c:588
-msgid "movies, shows"
-msgstr "filmes, shows"
+#: ../data/preferences_dialog.ui.h:10
+msgid "Search hidden directories"
+msgstr "Pesquisar nos diretórios ocultos"
 
-#: ../src/cddb.c:589
-msgid "others that do not fit in the above categories"
-msgstr "outras que não se enquadrem nas categorias acima"
+#: ../data/preferences_dialog.ui.h:11 ../data/org.gnome.EasyTAG.gschema.xml.h:8
+msgid "Whether to show hidden directories when showing a directory in the browser"
+msgstr "Se devem ser mostrados diretórios ocultos ao mostrar um diretório no navegador"
 
-#. Button to display/hide the categories
-#: ../src/cddb.c:592
-msgid "Categories"
-msgstr "Categorias"
+#: ../data/preferences_dialog.ui.h:12 ../data/org.gnome.EasyTAG.gschema.xml.h:53
+msgid "Sort files case-sensitively"
+msgstr "Ordenar arquivos diferenciando maiúsculo de minúsculo"
 
-#.
-#. * Results command
-#.
-#: ../src/cddb.c:600
-msgid "Results:"
-msgstr "Resultados:"
+#: ../data/preferences_dialog.ui.h:13 ../data/org.gnome.EasyTAG.gschema.xml.h:54
+msgid "Whether file sorting is case-sensitive"
+msgstr "Se a ordem de arquivos diferencia-se entre maiúsculo e minúsculo"
 
-#: ../src/cddb.c:606 ../src/misc.c:1947
-msgid "Search:"
-msgstr "Pesquisar:"
+#: ../data/preferences_dialog.ui.h:15 ../data/org.gnome.EasyTAG.gschema.xml.h:59
+msgid "Show the log"
+msgstr "Mostrar o log"
 
-#: ../src/cddb.c:620
-msgid "Enter the words to search in the list below"
-msgstr "Digite as palavras para pesquisar na lista abaixo"
+#: ../data/preferences_dialog.ui.h:16 ../data/org.gnome.EasyTAG.gschema.xml.h:60
+msgid "Whether to show the log in the main window"
+msgstr "Se deve ser mostrado o log na janela principal"
 
-#: ../src/cddb.c:632
-msgid "Search Next"
-msgstr "Procurar próximo"
+#: ../data/preferences_dialog.ui.h:17
+msgid "Maximum number of lines:"
+msgstr "Número máximo de linhas:"
 
-#: ../src/cddb.c:638
-msgid "Search Previous"
-msgstr "Procurar anterior"
+#: ../data/preferences_dialog.ui.h:18 ../data/org.gnome.EasyTAG.gschema.xml.h:58
+msgid "The maximum number of lines to keep in the log"
+msgstr "O número máximo de linhas para manter no log"
 
-#: ../src/cddb.c:649
-msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
-msgstr ""
-"Mostrar apenas linhas vermelhas (ou mostrar todas as linhas) na lista "
-"\"Artista / álbum\""
+#: ../data/preferences_dialog.ui.h:19
+msgid "General"
+msgstr "Geral"
 
-#: ../src/cddb.c:655
-msgid "Unselect all lines"
-msgstr "Desmarcar todas as linhas"
+#: ../data/preferences_dialog.ui.h:20 ../data/org.gnome.EasyTAG.gschema.xml.h:49
+msgid "Show audio file header summary"
+msgstr "Mostrar resumo de cabeçalho de arquivo de áudio"
 
-#: ../src/cddb.c:661
-msgid "Invert lines selection"
-msgstr "Inverter linhas selecionadas"
+#: ../data/preferences_dialog.ui.h:21 ../data/org.gnome.EasyTAG.gschema.xml.h:50
+msgid "Whether to show header information, such as bit rate and duration, for audio files"
+msgstr "Se deve ser mostrada informação de cabeçalho, tal como taxa de bits e duração, para arquivos de áudio"
 
-#: ../src/cddb.c:670
-msgid "Select all lines"
-msgstr "Selecionar todas as linhas"
+#: ../data/preferences_dialog.ui.h:22
+msgid "Display changed files in list using:"
+msgstr "Exibir os arquivos modificados na lista usando:"
 
-#: ../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 ""
-"Seleciona as linhas para \"aplicar\" na sua lista de arquivos. Todas as "
-"linhas serão processadas se nenhuma linha for selecionada.\n"
-"Você pode ainda reordenar as linhas nessa lista antes de usar o botão "
-"\"aplicar\"."
+#: ../data/preferences_dialog.ui.h:23
+msgid "Red color"
+msgstr "Vermelho"
 
-#.
-#. * Apply results to fields...
-#.
-#: ../src/cddb.c:795
-msgid "Set Into:"
-msgstr "Definir em:"
+#: ../data/preferences_dialog.ui.h:24
+msgid "Bold style"
+msgstr "Negrito"
 
-#: ../src/cddb.c:801
-msgid "All"
-msgstr "Todos"
+#: ../data/preferences_dialog.ui.h:25
+msgid "Interface"
+msgstr "Interface"
 
-#: ../src/cddb.c:808
-msgid "Track #"
-msgstr "Faixa #"
+#: ../data/preferences_dialog.ui.h:26
+msgid "File Settings"
+msgstr "Configurações do arquivo"
 
-#: ../src/cddb.c:809
-msgid "# Tracks"
-msgstr "# faixas"
+#: ../data/preferences_dialog.ui.h:27 ../data/org.gnome.EasyTAG.gschema.xml.h:45
+msgid "Preserve modification time when writing files"
+msgstr "Preservar a data de modificação ao gravar arquivos"
 
-#. Check box to run the scanner
-#: ../src/cddb.c:847 ../src/misc.c:2988
-msgid "Run the current scanner for each file"
-msgstr "Executar a verificação atual para cada arquivo"
+#: ../data/preferences_dialog.ui.h:28 ../data/org.gnome.EasyTAG.gschema.xml.h:46
+msgid "Whether to preserve the existing modification time when editing files"
+msgstr "Se deve ser preservada a data de modificação existente ao editar arquivos"
 
-#. Check box to use DLM (also used in the preferences window)
-#: ../src/cddb.c:854
-msgid "Match lines with the Levenshtein algorithm"
-msgstr "Coincidir linhas com o algoritmo Levenshtein"
+#: ../data/preferences_dialog.ui.h:29 ../data/org.gnome.EasyTAG.gschema.xml.h:47
+msgid "Update parent directory modification time when writing files"
+msgstr "Atualizar a data de modificação do diretório superior ao escrever arquivos"
 
-#. 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:1363
-msgid ""
-"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 ""
-"Ao ativar esta opção, o algoritmo Levenshtein (DLM: Damerau-Levenshtein "
-"Metric) será usado para comparar o título CDDB contra todos os nomes de "
-"arquivos no diretório atual, e para selecionar a melhor coincidência. Isto "
-"será usado ao selecionar o arquivo de áudio correspondente, ou ao aplicar os "
-"resultados CDDB, ao invés de usar diretamente a ordem na lista."
-
-#: ../src/cddb.c:871
-msgid "Load the selected lines or all lines (if no line selected)."
-msgstr ""
-"Carrega as linhas selecionadas ou todas as linhas (se nenhuma linha estiver "
-"selecionada)."
+#: ../data/preferences_dialog.ui.h:30 ../data/org.gnome.EasyTAG.gschema.xml.h:48
+msgid "Whether to update the modification time on the parent directory when editing files"
+msgstr "Se deve ser atualizada a data de modificação em um diretório superior ao editar arquivosarquivo."
 
-#: ../src/cddb.c:881
-msgid "Ready to search"
-msgstr "Pronto para pesquisar"
+#: ../data/preferences_dialog.ui.h:31
+msgid "Filenames"
+msgstr "Nomes do arquivo"
 
-#: ../src/cddb.c:1352
-#, c-format
-msgid ""
-"Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
-msgstr ""
-"Álbum: \"%s\", artista: \"%s\", duração: \"%s\", ano: \"%s\", gênero: \"%s"
-"\", ID: \"%s\""
+#: ../data/preferences_dialog.ui.h:32 ../data/org.gnome.EasyTAG.gschema.xml.h:195
+msgid "Replace illegal characters when renaming"
+msgstr "Substituir caracteres ilegais ao renomear"
 
-#: ../src/cddb.c:1588
-#, c-format
-msgid "Resolving host '%s'…"
-msgstr "Resolvendo host \"%s\"…"
+#: ../data/preferences_dialog.ui.h:33
+msgid "Convert characters which cannot be represented in filenames on the FAT32/16 and Joliet filesystems (‘\\’, ‘:’, ‘;’, ‘*’, ‘?’, ‘\"’, ‘<’, ‘>’, ‘|’)"
+msgstr "Converte caracteres que não podeme ser representados em nomes de arquivos nos sistemas de arquivos Joliet e FAT32/16 (‘\\’, ‘:’, ‘;’, ‘*’, ‘?’, ‘\"’, ‘<’, ‘>’, ‘|’)"
 
-#: ../src/cddb.c:1629
-#, c-format
-msgid "Cannot create a new socket (%s)"
-msgstr "Não foi possível criar um novo socket (%s)"
+#: ../data/preferences_dialog.ui.h:34
+msgid "Convert filename extension to:"
+msgstr "Converter a extensão do arquivo para:"
 
-#: ../src/cddb.c:1643
-msgid "Cannot set options on the newly-created socket"
-msgstr "Não foi possível definir as opções no novo socket criado"
+#: ../data/preferences_dialog.ui.h:35
+msgid "Lower Case"
+msgstr "Minúscula"
 
-#. Open connection to the server.
-#: ../src/cddb.c:1647
-#, c-format
-msgid "Connecting to host '%s', port '%d'…"
-msgstr "Conectando ao host \"%s\", porta \"%d\"…"
+#: ../data/preferences_dialog.ui.h:36
+msgid "For example, the extension will be converted to ‘.mp3’"
+msgstr "Por exemplo, a extensão será convertida para \".mp3\""
 
-#: ../src/cddb.c:1660
-#, c-format
-msgid "Cannot connect to host '%s' (%s)"
-msgstr "Não foi possível conectar ao host \"%s\" (%s)"
+#: ../data/preferences_dialog.ui.h:37
+msgid "Upper Case"
+msgstr "Maiúscula"
 
-#: ../src/cddb.c:1684
-#, c-format
-msgid "Cannot resolve host '%s' (%s)"
-msgstr "Não foi possível resolver host \"%s\" (%s)"
+#: ../data/preferences_dialog.ui.h:38
+msgid "For example, the extension will be converted to ‘.MP3’"
+msgstr "Por exemplo, a extensão será convertida para \".MP3\""
 
-#: ../src/cddb.c:1697
-#, c-format
-msgid "Connected to host '%s'"
-msgstr "Conectado ao host \"%s\""
+#: ../data/preferences_dialog.ui.h:39
+msgid "No Change"
+msgstr "Sem alteração"
 
-#: ../src/cddb.c:1778
-#, c-format
-msgid "Error while writing CDDB results to file '%s'"
-msgstr "Erro ao gravar resultado do CDDB no arquivo \"%s\""
+#: ../data/preferences_dialog.ui.h:40
+msgid "The extension will not be modified"
+msgstr "A extensão não será modificada"
 
-#: ../src/cddb.c:1789
-#, c-format
-msgid "Receiving data (%s)…"
-msgstr "Recebendo dados (%s)…"
+#: ../data/preferences_dialog.ui.h:41
+msgid "Filename Encoding"
+msgstr "Codificação do nome do arquivo"
 
-#: ../src/cddb.c:1801
-#, c-format
-msgid "Error when reading CDDB response (%s)"
-msgstr "Erro ao ler a resposta do CDDB (%s)"
+#: ../data/preferences_dialog.ui.h:42
+msgid "Try another character encoding"
+msgstr "Tentar outra codificação de caracteres"
 
-#: ../src/cddb.c:1808
-#, c-format
-msgid "Cannot create file '%s' (%s)"
-msgstr "Não foi possível criar o arquivo \"%s\" (%s)"
+#: ../data/preferences_dialog.ui.h:43
+msgid "Try to use the encoding associated with your locale and if this fails, try the ISO-8859-1 character encoding"
+msgstr "Tenta usar a codificação associada com sua localização e se isso falhar, tenta a codificação de caracteres ISO-8859-1"
 
-#: ../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)"
+#: ../data/preferences_dialog.ui.h:44
+msgid "Transliterate characters into the system character encoding"
+msgstr "Transliterar caracteres na codificação de caracteres do sistema"
 
-#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
-#. Send the request
-#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
-#. Send the request
-#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
-#. Send the request
-#: ../src/cddb.c:2314 ../src/cddb.c:2643 ../src/cddb.c:3516
-msgid "Sending request…"
-msgstr "Enviando requisição…"
+#: ../data/preferences_dialog.ui.h:45
+msgid "Replace unsupported characters with a similar character from the target character encoding"
+msgstr "Substitui caracteres sem suporte com um caractere similar da codificação de caracteres alvo"
 
-#: ../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 "Não foi possível enviar a requisição (%s)"
+#: ../data/preferences_dialog.ui.h:46
+msgid "Use the system character encoding and silently discard unsupported characters"
+msgstr "Usar a codificação de caracteres do sistema e descartar silenciosamente alguns caracteres sem suporte"
 
-#.
-#. * Read the answer
-#.
-#. Read the answer
-#: ../src/cddb.c:2344 ../src/cddb.c:3230 ../src/cddb.c:3529
-msgid "Receiving data…"
-msgstr "Recebendo dados…"
+#: ../data/preferences_dialog.ui.h:47
+msgid "Discard characters which cannot be represented in the target character encoding"
+msgstr "Descarta caracteres que não podem ser representados na codificação de caracteres alvo, ele será descartado silenciosamente"
 
-#: ../src/cddb.c:2351 ../src/cddb.c:2676 ../src/cddb.c:3237 ../src/cddb.c:3536
-msgid "The server returned a bad response"
-msgstr "O servidor retornou uma resposta incorreta"
+#: ../data/preferences_dialog.ui.h:48
+msgid "Files"
+msgstr "Arquivos"
 
-#: ../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 "O servidor retornou uma resposta incorreta: %s"
+#: ../data/preferences_dialog.ui.h:49
+msgid "Automatically complete date field"
+msgstr "Completar automaticamnete o campo de data"
 
-#: ../src/cddb.c:2512
-#, c-format
-msgid "Sorry, the web-based search is currently not available"
-msgstr "Desculpe, mas a pesquisa na web não está disponível no momento"
+#: ../data/preferences_dialog.ui.h:50 ../data/org.gnome.EasyTAG.gschema.xml.h:94
+msgid "Whether to automatically complete the date tag"
+msgstr "Se deve ser completado automaticamente a etiqueta de data"
 
-#: ../src/cddb.c:2514 ../src/cddb.c:2863
-#, c-format
-msgid "Found one matching album"
-msgid_plural "Found %d matching albums"
-msgstr[0] "Encontrado um álbum coincidente"
-msgstr[1] "Encontrados %d álbuns coincidentes"
+#: ../data/preferences_dialog.ui.h:51 ../data/org.gnome.EasyTAG.gschema.xml.h:99
+msgid "Automatically select the type of the image based on its filename"
+msgstr "Selecionar automaticamente o tipo de imagem baseada em seu nome de arquivo"
 
-#: ../src/cddb.c:2664
-#, c-format
-msgid "Receiving data of page %d (album %d/%d)…"
-msgstr "Recebendo dados da página %d (álbum %d/%d)…"
+#: ../data/preferences_dialog.ui.h:52
+msgid "Whether to, when adding cover art, automatically select a type for an image based on its filename"
+msgstr "Se, ao adicionar arte da capa, deve ser selecionado automaticamente um tipo para uma imagem baseada no seu nome de arquivo"
 
-#: ../src/cddb.c:2666
-#, c-format
-msgid "Receiving data of page %d…"
-msgstr "Recebendo dados da página %d…"
+#: ../data/preferences_dialog.ui.h:53 ../data/org.gnome.EasyTAG.gschema.xml.h:105
+msgid "Preserve the tag field focus"
+msgstr "Preservar o foco do campo de etiqueta"
 
-#: ../src/cddb.c:2830
-#, c-format
-msgid "More results to load…"
-msgstr "Mais resultados para carregar…"
+#: ../data/preferences_dialog.ui.h:54 ../data/org.gnome.EasyTAG.gschema.xml.h:106
+msgid "Whether to preserve focus on the current tag field when switching file"
+msgstr "Se deve ser preservado foco no campo de etiqueta atual ao trocar de arquivo"
 
-#: ../src/cddb.c:2959
-#, c-format
-msgid "No file selected"
-msgstr "Nenhum arquivo selecionado"
+#: ../data/preferences_dialog.ui.h:55
+msgid "Pad the number of digits in the disc field to:"
+msgstr "Preenche a quantidade de dígitos no campo de disco para:"
 
-#. 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 ""
-"Foram selecionados mais de 99 arquivos. Não foi possível enviar a requisição"
+#: ../data/preferences_dialog.ui.h:56 ../data/org.gnome.EasyTAG.gschema.xml.h:96
+msgid "Whether the disc number tag field should be padded with leading zeroes"
+msgstr "Se o campo de etiqueta de número do disco deve ser preenchido com zeros à esquerda"
 
-#: ../src/cddb.c:2973
-#, c-format
-msgid "One file selected"
-msgid_plural "%d files selected"
-msgstr[0] "Um arquivo selecionado"
-msgstr[1] "%d arquivos selecionados"
+#: ../data/preferences_dialog.ui.h:57
+msgid "Pad the number of digits in the track field to:"
+msgstr "Preenche a quantidade de dígitos no campo de trilha para:"
 
-# "Local CD Database" não existe, e sim CDDB local. Portanto, usei o nome correto.
-#: ../src/cddb.c:3056
-msgid "The path for 'Local CD Database' was not defined"
-msgstr "O caminho da \"CDDB local\" não foi defindo"
+#: ../data/preferences_dialog.ui.h:58 ../data/org.gnome.EasyTAG.gschema.xml.h:102
+msgid "Whether the track number tag field should be padded with leading zeroes"
+msgstr "Se o campo de etiqueta de número da faixa deve ser preenchido com zeros à esquerda"
 
-#. 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 "Digite-o na janela de preferências, antes de usar esta pesquisa."
+#: ../data/preferences_dialog.ui.h:59
+msgid "Splitting"
+msgstr "Divisão"
 
-#: ../src/cddb.c:3061
-msgid "Local CD search"
-msgstr "Pesquisa de CD local"
+#: ../data/preferences_dialog.ui.h:60
+msgid "For Vorbis tags, selected fields will be split at dashes and saved as separate tags"
+msgstr "Para etiquetas Vorbis, campos selecionados serão divididos em traços e salvos como etiquetas separadas"
 
-#. 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 "Enviando requisição (CddbId: %s, #faixas: %d, Duração do disco: %d)…"
+#: ../data/preferences_dialog.ui.h:62 ../data/org.gnome.EasyTAG.gschema.xml.h:206
+msgid "Whether to split title fields at a “ - ” separator in Ogg comments"
+msgstr "Se devem ser divididos os campos de título em um separador \" - \" em comentários Ogg"
 
-#: ../src/cddb.c:3363
-#, c-format
-msgid "DiscID '%s' gave one matching album"
-msgid_plural "DiscID '%s' gave %d matching albums"
-msgstr[0] "DiscID \"%s\" retornou um álbum coincidente"
-msgstr[1] "DiscID \"%s\" retornou %d álbuns coincidentes"
+#: ../data/preferences_dialog.ui.h:64 ../data/org.gnome.EasyTAG.gschema.xml.h:208
+msgid "Whether to split artist fields at a “ - ” separator in Ogg comments"
+msgstr "Se devem ser divididos os campos de artista em um separador \" - \" em comentários Ogg"
 
-#: ../src/cddb.c:3460
-#, c-format
-msgid "Can't load file: '%s' (%s)."
-msgstr "Não foi possível carregar o arquivo: \"%s\" (%s)."
+#: ../data/preferences_dialog.ui.h:66 ../data/org.gnome.EasyTAG.gschema.xml.h:210
+msgid "Whether to split album fields at a “ - ” separator in Ogg comments"
+msgstr "Se devem ser divididos os campos de álbum em um separador \" - \" em comentários Ogg"
 
-#. Load the track list of the album
-#: ../src/cddb.c:3759
-msgid "Loading album track list…"
-msgstr "Carregando lista das faixas do álbum…"
+#: ../data/preferences_dialog.ui.h:68 ../data/org.gnome.EasyTAG.gschema.xml.h:212
+msgid "Whether to split genre fields at a “ - ” separator in Ogg comments"
+msgstr "Se devem ser divididos os campos de gênero em um separador \" - \" em comentários Ogg"
 
-#: ../src/cddb.c:3958
-msgid "The number of CDDB results does not match the number of selected files"
-msgstr ""
-"O número de resultados do CDDB não corresponde ao número de arquivos "
-"selecionados"
+#: ../data/preferences_dialog.ui.h:70 ../data/org.gnome.EasyTAG.gschema.xml.h:214
+msgid "Whether to split comment fields at a “ - ” separator in Ogg comments"
+msgstr "Se devem ser divididos os campos de comentário em um separador \" - \" em comentários Ogg"
 
-#: ../src/cddb.c:3962
-msgid "Write Tag from CDDB"
-msgstr "Gravar etiqueta do CDDB"
+#: ../data/preferences_dialog.ui.h:72 ../data/org.gnome.EasyTAG.gschema.xml.h:216
+msgid "Whether to split composer fields at a “ - ” separator in Ogg comments"
+msgstr "Se devem ser divididos os campos de compositor em um separador \" - \" em comentários Ogg"
 
-#: ../src/charset.c:47
-msgid "Arabic (IBM-864)"
-msgstr "Árabe (IBM-864)"
+#: ../data/preferences_dialog.ui.h:73
+msgid "Original artist"
+msgstr "Artista original"
 
-#: ../src/charset.c:48
-msgid "Arabic (ISO-8859-6)"
-msgstr "Árabe (ISO-8859-6)"
+#: ../data/preferences_dialog.ui.h:74 ../data/org.gnome.EasyTAG.gschema.xml.h:218
+msgid "Whether to split original artist fields at a “ - ” separator in Ogg comments"
+msgstr "Se devem ser divididos os campos de artista original em um separador \" - \" em comentários Ogg"
 
-#: ../src/charset.c:49
-msgid "Arabic (Windows-1256)"
-msgstr "Árabe (Windows-1256)"
+#: ../data/preferences_dialog.ui.h:75
+msgid "Tags"
+msgstr "Etiquetas"
 
-#: ../src/charset.c:50
-msgid "Baltic (ISO-8859-13)"
-msgstr "Báltico (ISO-8859-13)"
+#: ../data/preferences_dialog.ui.h:76 ../data/org.gnome.EasyTAG.gschema.xml.h:63
+msgid "Strip ID3 tags if all ID3 tags are empty"
+msgstr "Remover etiquetas ID3 se todos os campos estiverem vazios"
 
-#: ../src/charset.c:51
-msgid "Baltic (ISO-8859-4)"
-msgstr "Báltico (ISO-8859-4)"
+#: ../data/preferences_dialog.ui.h:77 ../data/org.gnome.EasyTAG.gschema.xml.h:64
+msgid "Whether to remove the ID3 tag from the audio file if all the individual tag fields are empty"
+msgstr "Se deve ser removida a etiqueta ID3 do arquivo de áudio se todos os campos de etiqueta individual estiverem vazios"
 
-#: ../src/charset.c:52
-msgid "Baltic (Windows-1257)"
-msgstr "Báltico (Windows-1257)"
+#: ../data/preferences_dialog.ui.h:78
+msgid "Non-standard encoding for reading ID3 tags:"
+msgstr "Codificação não-padrão para a leitura das etiquetas ID3:"
 
-#: ../src/charset.c:53
-msgid "Celtic (ISO-8859-14)"
-msgstr "Céltico (ISO-8859-14)"
+#: ../data/preferences_dialog.ui.h:79 ../data/org.gnome.EasyTAG.gschema.xml.h:62
+msgid "Whether to use a non-standard character encoding when reading ID3 tags"
+msgstr "Se deve ser usado uma codificação de caracteres não-padrão ao ler etiquetas ID3"
 
-#: ../src/charset.c:54
-msgid "Central European (IBM-852)"
-msgstr "Europeu Central (IBM-852)"
+#: ../data/preferences_dialog.ui.h:80 ../data/org.gnome.EasyTAG.gschema.xml.h:72
+msgid "Choose the character set to be used when reading ID3v1 and ID3v2 tags"
+msgstr "Escolha a codificação de caracteres a ser usada para a leitura das etiquetas ID3v1 e ID3v2"
 
-#: ../src/charset.c:55
-msgid "Central European (ISO-8859-2)"
-msgstr "Europeu Central (ISO-8859-2)"
+#: ../data/preferences_dialog.ui.h:81
+msgid "ID3v2"
+msgstr "ID3v2"
 
-#: ../src/charset.c:56
-msgid "Central European (Windows-1250)"
-msgstr "Europeu Central (Windows-1250)"
+#: ../data/preferences_dialog.ui.h:82
+msgid "Write ID3v2 tag"
+msgstr "Gravar etiqueta ID3v2"
 
-#: ../src/charset.c:57
-msgid "Chinese Simplified (GB18030)"
-msgstr "Chinês Simplificado (GB18030)"
+#: ../data/preferences_dialog.ui.h:83 ../data/org.gnome.EasyTAG.gschema.xml.h:74
+msgid "Whether to write ID3v2 tags when writing ID3 tags into audio files"
+msgstr "Se devem ser gravadas etiquetas ID3v2 ao escrever etiquetas ID3 nos arquivos de áudio"
 
-#: ../src/charset.c:58
-msgid "Chinese Simplified (GB2312)"
-msgstr "Chinês Simplificado (GB2312)"
+#: ../data/preferences_dialog.ui.h:84
+msgid "Version:"
+msgstr "Versão:"
 
-#: ../src/charset.c:59
-msgid "Chinese Traditional (Big5)"
-msgstr "Chinês Tradicional (Big5)"
+#: ../data/preferences_dialog.ui.h:85
+msgid ""
+"Select the ID3v2 tag version to write:\n"
+" • ID3v2.3 is written using id3lib,\n"
+" • ID3v2.4 is written using libid3tag (recommended)"
+msgstr ""
+"Selecione a etiqueta ID3v2 que será gravada:\n"
+"- ID3v2.3 será gravada usando o id3lib,\n"
+"- ID3v2.4 será gravada usando o libid3tag (recomendado)."
 
-#: ../src/charset.c:60
-msgid "Chinese Traditional (Big5-HKSCS)"
-msgstr "Chinês Tradicional (Big5-HKSCS)"
+#: ../data/preferences_dialog.ui.h:88
+msgid "Character encoding:"
+msgstr "Codificação de caracteres:"
 
-#: ../src/charset.c:61
-msgid "Cyrillic (IBM-855)"
-msgstr "Cirílico (IBM-855)"
+#: ../data/preferences_dialog.ui.h:89
+msgid "Unicode"
+msgstr "Unicode"
 
-#: ../src/charset.c:62
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cirílico (ISO-8859-5)"
+#: ../data/preferences_dialog.ui.h:90
+msgid "Choose the Unicode character encoding to be used when writing ID3v2 tags"
+msgstr "Escolha a codificação de caracteres Unicode a ser usada ao escrever etiquetas ID3v2"
 
-#: ../src/charset.c:63
-msgid "Cyrillic (ISO-IR-111)"
-msgstr "Cirílico (ISO-IR-111)"
+#: ../data/preferences_dialog.ui.h:92
+msgid "Override the standard Unicode character encoding to be used when writing ID3v2 tags"
+msgstr "Sobrescreve a codificação de caracteres Unicode padrão a ser usada ao gravar etiquetas ID3v2"
 
-#: ../src/charset.c:64
-msgid "Cyrillic (KOI8-R)"
-msgstr "Cirílico (KOI8-R)"
+#: ../data/preferences_dialog.ui.h:93
+msgid "When encoding conversion fails:"
+msgstr "Ao falhar a codificação de caracteres:"
 
-#: ../src/charset.c:65
-msgid "Cyrillic (Windows-1251)"
-msgstr "Cirílico (Windows-1251)"
+#: ../data/preferences_dialog.ui.h:94
+msgid "Report error"
+msgstr "Relatar erro"
 
-#: ../src/charset.c:66
-msgid "Cyrillic/Russian (CP-866)"
-msgstr "Cirílico/Russo (CP-866)"
+#: ../data/preferences_dialog.ui.h:95
+msgid "Display an error message when a character cannot be represented in the target character encoding and keep the original character"
+msgstr "Exibe uma mensagem de erro quando um caractere não pode ser representado na codificação de caracteres alvo e mantém o caractere original"
 
-#: ../src/charset.c:67
-msgid "Cyrillic/Ukrainian (KOI8-U)"
-msgstr "Cirílico/Ucraniano (KOI8-U)"
+#: ../data/preferences_dialog.ui.h:96
+msgid "Transliterate"
+msgstr "Transliterar"
 
-#: ../src/charset.c:68
-msgid "English (US-ASCII)"
-msgstr "Inglês (US-ASCII)"
+#: ../data/preferences_dialog.ui.h:97
+msgid "Discard"
+msgstr "Descartar"
 
-#: ../src/charset.c:69
-msgid "Greek (ISO-8859-7)"
-msgstr "Grego (ISO-8859-7)"
+#: ../data/preferences_dialog.ui.h:98
+msgid "Automatically convert old ID3v2 tag versions"
+msgstr "Converter automaticamente versões antigas de etiquetas ID3v2"
 
-#: ../src/charset.c:70
-msgid "Greek (Windows-1253)"
-msgstr "Grego (Windows-1253)"
+#: ../data/preferences_dialog.ui.h:99 ../data/org.gnome.EasyTAG.gschema.xml.h:78
+msgid "Whether to convert ID3 tags written against old version of the specification, such as ID3v2.2, to newer ones, such as ID3v2.3 or ID3v2.4"
+msgstr "Se devem ser convertidas etiquetas ID3 escritas contra versão antigo da especificação, tal como ID3v2.2, para mais novas, tal como ID3v2.3 ou ID3v2.4"
 
-#: ../src/charset.c:71
-msgid "Hebrew (IBM-862)"
-msgstr "Hebraico (IBM-862)"
+#: ../data/preferences_dialog.ui.h:100
+msgid "Use CRC-32"
+msgstr "Usar CRC-32"
 
-#: ../src/charset.c:72
-msgid "Hebrew (Windows-1255)"
-msgstr "Hebraico (Windows-1255)"
+#: ../data/preferences_dialog.ui.h:101 ../data/org.gnome.EasyTAG.gschema.xml.h:82
+msgid "Whether to embed a CRC-32 checksum of the audio file data in ID3v2 tags"
+msgstr "Se deve ser embutida a verificação de integridade CRC-32 do arquivo de áudio nas etiquetas ID3v2"
 
-#: ../src/charset.c:73
-msgid "Japanese (EUC-JP)"
-msgstr "Japonês (EUC-JP)"
+#: ../data/preferences_dialog.ui.h:102 ../data/org.gnome.EasyTAG.gschema.xml.h:79
+msgid "Compress data in ID3v2 tags"
+msgstr "Comprimir dados nas etiquetas ID3v2"
 
-#: ../src/charset.c:74
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japonês (ISO-2022-JP)"
+#: ../data/preferences_dialog.ui.h:103 ../data/org.gnome.EasyTAG.gschema.xml.h:80
+msgid "Whether to compress data in ID3v2 tags"
+msgstr "Se devem ser comprimidos os dados nas etiquetas ID3v2"
 
-#: ../src/charset.c:75
-msgid "Japanese (Shift_JIS)"
-msgstr "Japonês (Shift_JIS)"
+#: ../data/preferences_dialog.ui.h:104 ../data/org.gnome.EasyTAG.gschema.xml.h:83
+msgid "Use text-only genre in ID3v2 tags"
+msgstr "Usar gênero no formato de texto em etiquetas ID3v2"
 
-#: ../src/charset.c:76
-msgid "Korean (EUC-KR)"
-msgstr "Coreano (EUC-KR)"
+#: ../data/preferences_dialog.ui.h:105 ../data/org.gnome.EasyTAG.gschema.xml.h:84
+msgid "Whether to use only a string, and not the integer-base ID3v1 genre field, when writing a genre field to ID3v2 tags"
+msgstr "Se deve ser usado apenas uma string, e não o campo de gênero ID3v1 baseado em inteiro, ao escrever um campo de gênero para etiquetas ID3v2"
 
-#: ../src/charset.c:77
-msgid "Nordic (ISO-8859-10)"
-msgstr "Nórdico (ISO-8859-10)"
+#: ../data/preferences_dialog.ui.h:106
+msgid "ID3v1"
+msgstr "ID3v1"
 
-#: ../src/charset.c:78
-msgid "South European (ISO-8859-3)"
-msgstr "Sul Europeu (ISO-8859-3)"
+#: ../data/preferences_dialog.ui.h:107
+msgid "Write ID3v1 tag"
+msgstr "Gravar etiqueta ID3v1"
 
-#: ../src/charset.c:79
-msgid "Thai (TIS-620)"
-msgstr "Tailandês (TIS-620)"
+#: ../data/preferences_dialog.ui.h:108 ../data/org.gnome.EasyTAG.gschema.xml.h:66
+msgid "Whether to write ID3v1 tags when writing ID3 tags into audio files"
+msgstr "Se devem ser gravadas etiquetas ID3v1 ao escrever etiquetas ID3 em arquivos de áudio"
 
-#: ../src/charset.c:80
-msgid "Turkish (IBM-857)"
-msgstr "Turco (IBM-857)"
+#: ../data/preferences_dialog.ui.h:109
+msgid "Choose the character set to be used when writing ID3v1 tag"
+msgstr "Escolha a codificação de caracteres para a gravação das etiquetas ID3"
 
-#: ../src/charset.c:81
-msgid "Turkish (ISO-8859-9)"
-msgstr "Turco (ISO-8859-9)"
+#: ../data/preferences_dialog.ui.h:110
+msgid "ID3 Tags"
+msgstr "Etiqueta ID3"
 
-#: ../src/charset.c:82
-msgid "Turkish (Windows-1254)"
-msgstr "Turco (Windows-1254)"
+#: ../data/preferences_dialog.ui.h:111
+msgid "Character Conversion"
+msgstr "Conversão de caracteres"
 
-#. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
-#: ../src/charset.c:84
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
+#: ../data/preferences_dialog.ui.h:112
+msgid "Fill Tag Scanner"
+msgstr "Verificador de preenchimento de etiqueta"
 
-#. {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:91
-msgid "Vietnamese (VISCII)"
-msgstr "Vietnamita (VISCII)"
+#: ../data/preferences_dialog.ui.h:114
+#, no-c-format
+msgid "Convert underscores and ‘%20’ to spaces"
+msgstr "Converter sublinhados e \"%20\" para espaços"
 
-#: ../src/charset.c:92
-msgid "Vietnamese (Windows-1258)"
-msgstr "Vietnamita (Windows-1258)"
+#: ../data/preferences_dialog.ui.h:116
+#, no-c-format
+msgid "Convert spaces and ‘%20’ to underscores"
+msgstr "Converter espaços e \"%20\" para sublinhados"
 
-#: ../src/charset.c:93
-msgid "Visual Hebrew (ISO-8859-8)"
-msgstr "Hebraico Visual (ISO-8859-8)"
+#: ../data/preferences_dialog.ui.h:117
+msgid "No conversion"
+msgstr "Nenhuma conversão"
 
-#: ../src/charset.c:94
-msgid "Western (IBM-850)"
-msgstr "Ocidental (IBM-850)"
+#: ../data/preferences_dialog.ui.h:118
+msgid "Rename File and Directory Scanner"
+msgstr "Verificador de renomeação de arquivos e diretório"
 
-#: ../src/charset.c:95
-msgid "Western (ISO-8859-1)"
-msgstr "Ocidental (ISO-8859-1)"
+#: ../data/preferences_dialog.ui.h:119
+msgid "Process Fields Scanner"
+msgstr "Verificador de processamento de campos"
 
-#: ../src/charset.c:96
-msgid "Western (ISO-8859-15)"
-msgstr "Ocidental (ISO-8859-15)"
+#: ../data/preferences_dialog.ui.h:120
+msgid "Upper-case the first letters of all words"
+msgstr "Converte para maiúscula a primeira letra de todas as palavras"
 
-#: ../src/charset.c:97
-msgid "Western (Windows-1252)"
-msgstr "Ocidental (Windows-1252)"
+#: ../data/preferences_dialog.ui.h:121 ../data/org.gnome.EasyTAG.gschema.xml.h:150
+msgid "Whether to upper-case the first letter of all words, including prepositions and other short words such as “feat.”, when processing tag fields"
+msgstr "Se deve ser convertida para maiúsculo a primeira letra de todas as palavras, incluindo preposições e outras palavras curtas, como \"feat.\", ao processar campos de etiqueta"
 
-#: ../src/charset.c:511
-#, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
-msgstr "O nome de arquivo \"%s\" não pôde ser convertido em UTF-8 (%s)."
+#: ../data/preferences_dialog.ui.h:122
+msgid "Fields"
+msgstr "Campos"
 
-#: ../src/charset.c:512 ../src/charset.c:611 ../src/charset.c:674
-msgid "Invalid UTF-8"
-msgstr "UTF-8 inválido"
+#: ../data/preferences_dialog.ui.h:123
+msgid "Overwrite fields when scanning tags"
+msgstr "Sobrescrever campos ao verificar as etiquetas"
 
-#: ../src/charset.c:610
-#, c-format
-msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
-msgstr ""
-"O texto em UTF-8 \"%s\" não pôde ser convertido na codificação do nome de "
-"arquivo (%s)."
+#: ../data/preferences_dialog.ui.h:124 ../data/org.gnome.EasyTAG.gschema.xml.h:111
+msgid "Whether to overwrite the tag field values when filling tags. Otherwise, only blank tag fields will be filled"
+msgstr "Se devem ser sobrescritos os valores de campo de etiqueta ao preencher etiquetas. Do contrário, apenas campos vazios serão preenchidos"
 
-#: ../src/charset.c:673
-#, c-format
-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)."
+#: ../data/preferences_dialog.ui.h:125
+msgid "Set this text as default comment:"
+msgstr "Definir esse texto como o comentário padrão:"
 
-#. Starting messages
-#: ../src/easytag.c:185
-#, c-format
-msgid "Starting EasyTAG version %s (PID: %d)…"
-msgstr "Inicializando EasyTAG versão %s (PID: %d)…"
+#: ../data/preferences_dialog.ui.h:126 ../data/org.gnome.EasyTAG.gschema.xml.h:113
+msgid "Whether to set the comment tag field to the provided default value when filling tags"
+msgstr "Se deve ser definido o campo de etiqueta de comentário para o valor padrão fornecido ao preencher etiquetas"
 
-#: ../src/easytag.c:187
-#, c-format
-msgid "Using libid3tag version %s"
-msgstr "Usando libid3tag versão %s"
+#: ../data/preferences_dialog.ui.h:127
+msgid "Use CRC-32 as the default comment (for files with ID3 tags only)"
+msgstr "Usar CRC-32 como o comentário padrão (para arquivos com apenas etiquetas ID3)."
 
-#: ../src/easytag.c:190
-#, c-format
-msgid "Using id3lib version %d.%d.%d"
-msgstr "Usando id3lib versão %d.%d.%d"
+#: ../data/preferences_dialog.ui.h:128 ../data/org.gnome.EasyTAG.gschema.xml.h:117
+msgid "Whether to use the CRC-32 of the audio file data as the default comment, for files with ID3 tags only"
+msgstr "Se deve ser usado o CRC-32 de dados de arquivo de áudio como o comentário padrão, para arquivos com apenas etiquetas ID3"
 
-#: ../src/easytag.c:196
-#, c-format
-msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
-msgstr "Variável EASYTAGLANG definida. Configurando a localização: \"%s\""
+#: ../data/preferences_dialog.ui.h:129
+msgid "Scanner"
+msgstr "Verificador"
 
-#: ../src/easytag.c:198
-#, c-format
-msgid "Setting locale: '%s'"
-msgstr "Configurando a localização: \"%s\""
+#: ../data/preferences_dialog.ui.h:130
+msgid "Automatic Search Servers"
+msgstr "Servidores de pesquisa automática"
 
-#: ../src/easytag.c:203
-#, c-format
-msgid "Currently using locale '%s' (and eventually '%s')"
-msgstr "Usando atualmente a localização \"%s\" (e eventualmente \"%s\")"
+#: ../data/preferences_dialog.ui.h:131
+msgid "Host:"
+msgstr "Máquina:"
 
-#: ../src/easytag.c:210
-msgid "Unable to create setting directories"
-msgstr "Não foi possível criar os diretórios de configuração"
+#: ../data/preferences_dialog.ui.h:132
+msgid "Port:"
+msgstr "Porta:"
 
-#: ../src/easytag.c:427 ../src/et_core.c:638 ../src/et_core.c:650
-#, c-format
-msgid "Error while querying information for file: '%s' (%s)"
-msgstr "Erro ao consultar informação de arquivo: \"%s\" (%s)"
+#: ../data/preferences_dialog.ui.h:133
+msgid "CGI Path:"
+msgstr "Caminho CGI:"
 
-#: ../src/easytag.c:490
-#, c-format
-msgid "Cannot open path '%s'"
-msgstr "Não foi possível abrir o caminho \"%s\""
+#: ../data/preferences_dialog.ui.h:134
+msgid "Manual Search Server"
+msgstr "Servidor de pesquisa manual"
 
-#.
-#. * Browser
-#.
-#: ../src/easytag.c:583 ../src/prefs.c:142
-msgid "Browser"
-msgstr "Navegador"
+#: ../data/preferences_dialog.ui.h:135
+msgid "Proxy"
+msgstr "Proxy"
 
-#: ../src/easytag.c:605 ../src/et_core.c:2858
-msgid "File"
-msgstr "Arquivo"
+#: ../data/preferences_dialog.ui.h:136
+msgid "Use a proxy server"
+msgstr "Usar um servidor proxy"
 
-#. Default values are MPs data
-#. 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:637 ../src/easytag.c:4226 ../src/flac_header.c:201
-#: ../src/monkeyaudio_header.c:96 ../src/musepack_header.c:98
-#: ../src/ogg_header.c:389 ../src/opus_header.c:221 ../src/wavpack_header.c:72
-#, c-format
-msgid "Encoder:"
-msgstr "Codificador:"
+#: ../data/preferences_dialog.ui.h:137 ../data/org.gnome.EasyTAG.gschema.xml.h:28
+msgid "Whether to access remote CDDB through a proxy"
+msgstr "Se deve ser acessado o CDDB remoto por um proxy"
 
-#: ../src/easytag.c:645
-msgid "Bitrate:"
-msgstr "Taxa de bits:"
+#: ../data/preferences_dialog.ui.h:138 ../data/org.gnome.EasyTAG.gschema.xml.h:30
+msgid "Hostname for a proxy to access remote CDDB"
+msgstr "Nome de máquina de um proxy para acessar o CDDB remoto"
 
-#. Translators: Please try to keep this string as short as possible as it
-#. * is shown in a narrow column.
-#: ../src/easytag.c:655
-msgid "Frequency:"
-msgstr "Frequência:"
+#: ../data/preferences_dialog.ui.h:139 ../data/org.gnome.EasyTAG.gschema.xml.h:32
+msgid "Port for a proxy to access remote CDDB"
+msgstr "Porta de um proxy para acessar o CDDB remoto"
 
-#. Mode
-#: ../src/easytag.c:666 ../src/easytag.c:4230 ../src/mpeg_header.c:216
-msgid "Mode:"
-msgstr "Modo:"
+#: ../data/preferences_dialog.ui.h:140
+msgid "User:"
+msgstr "Usuário:"
 
-#: ../src/easytag.c:673
-msgid "Size:"
-msgstr "Tamanho:"
+#: ../data/preferences_dialog.ui.h:141 ../data/org.gnome.EasyTAG.gschema.xml.h:34
+msgid "Username for a proxy to access remote CDDB"
+msgstr "Nome de usuário de um proxy para acessar o CDDB remoto"
 
-#: ../src/easytag.c:680
-msgid "Duration:"
-msgstr "Duração:"
+#: ../data/preferences_dialog.ui.h:142
+msgid "Password:"
+msgstr "Senha:"
 
-#. Main Frame
-#: ../src/easytag.c:726 ../src/et_core.c:2788
+#: ../data/preferences_dialog.ui.h:143 ../data/org.gnome.EasyTAG.gschema.xml.h:36
+msgid "Password for a proxy to access remote CDDB"
+msgstr "Senha de um proxy para acessar o CDDB remoto"
+
+#: ../data/preferences_dialog.ui.h:144
+msgid "Results List"
+msgstr "Lista de resultados"
+
+#: ../data/preferences_dialog.ui.h:145
+msgid "Select corresponding file (according to position or DLM if activated below)"
+msgstr "Selecionar o arquivo correspondente (de acordo com a posição ou com o DLM, se ativado abaixo)"
+
+#: ../data/preferences_dialog.ui.h:146 ../data/org.gnome.EasyTAG.gschema.xml.h:26
+msgid "Whether to select the file in the file list which matches the position in the CDDB results list"
+msgstr "Se deve ser selecionado o arquivo na lista de arquivos que correspondem à posição na lista de resultado do CDDB"
+
+#: ../data/preferences_dialog.ui.h:147
+msgid "Use the Levenshtein algorithm (DLM) to match results (using title) with audio files (using filename)"
+msgstr "Usar o algoritmo Levenshtein (DLM) para coincidir resultados (usando o título) com os arquivos de áudio (usando o nome do arquivo)"
+
+#: ../data/preferences_dialog.ui.h:149
+msgid "CDDB"
+msgstr "CDDB"
+
+#: ../data/preferences_dialog.ui.h:150
+msgid "Confirmation"
+msgstr "Confirmação"
+
+#: ../data/preferences_dialog.ui.h:151 ../data/org.gnome.EasyTAG.gschema.xml.h:118
+msgid "Confirm before quitting the application"
+msgstr "Confirmar antes de sair do aplicativo"
+
+#: ../data/preferences_dialog.ui.h:152 ../data/org.gnome.EasyTAG.gschema.xml.h:119
+msgid "Whether to ask for confirmation from the user before quitting the application"
+msgstr "Se deve ser solicitada confirmação para o usuário antes de sair do aplicativo"
+
+#: ../data/preferences_dialog.ui.h:153 ../data/org.gnome.EasyTAG.gschema.xml.h:120
+msgid "Confirm before writing tags"
+msgstr "Confirmar antes de gravar etiquetas"
+
+#: ../data/preferences_dialog.ui.h:154 ../data/org.gnome.EasyTAG.gschema.xml.h:121
+msgid "Whether to ask for confirmation from the user before writing tags to audio files"
+msgstr "Se deve ser solicitada confirmação para o usuário antes de escrever etiquetas em arquivos de áudio"
+
+#: ../data/preferences_dialog.ui.h:155 ../data/org.gnome.EasyTAG.gschema.xml.h:122
+msgid "Confirm before renaming a file"
+msgstr "Confirmar antes de renomear um arquivo"
+
+#: ../data/preferences_dialog.ui.h:156 ../data/org.gnome.EasyTAG.gschema.xml.h:123
+msgid "Whether to ask for confirmation from the user before renaming a file"
+msgstr "Se deve ser solicitada configuração para o usuário antes de renomear um arquivo"
+
+#: ../data/preferences_dialog.ui.h:157 ../data/org.gnome.EasyTAG.gschema.xml.h:126
+msgid "Confirm before deleting a file"
+msgstr "Confirmar antes de excluir um arquivo"
+
+#: ../data/preferences_dialog.ui.h:158 ../data/org.gnome.EasyTAG.gschema.xml.h:127
+msgid "Whether to ask for confirmation from the user before deleting a file"
+msgstr "Se deve ser solicitada confirmação para o usuário antes de excluir um arquivo"
+
+#: ../data/preferences_dialog.ui.h:159 ../data/org.gnome.EasyTAG.gschema.xml.h:124
+msgid "Confirm before writing a playlist"
+msgstr "Confirmar antes de gravar uma lista de reprodução"
+
+#: ../data/preferences_dialog.ui.h:160 ../data/org.gnome.EasyTAG.gschema.xml.h:125
+msgid "Whether to ask for confirmation from the user before writing a playlist"
+msgstr "Se deve ser solicitada confirmação para o usuário antes de escrever uma lista de reprodução"
+
+#: ../data/preferences_dialog.ui.h:161 ../data/org.gnome.EasyTAG.gschema.xml.h:128
+msgid "Confirm before losing unsaved changes to files"
+msgstr "Confirmar antes de perder alterações não salvas de arquivos"
+
+#: ../data/preferences_dialog.ui.h:162 ../data/org.gnome.EasyTAG.gschema.xml.h:129
+msgid "Whether to ask for confirmation from the user before performing an operation that would lose unsaved changes on files"
+msgstr "Se deve ser solicitada confirmação para o usuário antes de realizar uma operação que resultaria na perda de alterações não salvas em arquivos"
+
+#: ../data/preferences_dialog.ui.h:163
+msgid "Scanner Dialog"
+msgstr "Diálogo do verificador"
+
+#: ../data/preferences_dialog.ui.h:164
+msgid "Show the scanner dialog on startup"
+msgstr "Abrir o diálogo do verificador na inicialização"
+
+#: ../data/preferences_dialog.ui.h:165 ../data/org.gnome.EasyTAG.gschema.xml.h:202
+msgid "Whether to show the scanner window on application startup"
+msgstr "Se deve ser exibida a janela do verificador na inicialização do aplicativo"
+
+#: ../data/preferences_dialog.ui.h:166
+msgid "Application"
+msgstr "Aplicativo"
+
+#: ../data/scan_dialog.ui.h:1
+msgid "Select or type in a mask using codes (see Legend) to parse filename and directory. Used to fill in tag fields"
+msgstr "Selecione ou digite na máscara usando códigos (veja a legenda) para analisar o nome do arquivo e o diretório. Usado para preencher campos das etiquetas"
+
+#: ../data/scan_dialog.ui.h:2
+msgid "Fill tag preview"
+msgstr "Visualização do preenchimento da etiqueta"
+
+#: ../data/scan_dialog.ui.h:3
+msgid "Mask Editor"
+msgstr "Editor de máscara"
+
+#: ../data/scan_dialog.ui.h:4
+msgid "Create a new mask"
+msgstr "Criar uma nova máscara"
+
+#: ../data/scan_dialog.ui.h:5
+msgid "Move the selected mask up"
+msgstr "Mover a linha selecionada para cima"
+
+#: ../data/scan_dialog.ui.h:6
+msgid "Move the selected mask down"
+msgstr "Mover a linha selecionada para cima"
+
+#: ../data/scan_dialog.ui.h:7
+msgid "Duplicate the selected mask"
+msgstr "Duplicar a máscara selecionada"
+
+#: ../data/scan_dialog.ui.h:8
+msgid "Add default masks"
+msgstr "Adicionar máscaras padrão"
+
+#: ../data/scan_dialog.ui.h:9
+msgid "Remove the selected mask"
+msgstr "Remover a máscara selecionada"
+
+#: ../data/scan_dialog.ui.h:10
+msgid "Save masks"
+msgstr "Salvar máscaras"
+
+#: ../data/scan_dialog.ui.h:11
+msgid "Legend"
+msgstr "Legenda"
+
+#: ../data/scan_dialog.ui.h:13
+#, no-c-format
+msgid "%a: artist"
+msgstr "%a: artista"
+
+#: ../data/scan_dialog.ui.h:15
+#, no-c-format
+msgid "%a: album artist"
+msgstr "%a: artista do álbum"
+
+#: ../data/scan_dialog.ui.h:17
+#, no-c-format
+msgid "%b: album"
+msgstr "%b: álbum"
+
+#: ../data/scan_dialog.ui.h:19
+#, no-c-format
+msgid "%c: comment"
+msgstr "%c: comentário"
+
+#: ../data/scan_dialog.ui.h:21
+#, no-c-format
+msgid "%p: composer"
+msgstr "%p: compositor"
+
+#: ../data/scan_dialog.ui.h:23
+#, no-c-format
+msgid "%r: copyright"
+msgstr "%r: copyright"
+
+#: ../data/scan_dialog.ui.h:25
+#, no-c-format
+msgid "%d: disc number"
+msgstr "%d: número do disco"
+
+#: ../data/scan_dialog.ui.h:27
+#, no-c-format
+msgid "%e: encoded by"
+msgstr "%e: codificado por"
+
+#: ../data/scan_dialog.ui.h:29
+#, no-c-format
+msgid "%g: genre"
+msgstr "%g: gênero"
+
+#: ../data/scan_dialog.ui.h:31
+#, no-c-format
+msgid "%i: ignored"
+msgstr "%i: ignorado"
+
+#: ../data/scan_dialog.ui.h:33
+#, no-c-format
+msgid "%l: number of tracks"
+msgstr "%l: número de faixas"
+
+#: ../data/scan_dialog.ui.h:35
+#, no-c-format
+msgid "%o: original artist"
+msgstr "%o: artista original"
+
+#: ../data/scan_dialog.ui.h:37
+#, no-c-format
+msgid "%n: track"
+msgstr "%n: faixa"
+
+#: ../data/scan_dialog.ui.h:39
+#, no-c-format
+msgid "%t: title"
+msgstr "%t: título"
+
+#: ../data/scan_dialog.ui.h:41
+#, no-c-format
+msgid "%u: URL"
+msgstr "%u: URL"
+
+#: ../data/scan_dialog.ui.h:43
+#, no-c-format
+msgid "%x: number of discs"
+msgstr "%x: número de discos"
+
+#: ../data/scan_dialog.ui.h:45
+#, no-c-format
+msgid "%y: year"
+msgstr "%y: ano"
+
+#: ../data/scan_dialog.ui.h:46
+msgid "Fill Tag"
+msgstr "Preencher etiqueta"
+
+#: ../data/scan_dialog.ui.h:47
+msgid "Prefix mask with current directory"
+msgstr "Prefixa a máscara no diretório atual"
+
+#: ../data/scan_dialog.ui.h:48
+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 is an absolute path, otherwise is relative to the old path"
+msgstr ""
+"Selecione ou digite em uma máscara usando códigos (veja a legenda) para analisar os campos das etiquetas. Usado para renomear o arquivo.\n"
+"        Use \"/\" para criar diretórios. Se o primeiro caractere for \"/\", o caminho é absoluto, caso contrário é relativo ao caminho anterior"
+
+#: ../data/scan_dialog.ui.h:50
+msgid "Rename file preview"
+msgstr "Visualização da renomeação do arquivo"
+
+#. Only filename changed
+#: ../data/scan_dialog.ui.h:51 ../src/easytag.c:574
+msgid "Rename File"
+msgstr "Renomear arquivo"
+
+#: ../data/scan_dialog.ui.h:52
+msgid "Tag Fields"
+msgstr "Campos de etiquetas"
+
+#: ../data/scan_dialog.ui.h:54
+msgid "Process filename"
+msgstr "Processar o nome do arquivo"
+
+#: ../data/scan_dialog.ui.h:56
+msgid "Process title field"
+msgstr "Processar o campo do título"
+
+#: ../data/scan_dialog.ui.h:58
+msgid "Process artist field"
+msgstr "Processar o campo do artista"
+
+#: ../data/scan_dialog.ui.h:61
+msgid "Process album field"
+msgstr "Processar o campo do álbum"
+
+#: ../data/scan_dialog.ui.h:63
+msgid "Process genre field"
+msgstr "Processar o campo do gênero"
+
+#: ../data/scan_dialog.ui.h:65
+msgid "Process comment field"
+msgstr "Processar o campo do comentário"
+
+#: ../data/scan_dialog.ui.h:67
+msgid "Process composer field"
+msgstr "Processar o campo do compositor"
+
+#: ../data/scan_dialog.ui.h:68
+msgid "Orig. Artist"
+msgstr "Artista orig."
+
+#: ../data/scan_dialog.ui.h:69
+msgid "Process original artist field"
+msgstr "Processar o campo do artista original"
+
+#: ../data/scan_dialog.ui.h:71
+msgid "Process copyright field"
+msgstr "Processar o campo de copyright"
+
+#: ../data/scan_dialog.ui.h:73
+msgid "Process URL field"
+msgstr "Processar o campo da URL"
+
+#: ../data/scan_dialog.ui.h:75
+msgid "Process encoded-by field"
+msgstr "Processar o campo do nome do codificador"
+
+#: ../data/scan_dialog.ui.h:76
+msgid "Capitalization"
+msgstr "Maiúsculo"
+
+# Caixa alta?
+#: ../data/scan_dialog.ui.h:77
+msgid "Capitalize all"
+msgstr "Tudo em maiúsculo"
+
+#: ../data/scan_dialog.ui.h:78 ../data/org.gnome.EasyTAG.gschema.xml.h:144
+msgid "Whether to upper-case all characters of the tag when processing tag fields"
+msgstr "Se devem ser convertidos para caracteres maiúsculos todos os caracteres da etiqueta ao processar campos de etiqueta"
+
+#: ../data/scan_dialog.ui.h:79
+msgid "Lowercase all"
+msgstr "Tudo em minúsculo"
+
+#: ../data/scan_dialog.ui.h:80 ../data/org.gnome.EasyTAG.gschema.xml.h:142
+msgid "Whether to lower-case all characters of the tag when processing tag fields"
+msgstr "Se devem ser convertidos para caracteres minúsculos todos os caracteres da etiqueta ao processar campos de etiqueta"
+
+#: ../data/scan_dialog.ui.h:81
+msgid "Capitalize first letter"
+msgstr "Primeira letra em maiúsculo"
+
+#: ../data/scan_dialog.ui.h:82 ../data/org.gnome.EasyTAG.gschema.xml.h:146
+msgid "Whether to upper-case the first letter of the tag when processing tag fields"
+msgstr "Se deve ser convertido para caractere maiúsculo a primeira letra da etiqueta ao processar campos de etiqueta"
+
+#: ../data/scan_dialog.ui.h:83
+msgid "Capitalize the first letter of each word"
+msgstr "Primeira letra de cada palavra em maiúsculo"
+
+#: ../data/scan_dialog.ui.h:84 ../data/org.gnome.EasyTAG.gschema.xml.h:148
+msgid "Whether to upper-case the first letter of each word when processing tag fields"
+msgstr "Se deve ser convertida em maiúscula a primeira letra de cada palavra ao processar campos de etiqueta"
+
+#: ../data/scan_dialog.ui.h:85
+msgid "Detect Roman numerals"
+msgstr "Detectar numerais romano"
+
+#: ../data/scan_dialog.ui.h:86 ../data/org.gnome.EasyTAG.gschema.xml.h:152
+msgid "Whether to detect Roman numerals when applying upper-case conversions while processing tag fields"
+msgstr "Se deve ser detectados numerais romanos ao aplicar conversões para caracteres maiúsculos ao processar campos de etiqueta"
+
+#: ../data/scan_dialog.ui.h:87
+msgid "Do not change capitalization"
+msgstr "Não alterar maiúsculo/minúsculo"
+
+#: ../data/scan_dialog.ui.h:88
+msgid "Spaces Conversions"
+msgstr "Conversões de espaços"
+
+#: ../data/scan_dialog.ui.h:89 ../data/org.gnome.EasyTAG.gschema.xml.h:153 ../src/tag_area.c:876
+msgid "Remove spaces"
+msgstr "Remover espaços"
+
+#: ../data/scan_dialog.ui.h:90 ../data/org.gnome.EasyTAG.gschema.xml.h:154
+msgid "Whether to remove all spaces when processing tag fields"
+msgstr "Se devem ser removidos todos os espaços ao processar campos de etiqueta"
+
+#: ../data/scan_dialog.ui.h:91
+msgid "Insert a space before uppercase letters"
+msgstr "Inserir um espaço antes das letras maiúsculas"
+
+#: ../data/scan_dialog.ui.h:92 ../data/org.gnome.EasyTAG.gschema.xml.h:156
+msgid "Whether to insert spaces before capital letters when processing tag fields"
+msgstr "Se devem ser inseridos espaços antes de letras maiúsculas ao processar campos de etiqueta"
+
+#: ../data/scan_dialog.ui.h:93
+msgid "Remove duplicate spaces and underscores"
+msgstr "Remover sublinhados e espaços duplicados"
+
+#: ../data/scan_dialog.ui.h:94 ../data/org.gnome.EasyTAG.gschema.xml.h:158
+msgid "Whether to remove duplicate spaces and underscores when processing tag fields"
+msgstr "Se devem ser removidos espaços e sublinhados duplicados ao processar campos de etiqueta"
+
+#: ../data/scan_dialog.ui.h:95
+msgid "Do not change word separators"
+msgstr "Não alterar seperadores de palavras"
+
+#: ../data/scan_dialog.ui.h:96
+msgid "Character Conversions"
+msgstr "Conversão de caracteres"
+
+#: ../data/scan_dialog.ui.h:98 ../src/tag_area.c:832
+#, no-c-format
+msgid "Convert ‘_’ and ‘%20’ to spaces"
+msgstr "Converter \"_\" e \"%20\" para espaços"
+
+#: ../data/scan_dialog.ui.h:100
+#, no-c-format
+msgid "The underscore character or the string ‘%20’ is replaced by one space. Example, before: ‘Text%20In%20An_Entry‘, after: ‘Text In An Entry’"
+msgstr "O caractere de sublinhado ou o texto \"%20\" são substituídos por um espaço. Por exemplo, antes: \"Texto%20Em%20Uma_Entrada\", após: \"Texto em uma entrada\"."
+
+#: ../data/scan_dialog.ui.h:101 ../src/tag_area.c:838
+msgid "Convert spaces to underscores"
+msgstr "Converter espaços para sublinhados"
+
+#: ../data/scan_dialog.ui.h:102
+msgid "The space character is replaced by one underscore character. Example, before: ‘Text In An Entry’, after: ‘Text_In_An_Entry’"
+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\"."
+
+#: ../data/scan_dialog.ui.h:103
+msgid "Convert:"
+msgstr "Converter:"
+
+#: ../data/scan_dialog.ui.h:104
+msgid "Replace a string by another one. Note that the search is case sensitive"
+msgstr "Substituir um texto por outro. Saiba que a pesquisa diferencia maiúsculo de minúsculo"
+
+#: ../data/scan_dialog.ui.h:105
+msgid "to: "
+msgstr "para: "
+
+#: ../data/scan_dialog.ui.h:106
+msgid "Do not convert"
+msgstr "Não converter"
+
+#: ../data/scan_dialog.ui.h:108
+msgid "Show / Hide Masks Editor"
+msgstr "Mostra / oculta o editor de máscaras"
+
+#: ../data/scan_dialog.ui.h:109
+msgid "Show / Hide Legend"
+msgstr "Mostra / oculta legendas"
+
+#: ../data/scan_dialog.ui.h:110
+msgid "Scanner Preferences"
+msgstr "Preferências do verificador"
+
+#: ../data/search_dialog.ui.h:1
+msgid "Search:"
+msgstr "Pesquisar:"
+
+#: ../data/search_dialog.ui.h:2
+msgid "Type the text to search for in the file list, or leave the field empty to display all files"
+msgstr "Digite um texto para pesquisar na lista de arquivos, ou deixe este campo vazio para exibir todos os arquivos"
+
+#: ../data/search_dialog.ui.h:3
+msgid "_Find"
+msgstr "_Localizar"
+
+#: ../data/search_dialog.ui.h:4
+msgid "In:"
+msgstr "Em:"
+
+#. This option is for the previous 'in' option. For instance, translate this as 'Search' 'In:' 'the Filename'.
+#: ../data/search_dialog.ui.h:6
+msgid "the Filename"
+msgstr "o nome do arquivo"
+
+#. This option is for the previous 'in' option. For instance, translate this as 'Search' 'In:' 'the Tag'.
+#: ../data/search_dialog.ui.h:8
+msgid "the Tag"
+msgstr "a etiqueta"
+
+#: ../data/search_dialog.ui.h:9
+msgid "Case sensitive"
+msgstr "Diferenciar maiúsculas de minúsculas"
+
+#: ../data/search_dialog.ui.h:16
+msgid "CD"
+msgstr "CD"
+
+#: ../data/tag_area.ui.h:1
+msgid "Image Type"
+msgstr "Tipo de imagem"
+
+#: ../data/tag_area.ui.h:2 ../src/picture.c:272
+msgid "Description"
+msgstr "Descrição"
+
+#: ../data/tag_area.ui.h:4
+msgid "_Accept"
+msgstr "_Aceitar"
+
+#: ../data/tag_area.ui.h:5 ../src/tag_area.c:3019
 msgid "Tag"
 msgstr "Etiqueta"
 
-#.
-#. * 1 - Page for common tag fields
-#.
-#: ../src/easytag.c:748
-msgid "Common"
-msgstr "Comuns"
-
-#. Title
-#: ../src/easytag.c:755
+#: ../data/tag_area.ui.h:6
 msgid "Title:"
 msgstr "Título:"
 
-#: ../src/easytag.c:769
+#: ../data/tag_area.ui.h:7
 msgid "Tag selected files with this title"
 msgstr "Etiqueta arquivos selecionados com esse título"
 
-#. Artist
-#: ../src/easytag.c:774
+#: ../data/tag_area.ui.h:8
 msgid "Artist:"
 msgstr "Artista:"
 
-#: ../src/easytag.c:788
+#: ../data/tag_area.ui.h:9
 msgid "Tag selected files with this artist"
 msgstr "Etiqueta arquivos selecionados com esse artista"
 
-#. Album Artist
-#: ../src/easytag.c:793
+#: ../data/tag_area.ui.h:10
 msgid "Album artist:"
 msgstr "Artista do álbum:"
 
-#: ../src/easytag.c:807
+#: ../data/tag_area.ui.h:11
 msgid "Tag selected files with this album artist"
 msgstr "Etiqueta arquivos selecionados com o artista deste álbum"
 
-#. Album
-#: ../src/easytag.c:812
+#: ../data/tag_area.ui.h:12
 msgid "Album:"
 msgstr "Álbum:"
 
-#: ../src/easytag.c:826
+#: ../data/tag_area.ui.h:13
 msgid "Tag selected files with this album name"
 msgstr "Etiqueta arquivos selecionados com o nome deste álbum"
 
-#. Disc Number
-#: ../src/easytag.c:831
+#: ../data/tag_area.ui.h:14
 msgid "CD:"
 msgstr "CD:"
 
-#: ../src/easytag.c:848
+#: ../data/tag_area.ui.h:15
 msgid "Tag selected files with this disc number"
 msgstr "Etiqueta arquivos selecionados com o número deste disco"
 
-#. Year
-#: ../src/easytag.c:853
+#: ../data/tag_area.ui.h:16
 msgid "Year:"
 msgstr "Ano:"
 
-#: ../src/easytag.c:873
+#: ../data/tag_area.ui.h:17
 msgid "Tag selected files with this year"
 msgstr "Etiqueta arquivos selecionados com esse ano"
 
-#: ../src/easytag.c:887
-msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
-msgstr ""
-"Numera os arquivos selecionados seqüencialmente. Começar com 01 em cada "
-"subdiretório."
+#: ../data/tag_area.ui.h:18
+msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory"
+msgstr "Numera os arquivos selecionados sequencialmente. Começar com 01 em cada subdiretório"
 
-#. To have enough space to display the icon
-#. To have enough space to display the icon
-#: ../src/easytag.c:896
+#: ../data/tag_area.ui.h:19
 msgid "Track #:"
 msgstr "Faixa #:"
 
-#: ../src/easytag.c:927
-msgid ""
-"Set the number of files, in the same directory of the displayed file, to the "
-"selected tracks."
-msgstr ""
-"Define o número de arquivos, no mesmo diretório do arquivo exibido, para as "
-"faixas selecionadas."
+#: ../data/tag_area.ui.h:20
+msgid "Set the number of files, in the same directory of the displayed file, to the selected tracks"
+msgstr "Define o número de arquivos, no mesmo diretório do arquivo exibido, para as faixas selecionadas"
 
-#: ../src/easytag.c:947
+#: ../data/tag_area.ui.h:21
 msgid "Tag selected files with this number of tracks"
 msgstr "Etiqueta os arquivos selecionados com esse número de faixa"
 
-#. Genre
-#: ../src/easytag.c:951
+#: ../data/tag_area.ui.h:22
 msgid "Genre:"
 msgstr "Gênero:"
 
-#: ../src/easytag.c:979
-msgid "Tag selected files with this genre"
-msgstr "Etiqueta os arquivos selecionados com esse gênero"
-
-#. Comment
-#: ../src/easytag.c:984
+#: ../data/tag_area.ui.h:23
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: ../src/easytag.c:1011
+#: ../data/tag_area.ui.h:24
 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:1018
+#: ../data/tag_area.ui.h:25
 msgid "Composer:"
 msgstr "Compositor:"
 
-#: ../src/easytag.c:1032
+#: ../data/tag_area.ui.h:26
 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:1039
+#: ../data/tag_area.ui.h:27
 msgid "Orig. artist:"
 msgstr "Artista orig.:"
 
-#: ../src/easytag.c:1053
+#: ../data/tag_area.ui.h:28
 msgid "Tag selected files with this original artist"
 msgstr "Etiqueta os arquivos selecionados com esse artista original"
 
-#. Copyright
-#: ../src/easytag.c:1059
+#: ../data/tag_area.ui.h:29
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../src/easytag.c:1073
+#: ../data/tag_area.ui.h:30
 msgid "Tag selected files with this copyright"
 msgstr "Etiqueta os arquivos selecionados com esse copyright"
 
-#. URL
-#: ../src/easytag.c:1079
+#: ../data/tag_area.ui.h:31
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/easytag.c:1093
+#: ../data/tag_area.ui.h:32
 msgid "Tag selected files with this URL"
 msgstr "Etiqueta os arquivos selecionados com essa URL"
 
-#. Encoded by
-#: ../src/easytag.c:1099
+#: ../data/tag_area.ui.h:33
 msgid "Encoded by:"
 msgstr "Codificado por:"
 
-#: ../src/easytag.c:1113
+#: ../data/tag_area.ui.h:34
 msgid "Tag selected files with this encoder name"
 msgstr "Etiqueta os arquivos selecionados com esse nome do codificador"
 
-#.
-#. * 2 - Page for extra tag fields
-#.
-#: ../src/easytag.c:1146 ../src/et_core.c:3230 ../src/et_core.c:3233
-msgid "Images"
-msgstr "Imagens"
+#: ../data/tag_area.ui.h:35
+msgid "Common"
+msgstr "Comuns"
 
-#: ../src/easytag.c:1170
+#: ../data/tag_area.ui.h:36
 msgid "You can use drag and drop to add an image"
 msgstr "Você pode arrastar e soltar para adicionar uma imagem"
 
-#: ../src/easytag.c:1219
+#: ../data/tag_area.ui.h:37
 msgid "Add images to the tag"
 msgstr "Adiciona imagens à etiqueta"
 
-#: ../src/easytag.c:1237
+#: ../data/tag_area.ui.h:38
 msgid "Remove selected images from the tag"
 msgstr "Remove imagens selecionadas da etiqueta"
 
-#: ../src/easytag.c:1248
+#: ../data/tag_area.ui.h:39
 msgid "Save the selected images to files"
 msgstr "Salva as imagens selecionadas em arquivos"
 
-#: ../src/easytag.c:1259
+#: ../data/tag_area.ui.h:40
 msgid "Edit image properties"
 msgstr "Edita as propriedades da imagem"
 
-#: ../src/easytag.c:1270
-msgid "Tag selected files with these images"
-msgstr "Etiqueta os arquivos selecionados com essas imagens"
+#: ../data/tag_area.ui.h:41
+msgid "Tag selected files with these images"
+msgstr "Etiqueta os arquivos selecionados com essas imagens"
+
+#: ../data/tag_area.ui.h:42 ../src/tag_area.c:3272 ../src/tag_area.c:3275
+msgid "Images"
+msgstr "Imagens"
+
+#: ../data/toolbar.ui.h:2
+msgid "First file"
+msgstr "Primeiro arquivo"
+
+#: ../data/toolbar.ui.h:3
+msgid "_Previous File"
+msgstr "Arquivo _anterior"
+
+#: ../data/toolbar.ui.h:4
+msgid "Previous file"
+msgstr "Arquivo anterior"
+
+#: ../data/toolbar.ui.h:6
+msgid "Next file"
+msgstr "Próximo arquivo"
+
+#: ../data/toolbar.ui.h:8
+msgid "Last file"
+msgstr "Último arquivo"
+
+#: ../data/toolbar.ui.h:9
+msgid "_Show Scanner"
+msgstr "Mo_strar o verificador"
+
+#: ../data/toolbar.ui.h:10
+msgid "Show scanner"
+msgstr "Mostra o verificador"
+
+#: ../data/toolbar.ui.h:12
+msgid "Remove tags"
+msgstr "Remove etiquetas"
+
+#: ../data/toolbar.ui.h:13
+msgid "_Undo"
+msgstr "_Desfazer"
+
+#: ../data/toolbar.ui.h:14
+msgid "Undo for file"
+msgstr "Desfaz para arquivo"
+
+#: ../data/toolbar.ui.h:15
+msgid "R_edo"
+msgstr "_Refazer"
+
+#: ../data/toolbar.ui.h:16
+msgid "Redo for file"
+msgstr "Refaz para arquivo"
+
+#: ../data/toolbar.ui.h:18
+msgid "Save changes to selected files"
+msgstr "Salva alterações nos arquivos selecionados"
+
+#: ../data/toolbar.ui.h:20
+msgid "Browse directory tree"
+msgstr "Navega por árvore de diretório"
+
+#: ../data/toolbar.ui.h:22
+msgid "Browse artists and albums"
+msgstr "Navega por artistas e álbuns"
+
+#: ../data/toolbar.ui.h:24
+msgid "Invert file selection"
+msgstr "Inverte a seleção de arquivo"
+
+#: ../data/toolbar.ui.h:26
+msgid "Search filenames and tags"
+msgstr "Pesquisa nomes de arquivos e etiquetas"
+
+#: ../data/toolbar.ui.h:27
+msgid "CDDB Search…"
+msgstr "Pesquisa no CDDB…"
+
+#: ../data/toolbar.ui.h:28 ../src/cddb_dialog.c:2746
+msgid "CDDB Search"
+msgstr "Pesquisar no CDDB"
+
+#: ../data/toolbar.ui.h:30
+msgid "Generate a playlist"
+msgstr "Gera uma lista de reprodução"
+
+#: ../data/toolbar.ui.h:32
+msgid "Stop the current action"
+msgstr "Interrompe a ação atual"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:1
+msgid "Load on startup"
+msgstr "Carregar ao inicializar"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:3
+msgid "Default path"
+msgstr "Caminho padrão"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:7
+msgid "Show hidden directories while browsing"
+msgstr "Mostra os diretórios ocultos ao navegar"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:11
+msgid "CDDB server hostname for automatic search"
+msgstr "Nome da máquina do servidor CDDB para pesquisa automática"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:12
+msgid "The CDDB server to use for the automatic search"
+msgstr "O servidor CDDB a ser usado para a pesquisa automática"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:13
+msgid "CDDB server port for automatic search"
+msgstr "Porta do servidor CDDB para pesquisa automática"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:14
+msgid "The CDDB server port to use for the automatic search"
+msgstr "A porta do servidor CDDB a ser usada para a pesquisa automática"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:15
+msgid "CDDB server path for automatic search"
+msgstr "Caminho do servidor CDDB para pesquisa automática"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:16
+msgid "The CDDB server path to use for the automatic search"
+msgstr "O caminho do servidor CDDB a ser usado para a pesquisa automática"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:17
+msgid "CDDB server hostname for manual search"
+msgstr "Nome da máquina do servidor CDDB para pesquisa manual"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:18
+msgid "The CDDB server to use for a manual search"
+msgstr "O servidor CDDB a ser usado para uma pesquisa manual"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:19
+msgid "CDDB server port for manual search"
+msgstr "Porta do servidor CDDB para pesquisa manual"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:20
+msgid "The CDDB server port to use for a manual search"
+msgstr "A porta do servidor CDDB a ser usada para uma pesquisa manual"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:21
+msgid "CDDB server path for manual search"
+msgstr "Caminho do servidor CDDB para pesquisa manual"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:22
+msgid "The CDDB server path to use for a manual search"
+msgstr "O caminho do servidor CDDB a ser usado para uma pesquisa manual"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:23
+msgid "Use DLM to match CDDB results to files"
+msgstr "Usar DLM para corresponder resultados CDDB com arquivos"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:25
+msgid "Select the file with the position which matches the position of the CDDB result"
+msgstr "Selecione o arquivo com a posição que corresponde a posição do resultado CDDB"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:27
+msgid "Enable proxy for remote CDDB"
+msgstr "Habilitar proxy para CDDB remoto"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:29
+msgid "CDDB proxy hostname"
+msgstr "Nome de máquina do proxy para CDDB"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:31
+msgid "CDDB proxy port"
+msgstr "Porta do proxy para CDDB"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:33
+msgid "CDDB proxy username"
+msgstr "Usuário do proxy para CDDB"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:35
+msgid "CDDB proxy password"
+msgstr "Senha do proxy para CDDB"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:37
+msgid "Run the scanner on CDDB results"
+msgstr "Executar a varredura de resultados do CDDB"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:39
+msgid "The fields to use in a manual CDDB search"
+msgstr "Os campos para usar em uma pesquisa manual ao CDDB"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:40
+msgid "Which fields to search for matches of the returned CDDB results"
+msgstr "Quais campos devem ser pesquisados por correspondências de resultados retornados do CDDB"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:41
+msgid "The categories to use in a CDDB search"
+msgstr "As categorias para usar em uma pesquisa CDDB"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:42
+msgid "Which categories to search for matches in the returned CDDB results"
+msgstr "Em quais categorias pesquisar por correspondências nos resultados retornados do CDDB"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:43
+msgid "The tag fields to set when matching against CDDB results"
+msgstr "Os campos de etiqueta para definir ao corresponder a resultados CDDB"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:44
+msgid "Which tag fields should be set when matching against selected files and CDDB results"
+msgstr "Quais campos de etiqueta deveria ser definidos ao corresponder a arquivos selecionados e resultados do CDDB"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:51
+msgid "Show changed files in bold"
+msgstr "Exibir os arquivos modificados em negrito"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:52
+msgid "Whether to highlight changed files in the file list by making them bold, or alternatively by making them red"
+msgstr "Se devem ser destacados arquivos alterados na lista de arquivos deixando-os em negrito ou, alternativamente, em vermelho."
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:55
+msgid "How to sort audio files in the file list"
+msgstr "Como organizar arquivos de áudio na lista de arquivos"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:56
+msgid "Sort files in ascending or descending order for the selected type"
+msgstr "Organiza arquivos em ordem ascendente ou descendente para o tipo selecionado"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:57
+msgid "Number of log lines"
+msgstr "Número de linhas do log"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:61
+msgid "Use a non-standard character encoding when reading ID3 tags"
+msgstr "Usar uma codificação de caracteres não padrão para a leitura das etiquetas ID3"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:65
+msgid "Write ID3v1 tags"
+msgstr "Gravar etiquetas ID3v1"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:67
+msgid "The character set for writing ID3v1 tags"
+msgstr "A codificação de caracteres para a gravação das etiquetas ID3"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:68
+msgid "Choose the character set to be used when writing ID3v1 tags"
+msgstr "Escolha a codificação de caracteres a ser usada  ara a gravação das etiquetas ID3"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:69
+msgid "Encoding options when writing ID3v1 tags"
+msgstr "Opções de codificação ao escrever etiquetas ID3v1"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:70
+msgid "Additional options to pass to iconv() when converting between encodings when writing ID3v1 tags"
+msgstr "Opções adicionais para passar ao iconv() ao converter entre codificações quando da escrita de etiquetas ID3v1"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:71
+msgid "The character set for reading ID3v1 and ID3v2 tags"
+msgstr "A codificação de caracteres para a leitura das etiquetas ID3v1 e ID3v2"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:73
+msgid "Write ID3v2 tags"
+msgstr "Gravar etiquetas ID3v2"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:75
+msgid "Enable ID3v2.4 support"
+msgstr "Habilitar suporte a ID3v2.4"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:76
+msgid "Whether to write ID3v2.4 tags when ID3v2 support is enabled"
+msgstr "Se devem ser gravadas etiquetas ID3v2.4 quando suporte a ID3v2 estiver habilitado"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:77
+#, fuzzy
+#| msgid "Automatically convert old ID3v2 tag versions"
+msgid "Convert old ID3 tag versions to new ones"
+msgstr "Converter automaticamente versões antigas de etiquetas ID3v2"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:81
+#, fuzzy
+#| msgid "Set CRC32 in the ID3v2 tags"
+msgid "Use CRC-32 in ID3v2 tags"
+msgstr "Aplica o CRC32 nas etiquetas ID3v2"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:85
+#, fuzzy
+#| msgid "Try another character encoding"
+msgid "Use Unicode character encoding in ID3v2 tags"
+msgstr "Tentar outra codificação de caracteres"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:86
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "Whether to use a Unicode character set when writing ID3v2 tags"
+msgstr "Codificação de caracteres para a gravação das etiquetas ID3"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:87
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "The Unicode character set for writing ID3v2 tags"
+msgstr "Codificação de caracteres para a gravação das etiquetas ID3"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:88
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "Choose the Unicode character set to be used when writing ID3v2 tags"
+msgstr "Codificação de caracteres para a gravação das etiquetas ID3"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:89
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "The character set for writing ID3v2 tags"
+msgstr "Codificação de caracteres para a gravação das etiquetas ID3"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:90
+msgid "Override the typical Unicode character set to be used when writing ID3v2 tags"
+msgstr "Sobrescrever a codificação de caracteres Unicode típica para ser usado ao escrever etiquetas ID3v2"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:91
+msgid "Encoding options when writing ID3v2 tags"
+msgstr "Opções de codificação ao escrever etiquetas ID3v2"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:92
+msgid "Additional options to pass to iconv() when converting between encodings when writing ID3v2 tags"
+msgstr "Opções adicionais para passar ao iconv() ao converter entre codificações quando da escrita de etiquetas ID3v2"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:93
+msgid "Automatically complete the date"
+msgstr "Completar datas automaticamente"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:95
+msgid "Pad the disc number tag field"
+msgstr "Preencher o campo de etiqueta de número do disco"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:97
+msgid "The length of the disc number field"
+msgstr "O tamanho do campo de número do disco"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:98
+msgid "The length of the disc number field, which controls if the field is padded with leading zeroes"
+msgstr "O tamanho do campo de número do disco, o qual controla se o campo é preenchido com zeros no começo"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:100
+msgid "Whether to, when adding cover art, automatically select the type for an image based on its filename"
+msgstr "Se, ao adicionar arte na capa, deve ser selecionada automaticamente o tipo para uma imagem baseada em seu nome de arquivo"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:101
+msgid "Pad the track number tag field"
+msgstr "Preenche o campo de etiqueta de número da trilha"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:103
+msgid "The length of the track number field"
+msgstr "O tamanho do campo de número da faixa"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:104
+msgid "The length of the track number field, which controls if the field is padded with leading zeroes"
+msgstr "O tamanho do campo de número da faixa, que controla se o campo é preenchido com zeros no começo"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:107
+msgid "Convert spaces and underscores when filling tag fields"
+msgstr "Converter espaços e sublinhados ao preencher campos de etiquetas"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:109
+#, no-c-format
+msgid "Whether to convert to spaces (and %20) or underscores when filling tag fields from filenames"
+msgstr "Se deve-se converter para espaços (e %20) ou sublinhados ao preencher campos de etiqueta a partir de nomes de arquivos"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:110
+msgid "Overwrite tag field"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:112
+#, fuzzy
+#| msgid "Set this text as default comment:"
+msgid "Set the default comment"
+msgstr "Definir esse texto como o comentário padrão:"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:114
+msgid "Default comment for filling tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:115
+msgid "The default comment to use when filling tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:116
+#, fuzzy
+#| msgid "Set this text as default comment:"
+msgid "Use the CRC-32 as the default comment"
+msgstr "Definir esse texto como o comentário padrão:"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:130
+#, fuzzy
+#| msgid "Run the current scanner for each file"
+msgid "Run the current scanner when loading filenames from a file"
+msgstr "Executar a verificação atual para cada arquivo"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:132
+#, fuzzy
+#| msgid "Process title field"
+msgid "Process these tag fields"
+msgstr "Processar o campo do título"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:133
+msgid "The tag fields to process when using the scanner"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:134
+#, fuzzy
+#| msgid "Overwrite fields when scanning tags"
+msgid "Convert tag fields when processing"
+msgstr "Sobrescrever campos ao verificar as etiquetas"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:136
+#, no-c-format
+msgid "Whether to convert to spaces (and %20), underscores or other characters when processing tag fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:137
+#, fuzzy
+#| msgid "Try another character encoding"
+msgid "Convert characters in tags"
+msgstr "Tentar outra codificação de caracteres"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:138
+msgid "Whether to convert characters of the tag from one value to another when processing tag fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:139
+msgid "Convert the following characters when processing tag fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:140
+msgid "Replace any matched sequence of characters with this string when processing tag fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:141
+#, fuzzy
+#| msgid "Lowercase all"
+msgid "Lower-case all characters"
+msgstr "Tudo em minúsculo"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:143
+msgid "Upper-case all characters"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:145
+#, fuzzy
+#| msgid "Capitalize the first letter of each word"
+msgid "Upper-case the first letter of the tag"
+msgstr "Primeira letra de cada palavra em maiúsculo"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:147
+#, fuzzy
+#| msgid "Capitalize the first letter of each word"
+msgid "Upper-case the first letter of each word"
+msgstr "Primeira letra de cada palavra em maiúsculo"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:149
+msgid "Upper-case prepositions"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:151
+#, fuzzy
+#| msgid "Detect Roman numerals"
+msgid "Detect roman numerals"
+msgstr "Detectar numerais romano"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:155
+#, fuzzy
+#| msgid "Insert space before uppercase letter"
+msgid "Insert spaces before capital letters"
+msgstr "Inserir espaço antes da letra maiúscula"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:157
+#, fuzzy
+#| msgid "Remove duplicate spaces or underscores"
+msgid "Remove duplicate spaces"
+msgstr "Remover espaços e sublinhados duplicados"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:159
+#, fuzzy
+#| msgid "Playlist File Error"
+msgid "Playlist filename mask"
+msgstr "Erro no arquivo de lista de reprodução"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:160
+msgid "The default filename mask to use for a new playlist"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:161
+msgid "Use a filename mask when generating a playlist"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:162
+msgid "Whether to use a filename mask when creating playlists"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:163
+#, fuzzy
+#| msgid "Create playlist in the parent directory"
+msgid "Create playlists with only the selected files"
+msgstr "Criar uma lista de reprodução no diretório superior"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:165
+#, fuzzy
+#| msgid "Use relative path for files in playlist"
+msgid "Use relative paths when creating playlists"
+msgstr "Usar o caminho relativo para os arquivos na lista de reprodução"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:166
+#, fuzzy
+#| msgid "Use relative path for files in playlist"
+msgid "Whether to use relative paths for files when creating playlists"
+msgstr "Usar o caminho relativo para os arquivos na lista de reprodução"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:167
+#, fuzzy
+#| msgid "Create playlist in the parent directory"
+msgid "Create the playlist in the parent directory"
+msgstr "Criar uma lista de reprodução no diretório superior"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:169
+#, fuzzy
+#| msgid "Use full path for files in playlist"
+msgid "Use DOS separators for playlists"
+msgstr "Usar o caminho absoluto para os arquivos na lista de reprodução"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:171
+#, fuzzy
+#| msgid "Generate a playlist"
+msgid "Content of generated playlists"
+msgstr "Gera uma lista de reprodução"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:172
+msgid "Write a plain list of files, include extended information from the filename or extended information using a supplied mask"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:173
+msgid "Playlist default mask"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:174
+#, fuzzy
+#| msgid "Use full path for files in playlist"
+msgid "The default mask to use for files in a playlist"
+msgstr "Usar o caminho absoluto para os arquivos na lista de reprodução"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:175
+msgid "Search for files case-sensitively"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:176
+msgid "Whether matches when searching for files are case-sensitive"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:177
+#, fuzzy
+#| msgid "Search a file"
+msgid "Search in filenames"
+msgstr "Procurar um arquivo"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:178
+msgid "Perform the search on filenames"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:179
+#, fuzzy
+#| msgid "Searching"
+msgid "Search in tags"
+msgstr "Pesquisando"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:180
+msgid "Perform the search on tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:181
+#, fuzzy
+#| msgid "Error reading tags from file: '%s'"
+msgid "Mask for filling tags from filenames"
+msgstr "Erro na leitura das etiquetas o arquivo: \"%s\""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:182
+msgid "The default mask to use when automatically filling tags with information from filenames"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:183
+#, fuzzy
+#| msgid "Confirm renaming of file"
+msgid "Mask for renaming files"
+msgstr "Confirmar a renomeação do arquivo"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:184
+#, fuzzy
+#| msgid "Repeat action for the remaining files"
+msgid "The default mask to use when renaming files"
+msgstr "Repita esta ação para o resto dos arquivos"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:185
+#, fuzzy
+#| msgid "Unable to create setting directories"
+msgid "Mask for renaming directories"
+msgstr "Não foi possível criar os diretórios de configuração"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:186
+msgid "The default mask to use when renaming directories"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:187
+#, fuzzy
+#| msgid "Unable to create setting directories"
+msgid "Use a mask when renaming directories"
+msgstr "Não foi possível criar os diretórios de configuração"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:189
+#, fuzzy
+#| msgid "Convert space ' ' to underscore '_'"
+msgid "Convert spaces and underscores when renaming files"
+msgstr "Converter espaço \" \" para sublinhado \"_\""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:190
+msgid "Whether to convert to spaces or underscores when renaming files"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:191
+msgid "How to modify filename extensions when renaming"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:192
+msgid "Change the file extension to all lower-case, all upper-case or do not change it"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:193
+msgid "Encoding options when renaming files"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:194
+msgid "If the encoding of the filename does not match the filesystem encoding, choose whether to try another encoding, approximate the filesystem encoding with transliteration or discard the offending characters"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:196
+#, fuzzy
+#| msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
+msgid "Whether to replace illegal characters in a filename when using the rename function"
+msgstr "Substituir caracteres ilegais no nome do arquivo (para Windows e CD-ROM)"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:197
+#, fuzzy
+#| msgid "Show / Hide Masks Editor"
+msgid "Show the scanner mask editor"
+msgstr "Mostra / oculta o editor de máscaras"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:198
+msgid "Whether to show the scanner mask editor in the tag scanner"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:199
+#, fuzzy
+#| msgid "Show scanner"
+msgid "Show the scanner legend"
+msgstr "Mostra o verificador"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:200
+#, fuzzy
+#| msgid "Whether to pad the disc field with leading zeroes"
+msgid "Whether to show the scanner legend in the tag scanner"
+msgstr "Se deve preencher o campo disco com zeros à esquerda"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:201
+#, fuzzy
+#| msgid "Open the Scanner Window on startup"
+msgid "Show the scanner window on startup"
+msgstr "Abrir a janela do verificador na inicialização"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:203
+msgid "The scan mode"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:204
+msgid "Which type of scan to show in the scanner"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:205
+msgid "Split Ogg title fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:207
+msgid "Split Ogg artist fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:209
+msgid "Split Ogg album fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:211
+msgid "Split Ogg genre fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:213
+#, fuzzy
+#| msgid "Process comment field"
+msgid "Split Ogg comment fields"
+msgstr "Processar o campo do comentário"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:215
+#, fuzzy
+#| msgid "Process composer field"
+msgid "Split Ogg composer fields"
+msgstr "Processar o campo do compositor"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:217
+#, fuzzy
+#| msgid "Process original artist field"
+msgid "Split Ogg original artist fields"
+msgstr "Processar o campo do artista original"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:219
+msgid "Page to show in the preferences dialog"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:220
+msgid "The page in the notebook of the preferences dialog"
+msgstr ""
+
+#: ../nautilus-extension/nautilus-easytag.c:229
+msgid "Open in EasyTAG"
+msgstr "Abrir no EasyTAG"
+
+#: ../nautilus-extension/nautilus-easytag.c:230
+#, fuzzy
+#| msgid "Open the current selected directory in EasyTAG"
+msgid "Open the selected directory in EasyTAG"
+msgstr "Abre o diretório selecionado no EasyTAG"
+
+#: ../nautilus-extension/nautilus-easytag.c:248
+#, fuzzy
+#| msgid "Open selected files in EasyTAG"
+msgid "Open the selected files in EasyTAG"
+msgstr "Abre os arquivos selecionados no EasyTAG"
+
+#. Translators: put your own name here to appear in the about dialog.
+#: ../src/about.c:89
+msgid "translator-credits"
+msgstr ""
+"doutor.zero <doutor.zero at gmail.com>, 2005, 2007, 2008\n"
+"Enrico Nicoletto <liverig at gmail.com>, 2013, 2014\n"
+"Rafael Ferreira <rafael.f.f1 at gmail.com>, 2013, 2014"
+
+#: ../src/about.c:99
+msgid "View and edit tags in audio files"
+msgstr "Veja e edite etiquetas em arquivos de áudio"
+
+#: ../src/application.c:46
+msgid "Print the version and exit"
+msgstr "Mostra a versão e sai"
+
+#. Starting messages
+#: ../src/application.c:176
+#, fuzzy, c-format
+#| msgid "Starting EasyTAG version %s (PID: %d)…"
+msgid "Starting EasyTAG version %s…"
+msgstr "Inicializando EasyTAG versão %s (PID: %d)…"
+
+#: ../src/application.c:181
+#, fuzzy, c-format
+#| msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
+msgid "Variable EASYTAGLANG defined, setting locale ‘%s’"
+msgstr "Variável EASYTAGLANG definida. Configurando a localização: \"%s\""
+
+#: ../src/application.c:186
+#, fuzzy, c-format
+#| msgid "Setting locale: '%s'"
+msgid "Setting locale: ‘%s’"
+msgstr "Configurando a localização: \"%s\""
+
+#: ../src/application.c:192
+#, c-format
+msgid "System locale is ‘%s’, using ‘%s’"
+msgstr ""
+
+#: ../src/application.c:197
+msgid "Unable to create setting directories"
+msgstr "Não foi possível criar os diretórios de configuração"
+
+#: ../src/application.c:338
+#, c-format
+msgid "Website: %s"
+msgstr "Site: %s"
+
+#: ../src/application.c:347
+msgid "- Tag and rename audio files"
+msgstr " - Etiquete e renomeie arquivos de áudio"
+
+#: ../src/application.c:431 ../src/et_core.c:641
+#, fuzzy, c-format
+#| msgid "Error while querying information for file: '%s' (%s)"
+msgid "Error while querying information for file ‘%s’: %s"
+msgstr "Erro ao consultar informação de arquivo: \"%s\" (%s)"
+
+#: ../src/application.c:495
+#, fuzzy, c-format
+#| msgid "Cannot open path '%s'"
+msgid "Cannot open path ‘%s’"
+msgstr "Não foi possível abrir o caminho \"%s\""
+
+#: ../src/application_window.c:317 ../src/application_window.c:334
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the file '%s'?"
+msgid "Do you really want to delete the file ‘%s’?"
+msgstr "Você deseja mesmo excluir o arquivo \"%s\"?"
+
+#: ../src/application_window.c:320 ../src/easytag.c:462 ../src/easytag.c:595
+msgid "Repeat action for the remaining files"
+msgstr "Repita esta ação para o resto dos arquivos"
+
+#: ../src/application_window.c:322
+msgid "_Skip"
+msgstr ""
+
+#: ../src/application_window.c:324 ../src/application_window.c:338
+#, fuzzy
+#| msgid "Delete File"
+msgid "_Delete"
+msgstr "Excluir arquivo"
+
+#: ../src/application_window.c:326 ../src/application_window.c:336
+msgid "Delete File"
+msgstr "Excluir arquivo"
+
+#: ../src/application_window.c:363
+#, fuzzy, c-format
+#| msgid "File '%s' deleted"
+msgid "File ‘%s’ deleted"
+msgstr "Arquivo \"%s\" excluído"
+
+#: ../src/application_window.c:540
+#, fuzzy, c-format
+#| msgid "Cannot delete file (%s)"
+msgid "Cannot delete file ‘%s’"
+msgstr "Não foi possível excluir o arquivo (%s)"
+
+#: ../src/application_window.c:561
+#, fuzzy
+#| msgid "All files have been deleted"
+msgid "Some files were not deleted"
+msgstr "Todos os arquivos foram excluídos"
+
+#: ../src/application_window.c:563
+msgid "All files have been deleted"
+msgstr "Todos os arquivos foram excluídos"
+
+#: ../src/application_window.c:902
+msgid "All tags have been removed"
+msgstr "Todas as etiquetas foram removidas"
+
+#: ../src/application_window.c:1506 ../src/browser.c:355 ../src/browser.c:398 ../src/browser.c:432 ../src/browser.c:4710 ../src/browser.c:4785
+#, fuzzy, c-format
+#| msgid "Failed to launch program: %s"
+msgid "Failed to launch program ‘%s’"
+msgstr "Falha ao iniciar programa: %s"
+
+#. Quit EasyTAG.
+#: ../src/application_window.c:2646
+#, fuzzy
+#| msgid "EasyTAG: Normal exit."
+msgid "Normal exit"
+msgstr "EasyTAG: Saída normal."
+
+#: ../src/application_window.c:2683 ../src/browser.c:858
+msgid "Some files have been modified but not saved"
+msgstr "Alguns arquivos foram modificados, mas não salvos"
+
+#: ../src/application_window.c:2684 ../src/browser.c:862 ../src/easytag.c:247 ../src/easytag.c:466 ../src/easytag.c:598 ../src/easytag.c:606
+#, fuzzy
+#| msgid "Disc"
+msgid "_Discard"
+msgstr "Disco"
+
+#: ../src/application_window.c:2686 ../src/browser.c:864 ../src/easytag.c:248 ../src/easytag.c:468 ../src/easytag.c:475 ../src/easytag.c:600 ../src/easytag.c:607 ../src/playlist_dialog.c:659 ../src/tag_area.c:1842
+#, fuzzy
+#| msgid "_Save Files"
+msgid "_Save"
+msgstr "_Salvar arquivos"
+
+#: ../src/application_window.c:2690 ../src/application_window.c:2728 ../src/easytag.c:253
+msgid "Quit"
+msgstr "Sair"
+
+#: ../src/application_window.c:2693
+msgid "Do you want to save them before quitting?"
+msgstr "Você deseja salvá-los antes de sair?"
+
+#: ../src/application_window.c:2722
+msgid "Do you really want to quit?"
+msgstr "Você realmente deseja sair?"
+
+#: ../src/browser.c:568
+#, fuzzy
+#| msgid "Select a directory to browse"
+msgid "New default directory selected for browser"
+msgstr "Seleciona um diretório para navegar"
+
+#: ../src/browser.c:861
+#, fuzzy
+#| msgid "Do you want to save them before changing the directory?"
+msgid "Do you want to save them before changing directory?"
+msgstr "Deseja salvá-los antes de alterar o diretório?"
+
+#: ../src/browser.c:868
+msgid "Confirm Directory Change"
+msgstr "Confirmar alteração do diretório"
+
+#: ../src/browser.c:2556
+#, fuzzy
+#| msgid "<All albums>"
+msgid "All albums"
+msgstr "<Todos os álbuns>"
+
+#: ../src/browser.c:3809
+msgid "Select File"
+msgstr "Selecionar arquivo"
+
+#: ../src/browser.c:3816
+msgid "Select Directory"
+msgstr "Selecionar diretório"
+
+#: ../src/browser.c:4199
+#, fuzzy, c-format
+#| msgid "Rename the directory '%s' to:"
+msgid "Rename the directory ‘%s’ to:"
+msgstr "Renomear o diretório \"%s\" para:"
+
+#: ../src/browser.c:4339
+msgid "You must type a directory name"
+msgstr "Você deve digitar um nome para o diretório"
+
+#: ../src/browser.c:4340 ../src/browser.c:4362
+msgid "Directory Name Error"
+msgstr "Erro no nome do diretório"
+
+#: ../src/browser.c:4358
+#, fuzzy, c-format
+#| msgid "Could not convert '%s' into filename encoding."
+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:4361
+#, fuzzy
+#| msgid "Please use another name"
+msgid "Please use another name."
+msgstr "Por favor, use um outro nome"
+
+#: ../src/browser.c:4433
+#, fuzzy, c-format
+#| msgid "The directory name '%s' already exists"
+msgid "The directory name ‘%s’ already exists."
+msgstr "O nome do diretório \"%s\" já existe"
+
+#: ../src/browser.c:4434 ../src/easytag.c:655
+msgid "Rename File Error"
+msgstr "Erro ao renomear o arquivo"
+
+#: ../src/browser.c:4472 ../src/browser.c:4501
+msgid "Rename Directory Error"
+msgstr "Erro ao renomear o diretório"
+
+#: ../src/browser.c:4540
+msgid "Directory renamed"
+msgstr "Diretório renomeado"
+
+#: ../src/browser.c:4702 ../src/browser.c:4777
+#, fuzzy, c-format
+#| msgid "Executed command: %s"
+msgid "Executed command ‘%s’"
+msgstr "Comando executado: %s"
+
+#: ../src/cddb_dialog.c:270
+#, fuzzy, c-format
+#| msgid "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
+msgid "Album: ‘%s’, artist: ‘%s’, length: ‘%s’, year: ‘%s’, genre: ‘%s’, disc ID: ‘%s’"
+msgstr "Álbum: \"%s\", artista: \"%s\", duração: \"%s\", ano: \"%s\", gênero: \"%s\", ID: \"%s\""
+
+#: ../src/cddb_dialog.c:586
+#, c-format
+msgid "Resolving host '%s'…"
+msgstr "Resolvendo host \"%s\"…"
+
+#: ../src/cddb_dialog.c:628
+#, fuzzy, c-format
+#| msgid "Cannot create a new socket (%s)"
+msgid "Cannot create a new socket ‘%s’"
+msgstr "Não foi possível criar um novo socket (%s)"
+
+#: ../src/cddb_dialog.c:642
+msgid "Cannot set options on the newly-created socket"
+msgstr "Não foi possível definir as opções no novo socket criado"
+
+#. Open connection to the server.
+#: ../src/cddb_dialog.c:646
+#, fuzzy, c-format
+#| msgid "Connecting to host '%s', port '%d'…"
+msgid "Connecting to host ‘%s’, port ‘%d’…"
+msgstr "Conectando ao host \"%s\", porta \"%d\"…"
+
+#: ../src/cddb_dialog.c:659
+#, fuzzy, c-format
+#| msgid "Cannot connect to host '%s' (%s)"
+msgid "Cannot connect to host ‘%s’: %s"
+msgstr "Não foi possível conectar ao host \"%s\" (%s)"
+
+#: ../src/cddb_dialog.c:683
+#, fuzzy, c-format
+#| msgid "Cannot resolve host '%s' (%s)"
+msgid "Cannot resolve host ‘%s’: %s"
+msgstr "Não foi possível resolver host \"%s\" (%s)"
+
+#: ../src/cddb_dialog.c:696
+#, fuzzy, c-format
+#| msgid "Connected to host '%s'"
+msgid "Connected to host ‘%s’"
+msgstr "Conectado ao host \"%s\""
+
+#: ../src/cddb_dialog.c:783
+#, fuzzy, c-format
+#| msgid "Error while writing CDDB results to file '%s'"
+msgid "Error while writing CDDB results to file ‘%s’"
+msgstr "Erro ao gravar resultado do CDDB no arquivo \"%s\""
+
+#: ../src/cddb_dialog.c:794
+#, c-format
+msgid "Receiving data (%s)…"
+msgstr "Recebendo dados (%s)…"
+
+#: ../src/cddb_dialog.c:807
+#, fuzzy, c-format
+#| msgid "Error when reading CDDB response (%s)"
+msgid "Error when reading CDDB response ‘%s’"
+msgstr "Erro ao ler a resposta do CDDB (%s)"
+
+#: ../src/cddb_dialog.c:814
+#, fuzzy, c-format
+#| msgid "Cannot create file '%s' (%s)"
+msgid "Cannot create file ‘%s’: %s"
+msgstr "Não foi possível criar o arquivo \"%s\" (%s)"
+
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#: ../src/cddb_dialog.c:943 ../src/cddb_dialog.c:1589 ../src/cddb_dialog.c:1927
+msgid "Sending request…"
+msgstr "Enviando requisição…"
+
+#: ../src/cddb_dialog.c:947 ../src/cddb_dialog.c:1593 ../src/cddb_dialog.c:1931 ../src/cddb_dialog.c:3490
+#, fuzzy, c-format
+#| msgid "Cannot send the request (%s)"
+msgid "Cannot send the request ‘%s’"
+msgstr "Não foi possível enviar a requisição (%s)"
+
+#. Read the answer
+#.
+#. * Read the answer
+#.
+#: ../src/cddb_dialog.c:959 ../src/cddb_dialog.c:1620 ../src/cddb_dialog.c:3508
+msgid "Receiving data…"
+msgstr "Recebendo dados…"
+
+#: ../src/cddb_dialog.c:966 ../src/cddb_dialog.c:1627 ../src/cddb_dialog.c:1962 ../src/cddb_dialog.c:3515
+msgid "The server returned a bad response"
+msgstr "O servidor retornou uma resposta incorreta"
+
+#: ../src/cddb_dialog.c:982 ../src/cddb_dialog.c:997 ../src/cddb_dialog.c:1018 ../src/cddb_dialog.c:1640 ../src/cddb_dialog.c:1978 ../src/cddb_dialog.c:3532
+#, fuzzy, c-format
+#| msgid "The server returned a bad response: %s"
+msgid "The server returned a bad response ‘%s’"
+msgstr "O servidor retornou uma resposta incorreta: %s"
+
+#. Load the track list of the album
+#: ../src/cddb_dialog.c:1233
+msgid "Loading album track list…"
+msgstr "Carregando lista das faixas do álbum…"
+
+#: ../src/cddb_dialog.c:1787
+#, c-format
+msgid "Sorry, the web-based search is currently not available"
+msgstr "Desculpe, mas a pesquisa na web não está disponível no momento"
+
+#: ../src/cddb_dialog.c:1789 ../src/cddb_dialog.c:2149
+#, c-format
+msgid "Found one matching album"
+msgid_plural "Found %d matching albums"
+msgstr[0] "Encontrado um álbum coincidente"
+msgstr[1] "Encontrados %d álbuns coincidentes"
+
+#: ../src/cddb_dialog.c:1950
+#, c-format
+msgid "Receiving data of page %d (album %d/%d)…"
+msgstr "Recebendo dados da página %d (álbum %d/%d)…"
+
+#: ../src/cddb_dialog.c:1952
+#, c-format
+msgid "Receiving data of page %d…"
+msgstr "Recebendo dados da página %d…"
+
+#: ../src/cddb_dialog.c:2116
+#, c-format
+msgid "More results to load…"
+msgstr "Mais resultados para carregar…"
+
+#: ../src/cddb_dialog.c:2296
+msgid "The number of CDDB results does not match the number of selected files"
+msgstr "O número de resultados do CDDB não corresponde ao número de arquivos selecionados"
+
+#: ../src/cddb_dialog.c:2302
+msgid "Write Tag from CDDB"
+msgstr "Gravar etiqueta do CDDB"
+
+#: ../src/cddb_dialog.c:3006
+msgid "Ready to search"
+msgstr "Pronto para pesquisar"
+
+#: ../src/cddb_dialog.c:3094 ../src/load_files_dialog.c:261 ../src/setting.c:325
+#, fuzzy, c-format
+#| msgid "Cannot open file '%s' (%s)"
+msgid "Cannot open file ‘%s’: %s"
+msgstr "Não foi possível abrir o arquivo \"%s\" (%s)"
+
+#: ../src/cddb_dialog.c:3321
+#, c-format
+msgid "No file selected"
+msgstr "Nenhum arquivo selecionado"
+
+#. The CD redbook standard defines the maximum number of tracks as 99, any
+#. queries with more than 99 tracks will never return a result.
+#: ../src/cddb_dialog.c:3329
+#, c-format
+msgid "More than 99 files selected. Cannot send request"
+msgstr "Foram selecionados mais de 99 arquivos. Não foi possível enviar a requisição"
+
+#: ../src/cddb_dialog.c:3335
+#, c-format
+msgid "One file selected"
+msgid_plural "%d files selected"
+msgstr[0] "Um arquivo selecionado"
+msgstr[1] "%d arquivos selecionados"
+
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: ../src/cddb_dialog.c:3480
+#, fuzzy, c-format
+#| msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"
+msgid "Sending request (disc ID: %s, #tracks: %d, Disc length: %d)…"
+msgstr "Enviando requisição (CddbId: %s, #faixas: %d, Duração do disco: %d)…"
+
+#: ../src/cddb_dialog.c:3648
+#, fuzzy, c-format
+#| msgid "DiscID '%s' gave one matching album"
+#| msgid_plural "DiscID '%s' gave %d matching albums"
+msgid "DiscID ‘%s’ gave one matching album"
+msgid_plural "DiscID ‘%s’ gave %d matching albums"
+msgstr[0] "DiscID \"%s\" retornou um álbum coincidente"
+msgstr[1] "DiscID \"%s\" retornou %d álbuns coincidentes"
+
+#: ../src/charset.c:46
+msgid "Arabic (IBM-864)"
+msgstr "Árabe (IBM-864)"
+
+#: ../src/charset.c:47
+msgid "Arabic (ISO-8859-6)"
+msgstr "Árabe (ISO-8859-6)"
+
+#: ../src/charset.c:48
+msgid "Arabic (Windows-1256)"
+msgstr "Árabe (Windows-1256)"
+
+#: ../src/charset.c:49
+msgid "Baltic (ISO-8859-13)"
+msgstr "Báltico (ISO-8859-13)"
+
+#: ../src/charset.c:50
+msgid "Baltic (ISO-8859-4)"
+msgstr "Báltico (ISO-8859-4)"
+
+#: ../src/charset.c:51
+msgid "Baltic (Windows-1257)"
+msgstr "Báltico (Windows-1257)"
+
+#: ../src/charset.c:52
+msgid "Celtic (ISO-8859-14)"
+msgstr "Céltico (ISO-8859-14)"
+
+#: ../src/charset.c:53
+msgid "Central European (IBM-852)"
+msgstr "Europeu Central (IBM-852)"
+
+#: ../src/charset.c:54
+msgid "Central European (ISO-8859-2)"
+msgstr "Europeu Central (ISO-8859-2)"
+
+#: ../src/charset.c:55
+msgid "Central European (Windows-1250)"
+msgstr "Europeu Central (Windows-1250)"
+
+#: ../src/charset.c:56
+msgid "Chinese Simplified (GB18030)"
+msgstr "Chinês Simplificado (GB18030)"
+
+#: ../src/charset.c:57
+msgid "Chinese Simplified (GB2312)"
+msgstr "Chinês Simplificado (GB2312)"
 
-#: ../src/easytag.c:1328
-#, c-format
-msgid "Selected files tagged with title '%s'."
-msgstr "Arquivos selecionados etiquetados com o título \"%s\"."
+#: ../src/charset.c:58
+msgid "Chinese Traditional (Big5)"
+msgstr "Chinês Tradicional (Big5)"
 
-#: ../src/easytag.c:1330
-msgid "Removed title from selected files."
-msgstr "Título selecionado dos arquivos selecionados."
+#: ../src/charset.c:59
+msgid "Chinese Traditional (Big5-HKSCS)"
+msgstr "Chinês Tradicional (Big5-HKSCS)"
 
-#: ../src/easytag.c:1345
-#, c-format
-msgid "Selected files tagged with artist '%s'."
-msgstr "Arquivos selecionados etiquetados com o artista \"%s\"."
+#: ../src/charset.c:60
+msgid "Cyrillic (IBM-855)"
+msgstr "Cirílico (IBM-855)"
 
-#: ../src/easytag.c:1347
-msgid "Removed artist from selected files."
-msgstr "Artista removido dos arquivos selecionados."
+#: ../src/charset.c:61
+msgid "Cyrillic (ISO-8859-5)"
+msgstr "Cirílico (ISO-8859-5)"
 
-#: ../src/easytag.c:1361
-#, c-format
-msgid "Selected files tagged with album artist '%s'."
-msgstr "Arquivos selecionados etiquetados com o artista do álbum \"%s\"."
+#: ../src/charset.c:62
+msgid "Cyrillic (ISO-IR-111)"
+msgstr "Cirílico (ISO-IR-111)"
 
-#: ../src/easytag.c:1363
-msgid "Removed album artist from selected files."
-msgstr "Artista do álbum removido dos arquivos selecionados."
+#: ../src/charset.c:63
+msgid "Cyrillic (KOI8-R)"
+msgstr "Cirílico (KOI8-R)"
 
-#: ../src/easytag.c:1378
-#, c-format
-msgid "Selected files tagged with album '%s'."
-msgstr "Arquivos selecionados etiquetados com o álbum \"%s\"."
+#: ../src/charset.c:64
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cirílico (Windows-1251)"
 
-#: ../src/easytag.c:1380
-msgid "Removed album name from selected files."
-msgstr "Nome do álbum removido dos arquivos selecionados."
+#: ../src/charset.c:65
+msgid "Cyrillic/Russian (CP-866)"
+msgstr "Cirílico/Russo (CP-866)"
 
-#: ../src/easytag.c:1417
-#, c-format
-msgid "Selected files tagged with disc number '%s/%s'."
-msgstr "Arquivos selecionados etiquetados com o número do disco \"%s/%s\"."
+#: ../src/charset.c:66
+msgid "Cyrillic/Ukrainian (KOI8-U)"
+msgstr "Cirílico/Ucraniano (KOI8-U)"
 
-#: ../src/easytag.c:1422
-#, c-format
-msgid "Selected files tagged with disc number like 'xx'."
-msgstr "Arquivos selecionados etiquetados com o número do disco como \"xx\"."
+#: ../src/charset.c:67
+msgid "English (US-ASCII)"
+msgstr "Inglês (US-ASCII)"
 
-#: ../src/easytag.c:1427
-msgid "Removed disc number from selected files."
-msgstr "Número do disco removido dos arquivos selecionados."
+#: ../src/charset.c:68
+msgid "Greek (ISO-8859-7)"
+msgstr "Grego (ISO-8859-7)"
 
-#: ../src/easytag.c:1443
-#, c-format
-msgid "Selected files tagged with year '%s'."
-msgstr "Arquivos selecionados etiquetados com o ano \"%s\"."
+#: ../src/charset.c:69
+msgid "Greek (Windows-1253)"
+msgstr "Grego (Windows-1253)"
 
-#: ../src/easytag.c:1445
-msgid "Removed year from selected files."
-msgstr "Ano removido dos arquivos selecionados."
+#: ../src/charset.c:70
+msgid "Hebrew (IBM-862)"
+msgstr "Hebraico (IBM-862)"
 
-#: ../src/easytag.c:1471 ../src/easytag.c:1561
-#, c-format
-msgid "Selected files tagged with track like 'xx/%s'."
-msgstr "Arquivos selecionados etiquetados com a faixa como \"xx/%s\"."
+#: ../src/charset.c:71
+msgid "Hebrew (Windows-1255)"
+msgstr "Hebraico (Windows-1255)"
 
-#: ../src/easytag.c:1474
-#, c-format
-msgid "Selected files tagged with track like 'xx'."
-msgstr "Arquivos selecionados etiquetados com a faixa como \"xx\"."
+#: ../src/charset.c:72
+msgid "Japanese (EUC-JP)"
+msgstr "Japonês (EUC-JP)"
 
-#: ../src/easytag.c:1478 ../src/easytag.c:1564
-msgid "Removed track number from selected files."
-msgstr "Número da faixa removido dos arquivos selecionados."
+#: ../src/charset.c:73
+msgid "Japanese (ISO-2022-JP)"
+msgstr "Japonês (ISO-2022-JP)"
 
-#. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1534
-#, c-format
-msgid "Selected tracks numbered sequentially."
-msgstr "Faixas selecionadas numeradas sequencialmente."
+#: ../src/charset.c:74
+msgid "Japanese (Shift_JIS)"
+msgstr "Japonês (Shift_JIS)"
 
-#: ../src/easytag.c:1580
-#, c-format
-msgid "Selected files tagged with genre '%s'."
-msgstr "Arquivos selecionados etiquetados com o gênero \"%s\"."
+#: ../src/charset.c:75
+msgid "Korean (EUC-KR)"
+msgstr "Coreano (EUC-KR)"
 
-#: ../src/easytag.c:1582
-msgid "Removed genre from selected files."
-msgstr "Gênero removido dos arquivos selecionados."
+#: ../src/charset.c:76
+msgid "Nordic (ISO-8859-10)"
+msgstr "Nórdico (ISO-8859-10)"
 
-#: ../src/easytag.c:1604
-#, c-format
-msgid "Selected files tagged with comment '%s'."
-msgstr "Arquivos selecionados etiquetados com o comentário \"%s\"."
+#: ../src/charset.c:77
+msgid "South European (ISO-8859-3)"
+msgstr "Sul Europeu (ISO-8859-3)"
 
-#: ../src/easytag.c:1606
-msgid "Removed comment from selected files."
-msgstr "Comentário removido dos arquivos selecionados."
+#: ../src/charset.c:78
+msgid "Thai (TIS-620)"
+msgstr "Tailandês (TIS-620)"
 
-#: ../src/easytag.c:1620
-#, c-format
-msgid "Selected files tagged with composer '%s'."
-msgstr "Arquivos selecionados etiquetados com o compositor \"%s\"."
+#: ../src/charset.c:79
+msgid "Turkish (IBM-857)"
+msgstr "Turco (IBM-857)"
 
-#: ../src/easytag.c:1622
-msgid "Removed composer from selected files."
-msgstr "Compositor removido dos arquivos selecionados."
+#: ../src/charset.c:80
+msgid "Turkish (ISO-8859-9)"
+msgstr "Turco (ISO-8859-9)"
 
-#: ../src/easytag.c:1637
-#, c-format
-msgid "Selected files tagged with original artist '%s'."
-msgstr "Arquivos selecionados etiquetados com o artista original \"%s\"."
+#: ../src/charset.c:81
+msgid "Turkish (Windows-1254)"
+msgstr "Turco (Windows-1254)"
 
-#: ../src/easytag.c:1639
-msgid "Removed original artist from selected files."
-msgstr "Artista original removido dos arquivos selecionados."
+#. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
+#: ../src/charset.c:83
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
 
-#: ../src/easytag.c:1654
-#, c-format
-msgid "Selected files tagged with copyright '%s'."
-msgstr "Arquivos selecionados etiquetados com o copyright \"%s\"."
+#. {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:90
+msgid "Vietnamese (VISCII)"
+msgstr "Vietnamita (VISCII)"
 
-#: ../src/easytag.c:1656
-msgid "Removed copyright from selected files."
-msgstr "Copyright removido dos arquivos selecionados."
+#: ../src/charset.c:91
+msgid "Vietnamese (Windows-1258)"
+msgstr "Vietnamita (Windows-1258)"
 
-#: ../src/easytag.c:1671
-#, c-format
-msgid "Selected files tagged with URL '%s'."
-msgstr "Arquivos selecionados etiquetados com a URL \"%s\"."
+#: ../src/charset.c:92
+msgid "Visual Hebrew (ISO-8859-8)"
+msgstr "Hebraico Visual (ISO-8859-8)"
 
-#: ../src/easytag.c:1673
-msgid "Removed URL from selected files."
-msgstr "URL removida dos arquivos selecionados."
+#: ../src/charset.c:93
+msgid "Western (IBM-850)"
+msgstr "Ocidental (IBM-850)"
 
-#: ../src/easytag.c:1688
-#, c-format
-msgid "Selected files tagged with encoder name '%s'."
-msgstr "Arquivos selecionados etiquetados com o nome do codificador \"%s\"."
+#: ../src/charset.c:94
+msgid "Western (ISO-8859-1)"
+msgstr "Ocidental (ISO-8859-1)"
 
-#: ../src/easytag.c:1690
-msgid "Removed encoder name from selected files."
-msgstr "Nome do codificador removido dos arquivos selecionados."
+#: ../src/charset.c:95
+msgid "Western (ISO-8859-15)"
+msgstr "Ocidental (ISO-8859-15)"
 
-#: ../src/easytag.c:1722
-msgid "Selected files tagged with images."
-msgstr "Arquivos selecionados etiquetados com imagens."
+#: ../src/charset.c:96
+msgid "Western (Windows-1252)"
+msgstr "Ocidental (Windows-1252)"
 
-#: ../src/easytag.c:1724
-msgid "Removed images from selected files."
-msgstr "Imagens removidas dos arquivos selecionados."
+#: ../src/charset.c:508
+#, fuzzy, c-format
+#| msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
+msgid "The filename ‘%s’ could not be converted into UTF-8: %s"
+msgstr "O nome de arquivo \"%s\" não pôde ser convertido em UTF-8 (%s)."
 
-#: ../src/easytag.c:2005
-msgid "Select Mode and Mask, and redo the same action"
-msgstr "Seleciona modo e máscara e refaz a mesma ação"
+#: ../src/charset.c:510 ../src/charset.c:623 ../src/charset.c:688
+msgid "Invalid UTF-8"
+msgstr "UTF-8 inválido"
 
-#: ../src/easytag.c:2057
-msgid "All tags have been scanned"
-msgstr "Todas as etiquetas foram verificadas"
+#: ../src/charset.c:621
+#, fuzzy, c-format
+#| msgid "The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
+msgid "The UTF-8 string ‘%s’ could not be converted into filename encoding: %s"
+msgstr "O texto em UTF-8 \"%s\" não pôde ser convertido na codificação do nome de arquivo (%s)."
 
-#: ../src/easytag.c:2113
-msgid "All tags have been removed"
-msgstr "Todas as etiquetas foram removidas"
+#: ../src/charset.c:686
+#, fuzzy, c-format
+#| msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
+msgid "The string ‘%s’ could not be converted into UTF-8: %s"
+msgstr "O texto \"%s\" não pôde ser convertido em UTF-8 (%s)."
 
-#: ../src/easytag.c:2418
-#, c-format
+#: ../src/easytag.c:243
+#, fuzzy, c-format
+#| msgid "A file was changed by an external program"
+#| msgid_plural "%d files were changed by an external program."
 msgid "A file was changed by an external program"
-msgid_plural "%d files were 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:2423
+#: ../src/easytag.c:252
 msgid "Do you want to continue saving the file?"
 msgstr "Você deseja continuar salvando o arquivo?"
 
-#: ../src/easytag.c:2481 ../src/easytag.c:2501
+#: ../src/easytag.c:313 ../src/easytag.c:334
 msgid "Saving files was stopped"
 msgstr "O salvamento de arquivos foi interrompido"
 
-#: ../src/easytag.c:2503
+#: ../src/easytag.c:336
 msgid "All files have been saved"
 msgstr "Todas os arquivos foram salvos"
 
-#: ../src/easytag.c:2638
-#, c-format
-msgid "Cannot delete file (%s)"
-msgstr "Não foi possível excluir o arquivo (%s)"
-
-#: ../src/easytag.c:2659
-msgid "Files have been partially deleted"
-msgstr "Os arquivos foram parcialmente excluídos"
-
-#: ../src/easytag.c:2661
-msgid "All files have been deleted"
-msgstr "Todos os arquivos foram excluídos"
-
-#: ../src/easytag.c:2777
-#, c-format
-msgid "Do you want to write the tag of file '%s'?"
+#: ../src/easytag.c:455
+#, fuzzy, c-format
+#| msgid "Do you want to write the tag of file '%s'?"
+msgid "Do you want to write the tag of file ‘%s’?"
 msgstr "Você deseja gravar a etiqueta do arquivo \"%s\"?"
 
-#: ../src/easytag.c:2779
+#: ../src/easytag.c:457
 msgid "Confirm Tag Writing"
 msgstr "Confirmar gravação de etiqueta"
 
-#: ../src/easytag.c:2784 ../src/easytag.c:2904 ../src/easytag.c:3167
-msgid "Repeat action for the remaining files"
-msgstr "Repita esta ação para o resto dos arquivos"
-
 #. Directories and filename changed
-#: ../src/easytag.c:2868 ../src/scan_dialog.c:183
+#: ../src/easytag.c:558
 msgid "Rename File and Directory"
 msgstr "Renomear arquivo e diretório"
 
-#: ../src/easytag.c:2869
+#: ../src/easytag.c:559
 msgid "File and directory rename confirmation required"
 msgstr "É necessário confirmação para renomear arquivo e diretório"
 
-#: ../src/easytag.c:2870
-#, c-format
-msgid "Do you want to rename the file and directory '%s' to '%s'?"
+#: ../src/easytag.c:560
+#, fuzzy, c-format
+#| msgid "Do you want to rename the file and directory '%s' to '%s'?"
+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:2876
+#: ../src/easytag.c:566
 msgid "Directory rename confirmation required"
 msgstr "É necessário confirmação para renomear diretório"
 
-#: ../src/easytag.c:2877
-#, c-format
-msgid "Do you want to rename the directory '%s' to '%s'?"
+#: ../src/easytag.c:567
+#, fuzzy, c-format
+#| msgid "Do you want to rename the directory '%s' to '%s'?"
+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:2883
-msgid "Rename File"
-msgstr "Renomear arquivo"
-
-#: ../src/easytag.c:2884
+#: ../src/easytag.c:575
 msgid "File rename confirmation required"
 msgstr "É necessário confirmação para renomear o arquivo"
 
-#: ../src/easytag.c:2885
-#, c-format
-msgid "Do you want to rename the file '%s' to '%s'?"
+#: ../src/easytag.c:576
+#, fuzzy, c-format
+#| msgid "Do you want to rename the file '%s' to '%s'?"
+msgid "Do you want to rename the file ‘%s’ to ‘%s’?"
 msgstr "Você deseja renomear o arquivo \"%s\" para \"%s\"?"
 
-#: ../src/easytag.c:2951
-#, c-format
-msgid "Cannot rename file '%s' to '%s'"
+#: ../src/easytag.c:648
+#, fuzzy, c-format
+#| msgid "Cannot rename file '%s' to '%s'"
+msgid "Cannot rename file ‘%s’ to ‘%s’"
 msgstr "Não foi possível renomear o arquivo \"%s\" para \"%s\""
 
-#: ../src/easytag.c:2965
-#, c-format
-msgid "Cannot rename file '%s' to '%s': %s"
+#: ../src/easytag.c:662
+#, fuzzy, c-format
+#| msgid "Cannot rename file '%s' to '%s': %s"
+msgid "Cannot rename file ‘%s’ to ‘%s’: %s"
 msgstr "Não foi possível renomear o arquivo \"%s\" para \"%s\": %s"
 
-#: ../src/easytag.c:2969
+#: ../src/easytag.c:667
 msgid "File(s) not renamed"
 msgstr "Arquivo(s) não renomeado(s)"
 
-#: ../src/easytag.c:3081
-#, c-format
-msgid "Writing tag of '%s'"
+#: ../src/easytag.c:855
+#, fuzzy, c-format
+#| msgid "Writing tag of '%s'"
+msgid "Writing tag of ‘%s’"
 msgstr "Gravando etiqueta em \"%s\""
 
-#: ../src/easytag.c:3088
-msgid "Tag(s) written"
-msgstr "Etiqueta(s) gravada(s)"
-
-#: ../src/easytag.c:3103
-#, 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:863
+#, fuzzy, c-format
+#| msgid "Written tag of '%s'"
+msgid "Wrote tag of ‘%s’"
+msgstr "Gravada etiqueta de '%s'"
 
-#: ../src/easytag.c:3116
-#, c-format
-msgid "Cannot write tag in file '%s'"
+#: ../src/easytag.c:879
+#, fuzzy, c-format
+#| msgid "Cannot write tag in file '%s'"
+msgid "Cannot write tag in file ‘%s’"
 msgstr "Não foi possível gravar a etiqueta no arquivo \"%s\""
 
-#: ../src/easytag.c:3119
+#: ../src/easytag.c:883
 msgid "Tag Write Error"
 msgstr "Erro de gravação de etiqueta"
 
-#: ../src/easytag.c:3164 ../src/easytag.c:3178
-#, c-format
-msgid "Do you really want to delete the file '%s'?"
-msgstr "Você deseja mesmo excluir o arquivo \"%s\"?"
-
-#: ../src/easytag.c:3170 ../src/easytag.c:3180
-msgid "Delete File"
-msgstr "Excluir arquivo"
-
-#: ../src/easytag.c:3205
-#, c-format
-msgid "File '%s' deleted"
-msgstr "Arquivo \"%s\" excluído"
-
-#: ../src/easytag.c:3340
-#, c-format
-msgid "Cannot read directory '%s'"
+#: ../src/easytag.c:958 ../src/easytag.c:1186
+#, fuzzy, c-format
+#| msgid "Cannot read directory '%s'"
+msgid "Cannot read directory ‘%s’"
 msgstr "Não foi possível ler o diretório \"%s\""
 
-#: ../src/easytag.c:3344
+#: ../src/easytag.c:962
 msgid "Directory Read Error"
 msgstr "Erro de leitura do diretório"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3365
+#: ../src/easytag.c:983
 #, c-format
 msgid "Search in progress…"
 msgstr "Pesquisa em progresso…"
 
-#: ../src/easytag.c:3388 ../src/et_core.c:2865
-#, c-format
-msgid "File: '%s'"
+#: ../src/easytag.c:1007 ../src/et_core.c:2962
+#, fuzzy, c-format
+#| msgid "File: '%s'"
+msgid "File: ‘%s’"
 msgstr "Arquivo: \"%s\""
 
-#: ../src/easytag.c:3438
+#: ../src/easytag.c:1054
 #, 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:3445
+#: ../src/easytag.c:1061
 #, 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:3467
+#: ../src/easytag.c:1078
 msgid "No file found in this directory and subdirectories"
 msgstr "Nenhum arquivo encontrado nesse diretório e subdiretórios"
 
-#: ../src/easytag.c:3469
+#: ../src/easytag.c:1080
 msgid "No file found in this directory"
 msgstr "Nenhum arquivo encontrado neste diretório"
 
-#: ../src/easytag.c:3537
-#, c-format
-msgid "Error opening directory '%s' (%s)"
+#: ../src/easytag.c:1150
+#, fuzzy, c-format
+#| msgid "Error opening directory '%s' (%s)"
+msgid "Error opening directory ‘%s’: %s"
 msgstr "Erro ao abrir o diretório \"%s\" (%s)"
 
-#: ../src/easytag.c:3573
-#, c-format
-msgid "Cannot read directory (%s)"
-msgstr "Não foi possível ler o diretório (%s)"
-
-#: ../src/easytag.c:3593
-msgid "Searching for audio files…"
-msgstr "Pesquisa por arquivos de áudio…"
-
-#: ../src/easytag.c:3594
-msgid "Searching"
-msgstr "Pesquisando"
-
-#: ../src/easytag.c:4260
-msgid "Select a directory to browse"
-msgstr "Seleciona um diretório para navegar"
-
-#. Menu items
-#: ../src/easytag.c:4406
-msgid "Tag selected files with this field"
-msgstr "Etiquetar arquivos selecionados com esse campo"
-
-#: ../src/easytag.c:4418 ../src/scan_dialog.c:2128
-msgid "Convert '_' and '%20' to spaces"
-msgstr "Converter \"_\" e \"%20\" para espaços"
-
-#: ../src/easytag.c:4425 ../src/scan_dialog.c:2130
-msgid "Convert ' ' to '_'"
-msgstr "Converter \" \" para \"_\""
-
-#: ../src/easytag.c:4436
-msgid "All uppercase"
-msgstr "Todas maiúsculas"
-
-#: ../src/easytag.c:4443
-msgid "All lowercase"
-msgstr "Todas minúsculas"
-
-#: ../src/easytag.c:4450
-msgid "First letter uppercase"
-msgstr "Primeira letra maiúscula"
-
-#: ../src/easytag.c:4457
-msgid "First letter uppercase of each word"
-msgstr "Primeira letra de cada palavra maiúscula"
-
-#: ../src/easytag.c:4468 ../src/prefs.c:1023 ../src/scan_dialog.c:2254
-msgid "Remove spaces"
-msgstr "Remover espaços"
-
-#: ../src/easytag.c:4475
-msgid "Insert space before uppercase letter"
-msgstr "Inserir espaço antes da letra maiúscula"
-
-#: ../src/easytag.c:4482
-msgid "Remove duplicate spaces or underscores"
-msgstr "Remover espaços e sublinhados duplicados"
-
-#: ../src/easytag.c:4489
-msgid "Remove all text"
-msgstr "Remover todo texto"
-
-#: ../src/easytag.c:4508
-msgid "EasyTAG: Normal exit."
-msgstr "EasyTAG: Saída normal."
-
-#: ../src/easytag.c:4560
-msgid "Do you want to save them before quitting?"
-msgstr "Você deseja salvá-los antes de sair?"
-
-#: ../src/easytag.c:4587
-msgid "Do you really want to quit?"
-msgstr "Você realmente deseja sair?"
-
-#: ../src/et_core.c:551
-#, c-format
-msgid "Error reading tag from ogg file (%s)"
-msgstr "Erro ao ler a etiqueta do arquivo off (%s)"
-
-#: ../src/et_core.c:580
-#, c-format
-msgid "Error reading tag from Opus file (%s)"
-msgstr "Erro ao ler a etiqueta do arquivo Opus (%s)"
-
-#: ../src/et_core.c:723
-#, c-format
-msgid "Automatic corrections applied for file '%s'."
-msgstr "Correções automáticas aplicadas no arquivo \"%s\"."
-
-#: ../src/et_core.c:2748
-msgid "ID3 Tag"
-msgstr "Etiqueta ID3"
-
-#: ../src/et_core.c:2754
-msgid "Ogg Vorbis Tag"
-msgstr "Etiqueta Ogg Vorbis"
-
-#: ../src/et_core.c:2760
-msgid "FLAC Vorbis Tag"
-msgstr "Etiqueta FLAC"
-
-#: ../src/et_core.c:2765
-msgid "APE Tag"
-msgstr "Etiqueta APE"
-
-#: ../src/et_core.c:2770
-msgid "MP4/M4A/AAC Tag"
-msgstr "Etiqueta MP4/M4A/AAC"
-
-#: ../src/et_core.c:2776
-msgid "Wavpack Tag"
-msgstr "Etiqueta Wavpack"
-
-#: ../src/et_core.c:2782
-msgid "Opus Tag"
-msgstr "Etiqueta Opus"
-
-#: ../src/et_core.c:2802
-msgid "MP3 File"
-msgstr "Arquivo MP3"
-
-#: ../src/et_core.c:2806
-msgid "MP2 File"
-msgstr "Arquivo MP2"
-
-#: ../src/et_core.c:2812
-msgid "Ogg Vorbis File"
-msgstr "Arquivo Ogg Vorbis"
+#: ../src/easytag.c:1206
+msgid "Searching for audio files…"
+msgstr "Pesquisa por arquivos de áudio…"
 
-#: ../src/et_core.c:2818
-msgid "Speex File"
-msgstr "Arquivo Speex"
+#: ../src/easytag.c:1207
+msgid "Searching"
+msgstr "Pesquisando"
 
-#: ../src/et_core.c:2824
-msgid "FLAC File"
-msgstr "Arquivo FLAC"
+#: ../src/easytag.c:1208
+msgid "_Stop"
+msgstr ""
 
-#: ../src/et_core.c:2829
-msgid "MusePack File"
-msgstr "Arquivo MusePack"
+#: ../src/et_core.c:507
+#, fuzzy, c-format
+#| msgid "Error reading tag from ogg file (%s)"
+msgid "Error reading tag from Ogg file ‘%s’: %s"
+msgstr "Erro ao ler a etiqueta do arquivo off (%s)"
 
-# http://www.monkeysaudio.com/ (MAC)
-#: ../src/et_core.c:2833
-msgid "Monkey's Audio File"
-msgstr "Arquivo Monkey's audio"
+#: ../src/et_core.c:518
+#, fuzzy, c-format
+#| msgid "Error reading tags from file: '%s'"
+msgid "Error reading tag from FLAC file ‘%s’: %s"
+msgstr "Erro na leitura das etiquetas o arquivo: \"%s\""
 
-#: ../src/et_core.c:2838
-msgid "MP4/AAC File"
-msgstr "Arquivo MP4/AAC"
+#: ../src/et_core.c:528
+#, fuzzy, c-format
+#| msgid "Error reading tags from file: '%s'"
+msgid "Error reading APE tag from file ‘%s’: %s"
+msgstr "Erro na leitura das etiquetas o arquivo: \"%s\""
 
-#: ../src/et_core.c:2844
-msgid "Wavpack File"
-msgstr "Arquivo Wavpack"
+#: ../src/et_core.c:538
+#, fuzzy, c-format
+#| msgid "Error reading tags from file: '%s'"
+msgid "Error reading tag from MP4 file ‘%s’: %s"
+msgstr "Erro na leitura das etiquetas o arquivo: \"%s\""
 
-#: ../src/et_core.c:2850
-msgid "Opus File"
-msgstr "Arquivo Opus"
+#: ../src/et_core.c:549
+#, fuzzy, c-format
+#| msgid "Error reading tags from file: '%s'"
+msgid "Error reading tag from WavPack file ‘%s’: %s"
+msgstr "Erro na leitura das etiquetas o arquivo: \"%s\""
 
-#: ../src/et_core.c:2909 ../src/et_core.c:2964
-msgid "File not found"
-msgstr "Arquivo não localizado"
+#: ../src/et_core.c:560
+#, fuzzy, c-format
+#| msgid "Error reading tag from Opus file (%s)"
+msgid "Error reading tag from Opus file ‘%s’: %s"
+msgstr "Erro ao ler a etiqueta do arquivo Opus (%s)"
 
-#: ../src/et_core.c:2914
+#: ../src/et_core.c:576
 #, c-format
-msgid "Cannot query file information (%s)"
-msgstr "Não foi possível consultar a informação de arquivo (%s)"
+msgid "The year value ‘%s’ seems to be invalid in file ‘%s’. The information will be lost when saving"
+msgstr "O valor de ano \"%s\" parece ser inválido no arquivo \"%s\". A informação será perdida ao salvar"
 
-#: ../src/et_core.c:2948
-msgid "Read-only file"
-msgstr "Arquivo somente leitura"
+#: ../src/et_core.c:711
+#, fuzzy, c-format
+#| msgid "Automatic corrections applied for file '%s'."
+msgid "Automatic corrections applied for file ‘%s’"
+msgstr "Correções automáticas aplicadas no arquivo \"%s\"."
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:3012
+#: ../src/et_core.c:2986
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
 msgstr[0] "Um arquivo"
 msgstr[1] "%u arquivos"
 
-#: ../src/et_core.c:3216
-#, c-format
-msgid "Images (%d)"
-msgstr "Imagens (%d)"
-
 #. Bitrate
-#: ../src/et_core.c:3258 ../src/flac_header.c:205
-#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.cc:132
-#: ../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
+#: ../src/et_core.c:3017 ../src/tags/flac_header.c:179 ../src/tags/monkeyaudio_header.c:82 ../src/tags/mp4_header.cc:144 ../src/tags/mpeg_header.c:239 ../src/tags/musepack_header.c:86 ../src/tags/ogg_header.c:410 ../src/tags/opus_header.c:227
+#: ../src/tags/wavpack_header.c:119
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: ../src/et_core.c:3263 ../src/flac_header.c:210
-#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.cc:137
-#: ../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
+#: ../src/et_core.c:3020 ../src/tags/flac_header.c:182 ../src/tags/monkeyaudio_header.c:85 ../src/tags/mp4_header.cc:148 ../src/tags/mpeg_header.c:244 ../src/tags/musepack_header.c:89 ../src/tags/ogg_header.c:413 ../src/tags/opus_header.c:230
+#: ../src/tags/wavpack_header.c:122
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/et_core.c:3409 ../src/scan_dialog.c:688
-#, c-format
-msgid "Could not convert filename '%s' into system filename encoding"
-msgstr ""
-"Não foi possível converter o nome do arquivo \"%s\" para um nome de arquivo "
-"na codificação do sistema"
+#: ../src/et_core.c:3149
+#, fuzzy, c-format
+#| msgid "Could not convert filename '%s' into system filename encoding"
+msgid "Could not convert filename ‘%s’ to 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:3411
+#: ../src/et_core.c:3151
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Tente definir a variável de ambiente G_FILENAME_ENCODING."
 
-#: ../src/et_core.c:3412 ../src/scan_dialog.c:690
+#: ../src/et_core.c:3152 ../src/scan_dialog.c:721
 msgid "Filename translation"
 msgstr "Tradução do nome do arquivo"
 
-#: ../src/et_core.c:4117
-#, 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)"
-
-#. Mode
-#. Mode
-#. mpeg4ip library seems to always return -1
-#. Mode
-#: ../src/flac_header.c:215 ../src/mp4_header.cc:143 ../src/ogg_header.c:411
-#: ../src/opus_header.c:237 ../src/wavpack_header.c:88
-msgid "Channels:"
-msgstr "Canais:"
-
-#: ../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 "Erro ao abrir o arquivo: \"%s\" como FLAC (%s)."
-
-#: ../src/flac_tag.c:352 ../src/ogg_tag.c:304
-#, c-format
-msgid ""
-"The year value '%s' seems to be invalid in file '%s'. The information will "
-"be lost while saving tag."
-msgstr ""
-"O valor de ano \"%s\" parece ser inválido no arquivo \"%s\". A informação "
-"será perdida ao salvar a etiqueta."
-
-#: ../src/flac_tag.c:1061
-#, c-format
-msgid "Picture block isn't valid: '%s'"
-msgstr "O bloco da imagem não é válido: \"%s\""
-
-#: ../src/flac_tag.c:1094
-#, c-format
-msgid "Error: Failed to write comments to file '%s' (%s)."
-msgstr "Erro: Falha ao gravar comentários no arquivo \"%s\" (%s)."
-
-#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1161
-#, c-format
-msgid "Written tag of '%s'"
-msgstr "Gravada etiqueta de '%s'"
+#: ../src/file_area.c:279 ../src/file_area.c:334
+msgid "File not found"
+msgstr "Arquivo não localizado"
 
-#: ../src/id3_tag.c:205
-#, c-format
-msgid "Error while reading file: '%s' (%s)"
-msgstr "Erro ao ler o arquivo: \"%s\" (%s)"
+#: ../src/file_area.c:284 ../src/load_files_dialog.c:221
+#, fuzzy, c-format
+#| msgid "Cannot query file information (%s)"
+msgid "Cannot query file information ‘%s’"
+msgstr "Não foi possível consultar a informação de arquivo (%s)"
 
-#: ../src/id3_tag.c:217
-#, c-format
-msgid ""
-"As the following corrupted file '%s' will cause an error in id3lib, it will "
-"not be processed"
-msgstr ""
-"Como o seguinte arquivo corrompido \"%s\" causaria um erro na id3lib, ele "
-"não será processado pelo programa."
+#: ../src/file_area.c:318
+msgid "Read-only file"
+msgstr "Arquivo somente leitura"
 
-#: ../src/id3_tag.c:219
-msgid "Corrupted file"
-msgstr "Arquivo corrompido"
+#: ../src/load_files_dialog.c:291
+#, fuzzy, c-format
+#| msgid "Error reading file (%s)"
+msgid "Error reading file ‘%s’"
+msgstr "Erro na leitura do arquivo (%s)"
 
-#: ../src/id3_tag.c:592
-#, c-format
-msgid "Removed tag of '%s'"
-msgstr "Removida etiqueta de \"%s\""
+#: ../src/load_files_dialog.c:628 ../src/load_files_dialog.c:731
+msgid "Insert a blank line"
+msgstr "Inserir uma linha em branco"
 
-#: ../src/id3_tag.c:596 ../src/id3_tag.c:696
-#, c-format
-msgid "Error while removing ID3v1 tag of '%s' (%s)"
-msgstr "Erro ao remover etiqueta ID3v1 de \"%s\" (%s)"
+#: ../src/load_files_dialog.c:632 ../src/load_files_dialog.c:735
+msgid "Delete this line"
+msgstr "Excluir esta linha"
 
-#: ../src/id3_tag.c:598 ../src/id3_tag.c:668
-#, c-format
-msgid "Error while removing ID3v2 tag of '%s' (%s)"
-msgstr "Erro ao remover etiqueta ID3v2 de \"%s\" (%s)"
+#: ../src/load_files_dialog.c:643 ../src/load_files_dialog.c:746
+#, fuzzy
+#| msgid "Move up this line"
+msgid "Move this line up"
+msgstr "Mover esta linha para cima"
 
-#: ../src/id3_tag.c:617
-#, c-format
-msgid "Error while updating ID3v2 tag of '%s' (%s)"
-msgstr "Erro ao atualizar etiqueta ID3v2 de \"%s\" (%s)"
+#: ../src/load_files_dialog.c:647 ../src/load_files_dialog.c:750
+#, fuzzy
+#| msgid "Move up this line"
+msgid "Move this line down"
+msgstr "Mover esta linha para cima"
 
-#: ../src/id3_tag.c:645
-msgid ""
-"You have tried to save this tag to Unicode but it was detected that your "
-"version of id3lib is buggy"
-msgstr ""
-"Você tentou salvar esta etiqueta em Unicode, mas foi detectado que sua "
-"versão de id3lib está defeituosa"
+#: ../src/load_files_dialog.c:893
+msgid "Load Filenames From a Text File"
+msgstr "Carregar os nomes dos arquivos de um arquivo texto"
 
-#: ../src/id3_tag.c:647
-#, 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 is available in "
-"the EasyTAG package sources.\n"
-"Note that this message will appear only once.\n"
-"\n"
-"File: %s"
-msgstr ""
-"Se você recarregar esse arquivo, alguns caracteres na etiqueta podem não ser "
-"exibidos corretamente. Por favor, aplique o patch src/id3lib/"
-"patch_id3lib_3.8.3_UTF16_writing_bug.diff no id3lib, o qual está disponível "
-"no pacote das fontes do EasyTAG.\n"
-"Saiba que essa mensagem só aparecerá uma vez.\n"
-"\n"
-"Arquivo: %s"
+#: ../src/misc.c:204
+msgid "You must type a program name"
+msgstr "Você deve digitar o nome de um programa"
 
-#: ../src/id3_tag.c:654
-msgid "Buggy id3lib"
-msgstr "id3lib defeituoso"
+#: ../src/misc.c:205
+msgid "Program Name Error"
+msgstr "Erro no nome do programa"
 
-#: ../src/id3_tag.c:688
-#, c-format
-msgid "Error while updating ID3v1 tag of '%s' (%s)"
-msgstr "Erro ao atualizar etiqueta ID3v1 de \"%s\" (%s)"
+#: ../src/picture.c:174
+msgid "JPEG image"
+msgstr "Imagem JPEG"
 
-#: ../src/id3_tag.c:702 ../src/id3v24_tag.c:1108
-#, c-format
-msgid "Updated tag of '%s'"
-msgstr "Etiqueta atualizada de \"%s\""
+#: ../src/picture.c:176
+msgid "PNG image"
+msgstr "Imagem PNG"
 
-#: ../src/id3_tag.c:721
-msgid "No error reported"
-msgstr "Nenhum erro relatado"
+#: ../src/picture.c:178
+msgid "GIF image"
+msgstr "Imagem GIF"
 
-#: ../src/id3_tag.c:723
-msgid "No available memory"
-msgstr "Sem memória disponível"
+#: ../src/picture.c:180
+msgid "Unknown image"
+msgstr "Imagem desconhecida"
 
-#: ../src/id3_tag.c:725
-msgid "No data to parse"
-msgstr "Sem dados para analisar"
+#: ../src/picture.c:192
+#, fuzzy
+#| msgid "32x32 pixel PNG file icon"
+msgid "32×32 pixel PNG file icon"
+msgstr "32x32 pixels: ícone de arquivo PNG"
 
-#: ../src/id3_tag.c:727
-msgid "Improperly formatted data"
-msgstr "Dados formatados incorretamente"
+#: ../src/picture.c:194
+msgid "Other file icon"
+msgstr "Outro ícone de arquivo"
 
-#: ../src/id3_tag.c:729
-msgid "No buffer to write to"
-msgstr "Sem buffer para gravar para"
+#: ../src/picture.c:196
+msgid "Cover (front)"
+msgstr "Capa (frente)"
 
-#: ../src/id3_tag.c:731
-msgid "Buffer is too small"
-msgstr "Buffer é muito pequeno"
+#: ../src/picture.c:198
+msgid "Cover (back)"
+msgstr "Capa (atrás)"
 
-#: ../src/id3_tag.c:733
-msgid "Invalid frame ID"
-msgstr "ID do quadro inválido"
+#: ../src/picture.c:200
+msgid "Leaflet page"
+msgstr "Página do folheto"
 
-#: ../src/id3_tag.c:735
-msgid "Requested field not found"
-msgstr "Campo requerido não encontrado"
+#: ../src/picture.c:202
+#, fuzzy
+#| msgid "Media (e.g. label side of CD)"
+msgid "Media (such as label side of CD)"
+msgstr "Mídia (ex.: lado do rótulo do CD)"
 
-#: ../src/id3_tag.c:737
-msgid "Unknown field type"
-msgstr "Tipo de campo desconhecido"
+#: ../src/picture.c:204
+msgid "Lead artist/lead performer/soloist"
+msgstr "Artista principal/músico principal/solista"
 
-#: ../src/id3_tag.c:739
-msgid "Tag is already attached to a file"
-msgstr "Etiqueta já está anexada ao arquivo"
+#: ../src/picture.c:206
+msgid "Artist/performer"
+msgstr "Artista/músico"
 
-#: ../src/id3_tag.c:741
-msgid "Invalid tag version"
-msgstr "Versão da etiqueta inválida"
+#: ../src/picture.c:208
+msgid "Conductor"
+msgstr "Maestro"
 
-#: ../src/id3_tag.c:743
-msgid "No file to parse"
-msgstr "Nenhum arquivo para analisar"
+#: ../src/picture.c:210
+msgid "Band/Orchestra"
+msgstr "Banda/orquestra"
 
-#: ../src/id3_tag.c:745
-msgid "Attempting to write to a read-only file"
-msgstr "Tentando gravar em um arquivo somente-leitura"
+#: ../src/picture.c:214
+msgid "Lyricist/text writer"
+msgstr "Letrista/escritor"
 
-#: ../src/id3_tag.c:747
-msgid "Error in compression/uncompression"
-msgstr "Erro na compressão/descompressão"
+#: ../src/picture.c:216
+msgid "Recording location"
+msgstr "Local da gravação"
 
-#: ../src/id3_tag.c:749
-msgid "Unknown error message"
-msgstr "Mensagem de erro desconhecida"
+#: ../src/picture.c:218
+msgid "During recording"
+msgstr "Duração da gravação"
 
-#: ../src/id3_tag.c:1357
-#, c-format
-msgid "Error while creating temporary file: '%s'"
-msgstr "Erro ao criar um arquivo temporário: \"%s\""
+#: ../src/picture.c:220
+msgid "During performance"
+msgstr "Duração da performance"
 
-#: ../src/id3_tag.c:1364
-msgid "Error while creating temporary file"
-msgstr "Erro ao criar um arquivo temporário"
+#: ../src/picture.c:222
+msgid "Movie/video screen capture"
+msgstr "Captura de tela de filme/vídeo"
 
-#: ../src/id3_tag.c:1384
-#, c-format
-msgid "Error while writing to file: '%s' (%s)"
-msgstr "Erro ao gravar no arquivo: \"%s\" (%s)"
+#: ../src/picture.c:224
+msgid "A bright colored fish"
+msgstr "Um peixe de cores fortes"
 
-#. 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:1563
-#, 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] "Não foi possível gravar etiqueta do arquivo ‘%s’ (um byte em falta)"
-msgstr[1] ""
-"Não foi possível gravar etiqueta do arquivo ‘%s’ (%s bytes em falta)"
+#: ../src/picture.c:226
+msgid "Illustration"
+msgstr "Ilustração"
 
-#: ../src/id3v24_tag.c:1584
-#, c-format
-msgid "Cannot save tag of file '%s'"
-msgstr "Não foi possível gravar a etiqueta do arquivo \"%s\""
+#: ../src/picture.c:228
+msgid "Band/Artist logotype"
+msgstr "Logotipo da banda/artista"
 
-#: ../src/id3v24_tag.c:1595
-#, c-format
-msgid "Size error while saving tag of '%s'"
-msgstr "Erro ao salvar etiqueta de \"%s\""
+#: ../src/picture.c:230
+msgid "Publisher/studio logotype"
+msgstr "Logotipo do distribuidor/estúdio"
 
-#: ../src/log.c:100
-msgid "Log"
-msgstr "Log"
+#: ../src/picture.c:234
+msgid "Unknown image type"
+msgstr "Tipo de imagem desconhecida"
 
-#: ../src/misc.c:716
-msgid "You must type a program name"
-msgstr "Você deve digitar o nome de um programa"
+#: ../src/picture.c:262 ../src/picture.c:271
+msgid "pixels"
+msgstr "pixels"
 
-#: ../src/misc.c:717
-msgid "Program Name Error"
-msgstr "Erro no nome do programa"
+#: ../src/picture.c:262 ../src/picture.c:271
+msgid "Type"
+msgstr "Tipo"
 
-#: ../src/misc.c:796
-#, c-format
-msgid "Executed command: %s"
-msgstr "Comando executado: %s"
+#: ../src/playlist_dialog.c:531
+#, fuzzy, c-format
+#| msgid "Cannot write playlist file '%s'"
+msgid "Cannot write playlist file ‘%s’"
+msgstr "Não foi possível gravar o arquivo de lista de reprodução \"%s\""
 
-#: ../src/misc.c:803
-#, c-format
-msgid "Failed to launch program: %s"
-msgstr "Falha ao iniciar programa: %s"
+#: ../src/playlist_dialog.c:535
+msgid "Playlist File Error"
+msgstr "Erro no arquivo de lista de reprodução"
 
-#: ../src/misc.c:820
-msgid "Select File"
-msgstr "Selecionar arquivo"
+#: ../src/playlist_dialog.c:543
+#, fuzzy, c-format
+#| msgid "Written playlist file '%s'"
+msgid "Wrote playlist file ‘%s’"
+msgstr "Gravando o arquivo de lista de reprodução \"%s\""
 
-#: ../src/misc.c:826
-msgid "Select Directory"
-msgstr "Selecionar diretório"
+#: ../src/playlist_dialog.c:625 ../src/scan_dialog.c:2772 ../src/scan_dialog.c:2834
+msgid "Invalid scanner mask"
+msgstr "Máscara de verificação inválida"
 
-#: ../src/misc.c:1138
+#: ../src/playlist_dialog.c:656
 msgid "Generate Playlist"
 msgstr "Gerar uma lista de reprodução"
 
-#: ../src/misc.c:1162
-msgid "M3U Playlist Name"
-msgstr "Nome da lista de reprodução M3U"
-
-#: ../src/misc.c:1177
-msgid "Use directory name"
-msgstr "Usar o nome do diretório"
-
-#. Playlist options
-#: ../src/misc.c:1194
-msgid "Playlist Options"
-msgstr "Opções da lista de reprodução"
-
-#: ../src/misc.c:1200
-msgid "Include only the selected files"
-msgstr "Incluir apenas os arquivos selecionados"
-
-#: ../src/misc.c:1203
-msgid ""
-"If activated, only the selected files will be written in the playlist file. "
-"Else, all the files will be written."
-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:1206
-msgid "Use full path for files in playlist"
-msgstr "Usar o caminho absoluto para os arquivos na lista de reprodução"
-
-#: ../src/misc.c:1209
-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:1215
-msgid "Create playlist in the parent directory"
-msgstr "Criar uma lista de reprodução no diretório superior"
-
-#: ../src/misc.c:1218
-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."
+#. The window
+#: ../src/preferences_dialog.c:289
+msgid "Preferences"
+msgstr "Preferências"
 
-#. DOS Separator
-#: ../src/misc.c:1222
-msgid "Use DOS directory separator"
-msgstr "Usar separador de diretório DOS"
+#: ../src/preferences_dialog.c:1126
+#, fuzzy
+#| msgid "The selected path for 'Default path to files' is invalid"
+msgid "The selected default path is invalid"
+msgstr "O caminho selecionado para \"Caminho padrão para arquivos\" é inválido"
 
-#: ../src/misc.c:1228
+#: ../src/preferences_dialog.c:1128
+#, fuzzy, c-format
+#| msgid ""
+#| "Path: '%s'\n"
+#| "Error: %s"
 msgid ""
-"This option replaces the UNIX directory separator '/' into DOS separator "
-"'\\'."
+"Path: ‘%s’\n"
+"Error: %s"
 msgstr ""
-"Essa opção substitui o separador de diretório UNIX \"/\" por um separador "
-"DOS \"\\\"."
-
-#: ../src/misc.c:1237
-msgid "Playlist Content"
-msgstr "Conteúdo da lista de reprodução"
-
-#: ../src/misc.c:1243
-msgid "Write only list of files"
-msgstr "Gravar somente a lista dos arquivos"
-
-#: ../src/misc.c:1247
-msgid "Write info using filename"
-msgstr "Gravar informações usando o nome do arquivo"
-
-#: ../src/misc.c:1250
-msgid "Write info using:"
-msgstr "Gravar informações usando:"
+"Caminho: \"%s\"\n"
+"Erro: %s"
 
-#: ../src/misc.c:1464
-#, c-format
-msgid "Cannot write playlist file '%s'"
-msgstr "Não foi possível gravar o arquivo de lista de reprodução \"%s\""
+#: ../src/preferences_dialog.c:1132
+msgid "Invalid Path Error"
+msgstr "Erro de caminho inválido"
 
-#: ../src/misc.c:1468
-msgid "Playlist File Error"
-msgstr "Erro no arquivo de lista de reprodução"
+#: ../src/scan_dialog.c:307
+#, fuzzy, c-format
+#| msgid "Cannot calculate CRC value of file (%s)"
+msgid "Cannot calculate CRC value of file ‘%s’"
+msgstr "Não foi possível calcular o valor do CRC do arquivo (%s)"
 
-#: ../src/misc.c:1476
-#, c-format
-msgid "Written playlist file '%s'"
-msgstr "Gravando o arquivo de lista de reprodução \"%s\""
+#: ../src/scan_dialog.c:325
+msgid "Tag successfully scanned"
+msgstr "Etiqueta verificada com sucesso"
 
-#: ../src/misc.c:1540 ../src/scan_dialog.c:2747 ../src/scan_dialog.c:2809
-msgid "Invalid scanner mask"
-msgstr "Máscara de verificação inválida"
+#: ../src/scan_dialog.c:328
+#, fuzzy, c-format
+#| msgid "Tag successfully scanned: %s"
+msgid "Tag successfully scanned ‘%s’"
+msgstr "Etiqueta verificada com sucesso: %s"
 
-#: ../src/misc.c:1904
-msgid "CD"
-msgstr "CD"
+#: ../src/scan_dialog.c:371
+#, fuzzy, c-format
+#| msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
+msgid "The extension ‘%s’ was not found in filename ‘%s’"
+msgstr "Verificador de etiqueta: estranho… a extensão \"%s\" não foi encontrada no nome de arquivo \"%s\""
+
+#: ../src/scan_dialog.c:461 ../src/scan_dialog.c:492
+#, fuzzy, c-format
+#| msgid "Scan Error: can't find separator '%s' within '%s'"
+msgid "Cannot find separator ‘%s’ within ‘%s’"
+msgstr "Erro de verificação: não foi possível localizador o separador \"%s\" dentro de \"%s\""
+
+#: ../src/scan_dialog.c:719
+#, fuzzy, c-format
+#| msgid "Could not convert filename '%s' into system filename encoding"
+msgid "Could not convert filename ‘%s’ into system filename encoding"
+msgstr "Não foi possível converter o nome do arquivo \"%s\" para um nome de arquivo na codificação do sistema"
+
+#: ../src/scan_dialog.c:744
+msgid "New filename successfully scanned"
+msgstr "Novo nome do arquivo verificado com sucesso"
 
-#: ../src/misc.c:1926
-msgid "Find Files"
-msgstr "Localizar arquivos"
+#: ../src/scan_dialog.c:748
+#, fuzzy, c-format
+#| msgid "New filename successfully scanned: %s"
+msgid "New filename successfully scanned ‘%s’"
+msgstr "Novo nome do arquivo verificado com sucesso: %s"
 
-#: ../src/misc.c:1958
-msgid ""
-"Type the word to search into files. Or type nothing to display all files."
-msgstr ""
-"Digite uma palavra para pesquisar nos arquivos. Ou digite nada para exibir "
-"todos os arquivos."
+#: ../src/scan_dialog.c:1111
+#, fuzzy, c-format
+#| msgid "Error while processing fields: %s"
+msgid "Error while processing fields ‘%s’"
+msgstr "Erro ao processar os campos: %s"
 
-#. Where...
-#: ../src/misc.c:1964
-msgid "In:"
-msgstr "Em:"
+#: ../src/scan_dialog.c:2042
+msgid "New_mask"
+msgstr "Nova_máscara"
 
-#. Translators: This option is for the previous 'in' option. For instance,
-#. * translate this as "Search" "In:" "the Filename".
-#: ../src/misc.c:1969
-msgid "the Filename"
-msgstr "o nome do arquivo"
+#. The window
+#: ../src/scan_dialog.c:2259
+msgid "Tag and Filename Scan"
+msgstr "Verificação da etiqueta e do nome do arquivo"
 
-#. 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:1975
-msgid "the Tag"
-msgstr "a etiqueta"
+#. 'Scan selected files' button
+#: ../src/scan_dialog.c:2265
+msgid "Scan Files"
+msgstr "Verificar arquivos"
 
-#. Property of the search
-#: ../src/misc.c:1986 ../src/prefs.c:335
-msgid "Case sensitive"
-msgstr "Diferenciar maiúsculas de minúsculas"
+#: ../src/scan_dialog.c:2271
+msgid "Scan selected files"
+msgstr "Verificar os arquivos selecionados"
 
-#: ../src/misc.c:2213
-msgid "Ready to search…"
-msgstr "Pronto para pesquisar…"
+#: ../src/scan_dialog.c:2909
+msgid "All tags have been scanned"
+msgstr "Todas as etiquetas foram verificadas"
 
-#: ../src/misc.c:2433
+#: ../src/search_dialog.c:545
 #, c-format
 msgid "Found one file"
 msgid_plural "Found %d files"
 msgstr[0] "Encontrou um arquivo"
 msgstr[1] "Encontrou %d arquivos"
 
-#: ../src/misc.c:2718
-msgid "Load Filenames From a Text File"
-msgstr "Carregar os nomes dos arquivos de um arquivo texto"
-
-#: ../src/misc.c:2747
-msgid "File:"
-msgstr "Arquivo:"
+#: ../src/search_dialog.c:594
+msgid "Find Files"
+msgstr "Localizar arquivos"
 
-#. Button 'load'
-#. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: ../src/misc.c:2766
-msgid " Load "
-msgstr " Carregar "
+#: ../src/search_dialog.c:678
+msgid "Ready to search…"
+msgstr "Pronto para pesquisar…"
 
-#: ../src/misc.c:2784
-msgid "Content of Text File"
-msgstr "Conteúdo do arquivo texto"
+#: ../src/setting.c:139
+#, c-format
+msgid "Cannot create or open file ‘%s’: %s"
+msgstr "Não foi possível criar ou abrir o arquivo \"%s\": %s"
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2805 ../src/misc.c:2900
-msgid "Insert a blank line before the selected line"
-msgstr "Inserir uma linha em branco antes da linha selecionada"
+#: ../src/setting.c:243
+#, c-format
+msgid "Cannot write list to file ‘%s’: %s"
+msgstr "Erro: Não foi possível gravar a lista para o arquivo %s: %s"
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2814 ../src/misc.c:2909
-msgid "Delete the selected line"
-msgstr "Excluir a linha selecionada"
+#. Fall back to defaults.
+#: ../src/setting.c:348
+msgid "Loading default ‘Fill Tag’ masks…"
+msgstr "Carregando as máscaras padrão de \"Preenchimento de etiqueta\"…"
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2823 ../src/misc.c:2918 ../src/misc.c:3399
-msgid "Delete all blank lines"
-msgstr "Excluir todas as linhas em branco"
+#. Fall back to defaults.
+#: ../src/setting.c:378
+msgid "Loading default ‘Rename File’ masks…"
+msgstr "Carregando as máscaras padrões de \"Renomear arquivo\"…"
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2835 ../src/misc.c:2930
-msgid "Move up the selected line"
-msgstr "Mover para cima a linha selecionada"
+#: ../src/setting.c:464
+#, c-format
+msgid "Migrating configuration from directory ‘%s’ to ‘%s’"
+msgstr "Migrando a configuração do diretório \"%s\" para \"%s\""
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2844 ../src/misc.c:2939
-msgid "Move down the selected line"
-msgstr "Mover para baixo a linha selecionada"
+#: ../src/setting.c:488
+#, c-format
+msgid "Failed to migrate configuration file ‘%s’"
+msgstr "Falha ao migrar o arquivo de configuração \"%s\""
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2856 ../src/misc.c:2951 ../src/misc.c:3423
-msgid "Reload"
-msgstr "Recarregar"
+#: ../src/setting.c:525
+#, c-format
+msgid "Cannot create directory ‘%s’: %s"
+msgstr "Não foi possível criar o diretório \"%s\": %s"
 
-#: ../src/misc.c:2878
-msgid "List of Files"
-msgstr "Lista dos arquivos"
+#: ../src/status_bar.c:146
+msgid "Ready to start"
+msgstr "Pronto para começar"
 
-#: ../src/misc.c:2973
-msgid "Selected line:"
-msgstr "Linha selecionada:"
+#: ../src/tag_area.c:186
+#, c-format
+msgid "Selected files tagged with title ‘%s’"
+msgstr "Arquivos selecionados etiquetados com o título \"%s\""
 
-#: ../src/misc.c:2991
-msgid ""
-"When activating this option, after loading the filenames, the current "
-"selected scanner will be ran (the scanner window must be opened)."
-msgstr ""
-"Ao ativar esta opção, após carregar os nomes de arquivos, o verificador "
-"selecionado atualmente será executado (a janela do verificador deverá estar "
-"aberta)."
+#: ../src/tag_area.c:191
+msgid "Removed title from selected files"
+msgstr "Título removido dos arquivos selecionados"
 
-#: ../src/misc.c:3078
+#: ../src/tag_area.c:208
 #, c-format
-msgid "Cannot retrieve file info (%s)"
-msgstr "Não foi possível obter informação do arquivo (%s)"
+msgid "Selected files tagged with artist ‘%s’"
+msgstr "Arquivos selecionados etiquetados com o artista \"%s\""
 
-#: ../src/misc.c:3141
-#, c-format
-msgid "Can't open file '%s' (%s)"
-msgstr "Não foi possível abrir o arquivo \"%s\" (%s)"
+#: ../src/tag_area.c:213
+msgid "Removed artist from selected files"
+msgstr "Artista removido dos arquivos selecionados"
 
-#: ../src/misc.c:3170
+#: ../src/tag_area.c:229
 #, c-format
-msgid "Error reading file (%s)"
-msgstr "Erro na leitura do arquivo (%s)"
+msgid "Selected files tagged with album artist ‘%s’"
+msgstr "Arquivos selecionados etiquetados com o artista do álbum \"%s\""
 
-#: ../src/misc.c:3387
-msgid "Insert a blank line"
-msgstr "Inserir uma linha em branco"
+#: ../src/tag_area.c:234
+msgid "Removed album artist from selected files"
+msgstr "Artista do álbum removido dos arquivos selecionados"
 
-#: ../src/misc.c:3393
-msgid "Delete this line"
-msgstr "Excluir esta linha"
+#: ../src/tag_area.c:251
+#, c-format
+msgid "Selected files tagged with album ‘%s’"
+msgstr "Arquivos selecionados etiquetados com o álbum \"%s\""
 
-#: ../src/misc.c:3408
-msgid "Move up this line"
-msgstr "Mover esta linha para cima"
+#: ../src/tag_area.c:256
+msgid "Removed album name from selected files"
+msgstr "Nome do álbum removido dos arquivos selecionados"
 
-#: ../src/misc.c:3414
-msgid "Move down this line"
-msgstr "Mover esta linha para baixo"
+#: ../src/tag_area.c:294
+#, c-format
+msgid "Selected files tagged with disc number ‘%s/%s’"
+msgstr "Arquivos selecionados etiquetados com o número do disco \"%s/%s\""
 
-#. Mode changed to profile name
-#: ../src/monkeyaudio_header.c:78 ../src/musepack_header.c:80
+#: ../src/tag_area.c:299
 #, c-format
-msgid "Profile:"
-msgstr "Perfil:"
+msgid "Selected files tagged with disc number like ‘xx’"
+msgstr "Arquivos selecionados etiquetados com o número do disco como \"xx\""
 
-#: ../src/mp4_header.cc:59 ../src/mp4_tag.cc:91 ../src/mp4_tag.cc:284
-msgid "MP4 format invalid"
-msgstr "Formato MP4 inválido"
+#: ../src/tag_area.c:304
+msgid "Removed disc number from selected files"
+msgstr "Número do disco removido dos arquivos selecionados"
 
-#: ../src/mp4_header.cc:69
+#: ../src/tag_area.c:321
 #, c-format
-msgid "Error reading properties from file: '%s'"
-msgstr "Erro na leitura das propriedades do arquivo: \"%s\""
+msgid "Selected files tagged with year ‘%s’"
+msgstr "Arquivos selecionados etiquetados com o ano \"%s\""
 
-#: ../src/mp4_header.cc:130 ../src/mpeg_header.c:204
-#, c-format
-msgid "~%d kb/s"
-msgstr "~%d kb/s"
+#: ../src/tag_area.c:326
+msgid "Removed year from selected files"
+msgstr "Ano removido dos arquivos selecionados"
 
-#: ../src/mp4_tag.cc:101 ../src/mp4_tag.cc:293
+#: ../src/tag_area.c:353 ../src/tag_area.c:447
 #, c-format
-msgid "Error reading tags from file: '%s'"
-msgstr "Erro na leitura das etiquetas o arquivo: \"%s\""
+msgid "Selected files tagged with track like ‘xx/%s’"
+msgstr "Arquivos selecionados etiquetados com a faixa como \"xx/%s\""
 
-#: ../src/mpeg_header.c:64
-msgid "Stereo"
-msgstr "Estéreo"
+#: ../src/tag_area.c:357
+#, c-format
+msgid "Selected files tagged with track like ‘xx’"
+msgstr "Arquivos selecionados etiquetados com a faixa como \"xx\""
 
-#: ../src/mpeg_header.c:65
-msgid "Joint stereo"
-msgstr "Estéreo combinado"
+#: ../src/tag_area.c:362 ../src/tag_area.c:452
+msgid "Removed track number from selected files"
+msgstr "Número da faixa removido dos arquivos selecionados"
 
-#: ../src/mpeg_header.c:66
-msgid "Dual channel"
-msgstr "Canal duplo"
+#. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
+#: ../src/tag_area.c:420
+#, c-format
+msgid "Selected tracks numbered sequentially"
+msgstr "Faixas selecionadas numeradas sequencialmente"
 
-#: ../src/mpeg_header.c:67
-msgid "Single channel"
-msgstr "Canal único"
+#: ../src/tag_area.c:469
+#, c-format
+msgid "Selected files tagged with genre ‘%s’"
+msgstr "Arquivos selecionados etiquetados com o gênero \"%s\""
 
-#. MPEG, Layer versions
-#: ../src/mpeg_header.c:194
-msgid "MPEG"
-msgstr "MPEG"
+#: ../src/tag_area.c:474
+msgid "Removed genre from selected files"
+msgstr "Gênero removido dos arquivos selecionados"
 
-#. FIXME: Pass error back to calling function.
-#: ../src/ogg_header.c:227
+#: ../src/tag_area.c:498
 #, c-format
-msgid "Error while opening file: '%s' (%s)"
-msgstr "Erro ao abrir o arquivo: \"%s\" (%s)"
+msgid "Selected files tagged with comment ‘%s’"
+msgstr "Arquivos selecionados etiquetados com o comentário \"%s\""
 
-#: ../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: O bitstream especificado não existe ou o arquivo foi "
-"inicializado de maneira imprópria (arquivo: \"%s\")."
+#: ../src/tag_area.c:503
+msgid "Removed comment from selected files"
+msgstr "Comentário removido dos arquivos selecionados"
 
-#: ../src/ogg_header.c:279
+#: ../src/tag_area.c:519
 #, c-format
-msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
-msgstr "Ogg Vorbis: Leitura da mídia retornou um erro (arquivo: \"%s\")."
+msgid "Selected files tagged with composer ‘%s’"
+msgstr "Arquivos selecionados etiquetados com o compositor \"%s\""
 
-#: ../src/ogg_header.c:282
-#, c-format
-msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
-msgstr "Ogg Vorbis: O bitstream não contém dados Vorbis (arquivo: \"%s\")."
+#: ../src/tag_area.c:524
+msgid "Removed composer from selected files"
+msgstr "Compositor removido dos arquivos selecionados"
 
-#: ../src/ogg_header.c:285
+#: ../src/tag_area.c:541
 #, c-format
-msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
-msgstr "Ogg Vorbis: Versão do Vorbis não combina (arquivo: \"%s\")."
+msgid "Selected files tagged with original artist ‘%s’"
+msgstr "Arquivos selecionados etiquetados com o artista original \"%s\""
 
-#: ../src/ogg_header.c:288
-#, c-format
-msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
-msgstr "Ogg Vorbis: Cabeçalho do bitstream Vorbis inválido (arquivo: \"%s\")."
+#: ../src/tag_area.c:546
+msgid "Removed original artist from selected files"
+msgstr "Artista original removido dos arquivos selecionados"
 
-#: ../src/ogg_header.c:291
+#: ../src/tag_area.c:563
 #, c-format
-msgid ""
-"Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack corruption "
-"(file: '%s')."
-msgstr ""
-"Ogg Vorbis: Falta de lógica interna, indica um erro ou corrupção de pilha "
-"(arquivo: \"%s\")."
+msgid "Selected files tagged with copyright ‘%s’"
+msgstr "Arquivos selecionados etiquetados com o copyright \"%s\""
 
-#: ../src/ogg_header.c:337
-#, c-format
-msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
-msgstr "Erro: Falha ao abrir o arquivo: \"%s\" como Vorbis (%s)."
+#: ../src/tag_area.c:568
+msgid "Removed copyright from selected files"
+msgstr "Copyright removido dos arquivos selecionados"
 
-#: ../src/ogg_tag.c:706 ../src/ogg_tag.c:881
+#: ../src/tag_area.c:585
 #, 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."
+msgid "Selected files tagged with URL ‘%s’"
+msgstr "Arquivos selecionados etiquetados com URL \"%s\""
+
+#: ../src/tag_area.c:590
+msgid "Removed URL from selected files"
+msgstr "URL removida dos arquivos selecionados"
 
-#: ../src/ogg_tag.c:1030 ../src/picture.c:1082
+#: ../src/tag_area.c:607
 #, c-format
-msgid "Error with 'loader_write': %s"
-msgstr "Erro com \"loader_write\": %s"
+msgid "Selected files tagged with encoder name ‘%s’"
+msgstr "Arquivos selecionados etiquetados com o nome do codificador \"%s\""
+
+#: ../src/tag_area.c:612
+msgid "Removed encoder name from selected files"
+msgstr "Nome do codificador removido dos arquivos selecionados"
+
+#: ../src/tag_area.c:648
+msgid "Selected files tagged with images"
+msgstr "Arquivos selecionados etiquetados com imagens"
+
+#: ../src/tag_area.c:652
+msgid "Removed images from selected files"
+msgstr "Imagens removidas dos arquivos selecionados"
+
+#. Menu items
+#: ../src/tag_area.c:821
+msgid "Tag selected files with this field"
+msgstr "Etiquetar arquivos selecionados com esse campo"
+
+#: ../src/tag_area.c:848
+msgid "All uppercase"
+msgstr "Todas maiúsculas"
+
+#: ../src/tag_area.c:854
+msgid "All lowercase"
+msgstr "Todas minúsculas"
+
+#: ../src/tag_area.c:860
+msgid "First letter uppercase"
+msgstr "Primeira letra maiúscula"
+
+#: ../src/tag_area.c:866
+msgid "First letter uppercase of each word"
+msgstr "Primeira letra de cada palavra maiúscula"
+
+#: ../src/tag_area.c:882
+msgid "Insert space before uppercase letter"
+msgstr "Inserir espaço antes da letra maiúscula"
+
+#: ../src/tag_area.c:888
+msgid "Remove duplicate spaces or underscores"
+msgstr "Remover espaços e sublinhados duplicados"
+
+#: ../src/tag_area.c:894
+msgid "Remove all text"
+msgstr "Remover todo texto"
 
-#: ../src/ogg_tag.c:1045 ../src/picture.c:1005
+#: ../src/tag_area.c:1256 ../src/tag_area.c:1334
 #, c-format
-msgid "Error with 'loader_close': %s"
-msgstr "Erro com \"loader_close\": %s"
+msgid "Error parsing image data ‘%s’"
+msgstr "Erro ao analisar dados da imagem \"%s\""
+
+#: ../src/tag_area.c:1316
+msgid "Cannot display the image because not enough data has been read to determine how to create the image buffer"
+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/tag_area.c:1323
+msgid "Cannot display the image"
+msgstr "Não foi possível exibir a imagem"
+
+#: ../src/tag_area.c:1325
+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/tag_area.c:1327
+msgid "Load Image File"
+msgstr "Carregar arquivo de imagem"
 
-#: ../src/picture.c:244 ../src/picture.c:269
+#: ../src/tag_area.c:1371 ../src/tag_area.c:1396
 #, c-format
-msgid "Image file not loaded: %s"
-msgstr "O arquivo de imagem não foi carregado: %s"
+msgid "Image file not loaded ‘%s’"
+msgstr "O arquivo de imagem não foi carregado \"%s\""
 
-#: ../src/picture.c:261
+#: ../src/tag_area.c:1388
 #, c-format
-msgid "Cannot open file: '%s'"
+msgid "Cannot open file ‘%s’"
 msgstr "Não foi possível abrir o arquivo \"%s\""
 
-#: ../src/picture.c:265
+#: ../src/tag_area.c:1392
 msgid "Image File Error"
 msgstr "Erro o arquivo de imagem"
 
-#: ../src/picture.c:276
+#: ../src/tag_area.c:1403
 msgid "Image file loaded"
 msgstr "Arquivo de imagem carregado"
 
-#: ../src/picture.c:334
+#: ../src/tag_area.c:1474
 msgid "Add Images"
 msgstr "Adicionar imagens"
 
-#: ../src/picture.c:344 ../src/picture.c:701
+#: ../src/tag_area.c:1485 ../src/tag_area.c:1850
 msgid "All Files"
 msgstr "Todos os Arquivos"
 
-#: ../src/picture.c:350 ../src/picture.c:707
+#: ../src/tag_area.c:1491 ../src/tag_area.c:1856
 msgid "PNG and JPEG"
 msgstr "PNG e JPEG"
 
-#: ../src/picture.c:477
+#: ../src/tag_area.c:1635
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Propriedades da imagem %d/%d"
 
-#: ../src/picture.c:503
-msgid "Image Type"
-msgstr "Tipo de imagem"
-
-#. Description of the picture
-#: ../src/picture.c:561
-msgid "Image Description:"
-msgstr "Descrição de imagem:"
-
-#: ../src/picture.c:688
+#: ../src/tag_area.c:1835
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Salvar imagem %d/%d"
 
-#: ../src/picture.c:763
+#: ../src/tag_area.c:1912
 #, c-format
-msgid "Image file not saved: %s"
-msgstr "O arquivo de imagem não salvo: %s"
+msgid "Image file not saved ‘%s’"
+msgstr "O arquivo de imagem não salvo \"%s\""
 
-#: ../src/picture.c:846
-msgid "JPEG image"
-msgstr "Imagem JPEG"
+#: ../src/tag_area.c:2255
+msgid "Tag selected files with this genre"
+msgstr "Etiqueta os arquivos selecionados com esse gênero"
 
-#: ../src/picture.c:848
-msgid "PNG image"
-msgstr "Imagem PNG"
+#: ../src/tag_area.c:2986
+msgid "ID3 Tag"
+msgstr "Etiqueta ID3"
 
-#: ../src/picture.c:850
-msgid "GIF image"
-msgstr "Imagem GIF"
+#: ../src/tag_area.c:2991
+msgid "Ogg Vorbis Tag"
+msgstr "Etiqueta Ogg Vorbis"
 
-#: ../src/picture.c:852
-msgid "Unknown image"
-msgstr "Imagem desconhecida"
+#: ../src/tag_area.c:2996
+msgid "FLAC Vorbis Tag"
+msgstr "Etiqueta FLAC"
 
-#: ../src/picture.c:864
-msgid "32x32 pixel PNG file icon"
-msgstr "32x32 pixels: ícone de arquivo PNG"
+#: ../src/tag_area.c:3000
+msgid "APE Tag"
+msgstr "Etiqueta APE"
 
-#: ../src/picture.c:866
-msgid "Other file icon"
-msgstr "Outro ícone de arquivo"
+#: ../src/tag_area.c:3004
+msgid "MP4/M4A/AAC Tag"
+msgstr "Etiqueta MP4/M4A/AAC"
 
-#: ../src/picture.c:868
-msgid "Cover (front)"
-msgstr "Capa (frente)"
+#: ../src/tag_area.c:3009
+msgid "Wavpack Tag"
+msgstr "Etiqueta Wavpack"
 
-#: ../src/picture.c:870
-msgid "Cover (back)"
-msgstr "Capa (atrás)"
+#: ../src/tag_area.c:3014
+msgid "Opus Tag"
+msgstr "Etiqueta Opus"
 
-#: ../src/picture.c:872
-msgid "Leaflet page"
-msgstr "Página do folheto"
+#: ../src/tag_area.c:3254
+#, c-format
+msgid "Images (%d)"
+msgstr "Imagens (%d)"
 
-#: ../src/picture.c:874
-msgid "Media (e.g. label side of CD)"
-msgstr "Mídia (ex.: lado do rótulo do CD)"
+#: ../src/tags/ape_tag.c:63 ../src/tags/mp4_header.cc:58 ../src/tags/mp4_header.cc:67 ../src/tags/mp4_tag.cc:65 ../src/tags/mp4_tag.cc:78 ../src/tags/mp4_tag.cc:84 ../src/tags/ogg_header.c:227
+#, c-format
+msgid "Error while opening file: %s"
+msgstr "Erro ao abrir arquivo: %s"
 
-#: ../src/picture.c:876
-msgid "Lead artist/lead performer/soloist"
-msgstr "Artista principal/músico principal/solista"
+#: ../src/tags/ape_tag.c:366
+msgid "Failed to write APE tag"
+msgstr "Falha ao gravar etiqueta APE"
 
-#: ../src/picture.c:878
-msgid "Artist/performer"
-msgstr "Artista/músico"
+#: ../src/tags/flac_header.c:85 ../src/tags/flac_tag.c:123
+msgid "Error opening FLAC file"
+msgstr "Erro ao abrir arquivo FLAC"
 
-#: ../src/picture.c:880
-msgid "Conductor"
-msgstr "Maestro"
+#: ../src/tags/flac_header.c:172
+msgid "FLAC File"
+msgstr "Arquivo FLAC"
+
+#. Mode
+#. Mode
+#. mpeg4ip library seems to always return -1
+#. Mode
+#: ../src/tags/flac_header.c:185 ../src/tags/mp4_header.cc:152 ../src/tags/ogg_header.c:416 ../src/tags/opus_header.c:233 ../src/tags/wavpack_header.c:125
+msgid "Channels:"
+msgstr "Canais:"
+
+#: ../src/tags/flac_tag.c:847 ../src/tags/flac_tag.c:879 ../src/tags/flac_tag.c:893
+#, c-format
+msgid "Error while opening file ‘%s’ as FLAC: %s"
+msgstr "Erro ao abrir o arquivo \"%s\" como FLAC: %s"
+
+#: ../src/tags/flac_tag.c:1185 ../src/tags/flac_tag.c:1197 ../src/tags/flac_tag.c:1217
+#, c-format
+msgid "Failed to write comments to file ‘%s’: %s"
+msgstr "Falha ao gravar comentários no arquivo \"%s\": %s"
+
+#: ../src/tags/id3_tag.c:206
+#, c-format
+msgid "As the following corrupted file ‘%s’ will cause an error in id3lib, it will not be processed"
+msgstr "Como o seguinte arquivo corrompido \"%s\" causaria um erro na id3lib, ele não será processado"
+
+#: ../src/tags/id3_tag.c:208
+msgid "Corrupted file"
+msgstr "Arquivo corrompido"
+
+#: ../src/tags/id3_tag.c:596
+#, c-format
+msgid "Removed tag of ‘%s’"
+msgstr "Removida etiqueta de \"%s\""
+
+#: ../src/tags/id3_tag.c:603 ../src/tags/id3_tag.c:730
+#, c-format
+msgid "Error while removing ID3v1 tag of ‘%s’: %s"
+msgstr "Erro ao remover etiqueta ID3v1 de \"%s\": (%s)"
+
+#: ../src/tags/id3_tag.c:612 ../src/tags/id3_tag.c:693
+#, c-format
+msgid "Error while removing ID3v2 tag of ‘%s’: %s"
+msgstr "Erro ao remover etiqueta ID3v2 de \"%s\": (%s)"
+
+#: ../src/tags/id3_tag.c:638
+#, c-format
+msgid "Error while updating ID3v2 tag of ‘%s’: %s"
+msgstr "Erro ao atualizar etiqueta ID3v2 de \"%s\": (%s)"
+
+#: ../src/tags/id3_tag.c:668
+msgid "You have tried to save this tag to Unicode but it was detected that your version of id3lib is buggy"
+msgstr "Você tentou salvar esta etiqueta em Unicode, mas foi detectado que sua versão de id3lib está defeituosa"
+
+#: ../src/tags/id3_tag.c:670
+#, 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 is available in the EasyTAG package sources.\n"
+"Note that this message will appear only once.\n"
+"\n"
+"File: %s"
+msgstr ""
+"Se você recarregar esse arquivo, alguns caracteres na etiqueta podem não ser exibidos corretamente. Por favor, aplique o patch src/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff no id3lib, o qual está disponível no pacote das fontes do EasyTAG.\n"
+"Saiba que essa mensagem só aparecerá uma vez.\n"
+"\n"
+"Arquivo: %s"
+
+#: ../src/tags/id3_tag.c:677
+msgid "Buggy id3lib"
+msgstr "id3lib defeituoso"
+
+#: ../src/tags/id3_tag.c:718
+#, c-format
+msgid "Error while updating ID3v1 tag of ‘%s’: %s"
+msgstr "Erro ao atualizar etiqueta ID3v1 de \"%s\": %s"
+
+#: ../src/tags/id3_tag.c:752
+msgid "No error reported"
+msgstr "Nenhum erro relatado"
+
+#: ../src/tags/id3_tag.c:754
+msgid "No available memory"
+msgstr "Sem memória disponível"
 
-#: ../src/picture.c:882
-msgid "Band/Orchestra"
-msgstr "Banda/orquestra"
+#: ../src/tags/id3_tag.c:756
+msgid "No data to parse"
+msgstr "Sem dados para analisar"
 
-#: ../src/picture.c:886
-msgid "Lyricist/text writer"
-msgstr "Letrista/escritor"
+#: ../src/tags/id3_tag.c:758
+msgid "Improperly formatted data"
+msgstr "Dados formatados incorretamente"
 
-#: ../src/picture.c:888
-msgid "Recording location"
-msgstr "Local da gravação"
+#: ../src/tags/id3_tag.c:760
+msgid "No buffer to write to"
+msgstr "Sem buffer para gravar para"
 
-#: ../src/picture.c:890
-msgid "During recording"
-msgstr "Duração da gravação"
+#: ../src/tags/id3_tag.c:762
+msgid "Buffer is too small"
+msgstr "Buffer é muito pequeno"
 
-#: ../src/picture.c:892
-msgid "During performance"
-msgstr "Duração da performance"
+#: ../src/tags/id3_tag.c:764
+msgid "Invalid frame ID"
+msgstr "ID do quadro inválido"
 
-#: ../src/picture.c:894
-msgid "Movie/video screen capture"
-msgstr "Captura de tela de filme/vídeo"
+#: ../src/tags/id3_tag.c:766
+msgid "Requested field not found"
+msgstr "Campo requerido não encontrado"
 
-#: ../src/picture.c:896
-msgid "A bright colored fish"
-msgstr "Um peixe de cores fortes"
+#: ../src/tags/id3_tag.c:768
+msgid "Unknown field type"
+msgstr "Tipo de campo desconhecido"
 
-#: ../src/picture.c:898
-msgid "Illustration"
-msgstr "Ilustração"
+#: ../src/tags/id3_tag.c:770
+msgid "Tag is already attached to a file"
+msgstr "Etiqueta já está anexada ao arquivo"
 
-#: ../src/picture.c:900
-msgid "Band/Artist logotype"
-msgstr "Logotipo da banda/artista"
+#: ../src/tags/id3_tag.c:772
+msgid "Invalid tag version"
+msgstr "Versão da etiqueta inválida"
 
-#: ../src/picture.c:902
-msgid "Publisher/studio logotype"
-msgstr "Logotipo do distribuidor/estúdio"
+#: ../src/tags/id3_tag.c:774
+msgid "No file to parse"
+msgstr "Nenhum arquivo para analisar"
 
-#: ../src/picture.c:906
-msgid "Unknown image type"
-msgstr "Tipo de imagem desconhecida"
+#: ../src/tags/id3_tag.c:776
+msgid "Attempting to write to a read-only file"
+msgstr "Tentando gravar em um arquivo somente-leitura"
 
-#: ../src/picture.c:936 ../src/picture.c:947
-msgid "pixels"
-msgstr "pixels"
+#: ../src/tags/id3_tag.c:778
+msgid "Error in compression/uncompression"
+msgstr "Erro na compressão/descompressão"
 
-#: ../src/picture.c:937 ../src/picture.c:948
-msgid "Type"
-msgstr "Tipo"
+#: ../src/tags/id3_tag.c:780
+msgid "Unknown error message"
+msgstr "Mensagem de erro desconhecida"
 
-#: ../src/picture.c:949
-msgid "Description"
-msgstr "Descrição"
+#: ../src/tags/id3_tag.c:1457
+msgid "Error while creating temporary file"
+msgstr "Erro ao criar um arquivo temporário"
 
-#: ../src/picture.c:1065
-msgid ""
-"Cannot display the image because not enough data has been read to determine "
-"how to create the image buffer."
-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/tags/id3v24_tag.c:132 ../src/tags/id3v24_tag.c:187 ../src/tags/id3v24_tag.c:225 ../src/tags/id3v24_tag.c:236 ../src/tags/id3v24_tag.c:941 ../src/tags/id3v24_tag.c:948 ../src/tags/id3v24_tag.c:974 ../src/tags/id3v24_tag.c:1014 ../src/tags/mp4_tag.cc:94
+msgid "Error reading tags from file"
+msgstr "Erro na leitura das etiquetas do arquivo"
 
-#: ../src/picture.c:1072
-msgid "Cannot display the image"
-msgstr "Não foi possível exibir a imagem"
+# http://www.monkeysaudio.com/ (MAC)
+#: ../src/tags/monkeyaudio_header.c:46
+msgid "Error opening Monkey’s Audio file"
+msgstr "Erro ao abrir o arquivo de Monkey's Audio"
 
-#: ../src/picture.c:1074
-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."
+#. Mode changed to profile name
+#: ../src/tags/monkeyaudio_header.c:78 ../src/tags/musepack_header.c:81
+msgid "Profile:"
+msgstr "Perfil:"
 
-#: ../src/picture.c:1076
-msgid "Load Image File"
-msgstr "Carregar arquivo de imagem"
+#: ../src/tags/mp4_header.cc:68 ../src/tags/mp4_tag.cc:85 ../src/tags/mp4_tag.cc:281
+msgid "MP4 format invalid"
+msgstr "Formato MP4 inválido"
 
-#. Label
-#: ../src/prefs.c:152
-msgid "Default directory:"
-msgstr "Diretório padrão:"
+#: ../src/tags/mp4_header.cc:77
+msgid "Error reading properties from file"
+msgstr "Erro na leitura das propriedades do arquivo"
 
-#: ../src/prefs.c:165
-msgid ""
-"Specify the directory where your files are located. This path will be loaded "
-"when EasyTAG starts without parameter."
-msgstr ""
-"Especificar o diretório onde seus arquivos estão localizados. Esse caminho "
-"será carregado ao iniciar o EasyTAG sem nenhum parâmetro."
+#: ../src/tags/mp4_header.cc:131
+msgid "MP4/AAC File"
+msgstr "Arquivo MP4/AAC"
 
-#. Load directory on startup
-#: ../src/prefs.c:186
-msgid ""
-"Load on startup the default directory or the directory passed as argument"
-msgstr ""
-"Carregar na inicialização o diretório padrão ou o diretório passado como "
-"argumento"
+#: ../src/tags/mp4_header.cc:140 ../src/tags/mpeg_header.c:235
+#, c-format
+msgid "~%d kb/s"
+msgstr "~%d kb/s"
 
-#: ../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 ""
-"Pesquisa automaticamente por arquivos, ao inicializar o EasyTAG, no "
-"diretório padrão. Note que esse caminho pode ser sobreposto pelo parâmetro "
-"enviado ao Easytag (easytag /caminho_para/arquivos_mp3)."
+#: ../src/tags/mp4_tag.cc:257 ../src/tags/mp4_tag.cc:274 ../src/tags/mp4_tag.cc:280
+#, c-format
+msgid "Error while opening file ‘%s’: %s"
+msgstr "Erro ao abrir o arquivo \"%s\": %s"
 
-#. Browse subdirectories
-#: ../src/prefs.c:194
-msgid "Search subdirectories"
-msgstr "Pesquisar nos subdiretórios"
+#: ../src/tags/mp4_tag.cc:292
+#, c-format
+msgid "Error reading tags from file ‘%s’"
+msgstr "Erro na leitura das etiquetas do arquivo \"%s\""
 
-#: ../src/prefs.c:197
-msgid "Search subdirectories for files when reading a directory into the tree."
-msgstr "Pesquisa nos subdiretórios por arquivos ao ler um diretório na árvore."
+#: ../src/tags/mpeg_header.c:50
+msgid "Stereo"
+msgstr "Estéreo"
 
-#. Open the node to show subdirectories
-#: ../src/prefs.c:201
-msgid "Show subdirectories when selecting a directory"
-msgstr "Mostrar subdiretórios ao selecionar um diretório"
+#: ../src/tags/mpeg_header.c:51
+msgid "Joint stereo"
+msgstr "Estéreo combinado"
 
-#: ../src/prefs.c:205
-msgid ""
-"This expands the selected node into the file browser to display the sub-"
-"directories."
-msgstr ""
-"Isso expande o nodo selecionado no navegador de arquivos para exibir os "
-"subdiretórios."
+#: ../src/tags/mpeg_header.c:52
+msgid "Dual channel"
+msgstr "Canal duplo"
 
-#. Browse hidden directories
-#: ../src/prefs.c:209
-msgid "Search hidden directories"
-msgstr "Pesquisar nos diretórios ocultos"
+#: ../src/tags/mpeg_header.c:53
+msgid "Single channel"
+msgstr "Canal único"
 
-#: ../src/prefs.c:214
-msgid "Search hidden directories for files (directories starting by a '.')."
-msgstr ""
-"Pesquisar nos diretórios ocultos por arquivos (diretórios começando com \"."
-"\")."
+#: ../src/tags/mpeg_header.c:205
+msgid "MP3 File"
+msgstr "Arquivo MP3"
 
-#.
-#. * Misc
-#.
-#: ../src/prefs.c:222
-msgid "Misc"
-msgstr "Miscelânea"
+#: ../src/tags/mpeg_header.c:208
+msgid "MP2 File"
+msgstr "Arquivo MP2"
 
-#. User interface
-#: ../src/prefs.c:228
-msgid "User Interface"
-msgstr "Interface do usuário"
+#. MPEG, Layer versions
+#: ../src/tags/mpeg_header.c:215
+msgid "MPEG"
+msgstr "MPEG"
 
-#. Show header infos
-#: ../src/prefs.c:235
-msgid "Show header information of file"
-msgstr "Mostrar as informações do cabeçalho do arquivo"
+#: ../src/tags/musepack_header.c:46
+msgid "Error opening Musepack file"
+msgstr "Erro ao criar um arquivo Musepack"
 
-#: ../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 ""
-"Se ativada, as informações sobre o arquivo como a taxa de bits, o tempo, o "
-"tamanho, serão exibidas na entrada do nome do arquivo."
+#: ../src/tags/musepack_header.c:78
+msgid "MusePack File"
+msgstr "Arquivo MusePack"
 
-#: ../src/prefs.c:244
-msgid "Display changed files in list using:"
-msgstr "Exibir os arquivos modificados na lista usando:"
+#: ../src/tags/ogg_header.c:243
+msgid "The specified bitstream does not exist or the file has been initialized improperly"
+msgstr "O bitstream especificado não existe ou o arquivo foi inicializado de maneira imprópria"
 
-#: ../src/prefs.c:247
-msgid "Red color"
-msgstr "Vermelho"
+#: ../src/tags/ogg_header.c:262
+msgid "Read from media returned an error"
+msgstr "Leitura da mídia retornou um erro"
 
-#: ../src/prefs.c:253
-msgid "Bold style"
-msgstr "Negrito"
+#: ../src/tags/ogg_header.c:265
+msgid "Bitstream is not Vorbis data"
+msgstr "O bitstream não contém dados Vorbis"
 
-#. Sorting List Options
-#: ../src/prefs.c:259
-msgid "Sorting List Options"
-msgstr "Opções de organização da lista"
+#: ../src/tags/ogg_header.c:268
+msgid "Vorbis version mismatch"
+msgstr "Versão do Vorbis não combina"
 
-#. Sorting method
-#: ../src/prefs.c:268
-msgid "Sort the file list by:"
-msgstr "Organizar a lista de arquivo por:"
+#: ../src/tags/ogg_header.c:271
+msgid "Invalid Vorbis bitstream header"
+msgstr "Cabeçalho do bitstream Vorbis inválido"
 
-#: ../src/prefs.c:278
-msgid "Ascending filename"
-msgstr "Nome do arquivo ascendente"
+#: ../src/tags/ogg_header.c:274
+msgid "Internal logic fault, indicates a bug or heap/stack corruption"
+msgstr "Falta de lógica interna, indica um erro ou corrupção de pilha"
 
-#: ../src/prefs.c:280
-msgid "Descending filename"
-msgstr "Nome do arquivo descendente"
+#: ../src/tags/ogg_header.c:325
+#, c-format
+msgid "Failed to open file as Vorbis: %s"
+msgstr "Falha ao abrir o arquivo como Vorbis: %s"
 
-#: ../src/prefs.c:281
-msgid "Ascending title"
-msgstr "Título ascendente"
+#: ../src/tags/ogg_header.c:388
+msgid "Ogg Vorbis File"
+msgstr "Arquivo Ogg Vorbis"
 
-#: ../src/prefs.c:282
-msgid "Descending title"
-msgstr "Título descendente"
+#: ../src/tags/ogg_header.c:391
+msgid "Speex File"
+msgstr "Arquivo Speex"
 
-#: ../src/prefs.c:283
-msgid "Ascending artist"
-msgstr "Artista ascendente"
+#: ../src/tags/opus_header.c:220
+msgid "Opus File"
+msgstr "Arquivo Opus"
 
-#: ../src/prefs.c:284
-msgid "Descending artist"
-msgstr "Artista descendente"
+#: ../src/tags/wavpack_header.c:112
+msgid "Wavpack File"
+msgstr "Arquivo Wavpack"
 
-#: ../src/prefs.c:286
-msgid "Ascending album artist"
-msgstr "Artista de álbum ascendente"
+#, fuzzy
+#~| msgid "Can't load file: '%s' (%s)."
+#~ msgid "Cannot load file ‘%s’: %s"
+#~ msgstr "Não foi possível carregar o arquivo: \"%s\" (%s)."
 
-#: ../src/prefs.c:288
-msgid "Descending album artist"
-msgstr "Artista de álbum descendente"
+#, fuzzy
+#~| msgid "Error while writing list file: %s"
+#~ msgid "Error while writing list file ‘%s’"
+#~ msgstr "Erro ao gravar o arquivo de lista: %s"
 
-#: ../src/prefs.c:289
-msgid "Ascending album"
-msgstr "Álbum ascendente"
+#~ 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] "Não foi possível gravar etiqueta do arquivo ‘%s’ (um byte em falta)"
+#~ msgstr[1] "Não foi possível gravar etiqueta do arquivo ‘%s’ (%s bytes em falta)"
 
-#: ../src/prefs.c:290
-msgid "Descending album"
-msgstr "Álbum descendente"
+#~ msgid "Cannot save tag of file ‘%s’"
+#~ msgstr "Não foi possível salvar a etiqueta do arquivo \"%s\""
 
-#: ../src/prefs.c:291
-msgid "Ascending year"
-msgstr "Ano ascendente"
+#~ msgid "Size error while saving tag of ‘%s’"
+#~ msgstr "Erro no tamanho ao salvar etiqueta de \"%s\""
 
-#: ../src/prefs.c:292
-msgid "Descending year"
-msgstr "Ano descendente"
+#, fuzzy
+#~| msgid "Convert ' ' to '_'"
+#~ msgid "Convert ‘ ’ to ‘_’"
+#~ msgstr "Converter \" \" para \"_\""
 
-#: ../src/prefs.c:294
-msgid "Ascending disc number"
-msgstr "Número do disco ascendente"
+#~ msgid "Picture block is invalid ‘%s’"
+#~ msgstr "O bloco da imagem não é válido \"%s\""
 
-#: ../src/prefs.c:296
-msgid "Descending disc number"
-msgstr "Número da disco descendente"
+#~ msgid "The Ogg Vorbis file ‘%s’ contains an ID3v2 tag"
+#~ msgstr "O arquivo Ogg Vorbis \"%s\" contém uma etiqueta ID3v2"
 
-#: ../src/prefs.c:298
-msgid "Ascending track number"
-msgstr "Número da faixa ascendente"
+#~ msgid "Tree"
+#~ msgstr "Árvore"
 
-#: ../src/prefs.c:300
-msgid "Descending track number"
-msgstr "Número da faixa descendente"
+#~ msgid "Artist & Album"
+#~ msgstr "Artista & álbum"
 
-#: ../src/prefs.c:301
-msgid "Ascending genre"
-msgstr "Gênero ascendente"
+#~ msgid "Tag(s) written"
+#~ msgstr "Etiqueta(s) gravada(s)"
 
-#: ../src/prefs.c:302
-msgid "Descending genre"
-msgstr "Gênero descendente"
+#, fuzzy
+#~| msgid "Error writing tag type %d to file %s (%s)"
+#~ msgid "Error writing tag type ‘%d’ to file ‘%s’: %s"
+#~ msgstr "Erro ao gravar o tipo da etiqueta %d no arquivo %s (%s)"
 
-#: ../src/prefs.c:303
-msgid "Ascending comment"
-msgstr "Comentário ascendente"
+#, fuzzy
+#~| msgid "Error while reading file: '%s' (%s)"
+#~ msgid "Error while reading file ‘%s’: %s"
+#~ msgstr "Erro ao ler o arquivo: \"%s\" (%s)"
 
-#: ../src/prefs.c:304
-msgid "Descending comment"
-msgstr "Comentário descendente"
+#, fuzzy
+#~| msgid "Updated tag of '%s'"
+#~ msgid "Updated tag of ‘%s’"
+#~ msgstr "Etiqueta atualizada de \"%s\""
 
-#: ../src/prefs.c:306
-msgid "Ascending composer"
-msgstr "Compositor ascendente"
+#, fuzzy
+#~| msgid "Error while creating temporary file: '%s'"
+#~ msgid "Error while creating temporary file ‘%s’"
+#~ msgstr "Erro ao criar um arquivo temporário: \"%s\""
 
-#: ../src/prefs.c:308
-msgid "Descending composer"
-msgstr "compositor descendente"
+#, fuzzy
+#~| msgid "Error while writing to file: '%s' (%s)"
+#~ msgid "Error while writing to file ‘%s’: %s"
+#~ msgstr "Erro ao gravar no arquivo: \"%s\" (%s)"
 
-#: ../src/prefs.c:310
-msgid "Ascending original artist"
-msgstr "Artista original ascendente"
+#~ msgid "Run a command on the selected files"
+#~ msgstr "Executa um comando nos arquivos selecionados"
 
-#: ../src/prefs.c:312
-msgid "Descending original artist"
-msgstr "Artista original descendente"
+#~ msgid "Clear the current selection"
+#~ msgstr "Limpa a seleção atual"
 
-#: ../src/prefs.c:314
-msgid "Ascending copyright"
-msgstr "Copyright ascendente"
+#~ msgid "Delete files"
+#~ msgstr "Exclui arquivos"
 
-#: ../src/prefs.c:316
-msgid "Descending copyright"
-msgstr "Copyright descendente"
+#~ msgid "S_can Files"
+#~ msgstr "V_erificar arquivos"
 
-#: ../src/prefs.c:318
-msgid "Ascending URL"
-msgstr "URL ascendente"
+#~ msgid "_Undo Last Files Changes"
+#~ msgstr "_Desfazer a última modificação nos arquivos"
 
-#: ../src/prefs.c:320
-msgid "Descending URL"
-msgstr "URL descendente"
+#~ msgid "Undo last files changes"
+#~ msgstr "Desfaz a última modificação nos arquivos"
 
-#: ../src/prefs.c:322
-msgid "Ascending encoded by"
-msgstr "Nome do codificador ascendente"
+#~ msgid "R_edo Last Files Changes"
+#~ msgstr "Re_fazer a última modificação nos arquivos"
 
-#: ../src/prefs.c:324
-msgid "Descending encoded by"
-msgstr "Codificador descendente por"
+#~ msgid "Redo last files changes"
+#~ msgstr "Refaz a última modificação nos arquivos"
 
-#: ../src/prefs.c:326
-msgid "Ascending creation date"
-msgstr "Data de criação ascendente"
+#~ msgid "Force saving files"
+#~ msgstr "Força o salvamento dos arquivos"
 
-#: ../src/prefs.c:328
-msgid "Descending creation date"
-msgstr "Data de criação descendente"
+#~ msgid "Undo Last Changes"
+#~ msgstr "Desfazer últimas modificações"
 
-#: ../src/prefs.c:332
-msgid "Select the type of file sorting when loading a directory."
-msgstr ""
-"Selecionar o tipo de organização dos arquivos ao carregar um diretório."
+#~ msgid "Undo last changes"
+#~ msgstr "Desfaz as últimas modificações"
 
-#: ../src/prefs.c:344
-msgid "If activated, the sorting of the list will be dependent on the case."
-msgstr "Se ativada, a organização da lista dependerá de maiúsculo e minúsculo."
+#~ msgid "Redo Last Changes"
+#~ msgstr "Refazer últimas modificações"
 
-#. File Player
-#: ../src/prefs.c:348
-msgid "File Audio Player"
-msgstr "Reprodutor de arquivos de áudio"
+#~ msgid "Redo last changes"
+#~ msgstr "Refaz as últimas modificações"
 
-#: ../src/prefs.c:360
-msgid "Player to run:"
-msgstr "Executar o reprodutor:"
+#~ msgid "Go to home directory"
+#~ msgstr "Ir para a pasta pessoal"
 
-#: ../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 ""
-"Digite o programa usado para reproduzir os arquivos. Alguns argumentos podem "
-"ser passados para o programa (como \"xmms -p\") antes de receber os arquivos "
-"como outros argumentos."
-
-#. Log options
-#: ../src/prefs.c:384
-msgid "Log Options"
-msgstr "Opções de log"
-
-#. Show / hide log view
-#: ../src/prefs.c:391
-msgid "Show log view in main window"
-msgstr "Mostrar visualização do log na janela principal"
-
-#: ../src/prefs.c:394
-msgid "If activated, the log view would be visible in the main window."
-msgstr "Se ativada, será possível visualizar o log na janela principal."
-
-#: ../src/prefs.c:400
-msgid "Max number of lines:"
-msgstr "Número máximo de linhas:"
+#~ msgid "Go to desktop directory"
+#~ msgstr "Ir para o diretório da área de trabalho"
 
-#. 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);
-#.
-#.
-#. * File Settings
-#.
-#: ../src/prefs.c:418
-msgid "File Settings"
-msgstr "Configurações do arquivo"
+# Nome do diretório é maiúsculo, motivo pelo qual mantive assim no meio da mensagem
+#~ msgid "Go to documents directory"
+#~ msgstr "Ir para o diretório de documentos"
 
-#. File (name) Options
-#: ../src/prefs.c:424
-msgid "File Options"
-msgstr "Opções de arquivo"
+#~ msgid "Go to downloads directory"
+#~ msgstr "Ir para o diretório de downloads"
 
-#: ../src/prefs.c:430
-msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
-msgstr ""
-"Substituir caracteres ilegais no nome do arquivo (para Windows e CD-ROM)"
+#~ msgid "Go to music directory"
+#~ msgstr "Ir para o diretório de músicas"
 
-#: ../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 os caracteres ilegais para sistemas de arquivos FAT32/16 e ISO9660 "
-"+ Joliet (\"\\\", \":\", \";\", \"*\", \"?\", \"\"\", \"<\", \">\", \"|\") "
-"no nome dos arquivos para evitar problemas ao renomear. Isso é útil ao "
-"renomear um arquivo com o verificador, a partir da etiqueta."
+#~ msgid "Go to parent directory"
+#~ msgstr "Ir para o diretório superior"
 
-#. Extension case (lower/upper?)
-#: ../src/prefs.c:441
-msgid "Convert filename extension to:"
-msgstr "Converter a extensão do arquivo para:"
+#~ msgid "Go to default directory"
+#~ msgstr "Ir para o diretório padrão"
 
-#: ../src/prefs.c:444
-msgid "Lower Case"
-msgstr "Minúscula"
+#~ msgid "Set current path as default"
+#~ msgstr "Define o caminho atual como padrão"
 
-#: ../src/prefs.c:447
-msgid "For example, the extension will be converted to '.mp3'"
-msgstr "Por exemplo, a extensão será convertida para \".mp3\""
+#~ msgid "Rename directory"
+#~ msgstr "Renomeia um diretório"
 
-#: ../src/prefs.c:450
-msgid "Upper Case"
-msgstr "Maiúscula"
+#~ msgid "Reload directory"
+#~ msgstr "Recarrega um diretório"
 
-#: ../src/prefs.c:453
-msgid "For example, the extension will be converted to '.MP3'"
-msgstr "Por exemplo, a extensão será convertida para \".MP3\""
+#~ msgid "Run a command on the directory"
+#~ msgstr "Executa um comando neste diretório"
 
-#: ../src/prefs.c:456
-msgid "No Change"
-msgstr "Sem alteração"
+#~ msgid "Reload directory tree"
+#~ msgstr "Recarrega uma árvore de diretórios"
 
-#: ../src/prefs.c:459
-msgid "The extension will not be converted"
-msgstr "A extensão não será convertida"
+#~ msgid "CDDB search"
+#~ msgstr "Pesquisa no CDDB"
 
-#. Preserve modification time
-#: ../src/prefs.c:462
-msgid "Preserve modification time of the file"
-msgstr "Preservar a data de modificação do arquivo"
+#~ msgid "Load filenames from a text file"
+#~ msgstr "Carrega os nomes dos arquivos de um arquivo texto"
 
-#: ../src/prefs.c:465
-msgid ""
-"Preserve the modification time (in file properties) when saving the file."
-msgstr ""
-"Preserva a data de modificação (nas propriedades do arquivo) ao salvar o "
-"arquivo."
+#~ msgid "Run audio player"
+#~ msgstr "Executa um reprodutor de áudio"
 
-#. Change directory modification time
-#: ../src/prefs.c:469
-msgid ""
-"Update modification time of the parent directory of the file (recommended "
-"when using Amarok)"
-msgstr ""
-"Atualizar a data de modificação do diretório superior do arquivo "
-"(recomendado ao usar o Amarok)"
+#~ msgid "About"
+#~ msgstr "Sobre"
 
-#: ../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 "
-"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."
-msgstr ""
-"A data de modificação do diretório superior do arquivo será atualizada ao "
-"salvar a etiqueta do arquivo. Atualmente, isso é feito automaticamente "
-"apenas ao renomear um arquivo.\n"
-"Esse recurso é interessante ao usar aplicativos como o Amarok. Por motivos "
-"de performance, eles atualizam as informações do arquivo ao detectar "
-"alterações no diretório superior."
-
-#. Character Set for Filename
-#: ../src/prefs.c:481
-msgid "Character Set for Filename"
-msgstr "Codificação de caracteres para o nome do arquivo"
-
-#. Rules for character set
-#: ../src/prefs.c:493
-msgid ""
-"Rules to apply if some characters can't be converted to the system character "
-"encoding when writing filename:"
-msgstr ""
-"Regras ao aplicar se alguns caracteres não podem ser convertidas para a "
-"codificação de caracteres do sistema ao gravar o arquivo:"
+#~ msgid "_File Operations"
+#~ msgstr "_Operação em arquivos"
 
-#: ../src/prefs.c:499
-msgid "Try another character encoding"
-msgstr "Tentar outra codificação de caracteres"
+#~ msgid "S_canner"
+#~ msgstr "V_erificador"
 
-#: ../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 ""
-"Com essa opção, será tentada uma conversão para a codificação associada a "
-"sua localização (por exemplo: ISO-8859-1 para \"fr\", KOI8-R para \"ru\", "
-"ISO-8859-2 para \"ro\"). Se isso falhar, será usada a codificação de "
-"caracteres ISO-8859-1."
+#~ msgid "CDDB search files…"
+#~ msgstr "Pesquisar no CDDB pelos arquivos…"
 
-#: ../src/prefs.c:510
-msgid ""
-"Force using the system character encoding and activate the transliteration"
-msgstr ""
-"Forçar o uso da codificação de caracteres do sistema e ativar a "
-"transliteração"
+#~ msgid "Tree Browser"
+#~ msgstr "Navegador de árvore"
 
-#: ../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 ""
-"Com essa opção, quando um caractere não puder ser representado na "
-"codificação de caracteres alvo, ele pode ser aproximado através de um ou "
-"vários caracteres parecidos."
+#~ msgid "View by directory tree"
+#~ msgstr "Vê por árvore de diretórios"
 
-#: ../src/prefs.c:520
-msgid ""
-"Force using the system character encoding and silently discard some "
-"characters"
-msgstr ""
-"Forçar o uso da codificação de caracteres do sistema e descartar "
-"silenciosamente alguns caracteres"
+#~ msgid "_Fill Tags…"
+#~ msgstr "Pr_eencher etiquetas…"
 
-#: ../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 ""
-"Com essa opção, quando um caractere não puder ser representado no "
-"codificação de caracteres alvo, ele será descartado silenciosamente."
+#~ msgid "Fill tags"
+#~ msgstr "Preenche etiquetas"
 
-#.
-#. * Tag Settings
-#.
-#: ../src/prefs.c:533
-msgid "Tag Settings"
-msgstr "Configurações das etiquetas"
+#~ msgid "Rename files and directories"
+#~ msgstr "Renomeia arquivos e diretórios"
 
-#. Tag Options
-#: ../src/prefs.c:539
-msgid "Tag Options"
-msgstr "Opções das etiquetas"
+#~ msgid "_Process Fields…"
+#~ msgstr "_Processar campos…"
 
-#: ../src/prefs.c:545
-msgid "Auto completion of date if not complete"
-msgstr "Completar automaticamente a data se não estiver completa"
+#~ 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/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 ""
-"Tenta completar o campo do ano se você digitar apenas os últimos números da "
-"data (por exemplo, se o ano atual for 2005: 5 => 2005, 4 => 2004, 6 => 2006, "
-"95 => 1995…)."
+#~ 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/prefs.c:556
-msgid "Write the track field with the following number of digits:"
-msgstr "Gravar o campo da faixa com o seguinte número de dígitos:"
+#~ msgid "Select a directory to browse."
+#~ msgstr "Selecione um diretório para navegar."
 
-#: ../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 ""
-"Se ativada, o campo da faixa será gravado usando o número \"0\", como um "
-"meio de obter um número com \"n\" dígitos (por exemplo, com dois dígitos: "
-"\"05\", \"09\", \"10\"…). Caso contrário, será mantido o valor \"bruto\" da "
-"faixa."
+#~ msgid "If activated, it will use masks to rename directory."
+#~ msgstr "Se ativada, máscaras serão usadas para renomear o diretório."
 
-#: ../src/prefs.c:578
-msgid "Write the disc field with the following number of digits:"
-msgstr "Gravar o campo do disco com o seguinte número de dígitos:"
+#~ msgid "Program to run:"
+#~ msgstr "Programa para executar:"
 
-#: ../src/prefs.c:583
-msgid "Whether to pad the disc field with leading zeroes"
-msgstr "Se deve preencher o campo disco com zeros à esquerda"
+#~ msgid "Request CDDB"
+#~ msgstr "Requisitar CDDB"
 
-#: ../src/prefs.c:613
-msgid ""
-"Tag field focus when switching files in list with shortcuts Page Up/Page "
-"Down:"
-msgstr ""
-"Focalizar o campo da etiqueta ao mudar de arquivos na lista com os atalhos "
-"Page Up/Page Down:"
+#~ msgid "Use local CDDB"
+#~ msgstr "Usar o CDDB local"
 
-#: ../src/prefs.c:619
-msgid "Keep focus to the same tag field"
-msgstr "Manter o foco no mesmo campo da etiqueta"
+#~ msgid "When activating this option, after loading the fields, the current selected scanner will be ran (the scanner window must be opened)."
+#~ msgstr "Ao ativar esta opção, após o carregamento dos campos, a verificação selecionada será executada (a janela do verificador deverá estar aberta)."
 
-#: ../src/prefs.c:625
-msgid "Return focus to the first tag field (i.e. 'Title' field)"
-msgstr "Retornar o foco ao primeiro campo da etiqueta (i.e. campo \"Título\")"
+#~ msgid "Words:"
+#~ msgstr "Palavras:"
 
-#. 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 "Divisão de etiquetas"
+#~ msgid "Search In:"
+#~ msgstr "Pesquisar em:"
 
-#: ../src/prefs.c:639
-msgid ""
-"For Vorbis tags, selected fields will be split at dashes and saved as "
-"separate tags"
-msgstr ""
-"Para etiquetas Vorbis, campos selecionados serão divididos em traços e "
-"salvos como etiquetas separadas"
+#~ msgid "All Fields"
+#~ msgstr "Todos os campos"
 
-#: ../src/prefs.c:649
-msgid "Original artist"
-msgstr "Artista original"
+#~ msgid "All Categories"
+#~ msgstr "Todas as categorias"
 
-#.
-#. * ID3 Tag Settings
-#.
-#: ../src/prefs.c:670
-msgid "ID3 Tag Settings"
-msgstr "Configurações da etiqueta ID3"
+#~ msgid "included: funk, soul, rap, pop, industrial, metal, etc."
+#~ msgstr "incluindo: funk, soul, rap, pop, industrial, metal, etc."
 
-#. Tag Rules frame
-#: ../src/prefs.c:679
-msgid "ID3 Tag Rules"
-msgstr "Regras para etiquetas ID3"
+#~ msgid "movies, shows"
+#~ msgstr "filmes, shows"
 
-#. Strip tag when fields (managed by EasyTAG) are empty
-#: ../src/prefs.c:691
-msgid "Strip tags if all fields are set to blank"
-msgstr "Remover etiquetas se todos os campos estiverem em branco"
+#~ msgid "others that do not fit in the above categories"
+#~ msgstr "outras que não se enquadrem nas categorias acima"
 
-#: ../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 "
-"strip the whole tag when these seven standard data fields have been set to "
-"blank."
-msgstr ""
-"Etiquetas ID3v2 podem conter outros dados além do título, artista, álbum, "
-"ano, faixa, gênero ou comentário (como letras, imagens anexadas…), essa "
-"opção permite que você remova a etiqueta inteira quando esses sete campos "
-"padrões de dados estiverem em branco."
+#~ msgid "Enter the words to search in the list below"
+#~ msgstr "Digite as palavras para pesquisar na lista abaixo"
 
-#. Convert old ID3v2 tag version
-#: ../src/prefs.c:700
-msgid "Automatically convert old ID3v2 tag versions"
-msgstr "Converter automaticamente versões antigas de etiquetas ID3v2"
+#~ msgid "Search Next"
+#~ msgstr "Procurar próximo"
 
-#: ../src/prefs.c:703
-msgid ""
-"If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
-"ID3v2.3 version."
-msgstr ""
-"Se ativada, uma versão antiga de etiqueta ID3v2 (como ID3v2.2) será "
-"atualizada para a versão ID3v2.3."
+#~ msgid "Search Previous"
+#~ msgstr "Procurar anterior"
 
-#. Use CRC32
-#: ../src/prefs.c:707
-msgid "Use CRC32"
-msgstr "Usar CRC32"
+#~ msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
+#~ msgstr "Mostrar apenas linhas vermelhas (ou mostrar todas as linhas) na lista \"Artista / álbum\""
 
-#: ../src/prefs.c:710
-msgid "Set CRC32 in the ID3v2 tags"
-msgstr "Aplica o CRC32 nas etiquetas ID3v2"
+#~ msgid "Set Into:"
+#~ msgstr "Definir em:"
 
-#. Use Compression
-#: ../src/prefs.c:713
-msgid "Use Compression"
-msgstr "Usar compressão"
+#~ msgid "All"
+#~ msgstr "Todos"
 
-#: ../src/prefs.c:717
-msgid "Set Compression in the ID3v2 tags"
-msgstr "Aplica a compressão nas etiquetas ID3v2"
+#~ msgid ""
+#~ "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 ""
+#~ "Ao ativar esta opção, o algoritmo Levenshtein (DLM: Damerau-Levenshtein Metric) será usado para comparar o título CDDB contra todos os nomes de arquivos no diretório atual, e para selecionar a melhor coincidência. Isto será usado ao selecionar o arquivo de "
+#~ "áudio correspondente, ou ao aplicar os resultados CDDB, ao invés de usar diretamente a ordem na lista."
 
-#. Write Genre in text
-#: ../src/prefs.c:720
-msgid "Write Genre in text only"
-msgstr "Gravar o gênero em apenas texto"
+# "Local CD Database" não existe, e sim CDDB local. Portanto, usei o nome correto.
+#~ msgid "The path for 'Local CD Database' was not defined"
+#~ msgstr "O caminho da \"CDDB local\" não foi defindo"
 
-#: ../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 ""
-"Não usa as referências de número do ID3v1 na etiqeta de gênero. Habilite "
-"isso, se você vê números como gênero em seu reprodutor de música."
+#~ msgid "Enter it in the preferences window before using this search."
+#~ msgstr "Digite-o na janela de preferências, antes de usar esta pesquisa."
 
-#. Character Set for writing ID3 tag
-#: ../src/prefs.c:727
-msgid "Character Set for writing ID3 tags"
-msgstr "Codificação de caracteres para a gravação das etiquetas ID3"
+#~ msgid "Local CD search"
+#~ msgstr "Pesquisa de CD local"
 
-#. ID3v2 tags
-#: ../src/prefs.c:734
-msgid "ID3v2 tags"
-msgstr "Etiquetas ID3v2"
+#~ msgid "Using libid3tag version %s"
+#~ msgstr "Usando libid3tag versão %s"
 
-#. Write ID3v2 tag
-#: ../src/prefs.c:747
-msgid "Write ID3v2 tag"
-msgstr "Gravar etiqueta ID3v2"
+#~ msgid "Using id3lib version %d.%d.%d"
+#~ msgstr "Usando id3lib versão %d.%d.%d"
 
-#: ../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 ""
-"Se ativada, uma etiqueta ID3v2.4 será adicionada ou atualizada no início dos "
-"arquivos MP3. Caso contrário a etiqueta será removida."
+#~ msgid "Currently using locale '%s' (and eventually '%s')"
+#~ msgstr "Usando atualmente a localização \"%s\" (e eventualmente \"%s\")"
 
-#. ID3v2 tag version
-#: ../src/prefs.c:757
-msgid "Version:"
-msgstr "Versão:"
+#~ msgid "Frequency:"
+#~ msgstr "Frequência:"
 
-#: ../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 ""
-"Selecione a etiqueta ID3v2 que será gravada:\n"
-"- ID3v2.3 será gravada usando o id3lib,\n"
-"- ID3v2.4 será gravada usando o libid3tag (recomendado)."
+#~ msgid "Select Mode and Mask, and redo the same action"
+#~ msgstr "Seleciona modo e máscara e refaz a mesma ação"
 
-#. Charset
-#. Id3V1 writing character set
-#: ../src/prefs.c:778 ../src/prefs.c:882
-msgid "Charset:"
-msgstr "Codificação de caracteres:"
+#~ msgid "Files have been partially deleted"
+#~ msgstr "Os arquivos foram parcialmente excluídos"
 
-#. Unicode
-#: ../src/prefs.c:783
-msgid "Unicode "
-msgstr "Unicode "
+#~ msgid "Cannot write tag in file '%s' (%s)"
+#~ msgstr "Não foi possível gravar a etiqueta no arquivo \"%s\" (%s)"
 
-#: ../src/prefs.c:791
-msgid "Unicode type to use"
-msgstr "Tipo do unicode a ser usado"
+#~ msgid "Cannot read directory (%s)"
+#~ msgstr "Não foi possível ler o diretório (%s)"
 
-#: ../src/prefs.c:815
-msgid "Character set used to write the tag data in the file."
-msgstr ""
-"Codificação de caracteres usada para gravar os dados da etiqueta no arquivo."
+#~ msgid "M3U Playlist Name"
+#~ msgstr "Nome da lista de reprodução M3U"
 
-#. ID3v2 Additional iconv() options
-#. ID3V1 Additional iconv() options
-#: ../src/prefs.c:825 ../src/prefs.c:894
-msgid "Additional settings for iconv():"
-msgstr "Configurações adicionais para o iconv():"
+#~ msgid "Playlist Options"
+#~ msgstr "Opções da lista de reprodução"
 
-#: ../src/prefs.c:831 ../src/prefs.c:900
-msgid "No"
-msgstr "Não"
+#~ msgid "If activated, only the selected files will be written in the playlist file. Else, all the files will be written."
+#~ 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/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 ""
-"Com essa opção, quando um caractere não puder ser representado na "
-"codificação de caracteres alvo, ele não será alterado. Mas saiba que uma "
-"mensagem de erro será exibida, para informações."
+#~ 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."
 
-# Parâmetro do iconv(), não deve ser traduzido
-#: ../src/prefs.c:840 ../src/prefs.c:909
-msgid "//TRANSLIT"
-msgstr "//TRANSLIT"
+#~ msgid "This option replaces the UNIX directory separator '/' into DOS separator '\\'."
+#~ msgstr "Essa opção substitui o separador de diretório UNIX \"/\" por um separador DOS \"\\\"."
 
-# Parâmetro do iconv(), não deve ser traduzido
-#: ../src/prefs.c:850 ../src/prefs.c:919
-msgid "//IGNORE"
-msgstr "//IGNORE"
+#~ msgid "Playlist Content"
+#~ msgstr "Conteúdo da lista de reprodução"
 
-#. ID3v1 tags
-#: ../src/prefs.c:859
-msgid "ID3v1 tags"
-msgstr "Etiquetas ID3v1"
+#~ msgid "Move down the selected line"
+#~ msgstr "Mover para baixo a linha selecionada"
 
-#. Write ID3v1 tag
-#: ../src/prefs.c:873
-msgid "Write ID3v1.x tag"
-msgstr "Gravar etiqueta ID3v1.x"
+#~ msgid "When activating this option, after loading the filenames, the current selected scanner will be ran (the scanner window must be opened)."
+#~ msgstr "Ao ativar esta opção, após carregar os nomes de arquivos, o verificador selecionado atualmente será executado (a janela do verificador deverá estar aberta)."
 
-#: ../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 ""
-"Se ativada, uma etiqueta ID3v1.x será adicionada ou atualizada no fim do "
-"arquivo MP3. Caso contrário, a etiqueta será removida."
+#~ msgid "Cannot retrieve file info (%s)"
+#~ msgstr "Não foi possível obter informação do arquivo (%s)"
 
-#: ../src/prefs.c:890
-msgid "Character set used to write ID3v1 tag data in the file."
-msgstr ""
-"Codificação de caracteres a ser usada para gravar os dados da etiqueta ID3v1 "
-"no arquivo."
+#~ msgid "Can't open file '%s' (%s)"
+#~ msgstr "Não foi possível abrir o arquivo \"%s\" (%s)"
 
-#. Character Set for reading tag
-#: ../src/prefs.c:928
-msgid "Character Set for reading ID3 tags"
-msgstr "Codificação de caracteres para a leitura das etiquetas ID3"
+#~ msgid "Move down this line"
+#~ msgstr "Mover esta linha para baixo"
 
-#: ../src/prefs.c:942
-msgid "Non-standard:"
-msgstr "Fora do padrão:"
+#~ msgid "Error with 'loader_write': %s"
+#~ msgstr "Erro com \"loader_write\": %s"
 
-#: ../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 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."
-msgstr ""
-"Essa codificação de caracteres será usada ao ler os dados da etiqueta, para "
-"converter cada texto encontrada em um campo ISO-8859-1 na etiqueta (para "
-"etiquetas ID3v2 e/ou ID3v1).\n"
-"\n"
-"Por exemplo:\n"
-"  - em versões anteriores do EasyTAG, você pode salvar textos em UTF-8 em um "
-"campo ISO-8859-1. Isso não é o correto! Para converter essas etiquetas para "
-"o Unicode: ative essa opção e selecione UTF-8. Você também deve ativar a "
-"opção acima \"Tentar salvar as etiquetas em ISO-8859-1. Se não for possível, "
-"então use o UNICODE (recomendado)\" ou \"Sempre salvar as etiquetas na "
-"codificação de caracteres UNICODE\".\n"
-"  - se o Unicode não for usado, russos podem selecionar o conjunto de "
-"caracteres \"Windows-1251\" para carregar etiquetas gravadas no Windows. E "
-"\"KOI8-R\" para carregar etiquetas gravadas em sistemas Unix."
-
-#: ../src/prefs.c:966
-msgid "Character set used to read tag data in the file."
-msgstr ""
-"Codificação de caracteres usada para ler os dados da etiqueta no arquivo."
+#~ msgid "Error with 'loader_close': %s"
+#~ msgstr "Erro com \"loader_close\": %s"
 
-#.
-#. * Scanner
-#.
-#: ../src/prefs.c:980
-msgid "Scanner"
-msgstr "Verificador"
+#~ msgid "Image Description:"
+#~ msgstr "Descrição de imagem:"
 
-#. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: ../src/prefs.c:990
-msgid "Fill Tag Scanner - Character Conversion"
-msgstr "Verificador de preenchimento da etiqueta - Conversão de caracteres"
+#~ msgid "Default directory:"
+#~ msgstr "Diretório padrão:"
 
-#: ../src/prefs.c:996 ../src/prefs.c:1021
-msgid "Convert underscore character '_' and string '%20' to space ' '"
-msgstr ""
-"Converter caractere sublinhado \"_\" e o texto \"%20\"! para espaço \" \""
+#~ msgid "Specify the directory where your files are located. This path will be loaded when EasyTAG starts without parameter."
+#~ msgstr "Especificar o diretório onde seus arquivos estão localizados. Esse caminho será carregado ao iniciar o EasyTAG sem nenhum parâmetro."
 
-#: ../src/prefs.c:998 ../src/prefs.c:1022
-msgid "Convert space ' ' to underscore '_'"
-msgstr "Converter espaço \" \" para sublinhado \"_\""
+#~ 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 "Pesquisa automaticamente por arquivos, ao inicializar o EasyTAG, no diretório padrão. Note que esse caminho pode ser sobreposto pelo parâmetro enviado ao Easytag (easytag /caminho_para/arquivos_mp3)."
 
-#: ../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 ""
-"Se ativada, essa conversão será usada ao aplicar a máscara do verificador de "
-"etiquetas."
+#~ msgid "Search subdirectories"
+#~ msgstr "Pesquisar nos subdiretórios"
 
-#. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: ../src/prefs.c:1016
-msgid "Rename File Scanner - Character Conversion"
-msgstr "Verificador de renomeação de arquivos - Conversão de caracteres"
+#~ msgid "This expands the selected node into the file browser to display the sub-directories."
+#~ msgstr "Isso expande o nodo selecionado no navegador de arquivos para exibir os subdiretórios."
 
-#: ../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 ""
-"Se ativada, essa conversão será usada ao aplicar a máscara do verificador de "
-"nome dos arquivos."
+#~ msgid "Search hidden directories for files (directories starting by a '.')."
+#~ msgstr "Pesquisar nos diretórios ocultos por arquivos (diretórios começando com \".\")."
 
-#. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: ../src/prefs.c:1040
-msgid "Process Fields Scanner - Character Conversion"
-msgstr "Verificador de processamento dos campos - Conversão de caracteres"
+#~ msgid "Misc"
+#~ msgstr "Miscelânea"
 
-#. 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 ""
-"Não converter em maiúsculas a primeira letra de palavras para algumas "
-"preposições e artigos."
+#~ msgid "Show header information of file"
+#~ msgstr "Mostrar as informações do cabeçalho do arquivo"
 
-# "Feat" é featuring, que é a participação de algum artista na música de outro. Não é costume traduzir este termo no nome da música, e por este motivo mantive. Porém. entendo ser perfeitamente traduzível se trata-se de uma frase com algo como "com participação de".
-#: ../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 "
-"word' (for example, you will obtain 'Text in an Entry' instead of 'Text In "
-"An Entry')."
-msgstr ""
-"Não converte a primeira letra de palavras como preposições, artigos e "
-"palavras como \"feat.\", ao usar o verificador \"Primeira letra de cada "
-"palavra maiúscula\" (por exemplo, você obterá \"Texto em uma entrada\" ao "
-"invés de \"Texto em uma entrada\")."
-
-#. Properties of the scanner window
-#: ../src/prefs.c:1057
-msgid "Scanner Window"
-msgstr "Janela do verificador"
-
-#: ../src/prefs.c:1063
-msgid "Open the Scanner Window on startup"
-msgstr "Abrir a janela do verificador na inicialização"
+#~ msgid "If activated, information about the file as the bitrate, the time, the size, will be displayed under the filename entry."
+#~ msgstr "Se ativada, as informações sobre o arquivo como a taxa de bits, o tempo, o tamanho, serão exibidas na entrada do nome do arquivo."
 
-#: ../src/prefs.c:1066
-msgid ""
-"Activate this option to open automatically the scanner window when EasyTAG "
-"starts."
-msgstr ""
-"Ative essa opção para abrir automaticamente a janela do verificador quando o "
-"EasyTAG iniciar."
+#~ msgid "Sorting List Options"
+#~ msgstr "Opções de organização da lista"
 
-#. Other options
-#: ../src/prefs.c:1071
-msgid "Fields"
-msgstr "Campos"
+#~ msgid "Sort the file list by:"
+#~ msgstr "Organizar a lista de arquivo por:"
 
-#. Overwrite text into tag fields
-#: ../src/prefs.c:1078
-msgid "Overwrite fields when scanning tags"
-msgstr "Sobrescrever campos ao verificar as etiquetas"
+#~ msgid "Ascending filename"
+#~ msgstr "Nome do arquivo ascendente"
 
-#: ../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 ""
-"Se ativada, o verificador substituirá o texto existente nos campos por um "
-"novo. Se desativado, apenas os campos em branco da etiqueta serão "
-"preenchidos."
+#~ msgid "Descending filename"
+#~ msgstr "Nome do arquivo descendente"
 
-#: ../src/prefs.c:1092
-msgid "Set this text as default comment:"
-msgstr "Definir esse texto como o comentário padrão:"
+#~ msgid "Ascending title"
+#~ msgstr "Título ascendente"
 
-#: ../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 ""
-"Ative essa opção se deseja colocar o seguinte texto no campo de comentário "
-"ao usar o \"Verificador de preenchimento de etiquetas\"."
+#~ msgid "Descending title"
+#~ msgstr "Título descendente"
 
-#. CRC32 comment
-#: ../src/prefs.c:1113
-msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
-msgstr ""
-"Usar CRC32 como o comentário padrão (para arquivos com apenas etiquetas ID3)."
+#~ msgid "Ascending artist"
+#~ msgstr "Artista ascendente"
 
-#: ../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 ""
-"Calcula o valor CRC-32 do arquivo e gravá-o no campo de comentário ao usar o "
-"\"Verificador de preenchimento de etiquetas\"."
+#~ msgid "Descending artist"
+#~ msgstr "Artista descendente"
 
-#.
-#. * CDDB
-#.
-#: ../src/prefs.c:1128
-msgid "CDDB"
-msgstr "CDDB"
+#~ msgid "Ascending album artist"
+#~ msgstr "Artista de álbum ascendente"
 
-#. CDDB Server Settings (Automatic Search)
-#: ../src/prefs.c:1134
-msgid "Server Settings for Automatic Search"
-msgstr "Configurações do servidor para pesquisa automática"
+#~ msgid "Descending album artist"
+#~ msgstr "Artista de álbum descendente"
 
-#: ../src/prefs.c:1143 ../src/prefs.c:1182 ../src/prefs.c:1216
-msgid "Name:"
-msgstr "Nome:"
+#~ msgid "Ascending album"
+#~ msgstr "Álbum ascendente"
 
-#: ../src/prefs.c:1162 ../src/prefs.c:1190 ../src/prefs.c:1225
-#: ../src/prefs.c:1310
-msgid "Port:"
-msgstr "Porta:"
+#~ msgid "Descending album"
+#~ msgstr "Álbum descendente"
 
-#: ../src/prefs.c:1172 ../src/prefs.c:1200 ../src/prefs.c:1234
-msgid "CGI Path:"
-msgstr "Caminho CGI:"
+#~ msgid "Ascending year"
+#~ msgstr "Ano ascendente"
 
-#. CDDB Server Settings (Manual Search)
-#: ../src/prefs.c:1208
-msgid "Server Settings for Manual Search"
-msgstr "Configurações do servidor para pesquisa manual"
+#~ msgid "Descending year"
+#~ msgstr "Ano descendente"
 
-#. Local access for CDDB (Automatic Search)
-#: ../src/prefs.c:1242
-msgid "Local CDDB"
-msgstr "CDDB local"
+#~ msgid "Ascending disc number"
+#~ msgstr "Número do disco ascendente"
 
-#: ../src/prefs.c:1250
-msgid "Path:"
-msgstr "Caminho:"
+#~ msgid "Descending disc number"
+#~ msgstr "Número da disco descendente"
 
-#: ../src/prefs.c:1262
-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 ""
-"Especifique o diretório onde o banco de dados local do CD está localizado. O "
-"banco de dados local de CD contém os onze seguintes diretórios \"blues\", "
-"\"classical\", \"country\", \"data\", \"folk\", \"jazz\", \"newage\", "
-"\"reggae\", \"rock\", \"soundtrack\" e \"miscelânea\"."
-
-#. CDDB Proxy Settings
-#: ../src/prefs.c:1288
-msgid "Proxy Settings"
-msgstr "Configurações do proxy"
-
-#: ../src/prefs.c:1297
-msgid "Use a proxy"
-msgstr "Usar um proxy"
-
-#: ../src/prefs.c:1300
-msgid "Set active the settings of the proxy server."
-msgstr "Define como ativa as opções do servidor proxy."
-
-#: ../src/prefs.c:1302
-msgid "Host Name:"
-msgstr "Nome da máquina:"
-
-#: ../src/prefs.c:1309
-msgid "Name of the proxy server."
-msgstr "Nome do servidor proxy."
-
-#: ../src/prefs.c:1317
-msgid "Port of the proxy server."
-msgstr "Porta do servidor proxy."
-
-#: ../src/prefs.c:1321
-msgid "User Name:"
-msgstr "Nome de usuário:"
-
-#: ../src/prefs.c:1328
-msgid "Name of user for the the proxy server."
-msgstr "Nome do usuário do servidor proxy."
-
-#: ../src/prefs.c:1329
-msgid "User Password:"
-msgstr "Senha do usuário:"
-
-#: ../src/prefs.c:1338
-msgid "Password of user for the proxy server."
-msgstr "A senha do usuário para o servidor proxy."
-
-#. Track Name list (CDDB results)
-#: ../src/prefs.c:1343
-msgid "Track Name List"
-msgstr "Lista do nome da faixa"
-
-#: ../src/prefs.c:1350
-msgid ""
-"Select corresponding audio file (according position or DLM if activated "
-"below)"
-msgstr ""
-"Selecionar o arquivo de áudio correspondente (de acordo com a posição ou com "
-"o DLM, se ativado abaixo)"
+#~ msgid "Ascending track number"
+#~ msgstr "Número da faixa ascendente"
 
-#: ../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 ""
-"Se ativada, ao selecionar uma linha na lista de nomes das faixas, o arquivo "
-"de áudio correspondente na lista principal também será selecionado."
+#~ msgid "Descending track number"
+#~ msgstr "Número da faixa descendente"
 
-#. Check box to use DLM (also used in the cddb window)
-#: ../src/prefs.c:1359
-msgid ""
-"Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
-"files (using filename)"
-msgstr ""
-"Usar o algoritmo Levenshtein (DLM) para coincidir as linhas (usando o "
-"título) com os arquivos de áudio (usando o nome do arquivo)"
+#~ msgid "Ascending genre"
+#~ msgstr "Gênero ascendente"
 
-#.
-#. * Confirmation
-#.
-#: ../src/prefs.c:1374
-msgid "Confirmation"
-msgstr "Confirmação"
+#~ msgid "Descending genre"
+#~ msgstr "Gênero descendente"
 
-#: ../src/prefs.c:1379
-msgid "Confirm exit from program"
-msgstr "Confirmar ao sair do programa"
+#~ msgid "Ascending comment"
+#~ msgstr "Comentário ascendente"
 
-#: ../src/prefs.c:1382
-msgid ""
-"If activated, opens a dialog box to ask confirmation before exiting the "
-"program."
-msgstr ""
-"Se ativada, abre uma caixa de diálogo para pedir confirmação antes de fechar "
-"o programa."
+#~ msgid "Descending comment"
+#~ msgstr "Comentário descendente"
 
-#: ../src/prefs.c:1385
-msgid "Confirm writing of file tag"
-msgstr "Confirmar a gravação da etiqueta no arquivo"
+#~ msgid "Ascending composer"
+#~ msgstr "Compositor ascendente"
 
-#: ../src/prefs.c:1389
-msgid "Confirm renaming of file"
-msgstr "Confirmar a renomeação do arquivo"
+#~ msgid "Descending composer"
+#~ msgstr "compositor descendente"
 
-#: ../src/prefs.c:1393
-msgid "Confirm deleting of file"
-msgstr "Confirmar a exclusão do arquivo"
+#~ msgid "Ascending original artist"
+#~ msgstr "Artista original ascendente"
 
-#: ../src/prefs.c:1397
-msgid "Confirm writing of playlist"
-msgstr "Confirmar a gravação da lista de reprodução"
+#~ msgid "Descending original artist"
+#~ msgstr "Artista original descendente"
 
-#: ../src/prefs.c:1401
-msgid "Confirm changing directory when there are unsaved changes"
-msgstr "Confirmar a alteração do diretório quando há alterações não salvas"
+#~ msgid "Ascending copyright"
+#~ msgstr "Copyright ascendente"
 
-#. 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 "(Exemplo: %.*d_-_Nome_da_faixa_1.mp3)"
+#~ msgid "Descending copyright"
+#~ msgstr "Copyright descendente"
 
-#. 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 "(Exemplo: disco_%.*d_of_10/Nome_da_faixa_1.mp3)"
+#~ msgid "Ascending URL"
+#~ msgstr "URL ascendente"
 
-#: ../src/prefs.c:1614 ../src/setting.c:904
-msgid "Configuration saved"
-msgstr "Configuração salva"
+#~ msgid "Descending URL"
+#~ msgstr "URL descendente"
 
-#: ../src/prefs.c:1622
-msgid "Configuration unchanged"
-msgstr "Configuração inalterada"
+#~ msgid "Ascending encoded by"
+#~ msgstr "Nome do codificador ascendente"
 
-#: ../src/prefs.c:1713
-msgid "The selected path for 'Default path to files' is invalid"
-msgstr "O caminho selecionado para \"Caminho padrão para arquivos\" é inválido"
+#~ msgid "Descending encoded by"
+#~ msgstr "Codificador descendente por"
 
-#: ../src/prefs.c:1715
-#, c-format
-msgid ""
-"Path: '%s'\n"
-"Error: %s"
-msgstr ""
-"Caminho: \"%s\"\n"
-"Erro: %s"
+#~ msgid "Ascending creation date"
+#~ msgstr "Data de criação ascendente"
 
-#: ../src/prefs.c:1717
-msgid "Invalid Path Error"
-msgstr "Erro de caminho inválido"
+#~ msgid "Descending creation date"
+#~ msgstr "Data de criação descendente"
 
-#: ../src/prefs.c:1831
-#, c-format
-msgid "The audio file player '%s' cannot be found"
-msgstr "O reprodutor de arquivo de áudio \"%s\" não pode ser encontrado"
+#~ msgid "Select the type of file sorting when loading a directory."
+#~ msgstr "Selecionar o tipo de organização dos arquivos ao carregar um diretório."
 
-#: ../src/prefs.c:1833
-msgid "Audio Player Error"
-msgstr "Erro no reprodutor de áudio"
+#~ msgid "If activated, the sorting of the list will be dependent on the case."
+#~ msgstr "Se ativada, a organização da lista dependerá de maiúsculo e minúsculo."
 
-#: ../src/scan_dialog.c:182
-msgid "Fill Tag"
-msgstr "Preencher etiqueta"
+#~ msgid "File Audio Player"
+#~ msgstr "Reprodutor de arquivos de áudio"
 
-#: ../src/scan_dialog.c:356
-#, c-format
-msgid "Cannot calculate CRC value of file (%s)"
-msgstr "Não foi possível calcular o valor do CRC do arquivo (%s)"
+#~ msgid "Player to run:"
+#~ msgstr "Executar o reprodutor:"
 
-#: ../src/scan_dialog.c:371
-msgid "Tag successfully scanned"
-msgstr "Etiqueta verificada com sucesso"
+#~ 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 "Digite o programa usado para reproduzir os arquivos. Alguns argumentos podem ser passados para o programa (como \"xmms -p\") antes de receber os arquivos como outros argumentos."
 
-#: ../src/scan_dialog.c:373
-#, c-format
-msgid "Tag successfully scanned: %s"
-msgstr "Etiqueta verificada com sucesso: %s"
+#~ msgid "Show log view in main window"
+#~ msgstr "Mostrar visualização do log na janela principal"
 
-#: ../src/scan_dialog.c:414
-#, c-format
-msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
-msgstr ""
-"Verificador de etiqueta: estranho… a extensão \"%s\" não foi encontrada no "
-"nome de arquivo \"%s\""
+#~ msgid "If activated, the log view would be visible in the main window."
+#~ msgstr "Se ativada, será possível visualizar o log na janela principal."
 
-#: ../src/scan_dialog.c:496 ../src/scan_dialog.c:525
-#, c-format
-msgid "Scan Error: can't find separator '%s' within '%s'"
-msgstr ""
-"Erro de verificação: não foi possível localizador o separador \"%s\" dentro "
-"de \"%s\""
+#~ msgid "File Options"
+#~ msgstr "Opções de arquivo"
 
-#: ../src/scan_dialog.c:712
-msgid "New filename successfully scanned"
-msgstr "Novo nome do arquivo verificado com sucesso"
+#~ 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 os caracteres ilegais para sistemas de arquivos FAT32/16 e ISO9660 + Joliet (\"\\\", \":\", \";\", \"*\", \"?\", \"\"\", \"<\", \">\", \"|\") no nome dos arquivos para evitar problemas ao renomear. Isso é útil ao renomear um arquivo com o "
+#~ "verificador, a partir da etiqueta."
 
-#: ../src/scan_dialog.c:715
-#, c-format
-msgid "New filename successfully scanned: %s"
-msgstr "Novo nome do arquivo verificado com sucesso: %s"
+#~ msgid "Update modification time of the parent directory of the file (recommended when using Amarok)"
+#~ msgstr "Atualizar a data de modificação do diretório superior do arquivo (recomendado ao usar o Amarok)"
 
-#: ../src/scan_dialog.c:1632
-#, c-format
-msgid "Error while processing fields: %s"
-msgstr "Erro ao processar os campos: %s"
+#~ msgid ""
+#~ "The modification time of the parent directory of the file will be updated when saving tag the file. At the present time it is automatically done only when renaming a file.\n"
+#~ "This feature is interesting when using applications like Amarok. For performance reasons, they refresh file information by detecting changes of the parent directory."
+#~ msgstr ""
+#~ "A data de modificação do diretório superior do arquivo será atualizada ao salvar a etiqueta do arquivo. Atualmente, isso é feito automaticamente apenas ao renomear um arquivo.\n"
+#~ "Esse recurso é interessante ao usar aplicativos como o Amarok. Por motivos de performance, eles atualizam as informações do arquivo ao detectar alterações no diretório superior."
 
-#. The window
-#: ../src/scan_dialog.c:1802
-msgid "Tag and Filename Scan"
-msgstr "Verificação da etiqueta e do nome do arquivo"
+#~ msgid "Character Set for Filename"
+#~ msgstr "Codificação de caracteres para o nome do arquivo"
 
-#. TODO: Set related action to match AM_SCAN_FILES.
-#: ../src/scan_dialog.c:1811
-msgid "Scan Files"
-msgstr "Verificar arquivos"
+#~ msgid "Rules to apply if some characters can't be converted to the system character encoding when writing filename:"
+#~ msgstr "Regras ao aplicar se alguns caracteres não podem ser convertidas para a codificação de caracteres do sistema ao gravar o arquivo:"
 
-#. Option Menu
-#: ../src/scan_dialog.c:1839
-msgid "Scanner:"
-msgstr "Verificador:"
+#~ 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 "Com essa opção, será tentada uma conversão para a codificação associada a sua localização (por exemplo: ISO-8859-1 para \"fr\", KOI8-R para \"ru\", ISO-8859-2 para \"ro\"). Se isso falhar, será usada a codificação de caracteres ISO-8859-1."
 
-#: ../src/scan_dialog.c:1860
-msgid "Select the type of scanner to use"
-msgstr "Seleciona o tipo do verificador a ser usado"
+#~ msgid "Force using the system character encoding and activate the transliteration"
+#~ msgstr "Forçar o uso da codificação de caracteres do sistema e ativar a transliteração"
 
-#: ../src/scan_dialog.c:1869
-msgid "Scanner Preferences"
-msgstr "Preferências do verificador"
+#~ 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 "Com essa opção, quando um caractere não puder ser representado na codificação de caracteres alvo, ele pode ser aproximado através de um ou vários caracteres parecidos."
 
-#: ../src/scan_dialog.c:1878
-msgid "Show / Hide Masks Editor"
-msgstr "Mostra / oculta o editor de máscaras"
+#~ msgid "Tag Settings"
+#~ msgstr "Configurações das etiquetas"
 
-#: ../src/scan_dialog.c:1888
-msgid "Show / Hide Legend"
-msgstr "Mostra / oculta legendas"
+#~ msgid "Tag Options"
+#~ msgstr "Opções das etiquetas"
 
-#: ../src/scan_dialog.c:1918
-msgid ""
-"Select or type in a mask using codes (see Legend) to parse filename and "
-"path. Used to fill in tag fields"
-msgstr ""
-"Selecione ou digite na máscara usando códigos (veja a legenda) para analisar "
-"o nome do arquivo e o caminho. Usado para preencher campos das etiquetas"
+#~ msgid "Auto completion of date if not complete"
+#~ msgstr "Completar automaticamente a data se não estiver completa"
 
-#. Preview label
-#: ../src/scan_dialog.c:1942
-msgid "Fill tag preview"
-msgstr "Visualização do preenchimento da etiqueta"
+#~ 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 "Tenta completar o campo do ano se você digitar apenas os últimos números da data (por exemplo, se o ano atual for 2005: 5 => 2005, 4 => 2004, 6 => 2006, 95 => 1995…)."
 
-#: ../src/scan_dialog.c:1972
-msgid "Prefix mask with current path"
-msgstr "Prefixa a máscara no caminho atual"
+#~ msgid "Write the track field with the following number of digits:"
+#~ msgstr "Gravar o campo da faixa com o seguinte número de dígitos:"
 
-#: ../src/scan_dialog.c:1986
-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 ""
-"Selecione ou digite em uma máscara usando códigos (veja a legenda) para "
-"analisar os campos das etiquetas. Usado para renomear o arquivo.\n"
-"Use / para criar diretórios. Se o primeiro caractere for /, o caminho é "
-"absoluto, caso contrário é relativo ao caminho anterior."
+#~ 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 "Se ativada, o campo da faixa será gravado usando o número \"0\", como um meio de obter um número com \"n\" dígitos (por exemplo, com dois dígitos: \"05\", \"09\", \"10\"…). Caso contrário, será mantido o valor \"bruto\" da faixa."
 
-#. Preview label
-#: ../src/scan_dialog.c:2011
-msgid "Rename file preview"
-msgstr "Visualização da renomeação do arquivo"
+#~ msgid "Write the disc field with the following number of digits:"
+#~ msgstr "Gravar o campo do disco com o seguinte número de dígitos:"
 
-#: ../src/scan_dialog.c:2030
-msgid "Select fields:"
-msgstr "Campos selecionados:"
+#~ msgid "Tag field focus when switching files in list with shortcuts Page Up/Page Down:"
+#~ msgstr "Focalizar o campo da etiqueta ao mudar de arquivos na lista com os atalhos Page Up/Page Down:"
 
-#: ../src/scan_dialog.c:2033
-msgid ""
-"The buttons on the right represent the fields which can be processed. Select "
-"those which interest you"
-msgstr ""
-"Os botões a direita representam os campos que podem ser processados. "
-"Selecione aqueles que lhe interessam."
+#~ msgid "Keep focus to the same tag field"
+#~ msgstr "Manter o foco no mesmo campo da etiqueta"
 
-#. Advice for Translators: set the first letter of filename translated
-#: ../src/scan_dialog.c:2037
-msgid "F"
-msgstr "A"
+#~ msgid "Return focus to the first tag field (i.e. 'Title' field)"
+#~ msgstr "Retornar o foco ao primeiro campo da etiqueta (i.e. campo \"Título\")"
 
-#: ../src/scan_dialog.c:2039
-msgid "Process filename field"
-msgstr "Processar o campo do nome do arquivo"
+#~ msgid "ID3 Tag Settings"
+#~ msgstr "Configurações da etiqueta ID3"
 
-#. Advice for Translators: set the first letter of title translated
-#: ../src/scan_dialog.c:2041
-msgid "T"
-msgstr "T"
+#~ msgid "ID3 Tag Rules"
+#~ msgstr "Regras para etiquetas ID3"
 
-#: ../src/scan_dialog.c:2042
-msgid "Process title field"
-msgstr "Processar o campo do título"
+#~ 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 strip the whole tag when these seven standard data fields have been set to blank."
+#~ msgstr ""
+#~ "Etiquetas ID3v2 podem conter outros dados além do título, artista, álbum, ano, faixa, gênero ou comentário (como letras, imagens anexadas…), essa opção permite que você remova a etiqueta inteira quando esses sete campos padrões de dados estiverem em branco."
 
-#. Advice for Translators: set the first letter of artist translated
-#: ../src/scan_dialog.c:2044
-msgid "Ar"
-msgstr "Ar"
+#~ msgid "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the ID3v2.3 version."
+#~ msgstr "Se ativada, uma versão antiga de etiqueta ID3v2 (como ID3v2.2) será atualizada para a versão ID3v2.3."
 
-#: ../src/scan_dialog.c:2045
-msgid "Process file artist field"
-msgstr "Processar o campo do artista"
+#~ msgid "Use Compression"
+#~ msgstr "Usar compressão"
 
-#. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan_dialog.c:2047
-msgid "AA"
-msgstr "AA"
+#~ msgid "Write Genre in text only"
+#~ msgstr "Gravar o gênero em apenas texto"
 
-#: ../src/scan_dialog.c:2048
-msgid "Process album artist field"
-msgstr "Processar o campo do artista do álbum"
+#~ msgid "Don't use ID3v1 number references in genre tag. Enable this if you see numbers as genre in your music player."
+#~ msgstr "Não usa as referências de número do ID3v1 na etiqeta de gênero. Habilite isso, se você vê números como gênero em seu reprodutor de música."
 
-#. Advice for Translators: set the first letter of album translated
-#: ../src/scan_dialog.c:2050
-msgid "Al"
-msgstr "Al"
+#~ 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 "Se ativada, uma etiqueta ID3v2.4 será adicionada ou atualizada no início dos arquivos MP3. Caso contrário a etiqueta será removida."
 
-#: ../src/scan_dialog.c:2051
-msgid "Process album field"
-msgstr "Processar o campo do álbum"
+#~ msgid "Charset:"
+#~ msgstr "Codificação de caracteres:"
 
-#. Advice for Translators: set the first letter of genre translated
-#: ../src/scan_dialog.c:2053
-msgid "G"
-msgstr "G"
+#~ msgid "Unicode type to use"
+#~ msgstr "Tipo do unicode a ser usado"
 
-#: ../src/scan_dialog.c:2054
-msgid "Process genre field"
-msgstr "Processar o campo do gênero"
+#~ msgid "Character set used to write the tag data in the file."
+#~ msgstr "Codificação de caracteres usada para gravar os dados da etiqueta no arquivo."
 
-#. Advice for Translators: set the first letter of comment translated
-#: ../src/scan_dialog.c:2056
-msgid "Cm"
-msgstr "Cm"
+#~ msgid "Additional settings for iconv():"
+#~ msgstr "Configurações adicionais para o iconv():"
 
-#: ../src/scan_dialog.c:2057
-msgid "Process comment field"
-msgstr "Processar o campo do comentário"
+#~ msgid "No"
+#~ msgstr "Não"
 
-#. Advice for Translators: set the first letter of composer translated
-#: ../src/scan_dialog.c:2059
-msgid "Cp"
-msgstr "Cp"
+#~ msgid "With this option, when a character cannot be represented in the target character set, it isn't changed. But note that an error message will be displayed for information."
+#~ msgstr "Com essa opção, quando um caractere não puder ser representado na codificação de caracteres alvo, ele não será alterado. Mas saiba que uma mensagem de erro será exibida, para informações."
 
-#: ../src/scan_dialog.c:2060
-msgid "Process composer field"
-msgstr "Processar o campo do compositor"
+# Parâmetro do iconv(), não deve ser traduzido
+#~ msgid "//TRANSLIT"
+#~ msgstr "//TRANSLIT"
 
-#. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan_dialog.c:2062
-msgid "O"
-msgstr "A"
+# Parâmetro do iconv(), não deve ser traduzido
+#~ msgid "//IGNORE"
+#~ msgstr "//IGNORE"
 
-#: ../src/scan_dialog.c:2063
-msgid "Process original artist field"
-msgstr "Processar o campo do artista original"
+#~ msgid "If activated, an ID3v1 tag will be added or updated at the end of the MP3 files. Else it will be stripped."
+#~ msgstr "Se ativada, uma etiqueta ID3v1.x será adicionada ou atualizada no fim do arquivo MP3. Caso contrário, a etiqueta será removida."
 
-#. Advice for Translators: set the first letter of copyright translated
-#: ../src/scan_dialog.c:2065
-msgid "Cr"
-msgstr "Cr"
+#~ msgid "Character set used to write ID3v1 tag data in the file."
+#~ msgstr "Codificação de caracteres a ser usada para gravar os dados da etiqueta ID3v1 no arquivo."
 
-#: ../src/scan_dialog.c:2066
-msgid "Process copyright field"
-msgstr "Processar o campo de copyright"
+#~ msgid "Non-standard:"
+#~ msgstr "Fora do padrão:"
 
-#. Advice for Translators: set the first letter of URL translated
-#: ../src/scan_dialog.c:2068
-msgid "U"
-msgstr "U"
+#~ 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 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."
+#~ msgstr ""
+#~ "Essa codificação de caracteres será usada ao ler os dados da etiqueta, para converter cada texto encontrada em um campo ISO-8859-1 na etiqueta (para etiquetas ID3v2 e/ou ID3v1).\n"
+#~ "\n"
+#~ "Por exemplo:\n"
+#~ "  - em versões anteriores do EasyTAG, você pode salvar textos em UTF-8 em um campo ISO-8859-1. Isso não é o correto! Para converter essas etiquetas para o Unicode: ative essa opção e selecione UTF-8. Você também deve ativar a opção acima \"Tentar salvar as "
+#~ "etiquetas em ISO-8859-1. Se não for possível, então use o UNICODE (recomendado)\" ou \"Sempre salvar as etiquetas na codificação de caracteres UNICODE\".\n"
+#~ "  - se o Unicode não for usado, russos podem selecionar o conjunto de caracteres \"Windows-1251\" para carregar etiquetas gravadas no Windows. E \"KOI8-R\" para carregar etiquetas gravadas em sistemas Unix."
 
-#: ../src/scan_dialog.c:2069
-msgid "Process URL field"
-msgstr "Processar o campo da URL"
+#~ msgid "Character set used to read tag data in the file."
+#~ msgstr "Codificação de caracteres usada para ler os dados da etiqueta no arquivo."
 
-#. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan_dialog.c:2071
-msgid "E"
-msgstr "C"
+#~ msgid "Convert underscore character '_' and string '%20' to space ' '"
+#~ msgstr "Converter caractere sublinhado \"_\" e o texto \"%20\"! para espaço \" \""
 
-#: ../src/scan_dialog.c:2072
-msgid "Process encoder name field"
-msgstr "Processar o campo do nome do codificador"
+#~ msgid "If activated, this conversion will be used when applying a mask from the scanner for tags."
+#~ msgstr "Se ativada, essa conversão será usada ao aplicar a máscara do verificador de etiquetas."
 
-#: ../src/scan_dialog.c:2116
-msgid "Invert selection"
-msgstr "Inverter seleção"
+#~ msgid "Rename File Scanner - Character Conversion"
+#~ msgstr "Verificador de renomeação de arquivos - Conversão de caracteres"
 
-#: ../src/scan_dialog.c:2123
-msgid "Select/Unselect all"
-msgstr "Selecionar/Desmarcar todos"
+#~ msgid "If activated, this conversion will be used when applying a mask from the scanner for filenames."
+#~ msgstr "Se ativada, essa conversão será usada ao aplicar a máscara do verificador de nome dos arquivos."
 
-#: ../src/scan_dialog.c:2138
-msgid "Convert:"
-msgstr "Converter:"
+#~ msgid "Process Fields Scanner - Character Conversion"
+#~ msgstr "Verificador de processamento dos campos - Conversão de caracteres"
 
-#: ../src/scan_dialog.c:2140
-msgid "to: "
-msgstr "para: "
+# "Feat" é featuring, que é a participação de algum artista na música de outro. Não é costume traduzir este termo no nome da música, e por este motivo mantive. Porém. entendo ser perfeitamente traduzível se trata-se de uma frase com algo como "com participação de".
+#~ msgid "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 "Não converte a primeira letra de palavras como preposições, artigos e palavras como \"feat.\", ao usar o verificador \"Primeira letra de cada palavra maiúscula\" (por exemplo, você obterá \"Texto em uma entrada\" ao invés de \"Texto em uma entrada\")."
 
-#: ../src/scan_dialog.c:2147
-msgid "Do not convert"
-msgstr "Não converter"
+#~ msgid "Activate this option to open automatically the scanner window when EasyTAG starts."
+#~ msgstr "Ative essa opção para abrir automaticamente a janela do verificador quando o EasyTAG iniciar."
 
-#: ../src/scan_dialog.c:2177
-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 ""
-"O caractere de sublinhado ou o texto \"%20\" são substituídos por um espaço. "
-"Por exemplo, antes: \"Texto%20Em%20Uma_Entrada\", após: \"Texto em uma "
-"entrada\"."
+#~ 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 "Se ativada, o verificador substituirá o texto existente nos campos por um novo. Se desativado, apenas os campos em branco da etiqueta serão preenchidos."
 
-#: ../src/scan_dialog.c:2180
-msgid ""
-"The space character is replaced by one underscore character. Example, "
-"before: 'Text In An Entry', after: 'Text_In_An_Entry'."
-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\"."
+#~ msgid "Activate this option if you want to put the following string into the comment field when using the 'Fill Tag' scanner."
+#~ msgstr "Ative essa opção se deseja colocar o seguinte texto no campo de comentário ao usar o \"Verificador de preenchimento de etiquetas\"."
 
-#: ../src/scan_dialog.c:2183
-msgid ""
-"Replace a string by another one. Note that the search is case sensitive."
-msgstr ""
-"Substituir um texto por outro. Saiba que a pesquisa diferencia maiúsculo de "
-"minúsculo."
+#~ msgid "Calculates the CRC-32 value of the file and writes it into the comment field when using the 'Fill Tag' scanner."
+#~ msgstr "Calcula o valor CRC-32 do arquivo e gravá-o no campo de comentário ao usar o \"Verificador de preenchimento de etiquetas\"."
 
-# Caixa alta?
-#: ../src/scan_dialog.c:2190
-msgid "Capitalize all"
-msgstr "Tudo em maiúsculo"
+#~ msgid "Name:"
+#~ msgstr "Nome:"
 
-#: ../src/scan_dialog.c:2192
-msgid "Lowercase all"
-msgstr "Tudo em minúsculo"
+#~ msgid "Local CDDB"
+#~ msgstr "CDDB local"
 
-#: ../src/scan_dialog.c:2194
-msgid "Capitalize first letter"
-msgstr "Primeira letra em maiúsculo"
+#~ msgid "Path:"
+#~ msgstr "Caminho:"
 
-#: ../src/scan_dialog.c:2196
-msgid "Capitalize the first letter of each word"
-msgstr "Primeira letra de cada palavra em maiúsculo"
+#~ 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 ""
+#~ "Especifique o diretório onde o banco de dados local do CD está localizado. O banco de dados local de CD contém os onze seguintes diretórios \"blues\", \"classical\", \"country\", \"data\", \"folk\", \"jazz\", \"newage\", \"reggae\", \"rock\", \"soundtrack\" e "
+#~ "\"miscelânea\"."
 
-#: ../src/scan_dialog.c:2197
-msgid "Detect Roman numerals"
-msgstr "Detectar numerais romano"
+#~ msgid "Proxy Settings"
+#~ msgstr "Configurações do proxy"
 
-#: ../src/scan_dialog.c:2199
-msgid "Do not change capitalization"
-msgstr "Não alterar maiúsculo/minúsculo"
+#~ msgid "Set active the settings of the proxy server."
+#~ msgstr "Define como ativa as opções do servidor proxy."
 
-#: ../src/scan_dialog.c:2236
-msgid ""
-"Convert all words in all fields to upper case. Example, before: 'Text IN AN "
-"entry', after: 'TEXT IN AN ENTRY'."
-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\"."
+#~ msgid "Name of the proxy server."
+#~ msgstr "Nome do servidor proxy."
 
-#: ../src/scan_dialog.c:2239
-msgid ""
-"Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
-"entry', after: 'text in an entry'."
-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\"."
+#~ msgid "Port of the proxy server."
+#~ msgstr "Porta do servidor proxy."
 
-#: ../src/scan_dialog.c:2242
-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 ""
-"Converte a letra inicial da primeira palavra para maiúscula, em todos os "
-"campos. Por exemplo, antes: \"Texto EM Uma ENTRADA\", após: \"Texto em uma "
-"entrada\"."
+#~ msgid "Name of user for the the proxy server."
+#~ msgstr "Nome do usuário do servidor proxy."
 
-#: ../src/scan_dialog.c:2245
-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 ""
-"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\"."
+#~ msgid "Password of user for the proxy server."
+#~ msgstr "A senha do usuário para o servidor proxy."
 
-#: ../src/scan_dialog.c:2248
-msgid ""
-"Force to convert to upper case the Roman numerals. Example, before: 'ix. "
-"text in an entry', after: 'IX. Text In An Entry'."
-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\"."
+#~ msgid "Track Name List"
+#~ msgstr "Lista do nome da faixa"
 
-#: ../src/scan_dialog.c:2256
-msgid "Insert a space before uppercase letters"
-msgstr "Inserir um espaço antes das letras maiúsculas"
+#~ 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 "Se ativada, ao selecionar uma linha na lista de nomes das faixas, o arquivo de áudio correspondente na lista principal também será selecionado."
 
-#: ../src/scan_dialog.c:2258
-msgid "Remove duplicate spaces and underscores"
-msgstr "Remover sublinhados e espaços duplicados"
+#~ msgid "Confirm exit from program"
+#~ msgstr "Confirmar ao sair do programa"
 
-#: ../src/scan_dialog.c:2260
-msgid "Do not change word separators"
-msgstr "Não alterar seperadores de palavras"
+#~ msgid "If activated, opens a dialog box to ask confirmation before exiting the program."
+#~ msgstr "Se ativada, abre uma caixa de diálogo para pedir confirmação antes de fechar o programa."
 
-#: ../src/scan_dialog.c:2282
-msgid ""
-"All spaces between words are removed. Example, before: 'Text In An Entry', "
-"after: 'TextInAnEntry'."
-msgstr ""
-"Todos os espaços entre palavras são removidos. Por exemplo, antes: \"Texto "
-"Em Uma Entrada\", após: \"TextoEmUmaEntrada\"."
+#~ msgid "Confirm changing directory when there are unsaved changes"
+#~ msgstr "Confirmar a alteração do diretório quando há alterações não salvas"
 
-#: ../src/scan_dialog.c:2285
-msgid ""
-"A space is inserted before each upper case letter. Example, before: "
-"'TextInAnEntry', after: 'Text In An Entry'."
-msgstr ""
-"Um espaço é inserido antes de cada letra maiúscula. Por exemplo, antes: "
-"'TextoEmUmaEntrada', depois: 'Texto Em Uma Entrada'."
+#~ msgid "(Example: %.*d_-_Track_name_1.mp3)"
+#~ msgstr "(Exemplo: %.*d_-_Nome_da_faixa_1.mp3)"
 
-#: ../src/scan_dialog.c:2288
-msgid ""
-"Duplicate spaces and underscores are removed. Example, before: "
-"'Text__In__An   Entry', after: 'Text_In_An Entry'."
-msgstr ""
-"Sublinhados ou espaços duplicados serão removidos. Por exemplo, antes: "
-"\"Texto__Em__Uma   Entrada\", após: \"Texto_Em_Uma Entrada\"."
+#~ msgid "(Example: disc_%.*d_of_10/Track_name_1.mp3)"
+#~ msgstr "(Exemplo: disco_%.*d_of_10/Nome_da_faixa_1.mp3)"
 
-#.
-#. * Frame to display codes legend
-#.
-#: ../src/scan_dialog.c:2295
-msgid "Legend"
-msgstr "Legenda"
+#~ msgid "Configuration saved"
+#~ msgstr "Configuração salva"
 
-#: ../src/scan_dialog.c:2301
-#, c-format
-msgid "%a: artist"
-msgstr "%a: artista"
+#~ msgid "Configuration unchanged"
+#~ msgstr "Configuração inalterada"
 
-#: ../src/scan_dialog.c:2304
-msgid "%z: album artist"
-msgstr "%z: artista do álbum"
+#~ msgid "The audio file player '%s' cannot be found"
+#~ msgstr "O reprodutor de arquivo de áudio \"%s\" não pode ser encontrado"
 
-#: ../src/scan_dialog.c:2307
-msgid "%b: album"
-msgstr "%b: álbum"
+#~ msgid "Audio Player Error"
+#~ msgstr "Erro no reprodutor de áudio"
 
-#: ../src/scan_dialog.c:2310
-#, c-format
-msgid "%c: comment"
-msgstr "%c: comentário"
+#~ msgid "Scanner:"
+#~ msgstr "Verificador:"
 
-#: ../src/scan_dialog.c:2313
-#, c-format
-msgid "%p: composer"
-msgstr "%p: compositor"
+#~ msgid "Select the type of scanner to use"
+#~ msgstr "Seleciona o tipo do verificador a ser usado"
 
-#: ../src/scan_dialog.c:2316
-msgid "%r: copyright"
-msgstr "%r: copyright"
+#~ msgid "Select fields:"
+#~ msgstr "Campos selecionados:"
 
-#: ../src/scan_dialog.c:2319
-#, c-format
-msgid "%d: disc number"
-msgstr "%d: número do disco"
+#~ msgid "The buttons on the right represent the fields which can be processed. Select those which interest you"
+#~ msgstr "Os botões a direita representam os campos que podem ser processados. Selecione aqueles que lhe interessam."
 
-#: ../src/scan_dialog.c:2322
-#, c-format
-msgid "%e: encoded by"
-msgstr "%e: codificado por"
+#~ msgid "F"
+#~ msgstr "A"
 
-#: ../src/scan_dialog.c:2325
-#, c-format
-msgid "%g: genre"
-msgstr "%g: gênero"
+#~ msgid "T"
+#~ msgstr "T"
 
-#: ../src/scan_dialog.c:2328
-#, c-format
-msgid "%i: ignored"
-msgstr "%i: ignorado"
+#~ msgid "Ar"
+#~ msgstr "Ar"
 
-#: ../src/scan_dialog.c:2331
-msgid "%l: number of tracks"
-msgstr "%l: número de faixas"
+#~ msgid "AA"
+#~ msgstr "AA"
 
-#: ../src/scan_dialog.c:2334
-#, c-format
-msgid "%o: orig. artist"
-msgstr "%o: artista orig."
+#~ msgid "Process album artist field"
+#~ msgstr "Processar o campo do artista do álbum"
 
-#: ../src/scan_dialog.c:2337
-#, c-format
-msgid "%n: track"
-msgstr "%n: faixa"
+#~ msgid "Al"
+#~ msgstr "Al"
 
-#: ../src/scan_dialog.c:2340
-msgid "%t: title"
-msgstr "%t: título"
+#~ msgid "G"
+#~ msgstr "G"
 
-#: ../src/scan_dialog.c:2343
-#, c-format
-msgid "%u: URL"
-msgstr "%u: URL"
+#~ msgid "Cm"
+#~ msgstr "Cm"
 
-#: ../src/scan_dialog.c:2346
-#, c-format
-msgid "%x: number of discs"
-msgstr "%x: número de discos"
+#~ msgid "Cp"
+#~ msgstr "Cp"
 
-#: ../src/scan_dialog.c:2349
-msgid "%y: year"
-msgstr "%y: ano"
+#~ msgid "O"
+#~ msgstr "A"
 
-#.
-#. * Masks Editor
-#.
-#: ../src/scan_dialog.c:2356
-msgid "Mask Editor"
-msgstr "Editor de máscara"
+#~ msgid "Cr"
+#~ msgstr "Cr"
 
-#: ../src/scan_dialog.c:2410
-msgid "Create New Mask"
-msgstr "Criar nova máscara"
+#~ msgid "U"
+#~ msgstr "U"
 
-#: ../src/scan_dialog.c:2420
-msgid "Move Up this Mask"
-msgstr "Mover essa máscara para cima"
+#~ msgid "E"
+#~ msgstr "C"
 
-#: ../src/scan_dialog.c:2430
-msgid "Move Down this Mask"
-msgstr "Mover essa máscara para baixo"
+#~ msgid "Invert selection"
+#~ msgstr "Inverter seleção"
 
-#: ../src/scan_dialog.c:2440
-msgid "Duplicate Mask"
-msgstr "Duplicar máscara"
+#~ msgid "Select/Unselect all"
+#~ msgstr "Selecionar/Desmarcar todos"
 
-#: ../src/scan_dialog.c:2450
-msgid "Add Default Masks"
-msgstr "Adicionar máscaras padrão"
+#~ msgid "Convert all words in all fields to upper case. Example, before: 'Text IN AN entry', after: 'TEXT IN AN ENTRY'."
+#~ 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_dialog.c:2460
-msgid "Remove Mask"
-msgstr "Remover máscara"
+#~ msgid "Convert all words in all fields to lower case. Example, before: 'TEXT IN an entry', after: 'text in an entry'."
+#~ 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_dialog.c:2470
-msgid "Save Masks"
-msgstr "Salvar máscaras"
+#~ 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 "Converte a letra inicial da primeira palavra para maiúscula, em todos os campos. Por exemplo, antes: \"Texto EM Uma ENTRADA\", após: \"Texto em uma entrada\"."
 
-#: ../src/scan_dialog.c:3050
-msgid "New_mask"
-msgstr "Nova_máscara"
+#~ 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 "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_dialog.c:3089
-msgid "Copy: No row selected"
-msgstr "Copiar: Nenhuma linha selecionada"
+#~ msgid "Force to convert to upper case the Roman numerals. Example, before: 'ix. text in an entry', after: 'IX. Text In An Entry'."
+#~ 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_dialog.c:3182
-msgid "Remove: No row selected"
-msgstr "Remover: Nenhuma linha selecionada"
+#~ msgid "All spaces between words are removed. Example, before: 'Text In An Entry', after: 'TextInAnEntry'."
+#~ msgstr "Todos os espaços entre palavras são removidos. Por exemplo, antes: \"Texto Em Uma Entrada\", após: \"TextoEmUmaEntrada\"."
 
-#: ../src/scan_dialog.c:3229
-msgid "Move Up: No row selected"
-msgstr "Mover para cima: Nenhuma linha selecionada"
+#~ msgid "A space is inserted before each upper case letter. Example, before: 'TextInAnEntry', after: 'Text In An Entry'."
+#~ msgstr "Um espaço é inserido antes de cada letra maiúscula. Por exemplo, antes: 'TextoEmUmaEntrada', depois: 'Texto Em Uma Entrada'."
 
-#: ../src/scan_dialog.c:3273
-msgid "Move Down: No row selected"
-msgstr "Mover para baixo: Nenhuma linha selecionada"
+#~ msgid "Duplicate spaces and underscores are removed. Example, before: 'Text__In__An   Entry', after: 'Text_In_An Entry'."
+#~ msgstr "Sublinhados ou espaços duplicados serão removidos. Por exemplo, antes: \"Texto__Em__Uma   Entrada\", após: \"Texto_Em_Uma Entrada\"."
 
-#: ../src/setting.c:924
-#, c-format
-msgid "Error: Cannot write configuration file: %s (%s)"
-msgstr "Erro: Não foi possível gravar o arquivo de configuração: %s (%s)"
+#~ msgid "Move Up this Mask"
+#~ msgstr "Mover essa máscara para cima"
 
-#: ../src/setting.c:944 ../src/setting.c:961 ../src/setting.c:981
-#, c-format
-msgid "Error while writing configuration file: %s"
-msgstr "Erro ao escrever o arquivo de configuração %s"
+#~ msgid "Move Down this Mask"
+#~ msgstr "Mover essa máscara para baixo"
 
-#: ../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)"
+#~ msgid "Duplicate Mask"
+#~ msgstr "Duplicar máscara"
 
-#: ../src/setting.c:1102
-msgid "Loading default configuration"
-msgstr "Carregando configuração padrão"
+#~ msgid "Remove Mask"
+#~ msgstr "Remover máscara"
 
-#: ../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)"
+#~ msgid "Copy: No row selected"
+#~ msgstr "Copiar: Nenhuma linha selecionada"
 
-#: ../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)"
+#~ msgid "Remove: No row selected"
+#~ msgstr "Remover: Nenhuma linha selecionada"
 
-#: ../src/setting.c:1221
-#, c-format
-msgid "Error while writing list file: %s"
-msgstr "Erro ao gravar o arquivo de lista: %s"
+#~ msgid "Move Up: No row selected"
+#~ msgstr "Mover para cima: Nenhuma linha selecionada"
 
-#. Fall back to defaults
-#: ../src/setting.c:1301
-msgid "Loading default 'Fill Tag' masks…"
-msgstr "Carregando as máscaras padrão de \"Preenchimento de etiqueta\"…"
+#~ msgid "Move Down: No row selected"
+#~ msgstr "Mover para baixo: Nenhuma linha selecionada"
 
-#. Fall back to defaults
-#: ../src/setting.c:1331
-msgid "Loading default 'Rename File' masks…"
-msgstr "Carregando as máscaras padrão de \"Renomear arquivo\"…"
+#~ msgid "Error: Cannot write configuration file: %s (%s)"
+#~ msgstr "Erro: Não foi possível gravar o arquivo de configuração: %s (%s)"
 
-#. Fall back to defaults
-#: ../src/setting.c:1357
-msgid "Loading default 'Rename Directory' masks…"
-msgstr "Carregando as máscaras padrão de \"Renomear diretório\"…"
+#~ msgid "Error while writing configuration file: %s"
+#~ msgstr "Erro ao escrever o arquivo de configuração %s"
 
-#: ../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\""
+#~ msgid "Cannot open configuration file '%s' (%s)"
+#~ msgstr "Não foi possível abrir o arquivo de configuração \"%s\" (%s)"
 
-#: ../src/setting.c:1592
-#, c-format
-msgid "Failed to migrate configuration file '%s'"
-msgstr "Falha ao migrar o arquivo de configuração \"%s\""
+#~ msgid "Loading default configuration"
+#~ msgstr "Carregando configuração padrão"
 
-#: ../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)"
+#~ msgid "Loading default 'Rename Directory' masks…"
+#~ msgstr "Carregando as máscaras padrão de \"Renomear diretório\"…"
+
+#~ msgid "Error: Cannot create directory '%s' (%s)"
+#~ msgstr "Erro: Não foi possível criar o diretório \"%s\" (%s)"
 
 #~ msgid ""
-#~ "This program is free software; you can redistribute it and/or modify it "
-#~ "under the terms of the GNU General Public License as published by the "
-#~ "Free Software Foundation; either version 2 of the License, or (at your "
-#~ "option) any later version.\n"
+#~ "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"
+#~ "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/>."
+#~ "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 ""
-#~ "Este programa é um software livre; você pode redistribuí-lo e/ou modificá-"
-#~ "lo sob os termos da Licença Pública Geral GNU publicada pela Free "
-#~ "Software Foundation; qualquer versão 2 da Licença, ou (a seu critério) "
-#~ "outra versão posterior.\n"
+#~ "Este programa é um software livre; você pode redistribuí-lo e/ou modificá-lo sob os termos da Licença Pública Geral GNU publicada pela Free Software Foundation; qualquer versão 2 da Licença, ou (a seu critério) outra versão posterior.\n"
 #~ "\n"
-#~ "Este programa é distribuído na expectativa de que seja útil, mas SEM "
-#~ "NENHUMA GARANTIA; sem mesmo implicar garantias de COMERCIALIZAÇÃO ou "
-#~ "ADEQUAÇÃO A UM FIM ESPECÍFICO. Veja a Licença Pública Geral GNU (GPL) "
-#~ "para mais detalhes.\n"
+#~ "Este programa é distribuído na expectativa de que seja útil, mas SEM NENHUMA GARANTIA; sem mesmo implicar garantias de COMERCIALIZAÇÃO ou ADEQUAÇÃO A UM FIM ESPECÍFICO. Veja a Licença Pública Geral GNU (GPL) para mais detalhes.\n"
 #~ "\n"
-#~ "Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com "
-#~ "este programa; caso contrário, consulte <http://www.gnu.org/licenses/>."
+#~ "Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este programa; caso contrário, consulte <http://www.gnu.org/licenses/>."
 
 #~ msgid "File contains no audio track: '%s'"
 #~ msgstr "O arquivo contém nenhuma faixa de áudio: \"%s\""
@@ -5028,14 +5500,8 @@ msgstr "Erro: Não foi possível criar o diretório \"%s\" (%s)"
 #~ msgid "Received signal '%s' (%d)"
 #~ msgstr "Recebido o sinal \"%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 ""
-#~ "Você provavelmente encontrou um erro no EasyTAG. Por favor, envie um "
-#~ "relatório de erro com um backtrace do gdb (\"gdb easytag core\" então \"bt"
-#~ "\" e \"l\") e informações para reproduzi-lo para: %s"
+#~ 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 "Você provavelmente encontrou um erro no EasyTAG. Por favor, envie um relatório de erro com um backtrace do gdb (\"gdb easytag core\" então \"bt\" e \"l\") e informações para reproduzi-lo para: %s"
 
 #~ msgid "EasyTAG version %s: Abnormal exit (PID: %d)."
 #~ msgstr "EasyTAG versão %s: Saída anormal (PID: %d)."
@@ -5046,22 +5512,11 @@ msgstr "Erro: Não foi possível criar o diretório \"%s\" (%s)"
 #~ msgid "Cannot execute %s (error %d)\n"
 #~ msgstr "Não foi possível executar %s (erro %d)\n"
 
-#~ msgid ""
-#~ "Cannot write tag of file '%s' (%d bytes were read but %d bytes were "
-#~ "expected)"
-#~ msgstr ""
-#~ "Não foi possível gravar a etiqueta do arquivo \"%s\" (%d bytes foram "
-#~ "lidos, mas %d bytes eram esperados)"
+#~ msgid "Cannot write tag of file '%s' (%d bytes were read but %d bytes were expected)"
+#~ msgstr "Não foi possível gravar a etiqueta do arquivo \"%s\" (%d bytes foram lidos, mas %d bytes eram esperados)"
 
-#~ 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 é um utilitário para visualizar e editar etiquetas em "
-#~ "arquivos MP3, MP2, FLAC, Ogg Vorbis, MP4/AAC, MusePack e Monkey's Audio. "
-#~ "Sua simples e prática interface em GTK+ facilita a edição de etiquetas no "
-#~ "GNU/Linux."
+#~ 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 é um utilitário para visualizar e editar etiquetas em arquivos MP3, MP2, FLAC, Ogg Vorbis, MP4/AAC, MusePack e Monkey's Audio. Sua simples e prática interface em GTK+ facilita a edição de etiquetas no GNU/Linux."
 
 #~ msgid "(German translation)"
 #~ msgstr "(Tradução alemã)"
@@ -5191,9 +5646,6 @@ msgstr "Erro: Não foi possível criar o diretório \"%s\" (%s)"
 #~ msgid "Translations:\n"
 #~ msgstr "Traduções:\n"
 
-#~ msgid "General:\n"
-#~ msgstr "Principalmente:\n"
-
 #~ msgid "Changes"
 #~ msgstr "Modificações"
 
@@ -5242,10 +5694,6 @@ msgstr "Erro: Não foi possível criar o diretório \"%s\" (%s)"
 #~ msgstr "Procurar _Arquivo(s)..."
 
 #, fuzzy
-#~ msgid "Search File(s)…"
-#~ msgstr "Procurar Arquivo(s) ..."
-
-#, fuzzy
 #~ msgid "CD Data _Base Search…"
 #~ msgstr "Procurar no Banco de Dados de CDs"
 
@@ -5289,12 +5737,9 @@ msgstr "Erro: Não foi possível criar o diretório \"%s\" (%s)"
 #~ msgstr "Encontrados %d álbuns iguais para o DiscID '%s'"
 
 #, fuzzy
-#~ msgid ""
-#~ "You are applying %d lines of the CDDB results to %d lines in the list of "
-#~ "files"
+#~ msgid "You are applying %d lines of the CDDB results to %d lines in the list of files"
 #~ msgstr ""
-#~ "Tenha cuidado, você está aplicando %d linhas dos resultados CDDB para %d "
-#~ "linhas na lista de arquivos!\n"
+#~ "Tenha cuidado, você está aplicando %d linhas dos resultados CDDB para %d linhas na lista de arquivos!\n"
 #~ "\n"
 #~ "Deseja continuar?"
 
@@ -5332,8 +5777,7 @@ msgstr "Erro: Não foi possível criar o diretório \"%s\" (%s)"
 #~ msgstr "Imagens:"
 
 #~ msgid "Add pictures to the tag (drag and drop is also available)."
-#~ msgstr ""
-#~ "Adicionar imagens à etiqueta (também é possível 'arrastar e soltar')."
+#~ msgstr "Adicionar imagens à etiqueta (também é possível 'arrastar e soltar')."
 
 #~ msgid "Remove selected pictures, else all pictures."
 #~ msgstr "Remover as imagens selecionadas, ou todas as imagens."
@@ -5360,21 +5804,13 @@ msgstr "Erro: Não foi possível criar o diretório \"%s\" (%s)"
 #~ "(%s)"
 
 #, fuzzy
-#~ msgid ""
-#~ "Cannot rename file '%s' because the following file already exists: '%s'"
+#~ msgid "Cannot rename file '%s' because the following file already exists: '%s'"
 #~ msgstr ""
 #~ "Não foi possível renomear o arquivo \n"
 #~ "'%s'\n"
 #~ "porque o seguinte arquivo já existe:\n"
 #~ "'%s'"
 
-#, fuzzy
-#~ msgid "Cannot create target directory '%s': %s"
-#~ msgstr ""
-#~ "Não foi possível criar o diretório alvo\n"
-#~ "'%s'!\n"
-#~ "(%s)"
-
 #~ msgid "Renamed file '%s' to '%s'"
 #~ msgstr "Arquivo '%s' renomeado para '%s'"
 
@@ -5555,9 +5991,6 @@ msgstr "Erro: Não foi possível criar o diretório \"%s\" (%s)"
 #~ msgid "Encoded by"
 #~ msgstr "Codificador por"
 
-#~ msgid "Search a file"
-#~ msgstr "Procurar um arquivo"
-
 #~ msgid "Audio"
 #~ msgstr "Áudio"
 
@@ -5600,9 +6033,6 @@ msgstr "Erro: Não foi possível criar o diretório \"%s\" (%s)"
 #~ msgid "Let the Window Manager to place the windows."
 #~ msgstr "Deixar o Gerenciador de Janela posicionar as janelas."
 
-#~ msgid "Center of the main window"
-#~ msgstr "Centro da janela principal"
-
 #~ msgid "Windows should be placed in the center of the main window."
 #~ msgstr "As janelas deverão ser posicionadas no centro da janela principal."
 
@@ -5622,39 +6052,23 @@ msgstr "Erro: Não foi possível criar o diretório \"%s\" (%s)"
 #~ msgstr "Arquivos Ogg Vorbis: gravar também o comentário para o formato XMMS"
 
 #~ 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."
+#~ "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 ""
-#~ "O XMMS não usa corretamente a maneira de identificar um comentário em um "
-#~ "arquivo Ogg Vorbis como outros aplicativos fazem. Na verdade, esse campo "
-#~ "é normalmente marcado com 'comment=', enquanto o XMMS usa somente '='. "
-#~ "Por favor, desmarque essa opção se você não quiser que outros aplicativos "
-#~ "reclamem sobre um campo desconhecido. Apesar de que isso fará com que os "
-#~ "comentários não sejam mostrados no XMMS."
+#~ "O XMMS não usa corretamente a maneira de identificar um comentário em um arquivo Ogg Vorbis como outros aplicativos fazem. Na verdade, esse campo é normalmente marcado com 'comment=', enquanto o XMMS usa somente '='. Por favor, desmarque essa opção se você "
+#~ "não quiser que outros aplicativos reclamem sobre um campo desconhecido. Apesar de que isso fará com que os comentários não sejam mostrados no XMMS."
 
 #~ msgid "Write ID3 tags in FLAC files (in addition to FLAC tag)"
 #~ msgstr "Gravar etiquetas ID3 em arquivos FLAC (além da etiqueta FLAC)"
 
-#~ 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 ""
-#~ "Se ativada, etiquetas ID3 também serão adicionadas no arquivo FLAC (de "
-#~ "acordo com duas regras acima, mais a etiqueta FLAC). Caso contrário as "
-#~ "etiquetas ID3 serão removidas."
+#~ 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 "Se ativada, etiquetas ID3 também serão adicionadas no arquivo FLAC (de acordo com duas regras acima, mais a etiqueta FLAC). Caso contrário as etiquetas ID3 serão removidas."
 
 #~ msgid "Scanner window always on top"
 #~ msgstr "Janela do verificador sempre no topo"
 
-#~ msgid ""
-#~ "If activated, the window which contains the masks will stay always over "
-#~ "the main window."
-#~ msgstr ""
-#~ "Se ativada, a janela que contém as máscaras estará sempre sobre a janela "
-#~ "principal."
+#~ msgid "If activated, the window which contains the masks will stay always over the main window."
+#~ msgstr "Se ativada, a janela que contém as máscaras estará sempre sobre a janela principal."
 
 #~ msgid "CD Data Base"
 #~ msgstr "Banco de Dados de CDs"
@@ -5680,9 +6094,6 @@ msgstr "Erro: Não foi possível criar o diretório \"%s\" (%s)"
 #~ msgid "Close this window"
 #~ msgstr "Fechar essa janela"
 
-#~ msgid "Invert Selection"
-#~ msgstr "Inverter Seleção"
-
 #~ msgid "Convert '_' and '%20' to ' '"
 #~ msgstr "Converter '_' e '%20' para ' '"
 
@@ -5723,12 +6134,8 @@ msgstr "Erro: Não foi possível criar o diretório \"%s\" (%s)"
 #~ msgid "Corrupt or missing data, continuing…"
 #~ msgstr "Dados corrompidos ou faltando, continuando..."
 
-#~ msgid ""
-#~ "Error writing stream to output. Output stream may be corrupted or "
-#~ "truncated."
-#~ msgstr ""
-#~ "Erro ao escrever o stream de saída. O stream de saída pode estar "
-#~ "corrompido ou truncado."
+#~ msgid "Error writing stream to output. Output stream may be corrupted or truncated."
+#~ msgstr "Erro ao escrever o stream de saída. O stream de saída pode estar corrompido ou truncado."
 
 #~ msgid "About..."
 #~ msgstr "Sobre..."
@@ -5781,11 +6188,8 @@ msgstr "Erro: Não foi possível criar o diretório \"%s\" (%s)"
 #~ msgid "Error..."
 #~ msgstr "Erro..."
 
-#~ msgid ""
-#~ "Could not convert '%s' into filename encoding. Please use another name."
-#~ msgstr ""
-#~ "Não foi possível converter '%s' em um do nome de arquivo com essa "
-#~ "codificação. Por favor use outro nome."
+#~ msgid "Could not convert '%s' into filename encoding. Please use another name."
+#~ msgstr "Não foi possível converter '%s' em um do nome de arquivo com essa codificação. Por favor use outro nome."
 
 #~ msgid ""
 #~ "Can't rename because this directory name already exists!\n"
diff --git a/po/sr.po b/po/sr.po
index 17fd2e6..11db3e3 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: EasyTAG\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=easytag"
 "&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-10-29 17:48+0000\n"
-"PO-Revision-Date: 2014-11-05 05:03+0200\n"
+"POT-Creation-Date: 2014-12-27 04:16+0000\n"
+"PO-Revision-Date: 2014-12-27 12:24+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic at rocketmail.com>\n"
 "Language-Team: Serbian <gnom at prevod.org>\n"
 "Language: sr\n"
@@ -21,7 +21,17 @@ msgstr ""
 "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
+#. Name and summary taken from the desktop file.
+#: ../data/easytag.appdata.xml.in.h:2 ../data/easytag.desktop.in.h:1
+#| msgid "Open in EasyTAG"
+msgid "EasyTAG"
+msgstr "Лака ознака"
+
+#: ../data/easytag.appdata.xml.in.h:3 ../data/easytag.desktop.in.h:3
+msgid "Edit audio file metadata"
+msgstr "Уређујте метаподатке звучних датотека"
+
+#: ../data/easytag.appdata.xml.in.h:4
 msgid ""
 "View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg "
 "Vorbis, MusePack, Monkey's Audio and WavPack files."
@@ -29,7 +39,7 @@ msgstr ""
 "Прегледајте и уређујте ознаке за МП3, МП2, МП4/ААЦ, ФЛАЦ, Огг Опус, Огг "
 "Спикс, Огг Ворбис, МјузПак, Монки аудио и Вејвпак датотеке."
 
-#: ../data/easytag.appdata.xml.in.h:2
+#: ../data/easytag.appdata.xml.in.h:5
 msgid ""
 "Look up albums in online databases, bulk edit tags, create playlists and "
 "rename a collection of files."
@@ -37,7 +47,7 @@ msgstr ""
 "Тражите албуме у бази података на мрежи, групно уређујте ознаке, стварајте "
 "спискове нумера и преименујте збирке датотека."
 
-#: ../data/easytag.appdata.xml.in.h:3
+#: ../data/easytag.appdata.xml.in.h:6
 msgid ""
 "A simple and nice GTK+ interface makes tagging easier under GNU/Linux and "
 "Windows."
@@ -45,22 +55,26 @@ msgstr ""
 "Једноставно и привлачно Гтк+ сучеље чини означавање лакшим у ГНУ/Линуксу и "
 "Виндоузу."
 
-#: ../data/easytag.desktop.in.h:1
-#| msgid "Sound File Metadata Editor"
+#: ../data/easytag.desktop.in.h:2
 msgid "Audio File Metadata Editor"
 msgstr "Уређивач метаподатака звучних датотека"
 
-#: ../data/easytag.desktop.in.h:2
-#| msgid "Edit sound file metadata"
-msgid "Edit audio file metadata"
-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;"
+#: ../data/easytag.desktop.in.h:5
 msgid "mp3;tag;audio;music;"
 msgstr "мп3;ознака;звук;музика;"
 
+#: ../data/easytag-nautilus.metainfo.xml.in.h:1
+#: ../nautilus-extension/nautilus-easytag.c:247
+msgid "Open with EasyTAG"
+msgstr "Отвори Лаком ознаком"
+
+#: ../data/easytag-nautilus.metainfo.xml.in.h:2
+msgid "Open directories and audio files with EasyTAG using the context menu"
+msgstr ""
+"Отворите директоријуме и звучне датотеке Лаком ознаком користећи приручни "
+"изборник"
+
 #: ../data/browser.ui.h:1
 msgid "Browse Directory With"
 msgstr "Отворите директоријум програмом"
@@ -70,25 +84,22 @@ msgid "Run Program"
 msgstr "Покрени програм"
 
 #: ../data/browser.ui.h:3
-#| msgid ""
-#| "Enter the program to run. It will receive the current directory as "
-#| "parameter."
 msgid ""
 "Enter the program to run; it will receive the current directory as a "
 "parameter"
 msgstr ""
 "Унесите програм за покретање; примиће тренутни директоријум као параметар."
 
-#: ../data/browser.ui.h:4 ../src/misc.c:393 ../src/tag_area.c:1491
+#: ../data/browser.ui.h:4 ../src/browser.c:3779 ../src/tag_area.c:1479
 msgid "_Open"
 msgstr "От_вори"
 
 #: ../data/browser.ui.h:5 ../data/tag_area.ui.h:3
-#: ../src/application_window.c:322 ../src/application_window.c:336
-#: ../src/application_window.c:2612 ../src/application_window.c:2650
-#: ../src/browser.c:848 ../src/cddb_dialog.c:2266 ../src/easytag.c:516
-#: ../src/easytag.c:523 ../src/easytag.c:640 ../src/misc.c:391
-#: ../src/playlist_dialog.c:655 ../src/tag_area.c:1489 ../src/tag_area.c:1851
+#: ../src/application_window.c:323 ../src/application_window.c:337
+#: ../src/application_window.c:2685 ../src/application_window.c:2723
+#: ../src/browser.c:863 ../src/browser.c:3778 ../src/cddb_dialog.c:2297
+#: ../src/easytag.c:467 ../src/easytag.c:474 ../src/easytag.c:599
+#: ../src/playlist_dialog.c:658 ../src/tag_area.c:1477 ../src/tag_area.c:1840
 msgid "_Cancel"
 msgstr "От_кажи"
 
@@ -101,19 +112,16 @@ msgid "Open Files With"
 msgstr "Отворите датотеке програмом"
 
 #: ../data/browser.ui.h:8
-#| msgid ""
-#| "Enter the program to run. It will receive the current file as parameter."
 msgid ""
 "Enter the program to run; it will receive the current files as a parameter"
 msgstr "Унесите програм за покретање; примиће тренутну датотеку као параметар."
 
 #. Only directories changed
-#: ../data/browser.ui.h:9 ../data/menus.ui.h:99 ../src/easytag.c:606
+#: ../data/browser.ui.h:9 ../data/menus.ui.h:99 ../src/easytag.c:565
 msgid "Rename Directory"
 msgstr "Преименуј директоријум"
 
 #: ../data/browser.ui.h:10
-#| msgid "User Name:"
 msgid "Literal name:"
 msgstr "Дословни назив:"
 
@@ -122,14 +130,10 @@ msgid "Use mask:"
 msgstr "Користи маску:"
 
 #: ../data/browser.ui.h:12 ../data/org.gnome.EasyTAG.gschema.xml.h:188
-#| msgid "Unable to create setting directories"
 msgid "Whether to use a mask when renaming directories"
 msgstr "Да ли да користи маску приликом преименовања директоријума"
 
 #: ../data/browser.ui.h:13
-#| msgid ""
-#| "Select or type in a mask using codes (see Legend in Scanner Window) to "
-#| "rename the directory from tag fields."
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields"
@@ -142,12 +146,10 @@ msgid "Rename directory preview"
 msgstr "Преглед преименовања директоријума"
 
 #: ../data/browser.ui.h:15
-#| msgid "Rename File"
 msgid "_Rename"
 msgstr "_Преименуј"
 
 #: ../data/browser.ui.h:16
-#| msgid "Enter a directory to browse."
 msgid "Choose a directory to show in the browser"
 msgstr "Изаберите директоријум за приказ у прегледнику"
 
@@ -155,7 +157,7 @@ msgstr "Изаберите директоријум за приказ у пре
 msgid "Select a directory to browse"
 msgstr "Изаберите директоријум за разгледање"
 
-#: ../data/browser.ui.h:18 ../src/easytag.c:1107
+#: ../data/browser.ui.h:18 ../src/easytag.c:1071
 msgid "No files"
 msgstr "Нема датотека"
 
@@ -222,7 +224,7 @@ msgstr "Коментар"
 
 #: ../data/browser.ui.h:31 ../data/preferences_dialog.ui.h:71
 #: ../data/scan_dialog.ui.h:66 ../data/search_dialog.ui.h:21
-#: ../src/picture.c:224
+#: ../src/picture.c:212
 msgid "Composer"
 msgstr "Композитор"
 
@@ -246,35 +248,28 @@ msgid "Encoded By"
 msgstr "Кодирано помоћу"
 
 #: ../data/cddb_dialog.ui.h:1
-#| msgid "Search:"
 msgid "Search"
 msgstr "Потражи"
 
 #: ../data/cddb_dialog.ui.h:2
-#| msgid "Enter the words to search (separated by a space or '+')"
 msgid "Enter the words to search (separated by a space or ‘+’)"
 msgstr "Унеси речи за претрагу (раздвојене размаком или знаком „+“)"
 
 #: ../data/cddb_dialog.ui.h:3
-#| msgid "Search:"
 msgid "_Search"
 msgstr "_Тражи"
 
 #: ../data/cddb_dialog.ui.h:4
-#| msgid ""
-#| "Request automatically the CDDB using the selected files (the order is "
-#| "important) to generate the CddbID"
+msgid "Search Using Selected _Files"
+msgstr "Тражи користећи изабране _датотеке"
+
+#: ../data/cddb_dialog.ui.h:5
 msgid ""
 "Generate the CDDB disc ID using the selected files (the order is important)"
 msgstr ""
 "Ствара ИБ диска из базе података ЦД-а користећи изабране датотеке (редослед "
 "је важан)"
 
-#: ../data/cddb_dialog.ui.h:5
-#| msgid "Scan selected files"
-msgid "Search Using Selected _Files"
-msgstr "Тражи користећи изабране _датотеке"
-
 #: ../data/cddb_dialog.ui.h:6 ../data/toolbar.ui.h:31
 msgid "Stop"
 msgstr "Заустави"
@@ -284,12 +279,10 @@ msgid "Stop the search"
 msgstr "Прекините претрагу"
 
 #: ../data/cddb_dialog.ui.h:8
-#| msgid "Manual Search"
 msgid "Manual Search Options"
 msgstr "Избори ручне претраге"
 
 #: ../data/cddb_dialog.ui.h:9
-#| msgid "CDDB Search Files…"
 msgid "Search Fields"
 msgstr "Поља претраге"
 
@@ -298,7 +291,7 @@ msgid "Track Name"
 msgstr "Наслов нумере"
 
 #: ../data/cddb_dialog.ui.h:13 ../data/preferences_dialog.ui.h:91
-#: ../src/picture.c:202
+#: ../src/picture.c:190
 msgid "Other"
 msgstr "Остало"
 
@@ -347,7 +340,6 @@ msgid "Soundtrack"
 msgstr "Звучна трака"
 
 #: ../data/cddb_dialog.ui.h:25
-#| msgid "Results:"
 msgid "Results"
 msgstr "Резултати"
 
@@ -360,10 +352,6 @@ msgid "Category"
 msgstr "Категорија"
 
 #: ../data/cddb_dialog.ui.h:28
-#| 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."
 msgid ""
 "Select lines from which tags will be applied to your files list. All lines "
 "will be processed if no line is selected.\\nYou can also reorder lines in "
@@ -387,7 +375,6 @@ msgid "Select all lines"
 msgstr "Изабери све редове"
 
 #: ../data/cddb_dialog.ui.h:32
-#| msgid "Invert lines selection"
 msgid "Invert line selection"
 msgstr "Обрни избор редова"
 
@@ -396,7 +383,6 @@ msgid "Unselect all lines"
 msgstr "Поништи избор свих редова"
 
 #: ../data/cddb_dialog.ui.h:34 ../data/menus.ui.h:24
-#| msgid "Fill Tag"
 msgid "Fill Tags"
 msgstr "Попуни ознаке"
 
@@ -432,24 +418,23 @@ msgstr ""
 "датотекама"
 
 #: ../data/cddb_dialog.ui.h:45 ../data/search_dialog.ui.h:10
-#: ../src/load_files_dialog.c:895 ../src/preferences_dialog.c:295
-#: ../src/scan_dialog.c:2257
+#: ../src/load_files_dialog.c:895 ../src/preferences_dialog.c:291
+#: ../src/scan_dialog.c:2261
 msgid "_Close"
 msgstr "_Затвори"
 
-#: ../data/cddb_dialog.ui.h:46 ../src/cddb_dialog.c:2267
+#: ../data/cddb_dialog.ui.h:46 ../src/cddb_dialog.c:2298
 #: ../src/load_files_dialog.c:896
 msgid "_Apply"
 msgstr "_Примени"
 
 #: ../data/cddb_dialog.ui.h:47
-#| msgid "Load the selected lines or all lines (if no line selected)."
 msgid "Load the selected lines or all lines (if no lines are selected)"
 msgstr ""
 "Учитај изабране редове или све редове (уколико ниједан ред није изабран)."
 
 #. Default values are MPEG data.
-#: ../data/file_area.ui.h:1 ../src/et_core.c:3027 ../src/file_area.c:192
+#: ../data/file_area.ui.h:1 ../src/et_core.c:3010 ../src/file_area.c:192
 msgid "File"
 msgstr "Датотека"
 
@@ -461,9 +446,9 @@ msgstr "0/0:"
 #. Version changed to encoder version
 #. Encoder version
 #: ../data/file_area.ui.h:3 ../src/file_area.c:193
-#: ../src/tags/flac_header.c:303 ../src/tags/monkeyaudio_header.c:89
-#: ../src/tags/musepack_header.c:93 ../src/tags/ogg_header.c:399
-#: ../src/tags/opus_header.c:226 ../src/tags/wavpack_header.c:86
+#: ../src/tags/flac_header.c:175 ../src/tags/monkeyaudio_header.c:88
+#: ../src/tags/musepack_header.c:92 ../src/tags/ogg_header.c:398
+#: ../src/tags/opus_header.c:223 ../src/tags/wavpack_header.c:141
 msgid "Encoder:"
 msgstr "Кодер:"
 
@@ -477,7 +462,7 @@ msgstr "Проток узорка:"
 
 #. Mode
 #: ../data/file_area.ui.h:6 ../src/file_area.c:197
-#: ../src/tags/mpeg_header.c:248
+#: ../src/tags/mpeg_header.c:247
 msgid "Mode:"
 msgstr "Режим:"
 
@@ -498,12 +483,10 @@ msgid "File:"
 msgstr "Датотека:"
 
 #: ../data/load_files_dialog.ui.h:2
-#| msgid "Content of Text File"
 msgid "Choose a Text File"
 msgstr "Изаберите датотеку текста"
 
 #: ../data/load_files_dialog.ui.h:3
-#| msgid " Load "
 msgid "_Load"
 msgstr "_Учитај"
 
@@ -525,12 +508,10 @@ msgid "Delete all blank lines"
 msgstr "Обришите све празне редове"
 
 #: ../data/load_files_dialog.ui.h:8
-#| msgid "Move up the selected line"
 msgid "Move the selected line up"
 msgstr "Померите изабрани ред горе"
 
 #: ../data/load_files_dialog.ui.h:9
-#| msgid "Move up the selected line"
 msgid "Move the selected line down"
 msgstr "Померите изабрани ред доле"
 
@@ -549,7 +530,6 @@ msgstr "Изабрани ред:"
 
 #: ../data/load_files_dialog.ui.h:14
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:131
-#| msgid "Run the current scanner for each file"
 msgid "Whether to run the current scanner on files loaded from a text file"
 msgstr ""
 "Да ли да покрене текућег прегледача над датотекама учитаним из датотеке "
@@ -563,7 +543,7 @@ msgstr "По_моћ"
 msgid "_About"
 msgstr "_О програму"
 
-#: ../data/menus.ui.h:3 ../src/application_window.c:2651
+#: ../data/menus.ui.h:3 ../src/application_window.c:2724
 msgid "_Quit"
 msgstr "_Изађи"
 
@@ -588,7 +568,6 @@ msgid "Delete Files"
 msgstr "Обриши датотеке"
 
 #: ../data/menus.ui.h:9
-#| msgid "Find Files"
 msgid "Undo for File"
 msgstr "Поништи за датотеке"
 
@@ -613,7 +592,6 @@ msgid "_Find…"
 msgstr "_Пронађи…"
 
 #: ../data/menus.ui.h:15
-#| msgid "Select all"
 msgid "Select All"
 msgstr "Изабери све"
 
@@ -642,17 +620,14 @@ msgid "_View"
 msgstr "_Преглед"
 
 #: ../data/menus.ui.h:22
-#| msgid "_Show Scanner"
 msgid "Show Scanner"
 msgstr "Прикажи прегледач"
 
 #: ../data/menus.ui.h:23
-#| msgid "S_canner Mode"
 msgid "Scanner Mode"
 msgstr "Режим прегледача"
 
 #: ../data/menus.ui.h:25
-#| msgid "_Rename Files and Directories…"
 msgid "Rename Files and Directories"
 msgstr "Преименујте датотеке и директоријуме"
 
@@ -661,12 +636,10 @@ msgid "Process Fields"
 msgstr "Обради поља"
 
 #: ../data/menus.ui.h:27 ../data/toolbar.ui.h:19
-#| msgid "Directory renamed"
 msgid "Directory Tree"
 msgstr "Стабло директоријума"
 
 #: ../data/menus.ui.h:28 ../data/toolbar.ui.h:21
-#| msgid "Artist and Album"
 msgid "Artists and Albums"
 msgstr "Извођачи и албуми"
 
@@ -823,32 +796,26 @@ msgid "Descending by duration"
 msgstr "Опадајуће, према трајању нумере"
 
 #: ../data/menus.ui.h:67
-#| msgid "Ascending by bitrate"
 msgid "Ascending by bit rate"
 msgstr "Растуће, према битском протоку"
 
 #: ../data/menus.ui.h:68
-#| msgid "Descending by bitrate"
 msgid "Descending by bit rate"
 msgstr "Опадајуће, према битском протоку"
 
 #: ../data/menus.ui.h:69
-#| msgid "Ascending by samplerate"
 msgid "Ascending by sample rate"
 msgstr "Растуће, према протоку узорка"
 
 #: ../data/menus.ui.h:70
-#| msgid "Descending by samplerate"
 msgid "Descending by sample rate"
 msgstr "Опадајуће, према протоку узорка"
 
 #: ../data/menus.ui.h:71
-#| msgid "_Collapse Tree"
 msgid "Collapse Tree"
 msgstr "Скупи стабло"
 
 #: ../data/menus.ui.h:72
-#| msgid "_Reload Tree"
 msgid "Reload Tree"
 msgstr "Освежи стабло"
 
@@ -933,7 +900,6 @@ msgid "_First File"
 msgstr "П_рва датотека"
 
 #: ../data/menus.ui.h:93
-#| msgid "_Previous File"
 msgid "Previous File"
 msgstr "Претходна датотека"
 
@@ -946,27 +912,22 @@ msgid "_Last File"
 msgstr "Пос_ледња датотека"
 
 #: ../data/menus.ui.h:96
-#| msgid "_Home Directory"
 msgid "Home Directory"
 msgstr "Лични директоријум"
 
 #: ../data/menus.ui.h:97
-#| msgid "_Default Directory"
 msgid "Default Directory"
 msgstr "Основни директоријум"
 
 #: ../data/menus.ui.h:98
-#| msgid "Set _Current Path as Default"
 msgid "Set Current Path as Default"
 msgstr "Постави тренутну путању као основну"
 
 #: ../data/menus.ui.h:100
-#| msgid "Browse _Subdirectories"
 msgid "Browse Subdirectories"
 msgstr "Разгледај под-директоријуме"
 
 #: ../data/menus.ui.h:101
-#| msgid "Invert selection"
 msgid "Invert Selection"
 msgstr "Преокрени избор"
 
@@ -975,12 +936,10 @@ msgid "CDDB Search Files…"
 msgstr "Нађи датотеке у бази података ЦД-а…"
 
 #: ../data/menus.ui.h:103
-#| msgid "_Find…"
 msgid "Find…"
 msgstr "Пронађи…"
 
 #: ../data/menus.ui.h:104
-#| msgid "Clear log"
 msgid "Clear Log"
 msgstr "Очисти дневник"
 
@@ -989,7 +948,6 @@ msgid "Use directory name"
 msgstr "Користи назив директоријума"
 
 #: ../data/playlist_dialog.ui.h:4
-#| msgid "Log Options"
 msgid "Options"
 msgstr "Опције"
 
@@ -1016,7 +974,6 @@ msgid "Create playlist in the parent directory"
 msgstr "Направи списак нумера у родитељском директоријуму"
 
 #: ../data/playlist_dialog.ui.h:10 ../data/org.gnome.EasyTAG.gschema.xml.h:168
-#| msgid "Create playlist in the parent directory"
 msgid "Whether to create the playlist in the parent directory"
 msgstr "Да ли да направи списак нумера у родитељском директоријуму"
 
@@ -1032,7 +989,6 @@ msgstr ""
 "спискова нумера"
 
 #: ../data/playlist_dialog.ui.h:13
-#| msgid "_Contents"
 msgid "Content"
 msgstr "Садржај"
 
@@ -1041,12 +997,10 @@ msgid "Write only list of files"
 msgstr "Упиши само списак датотека"
 
 #: ../data/playlist_dialog.ui.h:15
-#| msgid "Write info using filename"
 msgid "Write information using filename"
 msgstr "Упиши податке користећи назив датотеке"
 
 #: ../data/playlist_dialog.ui.h:16
-#| msgid "Write info using:"
 msgid "Write information using:"
 msgstr "Упиши податке користећи:"
 
@@ -1055,12 +1009,10 @@ msgid "Browser"
 msgstr "Прегледник"
 
 #: ../data/preferences_dialog.ui.h:2
-#| msgid "_Default Directory"
 msgid "Default Directory:"
 msgstr "Основни директоријум:"
 
 #: ../data/preferences_dialog.ui.h:3 ../data/org.gnome.EasyTAG.gschema.xml.h:4
-#| msgid "New default path for files selected"
 msgid "The default path to search for music files"
 msgstr "Основна путања за тражење датотека музике"
 
@@ -1084,8 +1036,6 @@ msgid "Browse subdirectories"
 msgstr "Разгледајте под-директоријуме"
 
 #: ../data/preferences_dialog.ui.h:7 ../data/org.gnome.EasyTAG.gschema.xml.h:6
-#| msgid ""
-#| "Search subdirectories for files when reading a directory into the tree."
 msgid ""
 "Whether to search subdirectories for audio files when reading a directory in "
 "the browser"
@@ -1094,7 +1044,6 @@ msgstr ""
 "прегледнику."
 
 #: ../data/preferences_dialog.ui.h:8 ../data/org.gnome.EasyTAG.gschema.xml.h:9
-#| msgid "Show subdirectories when selecting a directory"
 msgid "Expand the subdirectories of the selected directory"
 msgstr "Рашири под-директоријуме изабраног директоријума"
 
@@ -1113,8 +1062,6 @@ msgstr "Претражи скривене директоријуме"
 
 #: ../data/preferences_dialog.ui.h:11
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:8
-#| msgid ""
-#| "Search subdirectories for files when reading a directory into the tree."
 msgid ""
 "Whether to show hidden directories when showing a directory in the browser"
 msgstr ""
@@ -1133,18 +1080,15 @@ msgstr "Да ли да се обазире на величину слова ка
 
 #: ../data/preferences_dialog.ui.h:15
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:59
-#| msgid "Show help"
 msgid "Show the log"
 msgstr "Прикажи дневник"
 
 #: ../data/preferences_dialog.ui.h:16
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:60
-#| msgid "Show log view in main window"
 msgid "Whether to show the log in the main window"
 msgstr "Да ли да прикаже дневник у главном проору"
 
 #: ../data/preferences_dialog.ui.h:17
-#| msgid "Max number of lines:"
 msgid "Maximum number of lines:"
 msgstr "Највећи број редова:"
 
@@ -1184,7 +1128,6 @@ msgid "Bold style"
 msgstr "Подебљано"
 
 #: ../data/preferences_dialog.ui.h:25
-#| msgid "User Interface"
 msgid "Interface"
 msgstr "Сучеље"
 
@@ -1194,26 +1137,21 @@ msgstr "Подешавања датотека"
 
 #: ../data/preferences_dialog.ui.h:27
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:45
-#| msgid "Preserve modification time of the file"
 msgid "Preserve modification time when writing files"
 msgstr "Задржава време измене када записује датотеке"
 
 #: ../data/preferences_dialog.ui.h:28
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:46
-#| msgid "Preserve modification time of the file"
 msgid "Whether to preserve the existing modification time when editing files"
 msgstr "Да ли да очува постојеће време измене када уређује датотеке"
 
 #: ../data/preferences_dialog.ui.h:29
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:47
-#| msgid "Preserve modification time of the file"
 msgid "Update parent directory modification time when writing files"
 msgstr "Освежи време измене полазног директоријума када пишеш датотеке"
 
 #: ../data/preferences_dialog.ui.h:30
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:48
-#| msgid ""
-#| "Preserve the modification time (in file properties) when saving the file."
 msgid ""
 "Whether to update the modification time on the parent directory when editing "
 "files"
@@ -1221,13 +1159,11 @@ msgstr ""
 "Да ли да освежи време измене полазног директоријума када уређује датотеке"
 
 #: ../data/preferences_dialog.ui.h:31
-#| msgid "Filename"
 msgid "Filenames"
 msgstr "Називи датотека"
 
 #: ../data/preferences_dialog.ui.h:32
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:195
-#| msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgid "Replace illegal characters when renaming"
 msgstr "Замени недозвољене знаке у називу датотеке"
 
@@ -1248,7 +1184,6 @@ msgid "Lower Case"
 msgstr "Мала слова"
 
 #: ../data/preferences_dialog.ui.h:36
-#| msgid "For example, the extension will be converted to '.mp3'"
 msgid "For example, the extension will be converted to ‘.mp3’"
 msgstr "На пример, проширење ће бити преименовано у „.mp3“"
 
@@ -1257,7 +1192,6 @@ msgid "Upper Case"
 msgstr "Велика слова"
 
 #: ../data/preferences_dialog.ui.h:38
-#| msgid "For example, the extension will be converted to '.MP3'"
 msgid "For example, the extension will be converted to ‘.MP3’"
 msgstr "На пример, проширење ће бити преименовано у „.MP3“"
 
@@ -1266,12 +1200,10 @@ msgid "No Change"
 msgstr "Без измене"
 
 #: ../data/preferences_dialog.ui.h:40
-#| msgid "The extension will not be converted"
 msgid "The extension will not be modified"
 msgstr "Проширење неће бити измењено"
 
 #: ../data/preferences_dialog.ui.h:41
-#| msgid "Filename translation"
 msgid "Filename Encoding"
 msgstr "Кодирање назива датотеке"
 
@@ -1288,7 +1220,6 @@ msgstr ""
 "пробајте ISO-8859-1 кодирање знакова"
 
 #: ../data/preferences_dialog.ui.h:44
-#| msgid "Try another character encoding"
 msgid "Transliterate characters into the system character encoding"
 msgstr "Преведи знакове у системско кодирање знакова"
 
@@ -1299,17 +1230,12 @@ msgid ""
 msgstr "Замените неподржане знакове сличним из циљног кодирања"
 
 #: ../data/preferences_dialog.ui.h:46
-#| msgid ""
-#| "Force using the system character encoding and silently discard some "
-#| "characters"
 msgid ""
 "Use the system character encoding and silently discard unsupported characters"
-msgstr "Користи системско кодирање знакова и неприметно одбаци неподржане знаке"
+msgstr ""
+"Користи системско кодирање знакова и неприметно одбаци неподржане знаке"
 
 #: ../data/preferences_dialog.ui.h:47
-#| msgid ""
-#| "With this option, when a character cannot be represented in the target "
-#| "character set, it will be silently discarded."
 msgid ""
 "Discard characters which cannot be represented in the target character "
 "encoding"
@@ -1317,7 +1243,6 @@ msgstr ""
 "Одбаците знакове који не могу бити представљени у циљном кодирању знакова"
 
 #: ../data/preferences_dialog.ui.h:48
-#| msgid "File"
 msgid "Files"
 msgstr "Датотеке"
 
@@ -1360,7 +1285,6 @@ msgstr "Попуни број цифара у пољу диска:"
 
 #: ../data/preferences_dialog.ui.h:56
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:96
-#| msgid "Whether to pad the disc field with leading zeroes"
 msgid "Whether the disc number tag field should be padded with leading zeroes"
 msgstr "Да ли поље ознаке броја диска треба да се попуни водећим нулама"
 
@@ -1370,12 +1294,10 @@ msgstr "Попуни број цифара у пољу нумере:"
 
 #: ../data/preferences_dialog.ui.h:58
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:102
-#| msgid "Whether to pad the disc field with leading zeroes"
 msgid "Whether the track number tag field should be padded with leading zeroes"
 msgstr "Да ли поље ознаке броја нумере треба да се попуни водећим нулама"
 
 #: ../data/preferences_dialog.ui.h:59
-#| msgid "Tag Splitting"
 msgid "Splitting"
 msgstr "Подела"
 
@@ -1434,7 +1356,6 @@ msgstr "Ознаке"
 
 #: ../data/preferences_dialog.ui.h:76
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:63
-#| msgid "Strip tags if all fields are set to blank"
 msgid "Strip ID3 tags if all ID3 tags are empty"
 msgstr "Обриши ИД3 ознаке ако су све ИД3 ознаке празне"
 
@@ -1448,7 +1369,6 @@ msgstr ""
 "ознаке празна"
 
 #: ../data/preferences_dialog.ui.h:78
-#| msgid "Character Set for reading ID3 tags"
 msgid "Non-standard encoding for reading ID3 tags:"
 msgstr "Не-стандардно кодирање за читање ИД3 ознака:"
 
@@ -1459,13 +1379,11 @@ msgstr "Да ли да користи не-стандардно кодирање
 
 #: ../data/preferences_dialog.ui.h:80
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:72
-#| msgid "Character Set for reading ID3 tags"
 msgid "Choose the character set to be used when reading ID3v1 and ID3v2 tags"
 msgstr ""
 "Изаберите скуп знакова за коришћење приликом читања ИД3в1 и ИД3в2 ознака"
 
 #: ../data/preferences_dialog.ui.h:81
-#| msgid "ID3v2 tags"
 msgid "ID3v2"
 msgstr "ИД3в2"
 
@@ -1484,10 +1402,6 @@ msgid "Version:"
 msgstr "Издање:"
 
 #: ../data/preferences_dialog.ui.h:85
-#| msgid ""
-#| "Select the ID3v2 tag version to write:\n"
-#| " - ID3v2.3 is written using id3lib,\n"
-#| " - ID3v2.4 is written using libid3tag (recommended)."
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " • ID3v2.3 is written using id3lib,\n"
@@ -1498,12 +1412,10 @@ msgstr ""
 " • ИД3в2.4 се уписује користећи библид3таг (препоручљиво)"
 
 #: ../data/preferences_dialog.ui.h:88
-#| msgid "Try another character encoding"
 msgid "Character encoding:"
 msgstr "Кодирање знакова:"
 
 #: ../data/preferences_dialog.ui.h:89
-#| msgid "Unicode "
 msgid "Unicode"
 msgstr "Уникод"
 
@@ -1530,9 +1442,6 @@ msgid "Report error"
 msgstr "Пријави грешку"
 
 #: ../data/preferences_dialog.ui.h:95
-#| msgid ""
-#| "With this option, when a character cannot be represented in the target "
-#| "character set, it will be silently discarded."
 msgid ""
 "Display an error message when a character cannot be represented in the "
 "target character encoding and keep the original character"
@@ -1545,7 +1454,6 @@ msgid "Transliterate"
 msgstr "Преслови"
 
 #: ../data/preferences_dialog.ui.h:97
-#| msgid "Disc"
 msgid "Discard"
 msgstr "Одбаци"
 
@@ -1563,7 +1471,6 @@ msgstr ""
 "је ИД3в2.2, у новије, као што су ИД3в2.3 или ИД3в2.4"
 
 #: ../data/preferences_dialog.ui.h:100
-#| msgid "Use CRC32"
 msgid "Use CRC-32"
 msgstr "Користи ЦРЦ-32"
 
@@ -1575,13 +1482,11 @@ msgstr ""
 
 #: ../data/preferences_dialog.ui.h:102
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:79
-#| msgid "Set Compression in the ID3v2 tags"
 msgid "Compress data in ID3v2 tags"
 msgstr "Запакуј податке у ИД3в2 ознакама"
 
 #: ../data/preferences_dialog.ui.h:103
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:80
-#| msgid "Set Compression in the ID3v2 tags"
 msgid "Whether to compress data in ID3v2 tags"
 msgstr "Да ли да запакује податке у ИД3в2 ознакама"
 
@@ -1600,12 +1505,10 @@ msgstr ""
 "када записује поље жанра у ИД3в2 ознакама"
 
 #: ../data/preferences_dialog.ui.h:106
-#| msgid "ID3v1 tags"
 msgid "ID3v1"
 msgstr "ИД3в1"
 
 #: ../data/preferences_dialog.ui.h:107
-#| msgid "Write ID3v1.x tag"
 msgid "Write ID3v1 tag"
 msgstr "Упиши ИД3в1 ознаку"
 
@@ -1616,34 +1519,28 @@ msgstr ""
 "Да ли да упише ИД3в1 ознаке приликом писања ИД3 ознака у звучним датотекама"
 
 #: ../data/preferences_dialog.ui.h:109
-#| msgid "Character Set for writing ID3 tags"
 msgid "Choose the character set to be used when writing ID3v1 tag"
 msgstr "Изаберите скуп знакова за упис ИД3в1 ознака"
 
 #: ../data/preferences_dialog.ui.h:110
-#| msgid "ID3 Tag"
 msgid "ID3 Tags"
 msgstr "ИД3 ознаке"
 
 #: ../data/preferences_dialog.ui.h:111
-#| msgid "Fill Tag Scanner - Character Conversion"
 msgid "Character Conversion"
 msgstr "Превођење знакова"
 
 #: ../data/preferences_dialog.ui.h:112
-#| msgid "Fill Tag"
 msgid "Fill Tag Scanner"
 msgstr "Попини прегледач ознаке"
 
 #: ../data/preferences_dialog.ui.h:114
 #, no-c-format
-#| msgid "Convert '_' and '%20' to spaces"
 msgid "Convert underscores and ‘%20’ to spaces"
 msgstr "Преведи „_“ и „%20“ у размаке"
 
 #: ../data/preferences_dialog.ui.h:116
 #, no-c-format
-#| msgid "Convert space ' ' to underscore '_'"
 msgid "Convert spaces and ‘%20’ to underscores"
 msgstr "Преведи размаке и „%20“ у доње цртице „_“"
 
@@ -1652,17 +1549,14 @@ msgid "No conversion"
 msgstr "Без претварања"
 
 #: ../data/preferences_dialog.ui.h:118
-#| msgid "Rename File and Directory"
 msgid "Rename File and Directory Scanner"
 msgstr "Преименуј датотеку и прегледача директоријума"
 
 #: ../data/preferences_dialog.ui.h:119
-#| msgid "Process Fields"
 msgid "Process Fields Scanner"
 msgstr "Обради прегледач поља"
 
 #: ../data/preferences_dialog.ui.h:120
-#| msgid "Capitalize the first letter of each word"
 msgid "Upper-case the first letters of all words"
 msgstr "Прво слово сваке речи велико"
 
@@ -1706,13 +1600,11 @@ msgstr ""
 "попуњава ознаке"
 
 #: ../data/preferences_dialog.ui.h:127
-#| msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgid "Use CRC-32 as the default comment (for files with ID3 tags only)"
 msgstr "Користи ЦРЦ-32 као основни коментар (само за датотеке са ИД3 ознакама)"
 
 #: ../data/preferences_dialog.ui.h:128
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:117
-#| msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgid ""
 "Whether to use the CRC-32 of the audio file data as the default comment, for "
 "files with ID3 tags only"
@@ -1725,12 +1617,10 @@ msgid "Scanner"
 msgstr "Прегледач"
 
 #: ../data/preferences_dialog.ui.h:130
-#| msgid "Automatic Search"
 msgid "Automatic Search Servers"
 msgstr "Сервери самосталне претраге"
 
 #: ../data/preferences_dialog.ui.h:131
-#| msgid "Host Name:"
 msgid "Host:"
 msgstr "Домаћин:"
 
@@ -1743,7 +1633,6 @@ msgid "CGI Path:"
 msgstr "ЦГИ путања:"
 
 #: ../data/preferences_dialog.ui.h:134
-#| msgid "Manual Search"
 msgid "Manual Search Server"
 msgstr "Сервер ручне претраге"
 
@@ -1752,7 +1641,6 @@ msgid "Proxy"
 msgstr "Посредник"
 
 #: ../data/preferences_dialog.ui.h:136
-#| msgid "Use a proxy"
 msgid "Use a proxy server"
 msgstr "Користи посреднички сервер"
 
@@ -1772,7 +1660,6 @@ msgid "Port for a proxy to access remote CDDB"
 msgstr "Прикључник за посредника за приступ удаљеној базе података ЦД-а"
 
 #: ../data/preferences_dialog.ui.h:140
-#| msgid "User Name:"
 msgid "User:"
 msgstr "Корисник:"
 
@@ -1782,7 +1669,6 @@ msgid "Username for a proxy to access remote CDDB"
 msgstr "Име корисника за посредника за приступ удаљеној базе података ЦД-а"
 
 #: ../data/preferences_dialog.ui.h:142
-#| msgid "User Password:"
 msgid "Password:"
 msgstr "Лозинка:"
 
@@ -1792,14 +1678,10 @@ msgid "Password for a proxy to access remote CDDB"
 msgstr "Лозинка за посредника за приступ удаљеној базе података ЦД-а"
 
 #: ../data/preferences_dialog.ui.h:144
-#| msgid "Results:"
 msgid "Results List"
 msgstr "Списак резултата"
 
 #: ../data/preferences_dialog.ui.h:145
-#| msgid ""
-#| "Select corresponding audio file (according position or DLM if activated "
-#| "below)"
 msgid ""
 "Select corresponding file (according to position or DLM if activated below)"
 msgstr ""
@@ -1816,9 +1698,6 @@ msgstr ""
 "резултата базе података ЦД-а"
 
 #: ../data/preferences_dialog.ui.h:147
-#| msgid ""
-#| "Use the Levenshtein algorithm (DLM) to match lines (using title) with "
-#| "audio files (using filename)"
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match results (using title) with "
 "audio files (using filename)"
@@ -1836,7 +1715,6 @@ msgstr "Потврде"
 
 #: ../data/preferences_dialog.ui.h:151
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:118
-#| msgid "Confirm writing of playlist"
 msgid "Confirm before quitting the application"
 msgstr "Потврди затварање програма"
 
@@ -1848,7 +1726,6 @@ msgstr "Да ли да затражи одобрење од корисника 
 
 #: ../data/preferences_dialog.ui.h:153
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:120
-#| msgid "Confirm writing of file tag"
 msgid "Confirm before writing tags"
 msgstr "Потврди упис ознаке датотеке"
 
@@ -1863,7 +1740,6 @@ msgstr ""
 
 #: ../data/preferences_dialog.ui.h:155
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:122
-#| msgid "Confirm renaming of file"
 msgid "Confirm before renaming a file"
 msgstr "Потврди преименовање датотеке"
 
@@ -1874,7 +1750,6 @@ msgstr "Да ли да затражи одобрење од корисника 
 
 #: ../data/preferences_dialog.ui.h:157
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:126
-#| msgid "Confirm deleting of file"
 msgid "Confirm before deleting a file"
 msgstr "Потврди брисање датотеке"
 
@@ -1885,18 +1760,17 @@ msgstr "Да ли да затражи одобрење од корисника 
 
 #: ../data/preferences_dialog.ui.h:159
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:124
-#| msgid "Confirm writing of playlist"
 msgid "Confirm before writing a playlist"
 msgstr "Потврди записивање списка нумера"
 
 #: ../data/preferences_dialog.ui.h:160
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:125
 msgid "Whether to ask for confirmation from the user before writing a playlist"
-msgstr "Да ли да затражи одобрење од корисника пре него ли запише списак нумера"
+msgstr ""
+"Да ли да затражи одобрење од корисника пре него ли запише списак нумера"
 
 #: ../data/preferences_dialog.ui.h:161
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:128
-#| msgid "Confirm renaming of file"
 msgid "Confirm before losing unsaved changes to files"
 msgstr "Потврди губљење несачуваних измена у датотекама"
 
@@ -1910,18 +1784,15 @@ msgstr ""
 "довела до губитка несачуваних измена у датотекама"
 
 #: ../data/preferences_dialog.ui.h:163
-#| msgid "Scanner Window"
 msgid "Scanner Dialog"
 msgstr "Прозорче прегледача"
 
 #: ../data/preferences_dialog.ui.h:164
-#| msgid "Open the Scanner Window on startup"
 msgid "Show the scanner dialog on startup"
 msgstr "Прикажи прозорче прегледача при покретању програма"
 
 #: ../data/preferences_dialog.ui.h:165
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:202
-#| msgid "Open the Scanner Window on startup"
 msgid "Whether to show the scanner window on application startup"
 msgstr "Да ли да прикаже прозорче прегледача при покретању програма"
 
@@ -1930,9 +1801,6 @@ msgid "Application"
 msgstr "Програм"
 
 #: ../data/scan_dialog.ui.h:1
-#| msgid ""
-#| "Select or type in a mask using codes (see Legend) to parse filename and "
-#| "path. Used to fill in tag fields"
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse filename and "
 "directory. Used to fill in tag fields"
@@ -1949,37 +1817,30 @@ msgid "Mask Editor"
 msgstr "Уређивач маски"
 
 #: ../data/scan_dialog.ui.h:4
-#| msgid "Create New Mask"
 msgid "Create a new mask"
 msgstr "Направите нову маску"
 
 #: ../data/scan_dialog.ui.h:5
-#| msgid "Move up the selected line"
 msgid "Move the selected mask up"
 msgstr "Померите горе изабрану маску"
 
 #: ../data/scan_dialog.ui.h:6
-#| msgid "Move up the selected line"
 msgid "Move the selected mask down"
 msgstr "Померите доле изабрану маску"
 
 #: ../data/scan_dialog.ui.h:7
-#| msgid "Delete the selected line"
 msgid "Duplicate the selected mask"
 msgstr "Удвостручите изабрану маску"
 
 #: ../data/scan_dialog.ui.h:8
-#| msgid "Add Default Masks"
 msgid "Add default masks"
 msgstr "Додајте основну маску"
 
 #: ../data/scan_dialog.ui.h:9
-#| msgid "Move up the selected line"
 msgid "Remove the selected mask"
 msgstr "Уклоните изабрану маску"
 
 #: ../data/scan_dialog.ui.h:10
-#| msgid "Save Masks"
 msgid "Save masks"
 msgstr "Сачувајте маску"
 
@@ -1994,7 +1855,6 @@ msgstr "%a: извођач"
 
 #: ../data/scan_dialog.ui.h:15
 #, no-c-format
-#| msgid "%z: album artist"
 msgid "%a: album artist"
 msgstr "%a: извођач албума"
 
@@ -2045,7 +1905,6 @@ msgstr "%l: број нумера"
 
 #: ../data/scan_dialog.ui.h:35
 #, no-c-format
-#| msgid "%o: orig. artist"
 msgid "%o: original artist"
 msgstr "%o: оригинални извођач"
 
@@ -2079,16 +1938,10 @@ msgid "Fill Tag"
 msgstr "Попуни ознаку"
 
 #: ../data/scan_dialog.ui.h:47
-#| msgid "Prefix mask with current path"
 msgid "Prefix mask with current directory"
 msgstr "Маска префикса са тренутним директоријумом"
 
 #: ../data/scan_dialog.ui.h:48
-#| 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."
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -2105,17 +1958,15 @@ msgid "Rename file preview"
 msgstr "Преглед преименовања датотеке"
 
 #. Only filename changed
-#: ../data/scan_dialog.ui.h:51 ../src/easytag.c:615
+#: ../data/scan_dialog.ui.h:51 ../src/easytag.c:574
 msgid "Rename File"
 msgstr "Преименуј датотеку"
 
 #: ../data/scan_dialog.ui.h:52
-#| msgid "Fields"
 msgid "Tag Fields"
 msgstr "Поља ознаке"
 
 #: ../data/scan_dialog.ui.h:54
-#| msgid "Process filename field"
 msgid "Process filename"
 msgstr "Обрадите назив датотеке"
 
@@ -2124,7 +1975,6 @@ msgid "Process title field"
 msgstr "Обрадите поље наслова"
 
 #: ../data/scan_dialog.ui.h:58
-#| msgid "Process file artist field"
 msgid "Process artist field"
 msgstr "Обрадите поље извођача"
 
@@ -2145,7 +1995,6 @@ msgid "Process composer field"
 msgstr "Обрадите поље композитора"
 
 #: ../data/scan_dialog.ui.h:68
-#| msgid "Orig. artist:"
 msgid "Orig. Artist"
 msgstr "Ориг. извођач"
 
@@ -2162,12 +2011,10 @@ msgid "Process URL field"
 msgstr "Обрадите поље адресе"
 
 #: ../data/scan_dialog.ui.h:75
-#| msgid "Process encoder name field"
 msgid "Process encoded-by field"
 msgstr "Обрадите поље назива енкодера"
 
 #: ../data/scan_dialog.ui.h:76
-#| msgid "Capitalize all"
 msgid "Capitalization"
 msgstr "Велика слова"
 
@@ -2206,8 +2053,6 @@ msgid "Capitalize the first letter of each word"
 msgstr "Прво слово сваке речи велико"
 
 #: ../data/scan_dialog.ui.h:84 ../data/org.gnome.EasyTAG.gschema.xml.h:148
-#| msgid ""
-#| "Don't uppercase first letter of words for some prepositions and articles."
 msgid ""
 "Whether to upper-case the first letter of each word when processing tag "
 "fields"
@@ -2236,7 +2081,7 @@ msgid "Spaces Conversions"
 msgstr "Претварања размака"
 
 #: ../data/scan_dialog.ui.h:89 ../data/org.gnome.EasyTAG.gschema.xml.h:153
-#: ../src/tag_area.c:875
+#: ../src/tag_area.c:876
 msgid "Remove spaces"
 msgstr "Уклони размаке"
 
@@ -2258,7 +2103,6 @@ msgid "Remove duplicate spaces and underscores"
 msgstr "Уклони дупле размаке и доње цртице"
 
 #: ../data/scan_dialog.ui.h:94 ../data/org.gnome.EasyTAG.gschema.xml.h:158
-#| msgid "Remove duplicate spaces and underscores"
 msgid ""
 "Whether to remove duplicate spaces and underscores when processing tag fields"
 msgstr "Да ли да уклони дупле размаке и доње цртице када обрађује поља ознаке"
@@ -2268,51 +2112,41 @@ msgid "Do not change word separators"
 msgstr "Не мењај раздвајаче речи"
 
 #: ../data/scan_dialog.ui.h:96
-#| msgid "Fill Tag Scanner - Character Conversion"
 msgid "Character Conversions"
 msgstr "Претварања знакова"
 
-#: ../data/scan_dialog.ui.h:98 ../src/tag_area.c:831
+#: ../data/scan_dialog.ui.h:98 ../src/tag_area.c:832
 #, no-c-format
-#| msgid "Convert '_' and '%20' to spaces"
 msgid "Convert ‘_’ and ‘%20’ to spaces"
 msgstr "Преведи „_“ и „%20“ у размаке"
 
 #: ../data/scan_dialog.ui.h:100
 #, no-c-format
-#| msgid ""
-#| "The underscore character or the string '%20' are replaced by one space. "
-#| "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
 msgid ""
 "The underscore character or the string ‘%20’ is replaced by one space. "
 "Example, before: ‘Text%20In%20An_Entry‘, after: ‘Text In An Entry’"
 msgstr ""
-"Доње цртице или ниска „%20“ између речи ће бити замењени размаком. На пример:"
-" „Текст%20у%20неком_пољу“ ће постати „Текст у неком пољу“."
+"Доње цртице или ниска „%20“ између речи ће бити замењени размаком. На "
+"пример: „Текст%20у%20неком_пољу“ ће постати „Текст у неком пољу“."
 
-#: ../data/scan_dialog.ui.h:101 ../src/tag_area.c:837
-#| msgid "Convert ' ' to '_'"
-msgid "Convert ‘ ’ to ‘_’"
-msgstr "Преведи „ “ у „_“"
+#: ../data/scan_dialog.ui.h:101 ../src/tag_area.c:838
+#| msgid "Convert spaces and ‘%20’ to underscores"
+msgid "Convert spaces to underscores"
+msgstr "Преведи размаке у доње цртице"
 
 #: ../data/scan_dialog.ui.h:102
-#| msgid ""
-#| "The space character is replaced by one underscore character. Example, "
-#| "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: ‘Text In An Entry’, after: ‘Text_In_An_Entry’"
 msgstr ""
-"Размак између речи биће замењен доњом цртицом. На пример „Текст у неком пољу“"
-" ће постати „Текст_у_неком_пољу“."
+"Размак између речи биће замењен доњом цртицом. На пример „Текст у неком "
+"пољу“ ће постати „Текст_у_неком_пољу“."
 
 #: ../data/scan_dialog.ui.h:103
 msgid "Convert:"
 msgstr "Претвори:"
 
 #: ../data/scan_dialog.ui.h:104
-#| msgid ""
-#| "Replace a string by another one. Note that the search is case sensitive."
 msgid "Replace a string by another one. Note that the search is case sensitive"
 msgstr ""
 "Замените једну ниску другом. Знајте да је претрага осетљива на величину "
@@ -2343,8 +2177,6 @@ msgid "Search:"
 msgstr "Потражи:"
 
 #: ../data/search_dialog.ui.h:2
-#| msgid ""
-#| "Type the word to search into files. Or type nothing to display all files."
 msgid ""
 "Type the text to search for in the file list, or leave the field empty to "
 "display all files"
@@ -2353,7 +2185,6 @@ msgstr ""
 "прикажете све датотеке."
 
 #: ../data/search_dialog.ui.h:3
-#| msgid "_Find…"
 msgid "_Find"
 msgstr "_Пронађи"
 
@@ -2383,7 +2214,7 @@ msgstr "ЦД"
 msgid "Image Type"
 msgstr "Врста слике"
 
-#: ../data/tag_area.ui.h:2 ../src/picture.c:289
+#: ../data/tag_area.ui.h:2 ../src/picture.c:272
 msgid "Description"
 msgstr "Опис"
 
@@ -2391,7 +2222,7 @@ msgstr "Опис"
 msgid "_Accept"
 msgstr "_Прихвати"
 
-#: ../data/tag_area.ui.h:5 ../src/tag_area.c:3029
+#: ../data/tag_area.ui.h:5 ../src/tag_area.c:3019
 msgid "Tag"
 msgstr "Ознака"
 
@@ -2444,8 +2275,6 @@ msgid "Tag selected files with this year"
 msgstr "Означите изабране датотеке овом годином"
 
 #: ../data/tag_area.ui.h:18
-#| msgid ""
-#| "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory"
 msgstr ""
 "Број доследно изабраних нумера. Почиње од 01 у сваком под-директоријуму."
@@ -2455,9 +2284,6 @@ msgid "Track #:"
 msgstr "Нумера #:"
 
 #: ../data/tag_area.ui.h:20
-#| msgid ""
-#| "Set the number of files, in the same directory of the displayed file, to "
-#| "the selected tracks."
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks"
@@ -2549,7 +2375,7 @@ msgstr "Уредите својства слике"
 msgid "Tag selected files with these images"
 msgstr "Означите изабране датотеке овим сликама"
 
-#: ../data/tag_area.ui.h:42 ../src/tag_area.c:3282 ../src/tag_area.c:3285
+#: ../data/tag_area.ui.h:42 ../src/tag_area.c:3272 ../src/tag_area.c:3275
 msgid "Images"
 msgstr "Слике"
 
@@ -2590,8 +2416,6 @@ msgid "_Undo"
 msgstr "По_ништи"
 
 #: ../data/toolbar.ui.h:14
-#| msgid "Found one file"
-#| msgid_plural "Found %d files"
 msgid "Undo for file"
 msgstr "Поништите последње измене датотека"
 
@@ -2600,7 +2424,6 @@ msgid "R_edo"
 msgstr "По_врати"
 
 #: ../data/toolbar.ui.h:16
-#| msgid "Read-only file"
 msgid "Redo for file"
 msgstr "Повратите последње измене датотека"
 
@@ -2609,12 +2432,10 @@ msgid "Save changes to selected files"
 msgstr "Сачувајте измене у изабраним датотекама"
 
 #: ../data/toolbar.ui.h:20
-#| msgid "Collapse directory tree"
 msgid "Browse directory tree"
 msgstr "Разгледајте стабло директоријума"
 
 #: ../data/toolbar.ui.h:22
-#| msgid "View by artist and album"
 msgid "Browse artists and albums"
 msgstr "Разгледајте извођаче и албуме"
 
@@ -2627,11 +2448,10 @@ msgid "Search filenames and tags"
 msgstr "Потражите називе датотека и ознаке"
 
 #: ../data/toolbar.ui.h:27
-#| msgid "CDD_B Search…"
 msgid "CDDB Search…"
 msgstr "Претражи базе података ЦД-а…"
 
-#: ../data/toolbar.ui.h:28 ../src/cddb_dialog.c:2694
+#: ../data/toolbar.ui.h:28 ../src/cddb_dialog.c:2746
 msgid "CDDB Search"
 msgstr "ЦДБП претрага"
 
@@ -2644,87 +2464,71 @@ msgid "Stop the current action"
 msgstr "Зауставите тренутну радњу"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:1
-#| msgid "Ready to start"
 msgid "Load on startup"
 msgstr "Учитајте при покретању"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:3
-#| msgid "Add Default Masks"
 msgid "Default path"
 msgstr "Основна путања"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:7
-#| msgid "Show hidden directories"
 msgid "Show hidden directories while browsing"
 msgstr "Прикажите скривене директоријуме приликом разгледања"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:11
-#| msgid "Server Settings for Automatic Search"
 msgid "CDDB server hostname for automatic search"
 msgstr "Назив домаћина сервера базе података ЦД-а за самосталну претрагу"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:12
-#| msgid "Server Settings for Automatic Search"
 msgid "The CDDB server to use for the automatic search"
 msgstr "Сервер базе података ЦД-а који ће се користити за самосталну претрагу"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:13
-#| msgid "Server Settings for Automatic Search"
 msgid "CDDB server port for automatic search"
 msgstr "Прикључник сервера базе података ЦД-а за самосталну претрагу"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:14
-#| msgid "Server Settings for Automatic Search"
 msgid "The CDDB server port to use for the automatic search"
 msgstr ""
 "Прикључник сервера базе података ЦД-а који ће се користити за самосталну "
 "претрагу"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:15
-#| msgid "Server Settings for Automatic Search"
 msgid "CDDB server path for automatic search"
 msgstr "Путања сервера базе података ЦД-а за самосталну претрагу"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:16
-#| msgid "Server Settings for Automatic Search"
 msgid "The CDDB server path to use for the automatic search"
 msgstr ""
 "Путања сервера базе података ЦД-а који ће се користити за самосталну претрагу"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:17
-#| msgid "Server Settings for Manual Search"
 msgid "CDDB server hostname for manual search"
 msgstr "Назив домаћина сервера базе података ЦД-а за ручну претрагу"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:18
-#| msgid "Server Settings for Manual Search"
 msgid "The CDDB server to use for a manual search"
 msgstr "Сервер базе података ЦД-а који ће се користити за ручну претрагу"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:19
-#| msgid "Server Settings for Manual Search"
 msgid "CDDB server port for manual search"
 msgstr "Прикључник сервера базе података ЦД-а за ручну претрагу"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:20
-#| msgid "Server Settings for Manual Search"
 msgid "The CDDB server port to use for a manual search"
 msgstr ""
 "Прикључник сервера базе података ЦД-а који ће се користити за ручну претрагу"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:21
-#| msgid "Server Settings for Manual Search"
 msgid "CDDB server path for manual search"
 msgstr "Путања сервера базе података ЦД-а за ручну претрагу"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:22
-#| msgid "Server Settings for Manual Search"
 msgid "The CDDB server path to use for a manual search"
 msgstr ""
 "Путања сервера базе података ЦД-а који ће се користити за ручну претрагу"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:23
-#| msgid "Error while writing CDDB results to file '%s'"
 msgid "Use DLM to match CDDB results to files"
 msgstr "Користи ДЛМ за упоређивање резултата базе података ЦД-а са датотекама"
 
@@ -2733,8 +2537,8 @@ msgid ""
 "Select the file with the position which matches the position of the CDDB "
 "result"
 msgstr ""
-"Бира датотеку са положајем који одговара положају резултата базе података "
-"ЦД-а"
+"Бира датотеку са положајем који одговара положају резултата базе података ЦД-"
+"а"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:27
 msgid "Enable proxy for remote CDDB"
@@ -2766,7 +2570,8 @@ msgstr "Поља за коришћење при ручној претрази б
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:40
 msgid "Which fields to search for matches of the returned CDDB results"
-msgstr "У којим пољима да тражи поклапања враћених резултата базе података ЦД-а"
+msgstr ""
+"У којим пољима да тражи поклапања враћених резултата базе података ЦД-а"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:41
 msgid "The categories to use in a CDDB search"
@@ -2790,7 +2595,6 @@ msgstr ""
 "и резултата базе података ЦД-а"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:51
-#| msgid "Display changed files in list using:"
 msgid "Show changed files in bold"
 msgstr "Приказује измењене датотеке подебљаним"
 
@@ -2811,27 +2615,22 @@ msgid "Sort files in ascending or descending order for the selected type"
 msgstr "Поређаће датотеке растућим или опадајућим редом за изабрану врсту"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:57
-#| msgid "Max number of lines:"
 msgid "Number of log lines"
 msgstr "Број редова дневника"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:61
-#| msgid "Character Set for reading ID3 tags"
 msgid "Use a non-standard character encoding when reading ID3 tags"
 msgstr "Користиће не-стандардно кодирање знакова када чита ИД3 ознаке"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:65
-#| msgid "Write ID3v1.x tag"
 msgid "Write ID3v1 tags"
 msgstr "Упиши ИД3в1 ознаку"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:67
-#| msgid "Character Set for writing ID3 tags"
 msgid "The character set for writing ID3v1 tags"
 msgstr "Скуп знакова за упис ИД3в1 ознака"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:68
-#| msgid "Character Set for writing ID3 tags"
 msgid "Choose the character set to be used when writing ID3v1 tags"
 msgstr "Изаберите скуп знакова за упис ИД3в1 ознака"
 
@@ -2848,12 +2647,10 @@ msgstr ""
 "кодирања када се записују ИД3в1 ознаке"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:71
-#| msgid "Character Set for reading ID3 tags"
 msgid "The character set for reading ID3v1 and ID3v2 tags"
 msgstr "Скуп знакова за читање ИД3в1 и ИД3в2 ознака"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:73
-#| msgid "Write ID3v2 tag"
 msgid "Write ID3v2 tags"
 msgstr "Упиши ИД3в2 ознаке"
 
@@ -2866,38 +2663,31 @@ msgid "Whether to write ID3v2.4 tags when ID3v2 support is enabled"
 msgstr "Да ли да записује ИД3в2.4 ознаке када је укључена ИД3в2 подршка"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:77
-#| msgid "Automatically convert old ID3v2 tag versions"
 msgid "Convert old ID3 tag versions to new ones"
 msgstr "Претвори стара издања ИД3 онаке у нове"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:81
-#| msgid "Set CRC32 in the ID3v2 tags"
 msgid "Use CRC-32 in ID3v2 tags"
 msgstr "Користи ЦРЦ-32 у ИД3в2 ознакама"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:85
-#| msgid "Try another character encoding"
 msgid "Use Unicode character encoding in ID3v2 tags"
 msgstr "Користи кодирање знакова Уникода у ИД3в2 ознакама"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:86
-#| msgid "Character Set for writing ID3 tags"
 msgid "Whether to use a Unicode character set when writing ID3v2 tags"
 msgstr "Да ли да користи скуп знакова Уникода када записује ИД3в2 ознаке"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:87
-#| msgid "Character Set for writing ID3 tags"
 msgid "The Unicode character set for writing ID3v2 tags"
 msgstr "Скуп знакова Уникода за упис ИД3в2 ознака"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:88
-#| msgid "Character Set for writing ID3 tags"
 msgid "Choose the Unicode character set to be used when writing ID3v2 tags"
 msgstr ""
 "Изаберите скуп знакова Уникода за коришћење приликом писања ИД3в2 ознака"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:89
-#| msgid "Character Set for writing ID3 tags"
 msgid "The character set for writing ID3v2 tags"
 msgstr "Скуп знакова за упис ИД3в2 ознака"
 
@@ -2980,7 +2770,6 @@ msgid "Overwrite tag field"
 msgstr "Препиши поље ознаке"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:112
-#| msgid "Set this text as default comment:"
 msgid "Set the default comment"
 msgstr "Постави основну напомену"
 
@@ -2993,17 +2782,14 @@ msgid "The default comment to use when filling tags"
 msgstr "Основна напомена за коришћење приликом испуњавања ознака"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:116
-#| msgid "Set this text as default comment:"
 msgid "Use the CRC-32 as the default comment"
 msgstr "Користи ЦРЦ-32 као основну напомену"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:130
-#| msgid "Run the current scanner for each file"
 msgid "Run the current scanner when loading filenames from a file"
 msgstr "Покреће текући прегледач када учитава називе датотека из датотеке"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:132
-#| msgid "Process title field"
 msgid "Process these tag fields"
 msgstr "Обради ова поља ознаке"
 
@@ -3012,7 +2798,6 @@ msgid "The tag fields to process when using the scanner"
 msgstr "Поља ознаке за обраду када се користи прегледач"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:134
-#| msgid "Overwrite fields when scanning tags"
 msgid "Convert tag fields when processing"
 msgstr "Претвори поља ознаке при обради"
 
@@ -3026,7 +2811,6 @@ msgstr ""
 "обраде поља ознаке"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:137
-#| msgid "Try another character encoding"
 msgid "Convert characters in tags"
 msgstr "Претвори знакове у ознакама"
 
@@ -3050,7 +2834,6 @@ msgstr ""
 "Замени сваки упоређени низ знакова овом ниском приликом обраде поља ознаке"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:141
-#| msgid "Lowercase all"
 msgid "Lower-case all characters"
 msgstr "Сва слова мала"
 
@@ -3059,12 +2842,10 @@ msgid "Upper-case all characters"
 msgstr "Сва слова велика"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:145
-#| msgid "Capitalize the first letter of each word"
 msgid "Upper-case the first letter of the tag"
 msgstr "Прво слово ознаке велико"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:147
-#| msgid "Capitalize the first letter of each word"
 msgid "Upper-case the first letter of each word"
 msgstr "Прво слово сваке речи велико"
 
@@ -3073,22 +2854,18 @@ msgid "Upper-case prepositions"
 msgstr "Предлози великим словима"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:151
-#| msgid "Detect Roman numerals"
 msgid "Detect roman numerals"
 msgstr "Откриј римске бројеве"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:155
-#| msgid "Insert space before uppercase letter"
 msgid "Insert spaces before capital letters"
 msgstr "Убаци размаке пре великих слова"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:157
-#| msgid "Remove duplicate spaces or underscores"
 msgid "Remove duplicate spaces"
 msgstr "Уклони дупле размаке"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:159
-#| msgid "Playlist File Error"
 msgid "Playlist filename mask"
 msgstr "Маска назива датотеке списка нумера"
 
@@ -3106,33 +2883,27 @@ msgstr ""
 "Да ли да користи маску назива датотеке приликом ставрања спискова нумера"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:163
-#| msgid "Create playlist in the parent directory"
 msgid "Create playlists with only the selected files"
 msgstr "Направите спискове нумера само са изабраним датотекама"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:165
-#| msgid "Use relative path for files in playlist"
 msgid "Use relative paths when creating playlists"
 msgstr "Користи релативне путање приликом стварања спискова нумера"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:166
-#| msgid "Use relative path for files in playlist"
 msgid "Whether to use relative paths for files when creating playlists"
 msgstr ""
 "Да ли да користи релативне путање за датотеке када прави спискове нумера"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:167
-#| msgid "Create playlist in the parent directory"
 msgid "Create the playlist in the parent directory"
 msgstr "Направите списак нумера у родитељском директоријуму"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:169
-#| msgid "Use full path for files in playlist"
 msgid "Use DOS separators for playlists"
 msgstr "Користи ДОС раздвојнике за спискове нумера"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:171
-#| msgid "Generate a playlist"
 msgid "Content of generated playlists"
 msgstr "Садржај створених спискова нумера"
 
@@ -3149,7 +2920,6 @@ msgid "Playlist default mask"
 msgstr "Основна маска списка нумера"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:174
-#| msgid "Use full path for files in playlist"
 msgid "The default mask to use for files in a playlist"
 msgstr "Основна маска за коришћење за датотеке у списку нумера"
 
@@ -3162,7 +2932,6 @@ msgid "Whether matches when searching for files are case-sensitive"
 msgstr "Да ли поређења приликом тражења датотека разликују величину слова"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:177
-#| msgid "Search filenames and tags"
 msgid "Search in filenames"
 msgstr "Потражи у називима датотека"
 
@@ -3171,7 +2940,6 @@ msgid "Perform the search on filenames"
 msgstr "Обави претрагу над називима датотека"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:179
-#| msgid "Searching"
 msgid "Search in tags"
 msgstr "Тражи у ознакама"
 
@@ -3180,7 +2948,6 @@ msgid "Perform the search on tags"
 msgstr "Обави претрагу над ознакама"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:181
-#| msgid "Error reading tags from file: '%s'"
 msgid "Mask for filling tags from filenames"
 msgstr "Маска за испуњавање ознака из назива датотека"
 
@@ -3193,17 +2960,14 @@ msgstr ""
 "датотека"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:183
-#| msgid "Confirm renaming of file"
 msgid "Mask for renaming files"
 msgstr "Маска за преименовање датотека"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:184
-#| msgid "Repeat action for the remaining files"
 msgid "The default mask to use when renaming files"
 msgstr "Основна маска за коришћење приликом преименовања датотека"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:185
-#| msgid "Unable to create setting directories"
 msgid "Mask for renaming directories"
 msgstr "Маска за преименовање директоријума"
 
@@ -3212,12 +2976,10 @@ msgid "The default mask to use when renaming directories"
 msgstr "Основна маска за коришћење приликом преименовања директоријума"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:187
-#| msgid "Unable to create setting directories"
 msgid "Use a mask when renaming directories"
 msgstr "Користи маску приликом преименовања директоријума"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:189
-#| msgid "Convert space ' ' to underscore '_'"
 msgid "Convert spaces and underscores when renaming files"
 msgstr "Претвори размаке и подвлаке приликом преименовања поља"
 
@@ -3250,7 +3012,6 @@ msgstr ""
 "неисправне знаке"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:196
-#| msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgid ""
 "Whether to replace illegal characters in a filename when using the rename "
 "function"
@@ -3259,7 +3020,6 @@ msgstr ""
 "преименовања"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:197
-#| msgid "Show / Hide Masks Editor"
 msgid "Show the scanner mask editor"
 msgstr "Приказује уређивач маске прегледача"
 
@@ -3268,17 +3028,14 @@ msgid "Whether to show the scanner mask editor in the tag scanner"
 msgstr "Да ли да прикаже уређивача маске прегледача у прегледачу ознаке"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:199
-#| msgid "Show scanner"
 msgid "Show the scanner legend"
 msgstr "Приказује легенду прегледача"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:200
-#| msgid "Whether to pad the disc field with leading zeroes"
 msgid "Whether to show the scanner legend in the tag scanner"
 msgstr "Да ли да прикаже легенду прегледача у прегледачу ознаке"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:201
-#| msgid "Open the Scanner Window on startup"
 msgid "Show the scanner window on startup"
 msgstr "Прикажи прозор прегледача при покретању програма"
 
@@ -3307,17 +3064,14 @@ msgid "Split Ogg genre fields"
 msgstr "Подели поља Огг жанра"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:213
-#| msgid "Process comment field"
 msgid "Split Ogg comment fields"
 msgstr "Подели поља Огг напомене"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:215
-#| msgid "Process composer field"
 msgid "Split Ogg composer fields"
 msgstr "Подели поља Огг композитора"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:217
-#| msgid "Process original artist field"
 msgid "Split Ogg original artist fields"
 msgstr "Подели поља Огг оригиналног извођача"
 
@@ -3334,21 +3088,15 @@ msgid "Open in EasyTAG"
 msgstr "Отвори у Лакој ознаци"
 
 #: ../nautilus-extension/nautilus-easytag.c:230
-#| msgid "Save the selected images to files"
 msgid "Open the selected directory in EasyTAG"
 msgstr "Отворите изабрани директоријум у Лакој ознаци"
 
-#: ../nautilus-extension/nautilus-easytag.c:247
-msgid "Open with EasyTAG"
-msgstr "Отвори Лаком ознаком"
-
 #: ../nautilus-extension/nautilus-easytag.c:248
-#| msgid "Include only the selected files"
 msgid "Open the selected files in EasyTAG"
 msgstr "Отворите изабране датотеке у Лакој ознаци"
 
 #. Translators: put your own name here to appear in the about dialog.
-#: ../src/about.c:90
+#: ../src/about.c:89
 msgid "translator-credits"
 msgstr ""
 "  Милош Поповић <gpopac at gmail.com>\n"
@@ -3356,7 +3104,7 @@ msgstr ""
 "\n"
 "http://prevod.org — превод на српски језик"
 
-#: ../src/about.c:100
+#: ../src/about.c:99
 msgid "View and edit tags in audio files"
 msgstr "Прегледајте и уређујте ознаке у звучним датотекама"
 
@@ -3365,202 +3113,203 @@ msgid "Print the version and exit"
 msgstr "Приказује издање и излази"
 
 #. Starting messages
-#: ../src/application.c:177
+#: ../src/application.c:176
 #, c-format
-msgid "Starting EasyTAG version %s (PID: %d)…"
-msgstr "Покрећем Лаку ознаку %s (ПИБ: %d)…"
+#| msgid "Starting EasyTAG version %s (PID: %d)…"
+msgid "Starting EasyTAG version %s…"
+msgstr "Покрећем Лаку ознаку издања %s…"
 
-#: ../src/application.c:183
+#: ../src/application.c:181
 #, c-format
-#| msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
 msgid "Variable EASYTAGLANG defined, setting locale ‘%s’"
 msgstr "Променљива „EASYTAGLANG“ је одређена, постављам језик „%s“"
 
-#: ../src/application.c:188
+#: ../src/application.c:186
 #, c-format
-#| msgid "Setting locale: '%s'"
 msgid "Setting locale: ‘%s’"
 msgstr "Постављам језик: „%s“"
 
-#: ../src/application.c:194
+#: ../src/application.c:192
 #, c-format
 msgid "System locale is ‘%s’, using ‘%s’"
 msgstr "Системски језик је „%s“, користим „%s“"
 
-#: ../src/application.c:199
+#: ../src/application.c:197
 msgid "Unable to create setting directories"
 msgstr "Не могу да направим директоријуме подешавања"
 
-#: ../src/application.c:340
+#: ../src/application.c:338
 #, c-format
 msgid "Website: %s"
 msgstr "Веб сајт: %s"
 
-#: ../src/application.c:349
+#: ../src/application.c:347
 msgid "- Tag and rename audio files"
 msgstr "— Уређујте ознаке и преименујте звучне датотеке"
 
-#: ../src/application.c:433 ../src/et_core.c:672
+#: ../src/application.c:431 ../src/et_core.c:641
 #, c-format
-#| msgid "Error while querying information for file: '%s' (%s)"
 msgid "Error while querying information for file ‘%s’: %s"
 msgstr "Грешка приликом пропитивања података за датотеку „%s“: %s"
 
-#: ../src/application.c:497
+#: ../src/application.c:495
 #, c-format
-#| msgid "Cannot open path '%s'"
 msgid "Cannot open path ‘%s’"
 msgstr "Не могу да отворим путању „%s“"
 
-#: ../src/application_window.c:316 ../src/application_window.c:333
+#: ../src/application_window.c:317 ../src/application_window.c:334
 #, c-format
-#| msgid "Do you really want to delete the file '%s'?"
 msgid "Do you really want to delete the file ‘%s’?"
 msgstr "Да ли заиста желите да обришете датотеку „%s“?"
 
-#: ../src/application_window.c:319 ../src/easytag.c:511 ../src/easytag.c:636
+#: ../src/application_window.c:320 ../src/easytag.c:462 ../src/easytag.c:595
 msgid "Repeat action for the remaining files"
 msgstr "Понови радњу за преостале датотеке"
 
-#: ../src/application_window.c:321
+#: ../src/application_window.c:322
 msgid "_Skip"
 msgstr "_Прескочи"
 
-#: ../src/application_window.c:323 ../src/application_window.c:337
-#| msgid "Delete File"
+#: ../src/application_window.c:324 ../src/application_window.c:338
 msgid "_Delete"
 msgstr "_Обриши"
 
-#: ../src/application_window.c:325 ../src/application_window.c:335
+#: ../src/application_window.c:326 ../src/application_window.c:336
 msgid "Delete File"
 msgstr "Уклони датотеку"
 
-#: ../src/application_window.c:362
+#: ../src/application_window.c:363
 #, c-format
-#| msgid "File '%s' deleted"
 msgid "File ‘%s’ deleted"
 msgstr "Датотека „%s“ је обрисана"
 
-#: ../src/application_window.c:539
+#: ../src/application_window.c:540
 #, c-format
-#| msgid "Cannot delete file (%s)"
 msgid "Cannot delete file ‘%s’"
 msgstr "Не могу да обришем датотеку „%s“"
 
-#: ../src/application_window.c:560
-#| msgid "All files have been deleted"
+#: ../src/application_window.c:561
 msgid "Some files were not deleted"
 msgstr "Неке датотеке нису обрисане"
 
-#: ../src/application_window.c:562
+#: ../src/application_window.c:563
 msgid "All files have been deleted"
 msgstr "Све датотеке су уклоњене"
 
-#: ../src/application_window.c:901
+#: ../src/application_window.c:902
 msgid "All tags have been removed"
 msgstr "Све ознаке су уклоњене"
 
+#: ../src/application_window.c:1506 ../src/browser.c:355 ../src/browser.c:398
+#: ../src/browser.c:432 ../src/browser.c:4716 ../src/browser.c:4791
+#, c-format
+msgid "Failed to launch program ‘%s’"
+msgstr "Нисам успео да покренем програм „%s“"
+
 #. Quit EasyTAG.
-#: ../src/application_window.c:2573
-#| msgid "EasyTAG: Normal exit."
+#: ../src/application_window.c:2646
 msgid "Normal exit"
 msgstr "Уобичајени излаз"
 
-#: ../src/application_window.c:2610 ../src/browser.c:843
+#: ../src/application_window.c:2683 ../src/browser.c:858
 msgid "Some files have been modified but not saved"
 msgstr "Неке датотеке су измењене али нису сачуване"
 
-#: ../src/application_window.c:2611 ../src/browser.c:847 ../src/easytag.c:294
-#: ../src/easytag.c:515 ../src/easytag.c:639 ../src/easytag.c:647
-#| msgid "Disc"
+#: ../src/application_window.c:2684 ../src/browser.c:862 ../src/easytag.c:247
+#: ../src/easytag.c:466 ../src/easytag.c:598 ../src/easytag.c:606
 msgid "_Discard"
 msgstr "_Одбаци"
 
-#: ../src/application_window.c:2613 ../src/browser.c:849 ../src/easytag.c:295
-#: ../src/easytag.c:517 ../src/easytag.c:524 ../src/easytag.c:641
-#: ../src/easytag.c:648 ../src/playlist_dialog.c:656 ../src/tag_area.c:1853
-#| msgid "_Save Files"
+#: ../src/application_window.c:2686 ../src/browser.c:864 ../src/easytag.c:248
+#: ../src/easytag.c:468 ../src/easytag.c:475 ../src/easytag.c:600
+#: ../src/easytag.c:607 ../src/playlist_dialog.c:659 ../src/tag_area.c:1842
 msgid "_Save"
 msgstr "_Сачувај"
 
-#: ../src/application_window.c:2617 ../src/application_window.c:2655
-#: ../src/easytag.c:300
+#: ../src/application_window.c:2690 ../src/application_window.c:2728
+#: ../src/easytag.c:253
 msgid "Quit"
 msgstr "Затварање програма"
 
-#: ../src/application_window.c:2620
+#: ../src/application_window.c:2693
 msgid "Do you want to save them before quitting?"
 msgstr "Да ли желите да их сачувате пре затварања?"
 
-#: ../src/application_window.c:2649
+#: ../src/application_window.c:2722
 msgid "Do you really want to quit?"
 msgstr "Да ли заиста желите да изађете из програма?"
 
-#: ../src/browser.c:553
-#| msgid "Select a directory to browse"
+#: ../src/browser.c:568
 msgid "New default directory selected for browser"
 msgstr "Изабран је нови основни директоријум за прегледника"
 
-#: ../src/browser.c:846
-#| msgid "Do you want to save them before changing the directory?"
+#: ../src/browser.c:861
 msgid "Do you want to save them before changing directory?"
 msgstr "Да ли желите да их сачувате пре него што промените директоријум?"
 
-#: ../src/browser.c:853
+#: ../src/browser.c:868
 msgid "Confirm Directory Change"
 msgstr "Потврдите промену директоријума"
 
-#: ../src/browser.c:2533
-msgid "<All albums>"
-msgstr "<Сви албуми>"
+#: ../src/browser.c:2562
+#| msgid "<All albums>"
+msgid "All albums"
+msgstr "Сви албуми"
+
+#: ../src/browser.c:3815
+msgid "Select File"
+msgstr "Изаберите датотеку"
+
+#: ../src/browser.c:3822
+msgid "Select Directory"
+msgstr "Изаберите директоријум"
 
-#: ../src/browser.c:4157
+#: ../src/browser.c:4205
 #, c-format
-#| msgid "Rename the directory '%s' to:"
 msgid "Rename the directory ‘%s’ to:"
 msgstr "Преименуј директоријум „%s“ у:"
 
-#: ../src/browser.c:4297
+#: ../src/browser.c:4345
 msgid "You must type a directory name"
 msgstr "Морате да унесете назив директоријума"
 
-#: ../src/browser.c:4298 ../src/browser.c:4320
+#: ../src/browser.c:4346 ../src/browser.c:4368
 msgid "Directory Name Error"
 msgstr "Грешка назива директоријума"
 
-#: ../src/browser.c:4316
+#: ../src/browser.c:4364
 #, c-format
-#| msgid "Could not convert '%s' into filename encoding."
 msgid "Could not convert ‘%s’ into filename encoding"
 msgstr "Не могу да претворим „%s“ у кодирање назива датотеке"
 
-#: ../src/browser.c:4319
-#| msgid "Please use another name"
+#: ../src/browser.c:4367
 msgid "Please use another name."
 msgstr "Користите други назив."
 
-#: ../src/browser.c:4390
+#: ../src/browser.c:4439
 #, c-format
-#| msgid "The directory name '%s' already exists"
 msgid "The directory name ‘%s’ already exists."
 msgstr "Назив директоријума „%s“ већ постоји."
 
-#: ../src/browser.c:4391 ../src/easytag.c:696
+#: ../src/browser.c:4440 ../src/easytag.c:655
 msgid "Rename File Error"
 msgstr "Грешка преименовања датотеке"
 
-#: ../src/browser.c:4429 ../src/browser.c:4458
+#: ../src/browser.c:4478 ../src/browser.c:4507
 msgid "Rename Directory Error"
 msgstr "Грешка преименовања директоријума"
 
-#: ../src/browser.c:4497
+#: ../src/browser.c:4546
 msgid "Directory renamed"
 msgstr "Директоријум је преименован"
 
-#: ../src/cddb_dialog.c:271
+#: ../src/browser.c:4708 ../src/browser.c:4783
+#, c-format
+msgid "Executed command ‘%s’"
+msgstr "Извршена наредба „%s“"
+
+#: ../src/cddb_dialog.c:270
 #, c-format
-#| msgid ""
-#| "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgid ""
 "Album: ‘%s’, artist: ‘%s’, length: ‘%s’, year: ‘%s’, genre: ‘%s’, disc ID: "
 "‘%s’"
@@ -3568,90 +3317,75 @@ msgstr ""
 "Албум: „%s“, извођач: „%s“, дужина нумере: „%s“, година: „%s“, жанр: „%s“, "
 "ИД диска: „%s“"
 
-#: ../src/cddb_dialog.c:589
+#: ../src/cddb_dialog.c:586
 #, c-format
 msgid "Resolving host '%s'…"
 msgstr "Приступам серверу „%s“…"
 
-#: ../src/cddb_dialog.c:631
+#: ../src/cddb_dialog.c:628
 #, c-format
-#| msgid "Cannot create a new socket (%s)"
 msgid "Cannot create a new socket ‘%s’"
 msgstr "Не могу да направим нову утичницу „%s“"
 
-#: ../src/cddb_dialog.c:645
+#: ../src/cddb_dialog.c:642
 msgid "Cannot set options on the newly-created socket"
 msgstr "Не могу да подесим опције на новоствореној утичници"
 
 #. Open connection to the server.
-#: ../src/cddb_dialog.c:649
+#: ../src/cddb_dialog.c:646
 #, c-format
-#| msgid "Connecting to host '%s', port '%d'…"
 msgid "Connecting to host ‘%s’, port ‘%d’…"
 msgstr "Повезујем се на домаћина „%s“, прикључник „%d“…"
 
-#: ../src/cddb_dialog.c:662
+#: ../src/cddb_dialog.c:659
 #, c-format
-#| msgid "Cannot connect to host '%s' (%s)"
 msgid "Cannot connect to host ‘%s’: %s"
 msgstr "Не могу да се повежем на домаћина „%s“: %s"
 
-#: ../src/cddb_dialog.c:686
+#: ../src/cddb_dialog.c:683
 #, c-format
-#| msgid "Cannot resolve host '%s' (%s)"
 msgid "Cannot resolve host ‘%s’: %s"
 msgstr "Не могу да приступим домаћину „%s“: %s"
 
-#: ../src/cddb_dialog.c:699
+#: ../src/cddb_dialog.c:696
 #, c-format
-#| msgid "Connected to host '%s'"
 msgid "Connected to host ‘%s’"
 msgstr "Повезан сам са домаћином „%s“"
 
-#: ../src/cddb_dialog.c:786
+#: ../src/cddb_dialog.c:783
 #, c-format
-#| msgid "Error while writing CDDB results to file '%s'"
 msgid "Error while writing CDDB results to file ‘%s’"
 msgstr "Грешка приликом писања резултата базе података ЦД-а у датотеку „%s“"
 
-#: ../src/cddb_dialog.c:797
+#: ../src/cddb_dialog.c:794
 #, c-format
 msgid "Receiving data (%s)…"
 msgstr "Примам податке (%s)…"
 
-#: ../src/cddb_dialog.c:810
+#: ../src/cddb_dialog.c:807
 #, c-format
-#| msgid "Error when reading CDDB response (%s)"
 msgid "Error when reading CDDB response ‘%s’"
 msgstr "Грешка читања одговора базе података ЦД-а „%s“"
 
-#: ../src/cddb_dialog.c:817
+#: ../src/cddb_dialog.c:814
 #, c-format
-#| msgid "Cannot create file '%s' (%s)"
 msgid "Cannot create file ‘%s’: %s"
 msgstr "Не могу да направим датотеку „%s“: %s"
 
-#: ../src/cddb_dialog.c:879
-#, c-format
-#| msgid "Can't load file: '%s' (%s)."
-msgid "Cannot load file ‘%s’: %s"
-msgstr "Не могу да учитам датотеку „%s“: %s"
-
 #. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
 #. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
 #. Send the request
 #. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
 #. Send the request
-#: ../src/cddb_dialog.c:950 ../src/cddb_dialog.c:1557
-#: ../src/cddb_dialog.c:1895
+#: ../src/cddb_dialog.c:943 ../src/cddb_dialog.c:1589
+#: ../src/cddb_dialog.c:1927
 msgid "Sending request…"
 msgstr "Шаљем захтев…"
 
-#: ../src/cddb_dialog.c:954 ../src/cddb_dialog.c:1561
-#: ../src/cddb_dialog.c:1899 ../src/cddb_dialog.c:3432
+#: ../src/cddb_dialog.c:947 ../src/cddb_dialog.c:1593
+#: ../src/cddb_dialog.c:1931 ../src/cddb_dialog.c:3490
 #, c-format
-#| msgid "Cannot send the request (%s)"
 msgid "Cannot send the request ‘%s’"
 msgstr "Не могу да пошаљем захтев „%s“"
 
@@ -3659,35 +3393,34 @@ msgstr "Не могу да пошаљем захтев „%s“"
 #.
 #. * Read the answer
 #.
-#: ../src/cddb_dialog.c:966 ../src/cddb_dialog.c:1588
-#: ../src/cddb_dialog.c:3450
+#: ../src/cddb_dialog.c:959 ../src/cddb_dialog.c:1620
+#: ../src/cddb_dialog.c:3508
 msgid "Receiving data…"
 msgstr "Примам податке…"
 
-#: ../src/cddb_dialog.c:973 ../src/cddb_dialog.c:1595
-#: ../src/cddb_dialog.c:1930 ../src/cddb_dialog.c:3457
+#: ../src/cddb_dialog.c:966 ../src/cddb_dialog.c:1627
+#: ../src/cddb_dialog.c:1962 ../src/cddb_dialog.c:3515
 msgid "The server returned a bad response"
 msgstr "Сервер је вратио погрешан одговор"
 
-#: ../src/cddb_dialog.c:989 ../src/cddb_dialog.c:1005
-#: ../src/cddb_dialog.c:1608 ../src/cddb_dialog.c:1946
-#: ../src/cddb_dialog.c:3474
+#: ../src/cddb_dialog.c:982 ../src/cddb_dialog.c:997 ../src/cddb_dialog.c:1018
+#: ../src/cddb_dialog.c:1640 ../src/cddb_dialog.c:1978
+#: ../src/cddb_dialog.c:3532
 #, c-format
-#| msgid "The server returned a bad response: %s"
 msgid "The server returned a bad response ‘%s’"
 msgstr "Сервер је вратио погрешан одговор „%s“"
 
 #. Load the track list of the album
-#: ../src/cddb_dialog.c:1201
+#: ../src/cddb_dialog.c:1233
 msgid "Loading album track list…"
 msgstr "Читам списак нумера албума…"
 
-#: ../src/cddb_dialog.c:1755
+#: ../src/cddb_dialog.c:1787
 #, c-format
 msgid "Sorry, the web-based search is currently not available"
 msgstr "Нажалост, претрага базирана на вебу тренутно није доступна"
 
-#: ../src/cddb_dialog.c:1757 ../src/cddb_dialog.c:2117
+#: ../src/cddb_dialog.c:1789 ../src/cddb_dialog.c:2149
 #, c-format
 msgid "Found one matching album"
 msgid_plural "Found %d matching albums"
@@ -3696,53 +3429,52 @@ msgstr[1] "Пронашао сам %d одговарајућа албума"
 msgstr[2] "Пронашао сам %d одговарајућих албума"
 msgstr[3] "Пронашао сам један одговарајући албум"
 
-#: ../src/cddb_dialog.c:1918
+#: ../src/cddb_dialog.c:1950
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)…"
 msgstr "Примам податке странице %d (албум %d/%d)…"
 
-#: ../src/cddb_dialog.c:1920
+#: ../src/cddb_dialog.c:1952
 #, c-format
 msgid "Receiving data of page %d…"
 msgstr "Примам податке странице %d…"
 
-#: ../src/cddb_dialog.c:2084
+#: ../src/cddb_dialog.c:2116
 #, c-format
 msgid "More results to load…"
 msgstr "Још резултата за учитавање…"
 
-#: ../src/cddb_dialog.c:2265
+#: ../src/cddb_dialog.c:2296
 msgid "The number of CDDB results does not match the number of selected files"
 msgstr "Број резултата базе података ЦД-а не одговара броју изабраних датотека"
 
-#: ../src/cddb_dialog.c:2271
+#: ../src/cddb_dialog.c:2302
 msgid "Write Tag from CDDB"
 msgstr "Упиши ознаке из базе података ЦД-а"
 
-#: ../src/cddb_dialog.c:2954
+#: ../src/cddb_dialog.c:3006
 msgid "Ready to search"
 msgstr "Спреман сам за претрагу"
 
-#: ../src/cddb_dialog.c:3042 ../src/load_files_dialog.c:261
-#: ../src/setting.c:247
+#: ../src/cddb_dialog.c:3094 ../src/load_files_dialog.c:261
+#: ../src/setting.c:325
 #, c-format
-#| msgid "Cannot open file '%s' (%s)"
 msgid "Cannot open file ‘%s’: %s"
 msgstr "Не могу да отворим датотеку „%s“: %s"
 
-#: ../src/cddb_dialog.c:3263
+#: ../src/cddb_dialog.c:3321
 #, c-format
 msgid "No file selected"
 msgstr "Није изабрана ниједна датотека"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: ../src/cddb_dialog.c:3271
+#: ../src/cddb_dialog.c:3329
 #, c-format
 msgid "More than 99 files selected. Cannot send request"
 msgstr "Изабрали сте више од 99 датотека. Не могу да пошаљем захтев"
 
-#: ../src/cddb_dialog.c:3277
+#: ../src/cddb_dialog.c:3335
 #, c-format
 msgid "One file selected"
 msgid_plural "%d files selected"
@@ -3752,16 +3484,13 @@ msgstr[2] "Изабрано је %d датотека"
 msgstr[3] "Изабрана је једна датотека"
 
 #. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
-#: ../src/cddb_dialog.c:3422
+#: ../src/cddb_dialog.c:3480
 #, c-format
-#| msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"
 msgid "Sending request (disc ID: %s, #tracks: %d, Disc length: %d)…"
 msgstr "Шаљем захтев (ИБ диска: %s, #нумере: %d, Трајање диска: %d)…"
 
-#: ../src/cddb_dialog.c:3590
+#: ../src/cddb_dialog.c:3648
 #, c-format
-#| msgid "DiscID '%s' gave one matching album"
-#| msgid_plural "DiscID '%s' gave %d matching albums"
 msgid "DiscID ‘%s’ gave one matching album"
 msgid_plural "DiscID ‘%s’ gave %d matching albums"
 msgstr[0] "ИБ диска „%s“ је дао %d одговарајући албум"
@@ -3769,152 +3498,152 @@ msgstr[1] "ИБ диска „%s“ је дао %d одговарајућа ал
 msgstr[2] "ИБ диска „%s“ је дао %d одговарајућих албума"
 msgstr[3] "ИБ диска „%s“ је дао један одговарајући албум"
 
-#: ../src/charset.c:49
+#: ../src/charset.c:46
 msgid "Arabic (IBM-864)"
 msgstr "Арапски (IBM-864)"
 
-#: ../src/charset.c:50
+#: ../src/charset.c:47
 msgid "Arabic (ISO-8859-6)"
 msgstr "Арапски (ISO-8859-6)"
 
-#: ../src/charset.c:51
+#: ../src/charset.c:48
 msgid "Arabic (Windows-1256)"
 msgstr "Арапски (Windows-1256)"
 
-#: ../src/charset.c:52
+#: ../src/charset.c:49
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтички (ISO-8859-13)"
 
-#: ../src/charset.c:53
+#: ../src/charset.c:50
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтички (ISO-8859-4)"
 
-#: ../src/charset.c:54
+#: ../src/charset.c:51
 msgid "Baltic (Windows-1257)"
 msgstr "Балтички (Windows-1257)"
 
-#: ../src/charset.c:55
+#: ../src/charset.c:52
 msgid "Celtic (ISO-8859-14)"
 msgstr "Келтски (ISO-8859-14)"
 
-#: ../src/charset.c:56
+#: ../src/charset.c:53
 msgid "Central European (IBM-852)"
 msgstr "Централно европски (IBM-852)"
 
-#: ../src/charset.c:57
+#: ../src/charset.c:54
 msgid "Central European (ISO-8859-2)"
 msgstr "Централно европски (ISO-8859-2)"
 
-#: ../src/charset.c:58
+#: ../src/charset.c:55
 msgid "Central European (Windows-1250)"
 msgstr "Централно европски (Windows-1250)"
 
-#: ../src/charset.c:59
+#: ../src/charset.c:56
 msgid "Chinese Simplified (GB18030)"
 msgstr "Упрошћени кинески (GB18030)"
 
-#: ../src/charset.c:60
+#: ../src/charset.c:57
 msgid "Chinese Simplified (GB2312)"
 msgstr "Упрошћени кинески (GB2312)"
 
-#: ../src/charset.c:61
+#: ../src/charset.c:58
 msgid "Chinese Traditional (Big5)"
 msgstr "Традиционални кинески (Big5)"
 
-#: ../src/charset.c:62
+#: ../src/charset.c:59
 msgid "Chinese Traditional (Big5-HKSCS)"
 msgstr "Традиционални кинески (Big5-HKSCS)"
 
-#: ../src/charset.c:63
+#: ../src/charset.c:60
 msgid "Cyrillic (IBM-855)"
 msgstr "Ћирилични (IBM-855)"
 
-#: ../src/charset.c:64
+#: ../src/charset.c:61
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Ћирилични (ISO-8859-5)"
 
-#: ../src/charset.c:65
+#: ../src/charset.c:62
 msgid "Cyrillic (ISO-IR-111)"
 msgstr "Ћирилични (ISO-IR-111)"
 
-#: ../src/charset.c:66
+#: ../src/charset.c:63
 msgid "Cyrillic (KOI8-R)"
 msgstr "Ћирилични (KOI8-R)"
 
-#: ../src/charset.c:67
+#: ../src/charset.c:64
 msgid "Cyrillic (Windows-1251)"
 msgstr "Ћирилични (Windows-1251)"
 
-#: ../src/charset.c:68
+#: ../src/charset.c:65
 msgid "Cyrillic/Russian (CP-866)"
 msgstr "Ћирилични/Руски (CP-866)"
 
-#: ../src/charset.c:69
+#: ../src/charset.c:66
 msgid "Cyrillic/Ukrainian (KOI8-U)"
 msgstr "Ћирилични/Украински (KOI8-U)"
 
-#: ../src/charset.c:70
+#: ../src/charset.c:67
 msgid "English (US-ASCII)"
 msgstr "Енглески (US-ASCII)"
 
-#: ../src/charset.c:71
+#: ../src/charset.c:68
 msgid "Greek (ISO-8859-7)"
 msgstr "Грчки (ISO-8859-7)"
 
-#: ../src/charset.c:72
+#: ../src/charset.c:69
 msgid "Greek (Windows-1253)"
 msgstr "Грчки (Windows-1253)"
 
-#: ../src/charset.c:73
+#: ../src/charset.c:70
 msgid "Hebrew (IBM-862)"
 msgstr "Хебрејски (IBM-862)"
 
-#: ../src/charset.c:74
+#: ../src/charset.c:71
 msgid "Hebrew (Windows-1255)"
 msgstr "Хебрејски (Windows-1255)"
 
-#: ../src/charset.c:75
+#: ../src/charset.c:72
 msgid "Japanese (EUC-JP)"
 msgstr "Јапански (EUC-JP)"
 
-#: ../src/charset.c:76
+#: ../src/charset.c:73
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Јапански (ISO-2022-JP)"
 
-#: ../src/charset.c:77
+#: ../src/charset.c:74
 msgid "Japanese (Shift_JIS)"
 msgstr "Јапански (Shift_JIS)"
 
-#: ../src/charset.c:78
+#: ../src/charset.c:75
 msgid "Korean (EUC-KR)"
 msgstr "Корејски (EUC-KR)"
 
-#: ../src/charset.c:79
+#: ../src/charset.c:76
 msgid "Nordic (ISO-8859-10)"
 msgstr "Нордијски (ISO-8859-10)"
 
-#: ../src/charset.c:80
+#: ../src/charset.c:77
 msgid "South European (ISO-8859-3)"
 msgstr "Јужно европски (ISO-8859-3)"
 
-#: ../src/charset.c:81
+#: ../src/charset.c:78
 msgid "Thai (TIS-620)"
 msgstr "Таи (TIS-620)"
 
-#: ../src/charset.c:82
+#: ../src/charset.c:79
 msgid "Turkish (IBM-857)"
 msgstr "Турски (IBM-857)"
 
-#: ../src/charset.c:83
+#: ../src/charset.c:80
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турски (ISO-8859-9)"
 
-#: ../src/charset.c:84
+#: ../src/charset.c:81
 msgid "Turkish (Windows-1254)"
 msgstr "Турски (Windows-1254)"
 
 #. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
-#: ../src/charset.c:86
+#: ../src/charset.c:83
 msgid "Unicode (UTF-8)"
 msgstr "Уникод (UTF-8)"
 
@@ -3922,61 +3651,55 @@ msgstr "Уникод (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:90
 msgid "Vietnamese (VISCII)"
 msgstr "Вијетнамски (VISCII)"
 
-#: ../src/charset.c:94
+#: ../src/charset.c:91
 msgid "Vietnamese (Windows-1258)"
 msgstr "Вијетнамски (Windows-1258)"
 
-#: ../src/charset.c:95
+#: ../src/charset.c:92
 msgid "Visual Hebrew (ISO-8859-8)"
 msgstr "Визуелни хебрејски (ISO-8859-8)"
 
-#: ../src/charset.c:96
+#: ../src/charset.c:93
 msgid "Western (IBM-850)"
 msgstr "Западњачки (IBM-850)"
 
-#: ../src/charset.c:97
+#: ../src/charset.c:94
 msgid "Western (ISO-8859-1)"
 msgstr "Западњачки (ISO-8859-1)"
 
-#: ../src/charset.c:98
+#: ../src/charset.c:95
 msgid "Western (ISO-8859-15)"
 msgstr "Западњачки (ISO-8859-15)"
 
-#: ../src/charset.c:99
+#: ../src/charset.c:96
 msgid "Western (Windows-1252)"
 msgstr "Западњачки (Windows-1252)"
 
-#: ../src/charset.c:511
+#: ../src/charset.c:508
 #, c-format
-#| msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgid "The filename ‘%s’ could not be converted into UTF-8: %s"
 msgstr "Назив датотеке „%s“ не може бити преведен у УТФ-8: %s"
 
-#: ../src/charset.c:513 ../src/charset.c:626 ../src/charset.c:691
+#: ../src/charset.c:510 ../src/charset.c:623 ../src/charset.c:688
 msgid "Invalid UTF-8"
 msgstr "Неисправан УТФ-8"
 
-#: ../src/charset.c:624
+#: ../src/charset.c:621
 #, c-format
-#| msgid ""
-#| "The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgid "The UTF-8 string ‘%s’ could not be converted into filename encoding: %s"
 msgstr "УТФ-8 ниска „%s“ не може бити преведена у кодирање назива датотеке: %s"
 
-#: ../src/charset.c:689
+#: ../src/charset.c:686
 #, c-format
-#| msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgid "The string ‘%s’ could not be converted into UTF-8: %s"
 msgstr "Ниска „%s“ не може бити преведена у УТФ-8: %s"
 
-#: ../src/easytag.c:290
+#: ../src/easytag.c:243
 #, c-format
-#| msgid "A file was changed by an external program"
-#| msgid_plural "%d files were changed by an external program."
 msgid "A file was changed by an external program"
 msgid_plural "%d files were changed by an external program"
 msgstr[0] "%d датотека је измењена спољним програмом"
@@ -3984,124 +3707,113 @@ msgstr[1] "%d датотеке су измењене спољним програ
 msgstr[2] "%d датотека је измењено спољним програмом"
 msgstr[3] "Једна датотека је измењена спољним програмом"
 
-#: ../src/easytag.c:299
+#: ../src/easytag.c:252
 msgid "Do you want to continue saving the file?"
 msgstr "Да ли желите да сачувате датотеку?"
 
-#: ../src/easytag.c:360 ../src/easytag.c:381
+#: ../src/easytag.c:313 ../src/easytag.c:334
 msgid "Saving files was stopped"
 msgstr "Чување датотека је заустављено"
 
-#: ../src/easytag.c:383
+#: ../src/easytag.c:336
 msgid "All files have been saved"
 msgstr "Све датотеке су сачуване"
 
-#: ../src/easytag.c:504
+#: ../src/easytag.c:455
 #, c-format
-#| msgid "Do you want to write the tag of file '%s'?"
 msgid "Do you want to write the tag of file ‘%s’?"
 msgstr "Да ли желите да упишете ознаку датотеке „%s“?"
 
-#: ../src/easytag.c:506
+#: ../src/easytag.c:457
 msgid "Confirm Tag Writing"
 msgstr "Потврди уписивање ознаке"
 
 #. Directories and filename changed
-#: ../src/easytag.c:599
+#: ../src/easytag.c:558
 msgid "Rename File and Directory"
 msgstr "Преименуј датотеку и директоријум"
 
-#: ../src/easytag.c:600
+#: ../src/easytag.c:559
 msgid "File and directory rename confirmation required"
 msgstr "Потребно је потврђивање за преименовање датотеке и директоријума"
 
-#: ../src/easytag.c:601
+#: ../src/easytag.c:560
 #, c-format
-#| msgid "Do you want to rename the file and directory '%s' to '%s'?"
 msgid "Do you want to rename the file and directory ‘%s’ to ‘%s’?"
 msgstr "Да ли желите да преименујете датотеку и директоријум „%s“ у „%s“?"
 
-#: ../src/easytag.c:607
+#: ../src/easytag.c:566
 msgid "Directory rename confirmation required"
 msgstr "Потребно је потврђивање за преименовање директоријума"
 
-#: ../src/easytag.c:608
+#: ../src/easytag.c:567
 #, c-format
-#| msgid "Do you want to rename the directory '%s' to '%s'?"
 msgid "Do you want to rename the directory ‘%s’ to ‘%s’?"
 msgstr "Да ли желите да преименујете директоријум „%s“ у „%s“?"
 
-#: ../src/easytag.c:616
+#: ../src/easytag.c:575
 msgid "File rename confirmation required"
 msgstr "Потребно је потврђивање за преименовање датотеке"
 
-#: ../src/easytag.c:617
+#: ../src/easytag.c:576
 #, c-format
-#| msgid "Do you want to rename the file '%s' to '%s'?"
 msgid "Do you want to rename the file ‘%s’ to ‘%s’?"
 msgstr "Да ли желите да преименујете датотеку „%s“ у „%s“?"
 
-#: ../src/easytag.c:689
+#: ../src/easytag.c:648
 #, c-format
-#| msgid "Cannot rename file '%s' to '%s'"
 msgid "Cannot rename file ‘%s’ to ‘%s’"
 msgstr "Не могу да преименујем датотеку „%s“ у „%s“"
 
-#: ../src/easytag.c:703
+#: ../src/easytag.c:662
 #, c-format
-#| msgid "Cannot rename file '%s' to '%s': %s"
 msgid "Cannot rename file ‘%s’ to ‘%s’: %s"
 msgstr "Не могу да преименујем датотеку „%s“ у „%s“: %s"
 
-#: ../src/easytag.c:708
+#: ../src/easytag.c:667
 msgid "File(s) not renamed"
 msgstr "Датотека(е) није преименована"
 
-#: ../src/easytag.c:888
+#: ../src/easytag.c:852
 #, c-format
-#| msgid "Writing tag of '%s'"
 msgid "Writing tag of ‘%s’"
 msgstr "Записујем ознаку од „%s“"
 
-#: ../src/easytag.c:896
+#: ../src/easytag.c:860
 #, c-format
-#| msgid "Written tag of '%s'"
 msgid "Wrote tag of ‘%s’"
 msgstr "Записах ознаку у „%s“"
 
-#: ../src/easytag.c:912
+#: ../src/easytag.c:876
 #, c-format
-#| msgid "Cannot write tag in file '%s'"
 msgid "Cannot write tag in file ‘%s’"
 msgstr "Не могу да упишем ознаку у датотеку „%s“"
 
-#: ../src/easytag.c:916
+#: ../src/easytag.c:880
 msgid "Tag Write Error"
 msgstr "Грешка уписивања ознаке"
 
-#: ../src/easytag.c:991 ../src/easytag.c:1219
+#: ../src/easytag.c:955 ../src/easytag.c:1183
 #, c-format
-#| msgid "Cannot read directory '%s'"
 msgid "Cannot read directory ‘%s’"
 msgstr "Не могу да читам директоријум „%s“"
 
-#: ../src/easytag.c:995
+#: ../src/easytag.c:959
 msgid "Directory Read Error"
 msgstr "Грешка читања директоријума"
 
 #. Read the directory recursively
-#: ../src/easytag.c:1016
+#: ../src/easytag.c:980
 #, c-format
 msgid "Search in progress…"
 msgstr "Претрага је у току…"
 
-#: ../src/easytag.c:1040 ../src/et_core.c:2979
+#: ../src/easytag.c:1004 ../src/et_core.c:2962
 #, c-format
-#| msgid "File: '%s'"
 msgid "File: ‘%s’"
 msgstr "Датотека: „%s“"
 
-#: ../src/easytag.c:1087
+#: ../src/easytag.c:1051
 #, c-format
 msgid "Found one file in this directory and subdirectories"
 msgid_plural "Found %d files in this directory and subdirectories"
@@ -4110,7 +3822,7 @@ msgstr[1] "Нашао сам %d датотеке у овом директори
 msgstr[2] "Нашао сам %d датотека у овом директоријуму и под-директоријумима"
 msgstr[3] "Нашао сам једну датотеку у овом директоријуму и под-директоријумима"
 
-#: ../src/easytag.c:1094
+#: ../src/easytag.c:1058
 #, c-format
 msgid "Found one file in this directory"
 msgid_plural "Found %d files in this directory"
@@ -4119,77 +3831,78 @@ msgstr[1] "Нашао сам %d датотеке у овом директори
 msgstr[2] "Нашао сам %d датотека у овом директоријуму"
 msgstr[3] "Нашао сам једну датотеку у овом директоријуму"
 
-#: ../src/easytag.c:1111
+#: ../src/easytag.c:1075
 msgid "No file found in this directory and subdirectories"
 msgstr ""
 "Нисам пронашао ни једну датотеку у овом директоријуму и под-директоријумима"
 
-#: ../src/easytag.c:1113
+#: ../src/easytag.c:1077
 msgid "No file found in this directory"
 msgstr "Нисам пронашао ни једну датотеку у овом директоријуму"
 
-#: ../src/easytag.c:1183
+#: ../src/easytag.c:1147
 #, c-format
-#| msgid "Error opening directory '%s' (%s)"
 msgid "Error opening directory ‘%s’: %s"
 msgstr "Грешка отварања директоријума „%s“: %s"
 
-#: ../src/easytag.c:1239
+#: ../src/easytag.c:1203
 msgid "Searching for audio files…"
 msgstr "Тражим звучне датотеке…"
 
-#: ../src/easytag.c:1240
+#: ../src/easytag.c:1204
 msgid "Searching"
 msgstr "Тражим"
 
-#: ../src/easytag.c:1241
+#: ../src/easytag.c:1205
 msgid "_Stop"
 msgstr "_Заустави"
 
-#: ../src/et_core.c:545
+#: ../src/et_core.c:507
 #, c-format
-#| msgid "Error reading tag from ogg file (%s)"
 msgid "Error reading tag from Ogg file ‘%s’: %s"
 msgstr "Грешка читања ознаке из Огг датотеке „%s“: %s"
 
-#: ../src/et_core.c:556
+#: ../src/et_core.c:518
 #, c-format
-#| msgid "Error reading tags from file: '%s'"
 msgid "Error reading tag from FLAC file ‘%s’: %s"
 msgstr "Грешка читања ознаке из ФЛАЦ датотеке „%s“: %s"
 
-#: ../src/et_core.c:566
+#: ../src/et_core.c:528
 #, c-format
-#| msgid "Error reading tags from file: '%s'"
 msgid "Error reading APE tag from file ‘%s’: %s"
 msgstr "Грешка читања АПЕ ознаке из датотеке „%s“: %s"
 
-#: ../src/et_core.c:576
+#: ../src/et_core.c:538
 #, c-format
-#| msgid "Error reading tags from file: '%s'"
 msgid "Error reading tag from MP4 file ‘%s’: %s"
 msgstr "Грешка читања ознаке из МП4 датотеке „%s“: %s"
 
-#: ../src/et_core.c:587
+#: ../src/et_core.c:549
 #, c-format
-#| msgid "Error reading tags from file: '%s'"
 msgid "Error reading tag from WavPack file ‘%s’: %s"
 msgstr "Грешка читања ознаке из Вејвпак датотеке „%s“: %s"
 
-#: ../src/et_core.c:598
+#: ../src/et_core.c:560
 #, c-format
-#| msgid "Error reading tag from Opus file (%s)"
 msgid "Error reading tag from Opus file ‘%s’: %s"
 msgstr "Грешка читања ознаке из Опус датотеке „%s“: %s"
 
-#: ../src/et_core.c:742
+#: ../src/et_core.c:576
+#, c-format
+msgid ""
+"The year value ‘%s’ seems to be invalid in file ‘%s’. The information will "
+"be lost when saving"
+msgstr ""
+"Вредност године „%s“ изгледа да није исправна у датотеци „%s“. Податак ће "
+"бити изгубљен приликом чувања."
+
+#: ../src/et_core.c:711
 #, c-format
-#| msgid "Automatic corrections applied for file '%s'."
 msgid "Automatic corrections applied for file ‘%s’"
 msgstr "Самостално исправљање је примењено над датотеком „%s“"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:3003
+#: ../src/et_core.c:2986
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
@@ -4199,37 +3912,36 @@ msgstr[2] "%u датотека"
 msgstr[3] "Једна датотека"
 
 #. Bitrate
-#: ../src/et_core.c:3034 ../src/tags/flac_header.c:307
-#: ../src/tags/monkeyaudio_header.c:83 ../src/tags/mp4_header.cc:144
-#: ../src/tags/mpeg_header.c:240 ../src/tags/musepack_header.c:87
-#: ../src/tags/ogg_header.c:411 ../src/tags/opus_header.c:230
-#: ../src/tags/wavpack_header.c:90
+#: ../src/et_core.c:3017 ../src/tags/flac_header.c:179
+#: ../src/tags/monkeyaudio_header.c:82 ../src/tags/mp4_header.cc:144
+#: ../src/tags/mpeg_header.c:239 ../src/tags/musepack_header.c:86
+#: ../src/tags/ogg_header.c:410 ../src/tags/opus_header.c:227
+#: ../src/tags/wavpack_header.c:145
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: ../src/et_core.c:3037 ../src/tags/flac_header.c:310
-#: ../src/tags/monkeyaudio_header.c:86 ../src/tags/mp4_header.cc:148
-#: ../src/tags/mpeg_header.c:245 ../src/tags/musepack_header.c:90
-#: ../src/tags/ogg_header.c:414 ../src/tags/opus_header.c:233
-#: ../src/tags/wavpack_header.c:93
+#: ../src/et_core.c:3020 ../src/tags/flac_header.c:182
+#: ../src/tags/monkeyaudio_header.c:85 ../src/tags/mp4_header.cc:148
+#: ../src/tags/mpeg_header.c:244 ../src/tags/musepack_header.c:89
+#: ../src/tags/ogg_header.c:413 ../src/tags/opus_header.c:230
+#: ../src/tags/wavpack_header.c:148
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/et_core.c:3166
+#: ../src/et_core.c:3149
 #, c-format
-#| msgid "Could not convert filename '%s' into system filename encoding"
 msgid "Could not convert filename ‘%s’ to system filename encoding"
 msgstr ""
 "Не могу да претворим назив датотеке „%s“ у кодирање назива датотеке система"
 
-#: ../src/et_core.c:3168
+#: ../src/et_core.c:3151
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Покушавам да поставим променљиву окружења Г_КОДИРАЊЕ_НАЗИВАДАТОТЕКЕ."
 
-#: ../src/et_core.c:3169 ../src/scan_dialog.c:719
+#: ../src/et_core.c:3152 ../src/scan_dialog.c:721
 msgid "Filename translation"
 msgstr "Превод назива датотеке"
 
@@ -4239,7 +3951,6 @@ msgstr "Нисам нашао датотеку"
 
 #: ../src/file_area.c:284 ../src/load_files_dialog.c:221
 #, c-format
-#| msgid "Cannot query file information (%s)"
 msgid "Cannot query file information ‘%s’"
 msgstr "Не могу да пропитам податке датотеке „%s“"
 
@@ -4249,7 +3960,6 @@ msgstr "Датотека само за читање"
 
 #: ../src/load_files_dialog.c:291
 #, c-format
-#| msgid "Error reading file (%s)"
 msgid "Error reading file ‘%s’"
 msgstr "Грешка читања датотеке „%s“"
 
@@ -4262,12 +3972,10 @@ msgid "Delete this line"
 msgstr "Обришите овај ред"
 
 #: ../src/load_files_dialog.c:643 ../src/load_files_dialog.c:746
-#| msgid "Move up this line"
 msgid "Move this line up"
 msgstr "Померите овај ред на горе"
 
 #: ../src/load_files_dialog.c:647 ../src/load_files_dialog.c:750
-#| msgid "Move up this line"
 msgid "Move this line down"
 msgstr "Померите овај ред на доле"
 
@@ -4275,180 +3983,152 @@ msgstr "Померите овај ред на доле"
 msgid "Load Filenames From a Text File"
 msgstr "Учитајте називе датотека из текстуалне датотеке"
 
-#: ../src/misc.c:257
+#: ../src/misc.c:204
 msgid "You must type a program name"
 msgstr "Морате да унесете назив програма"
 
-#: ../src/misc.c:258
+#: ../src/misc.c:205
 msgid "Program Name Error"
 msgstr "Грешка назива програма"
 
-#: ../src/misc.c:336
-#, c-format
-#| msgid "Executed command: %s"
-msgid "Executed command ‘%s’"
-msgstr "Извршена наредба „%s“"
-
-#: ../src/misc.c:344 ../src/misc.c:455
-#, c-format
-#| msgid "Failed to launch program: %s"
-msgid "Failed to launch program ‘%s’"
-msgstr "Нисам успео да покренем програм „%s“"
-
-#: ../src/misc.c:361
-msgid "Select File"
-msgstr "Изаберите датотеку"
-
-#: ../src/misc.c:367
-msgid "Select Directory"
-msgstr "Изаберите директоријум"
-
-#: ../src/picture.c:186
+#: ../src/picture.c:174
 msgid "JPEG image"
 msgstr "ЈПЕГ слика"
 
-#: ../src/picture.c:188
+#: ../src/picture.c:176
 msgid "PNG image"
 msgstr "ПНГ слика"
 
-#: ../src/picture.c:190
+#: ../src/picture.c:178
 msgid "GIF image"
 msgstr "ГИФ слика"
 
-#: ../src/picture.c:192
+#: ../src/picture.c:180
 msgid "Unknown image"
 msgstr "Непозната слика"
 
-#: ../src/picture.c:204
-#| msgid "32x32 pixel PNG file icon"
+#: ../src/picture.c:192
 msgid "32×32 pixel PNG file icon"
 msgstr "ПНГ иконица, 32x32 тачкица"
 
-#: ../src/picture.c:206
+#: ../src/picture.c:194
 msgid "Other file icon"
 msgstr "Остале иконице датотеке"
 
-#: ../src/picture.c:208
+#: ../src/picture.c:196
 msgid "Cover (front)"
 msgstr "Омот (лице)"
 
-#: ../src/picture.c:210
+#: ../src/picture.c:198
 msgid "Cover (back)"
 msgstr "Омот (полеђина)"
 
-#: ../src/picture.c:212
+#: ../src/picture.c:200
 msgid "Leaflet page"
 msgstr "Страна са летком"
 
-#: ../src/picture.c:214
-#| msgid "Media (e.g. label side of CD)"
+#: ../src/picture.c:202
 msgid "Media (such as label side of CD)"
 msgstr "Медијум (као што је страна са натписом ЦД-а)"
 
-#: ../src/picture.c:216
+#: ../src/picture.c:204
 msgid "Lead artist/lead performer/soloist"
 msgstr "Водећи уметник/водећи извођач/солиста"
 
-#: ../src/picture.c:218
+#: ../src/picture.c:206
 msgid "Artist/performer"
 msgstr "Уметник/Извођач"
 
-#: ../src/picture.c:220
+#: ../src/picture.c:208
 msgid "Conductor"
 msgstr "Диригент"
 
-#: ../src/picture.c:222
+#: ../src/picture.c:210
 msgid "Band/Orchestra"
 msgstr "Бенд/Оркестар"
 
-#: ../src/picture.c:226
+#: ../src/picture.c:214
 msgid "Lyricist/text writer"
 msgstr "Писац текстова"
 
-#: ../src/picture.c:228
+#: ../src/picture.c:216
 msgid "Recording location"
 msgstr "Место снимања"
 
-#: ../src/picture.c:230
+#: ../src/picture.c:218
 msgid "During recording"
 msgstr "У току снимања"
 
-#: ../src/picture.c:232
+#: ../src/picture.c:220
 msgid "During performance"
 msgstr "У току извођења"
 
-#: ../src/picture.c:234
+#: ../src/picture.c:222
 msgid "Movie/video screen capture"
 msgstr "Филм/Видео запис"
 
-#: ../src/picture.c:236
+#: ../src/picture.c:224
 msgid "A bright colored fish"
 msgstr "Светло обојена риба"
 
-#: ../src/picture.c:238
+#: ../src/picture.c:226
 msgid "Illustration"
 msgstr "Илустрација"
 
-#: ../src/picture.c:240
+#: ../src/picture.c:228
 msgid "Band/Artist logotype"
 msgstr "Лого бенда/извођача"
 
-#: ../src/picture.c:242
+#: ../src/picture.c:230
 msgid "Publisher/studio logotype"
 msgstr "Лого издавача/студија"
 
-#: ../src/picture.c:246
+#: ../src/picture.c:234
 msgid "Unknown image type"
 msgstr "Непозната врста слике"
 
-#: ../src/picture.c:276 ../src/picture.c:287
+#: ../src/picture.c:262 ../src/picture.c:271
 msgid "pixels"
 msgstr "тачкица"
 
-#: ../src/picture.c:277 ../src/picture.c:288
+#: ../src/picture.c:262 ../src/picture.c:271
 msgid "Type"
 msgstr "Врста"
 
-#: ../src/playlist_dialog.c:528
+#: ../src/playlist_dialog.c:531
 #, c-format
-#| msgid "Cannot write playlist file '%s'"
 msgid "Cannot write playlist file ‘%s’"
 msgstr "Не могу да запишем датотеку списка нумера „%s“"
 
-#: ../src/playlist_dialog.c:532
+#: ../src/playlist_dialog.c:535
 msgid "Playlist File Error"
 msgstr "Грешка датотеке списка нумера"
 
-#: ../src/playlist_dialog.c:540
+#: ../src/playlist_dialog.c:543
 #, c-format
-#| msgid "Written playlist file '%s'"
 msgid "Wrote playlist file ‘%s’"
 msgstr "Датотека списка нумера „%s“ је записана"
 
-#: ../src/playlist_dialog.c:622 ../src/scan_dialog.c:2768
-#: ../src/scan_dialog.c:2830
+#: ../src/playlist_dialog.c:625 ../src/scan_dialog.c:2772
+#: ../src/scan_dialog.c:2834
 msgid "Invalid scanner mask"
 msgstr "Неисправна маска прегледача"
 
-#: ../src/playlist_dialog.c:653
+#: ../src/playlist_dialog.c:656
 msgid "Generate Playlist"
 msgstr "Направите списак нумера"
 
 #. The window
-#: ../src/preferences_dialog.c:293
+#: ../src/preferences_dialog.c:289
 msgid "Preferences"
 msgstr "Поставке"
 
-#: ../src/preferences_dialog.c:1130
-#| msgid "The selected path for 'Default path to files' is invalid"
+#: ../src/preferences_dialog.c:1126
 msgid "The selected default path is invalid"
 msgstr "Изабрана основна путања није исправна"
 
-#: ../src/preferences_dialog.c:1132
+#: ../src/preferences_dialog.c:1128
 #, c-format
-#| msgid ""
-#| "Path: '%s'\n"
-#| "Error: %s"
 msgid ""
 "Path: ‘%s’\n"
 "Error: %s"
@@ -4456,85 +4136,77 @@ msgstr ""
 "Путања: „%s“\n"
 "Грешка: %s"
 
-#: ../src/preferences_dialog.c:1136
+#: ../src/preferences_dialog.c:1132
 msgid "Invalid Path Error"
 msgstr "Грешка неисправне путање"
 
 #: ../src/scan_dialog.c:307
 #, c-format
-#| msgid "Cannot calculate CRC value of file (%s)"
 msgid "Cannot calculate CRC value of file ‘%s’"
 msgstr "Не могу да срачунам ЦРЦ вредност датотеке „%s“"
 
-#: ../src/scan_dialog.c:323
+#: ../src/scan_dialog.c:325
 msgid "Tag successfully scanned"
 msgstr "Ознака је успешно скенирана"
 
-#: ../src/scan_dialog.c:326
+#: ../src/scan_dialog.c:328
 #, c-format
-#| msgid "Tag successfully scanned: %s"
 msgid "Tag successfully scanned ‘%s’"
 msgstr "Ознака је успешно прегледана „%s“"
 
-#: ../src/scan_dialog.c:369
+#: ../src/scan_dialog.c:371
 #, c-format
-#| msgid ""
-#| "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
 msgid "The extension ‘%s’ was not found in filename ‘%s’"
 msgstr "Нисам нашао проширење „%s“ у називу датотеке „%s“"
 
-#: ../src/scan_dialog.c:459 ../src/scan_dialog.c:490
+#: ../src/scan_dialog.c:461 ../src/scan_dialog.c:492
 #, c-format
-#| msgid "Scan Error: can't find separator '%s' within '%s'"
 msgid "Cannot find separator ‘%s’ within ‘%s’"
 msgstr "Не могу да нађем раздвајач „%s“ у „%s“"
 
-#: ../src/scan_dialog.c:717
+#: ../src/scan_dialog.c:719
 #, c-format
-#| msgid "Could not convert filename '%s' into system filename encoding"
 msgid "Could not convert filename ‘%s’ into system filename encoding"
 msgstr ""
 "Не могу да претворим назив датотеке „%s“ у кодирање назива датотеке система"
 
-#: ../src/scan_dialog.c:742
+#: ../src/scan_dialog.c:744
 msgid "New filename successfully scanned"
 msgstr "Нови назив датотеке је успешно скениран"
 
-#: ../src/scan_dialog.c:746
+#: ../src/scan_dialog.c:748
 #, c-format
-#| msgid "New filename successfully scanned: %s"
 msgid "New filename successfully scanned ‘%s’"
 msgstr "Нови назив датотеке је успешно скениран %s"
 
-#: ../src/scan_dialog.c:1109
+#: ../src/scan_dialog.c:1111
 #, c-format
-#| msgid "Error while processing fields: %s"
 msgid "Error while processing fields ‘%s’"
 msgstr "Грешка приликом обраде поља „%s“"
 
-#: ../src/scan_dialog.c:2038
+#: ../src/scan_dialog.c:2042
 msgid "New_mask"
 msgstr "Нова _маска"
 
 #. The window
-#: ../src/scan_dialog.c:2255
+#: ../src/scan_dialog.c:2259
 msgid "Tag and Filename Scan"
 msgstr "Прегледач ознака и назива датотека"
 
 #. 'Scan selected files' button
-#: ../src/scan_dialog.c:2261
+#: ../src/scan_dialog.c:2265
 msgid "Scan Files"
 msgstr "Прегледај датотеке"
 
-#: ../src/scan_dialog.c:2267
+#: ../src/scan_dialog.c:2271
 msgid "Scan selected files"
 msgstr "Прегледајте изабране датотеке"
 
-#: ../src/scan_dialog.c:2905
+#: ../src/scan_dialog.c:2909
 msgid "All tags have been scanned"
 msgstr "Све ознаке су прегледане"
 
-#: ../src/search_dialog.c:542
+#: ../src/search_dialog.c:545
 #, c-format
 msgid "Found one file"
 msgid_plural "Found %d files"
@@ -4543,292 +4215,222 @@ msgstr[1] "Пронашао сам %d датотеке"
 msgstr[2] "Пронашао сам %d датотека"
 msgstr[3] "Пронашао сам: %d датотеку/е/а"
 
-#: ../src/search_dialog.c:591
+#: ../src/search_dialog.c:594
 msgid "Find Files"
 msgstr "Пронађите датотеке"
 
-#: ../src/search_dialog.c:675
+#: ../src/search_dialog.c:678
 msgid "Ready to search…"
 msgstr "Спреман сам за претрагу…"
 
-#: ../src/setting.c:144
+#: ../src/setting.c:243
 #, c-format
-#| msgid "Cannot create or open file '%s' (%s)"
-msgid "Cannot create or open file ‘%s’: %s"
-msgstr "Не могу да направим или отворим датотеку „%s“: %s"
-
-#: ../src/setting.c:194
-#, c-format
-#| msgid "Error: Cannot write list to file: %s (%s)"
 msgid "Cannot write list to file ‘%s’: %s"
 msgstr "Не могу да упишем списак у датотеку„%s“: %s"
 
-#: ../src/setting.c:212
-#, c-format
-#| msgid "Error while writing list file: %s"
-msgid "Error while writing list file ‘%s’"
-msgstr "Грешка приликом писања датотеке списка „%s“"
-
 #. Fall back to defaults.
-#: ../src/setting.c:292
-#| msgid "Loading default 'Fill Tag' masks…"
+#: ../src/setting.c:348
 msgid "Loading default ‘Fill Tag’ masks…"
 msgstr "Учитавам основне маске за „Попуни ознаку“…"
 
 #. Fall back to defaults.
-#: ../src/setting.c:322
-#| msgid "Loading default 'Rename File' masks…"
+#: ../src/setting.c:378
 msgid "Loading default ‘Rename File’ masks…"
 msgstr "Учитавам основне маске за „преименовање датотека“…"
 
-#: ../src/setting.c:409
-#, c-format
-#| msgid "Migrating configuration from directory '%s' to '%s'"
-msgid "Migrating configuration from directory ‘%s’ to ‘%s’"
-msgstr "Селим подешавања из директоријума „%s“ у „%s“"
-
-#: ../src/setting.c:433
-#, c-format
-#| msgid "Failed to migrate configuration file '%s'"
-msgid "Failed to migrate configuration file ‘%s’"
-msgstr "Нисам успео да преселим датотеку подешавања „%s“"
-
-#: ../src/setting.c:470
-#, c-format
-#| msgid "Error: Cannot create directory '%s' (%s)"
-msgid "Cannot create directory ‘%s’: %s"
-msgstr "Не могу да направим директоријум „%s“: %s"
-
-#: ../src/status_bar.c:145
+#: ../src/status_bar.c:146
 msgid "Ready to start"
 msgstr "Спреман сам за почетак"
 
-#: ../src/tag_area.c:187
+#: ../src/tag_area.c:186
 #, c-format
-#| msgid "Selected files tagged with title '%s'."
 msgid "Selected files tagged with title ‘%s’"
 msgstr "Изабране датотеке су означене насловом „%s“"
 
-#: ../src/tag_area.c:192
-#| msgid "Removed title from selected files."
+#: ../src/tag_area.c:191
 msgid "Removed title from selected files"
 msgstr "Уклоњен је наслов из изабраних датотека"
 
-#: ../src/tag_area.c:209
+#: ../src/tag_area.c:208
 #, c-format
-#| msgid "Selected files tagged with artist '%s'."
 msgid "Selected files tagged with artist ‘%s’"
 msgstr "Изабране датотеке су означене извођачем „%s“"
 
-#: ../src/tag_area.c:214
-#| msgid "Removed artist from selected files."
+#: ../src/tag_area.c:213
 msgid "Removed artist from selected files"
 msgstr "Уклоњен је извођач из изабраних датотека"
 
-#: ../src/tag_area.c:230
+#: ../src/tag_area.c:229
 #, c-format
-#| msgid "Selected files tagged with album artist '%s'."
 msgid "Selected files tagged with album artist ‘%s’"
 msgstr "Изабране датотеке су означене извођачем албума „%s“"
 
-#: ../src/tag_area.c:235
-#| msgid "Removed album artist from selected files."
+#: ../src/tag_area.c:234
 msgid "Removed album artist from selected files"
 msgstr "Уклоњен је извођач албума из изабраних датотека"
 
-#: ../src/tag_area.c:252
+#: ../src/tag_area.c:251
 #, c-format
-#| msgid "Selected files tagged with album '%s'."
 msgid "Selected files tagged with album ‘%s’"
 msgstr "Изабране датотеке су означене албумом „%s“"
 
-#: ../src/tag_area.c:257
-#| msgid "Removed album name from selected files."
+#: ../src/tag_area.c:256
 msgid "Removed album name from selected files"
 msgstr "Уклоњен је назив албума из изабраних датотека"
 
-#: ../src/tag_area.c:295
+#: ../src/tag_area.c:294
 #, c-format
-#| msgid "Selected files tagged with disc number '%s/%s'."
 msgid "Selected files tagged with disc number ‘%s/%s’"
 msgstr "Изабране датотеке су означене бројем диска „%s/%s“"
 
-#: ../src/tag_area.c:300
+#: ../src/tag_area.c:299
 #, c-format
-#| msgid "Selected files tagged with disc number like 'xx'."
 msgid "Selected files tagged with disc number like ‘xx’"
 msgstr "Изабране датотеке су означене бројем диска као „хх“"
 
-#: ../src/tag_area.c:305
-#| msgid "Removed disc number from selected files."
+#: ../src/tag_area.c:304
 msgid "Removed disc number from selected files"
 msgstr "Уклоњен је број диска из изабраних датотека"
 
-#: ../src/tag_area.c:322
+#: ../src/tag_area.c:321
 #, c-format
-#| msgid "Selected files tagged with year '%s'."
 msgid "Selected files tagged with year ‘%s’"
 msgstr "Изабране датотеке су означене годином „%s“"
 
-#: ../src/tag_area.c:327
-#| msgid "Removed year from selected files."
+#: ../src/tag_area.c:326
 msgid "Removed year from selected files"
 msgstr "Уклоњена је година из изабраних датотека"
 
-#: ../src/tag_area.c:354 ../src/tag_area.c:448
+#: ../src/tag_area.c:353 ../src/tag_area.c:447
 #, c-format
-#| msgid "Selected files tagged with track like 'xx/%s'."
 msgid "Selected files tagged with track like ‘xx/%s’"
 msgstr "Изабране датотеке су означене нумером типа „xx/%s“"
 
-#: ../src/tag_area.c:358
+#: ../src/tag_area.c:357
 #, c-format
-#| msgid "Selected files tagged with track like 'xx'."
 msgid "Selected files tagged with track like ‘xx’"
 msgstr "Изабране датотеке су означене нумером типа „xx“"
 
-#: ../src/tag_area.c:363 ../src/tag_area.c:453
-#| msgid "Removed track number from selected files."
+#: ../src/tag_area.c:362 ../src/tag_area.c:452
 msgid "Removed track number from selected files"
 msgstr "Уклоњен је број нумере из изабраних датотека"
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/tag_area.c:421
+#: ../src/tag_area.c:420
 #, c-format
-#| msgid "Selected tracks numbered sequentially."
 msgid "Selected tracks numbered sequentially"
 msgstr "Изабране датотеке су побројане редом"
 
-#: ../src/tag_area.c:470
+#: ../src/tag_area.c:469
 #, c-format
-#| msgid "Selected files tagged with genre '%s'."
 msgid "Selected files tagged with genre ‘%s’"
 msgstr "Изабране датотеке су означене жанром „%s“"
 
-#: ../src/tag_area.c:475
-#| msgid "Removed genre from selected files."
+#: ../src/tag_area.c:474
 msgid "Removed genre from selected files"
 msgstr "Уклоњен је жанр из изабраних датотека"
 
-#: ../src/tag_area.c:499
+#: ../src/tag_area.c:498
 #, c-format
-#| msgid "Selected files tagged with comment '%s'."
 msgid "Selected files tagged with comment ‘%s’"
 msgstr "Изабране датотеке су означене коментаром „%s“"
 
-#: ../src/tag_area.c:504
-#| msgid "Removed comment from selected files."
+#: ../src/tag_area.c:503
 msgid "Removed comment from selected files"
 msgstr "Уклоњен је коментар из изабраних датотека"
 
-#: ../src/tag_area.c:520
+#: ../src/tag_area.c:519
 #, c-format
-#| msgid "Selected files tagged with composer '%s'."
 msgid "Selected files tagged with composer ‘%s’"
 msgstr "Изабране датотеке су означене композитором „%s“"
 
-#: ../src/tag_area.c:525
-#| msgid "Removed composer from selected files."
+#: ../src/tag_area.c:524
 msgid "Removed composer from selected files"
 msgstr "Уклоњен је композитор из изабраних датотека"
 
-#: ../src/tag_area.c:542
+#: ../src/tag_area.c:541
 #, c-format
-#| msgid "Selected files tagged with original artist '%s'."
 msgid "Selected files tagged with original artist ‘%s’"
 msgstr "Изабране датотеке су означене оригиналним извођачем „%s“"
 
-#: ../src/tag_area.c:547
-#| msgid "Removed original artist from selected files."
+#: ../src/tag_area.c:546
 msgid "Removed original artist from selected files"
 msgstr "Уклоњен је оригинални извођач из изабраних датотека"
 
-#: ../src/tag_area.c:564
+#: ../src/tag_area.c:563
 #, c-format
-#| msgid "Selected files tagged with copyright '%s'."
 msgid "Selected files tagged with copyright ‘%s’"
 msgstr "Изабране датотеке су означене ауторским правом „%s“"
 
-#: ../src/tag_area.c:569
-#| msgid "Removed copyright from selected files."
+#: ../src/tag_area.c:568
 msgid "Removed copyright from selected files"
 msgstr "Уклоњено је ауторско право из изабраних датотека"
 
-#: ../src/tag_area.c:586
+#: ../src/tag_area.c:585
 #, c-format
-#| msgid "Selected files tagged with URL '%s'."
 msgid "Selected files tagged with URL ‘%s’"
 msgstr "Изабране датотеке су означене адресом „%s“"
 
-#: ../src/tag_area.c:591
-#| msgid "Removed URL from selected files."
+#: ../src/tag_area.c:590
 msgid "Removed URL from selected files"
 msgstr "Уклоњена је адреса из изабраних датотека"
 
-#: ../src/tag_area.c:608
+#: ../src/tag_area.c:607
 #, c-format
-#| msgid "Selected files tagged with encoder name '%s'."
 msgid "Selected files tagged with encoder name ‘%s’"
 msgstr "Изабране датотеке су означене називом кодера „%s“"
 
-#: ../src/tag_area.c:613
-#| msgid "Removed encoder name from selected files."
+#: ../src/tag_area.c:612
 msgid "Removed encoder name from selected files"
 msgstr "Уклоњен је назив кодера из изабраних датотека"
 
-#: ../src/tag_area.c:647
-#| msgid "Selected files tagged with images."
+#: ../src/tag_area.c:648
 msgid "Selected files tagged with images"
 msgstr "Изабране датотеке су означене сликама"
 
-#: ../src/tag_area.c:651
-#| msgid "Removed images from selected files."
+#: ../src/tag_area.c:652
 msgid "Removed images from selected files"
 msgstr "Уклоњене су слике из изабраних датотека"
 
 #. Menu items
-#: ../src/tag_area.c:820
+#: ../src/tag_area.c:821
 msgid "Tag selected files with this field"
 msgstr "Означи изабране датотеке овим пољем"
 
-#: ../src/tag_area.c:847
+#: ../src/tag_area.c:848
 msgid "All uppercase"
 msgstr "Сва слова велика"
 
-#: ../src/tag_area.c:853
+#: ../src/tag_area.c:854
 msgid "All lowercase"
 msgstr "Сва слова мала"
 
-#: ../src/tag_area.c:859
+#: ../src/tag_area.c:860
 msgid "First letter uppercase"
 msgstr "Прво слово велико"
 
-#: ../src/tag_area.c:865
+#: ../src/tag_area.c:866
 msgid "First letter uppercase of each word"
 msgstr "Прво слово сваке речи велико"
 
-#: ../src/tag_area.c:881
+#: ../src/tag_area.c:882
 msgid "Insert space before uppercase letter"
 msgstr "Убаци размак пре великог слова"
 
-#: ../src/tag_area.c:887
+#: ../src/tag_area.c:888
 msgid "Remove duplicate spaces or underscores"
 msgstr "Уклони дупле размаке или доње цртице"
 
-#: ../src/tag_area.c:893
+#: ../src/tag_area.c:894
 msgid "Remove all text"
 msgstr "Уклони сав текст"
 
-#: ../src/tag_area.c:1269 ../src/tag_area.c:1346 ../src/tags/ogg_tag.c:1049
-#: ../src/tags/ogg_tag.c:1064
+#: ../src/tag_area.c:1256 ../src/tag_area.c:1334
 #, c-format
 msgid "Error parsing image data ‘%s’"
 msgstr "Грешка обраде података слике „%s“"
 
-#: ../src/tag_area.c:1328
-#| msgid ""
-#| "Cannot display the image because not enough data has been read to "
-#| "determine how to create the image buffer."
+#: ../src/tag_area.c:1316
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer"
@@ -4836,125 +4438,120 @@ msgstr ""
 "Не могу да прикажем слику јер је недовољно података учитано да бих знао како "
 "да направим међумеморију слике."
 
-#: ../src/tag_area.c:1335
+#: ../src/tag_area.c:1323
 msgid "Cannot display the image"
 msgstr "Не могу да прикажем слику"
 
-#: ../src/tag_area.c:1337
+#: ../src/tag_area.c:1325
 msgid ""
 "Not enough data has been read to determine how to create the image buffer."
 msgstr ""
 "Није прочитано довољно података да бих одредио како да направим међумеморију "
 "слике."
 
-#: ../src/tag_area.c:1339
+#: ../src/tag_area.c:1327
 msgid "Load Image File"
 msgstr "Учитај датотеку слике"
 
-#: ../src/tag_area.c:1383 ../src/tag_area.c:1408
+#: ../src/tag_area.c:1371 ../src/tag_area.c:1396
 #, c-format
-#| msgid "Image file not loaded: %s"
 msgid "Image file not loaded ‘%s’"
 msgstr "Датотека слике није учитана „%s“"
 
-#: ../src/tag_area.c:1400
+#: ../src/tag_area.c:1388
 #, c-format
-#| msgid "Cannot open file: '%s'"
 msgid "Cannot open file ‘%s’"
 msgstr "Не могу да отворим датотеку „%s“"
 
-#: ../src/tag_area.c:1404
+#: ../src/tag_area.c:1392
 msgid "Image File Error"
 msgstr "Грешка датотеке слике"
 
-#: ../src/tag_area.c:1415
+#: ../src/tag_area.c:1403
 msgid "Image file loaded"
 msgstr "Датотека слике је учитана"
 
-#: ../src/tag_area.c:1486
+#: ../src/tag_area.c:1474
 msgid "Add Images"
 msgstr "Додај слике"
 
-#: ../src/tag_area.c:1497 ../src/tag_area.c:1861
+#: ../src/tag_area.c:1485 ../src/tag_area.c:1850
 msgid "All Files"
 msgstr "Све датотеке"
 
-#: ../src/tag_area.c:1503 ../src/tag_area.c:1867
+#: ../src/tag_area.c:1491 ../src/tag_area.c:1856
 msgid "PNG and JPEG"
 msgstr "ПНГ и ЈПЕГ"
 
-#: ../src/tag_area.c:1647
+#: ../src/tag_area.c:1635
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Својства слике %d/%d"
 
-#: ../src/tag_area.c:1846
+#: ../src/tag_area.c:1835
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Сачувај слику %d/%d"
 
-#: ../src/tag_area.c:1923
+#: ../src/tag_area.c:1912
 #, c-format
-#| msgid "Image file not saved: %s"
 msgid "Image file not saved ‘%s’"
 msgstr "Датотека слике није сачувана „%s“"
 
-#: ../src/tag_area.c:2266
+#: ../src/tag_area.c:2255
 msgid "Tag selected files with this genre"
 msgstr "Означите изабране датотеке овим жанром"
 
-#: ../src/tag_area.c:2996
+#: ../src/tag_area.c:2986
 msgid "ID3 Tag"
 msgstr "ИД3 ознака"
 
-#: ../src/tag_area.c:3001
+#: ../src/tag_area.c:2991
 msgid "Ogg Vorbis Tag"
 msgstr "Огг Ворбис ознака"
 
-#: ../src/tag_area.c:3006
+#: ../src/tag_area.c:2996
 msgid "FLAC Vorbis Tag"
 msgstr "ФЛАЦ Ворбис ознака"
 
-#: ../src/tag_area.c:3010
+#: ../src/tag_area.c:3000
 msgid "APE Tag"
 msgstr "АПЕ ознака"
 
-#: ../src/tag_area.c:3014
+#: ../src/tag_area.c:3004
 msgid "MP4/M4A/AAC Tag"
 msgstr "МП4/М4А/ААЦ ознака"
 
-#: ../src/tag_area.c:3019
+#: ../src/tag_area.c:3009
 msgid "Wavpack Tag"
 msgstr "Вејвпак ознака"
 
-#: ../src/tag_area.c:3024
+#: ../src/tag_area.c:3014
 msgid "Opus Tag"
 msgstr "Опус ознака"
 
-#: ../src/tag_area.c:3264
+#: ../src/tag_area.c:3254
 #, c-format
 msgid "Images (%d)"
 msgstr "Слике (%d)"
 
-#: ../src/tags/ape_tag.c:67 ../src/tags/flac_tag.c:137
-#: ../src/tags/mp4_header.cc:58 ../src/tags/mp4_header.cc:67
-#: ../src/tags/mp4_tag.cc:67 ../src/tags/mp4_tag.cc:80
-#: ../src/tags/mp4_tag.cc:86 ../src/tags/ogg_header.c:228
+#: ../src/tags/ape_tag.c:63 ../src/tags/mp4_header.cc:58
+#: ../src/tags/mp4_header.cc:67 ../src/tags/mp4_tag.cc:65
+#: ../src/tags/mp4_tag.cc:78 ../src/tags/mp4_tag.cc:84
+#: ../src/tags/ogg_header.c:227
 #, c-format
-#| msgid "Error while opening file: '%s' (%s)"
 msgid "Error while opening file: %s"
 msgstr "Грешка отварања датотеке: %s"
 
-#: ../src/tags/ape_tag.c:370
+#: ../src/tags/ape_tag.c:385
 msgid "Failed to write APE tag"
 msgstr "Нисам успео да запишем АПЕ ознаку"
 
-#: ../src/tags/flac_header.c:213
-#| msgid "Error reading file (%s)"
+#: ../src/tags/flac_header.c:85 ../src/tags/flac_tag.c:123
 msgid "Error opening FLAC file"
 msgstr "Грешка отварања ФЛАЦ датотеке"
 
-#: ../src/tags/flac_header.c:300
+#: ../src/tags/flac_header.c:172
 msgid "FLAC File"
 msgstr "ФЛАЦ датотека"
 
@@ -4962,47 +4559,26 @@ msgstr "ФЛАЦ датотека"
 #. Mode
 #. mpeg4ip library seems to always return -1
 #. Mode
-#: ../src/tags/flac_header.c:313 ../src/tags/mp4_header.cc:152
-#: ../src/tags/ogg_header.c:417 ../src/tags/opus_header.c:236
-#: ../src/tags/wavpack_header.c:96
+#: ../src/tags/flac_header.c:185 ../src/tags/mp4_header.cc:152
+#: ../src/tags/ogg_header.c:416 ../src/tags/opus_header.c:233
+#: ../src/tags/wavpack_header.c:151
 msgid "Channels:"
 msgstr "Бр. канала:"
 
-#: ../src/tags/flac_tag.c:362 ../src/tags/ogg_tag.c:292
-#, c-format
-#| msgid ""
-#| "The year value '%s' seems to be invalid in file '%s'. The information "
-#| "will be lost while saving tag."
-msgid ""
-"The year value ‘%s’ seems to be invalid in file ‘%s’. The information will "
-"be lost when saving"
-msgstr ""
-"Вредност године „%s“ изгледа да није исправна у датотеци „%s“. Податак ће "
-"бити изгубљен приликом чувања."
-
-#: ../src/tags/flac_tag.c:866 ../src/tags/flac_tag.c:878
+#: ../src/tags/flac_tag.c:845 ../src/tags/flac_tag.c:878
+#: ../src/tags/flac_tag.c:892
 #, c-format
-#| msgid "Error while opening file: '%s' as FLAC (%s)."
 msgid "Error while opening file ‘%s’ as FLAC: %s"
 msgstr "Грешка при отварању датотеке „%s“ као ФЛАЦ: %s"
 
-#: ../src/tags/flac_tag.c:1098
-#, c-format
-#| msgid "Picture block isn't valid: '%s'"
-msgid "Picture block is invalid ‘%s’"
-msgstr "Блок слике није исправан „%s“"
-
-#: ../src/tags/flac_tag.c:1135
+#: ../src/tags/flac_tag.c:1185 ../src/tags/flac_tag.c:1197
+#: ../src/tags/flac_tag.c:1217
 #, c-format
-#| msgid "Error: Failed to write comments to file '%s' (%s)."
 msgid "Failed to write comments to file ‘%s’: %s"
 msgstr "Нисам успео да упишем напомене у датотеку „%s“: %s"
 
-#: ../src/tags/id3_tag.c:212
+#: ../src/tags/id3_tag.c:206
 #, c-format
-#| msgid ""
-#| "As the following corrupted file '%s' will cause an error in id3lib, it "
-#| "will not be processed"
 msgid ""
 "As the following corrupted file ‘%s’ will cause an error in id3lib, it will "
 "not be processed"
@@ -5010,31 +4586,27 @@ msgstr ""
 "Следећа оштећена датотека „%s“ неће бити обрађена, зато што ће проузроковати "
 "грешку у ид3библ"
 
-#: ../src/tags/id3_tag.c:214
+#: ../src/tags/id3_tag.c:208
 msgid "Corrupted file"
 msgstr "Оштећена датотека"
 
 #: ../src/tags/id3_tag.c:596
 #, c-format
-#| msgid "Removed tag of '%s'"
 msgid "Removed tag of ‘%s’"
 msgstr "Уклоњена је ознака из „%s“"
 
 #: ../src/tags/id3_tag.c:603 ../src/tags/id3_tag.c:730
 #, c-format
-#| msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgid "Error while removing ID3v1 tag of ‘%s’: %s"
 msgstr "Грешка при уклањању ИД3в1 ознаке из „%s“: %s"
 
 #: ../src/tags/id3_tag.c:612 ../src/tags/id3_tag.c:693
 #, c-format
-#| msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgid "Error while removing ID3v2 tag of ‘%s’: %s"
 msgstr "Грешка при уклањању ИД3в2 ознаке из „%s“: %s"
 
 #: ../src/tags/id3_tag.c:638
 #, c-format
-#| msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgid "Error while updating ID3v2 tag of ‘%s’: %s"
 msgstr "Грешка при ажурирању ИД3в2 ознаке у „%s“: %s"
 
@@ -5071,7 +4643,6 @@ msgstr "Лоша ид3библ"
 
 #: ../src/tags/id3_tag.c:718
 #, c-format
-#| msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgid "Error while updating ID3v1 tag of ‘%s’: %s"
 msgstr "Грешка при ажурирању ИД3в1 ознаке у „%s“: %s"
 
@@ -5139,55 +4710,29 @@ msgstr "Непозната порука о грешци"
 msgid "Error while creating temporary file"
 msgstr "Грешка приликом стварања привремене датотеке"
 
-#: ../src/tags/id3v24_tag.c:138 ../src/tags/id3v24_tag.c:193
-#: ../src/tags/mp4_tag.cc:96
-#| msgid "Error reading tags from file: '%s'"
+#: ../src/tags/id3v24_tag.c:132 ../src/tags/id3v24_tag.c:187
+#: ../src/tags/id3v24_tag.c:225 ../src/tags/id3v24_tag.c:236
+#: ../src/tags/id3v24_tag.c:941 ../src/tags/id3v24_tag.c:948
+#: ../src/tags/id3v24_tag.c:974 ../src/tags/id3v24_tag.c:1014
+#: ../src/tags/mp4_tag.cc:94
 msgid "Error reading tags from file"
 msgstr "Грешка читања ознака из датотеке"
 
-#. 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/tags/id3v24_tag.c:1663
-#, 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] "Не могу да упишем ознаку у датотеку „%s“ (%s бајт недостаје)"
-msgstr[1] "Не могу да упишем ознаку у датотеку „%s“ (%s бајта недостају)"
-msgstr[2] "Не могу да упишем ознаку у датотеку „%s“ (%s бајтова недостаје)"
-msgstr[3] "Не могу да упишем ознаку у датотеку „%s“ (%s)"
-
-#: ../src/tags/id3v24_tag.c:1686
-#, c-format
-#| msgid "Cannot save tag of file '%s'"
-msgid "Cannot save tag of file ‘%s’"
-msgstr "Не могу да сачувам ознаку датотеке „%s“"
-
-#: ../src/tags/id3v24_tag.c:1698
-#, c-format
-#| msgid "Size error while saving tag of '%s'"
-msgid "Size error while saving tag of ‘%s’"
-msgstr "Грешка величине при чувању ознаке за „%s“"
-
-#: ../src/tags/monkeyaudio_header.c:47
-#| msgid "Monkey's Audio File"
+#: ../src/tags/monkeyaudio_header.c:46
 msgid "Error opening Monkey’s Audio file"
 msgstr "Грешка отварања Монкијеве звучне датотеке"
 
 #. Mode changed to profile name
-#: ../src/tags/monkeyaudio_header.c:79 ../src/tags/musepack_header.c:82
+#: ../src/tags/monkeyaudio_header.c:78 ../src/tags/musepack_header.c:81
 msgid "Profile:"
 msgstr "Профил:"
 
-#: ../src/tags/mp4_header.cc:68 ../src/tags/mp4_tag.cc:87
-#: ../src/tags/mp4_tag.cc:283
+#: ../src/tags/mp4_header.cc:68 ../src/tags/mp4_tag.cc:85
+#: ../src/tags/mp4_tag.cc:281
 msgid "MP4 format invalid"
 msgstr "МП4 запис је неисправан"
 
 #: ../src/tags/mp4_header.cc:77
-#| msgid "Error reading properties from file: '%s'"
 msgid "Error reading properties from file"
 msgstr "Грешка читања својстава из датотеке"
 
@@ -5195,123 +4740,154 @@ msgstr "Грешка читања својстава из датотеке"
 msgid "MP4/AAC File"
 msgstr "МП4/ААЦ датотека"
 
-#: ../src/tags/mp4_header.cc:140 ../src/tags/mpeg_header.c:236
+#: ../src/tags/mp4_header.cc:140 ../src/tags/mpeg_header.c:235
 #, c-format
 msgid "~%d kb/s"
 msgstr "~%d kb/s"
 
-#: ../src/tags/mp4_tag.cc:259 ../src/tags/mp4_tag.cc:276
-#: ../src/tags/mp4_tag.cc:282
+#: ../src/tags/mp4_tag.cc:257 ../src/tags/mp4_tag.cc:274
+#: ../src/tags/mp4_tag.cc:280
 #, c-format
-#| msgid "Error while opening file: '%s' (%s)"
 msgid "Error while opening file ‘%s’: %s"
 msgstr "Грешка отварања датотеке „%s“: %s"
 
-#: ../src/tags/mp4_tag.cc:294
+#: ../src/tags/mp4_tag.cc:292
 #, c-format
-#| msgid "Error reading tags from file: '%s'"
 msgid "Error reading tags from file ‘%s’"
 msgstr "Грешка читања ознака из датотеке „%s“"
 
-#: ../src/tags/mpeg_header.c:51
+#: ../src/tags/mpeg_header.c:50
 msgid "Stereo"
 msgstr "Стерео"
 
-#: ../src/tags/mpeg_header.c:52
+#: ../src/tags/mpeg_header.c:51
 msgid "Joint stereo"
 msgstr "Придружени стерео"
 
-#: ../src/tags/mpeg_header.c:53
+#: ../src/tags/mpeg_header.c:52
 msgid "Dual channel"
 msgstr "Два канала"
 
-#: ../src/tags/mpeg_header.c:54
+#: ../src/tags/mpeg_header.c:53
 msgid "Single channel"
 msgstr "Један канал"
 
-#: ../src/tags/mpeg_header.c:206
+#: ../src/tags/mpeg_header.c:205
 msgid "MP3 File"
 msgstr "МП3 датотека"
 
-#: ../src/tags/mpeg_header.c:209
+#: ../src/tags/mpeg_header.c:208
 msgid "MP2 File"
 msgstr "МП2 датотека"
 
 #. MPEG, Layer versions
-#: ../src/tags/mpeg_header.c:216
+#: ../src/tags/mpeg_header.c:215
 msgid "MPEG"
 msgstr "МПЕГ"
 
-#: ../src/tags/musepack_header.c:47
-#| msgid "Error while creating temporary file"
+#: ../src/tags/musepack_header.c:46
 msgid "Error opening Musepack file"
 msgstr "Грешка отварања Мјузпак датотеке"
 
-#: ../src/tags/musepack_header.c:79
+#: ../src/tags/musepack_header.c:78
 msgid "MusePack File"
 msgstr "МјузПак датотека"
 
-#: ../src/tags/ogg_header.c:244
-#| msgid ""
-#| "Ogg Vorbis: The specified bitstream does not exist or the file has been "
-#| "initialized improperly (file: '%s')."
+#: ../src/tags/ogg_header.c:243
 msgid ""
 "The specified bitstream does not exist or the file has been initialized "
 "improperly"
 msgstr "Изабрани битски ток не постоји или је датотека лоше започета"
 
-#: ../src/tags/ogg_header.c:263
-#| msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
+#: ../src/tags/ogg_header.c:262
 msgid "Read from media returned an error"
 msgstr "Читање са медијума је изазвало грешку"
 
-#: ../src/tags/ogg_header.c:266
-#| msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
+#: ../src/tags/ogg_header.c:265
 msgid "Bitstream is not Vorbis data"
 msgstr "Битски ток није Ворбис податак"
 
-#: ../src/tags/ogg_header.c:269
-#| msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
+#: ../src/tags/ogg_header.c:268
 msgid "Vorbis version mismatch"
 msgstr "Издање Ворбиса не одговара"
 
-#: ../src/tags/ogg_header.c:272
-#| msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
+#: ../src/tags/ogg_header.c:271
 msgid "Invalid Vorbis bitstream header"
 msgstr "Погрешно заглавље битског тока Ворбиса"
 
-#: ../src/tags/ogg_header.c:275
-#| msgid ""
-#| "Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack "
-#| "corruption (file: '%s')."
+#: ../src/tags/ogg_header.c:274
 msgid "Internal logic fault, indicates a bug or heap/stack corruption"
 msgstr ""
 "Унутарња логичка грешка, указује на грешку у програму или гомилу оштећења"
 
-#: ../src/tags/ogg_header.c:326
+#: ../src/tags/ogg_header.c:325
 #, c-format
-#| msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
 msgid "Failed to open file as Vorbis: %s"
 msgstr "Нисам успео да отворим датотеку као Ворбис: %s"
 
-#: ../src/tags/ogg_header.c:389
+#: ../src/tags/ogg_header.c:388
 msgid "Ogg Vorbis File"
 msgstr "Огг Ворбис датотека"
 
-#: ../src/tags/ogg_header.c:392
+#: ../src/tags/ogg_header.c:391
 msgid "Speex File"
 msgstr "Спикс датотека"
 
-#: ../src/tags/ogg_tag.c:699 ../src/tags/ogg_tag.c:889
-#, c-format
-#| msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
-msgid "The Ogg Vorbis file ‘%s’ contains an ID3v2 tag"
-msgstr "Огг Ворбис датотека „%s“ садржи ИД3в2 ознаку"
-
-#: ../src/tags/opus_header.c:223
+#: ../src/tags/opus_header.c:220
 msgid "Opus File"
 msgstr "Опус датотека"
 
-#: ../src/tags/wavpack_header.c:83
+#: ../src/tags/wavpack_header.c:138
 msgid "Wavpack File"
-msgstr "Вејвпак датотека"
\ No newline at end of file
+msgstr "Вејвпак датотека"
+
+#~| msgid "Convert ' ' to '_'"
+#~ msgid "Convert ‘ ’ to ‘_’"
+#~ msgstr "Преведи „ “ у „_“"
+
+#~| msgid "Can't load file: '%s' (%s)."
+#~ msgid "Cannot load file ‘%s’: %s"
+#~ msgstr "Не могу да учитам датотеку „%s“: %s"
+
+#~| msgid "Cannot create or open file '%s' (%s)"
+#~ msgid "Cannot create or open file ‘%s’: %s"
+#~ msgstr "Не могу да направим или отворим датотеку „%s“: %s"
+
+#~| msgid "Error while writing list file: %s"
+#~ msgid "Error while writing list file ‘%s’"
+#~ msgstr "Грешка приликом писања датотеке списка „%s“"
+
+#~| msgid "Migrating configuration from directory '%s' to '%s'"
+#~ msgid "Migrating configuration from directory ‘%s’ to ‘%s’"
+#~ msgstr "Селим подешавања из директоријума „%s“ у „%s“"
+
+#~| msgid "Failed to migrate configuration file '%s'"
+#~ msgid "Failed to migrate configuration file ‘%s’"
+#~ msgstr "Нисам успео да преселим датотеку подешавања „%s“"
+
+#~| msgid "Error: Cannot create directory '%s' (%s)"
+#~ msgid "Cannot create directory ‘%s’: %s"
+#~ msgstr "Не могу да направим директоријум „%s“: %s"
+
+#~| msgid "Picture block isn't valid: '%s'"
+#~ msgid "Picture block is invalid ‘%s’"
+#~ msgstr "Блок слике није исправан „%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] "Не могу да упишем ознаку у датотеку „%s“ (%s бајт недостаје)"
+#~ msgstr[1] "Не могу да упишем ознаку у датотеку „%s“ (%s бајта недостају)"
+#~ msgstr[2] "Не могу да упишем ознаку у датотеку „%s“ (%s бајтова недостаје)"
+#~ msgstr[3] "Не могу да упишем ознаку у датотеку „%s“ (%s)"
+
+#~| msgid "Cannot save tag of file '%s'"
+#~ msgid "Cannot save tag of file ‘%s’"
+#~ msgstr "Не могу да сачувам ознаку датотеке „%s“"
+
+#~| msgid "Size error while saving tag of '%s'"
+#~ msgid "Size error while saving tag of ‘%s’"
+#~ msgstr "Грешка величине при чувању ознаке за „%s“"
+
+#~| msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
+#~ msgid "The Ogg Vorbis file ‘%s’ contains an ID3v2 tag"
+#~ msgstr "Огг Ворбис датотека „%s“ садржи ИД3в2 ознаку"
diff --git a/po/sr at latin.po b/po/sr at latin.po
index 190ca96..1473737 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: EasyTAG\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=easytag"
 "&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-10-29 17:48+0000\n"
-"PO-Revision-Date: 2014-11-05 05:03+0200\n"
+"POT-Creation-Date: 2014-12-27 04:16+0000\n"
+"PO-Revision-Date: 2014-12-27 12:24+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic at rocketmail.com>\n"
 "Language-Team: Serbian <gnom at prevod.org>\n"
 "Language: sr\n"
@@ -21,7 +21,17 @@ msgstr ""
 "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
+#. Name and summary taken from the desktop file.
+#: ../data/easytag.appdata.xml.in.h:2 ../data/easytag.desktop.in.h:1
+#| msgid "Open in EasyTAG"
+msgid "EasyTAG"
+msgstr "Laka oznaka"
+
+#: ../data/easytag.appdata.xml.in.h:3 ../data/easytag.desktop.in.h:3
+msgid "Edit audio file metadata"
+msgstr "Uređujte metapodatke zvučnih datoteka"
+
+#: ../data/easytag.appdata.xml.in.h:4
 msgid ""
 "View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg "
 "Vorbis, MusePack, Monkey's Audio and WavPack files."
@@ -29,7 +39,7 @@ 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
+#: ../data/easytag.appdata.xml.in.h:5
 msgid ""
 "Look up albums in online databases, bulk edit tags, create playlists and "
 "rename a collection of files."
@@ -37,7 +47,7 @@ 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
+#: ../data/easytag.appdata.xml.in.h:6
 msgid ""
 "A simple and nice GTK+ interface makes tagging easier under GNU/Linux and "
 "Windows."
@@ -45,22 +55,26 @@ 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"
+#: ../data/easytag.desktop.in.h:2
 msgid "Audio File Metadata Editor"
 msgstr "Uređivač metapodataka zvučnih datoteka"
 
-#: ../data/easytag.desktop.in.h:2
-#| msgid "Edit sound file metadata"
-msgid "Edit audio file metadata"
-msgstr "Uređujte metapodatke zvučnih datoteka"
-
 #. 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;"
+#: ../data/easytag.desktop.in.h:5
 msgid "mp3;tag;audio;music;"
 msgstr "mp3;oznaka;zvuk;muzika;"
 
+#: ../data/easytag-nautilus.metainfo.xml.in.h:1
+#: ../nautilus-extension/nautilus-easytag.c:247
+msgid "Open with EasyTAG"
+msgstr "Otvori Lakom oznakom"
+
+#: ../data/easytag-nautilus.metainfo.xml.in.h:2
+msgid "Open directories and audio files with EasyTAG using the context menu"
+msgstr ""
+"Otvorite direktorijume i zvučne datoteke Lakom oznakom koristeći priručni "
+"izbornik"
+
 #: ../data/browser.ui.h:1
 msgid "Browse Directory With"
 msgstr "Otvorite direktorijum programom"
@@ -70,25 +84,22 @@ msgid "Run Program"
 msgstr "Pokreni program"
 
 #: ../data/browser.ui.h:3
-#| msgid ""
-#| "Enter the program to run. It will receive the current directory as "
-#| "parameter."
 msgid ""
 "Enter the program to run; it will receive the current directory as a "
 "parameter"
 msgstr ""
 "Unesite program za pokretanje; primiće trenutni direktorijum kao parametar."
 
-#: ../data/browser.ui.h:4 ../src/misc.c:393 ../src/tag_area.c:1491
+#: ../data/browser.ui.h:4 ../src/browser.c:3779 ../src/tag_area.c:1479
 msgid "_Open"
 msgstr "Ot_vori"
 
 #: ../data/browser.ui.h:5 ../data/tag_area.ui.h:3
-#: ../src/application_window.c:322 ../src/application_window.c:336
-#: ../src/application_window.c:2612 ../src/application_window.c:2650
-#: ../src/browser.c:848 ../src/cddb_dialog.c:2266 ../src/easytag.c:516
-#: ../src/easytag.c:523 ../src/easytag.c:640 ../src/misc.c:391
-#: ../src/playlist_dialog.c:655 ../src/tag_area.c:1489 ../src/tag_area.c:1851
+#: ../src/application_window.c:323 ../src/application_window.c:337
+#: ../src/application_window.c:2685 ../src/application_window.c:2723
+#: ../src/browser.c:863 ../src/browser.c:3778 ../src/cddb_dialog.c:2297
+#: ../src/easytag.c:467 ../src/easytag.c:474 ../src/easytag.c:599
+#: ../src/playlist_dialog.c:658 ../src/tag_area.c:1477 ../src/tag_area.c:1840
 msgid "_Cancel"
 msgstr "Ot_kaži"
 
@@ -101,19 +112,16 @@ msgid "Open Files With"
 msgstr "Otvorite datoteke programom"
 
 #: ../data/browser.ui.h:8
-#| msgid ""
-#| "Enter the program to run. It will receive the current file as parameter."
 msgid ""
 "Enter the program to run; it will receive the current files as a parameter"
 msgstr "Unesite program za pokretanje; primiće trenutnu datoteku kao parametar."
 
 #. Only directories changed
-#: ../data/browser.ui.h:9 ../data/menus.ui.h:99 ../src/easytag.c:606
+#: ../data/browser.ui.h:9 ../data/menus.ui.h:99 ../src/easytag.c:565
 msgid "Rename Directory"
 msgstr "Preimenuj direktorijum"
 
 #: ../data/browser.ui.h:10
-#| msgid "User Name:"
 msgid "Literal name:"
 msgstr "Doslovni naziv:"
 
@@ -122,14 +130,10 @@ msgid "Use mask:"
 msgstr "Koristi masku:"
 
 #: ../data/browser.ui.h:12 ../data/org.gnome.EasyTAG.gschema.xml.h:188
-#| msgid "Unable to create setting directories"
 msgid "Whether to use a mask when renaming directories"
 msgstr "Da li da koristi masku prilikom preimenovanja direktorijuma"
 
 #: ../data/browser.ui.h:13
-#| msgid ""
-#| "Select or type in a mask using codes (see Legend in Scanner Window) to "
-#| "rename the directory from tag fields."
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields"
@@ -142,12 +146,10 @@ msgid "Rename directory preview"
 msgstr "Pregled preimenovanja direktorijuma"
 
 #: ../data/browser.ui.h:15
-#| msgid "Rename File"
 msgid "_Rename"
 msgstr "_Preimenuj"
 
 #: ../data/browser.ui.h:16
-#| msgid "Enter a directory to browse."
 msgid "Choose a directory to show in the browser"
 msgstr "Izaberite direktorijum za prikaz u pregledniku"
 
@@ -155,7 +157,7 @@ msgstr "Izaberite direktorijum za prikaz u pregledniku"
 msgid "Select a directory to browse"
 msgstr "Izaberite direktorijum za razgledanje"
 
-#: ../data/browser.ui.h:18 ../src/easytag.c:1107
+#: ../data/browser.ui.h:18 ../src/easytag.c:1071
 msgid "No files"
 msgstr "Nema datoteka"
 
@@ -222,7 +224,7 @@ msgstr "Komentar"
 
 #: ../data/browser.ui.h:31 ../data/preferences_dialog.ui.h:71
 #: ../data/scan_dialog.ui.h:66 ../data/search_dialog.ui.h:21
-#: ../src/picture.c:224
+#: ../src/picture.c:212
 msgid "Composer"
 msgstr "Kompozitor"
 
@@ -246,35 +248,28 @@ msgid "Encoded By"
 msgstr "Kodirano pomoću"
 
 #: ../data/cddb_dialog.ui.h:1
-#| msgid "Search:"
 msgid "Search"
 msgstr "Potraži"
 
 #: ../data/cddb_dialog.ui.h:2
-#| msgid "Enter the words to search (separated by a space or '+')"
 msgid "Enter the words to search (separated by a space or ‘+’)"
 msgstr "Unesi reči za pretragu (razdvojene razmakom ili znakom „+“)"
 
 #: ../data/cddb_dialog.ui.h:3
-#| msgid "Search:"
 msgid "_Search"
 msgstr "_Traži"
 
 #: ../data/cddb_dialog.ui.h:4
-#| msgid ""
-#| "Request automatically the CDDB using the selected files (the order is "
-#| "important) to generate the CddbID"
+msgid "Search Using Selected _Files"
+msgstr "Traži koristeći izabrane _datoteke"
+
+#: ../data/cddb_dialog.ui.h:5
 msgid ""
 "Generate the CDDB disc ID using the selected files (the order is important)"
 msgstr ""
 "Stvara IB diska iz baze podataka CD-a koristeći izabrane datoteke (redosled "
 "je važan)"
 
-#: ../data/cddb_dialog.ui.h:5
-#| msgid "Scan selected files"
-msgid "Search Using Selected _Files"
-msgstr "Traži koristeći izabrane _datoteke"
-
 #: ../data/cddb_dialog.ui.h:6 ../data/toolbar.ui.h:31
 msgid "Stop"
 msgstr "Zaustavi"
@@ -284,12 +279,10 @@ msgid "Stop the search"
 msgstr "Prekinite pretragu"
 
 #: ../data/cddb_dialog.ui.h:8
-#| msgid "Manual Search"
 msgid "Manual Search Options"
 msgstr "Izbori ručne pretrage"
 
 #: ../data/cddb_dialog.ui.h:9
-#| msgid "CDDB Search Files…"
 msgid "Search Fields"
 msgstr "Polja pretrage"
 
@@ -298,7 +291,7 @@ msgid "Track Name"
 msgstr "Naslov numere"
 
 #: ../data/cddb_dialog.ui.h:13 ../data/preferences_dialog.ui.h:91
-#: ../src/picture.c:202
+#: ../src/picture.c:190
 msgid "Other"
 msgstr "Ostalo"
 
@@ -347,7 +340,6 @@ msgid "Soundtrack"
 msgstr "Zvučna traka"
 
 #: ../data/cddb_dialog.ui.h:25
-#| msgid "Results:"
 msgid "Results"
 msgstr "Rezultati"
 
@@ -360,10 +352,6 @@ msgid "Category"
 msgstr "Kategorija"
 
 #: ../data/cddb_dialog.ui.h:28
-#| 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."
 msgid ""
 "Select lines from which tags will be applied to your files list. All lines "
 "will be processed if no line is selected.\\nYou can also reorder lines in "
@@ -387,7 +375,6 @@ msgid "Select all lines"
 msgstr "Izaberi sve redove"
 
 #: ../data/cddb_dialog.ui.h:32
-#| msgid "Invert lines selection"
 msgid "Invert line selection"
 msgstr "Obrni izbor redova"
 
@@ -396,7 +383,6 @@ msgid "Unselect all lines"
 msgstr "Poništi izbor svih redova"
 
 #: ../data/cddb_dialog.ui.h:34 ../data/menus.ui.h:24
-#| msgid "Fill Tag"
 msgid "Fill Tags"
 msgstr "Popuni oznake"
 
@@ -432,24 +418,23 @@ msgstr ""
 "datotekama"
 
 #: ../data/cddb_dialog.ui.h:45 ../data/search_dialog.ui.h:10
-#: ../src/load_files_dialog.c:895 ../src/preferences_dialog.c:295
-#: ../src/scan_dialog.c:2257
+#: ../src/load_files_dialog.c:895 ../src/preferences_dialog.c:291
+#: ../src/scan_dialog.c:2261
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../data/cddb_dialog.ui.h:46 ../src/cddb_dialog.c:2267
+#: ../data/cddb_dialog.ui.h:46 ../src/cddb_dialog.c:2298
 #: ../src/load_files_dialog.c:896
 msgid "_Apply"
 msgstr "_Primeni"
 
 #: ../data/cddb_dialog.ui.h:47
-#| msgid "Load the selected lines or all lines (if no line selected)."
 msgid "Load the selected lines or all lines (if no lines are selected)"
 msgstr ""
 "Učitaj izabrane redove ili sve redove (ukoliko nijedan red nije izabran)."
 
 #. Default values are MPEG data.
-#: ../data/file_area.ui.h:1 ../src/et_core.c:3027 ../src/file_area.c:192
+#: ../data/file_area.ui.h:1 ../src/et_core.c:3010 ../src/file_area.c:192
 msgid "File"
 msgstr "Datoteka"
 
@@ -461,9 +446,9 @@ msgstr "0/0:"
 #. Version changed to encoder version
 #. Encoder version
 #: ../data/file_area.ui.h:3 ../src/file_area.c:193
-#: ../src/tags/flac_header.c:303 ../src/tags/monkeyaudio_header.c:89
-#: ../src/tags/musepack_header.c:93 ../src/tags/ogg_header.c:399
-#: ../src/tags/opus_header.c:226 ../src/tags/wavpack_header.c:86
+#: ../src/tags/flac_header.c:175 ../src/tags/monkeyaudio_header.c:88
+#: ../src/tags/musepack_header.c:92 ../src/tags/ogg_header.c:398
+#: ../src/tags/opus_header.c:223 ../src/tags/wavpack_header.c:141
 msgid "Encoder:"
 msgstr "Koder:"
 
@@ -477,7 +462,7 @@ msgstr "Protok uzorka:"
 
 #. Mode
 #: ../data/file_area.ui.h:6 ../src/file_area.c:197
-#: ../src/tags/mpeg_header.c:248
+#: ../src/tags/mpeg_header.c:247
 msgid "Mode:"
 msgstr "Režim:"
 
@@ -498,12 +483,10 @@ msgid "File:"
 msgstr "Datoteka:"
 
 #: ../data/load_files_dialog.ui.h:2
-#| msgid "Content of Text File"
 msgid "Choose a Text File"
 msgstr "Izaberite datoteku teksta"
 
 #: ../data/load_files_dialog.ui.h:3
-#| msgid " Load "
 msgid "_Load"
 msgstr "_Učitaj"
 
@@ -525,12 +508,10 @@ msgid "Delete all blank lines"
 msgstr "Obrišite sve prazne redove"
 
 #: ../data/load_files_dialog.ui.h:8
-#| msgid "Move up the selected line"
 msgid "Move the selected line up"
 msgstr "Pomerite izabrani red gore"
 
 #: ../data/load_files_dialog.ui.h:9
-#| msgid "Move up the selected line"
 msgid "Move the selected line down"
 msgstr "Pomerite izabrani red dole"
 
@@ -549,7 +530,6 @@ msgstr "Izabrani red:"
 
 #: ../data/load_files_dialog.ui.h:14
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:131
-#| msgid "Run the current scanner for each file"
 msgid "Whether to run the current scanner on files loaded from a text file"
 msgstr ""
 "Da li da pokrene tekućeg pregledača nad datotekama učitanim iz datoteke "
@@ -563,7 +543,7 @@ msgstr "Po_moć"
 msgid "_About"
 msgstr "_O programu"
 
-#: ../data/menus.ui.h:3 ../src/application_window.c:2651
+#: ../data/menus.ui.h:3 ../src/application_window.c:2724
 msgid "_Quit"
 msgstr "_Izađi"
 
@@ -588,7 +568,6 @@ msgid "Delete Files"
 msgstr "Obriši datoteke"
 
 #: ../data/menus.ui.h:9
-#| msgid "Find Files"
 msgid "Undo for File"
 msgstr "Poništi za datoteke"
 
@@ -613,7 +592,6 @@ msgid "_Find…"
 msgstr "_Pronađi…"
 
 #: ../data/menus.ui.h:15
-#| msgid "Select all"
 msgid "Select All"
 msgstr "Izaberi sve"
 
@@ -642,17 +620,14 @@ msgid "_View"
 msgstr "_Pregled"
 
 #: ../data/menus.ui.h:22
-#| msgid "_Show Scanner"
 msgid "Show Scanner"
 msgstr "Prikaži pregledač"
 
 #: ../data/menus.ui.h:23
-#| msgid "S_canner Mode"
 msgid "Scanner Mode"
 msgstr "Režim pregledača"
 
 #: ../data/menus.ui.h:25
-#| msgid "_Rename Files and Directories…"
 msgid "Rename Files and Directories"
 msgstr "Preimenujte datoteke i direktorijume"
 
@@ -661,12 +636,10 @@ msgid "Process Fields"
 msgstr "Obradi polja"
 
 #: ../data/menus.ui.h:27 ../data/toolbar.ui.h:19
-#| msgid "Directory renamed"
 msgid "Directory Tree"
 msgstr "Stablo direktorijuma"
 
 #: ../data/menus.ui.h:28 ../data/toolbar.ui.h:21
-#| msgid "Artist and Album"
 msgid "Artists and Albums"
 msgstr "Izvođači i albumi"
 
@@ -823,32 +796,26 @@ msgid "Descending by duration"
 msgstr "Opadajuće, prema trajanju numere"
 
 #: ../data/menus.ui.h:67
-#| msgid "Ascending by bitrate"
 msgid "Ascending by bit rate"
 msgstr "Rastuće, prema bitskom protoku"
 
 #: ../data/menus.ui.h:68
-#| msgid "Descending by bitrate"
 msgid "Descending by bit rate"
 msgstr "Opadajuće, prema bitskom protoku"
 
 #: ../data/menus.ui.h:69
-#| msgid "Ascending by samplerate"
 msgid "Ascending by sample rate"
 msgstr "Rastuće, prema protoku uzorka"
 
 #: ../data/menus.ui.h:70
-#| msgid "Descending by samplerate"
 msgid "Descending by sample rate"
 msgstr "Opadajuće, prema protoku uzorka"
 
 #: ../data/menus.ui.h:71
-#| msgid "_Collapse Tree"
 msgid "Collapse Tree"
 msgstr "Skupi stablo"
 
 #: ../data/menus.ui.h:72
-#| msgid "_Reload Tree"
 msgid "Reload Tree"
 msgstr "Osveži stablo"
 
@@ -933,7 +900,6 @@ msgid "_First File"
 msgstr "P_rva datoteka"
 
 #: ../data/menus.ui.h:93
-#| msgid "_Previous File"
 msgid "Previous File"
 msgstr "Prethodna datoteka"
 
@@ -946,27 +912,22 @@ msgid "_Last File"
 msgstr "Pos_lednja datoteka"
 
 #: ../data/menus.ui.h:96
-#| msgid "_Home Directory"
 msgid "Home Directory"
 msgstr "Lični direktorijum"
 
 #: ../data/menus.ui.h:97
-#| msgid "_Default Directory"
 msgid "Default Directory"
 msgstr "Osnovni direktorijum"
 
 #: ../data/menus.ui.h:98
-#| msgid "Set _Current Path as Default"
 msgid "Set Current Path as Default"
 msgstr "Postavi trenutnu putanju kao osnovnu"
 
 #: ../data/menus.ui.h:100
-#| msgid "Browse _Subdirectories"
 msgid "Browse Subdirectories"
 msgstr "Razgledaj pod-direktorijume"
 
 #: ../data/menus.ui.h:101
-#| msgid "Invert selection"
 msgid "Invert Selection"
 msgstr "Preokreni izbor"
 
@@ -975,12 +936,10 @@ msgid "CDDB Search Files…"
 msgstr "Nađi datoteke u bazi podataka CD-a…"
 
 #: ../data/menus.ui.h:103
-#| msgid "_Find…"
 msgid "Find…"
 msgstr "Pronađi…"
 
 #: ../data/menus.ui.h:104
-#| msgid "Clear log"
 msgid "Clear Log"
 msgstr "Očisti dnevnik"
 
@@ -989,7 +948,6 @@ msgid "Use directory name"
 msgstr "Koristi naziv direktorijuma"
 
 #: ../data/playlist_dialog.ui.h:4
-#| msgid "Log Options"
 msgid "Options"
 msgstr "Opcije"
 
@@ -1016,7 +974,6 @@ msgid "Create playlist in the parent directory"
 msgstr "Napravi spisak numera u roditeljskom direktorijumu"
 
 #: ../data/playlist_dialog.ui.h:10 ../data/org.gnome.EasyTAG.gschema.xml.h:168
-#| msgid "Create playlist in the parent directory"
 msgid "Whether to create the playlist in the parent directory"
 msgstr "Da li da napravi spisak numera u roditeljskom direktorijumu"
 
@@ -1032,7 +989,6 @@ msgstr ""
 "spiskova numera"
 
 #: ../data/playlist_dialog.ui.h:13
-#| msgid "_Contents"
 msgid "Content"
 msgstr "Sadržaj"
 
@@ -1041,12 +997,10 @@ msgid "Write only list of files"
 msgstr "Upiši samo spisak datoteka"
 
 #: ../data/playlist_dialog.ui.h:15
-#| msgid "Write info using filename"
 msgid "Write information using filename"
 msgstr "Upiši podatke koristeći naziv datoteke"
 
 #: ../data/playlist_dialog.ui.h:16
-#| msgid "Write info using:"
 msgid "Write information using:"
 msgstr "Upiši podatke koristeći:"
 
@@ -1055,12 +1009,10 @@ msgid "Browser"
 msgstr "Preglednik"
 
 #: ../data/preferences_dialog.ui.h:2
-#| msgid "_Default Directory"
 msgid "Default Directory:"
 msgstr "Osnovni direktorijum:"
 
 #: ../data/preferences_dialog.ui.h:3 ../data/org.gnome.EasyTAG.gschema.xml.h:4
-#| msgid "New default path for files selected"
 msgid "The default path to search for music files"
 msgstr "Osnovna putanja za traženje datoteka muzike"
 
@@ -1084,8 +1036,6 @@ msgid "Browse subdirectories"
 msgstr "Razgledajte pod-direktorijume"
 
 #: ../data/preferences_dialog.ui.h:7 ../data/org.gnome.EasyTAG.gschema.xml.h:6
-#| msgid ""
-#| "Search subdirectories for files when reading a directory into the tree."
 msgid ""
 "Whether to search subdirectories for audio files when reading a directory in "
 "the browser"
@@ -1094,7 +1044,6 @@ msgstr ""
 "pregledniku."
 
 #: ../data/preferences_dialog.ui.h:8 ../data/org.gnome.EasyTAG.gschema.xml.h:9
-#| msgid "Show subdirectories when selecting a directory"
 msgid "Expand the subdirectories of the selected directory"
 msgstr "Raširi pod-direktorijume izabranog direktorijuma"
 
@@ -1113,8 +1062,6 @@ msgstr "Pretraži skrivene direktorijume"
 
 #: ../data/preferences_dialog.ui.h:11
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:8
-#| msgid ""
-#| "Search subdirectories for files when reading a directory into the tree."
 msgid ""
 "Whether to show hidden directories when showing a directory in the browser"
 msgstr ""
@@ -1133,18 +1080,15 @@ msgstr "Da li da se obazire na veličinu slova kada ređa datoteke"
 
 #: ../data/preferences_dialog.ui.h:15
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:59
-#| msgid "Show help"
 msgid "Show the log"
 msgstr "Prikaži dnevnik"
 
 #: ../data/preferences_dialog.ui.h:16
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:60
-#| msgid "Show log view in main window"
 msgid "Whether to show the log in the main window"
 msgstr "Da li da prikaže dnevnik u glavnom prooru"
 
 #: ../data/preferences_dialog.ui.h:17
-#| msgid "Max number of lines:"
 msgid "Maximum number of lines:"
 msgstr "Najveći broj redova:"
 
@@ -1184,7 +1128,6 @@ msgid "Bold style"
 msgstr "Podebljano"
 
 #: ../data/preferences_dialog.ui.h:25
-#| msgid "User Interface"
 msgid "Interface"
 msgstr "Sučelje"
 
@@ -1194,26 +1137,21 @@ msgstr "Podešavanja datoteka"
 
 #: ../data/preferences_dialog.ui.h:27
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:45
-#| msgid "Preserve modification time of the file"
 msgid "Preserve modification time when writing files"
 msgstr "Zadržava vreme izmene kada zapisuje datoteke"
 
 #: ../data/preferences_dialog.ui.h:28
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:46
-#| msgid "Preserve modification time of the file"
 msgid "Whether to preserve the existing modification time when editing files"
 msgstr "Da li da očuva postojeće vreme izmene kada uređuje datoteke"
 
 #: ../data/preferences_dialog.ui.h:29
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:47
-#| msgid "Preserve modification time of the file"
 msgid "Update parent directory modification time when writing files"
 msgstr "Osveži vreme izmene polaznog direktorijuma kada pišeš datoteke"
 
 #: ../data/preferences_dialog.ui.h:30
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:48
-#| msgid ""
-#| "Preserve the modification time (in file properties) when saving the file."
 msgid ""
 "Whether to update the modification time on the parent directory when editing "
 "files"
@@ -1221,13 +1159,11 @@ msgstr ""
 "Da li da osveži vreme izmene polaznog direktorijuma kada uređuje datoteke"
 
 #: ../data/preferences_dialog.ui.h:31
-#| msgid "Filename"
 msgid "Filenames"
 msgstr "Nazivi datoteka"
 
 #: ../data/preferences_dialog.ui.h:32
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:195
-#| msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgid "Replace illegal characters when renaming"
 msgstr "Zameni nedozvoljene znake u nazivu datoteke"
 
@@ -1248,7 +1184,6 @@ msgid "Lower Case"
 msgstr "Mala slova"
 
 #: ../data/preferences_dialog.ui.h:36
-#| msgid "For example, the extension will be converted to '.mp3'"
 msgid "For example, the extension will be converted to ‘.mp3’"
 msgstr "Na primer, proširenje će biti preimenovano u „.mp3“"
 
@@ -1257,7 +1192,6 @@ msgid "Upper Case"
 msgstr "Velika slova"
 
 #: ../data/preferences_dialog.ui.h:38
-#| msgid "For example, the extension will be converted to '.MP3'"
 msgid "For example, the extension will be converted to ‘.MP3’"
 msgstr "Na primer, proširenje će biti preimenovano u „.MP3“"
 
@@ -1266,12 +1200,10 @@ msgid "No Change"
 msgstr "Bez izmene"
 
 #: ../data/preferences_dialog.ui.h:40
-#| msgid "The extension will not be converted"
 msgid "The extension will not be modified"
 msgstr "Proširenje neće biti izmenjeno"
 
 #: ../data/preferences_dialog.ui.h:41
-#| msgid "Filename translation"
 msgid "Filename Encoding"
 msgstr "Kodiranje naziva datoteke"
 
@@ -1288,7 +1220,6 @@ msgstr ""
 "probajte ISO-8859-1 kodiranje znakova"
 
 #: ../data/preferences_dialog.ui.h:44
-#| msgid "Try another character encoding"
 msgid "Transliterate characters into the system character encoding"
 msgstr "Prevedi znakove u sistemsko kodiranje znakova"
 
@@ -1299,17 +1230,12 @@ msgid ""
 msgstr "Zamenite nepodržane znakove sličnim iz ciljnog kodiranja"
 
 #: ../data/preferences_dialog.ui.h:46
-#| msgid ""
-#| "Force using the system character encoding and silently discard some "
-#| "characters"
 msgid ""
 "Use the system character encoding and silently discard unsupported characters"
-msgstr "Koristi sistemsko kodiranje znakova i neprimetno odbaci nepodržane znake"
+msgstr ""
+"Koristi sistemsko kodiranje znakova i neprimetno odbaci nepodržane znake"
 
 #: ../data/preferences_dialog.ui.h:47
-#| msgid ""
-#| "With this option, when a character cannot be represented in the target "
-#| "character set, it will be silently discarded."
 msgid ""
 "Discard characters which cannot be represented in the target character "
 "encoding"
@@ -1317,7 +1243,6 @@ msgstr ""
 "Odbacite znakove koji ne mogu biti predstavljeni u ciljnom kodiranju znakova"
 
 #: ../data/preferences_dialog.ui.h:48
-#| msgid "File"
 msgid "Files"
 msgstr "Datoteke"
 
@@ -1360,7 +1285,6 @@ msgstr "Popuni broj cifara u polju diska:"
 
 #: ../data/preferences_dialog.ui.h:56
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:96
-#| msgid "Whether to pad the disc field with leading zeroes"
 msgid "Whether the disc number tag field should be padded with leading zeroes"
 msgstr "Da li polje oznake broja diska treba da se popuni vodećim nulama"
 
@@ -1370,12 +1294,10 @@ msgstr "Popuni broj cifara u polju numere:"
 
 #: ../data/preferences_dialog.ui.h:58
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:102
-#| msgid "Whether to pad the disc field with leading zeroes"
 msgid "Whether the track number tag field should be padded with leading zeroes"
 msgstr "Da li polje oznake broja numere treba da se popuni vodećim nulama"
 
 #: ../data/preferences_dialog.ui.h:59
-#| msgid "Tag Splitting"
 msgid "Splitting"
 msgstr "Podela"
 
@@ -1434,7 +1356,6 @@ msgstr "Oznake"
 
 #: ../data/preferences_dialog.ui.h:76
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:63
-#| msgid "Strip tags if all fields are set to blank"
 msgid "Strip ID3 tags if all ID3 tags are empty"
 msgstr "Obriši ID3 oznake ako su sve ID3 oznake prazne"
 
@@ -1448,7 +1369,6 @@ msgstr ""
 "oznake prazna"
 
 #: ../data/preferences_dialog.ui.h:78
-#| msgid "Character Set for reading ID3 tags"
 msgid "Non-standard encoding for reading ID3 tags:"
 msgstr "Ne-standardno kodiranje za čitanje ID3 oznaka:"
 
@@ -1459,13 +1379,11 @@ msgstr "Da li da koristi ne-standardno kodiranje znakova kada čita ID3 oznake"
 
 #: ../data/preferences_dialog.ui.h:80
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:72
-#| msgid "Character Set for reading ID3 tags"
 msgid "Choose the character set to be used when reading ID3v1 and ID3v2 tags"
 msgstr ""
 "Izaberite skup znakova za korišćenje prilikom čitanja ID3v1 i ID3v2 oznaka"
 
 #: ../data/preferences_dialog.ui.h:81
-#| msgid "ID3v2 tags"
 msgid "ID3v2"
 msgstr "ID3v2"
 
@@ -1484,10 +1402,6 @@ msgid "Version:"
 msgstr "Izdanje:"
 
 #: ../data/preferences_dialog.ui.h:85
-#| msgid ""
-#| "Select the ID3v2 tag version to write:\n"
-#| " - ID3v2.3 is written using id3lib,\n"
-#| " - ID3v2.4 is written using libid3tag (recommended)."
 msgid ""
 "Select the ID3v2 tag version to write:\n"
 " • ID3v2.3 is written using id3lib,\n"
@@ -1498,12 +1412,10 @@ msgstr ""
 " • ID3v2.4 se upisuje koristeći biblid3tag (preporučljivo)"
 
 #: ../data/preferences_dialog.ui.h:88
-#| msgid "Try another character encoding"
 msgid "Character encoding:"
 msgstr "Kodiranje znakova:"
 
 #: ../data/preferences_dialog.ui.h:89
-#| msgid "Unicode "
 msgid "Unicode"
 msgstr "Unikod"
 
@@ -1530,9 +1442,6 @@ msgid "Report error"
 msgstr "Prijavi grešku"
 
 #: ../data/preferences_dialog.ui.h:95
-#| msgid ""
-#| "With this option, when a character cannot be represented in the target "
-#| "character set, it will be silently discarded."
 msgid ""
 "Display an error message when a character cannot be represented in the "
 "target character encoding and keep the original character"
@@ -1545,7 +1454,6 @@ msgid "Transliterate"
 msgstr "Preslovi"
 
 #: ../data/preferences_dialog.ui.h:97
-#| msgid "Disc"
 msgid "Discard"
 msgstr "Odbaci"
 
@@ -1563,7 +1471,6 @@ msgstr ""
 "je ID3v2.2, u novije, kao što su ID3v2.3 ili ID3v2.4"
 
 #: ../data/preferences_dialog.ui.h:100
-#| msgid "Use CRC32"
 msgid "Use CRC-32"
 msgstr "Koristi CRC-32"
 
@@ -1575,13 +1482,11 @@ msgstr ""
 
 #: ../data/preferences_dialog.ui.h:102
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:79
-#| msgid "Set Compression in the ID3v2 tags"
 msgid "Compress data in ID3v2 tags"
 msgstr "Zapakuj podatke u ID3v2 oznakama"
 
 #: ../data/preferences_dialog.ui.h:103
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:80
-#| msgid "Set Compression in the ID3v2 tags"
 msgid "Whether to compress data in ID3v2 tags"
 msgstr "Da li da zapakuje podatke u ID3v2 oznakama"
 
@@ -1600,12 +1505,10 @@ msgstr ""
 "kada zapisuje polje žanra u ID3v2 oznakama"
 
 #: ../data/preferences_dialog.ui.h:106
-#| msgid "ID3v1 tags"
 msgid "ID3v1"
 msgstr "ID3v1"
 
 #: ../data/preferences_dialog.ui.h:107
-#| msgid "Write ID3v1.x tag"
 msgid "Write ID3v1 tag"
 msgstr "Upiši ID3v1 oznaku"
 
@@ -1616,34 +1519,28 @@ msgstr ""
 "Da li da upiše ID3v1 oznake prilikom pisanja ID3 oznaka u zvučnim datotekama"
 
 #: ../data/preferences_dialog.ui.h:109
-#| msgid "Character Set for writing ID3 tags"
 msgid "Choose the character set to be used when writing ID3v1 tag"
 msgstr "Izaberite skup znakova za upis ID3v1 oznaka"
 
 #: ../data/preferences_dialog.ui.h:110
-#| msgid "ID3 Tag"
 msgid "ID3 Tags"
 msgstr "ID3 oznake"
 
 #: ../data/preferences_dialog.ui.h:111
-#| msgid "Fill Tag Scanner - Character Conversion"
 msgid "Character Conversion"
 msgstr "Prevođenje znakova"
 
 #: ../data/preferences_dialog.ui.h:112
-#| msgid "Fill Tag"
 msgid "Fill Tag Scanner"
 msgstr "Popini pregledač oznake"
 
 #: ../data/preferences_dialog.ui.h:114
 #, no-c-format
-#| msgid "Convert '_' and '%20' to spaces"
 msgid "Convert underscores and ‘%20’ to spaces"
 msgstr "Prevedi „_“ i „%20“ u razmake"
 
 #: ../data/preferences_dialog.ui.h:116
 #, no-c-format
-#| msgid "Convert space ' ' to underscore '_'"
 msgid "Convert spaces and ‘%20’ to underscores"
 msgstr "Prevedi razmake i „%20“ u donje crtice „_“"
 
@@ -1652,17 +1549,14 @@ msgid "No conversion"
 msgstr "Bez pretvaranja"
 
 #: ../data/preferences_dialog.ui.h:118
-#| msgid "Rename File and Directory"
 msgid "Rename File and Directory Scanner"
 msgstr "Preimenuj datoteku i pregledača direktorijuma"
 
 #: ../data/preferences_dialog.ui.h:119
-#| msgid "Process Fields"
 msgid "Process Fields Scanner"
 msgstr "Obradi pregledač polja"
 
 #: ../data/preferences_dialog.ui.h:120
-#| msgid "Capitalize the first letter of each word"
 msgid "Upper-case the first letters of all words"
 msgstr "Prvo slovo svake reči veliko"
 
@@ -1706,13 +1600,11 @@ msgstr ""
 "popunjava oznake"
 
 #: ../data/preferences_dialog.ui.h:127
-#| msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgid "Use CRC-32 as the default comment (for files with ID3 tags only)"
 msgstr "Koristi CRC-32 kao osnovni komentar (samo za datoteke sa ID3 oznakama)"
 
 #: ../data/preferences_dialog.ui.h:128
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:117
-#| msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
 msgid ""
 "Whether to use the CRC-32 of the audio file data as the default comment, for "
 "files with ID3 tags only"
@@ -1725,12 +1617,10 @@ msgid "Scanner"
 msgstr "Pregledač"
 
 #: ../data/preferences_dialog.ui.h:130
-#| msgid "Automatic Search"
 msgid "Automatic Search Servers"
 msgstr "Serveri samostalne pretrage"
 
 #: ../data/preferences_dialog.ui.h:131
-#| msgid "Host Name:"
 msgid "Host:"
 msgstr "Domaćin:"
 
@@ -1743,7 +1633,6 @@ msgid "CGI Path:"
 msgstr "CGI putanja:"
 
 #: ../data/preferences_dialog.ui.h:134
-#| msgid "Manual Search"
 msgid "Manual Search Server"
 msgstr "Server ručne pretrage"
 
@@ -1752,7 +1641,6 @@ msgid "Proxy"
 msgstr "Posrednik"
 
 #: ../data/preferences_dialog.ui.h:136
-#| msgid "Use a proxy"
 msgid "Use a proxy server"
 msgstr "Koristi posrednički server"
 
@@ -1772,7 +1660,6 @@ msgid "Port for a proxy to access remote CDDB"
 msgstr "Priključnik za posrednika za pristup udaljenoj baze podataka CD-a"
 
 #: ../data/preferences_dialog.ui.h:140
-#| msgid "User Name:"
 msgid "User:"
 msgstr "Korisnik:"
 
@@ -1782,7 +1669,6 @@ msgid "Username for a proxy to access remote CDDB"
 msgstr "Ime korisnika za posrednika za pristup udaljenoj baze podataka CD-a"
 
 #: ../data/preferences_dialog.ui.h:142
-#| msgid "User Password:"
 msgid "Password:"
 msgstr "Lozinka:"
 
@@ -1792,14 +1678,10 @@ msgid "Password for a proxy to access remote CDDB"
 msgstr "Lozinka za posrednika za pristup udaljenoj baze podataka CD-a"
 
 #: ../data/preferences_dialog.ui.h:144
-#| msgid "Results:"
 msgid "Results List"
 msgstr "Spisak rezultata"
 
 #: ../data/preferences_dialog.ui.h:145
-#| msgid ""
-#| "Select corresponding audio file (according position or DLM if activated "
-#| "below)"
 msgid ""
 "Select corresponding file (according to position or DLM if activated below)"
 msgstr ""
@@ -1816,9 +1698,6 @@ msgstr ""
 "rezultata baze podataka CD-a"
 
 #: ../data/preferences_dialog.ui.h:147
-#| msgid ""
-#| "Use the Levenshtein algorithm (DLM) to match lines (using title) with "
-#| "audio files (using filename)"
 msgid ""
 "Use the Levenshtein algorithm (DLM) to match results (using title) with "
 "audio files (using filename)"
@@ -1836,7 +1715,6 @@ msgstr "Potvrde"
 
 #: ../data/preferences_dialog.ui.h:151
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:118
-#| msgid "Confirm writing of playlist"
 msgid "Confirm before quitting the application"
 msgstr "Potvrdi zatvaranje programa"
 
@@ -1848,7 +1726,6 @@ msgstr "Da li da zatraži odobrenje od korisnika pre nego li zatvori program"
 
 #: ../data/preferences_dialog.ui.h:153
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:120
-#| msgid "Confirm writing of file tag"
 msgid "Confirm before writing tags"
 msgstr "Potvrdi upis oznake datoteke"
 
@@ -1863,7 +1740,6 @@ msgstr ""
 
 #: ../data/preferences_dialog.ui.h:155
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:122
-#| msgid "Confirm renaming of file"
 msgid "Confirm before renaming a file"
 msgstr "Potvrdi preimenovanje datoteke"
 
@@ -1874,7 +1750,6 @@ msgstr "Da li da zatraži odobrenje od korisnika pre nego li preimenuje datoteku
 
 #: ../data/preferences_dialog.ui.h:157
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:126
-#| msgid "Confirm deleting of file"
 msgid "Confirm before deleting a file"
 msgstr "Potvrdi brisanje datoteke"
 
@@ -1885,18 +1760,17 @@ msgstr "Da li da zatraži odobrenje od korisnika pre nego li obriše datoteku"
 
 #: ../data/preferences_dialog.ui.h:159
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:124
-#| msgid "Confirm writing of playlist"
 msgid "Confirm before writing a playlist"
 msgstr "Potvrdi zapisivanje spiska numera"
 
 #: ../data/preferences_dialog.ui.h:160
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:125
 msgid "Whether to ask for confirmation from the user before writing a playlist"
-msgstr "Da li da zatraži odobrenje od korisnika pre nego li zapiše spisak numera"
+msgstr ""
+"Da li da zatraži odobrenje od korisnika pre nego li zapiše spisak numera"
 
 #: ../data/preferences_dialog.ui.h:161
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:128
-#| msgid "Confirm renaming of file"
 msgid "Confirm before losing unsaved changes to files"
 msgstr "Potvrdi gubljenje nesačuvanih izmena u datotekama"
 
@@ -1910,18 +1784,15 @@ msgstr ""
 "dovela do gubitka nesačuvanih izmena u datotekama"
 
 #: ../data/preferences_dialog.ui.h:163
-#| msgid "Scanner Window"
 msgid "Scanner Dialog"
 msgstr "Prozorče pregledača"
 
 #: ../data/preferences_dialog.ui.h:164
-#| msgid "Open the Scanner Window on startup"
 msgid "Show the scanner dialog on startup"
 msgstr "Prikaži prozorče pregledača pri pokretanju programa"
 
 #: ../data/preferences_dialog.ui.h:165
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:202
-#| msgid "Open the Scanner Window on startup"
 msgid "Whether to show the scanner window on application startup"
 msgstr "Da li da prikaže prozorče pregledača pri pokretanju programa"
 
@@ -1930,9 +1801,6 @@ msgid "Application"
 msgstr "Program"
 
 #: ../data/scan_dialog.ui.h:1
-#| msgid ""
-#| "Select or type in a mask using codes (see Legend) to parse filename and "
-#| "path. Used to fill in tag fields"
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse filename and "
 "directory. Used to fill in tag fields"
@@ -1949,37 +1817,30 @@ msgid "Mask Editor"
 msgstr "Uređivač maski"
 
 #: ../data/scan_dialog.ui.h:4
-#| msgid "Create New Mask"
 msgid "Create a new mask"
 msgstr "Napravite novu masku"
 
 #: ../data/scan_dialog.ui.h:5
-#| msgid "Move up the selected line"
 msgid "Move the selected mask up"
 msgstr "Pomerite gore izabranu masku"
 
 #: ../data/scan_dialog.ui.h:6
-#| msgid "Move up the selected line"
 msgid "Move the selected mask down"
 msgstr "Pomerite dole izabranu masku"
 
 #: ../data/scan_dialog.ui.h:7
-#| msgid "Delete the selected line"
 msgid "Duplicate the selected mask"
 msgstr "Udvostručite izabranu masku"
 
 #: ../data/scan_dialog.ui.h:8
-#| msgid "Add Default Masks"
 msgid "Add default masks"
 msgstr "Dodajte osnovnu masku"
 
 #: ../data/scan_dialog.ui.h:9
-#| msgid "Move up the selected line"
 msgid "Remove the selected mask"
 msgstr "Uklonite izabranu masku"
 
 #: ../data/scan_dialog.ui.h:10
-#| msgid "Save Masks"
 msgid "Save masks"
 msgstr "Sačuvajte masku"
 
@@ -1994,7 +1855,6 @@ msgstr "%a: izvođač"
 
 #: ../data/scan_dialog.ui.h:15
 #, no-c-format
-#| msgid "%z: album artist"
 msgid "%a: album artist"
 msgstr "%a: izvođač albuma"
 
@@ -2045,7 +1905,6 @@ msgstr "%l: broj numera"
 
 #: ../data/scan_dialog.ui.h:35
 #, no-c-format
-#| msgid "%o: orig. artist"
 msgid "%o: original artist"
 msgstr "%o: originalni izvođač"
 
@@ -2079,16 +1938,10 @@ msgid "Fill Tag"
 msgstr "Popuni oznaku"
 
 #: ../data/scan_dialog.ui.h:47
-#| msgid "Prefix mask with current path"
 msgid "Prefix mask with current directory"
 msgstr "Maska prefiksa sa trenutnim direktorijumom"
 
 #: ../data/scan_dialog.ui.h:48
-#| 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."
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -2105,17 +1958,15 @@ msgid "Rename file preview"
 msgstr "Pregled preimenovanja datoteke"
 
 #. Only filename changed
-#: ../data/scan_dialog.ui.h:51 ../src/easytag.c:615
+#: ../data/scan_dialog.ui.h:51 ../src/easytag.c:574
 msgid "Rename File"
 msgstr "Preimenuj datoteku"
 
 #: ../data/scan_dialog.ui.h:52
-#| msgid "Fields"
 msgid "Tag Fields"
 msgstr "Polja oznake"
 
 #: ../data/scan_dialog.ui.h:54
-#| msgid "Process filename field"
 msgid "Process filename"
 msgstr "Obradite naziv datoteke"
 
@@ -2124,7 +1975,6 @@ msgid "Process title field"
 msgstr "Obradite polje naslova"
 
 #: ../data/scan_dialog.ui.h:58
-#| msgid "Process file artist field"
 msgid "Process artist field"
 msgstr "Obradite polje izvođača"
 
@@ -2145,7 +1995,6 @@ msgid "Process composer field"
 msgstr "Obradite polje kompozitora"
 
 #: ../data/scan_dialog.ui.h:68
-#| msgid "Orig. artist:"
 msgid "Orig. Artist"
 msgstr "Orig. izvođač"
 
@@ -2162,12 +2011,10 @@ msgid "Process URL field"
 msgstr "Obradite polje adrese"
 
 #: ../data/scan_dialog.ui.h:75
-#| msgid "Process encoder name field"
 msgid "Process encoded-by field"
 msgstr "Obradite polje naziva enkodera"
 
 #: ../data/scan_dialog.ui.h:76
-#| msgid "Capitalize all"
 msgid "Capitalization"
 msgstr "Velika slova"
 
@@ -2206,8 +2053,6 @@ msgid "Capitalize the first letter of each word"
 msgstr "Prvo slovo svake reči veliko"
 
 #: ../data/scan_dialog.ui.h:84 ../data/org.gnome.EasyTAG.gschema.xml.h:148
-#| msgid ""
-#| "Don't uppercase first letter of words for some prepositions and articles."
 msgid ""
 "Whether to upper-case the first letter of each word when processing tag "
 "fields"
@@ -2236,7 +2081,7 @@ msgid "Spaces Conversions"
 msgstr "Pretvaranja razmaka"
 
 #: ../data/scan_dialog.ui.h:89 ../data/org.gnome.EasyTAG.gschema.xml.h:153
-#: ../src/tag_area.c:875
+#: ../src/tag_area.c:876
 msgid "Remove spaces"
 msgstr "Ukloni razmake"
 
@@ -2258,7 +2103,6 @@ msgid "Remove duplicate spaces and underscores"
 msgstr "Ukloni duple razmake i donje crtice"
 
 #: ../data/scan_dialog.ui.h:94 ../data/org.gnome.EasyTAG.gschema.xml.h:158
-#| msgid "Remove duplicate spaces and underscores"
 msgid ""
 "Whether to remove duplicate spaces and underscores when processing tag fields"
 msgstr "Da li da ukloni duple razmake i donje crtice kada obrađuje polja oznake"
@@ -2268,51 +2112,41 @@ msgid "Do not change word separators"
 msgstr "Ne menjaj razdvajače reči"
 
 #: ../data/scan_dialog.ui.h:96
-#| msgid "Fill Tag Scanner - Character Conversion"
 msgid "Character Conversions"
 msgstr "Pretvaranja znakova"
 
-#: ../data/scan_dialog.ui.h:98 ../src/tag_area.c:831
+#: ../data/scan_dialog.ui.h:98 ../src/tag_area.c:832
 #, no-c-format
-#| msgid "Convert '_' and '%20' to spaces"
 msgid "Convert ‘_’ and ‘%20’ to spaces"
 msgstr "Prevedi „_“ i „%20“ u razmake"
 
 #: ../data/scan_dialog.ui.h:100
 #, no-c-format
-#| msgid ""
-#| "The underscore character or the string '%20' are replaced by one space. "
-#| "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
 msgid ""
 "The underscore character or the string ‘%20’ is replaced by one space. "
 "Example, before: ‘Text%20In%20An_Entry‘, after: ‘Text In An Entry’"
 msgstr ""
-"Donje crtice ili niska „%20“ između reči će biti zamenjeni razmakom. Na primer:"
-" „Tekst%20u%20nekom_polju“ će postati „Tekst u nekom polju“."
+"Donje crtice ili niska „%20“ između reči će biti zamenjeni razmakom. Na "
+"primer: „Tekst%20u%20nekom_polju“ će postati „Tekst u nekom polju“."
 
-#: ../data/scan_dialog.ui.h:101 ../src/tag_area.c:837
-#| msgid "Convert ' ' to '_'"
-msgid "Convert ‘ ’ to ‘_’"
-msgstr "Prevedi „ “ u „_“"
+#: ../data/scan_dialog.ui.h:101 ../src/tag_area.c:838
+#| msgid "Convert spaces and ‘%20’ to underscores"
+msgid "Convert spaces to underscores"
+msgstr "Prevedi razmake u donje crtice"
 
 #: ../data/scan_dialog.ui.h:102
-#| msgid ""
-#| "The space character is replaced by one underscore character. Example, "
-#| "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: ‘Text In An Entry’, after: ‘Text_In_An_Entry’"
 msgstr ""
-"Razmak između reči biće zamenjen donjom crticom. Na primer „Tekst u nekom polju“"
-" će postati „Tekst_u_nekom_polju“."
+"Razmak između reči biće zamenjen donjom crticom. Na primer „Tekst u nekom "
+"polju“ će postati „Tekst_u_nekom_polju“."
 
 #: ../data/scan_dialog.ui.h:103
 msgid "Convert:"
 msgstr "Pretvori:"
 
 #: ../data/scan_dialog.ui.h:104
-#| msgid ""
-#| "Replace a string by another one. Note that the search is case sensitive."
 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 "
@@ -2343,8 +2177,6 @@ msgid "Search:"
 msgstr "Potraži:"
 
 #: ../data/search_dialog.ui.h:2
-#| msgid ""
-#| "Type the word to search into files. Or type nothing to display all files."
 msgid ""
 "Type the text to search for in the file list, or leave the field empty to "
 "display all files"
@@ -2353,7 +2185,6 @@ msgstr ""
 "prikažete sve datoteke."
 
 #: ../data/search_dialog.ui.h:3
-#| msgid "_Find…"
 msgid "_Find"
 msgstr "_Pronađi"
 
@@ -2383,7 +2214,7 @@ msgstr "CD"
 msgid "Image Type"
 msgstr "Vrsta slike"
 
-#: ../data/tag_area.ui.h:2 ../src/picture.c:289
+#: ../data/tag_area.ui.h:2 ../src/picture.c:272
 msgid "Description"
 msgstr "Opis"
 
@@ -2391,7 +2222,7 @@ msgstr "Opis"
 msgid "_Accept"
 msgstr "_Prihvati"
 
-#: ../data/tag_area.ui.h:5 ../src/tag_area.c:3029
+#: ../data/tag_area.ui.h:5 ../src/tag_area.c:3019
 msgid "Tag"
 msgstr "Oznaka"
 
@@ -2444,8 +2275,6 @@ msgid "Tag selected files with this year"
 msgstr "Označite izabrane datoteke ovom godinom"
 
 #: ../data/tag_area.ui.h:18
-#| msgid ""
-#| "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory"
 msgstr ""
 "Broj dosledno izabranih numera. Počinje od 01 u svakom pod-direktorijumu."
@@ -2455,9 +2284,6 @@ msgid "Track #:"
 msgstr "Numera #:"
 
 #: ../data/tag_area.ui.h:20
-#| msgid ""
-#| "Set the number of files, in the same directory of the displayed file, to "
-#| "the selected tracks."
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks"
@@ -2549,7 +2375,7 @@ msgstr "Uredite svojstva slike"
 msgid "Tag selected files with these images"
 msgstr "Označite izabrane datoteke ovim slikama"
 
-#: ../data/tag_area.ui.h:42 ../src/tag_area.c:3282 ../src/tag_area.c:3285
+#: ../data/tag_area.ui.h:42 ../src/tag_area.c:3272 ../src/tag_area.c:3275
 msgid "Images"
 msgstr "Slike"
 
@@ -2590,8 +2416,6 @@ msgid "_Undo"
 msgstr "Po_ništi"
 
 #: ../data/toolbar.ui.h:14
-#| msgid "Found one file"
-#| msgid_plural "Found %d files"
 msgid "Undo for file"
 msgstr "Poništite poslednje izmene datoteka"
 
@@ -2600,7 +2424,6 @@ msgid "R_edo"
 msgstr "Po_vrati"
 
 #: ../data/toolbar.ui.h:16
-#| msgid "Read-only file"
 msgid "Redo for file"
 msgstr "Povratite poslednje izmene datoteka"
 
@@ -2609,12 +2432,10 @@ msgid "Save changes to selected files"
 msgstr "Sačuvajte izmene u izabranim datotekama"
 
 #: ../data/toolbar.ui.h:20
-#| msgid "Collapse directory tree"
 msgid "Browse directory tree"
 msgstr "Razgledajte stablo direktorijuma"
 
 #: ../data/toolbar.ui.h:22
-#| msgid "View by artist and album"
 msgid "Browse artists and albums"
 msgstr "Razgledajte izvođače i albume"
 
@@ -2627,11 +2448,10 @@ msgid "Search filenames and tags"
 msgstr "Potražite nazive datoteka i oznake"
 
 #: ../data/toolbar.ui.h:27
-#| msgid "CDD_B Search…"
 msgid "CDDB Search…"
 msgstr "Pretraži baze podataka CD-a…"
 
-#: ../data/toolbar.ui.h:28 ../src/cddb_dialog.c:2694
+#: ../data/toolbar.ui.h:28 ../src/cddb_dialog.c:2746
 msgid "CDDB Search"
 msgstr "CDBP pretraga"
 
@@ -2644,87 +2464,71 @@ msgid "Stop the current action"
 msgstr "Zaustavite trenutnu radnju"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:1
-#| msgid "Ready to start"
 msgid "Load on startup"
 msgstr "Učitajte pri pokretanju"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:3
-#| msgid "Add Default Masks"
 msgid "Default path"
 msgstr "Osnovna putanja"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:7
-#| msgid "Show hidden directories"
 msgid "Show hidden directories while browsing"
 msgstr "Prikažite skrivene direktorijume prilikom razgledanja"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:11
-#| msgid "Server Settings for Automatic Search"
 msgid "CDDB server hostname for automatic search"
 msgstr "Naziv domaćina servera baze podataka CD-a za samostalnu pretragu"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:12
-#| msgid "Server Settings for Automatic Search"
 msgid "The CDDB server to use for the automatic search"
 msgstr "Server baze podataka CD-a koji će se koristiti za samostalnu pretragu"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:13
-#| msgid "Server Settings for Automatic Search"
 msgid "CDDB server port for automatic search"
 msgstr "Priključnik servera baze podataka CD-a za samostalnu pretragu"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:14
-#| msgid "Server Settings for Automatic Search"
 msgid "The CDDB server port to use for the automatic search"
 msgstr ""
 "Priključnik servera baze podataka CD-a koji će se koristiti za samostalnu "
 "pretragu"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:15
-#| msgid "Server Settings for Automatic Search"
 msgid "CDDB server path for automatic search"
 msgstr "Putanja servera baze podataka CD-a za samostalnu pretragu"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:16
-#| msgid "Server Settings for Automatic Search"
 msgid "The CDDB server path to use for the automatic search"
 msgstr ""
 "Putanja servera baze podataka CD-a koji će se koristiti za samostalnu pretragu"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:17
-#| msgid "Server Settings for Manual Search"
 msgid "CDDB server hostname for manual search"
 msgstr "Naziv domaćina servera baze podataka CD-a za ručnu pretragu"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:18
-#| msgid "Server Settings for Manual Search"
 msgid "The CDDB server to use for a manual search"
 msgstr "Server baze podataka CD-a koji će se koristiti za ručnu pretragu"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:19
-#| msgid "Server Settings for Manual Search"
 msgid "CDDB server port for manual search"
 msgstr "Priključnik servera baze podataka CD-a za ručnu pretragu"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:20
-#| msgid "Server Settings for Manual Search"
 msgid "The CDDB server port to use for a manual search"
 msgstr ""
 "Priključnik servera baze podataka CD-a koji će se koristiti za ručnu pretragu"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:21
-#| msgid "Server Settings for Manual Search"
 msgid "CDDB server path for manual search"
 msgstr "Putanja servera baze podataka CD-a za ručnu pretragu"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:22
-#| msgid "Server Settings for Manual Search"
 msgid "The CDDB server path to use for a manual search"
 msgstr ""
 "Putanja servera baze podataka CD-a koji će se koristiti za ručnu pretragu"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:23
-#| msgid "Error while writing CDDB results to file '%s'"
 msgid "Use DLM to match CDDB results to files"
 msgstr "Koristi DLM za upoređivanje rezultata baze podataka CD-a sa datotekama"
 
@@ -2733,8 +2537,8 @@ msgid ""
 "Select the file with the position which matches the position of the CDDB "
 "result"
 msgstr ""
-"Bira datoteku sa položajem koji odgovara položaju rezultata baze podataka "
-"CD-a"
+"Bira datoteku sa položajem koji odgovara položaju rezultata baze podataka CD-"
+"a"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:27
 msgid "Enable proxy for remote CDDB"
@@ -2766,7 +2570,8 @@ msgstr "Polja za korišćenje pri ručnoj pretrazi baze podataka CD-a"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:40
 msgid "Which fields to search for matches of the returned CDDB results"
-msgstr "U kojim poljima da traži poklapanja vraćenih rezultata baze podataka CD-a"
+msgstr ""
+"U kojim poljima da traži poklapanja vraćenih rezultata baze podataka CD-a"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:41
 msgid "The categories to use in a CDDB search"
@@ -2790,7 +2595,6 @@ msgstr ""
 "i rezultata baze podataka CD-a"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:51
-#| msgid "Display changed files in list using:"
 msgid "Show changed files in bold"
 msgstr "Prikazuje izmenjene datoteke podebljanim"
 
@@ -2811,27 +2615,22 @@ msgid "Sort files in ascending or descending order for the selected type"
 msgstr "Poređaće datoteke rastućim ili opadajućim redom za izabranu vrstu"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:57
-#| msgid "Max number of lines:"
 msgid "Number of log lines"
 msgstr "Broj redova dnevnika"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:61
-#| msgid "Character Set for reading ID3 tags"
 msgid "Use a non-standard character encoding when reading ID3 tags"
 msgstr "Koristiće ne-standardno kodiranje znakova kada čita ID3 oznake"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:65
-#| msgid "Write ID3v1.x tag"
 msgid "Write ID3v1 tags"
 msgstr "Upiši ID3v1 oznaku"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:67
-#| msgid "Character Set for writing ID3 tags"
 msgid "The character set for writing ID3v1 tags"
 msgstr "Skup znakova za upis ID3v1 oznaka"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:68
-#| msgid "Character Set for writing ID3 tags"
 msgid "Choose the character set to be used when writing ID3v1 tags"
 msgstr "Izaberite skup znakova za upis ID3v1 oznaka"
 
@@ -2848,12 +2647,10 @@ msgstr ""
 "kodiranja kada se zapisuju ID3v1 oznake"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:71
-#| msgid "Character Set for reading ID3 tags"
 msgid "The character set for reading ID3v1 and ID3v2 tags"
 msgstr "Skup znakova za čitanje ID3v1 i ID3v2 oznaka"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:73
-#| msgid "Write ID3v2 tag"
 msgid "Write ID3v2 tags"
 msgstr "Upiši ID3v2 oznake"
 
@@ -2866,38 +2663,31 @@ msgid "Whether to write ID3v2.4 tags when ID3v2 support is enabled"
 msgstr "Da li da zapisuje ID3v2.4 oznake kada je uključena ID3v2 podrška"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:77
-#| msgid "Automatically convert old ID3v2 tag versions"
 msgid "Convert old ID3 tag versions to new ones"
 msgstr "Pretvori stara izdanja ID3 onake u nove"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:81
-#| msgid "Set CRC32 in the ID3v2 tags"
 msgid "Use CRC-32 in ID3v2 tags"
 msgstr "Koristi CRC-32 u ID3v2 oznakama"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:85
-#| msgid "Try another character encoding"
 msgid "Use Unicode character encoding in ID3v2 tags"
 msgstr "Koristi kodiranje znakova Unikoda u ID3v2 oznakama"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:86
-#| msgid "Character Set for writing ID3 tags"
 msgid "Whether to use a Unicode character set when writing ID3v2 tags"
 msgstr "Da li da koristi skup znakova Unikoda kada zapisuje ID3v2 oznake"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:87
-#| msgid "Character Set for writing ID3 tags"
 msgid "The Unicode character set for writing ID3v2 tags"
 msgstr "Skup znakova Unikoda za upis ID3v2 oznaka"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:88
-#| msgid "Character Set for writing ID3 tags"
 msgid "Choose the Unicode character set to be used when writing ID3v2 tags"
 msgstr ""
 "Izaberite skup znakova Unikoda za korišćenje prilikom pisanja ID3v2 oznaka"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:89
-#| msgid "Character Set for writing ID3 tags"
 msgid "The character set for writing ID3v2 tags"
 msgstr "Skup znakova za upis ID3v2 oznaka"
 
@@ -2980,7 +2770,6 @@ msgid "Overwrite tag field"
 msgstr "Prepiši polje oznake"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:112
-#| msgid "Set this text as default comment:"
 msgid "Set the default comment"
 msgstr "Postavi osnovnu napomenu"
 
@@ -2993,17 +2782,14 @@ msgid "The default comment to use when filling tags"
 msgstr "Osnovna napomena za korišćenje prilikom ispunjavanja oznaka"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:116
-#| msgid "Set this text as default comment:"
 msgid "Use the CRC-32 as the default comment"
 msgstr "Koristi CRC-32 kao osnovnu napomenu"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:130
-#| msgid "Run the current scanner for each file"
 msgid "Run the current scanner when loading filenames from a file"
 msgstr "Pokreće tekući pregledač kada učitava nazive datoteka iz datoteke"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:132
-#| msgid "Process title field"
 msgid "Process these tag fields"
 msgstr "Obradi ova polja oznake"
 
@@ -3012,7 +2798,6 @@ msgid "The tag fields to process when using the scanner"
 msgstr "Polja oznake za obradu kada se koristi pregledač"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:134
-#| msgid "Overwrite fields when scanning tags"
 msgid "Convert tag fields when processing"
 msgstr "Pretvori polja oznake pri obradi"
 
@@ -3026,7 +2811,6 @@ msgstr ""
 "obrade polja oznake"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:137
-#| msgid "Try another character encoding"
 msgid "Convert characters in tags"
 msgstr "Pretvori znakove u oznakama"
 
@@ -3050,7 +2834,6 @@ msgstr ""
 "Zameni svaki upoređeni niz znakova ovom niskom prilikom obrade polja oznake"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:141
-#| msgid "Lowercase all"
 msgid "Lower-case all characters"
 msgstr "Sva slova mala"
 
@@ -3059,12 +2842,10 @@ msgid "Upper-case all characters"
 msgstr "Sva slova velika"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:145
-#| msgid "Capitalize the first letter of each word"
 msgid "Upper-case the first letter of the tag"
 msgstr "Prvo slovo oznake veliko"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:147
-#| msgid "Capitalize the first letter of each word"
 msgid "Upper-case the first letter of each word"
 msgstr "Prvo slovo svake reči veliko"
 
@@ -3073,22 +2854,18 @@ msgid "Upper-case prepositions"
 msgstr "Predlozi velikim slovima"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:151
-#| msgid "Detect Roman numerals"
 msgid "Detect roman numerals"
 msgstr "Otkrij rimske brojeve"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:155
-#| msgid "Insert space before uppercase letter"
 msgid "Insert spaces before capital letters"
 msgstr "Ubaci razmake pre velikih slova"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:157
-#| msgid "Remove duplicate spaces or underscores"
 msgid "Remove duplicate spaces"
 msgstr "Ukloni duple razmake"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:159
-#| msgid "Playlist File Error"
 msgid "Playlist filename mask"
 msgstr "Maska naziva datoteke spiska numera"
 
@@ -3106,33 +2883,27 @@ msgstr ""
 "Da li da koristi masku naziva datoteke prilikom stavranja spiskova numera"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:163
-#| msgid "Create playlist in the parent directory"
 msgid "Create playlists with only the selected files"
 msgstr "Napravite spiskove numera samo sa izabranim datotekama"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:165
-#| msgid "Use relative path for files in playlist"
 msgid "Use relative paths when creating playlists"
 msgstr "Koristi relativne putanje prilikom stvaranja spiskova numera"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:166
-#| msgid "Use relative path for files in playlist"
 msgid "Whether to use relative paths for files when creating playlists"
 msgstr ""
 "Da li da koristi relativne putanje za datoteke kada pravi spiskove numera"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:167
-#| msgid "Create playlist in the parent directory"
 msgid "Create the playlist in the parent directory"
 msgstr "Napravite spisak numera u roditeljskom direktorijumu"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:169
-#| msgid "Use full path for files in playlist"
 msgid "Use DOS separators for playlists"
 msgstr "Koristi DOS razdvojnike za spiskove numera"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:171
-#| msgid "Generate a playlist"
 msgid "Content of generated playlists"
 msgstr "Sadržaj stvorenih spiskova numera"
 
@@ -3149,7 +2920,6 @@ msgid "Playlist default mask"
 msgstr "Osnovna maska spiska numera"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:174
-#| msgid "Use full path for files in playlist"
 msgid "The default mask to use for files in a playlist"
 msgstr "Osnovna maska za korišćenje za datoteke u spisku numera"
 
@@ -3162,7 +2932,6 @@ msgid "Whether matches when searching for files are case-sensitive"
 msgstr "Da li poređenja prilikom traženja datoteka razlikuju veličinu slova"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:177
-#| msgid "Search filenames and tags"
 msgid "Search in filenames"
 msgstr "Potraži u nazivima datoteka"
 
@@ -3171,7 +2940,6 @@ msgid "Perform the search on filenames"
 msgstr "Obavi pretragu nad nazivima datoteka"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:179
-#| msgid "Searching"
 msgid "Search in tags"
 msgstr "Traži u oznakama"
 
@@ -3180,7 +2948,6 @@ msgid "Perform the search on tags"
 msgstr "Obavi pretragu nad oznakama"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:181
-#| msgid "Error reading tags from file: '%s'"
 msgid "Mask for filling tags from filenames"
 msgstr "Maska za ispunjavanje oznaka iz naziva datoteka"
 
@@ -3193,17 +2960,14 @@ msgstr ""
 "datoteka"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:183
-#| msgid "Confirm renaming of file"
 msgid "Mask for renaming files"
 msgstr "Maska za preimenovanje datoteka"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:184
-#| msgid "Repeat action for the remaining files"
 msgid "The default mask to use when renaming files"
 msgstr "Osnovna maska za korišćenje prilikom preimenovanja datoteka"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:185
-#| msgid "Unable to create setting directories"
 msgid "Mask for renaming directories"
 msgstr "Maska za preimenovanje direktorijuma"
 
@@ -3212,12 +2976,10 @@ msgid "The default mask to use when renaming directories"
 msgstr "Osnovna maska za korišćenje prilikom preimenovanja direktorijuma"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:187
-#| msgid "Unable to create setting directories"
 msgid "Use a mask when renaming directories"
 msgstr "Koristi masku prilikom preimenovanja direktorijuma"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:189
-#| msgid "Convert space ' ' to underscore '_'"
 msgid "Convert spaces and underscores when renaming files"
 msgstr "Pretvori razmake i podvlake prilikom preimenovanja polja"
 
@@ -3250,7 +3012,6 @@ msgstr ""
 "neispravne znake"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:196
-#| msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
 msgid ""
 "Whether to replace illegal characters in a filename when using the rename "
 "function"
@@ -3259,7 +3020,6 @@ msgstr ""
 "preimenovanja"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:197
-#| msgid "Show / Hide Masks Editor"
 msgid "Show the scanner mask editor"
 msgstr "Prikazuje uređivač maske pregledača"
 
@@ -3268,17 +3028,14 @@ msgid "Whether to show the scanner mask editor in the tag scanner"
 msgstr "Da li da prikaže uređivača maske pregledača u pregledaču oznake"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:199
-#| msgid "Show scanner"
 msgid "Show the scanner legend"
 msgstr "Prikazuje legendu pregledača"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:200
-#| msgid "Whether to pad the disc field with leading zeroes"
 msgid "Whether to show the scanner legend in the tag scanner"
 msgstr "Da li da prikaže legendu pregledača u pregledaču oznake"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:201
-#| msgid "Open the Scanner Window on startup"
 msgid "Show the scanner window on startup"
 msgstr "Prikaži prozor pregledača pri pokretanju programa"
 
@@ -3307,17 +3064,14 @@ msgid "Split Ogg genre fields"
 msgstr "Podeli polja Ogg žanra"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:213
-#| msgid "Process comment field"
 msgid "Split Ogg comment fields"
 msgstr "Podeli polja Ogg napomene"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:215
-#| msgid "Process composer field"
 msgid "Split Ogg composer fields"
 msgstr "Podeli polja Ogg kompozitora"
 
 #: ../data/org.gnome.EasyTAG.gschema.xml.h:217
-#| msgid "Process original artist field"
 msgid "Split Ogg original artist fields"
 msgstr "Podeli polja Ogg originalnog izvođača"
 
@@ -3334,21 +3088,15 @@ msgid "Open in EasyTAG"
 msgstr "Otvori u Lakoj oznaci"
 
 #: ../nautilus-extension/nautilus-easytag.c:230
-#| msgid "Save the selected images to files"
 msgid "Open the selected directory in EasyTAG"
 msgstr "Otvorite izabrani direktorijum u Lakoj oznaci"
 
-#: ../nautilus-extension/nautilus-easytag.c:247
-msgid "Open with EasyTAG"
-msgstr "Otvori Lakom oznakom"
-
 #: ../nautilus-extension/nautilus-easytag.c:248
-#| msgid "Include only the selected files"
 msgid "Open the selected files in EasyTAG"
 msgstr "Otvorite izabrane datoteke u Lakoj oznaci"
 
 #. Translators: put your own name here to appear in the about dialog.
-#: ../src/about.c:90
+#: ../src/about.c:89
 msgid "translator-credits"
 msgstr ""
 "  Miloš Popović <gpopac at gmail.com>\n"
@@ -3356,7 +3104,7 @@ msgstr ""
 "\n"
 "http://prevod.org — prevod na srpski jezik"
 
-#: ../src/about.c:100
+#: ../src/about.c:99
 msgid "View and edit tags in audio files"
 msgstr "Pregledajte i uređujte oznake u zvučnim datotekama"
 
@@ -3365,202 +3113,203 @@ msgid "Print the version and exit"
 msgstr "Prikazuje izdanje i izlazi"
 
 #. Starting messages
-#: ../src/application.c:177
+#: ../src/application.c:176
 #, c-format
-msgid "Starting EasyTAG version %s (PID: %d)…"
-msgstr "Pokrećem Laku oznaku %s (PIB: %d)…"
+#| msgid "Starting EasyTAG version %s (PID: %d)…"
+msgid "Starting EasyTAG version %s…"
+msgstr "Pokrećem Laku oznaku izdanja %s…"
 
-#: ../src/application.c:183
+#: ../src/application.c:181
 #, c-format
-#| msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
 msgid "Variable EASYTAGLANG defined, setting locale ‘%s’"
 msgstr "Promenljiva „EASYTAGLANG“ je određena, postavljam jezik „%s“"
 
-#: ../src/application.c:188
+#: ../src/application.c:186
 #, c-format
-#| msgid "Setting locale: '%s'"
 msgid "Setting locale: ‘%s’"
 msgstr "Postavljam jezik: „%s“"
 
-#: ../src/application.c:194
+#: ../src/application.c:192
 #, c-format
 msgid "System locale is ‘%s’, using ‘%s’"
 msgstr "Sistemski jezik je „%s“, koristim „%s“"
 
-#: ../src/application.c:199
+#: ../src/application.c:197
 msgid "Unable to create setting directories"
 msgstr "Ne mogu da napravim direktorijume podešavanja"
 
-#: ../src/application.c:340
+#: ../src/application.c:338
 #, c-format
 msgid "Website: %s"
 msgstr "Veb sajt: %s"
 
-#: ../src/application.c:349
+#: ../src/application.c:347
 msgid "- Tag and rename audio files"
 msgstr "— Uređujte oznake i preimenujte zvučne datoteke"
 
-#: ../src/application.c:433 ../src/et_core.c:672
+#: ../src/application.c:431 ../src/et_core.c:641
 #, c-format
-#| msgid "Error while querying information for file: '%s' (%s)"
 msgid "Error while querying information for file ‘%s’: %s"
 msgstr "Greška prilikom propitivanja podataka za datoteku „%s“: %s"
 
-#: ../src/application.c:497
+#: ../src/application.c:495
 #, c-format
-#| msgid "Cannot open path '%s'"
 msgid "Cannot open path ‘%s’"
 msgstr "Ne mogu da otvorim putanju „%s“"
 
-#: ../src/application_window.c:316 ../src/application_window.c:333
+#: ../src/application_window.c:317 ../src/application_window.c:334
 #, c-format
-#| msgid "Do you really want to delete the file '%s'?"
 msgid "Do you really want to delete the file ‘%s’?"
 msgstr "Da li zaista želite da obrišete datoteku „%s“?"
 
-#: ../src/application_window.c:319 ../src/easytag.c:511 ../src/easytag.c:636
+#: ../src/application_window.c:320 ../src/easytag.c:462 ../src/easytag.c:595
 msgid "Repeat action for the remaining files"
 msgstr "Ponovi radnju za preostale datoteke"
 
-#: ../src/application_window.c:321
+#: ../src/application_window.c:322
 msgid "_Skip"
 msgstr "_Preskoči"
 
-#: ../src/application_window.c:323 ../src/application_window.c:337
-#| msgid "Delete File"
+#: ../src/application_window.c:324 ../src/application_window.c:338
 msgid "_Delete"
 msgstr "_Obriši"
 
-#: ../src/application_window.c:325 ../src/application_window.c:335
+#: ../src/application_window.c:326 ../src/application_window.c:336
 msgid "Delete File"
 msgstr "Ukloni datoteku"
 
-#: ../src/application_window.c:362
+#: ../src/application_window.c:363
 #, c-format
-#| msgid "File '%s' deleted"
 msgid "File ‘%s’ deleted"
 msgstr "Datoteka „%s“ je obrisana"
 
-#: ../src/application_window.c:539
+#: ../src/application_window.c:540
 #, c-format
-#| msgid "Cannot delete file (%s)"
 msgid "Cannot delete file ‘%s’"
 msgstr "Ne mogu da obrišem datoteku „%s“"
 
-#: ../src/application_window.c:560
-#| msgid "All files have been deleted"
+#: ../src/application_window.c:561
 msgid "Some files were not deleted"
 msgstr "Neke datoteke nisu obrisane"
 
-#: ../src/application_window.c:562
+#: ../src/application_window.c:563
 msgid "All files have been deleted"
 msgstr "Sve datoteke su uklonjene"
 
-#: ../src/application_window.c:901
+#: ../src/application_window.c:902
 msgid "All tags have been removed"
 msgstr "Sve oznake su uklonjene"
 
+#: ../src/application_window.c:1506 ../src/browser.c:355 ../src/browser.c:398
+#: ../src/browser.c:432 ../src/browser.c:4716 ../src/browser.c:4791
+#, c-format
+msgid "Failed to launch program ‘%s’"
+msgstr "Nisam uspeo da pokrenem program „%s“"
+
 #. Quit EasyTAG.
-#: ../src/application_window.c:2573
-#| msgid "EasyTAG: Normal exit."
+#: ../src/application_window.c:2646
 msgid "Normal exit"
 msgstr "Uobičajeni izlaz"
 
-#: ../src/application_window.c:2610 ../src/browser.c:843
+#: ../src/application_window.c:2683 ../src/browser.c:858
 msgid "Some files have been modified but not saved"
 msgstr "Neke datoteke su izmenjene ali nisu sačuvane"
 
-#: ../src/application_window.c:2611 ../src/browser.c:847 ../src/easytag.c:294
-#: ../src/easytag.c:515 ../src/easytag.c:639 ../src/easytag.c:647
-#| msgid "Disc"
+#: ../src/application_window.c:2684 ../src/browser.c:862 ../src/easytag.c:247
+#: ../src/easytag.c:466 ../src/easytag.c:598 ../src/easytag.c:606
 msgid "_Discard"
 msgstr "_Odbaci"
 
-#: ../src/application_window.c:2613 ../src/browser.c:849 ../src/easytag.c:295
-#: ../src/easytag.c:517 ../src/easytag.c:524 ../src/easytag.c:641
-#: ../src/easytag.c:648 ../src/playlist_dialog.c:656 ../src/tag_area.c:1853
-#| msgid "_Save Files"
+#: ../src/application_window.c:2686 ../src/browser.c:864 ../src/easytag.c:248
+#: ../src/easytag.c:468 ../src/easytag.c:475 ../src/easytag.c:600
+#: ../src/easytag.c:607 ../src/playlist_dialog.c:659 ../src/tag_area.c:1842
 msgid "_Save"
 msgstr "_Sačuvaj"
 
-#: ../src/application_window.c:2617 ../src/application_window.c:2655
-#: ../src/easytag.c:300
+#: ../src/application_window.c:2690 ../src/application_window.c:2728
+#: ../src/easytag.c:253
 msgid "Quit"
 msgstr "Zatvaranje programa"
 
-#: ../src/application_window.c:2620
+#: ../src/application_window.c:2693
 msgid "Do you want to save them before quitting?"
 msgstr "Da li želite da ih sačuvate pre zatvaranja?"
 
-#: ../src/application_window.c:2649
+#: ../src/application_window.c:2722
 msgid "Do you really want to quit?"
 msgstr "Da li zaista želite da izađete iz programa?"
 
-#: ../src/browser.c:553
-#| msgid "Select a directory to browse"
+#: ../src/browser.c:568
 msgid "New default directory selected for browser"
 msgstr "Izabran je novi osnovni direktorijum za preglednika"
 
-#: ../src/browser.c:846
-#| msgid "Do you want to save them before changing the directory?"
+#: ../src/browser.c:861
 msgid "Do you want to save them before changing directory?"
 msgstr "Da li želite da ih sačuvate pre nego što promenite direktorijum?"
 
-#: ../src/browser.c:853
+#: ../src/browser.c:868
 msgid "Confirm Directory Change"
 msgstr "Potvrdite promenu direktorijuma"
 
-#: ../src/browser.c:2533
-msgid "<All albums>"
-msgstr "<Svi albumi>"
+#: ../src/browser.c:2562
+#| msgid "<All albums>"
+msgid "All albums"
+msgstr "Svi albumi"
+
+#: ../src/browser.c:3815
+msgid "Select File"
+msgstr "Izaberite datoteku"
+
+#: ../src/browser.c:3822
+msgid "Select Directory"
+msgstr "Izaberite direktorijum"
 
-#: ../src/browser.c:4157
+#: ../src/browser.c:4205
 #, c-format
-#| msgid "Rename the directory '%s' to:"
 msgid "Rename the directory ‘%s’ to:"
 msgstr "Preimenuj direktorijum „%s“ u:"
 
-#: ../src/browser.c:4297
+#: ../src/browser.c:4345
 msgid "You must type a directory name"
 msgstr "Morate da unesete naziv direktorijuma"
 
-#: ../src/browser.c:4298 ../src/browser.c:4320
+#: ../src/browser.c:4346 ../src/browser.c:4368
 msgid "Directory Name Error"
 msgstr "Greška naziva direktorijuma"
 
-#: ../src/browser.c:4316
+#: ../src/browser.c:4364
 #, c-format
-#| msgid "Could not convert '%s' into filename encoding."
 msgid "Could not convert ‘%s’ into filename encoding"
 msgstr "Ne mogu da pretvorim „%s“ u kodiranje naziva datoteke"
 
-#: ../src/browser.c:4319
-#| msgid "Please use another name"
+#: ../src/browser.c:4367
 msgid "Please use another name."
 msgstr "Koristite drugi naziv."
 
-#: ../src/browser.c:4390
+#: ../src/browser.c:4439
 #, c-format
-#| msgid "The directory name '%s' already exists"
 msgid "The directory name ‘%s’ already exists."
 msgstr "Naziv direktorijuma „%s“ već postoji."
 
-#: ../src/browser.c:4391 ../src/easytag.c:696
+#: ../src/browser.c:4440 ../src/easytag.c:655
 msgid "Rename File Error"
 msgstr "Greška preimenovanja datoteke"
 
-#: ../src/browser.c:4429 ../src/browser.c:4458
+#: ../src/browser.c:4478 ../src/browser.c:4507
 msgid "Rename Directory Error"
 msgstr "Greška preimenovanja direktorijuma"
 
-#: ../src/browser.c:4497
+#: ../src/browser.c:4546
 msgid "Directory renamed"
 msgstr "Direktorijum je preimenovan"
 
-#: ../src/cddb_dialog.c:271
+#: ../src/browser.c:4708 ../src/browser.c:4783
+#, c-format
+msgid "Executed command ‘%s’"
+msgstr "Izvršena naredba „%s“"
+
+#: ../src/cddb_dialog.c:270
 #, c-format
-#| msgid ""
-#| "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
 msgid ""
 "Album: ‘%s’, artist: ‘%s’, length: ‘%s’, year: ‘%s’, genre: ‘%s’, disc ID: "
 "‘%s’"
@@ -3568,90 +3317,75 @@ msgstr ""
 "Album: „%s“, izvođač: „%s“, dužina numere: „%s“, godina: „%s“, žanr: „%s“, "
 "ID diska: „%s“"
 
-#: ../src/cddb_dialog.c:589
+#: ../src/cddb_dialog.c:586
 #, c-format
 msgid "Resolving host '%s'…"
 msgstr "Pristupam serveru „%s“…"
 
-#: ../src/cddb_dialog.c:631
+#: ../src/cddb_dialog.c:628
 #, c-format
-#| msgid "Cannot create a new socket (%s)"
 msgid "Cannot create a new socket ‘%s’"
 msgstr "Ne mogu da napravim novu utičnicu „%s“"
 
-#: ../src/cddb_dialog.c:645
+#: ../src/cddb_dialog.c:642
 msgid "Cannot set options on the newly-created socket"
 msgstr "Ne mogu da podesim opcije na novostvorenoj utičnici"
 
 #. Open connection to the server.
-#: ../src/cddb_dialog.c:649
+#: ../src/cddb_dialog.c:646
 #, c-format
-#| msgid "Connecting to host '%s', port '%d'…"
 msgid "Connecting to host ‘%s’, port ‘%d’…"
 msgstr "Povezujem se na domaćina „%s“, priključnik „%d“…"
 
-#: ../src/cddb_dialog.c:662
+#: ../src/cddb_dialog.c:659
 #, c-format
-#| msgid "Cannot connect to host '%s' (%s)"
 msgid "Cannot connect to host ‘%s’: %s"
 msgstr "Ne mogu da se povežem na domaćina „%s“: %s"
 
-#: ../src/cddb_dialog.c:686
+#: ../src/cddb_dialog.c:683
 #, c-format
-#| msgid "Cannot resolve host '%s' (%s)"
 msgid "Cannot resolve host ‘%s’: %s"
 msgstr "Ne mogu da pristupim domaćinu „%s“: %s"
 
-#: ../src/cddb_dialog.c:699
+#: ../src/cddb_dialog.c:696
 #, c-format
-#| msgid "Connected to host '%s'"
 msgid "Connected to host ‘%s’"
 msgstr "Povezan sam sa domaćinom „%s“"
 
-#: ../src/cddb_dialog.c:786
+#: ../src/cddb_dialog.c:783
 #, c-format
-#| msgid "Error while writing CDDB results to file '%s'"
 msgid "Error while writing CDDB results to file ‘%s’"
 msgstr "Greška prilikom pisanja rezultata baze podataka CD-a u datoteku „%s“"
 
-#: ../src/cddb_dialog.c:797
+#: ../src/cddb_dialog.c:794
 #, c-format
 msgid "Receiving data (%s)…"
 msgstr "Primam podatke (%s)…"
 
-#: ../src/cddb_dialog.c:810
+#: ../src/cddb_dialog.c:807
 #, c-format
-#| msgid "Error when reading CDDB response (%s)"
 msgid "Error when reading CDDB response ‘%s’"
 msgstr "Greška čitanja odgovora baze podataka CD-a „%s“"
 
-#: ../src/cddb_dialog.c:817
+#: ../src/cddb_dialog.c:814
 #, c-format
-#| msgid "Cannot create file '%s' (%s)"
 msgid "Cannot create file ‘%s’: %s"
 msgstr "Ne mogu da napravim datoteku „%s“: %s"
 
-#: ../src/cddb_dialog.c:879
-#, c-format
-#| msgid "Can't load file: '%s' (%s)."
-msgid "Cannot load file ‘%s’: %s"
-msgstr "Ne mogu da učitam datoteku „%s“: %s"
-
 #. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
 #. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
 #. Send the request
 #. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
 #. Send the request
-#: ../src/cddb_dialog.c:950 ../src/cddb_dialog.c:1557
-#: ../src/cddb_dialog.c:1895
+#: ../src/cddb_dialog.c:943 ../src/cddb_dialog.c:1589
+#: ../src/cddb_dialog.c:1927
 msgid "Sending request…"
 msgstr "Šaljem zahtev…"
 
-#: ../src/cddb_dialog.c:954 ../src/cddb_dialog.c:1561
-#: ../src/cddb_dialog.c:1899 ../src/cddb_dialog.c:3432
+#: ../src/cddb_dialog.c:947 ../src/cddb_dialog.c:1593
+#: ../src/cddb_dialog.c:1931 ../src/cddb_dialog.c:3490
 #, c-format
-#| msgid "Cannot send the request (%s)"
 msgid "Cannot send the request ‘%s’"
 msgstr "Ne mogu da pošaljem zahtev „%s“"
 
@@ -3659,35 +3393,34 @@ msgstr "Ne mogu da pošaljem zahtev „%s“"
 #.
 #. * Read the answer
 #.
-#: ../src/cddb_dialog.c:966 ../src/cddb_dialog.c:1588
-#: ../src/cddb_dialog.c:3450
+#: ../src/cddb_dialog.c:959 ../src/cddb_dialog.c:1620
+#: ../src/cddb_dialog.c:3508
 msgid "Receiving data…"
 msgstr "Primam podatke…"
 
-#: ../src/cddb_dialog.c:973 ../src/cddb_dialog.c:1595
-#: ../src/cddb_dialog.c:1930 ../src/cddb_dialog.c:3457
+#: ../src/cddb_dialog.c:966 ../src/cddb_dialog.c:1627
+#: ../src/cddb_dialog.c:1962 ../src/cddb_dialog.c:3515
 msgid "The server returned a bad response"
 msgstr "Server je vratio pogrešan odgovor"
 
-#: ../src/cddb_dialog.c:989 ../src/cddb_dialog.c:1005
-#: ../src/cddb_dialog.c:1608 ../src/cddb_dialog.c:1946
-#: ../src/cddb_dialog.c:3474
+#: ../src/cddb_dialog.c:982 ../src/cddb_dialog.c:997 ../src/cddb_dialog.c:1018
+#: ../src/cddb_dialog.c:1640 ../src/cddb_dialog.c:1978
+#: ../src/cddb_dialog.c:3532
 #, c-format
-#| msgid "The server returned a bad response: %s"
 msgid "The server returned a bad response ‘%s’"
 msgstr "Server je vratio pogrešan odgovor „%s“"
 
 #. Load the track list of the album
-#: ../src/cddb_dialog.c:1201
+#: ../src/cddb_dialog.c:1233
 msgid "Loading album track list…"
 msgstr "Čitam spisak numera albuma…"
 
-#: ../src/cddb_dialog.c:1755
+#: ../src/cddb_dialog.c:1787
 #, c-format
 msgid "Sorry, the web-based search is currently not available"
 msgstr "Nažalost, pretraga bazirana na vebu trenutno nije dostupna"
 
-#: ../src/cddb_dialog.c:1757 ../src/cddb_dialog.c:2117
+#: ../src/cddb_dialog.c:1789 ../src/cddb_dialog.c:2149
 #, c-format
 msgid "Found one matching album"
 msgid_plural "Found %d matching albums"
@@ -3696,53 +3429,52 @@ msgstr[1] "Pronašao sam %d odgovarajuća albuma"
 msgstr[2] "Pronašao sam %d odgovarajućih albuma"
 msgstr[3] "Pronašao sam jedan odgovarajući album"
 
-#: ../src/cddb_dialog.c:1918
+#: ../src/cddb_dialog.c:1950
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)…"
 msgstr "Primam podatke stranice %d (album %d/%d)…"
 
-#: ../src/cddb_dialog.c:1920
+#: ../src/cddb_dialog.c:1952
 #, c-format
 msgid "Receiving data of page %d…"
 msgstr "Primam podatke stranice %d…"
 
-#: ../src/cddb_dialog.c:2084
+#: ../src/cddb_dialog.c:2116
 #, c-format
 msgid "More results to load…"
 msgstr "Još rezultata za učitavanje…"
 
-#: ../src/cddb_dialog.c:2265
+#: ../src/cddb_dialog.c:2296
 msgid "The number of CDDB results does not match the number of selected files"
 msgstr "Broj rezultata baze podataka CD-a ne odgovara broju izabranih datoteka"
 
-#: ../src/cddb_dialog.c:2271
+#: ../src/cddb_dialog.c:2302
 msgid "Write Tag from CDDB"
 msgstr "Upiši oznake iz baze podataka CD-a"
 
-#: ../src/cddb_dialog.c:2954
+#: ../src/cddb_dialog.c:3006
 msgid "Ready to search"
 msgstr "Spreman sam za pretragu"
 
-#: ../src/cddb_dialog.c:3042 ../src/load_files_dialog.c:261
-#: ../src/setting.c:247
+#: ../src/cddb_dialog.c:3094 ../src/load_files_dialog.c:261
+#: ../src/setting.c:325
 #, c-format
-#| msgid "Cannot open file '%s' (%s)"
 msgid "Cannot open file ‘%s’: %s"
 msgstr "Ne mogu da otvorim datoteku „%s“: %s"
 
-#: ../src/cddb_dialog.c:3263
+#: ../src/cddb_dialog.c:3321
 #, c-format
 msgid "No file selected"
 msgstr "Nije izabrana nijedna datoteka"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: ../src/cddb_dialog.c:3271
+#: ../src/cddb_dialog.c:3329
 #, c-format
 msgid "More than 99 files selected. Cannot send request"
 msgstr "Izabrali ste više od 99 datoteka. Ne mogu da pošaljem zahtev"
 
-#: ../src/cddb_dialog.c:3277
+#: ../src/cddb_dialog.c:3335
 #, c-format
 msgid "One file selected"
 msgid_plural "%d files selected"
@@ -3752,16 +3484,13 @@ msgstr[2] "Izabrano je %d datoteka"
 msgstr[3] "Izabrana je jedna datoteka"
 
 #. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
-#: ../src/cddb_dialog.c:3422
+#: ../src/cddb_dialog.c:3480
 #, c-format
-#| msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"
 msgid "Sending request (disc ID: %s, #tracks: %d, Disc length: %d)…"
 msgstr "Šaljem zahtev (IB diska: %s, #numere: %d, Trajanje diska: %d)…"
 
-#: ../src/cddb_dialog.c:3590
+#: ../src/cddb_dialog.c:3648
 #, c-format
-#| msgid "DiscID '%s' gave one matching album"
-#| msgid_plural "DiscID '%s' gave %d matching albums"
 msgid "DiscID ‘%s’ gave one matching album"
 msgid_plural "DiscID ‘%s’ gave %d matching albums"
 msgstr[0] "IB diska „%s“ je dao %d odgovarajući album"
@@ -3769,152 +3498,152 @@ msgstr[1] "IB diska „%s“ je dao %d odgovarajuća albuma"
 msgstr[2] "IB diska „%s“ je dao %d odgovarajućih albuma"
 msgstr[3] "IB diska „%s“ je dao jedan odgovarajući album"
 
-#: ../src/charset.c:49
+#: ../src/charset.c:46
 msgid "Arabic (IBM-864)"
 msgstr "Arapski (IBM-864)"
 
-#: ../src/charset.c:50
+#: ../src/charset.c:47
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arapski (ISO-8859-6)"
 
-#: ../src/charset.c:51
+#: ../src/charset.c:48
 msgid "Arabic (Windows-1256)"
 msgstr "Arapski (Windows-1256)"
 
-#: ../src/charset.c:52
+#: ../src/charset.c:49
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltički (ISO-8859-13)"
 
-#: ../src/charset.c:53
+#: ../src/charset.c:50
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltički (ISO-8859-4)"
 
-#: ../src/charset.c:54
+#: ../src/charset.c:51
 msgid "Baltic (Windows-1257)"
 msgstr "Baltički (Windows-1257)"
 
-#: ../src/charset.c:55
+#: ../src/charset.c:52
 msgid "Celtic (ISO-8859-14)"
 msgstr "Keltski (ISO-8859-14)"
 
-#: ../src/charset.c:56
+#: ../src/charset.c:53
 msgid "Central European (IBM-852)"
 msgstr "Centralno evropski (IBM-852)"
 
-#: ../src/charset.c:57
+#: ../src/charset.c:54
 msgid "Central European (ISO-8859-2)"
 msgstr "Centralno evropski (ISO-8859-2)"
 
-#: ../src/charset.c:58
+#: ../src/charset.c:55
 msgid "Central European (Windows-1250)"
 msgstr "Centralno evropski (Windows-1250)"
 
-#: ../src/charset.c:59
+#: ../src/charset.c:56
 msgid "Chinese Simplified (GB18030)"
 msgstr "Uprošćeni kineski (GB18030)"
 
-#: ../src/charset.c:60
+#: ../src/charset.c:57
 msgid "Chinese Simplified (GB2312)"
 msgstr "Uprošćeni kineski (GB2312)"
 
-#: ../src/charset.c:61
+#: ../src/charset.c:58
 msgid "Chinese Traditional (Big5)"
 msgstr "Tradicionalni kineski (Big5)"
 
-#: ../src/charset.c:62
+#: ../src/charset.c:59
 msgid "Chinese Traditional (Big5-HKSCS)"
 msgstr "Tradicionalni kineski (Big5-HKSCS)"
 
-#: ../src/charset.c:63
+#: ../src/charset.c:60
 msgid "Cyrillic (IBM-855)"
 msgstr "Ćirilični (IBM-855)"
 
-#: ../src/charset.c:64
+#: ../src/charset.c:61
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Ćirilični (ISO-8859-5)"
 
-#: ../src/charset.c:65
+#: ../src/charset.c:62
 msgid "Cyrillic (ISO-IR-111)"
 msgstr "Ćirilični (ISO-IR-111)"
 
-#: ../src/charset.c:66
+#: ../src/charset.c:63
 msgid "Cyrillic (KOI8-R)"
 msgstr "Ćirilični (KOI8-R)"
 
-#: ../src/charset.c:67
+#: ../src/charset.c:64
 msgid "Cyrillic (Windows-1251)"
 msgstr "Ćirilični (Windows-1251)"
 
-#: ../src/charset.c:68
+#: ../src/charset.c:65
 msgid "Cyrillic/Russian (CP-866)"
 msgstr "Ćirilični/Ruski (CP-866)"
 
-#: ../src/charset.c:69
+#: ../src/charset.c:66
 msgid "Cyrillic/Ukrainian (KOI8-U)"
 msgstr "Ćirilični/Ukrainski (KOI8-U)"
 
-#: ../src/charset.c:70
+#: ../src/charset.c:67
 msgid "English (US-ASCII)"
 msgstr "Engleski (US-ASCII)"
 
-#: ../src/charset.c:71
+#: ../src/charset.c:68
 msgid "Greek (ISO-8859-7)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: ../src/charset.c:72
+#: ../src/charset.c:69
 msgid "Greek (Windows-1253)"
 msgstr "Grčki (Windows-1253)"
 
-#: ../src/charset.c:73
+#: ../src/charset.c:70
 msgid "Hebrew (IBM-862)"
 msgstr "Hebrejski (IBM-862)"
 
-#: ../src/charset.c:74
+#: ../src/charset.c:71
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrejski (Windows-1255)"
 
-#: ../src/charset.c:75
+#: ../src/charset.c:72
 msgid "Japanese (EUC-JP)"
 msgstr "Japanski (EUC-JP)"
 
-#: ../src/charset.c:76
+#: ../src/charset.c:73
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanski (ISO-2022-JP)"
 
-#: ../src/charset.c:77
+#: ../src/charset.c:74
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanski (Shift_JIS)"
 
-#: ../src/charset.c:78
+#: ../src/charset.c:75
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: ../src/charset.c:79
+#: ../src/charset.c:76
 msgid "Nordic (ISO-8859-10)"
 msgstr "Nordijski (ISO-8859-10)"
 
-#: ../src/charset.c:80
+#: ../src/charset.c:77
 msgid "South European (ISO-8859-3)"
 msgstr "Južno evropski (ISO-8859-3)"
 
-#: ../src/charset.c:81
+#: ../src/charset.c:78
 msgid "Thai (TIS-620)"
 msgstr "Tai (TIS-620)"
 
-#: ../src/charset.c:82
+#: ../src/charset.c:79
 msgid "Turkish (IBM-857)"
 msgstr "Turski (IBM-857)"
 
-#: ../src/charset.c:83
+#: ../src/charset.c:80
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turski (ISO-8859-9)"
 
-#: ../src/charset.c:84
+#: ../src/charset.c:81
 msgid "Turkish (Windows-1254)"
 msgstr "Turski (Windows-1254)"
 
 #. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
-#: ../src/charset.c:86
+#: ../src/charset.c:83
 msgid "Unicode (UTF-8)"
 msgstr "Unikod (UTF-8)"
 
@@ -3922,61 +3651,55 @@ msgstr "Unikod (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:90
 msgid "Vietnamese (VISCII)"
 msgstr "Vijetnamski (VISCII)"
 
-#: ../src/charset.c:94
+#: ../src/charset.c:91
 msgid "Vietnamese (Windows-1258)"
 msgstr "Vijetnamski (Windows-1258)"
 
-#: ../src/charset.c:95
+#: ../src/charset.c:92
 msgid "Visual Hebrew (ISO-8859-8)"
 msgstr "Vizuelni hebrejski (ISO-8859-8)"
 
-#: ../src/charset.c:96
+#: ../src/charset.c:93
 msgid "Western (IBM-850)"
 msgstr "Zapadnjački (IBM-850)"
 
-#: ../src/charset.c:97
+#: ../src/charset.c:94
 msgid "Western (ISO-8859-1)"
 msgstr "Zapadnjački (ISO-8859-1)"
 
-#: ../src/charset.c:98
+#: ../src/charset.c:95
 msgid "Western (ISO-8859-15)"
 msgstr "Zapadnjački (ISO-8859-15)"
 
-#: ../src/charset.c:99
+#: ../src/charset.c:96
 msgid "Western (Windows-1252)"
 msgstr "Zapadnjački (Windows-1252)"
 
-#: ../src/charset.c:511
+#: ../src/charset.c:508
 #, c-format
-#| msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
 msgid "The filename ‘%s’ could not be converted into UTF-8: %s"
 msgstr "Naziv datoteke „%s“ ne može biti preveden u UTF-8: %s"
 
-#: ../src/charset.c:513 ../src/charset.c:626 ../src/charset.c:691
+#: ../src/charset.c:510 ../src/charset.c:623 ../src/charset.c:688
 msgid "Invalid UTF-8"
 msgstr "Neispravan UTF-8"
 
-#: ../src/charset.c:624
+#: ../src/charset.c:621
 #, c-format
-#| msgid ""
-#| "The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgid "The UTF-8 string ‘%s’ could not be converted into filename encoding: %s"
 msgstr "UTF-8 niska „%s“ ne može biti prevedena u kodiranje naziva datoteke: %s"
 
-#: ../src/charset.c:689
+#: ../src/charset.c:686
 #, c-format
-#| msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgid "The string ‘%s’ could not be converted into UTF-8: %s"
 msgstr "Niska „%s“ ne može biti prevedena u UTF-8: %s"
 
-#: ../src/easytag.c:290
+#: ../src/easytag.c:243
 #, c-format
-#| msgid "A file was changed by an external program"
-#| msgid_plural "%d files were changed by an external program."
 msgid "A file was changed by an external program"
 msgid_plural "%d files were changed by an external program"
 msgstr[0] "%d datoteka je izmenjena spoljnim programom"
@@ -3984,124 +3707,113 @@ 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:299
+#: ../src/easytag.c:252
 msgid "Do you want to continue saving the file?"
 msgstr "Da li želite da sačuvate datoteku?"
 
-#: ../src/easytag.c:360 ../src/easytag.c:381
+#: ../src/easytag.c:313 ../src/easytag.c:334
 msgid "Saving files was stopped"
 msgstr "Čuvanje datoteka je zaustavljeno"
 
-#: ../src/easytag.c:383
+#: ../src/easytag.c:336
 msgid "All files have been saved"
 msgstr "Sve datoteke su sačuvane"
 
-#: ../src/easytag.c:504
+#: ../src/easytag.c:455
 #, c-format
-#| msgid "Do you want to write the tag of file '%s'?"
 msgid "Do you want to write the tag of file ‘%s’?"
 msgstr "Da li želite da upišete oznaku datoteke „%s“?"
 
-#: ../src/easytag.c:506
+#: ../src/easytag.c:457
 msgid "Confirm Tag Writing"
 msgstr "Potvrdi upisivanje oznake"
 
 #. Directories and filename changed
-#: ../src/easytag.c:599
+#: ../src/easytag.c:558
 msgid "Rename File and Directory"
 msgstr "Preimenuj datoteku i direktorijum"
 
-#: ../src/easytag.c:600
+#: ../src/easytag.c:559
 msgid "File and directory rename confirmation required"
 msgstr "Potrebno je potvrđivanje za preimenovanje datoteke i direktorijuma"
 
-#: ../src/easytag.c:601
+#: ../src/easytag.c:560
 #, c-format
-#| msgid "Do you want to rename the file and directory '%s' to '%s'?"
 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:607
+#: ../src/easytag.c:566
 msgid "Directory rename confirmation required"
 msgstr "Potrebno je potvrđivanje za preimenovanje direktorijuma"
 
-#: ../src/easytag.c:608
+#: ../src/easytag.c:567
 #, c-format
-#| msgid "Do you want to rename the directory '%s' to '%s'?"
 msgid "Do you want to rename the directory ‘%s’ to ‘%s’?"
 msgstr "Da li želite da preimenujete direktorijum „%s“ u „%s“?"
 
-#: ../src/easytag.c:616
+#: ../src/easytag.c:575
 msgid "File rename confirmation required"
 msgstr "Potrebno je potvrđivanje za preimenovanje datoteke"
 
-#: ../src/easytag.c:617
+#: ../src/easytag.c:576
 #, c-format
-#| msgid "Do you want to rename the file '%s' to '%s'?"
 msgid "Do you want to rename the file ‘%s’ to ‘%s’?"
 msgstr "Da li želite da preimenujete datoteku „%s“ u „%s“?"
 
-#: ../src/easytag.c:689
+#: ../src/easytag.c:648
 #, c-format
-#| msgid "Cannot rename file '%s' to '%s'"
 msgid "Cannot rename file ‘%s’ to ‘%s’"
 msgstr "Ne mogu da preimenujem datoteku „%s“ u „%s“"
 
-#: ../src/easytag.c:703
+#: ../src/easytag.c:662
 #, c-format
-#| msgid "Cannot rename file '%s' to '%s': %s"
 msgid "Cannot rename file ‘%s’ to ‘%s’: %s"
 msgstr "Ne mogu da preimenujem datoteku „%s“ u „%s“: %s"
 
-#: ../src/easytag.c:708
+#: ../src/easytag.c:667
 msgid "File(s) not renamed"
 msgstr "Datoteka(e) nije preimenovana"
 
-#: ../src/easytag.c:888
+#: ../src/easytag.c:852
 #, c-format
-#| msgid "Writing tag of '%s'"
 msgid "Writing tag of ‘%s’"
 msgstr "Zapisujem oznaku od „%s“"
 
-#: ../src/easytag.c:896
+#: ../src/easytag.c:860
 #, c-format
-#| msgid "Written tag of '%s'"
 msgid "Wrote tag of ‘%s’"
 msgstr "Zapisah oznaku u „%s“"
 
-#: ../src/easytag.c:912
+#: ../src/easytag.c:876
 #, c-format
-#| msgid "Cannot write tag in file '%s'"
 msgid "Cannot write tag in file ‘%s’"
 msgstr "Ne mogu da upišem oznaku u datoteku „%s“"
 
-#: ../src/easytag.c:916
+#: ../src/easytag.c:880
 msgid "Tag Write Error"
 msgstr "Greška upisivanja oznake"
 
-#: ../src/easytag.c:991 ../src/easytag.c:1219
+#: ../src/easytag.c:955 ../src/easytag.c:1183
 #, c-format
-#| msgid "Cannot read directory '%s'"
 msgid "Cannot read directory ‘%s’"
 msgstr "Ne mogu da čitam direktorijum „%s“"
 
-#: ../src/easytag.c:995
+#: ../src/easytag.c:959
 msgid "Directory Read Error"
 msgstr "Greška čitanja direktorijuma"
 
 #. Read the directory recursively
-#: ../src/easytag.c:1016
+#: ../src/easytag.c:980
 #, c-format
 msgid "Search in progress…"
 msgstr "Pretraga je u toku…"
 
-#: ../src/easytag.c:1040 ../src/et_core.c:2979
+#: ../src/easytag.c:1004 ../src/et_core.c:2962
 #, c-format
-#| msgid "File: '%s'"
 msgid "File: ‘%s’"
 msgstr "Datoteka: „%s“"
 
-#: ../src/easytag.c:1087
+#: ../src/easytag.c:1051
 #, c-format
 msgid "Found one file in this directory and subdirectories"
 msgid_plural "Found %d files in this directory and subdirectories"
@@ -4110,7 +3822,7 @@ msgstr[1] "Našao sam %d datoteke u ovom direktorijumu i pod-direktorijumima"
 msgstr[2] "Našao sam %d datoteka u ovom direktorijumu i pod-direktorijumima"
 msgstr[3] "Našao sam jednu datoteku u ovom direktorijumu i pod-direktorijumima"
 
-#: ../src/easytag.c:1094
+#: ../src/easytag.c:1058
 #, c-format
 msgid "Found one file in this directory"
 msgid_plural "Found %d files in this directory"
@@ -4119,77 +3831,78 @@ msgstr[1] "Našao sam %d datoteke u ovom direktorijumu"
 msgstr[2] "Našao sam %d datoteka u ovom direktorijumu"
 msgstr[3] "Našao sam jednu datoteku u ovom direktorijumu"
 
-#: ../src/easytag.c:1111
+#: ../src/easytag.c:1075
 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:1113
+#: ../src/easytag.c:1077
 msgid "No file found in this directory"
 msgstr "Nisam pronašao ni jednu datoteku u ovom direktorijumu"
 
-#: ../src/easytag.c:1183
+#: ../src/easytag.c:1147
 #, c-format
-#| msgid "Error opening directory '%s' (%s)"
 msgid "Error opening directory ‘%s’: %s"
 msgstr "Greška otvaranja direktorijuma „%s“: %s"
 
-#: ../src/easytag.c:1239
+#: ../src/easytag.c:1203
 msgid "Searching for audio files…"
 msgstr "Tražim zvučne datoteke…"
 
-#: ../src/easytag.c:1240
+#: ../src/easytag.c:1204
 msgid "Searching"
 msgstr "Tražim"
 
-#: ../src/easytag.c:1241
+#: ../src/easytag.c:1205
 msgid "_Stop"
 msgstr "_Zaustavi"
 
-#: ../src/et_core.c:545
+#: ../src/et_core.c:507
 #, c-format
-#| msgid "Error reading tag from ogg file (%s)"
 msgid "Error reading tag from Ogg file ‘%s’: %s"
 msgstr "Greška čitanja oznake iz Ogg datoteke „%s“: %s"
 
-#: ../src/et_core.c:556
+#: ../src/et_core.c:518
 #, c-format
-#| msgid "Error reading tags from file: '%s'"
 msgid "Error reading tag from FLAC file ‘%s’: %s"
 msgstr "Greška čitanja oznake iz FLAC datoteke „%s“: %s"
 
-#: ../src/et_core.c:566
+#: ../src/et_core.c:528
 #, c-format
-#| msgid "Error reading tags from file: '%s'"
 msgid "Error reading APE tag from file ‘%s’: %s"
 msgstr "Greška čitanja APE oznake iz datoteke „%s“: %s"
 
-#: ../src/et_core.c:576
+#: ../src/et_core.c:538
 #, c-format
-#| msgid "Error reading tags from file: '%s'"
 msgid "Error reading tag from MP4 file ‘%s’: %s"
 msgstr "Greška čitanja oznake iz MP4 datoteke „%s“: %s"
 
-#: ../src/et_core.c:587
+#: ../src/et_core.c:549
 #, c-format
-#| msgid "Error reading tags from file: '%s'"
 msgid "Error reading tag from WavPack file ‘%s’: %s"
 msgstr "Greška čitanja oznake iz Vejvpak datoteke „%s“: %s"
 
-#: ../src/et_core.c:598
+#: ../src/et_core.c:560
 #, c-format
-#| msgid "Error reading tag from Opus file (%s)"
 msgid "Error reading tag from Opus file ‘%s’: %s"
 msgstr "Greška čitanja oznake iz Opus datoteke „%s“: %s"
 
-#: ../src/et_core.c:742
+#: ../src/et_core.c:576
+#, c-format
+msgid ""
+"The year value ‘%s’ seems to be invalid in file ‘%s’. The information will "
+"be lost when saving"
+msgstr ""
+"Vrednost godine „%s“ izgleda da nije ispravna u datoteci „%s“. Podatak će "
+"biti izgubljen prilikom čuvanja."
+
+#: ../src/et_core.c:711
 #, c-format
-#| msgid "Automatic corrections applied for file '%s'."
 msgid "Automatic corrections applied for file ‘%s’"
 msgstr "Samostalno ispravljanje je primenjeno nad datotekom „%s“"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:3003
+#: ../src/et_core.c:2986
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
@@ -4199,37 +3912,36 @@ msgstr[2] "%u datoteka"
 msgstr[3] "Jedna datoteka"
 
 #. Bitrate
-#: ../src/et_core.c:3034 ../src/tags/flac_header.c:307
-#: ../src/tags/monkeyaudio_header.c:83 ../src/tags/mp4_header.cc:144
-#: ../src/tags/mpeg_header.c:240 ../src/tags/musepack_header.c:87
-#: ../src/tags/ogg_header.c:411 ../src/tags/opus_header.c:230
-#: ../src/tags/wavpack_header.c:90
+#: ../src/et_core.c:3017 ../src/tags/flac_header.c:179
+#: ../src/tags/monkeyaudio_header.c:82 ../src/tags/mp4_header.cc:144
+#: ../src/tags/mpeg_header.c:239 ../src/tags/musepack_header.c:86
+#: ../src/tags/ogg_header.c:410 ../src/tags/opus_header.c:227
+#: ../src/tags/wavpack_header.c:145
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: ../src/et_core.c:3037 ../src/tags/flac_header.c:310
-#: ../src/tags/monkeyaudio_header.c:86 ../src/tags/mp4_header.cc:148
-#: ../src/tags/mpeg_header.c:245 ../src/tags/musepack_header.c:90
-#: ../src/tags/ogg_header.c:414 ../src/tags/opus_header.c:233
-#: ../src/tags/wavpack_header.c:93
+#: ../src/et_core.c:3020 ../src/tags/flac_header.c:182
+#: ../src/tags/monkeyaudio_header.c:85 ../src/tags/mp4_header.cc:148
+#: ../src/tags/mpeg_header.c:244 ../src/tags/musepack_header.c:89
+#: ../src/tags/ogg_header.c:413 ../src/tags/opus_header.c:230
+#: ../src/tags/wavpack_header.c:148
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/et_core.c:3166
+#: ../src/et_core.c:3149
 #, c-format
-#| msgid "Could not convert filename '%s' into system filename encoding"
 msgid "Could not convert filename ‘%s’ to system filename encoding"
 msgstr ""
 "Ne mogu da pretvorim naziv datoteke „%s“ u kodiranje naziva datoteke sistema"
 
-#: ../src/et_core.c:3168
+#: ../src/et_core.c:3151
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Pokušavam da postavim promenljivu okruženja G_KODIRANJE_NAZIVADATOTEKE."
 
-#: ../src/et_core.c:3169 ../src/scan_dialog.c:719
+#: ../src/et_core.c:3152 ../src/scan_dialog.c:721
 msgid "Filename translation"
 msgstr "Prevod naziva datoteke"
 
@@ -4239,7 +3951,6 @@ msgstr "Nisam našao datoteku"
 
 #: ../src/file_area.c:284 ../src/load_files_dialog.c:221
 #, c-format
-#| msgid "Cannot query file information (%s)"
 msgid "Cannot query file information ‘%s’"
 msgstr "Ne mogu da propitam podatke datoteke „%s“"
 
@@ -4249,7 +3960,6 @@ msgstr "Datoteka samo za čitanje"
 
 #: ../src/load_files_dialog.c:291
 #, c-format
-#| msgid "Error reading file (%s)"
 msgid "Error reading file ‘%s’"
 msgstr "Greška čitanja datoteke „%s“"
 
@@ -4262,12 +3972,10 @@ msgid "Delete this line"
 msgstr "Obrišite ovaj red"
 
 #: ../src/load_files_dialog.c:643 ../src/load_files_dialog.c:746
-#| msgid "Move up this line"
 msgid "Move this line up"
 msgstr "Pomerite ovaj red na gore"
 
 #: ../src/load_files_dialog.c:647 ../src/load_files_dialog.c:750
-#| msgid "Move up this line"
 msgid "Move this line down"
 msgstr "Pomerite ovaj red na dole"
 
@@ -4275,180 +3983,152 @@ msgstr "Pomerite ovaj red na dole"
 msgid "Load Filenames From a Text File"
 msgstr "Učitajte nazive datoteka iz tekstualne datoteke"
 
-#: ../src/misc.c:257
+#: ../src/misc.c:204
 msgid "You must type a program name"
 msgstr "Morate da unesete naziv programa"
 
-#: ../src/misc.c:258
+#: ../src/misc.c:205
 msgid "Program Name Error"
 msgstr "Greška naziva programa"
 
-#: ../src/misc.c:336
-#, c-format
-#| msgid "Executed command: %s"
-msgid "Executed command ‘%s’"
-msgstr "Izvršena naredba „%s“"
-
-#: ../src/misc.c:344 ../src/misc.c:455
-#, c-format
-#| msgid "Failed to launch program: %s"
-msgid "Failed to launch program ‘%s’"
-msgstr "Nisam uspeo da pokrenem program „%s“"
-
-#: ../src/misc.c:361
-msgid "Select File"
-msgstr "Izaberite datoteku"
-
-#: ../src/misc.c:367
-msgid "Select Directory"
-msgstr "Izaberite direktorijum"
-
-#: ../src/picture.c:186
+#: ../src/picture.c:174
 msgid "JPEG image"
 msgstr "JPEG slika"
 
-#: ../src/picture.c:188
+#: ../src/picture.c:176
 msgid "PNG image"
 msgstr "PNG slika"
 
-#: ../src/picture.c:190
+#: ../src/picture.c:178
 msgid "GIF image"
 msgstr "GIF slika"
 
-#: ../src/picture.c:192
+#: ../src/picture.c:180
 msgid "Unknown image"
 msgstr "Nepoznata slika"
 
-#: ../src/picture.c:204
-#| msgid "32x32 pixel PNG file icon"
+#: ../src/picture.c:192
 msgid "32×32 pixel PNG file icon"
 msgstr "PNG ikonica, 32x32 tačkica"
 
-#: ../src/picture.c:206
+#: ../src/picture.c:194
 msgid "Other file icon"
 msgstr "Ostale ikonice datoteke"
 
-#: ../src/picture.c:208
+#: ../src/picture.c:196
 msgid "Cover (front)"
 msgstr "Omot (lice)"
 
-#: ../src/picture.c:210
+#: ../src/picture.c:198
 msgid "Cover (back)"
 msgstr "Omot (poleđina)"
 
-#: ../src/picture.c:212
+#: ../src/picture.c:200
 msgid "Leaflet page"
 msgstr "Strana sa letkom"
 
-#: ../src/picture.c:214
-#| msgid "Media (e.g. label side of CD)"
+#: ../src/picture.c:202
 msgid "Media (such as label side of CD)"
 msgstr "Medijum (kao što je strana sa natpisom CD-a)"
 
-#: ../src/picture.c:216
+#: ../src/picture.c:204
 msgid "Lead artist/lead performer/soloist"
 msgstr "Vodeći umetnik/vodeći izvođač/solista"
 
-#: ../src/picture.c:218
+#: ../src/picture.c:206
 msgid "Artist/performer"
 msgstr "Umetnik/Izvođač"
 
-#: ../src/picture.c:220
+#: ../src/picture.c:208
 msgid "Conductor"
 msgstr "Dirigent"
 
-#: ../src/picture.c:222
+#: ../src/picture.c:210
 msgid "Band/Orchestra"
 msgstr "Bend/Orkestar"
 
-#: ../src/picture.c:226
+#: ../src/picture.c:214
 msgid "Lyricist/text writer"
 msgstr "Pisac tekstova"
 
-#: ../src/picture.c:228
+#: ../src/picture.c:216
 msgid "Recording location"
 msgstr "Mesto snimanja"
 
-#: ../src/picture.c:230
+#: ../src/picture.c:218
 msgid "During recording"
 msgstr "U toku snimanja"
 
-#: ../src/picture.c:232
+#: ../src/picture.c:220
 msgid "During performance"
 msgstr "U toku izvođenja"
 
-#: ../src/picture.c:234
+#: ../src/picture.c:222
 msgid "Movie/video screen capture"
 msgstr "Film/Video zapis"
 
-#: ../src/picture.c:236
+#: ../src/picture.c:224
 msgid "A bright colored fish"
 msgstr "Svetlo obojena riba"
 
-#: ../src/picture.c:238
+#: ../src/picture.c:226
 msgid "Illustration"
 msgstr "Ilustracija"
 
-#: ../src/picture.c:240
+#: ../src/picture.c:228
 msgid "Band/Artist logotype"
 msgstr "Logo benda/izvođača"
 
-#: ../src/picture.c:242
+#: ../src/picture.c:230
 msgid "Publisher/studio logotype"
 msgstr "Logo izdavača/studija"
 
-#: ../src/picture.c:246
+#: ../src/picture.c:234
 msgid "Unknown image type"
 msgstr "Nepoznata vrsta slike"
 
-#: ../src/picture.c:276 ../src/picture.c:287
+#: ../src/picture.c:262 ../src/picture.c:271
 msgid "pixels"
 msgstr "tačkica"
 
-#: ../src/picture.c:277 ../src/picture.c:288
+#: ../src/picture.c:262 ../src/picture.c:271
 msgid "Type"
 msgstr "Vrsta"
 
-#: ../src/playlist_dialog.c:528
+#: ../src/playlist_dialog.c:531
 #, c-format
-#| msgid "Cannot write playlist file '%s'"
 msgid "Cannot write playlist file ‘%s’"
 msgstr "Ne mogu da zapišem datoteku spiska numera „%s“"
 
-#: ../src/playlist_dialog.c:532
+#: ../src/playlist_dialog.c:535
 msgid "Playlist File Error"
 msgstr "Greška datoteke spiska numera"
 
-#: ../src/playlist_dialog.c:540
+#: ../src/playlist_dialog.c:543
 #, c-format
-#| msgid "Written playlist file '%s'"
 msgid "Wrote playlist file ‘%s’"
 msgstr "Datoteka spiska numera „%s“ je zapisana"
 
-#: ../src/playlist_dialog.c:622 ../src/scan_dialog.c:2768
-#: ../src/scan_dialog.c:2830
+#: ../src/playlist_dialog.c:625 ../src/scan_dialog.c:2772
+#: ../src/scan_dialog.c:2834
 msgid "Invalid scanner mask"
 msgstr "Neispravna maska pregledača"
 
-#: ../src/playlist_dialog.c:653
+#: ../src/playlist_dialog.c:656
 msgid "Generate Playlist"
 msgstr "Napravite spisak numera"
 
 #. The window
-#: ../src/preferences_dialog.c:293
+#: ../src/preferences_dialog.c:289
 msgid "Preferences"
 msgstr "Postavke"
 
-#: ../src/preferences_dialog.c:1130
-#| msgid "The selected path for 'Default path to files' is invalid"
+#: ../src/preferences_dialog.c:1126
 msgid "The selected default path is invalid"
 msgstr "Izabrana osnovna putanja nije ispravna"
 
-#: ../src/preferences_dialog.c:1132
+#: ../src/preferences_dialog.c:1128
 #, c-format
-#| msgid ""
-#| "Path: '%s'\n"
-#| "Error: %s"
 msgid ""
 "Path: ‘%s’\n"
 "Error: %s"
@@ -4456,85 +4136,77 @@ msgstr ""
 "Putanja: „%s“\n"
 "Greška: %s"
 
-#: ../src/preferences_dialog.c:1136
+#: ../src/preferences_dialog.c:1132
 msgid "Invalid Path Error"
 msgstr "Greška neispravne putanje"
 
 #: ../src/scan_dialog.c:307
 #, c-format
-#| msgid "Cannot calculate CRC value of file (%s)"
 msgid "Cannot calculate CRC value of file ‘%s’"
 msgstr "Ne mogu da sračunam CRC vrednost datoteke „%s“"
 
-#: ../src/scan_dialog.c:323
+#: ../src/scan_dialog.c:325
 msgid "Tag successfully scanned"
 msgstr "Oznaka je uspešno skenirana"
 
-#: ../src/scan_dialog.c:326
+#: ../src/scan_dialog.c:328
 #, c-format
-#| msgid "Tag successfully scanned: %s"
 msgid "Tag successfully scanned ‘%s’"
 msgstr "Oznaka je uspešno pregledana „%s“"
 
-#: ../src/scan_dialog.c:369
+#: ../src/scan_dialog.c:371
 #, c-format
-#| msgid ""
-#| "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
 msgid "The extension ‘%s’ was not found in filename ‘%s’"
 msgstr "Nisam našao proširenje „%s“ u nazivu datoteke „%s“"
 
-#: ../src/scan_dialog.c:459 ../src/scan_dialog.c:490
+#: ../src/scan_dialog.c:461 ../src/scan_dialog.c:492
 #, c-format
-#| msgid "Scan Error: can't find separator '%s' within '%s'"
 msgid "Cannot find separator ‘%s’ within ‘%s’"
 msgstr "Ne mogu da nađem razdvajač „%s“ u „%s“"
 
-#: ../src/scan_dialog.c:717
+#: ../src/scan_dialog.c:719
 #, c-format
-#| msgid "Could not convert filename '%s' into system filename encoding"
 msgid "Could not convert filename ‘%s’ into system filename encoding"
 msgstr ""
 "Ne mogu da pretvorim naziv datoteke „%s“ u kodiranje naziva datoteke sistema"
 
-#: ../src/scan_dialog.c:742
+#: ../src/scan_dialog.c:744
 msgid "New filename successfully scanned"
 msgstr "Novi naziv datoteke je uspešno skeniran"
 
-#: ../src/scan_dialog.c:746
+#: ../src/scan_dialog.c:748
 #, c-format
-#| msgid "New filename successfully scanned: %s"
 msgid "New filename successfully scanned ‘%s’"
 msgstr "Novi naziv datoteke je uspešno skeniran %s"
 
-#: ../src/scan_dialog.c:1109
+#: ../src/scan_dialog.c:1111
 #, c-format
-#| msgid "Error while processing fields: %s"
 msgid "Error while processing fields ‘%s’"
 msgstr "Greška prilikom obrade polja „%s“"
 
-#: ../src/scan_dialog.c:2038
+#: ../src/scan_dialog.c:2042
 msgid "New_mask"
 msgstr "Nova _maska"
 
 #. The window
-#: ../src/scan_dialog.c:2255
+#: ../src/scan_dialog.c:2259
 msgid "Tag and Filename Scan"
 msgstr "Pregledač oznaka i naziva datoteka"
 
 #. 'Scan selected files' button
-#: ../src/scan_dialog.c:2261
+#: ../src/scan_dialog.c:2265
 msgid "Scan Files"
 msgstr "Pregledaj datoteke"
 
-#: ../src/scan_dialog.c:2267
+#: ../src/scan_dialog.c:2271
 msgid "Scan selected files"
 msgstr "Pregledajte izabrane datoteke"
 
-#: ../src/scan_dialog.c:2905
+#: ../src/scan_dialog.c:2909
 msgid "All tags have been scanned"
 msgstr "Sve oznake su pregledane"
 
-#: ../src/search_dialog.c:542
+#: ../src/search_dialog.c:545
 #, c-format
 msgid "Found one file"
 msgid_plural "Found %d files"
@@ -4543,292 +4215,222 @@ msgstr[1] "Pronašao sam %d datoteke"
 msgstr[2] "Pronašao sam %d datoteka"
 msgstr[3] "Pronašao sam: %d datoteku/e/a"
 
-#: ../src/search_dialog.c:591
+#: ../src/search_dialog.c:594
 msgid "Find Files"
 msgstr "Pronađite datoteke"
 
-#: ../src/search_dialog.c:675
+#: ../src/search_dialog.c:678
 msgid "Ready to search…"
 msgstr "Spreman sam za pretragu…"
 
-#: ../src/setting.c:144
+#: ../src/setting.c:243
 #, c-format
-#| msgid "Cannot create or open file '%s' (%s)"
-msgid "Cannot create or open file ‘%s’: %s"
-msgstr "Ne mogu da napravim ili otvorim datoteku „%s“: %s"
-
-#: ../src/setting.c:194
-#, c-format
-#| msgid "Error: Cannot write list to file: %s (%s)"
 msgid "Cannot write list to file ‘%s’: %s"
 msgstr "Ne mogu da upišem spisak u datoteku„%s“: %s"
 
-#: ../src/setting.c:212
-#, c-format
-#| msgid "Error while writing list file: %s"
-msgid "Error while writing list file ‘%s’"
-msgstr "Greška prilikom pisanja datoteke spiska „%s“"
-
 #. Fall back to defaults.
-#: ../src/setting.c:292
-#| msgid "Loading default 'Fill Tag' masks…"
+#: ../src/setting.c:348
 msgid "Loading default ‘Fill Tag’ masks…"
 msgstr "Učitavam osnovne maske za „Popuni oznaku“…"
 
 #. Fall back to defaults.
-#: ../src/setting.c:322
-#| msgid "Loading default 'Rename File' masks…"
+#: ../src/setting.c:378
 msgid "Loading default ‘Rename File’ masks…"
 msgstr "Učitavam osnovne maske za „preimenovanje datoteka“…"
 
-#: ../src/setting.c:409
-#, c-format
-#| msgid "Migrating configuration from directory '%s' to '%s'"
-msgid "Migrating configuration from directory ‘%s’ to ‘%s’"
-msgstr "Selim podešavanja iz direktorijuma „%s“ u „%s“"
-
-#: ../src/setting.c:433
-#, c-format
-#| msgid "Failed to migrate configuration file '%s'"
-msgid "Failed to migrate configuration file ‘%s’"
-msgstr "Nisam uspeo da preselim datoteku podešavanja „%s“"
-
-#: ../src/setting.c:470
-#, c-format
-#| msgid "Error: Cannot create directory '%s' (%s)"
-msgid "Cannot create directory ‘%s’: %s"
-msgstr "Ne mogu da napravim direktorijum „%s“: %s"
-
-#: ../src/status_bar.c:145
+#: ../src/status_bar.c:146
 msgid "Ready to start"
 msgstr "Spreman sam za početak"
 
-#: ../src/tag_area.c:187
+#: ../src/tag_area.c:186
 #, c-format
-#| msgid "Selected files tagged with title '%s'."
 msgid "Selected files tagged with title ‘%s’"
 msgstr "Izabrane datoteke su označene naslovom „%s“"
 
-#: ../src/tag_area.c:192
-#| msgid "Removed title from selected files."
+#: ../src/tag_area.c:191
 msgid "Removed title from selected files"
 msgstr "Uklonjen je naslov iz izabranih datoteka"
 
-#: ../src/tag_area.c:209
+#: ../src/tag_area.c:208
 #, c-format
-#| msgid "Selected files tagged with artist '%s'."
 msgid "Selected files tagged with artist ‘%s’"
 msgstr "Izabrane datoteke su označene izvođačem „%s“"
 
-#: ../src/tag_area.c:214
-#| msgid "Removed artist from selected files."
+#: ../src/tag_area.c:213
 msgid "Removed artist from selected files"
 msgstr "Uklonjen je izvođač iz izabranih datoteka"
 
-#: ../src/tag_area.c:230
+#: ../src/tag_area.c:229
 #, c-format
-#| msgid "Selected files tagged with album artist '%s'."
 msgid "Selected files tagged with album artist ‘%s’"
 msgstr "Izabrane datoteke su označene izvođačem albuma „%s“"
 
-#: ../src/tag_area.c:235
-#| msgid "Removed album artist from selected files."
+#: ../src/tag_area.c:234
 msgid "Removed album artist from selected files"
 msgstr "Uklonjen je izvođač albuma iz izabranih datoteka"
 
-#: ../src/tag_area.c:252
+#: ../src/tag_area.c:251
 #, c-format
-#| msgid "Selected files tagged with album '%s'."
 msgid "Selected files tagged with album ‘%s’"
 msgstr "Izabrane datoteke su označene albumom „%s“"
 
-#: ../src/tag_area.c:257
-#| msgid "Removed album name from selected files."
+#: ../src/tag_area.c:256
 msgid "Removed album name from selected files"
 msgstr "Uklonjen je naziv albuma iz izabranih datoteka"
 
-#: ../src/tag_area.c:295
+#: ../src/tag_area.c:294
 #, c-format
-#| msgid "Selected files tagged with disc number '%s/%s'."
 msgid "Selected files tagged with disc number ‘%s/%s’"
 msgstr "Izabrane datoteke su označene brojem diska „%s/%s“"
 
-#: ../src/tag_area.c:300
+#: ../src/tag_area.c:299
 #, c-format
-#| msgid "Selected files tagged with disc number like 'xx'."
 msgid "Selected files tagged with disc number like ‘xx’"
 msgstr "Izabrane datoteke su označene brojem diska kao „hh“"
 
-#: ../src/tag_area.c:305
-#| msgid "Removed disc number from selected files."
+#: ../src/tag_area.c:304
 msgid "Removed disc number from selected files"
 msgstr "Uklonjen je broj diska iz izabranih datoteka"
 
-#: ../src/tag_area.c:322
+#: ../src/tag_area.c:321
 #, c-format
-#| msgid "Selected files tagged with year '%s'."
 msgid "Selected files tagged with year ‘%s’"
 msgstr "Izabrane datoteke su označene godinom „%s“"
 
-#: ../src/tag_area.c:327
-#| msgid "Removed year from selected files."
+#: ../src/tag_area.c:326
 msgid "Removed year from selected files"
 msgstr "Uklonjena je godina iz izabranih datoteka"
 
-#: ../src/tag_area.c:354 ../src/tag_area.c:448
+#: ../src/tag_area.c:353 ../src/tag_area.c:447
 #, c-format
-#| msgid "Selected files tagged with track like 'xx/%s'."
 msgid "Selected files tagged with track like ‘xx/%s’"
 msgstr "Izabrane datoteke su označene numerom tipa „xx/%s“"
 
-#: ../src/tag_area.c:358
+#: ../src/tag_area.c:357
 #, c-format
-#| msgid "Selected files tagged with track like 'xx'."
 msgid "Selected files tagged with track like ‘xx’"
 msgstr "Izabrane datoteke su označene numerom tipa „xx“"
 
-#: ../src/tag_area.c:363 ../src/tag_area.c:453
-#| msgid "Removed track number from selected files."
+#: ../src/tag_area.c:362 ../src/tag_area.c:452
 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/tag_area.c:421
+#: ../src/tag_area.c:420
 #, c-format
-#| msgid "Selected tracks numbered sequentially."
 msgid "Selected tracks numbered sequentially"
 msgstr "Izabrane datoteke su pobrojane redom"
 
-#: ../src/tag_area.c:470
+#: ../src/tag_area.c:469
 #, c-format
-#| msgid "Selected files tagged with genre '%s'."
 msgid "Selected files tagged with genre ‘%s’"
 msgstr "Izabrane datoteke su označene žanrom „%s“"
 
-#: ../src/tag_area.c:475
-#| msgid "Removed genre from selected files."
+#: ../src/tag_area.c:474
 msgid "Removed genre from selected files"
 msgstr "Uklonjen je žanr iz izabranih datoteka"
 
-#: ../src/tag_area.c:499
+#: ../src/tag_area.c:498
 #, c-format
-#| msgid "Selected files tagged with comment '%s'."
 msgid "Selected files tagged with comment ‘%s’"
 msgstr "Izabrane datoteke su označene komentarom „%s“"
 
-#: ../src/tag_area.c:504
-#| msgid "Removed comment from selected files."
+#: ../src/tag_area.c:503
 msgid "Removed comment from selected files"
 msgstr "Uklonjen je komentar iz izabranih datoteka"
 
-#: ../src/tag_area.c:520
+#: ../src/tag_area.c:519
 #, c-format
-#| msgid "Selected files tagged with composer '%s'."
 msgid "Selected files tagged with composer ‘%s’"
 msgstr "Izabrane datoteke su označene kompozitorom „%s“"
 
-#: ../src/tag_area.c:525
-#| msgid "Removed composer from selected files."
+#: ../src/tag_area.c:524
 msgid "Removed composer from selected files"
 msgstr "Uklonjen je kompozitor iz izabranih datoteka"
 
-#: ../src/tag_area.c:542
+#: ../src/tag_area.c:541
 #, c-format
-#| msgid "Selected files tagged with original artist '%s'."
 msgid "Selected files tagged with original artist ‘%s’"
 msgstr "Izabrane datoteke su označene originalnim izvođačem „%s“"
 
-#: ../src/tag_area.c:547
-#| msgid "Removed original artist from selected files."
+#: ../src/tag_area.c:546
 msgid "Removed original artist from selected files"
 msgstr "Uklonjen je originalni izvođač iz izabranih datoteka"
 
-#: ../src/tag_area.c:564
+#: ../src/tag_area.c:563
 #, c-format
-#| msgid "Selected files tagged with copyright '%s'."
 msgid "Selected files tagged with copyright ‘%s’"
 msgstr "Izabrane datoteke su označene autorskim pravom „%s“"
 
-#: ../src/tag_area.c:569
-#| msgid "Removed copyright from selected files."
+#: ../src/tag_area.c:568
 msgid "Removed copyright from selected files"
 msgstr "Uklonjeno je autorsko pravo iz izabranih datoteka"
 
-#: ../src/tag_area.c:586
+#: ../src/tag_area.c:585
 #, c-format
-#| msgid "Selected files tagged with URL '%s'."
 msgid "Selected files tagged with URL ‘%s’"
 msgstr "Izabrane datoteke su označene adresom „%s“"
 
-#: ../src/tag_area.c:591
-#| msgid "Removed URL from selected files."
+#: ../src/tag_area.c:590
 msgid "Removed URL from selected files"
 msgstr "Uklonjena je adresa iz izabranih datoteka"
 
-#: ../src/tag_area.c:608
+#: ../src/tag_area.c:607
 #, c-format
-#| msgid "Selected files tagged with encoder name '%s'."
 msgid "Selected files tagged with encoder name ‘%s’"
 msgstr "Izabrane datoteke su označene nazivom kodera „%s“"
 
-#: ../src/tag_area.c:613
-#| msgid "Removed encoder name from selected files."
+#: ../src/tag_area.c:612
 msgid "Removed encoder name from selected files"
 msgstr "Uklonjen je naziv kodera iz izabranih datoteka"
 
-#: ../src/tag_area.c:647
-#| msgid "Selected files tagged with images."
+#: ../src/tag_area.c:648
 msgid "Selected files tagged with images"
 msgstr "Izabrane datoteke su označene slikama"
 
-#: ../src/tag_area.c:651
-#| msgid "Removed images from selected files."
+#: ../src/tag_area.c:652
 msgid "Removed images from selected files"
 msgstr "Uklonjene su slike iz izabranih datoteka"
 
 #. Menu items
-#: ../src/tag_area.c:820
+#: ../src/tag_area.c:821
 msgid "Tag selected files with this field"
 msgstr "Označi izabrane datoteke ovim poljem"
 
-#: ../src/tag_area.c:847
+#: ../src/tag_area.c:848
 msgid "All uppercase"
 msgstr "Sva slova velika"
 
-#: ../src/tag_area.c:853
+#: ../src/tag_area.c:854
 msgid "All lowercase"
 msgstr "Sva slova mala"
 
-#: ../src/tag_area.c:859
+#: ../src/tag_area.c:860
 msgid "First letter uppercase"
 msgstr "Prvo slovo veliko"
 
-#: ../src/tag_area.c:865
+#: ../src/tag_area.c:866
 msgid "First letter uppercase of each word"
 msgstr "Prvo slovo svake reči veliko"
 
-#: ../src/tag_area.c:881
+#: ../src/tag_area.c:882
 msgid "Insert space before uppercase letter"
 msgstr "Ubaci razmak pre velikog slova"
 
-#: ../src/tag_area.c:887
+#: ../src/tag_area.c:888
 msgid "Remove duplicate spaces or underscores"
 msgstr "Ukloni duple razmake ili donje crtice"
 
-#: ../src/tag_area.c:893
+#: ../src/tag_area.c:894
 msgid "Remove all text"
 msgstr "Ukloni sav tekst"
 
-#: ../src/tag_area.c:1269 ../src/tag_area.c:1346 ../src/tags/ogg_tag.c:1049
-#: ../src/tags/ogg_tag.c:1064
+#: ../src/tag_area.c:1256 ../src/tag_area.c:1334
 #, c-format
 msgid "Error parsing image data ‘%s’"
 msgstr "Greška obrade podataka slike „%s“"
 
-#: ../src/tag_area.c:1328
-#| msgid ""
-#| "Cannot display the image because not enough data has been read to "
-#| "determine how to create the image buffer."
+#: ../src/tag_area.c:1316
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer"
@@ -4836,125 +4438,120 @@ msgstr ""
 "Ne mogu da prikažem sliku jer je nedovoljno podataka učitano da bih znao kako "
 "da napravim međumemoriju slike."
 
-#: ../src/tag_area.c:1335
+#: ../src/tag_area.c:1323
 msgid "Cannot display the image"
 msgstr "Ne mogu da prikažem sliku"
 
-#: ../src/tag_area.c:1337
+#: ../src/tag_area.c:1325
 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/tag_area.c:1339
+#: ../src/tag_area.c:1327
 msgid "Load Image File"
 msgstr "Učitaj datoteku slike"
 
-#: ../src/tag_area.c:1383 ../src/tag_area.c:1408
+#: ../src/tag_area.c:1371 ../src/tag_area.c:1396
 #, c-format
-#| msgid "Image file not loaded: %s"
 msgid "Image file not loaded ‘%s’"
 msgstr "Datoteka slike nije učitana „%s“"
 
-#: ../src/tag_area.c:1400
+#: ../src/tag_area.c:1388
 #, c-format
-#| msgid "Cannot open file: '%s'"
 msgid "Cannot open file ‘%s’"
 msgstr "Ne mogu da otvorim datoteku „%s“"
 
-#: ../src/tag_area.c:1404
+#: ../src/tag_area.c:1392
 msgid "Image File Error"
 msgstr "Greška datoteke slike"
 
-#: ../src/tag_area.c:1415
+#: ../src/tag_area.c:1403
 msgid "Image file loaded"
 msgstr "Datoteka slike je učitana"
 
-#: ../src/tag_area.c:1486
+#: ../src/tag_area.c:1474
 msgid "Add Images"
 msgstr "Dodaj slike"
 
-#: ../src/tag_area.c:1497 ../src/tag_area.c:1861
+#: ../src/tag_area.c:1485 ../src/tag_area.c:1850
 msgid "All Files"
 msgstr "Sve datoteke"
 
-#: ../src/tag_area.c:1503 ../src/tag_area.c:1867
+#: ../src/tag_area.c:1491 ../src/tag_area.c:1856
 msgid "PNG and JPEG"
 msgstr "PNG i JPEG"
 
-#: ../src/tag_area.c:1647
+#: ../src/tag_area.c:1635
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Svojstva slike %d/%d"
 
-#: ../src/tag_area.c:1846
+#: ../src/tag_area.c:1835
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Sačuvaj sliku %d/%d"
 
-#: ../src/tag_area.c:1923
+#: ../src/tag_area.c:1912
 #, c-format
-#| msgid "Image file not saved: %s"
 msgid "Image file not saved ‘%s’"
 msgstr "Datoteka slike nije sačuvana „%s“"
 
-#: ../src/tag_area.c:2266
+#: ../src/tag_area.c:2255
 msgid "Tag selected files with this genre"
 msgstr "Označite izabrane datoteke ovim žanrom"
 
-#: ../src/tag_area.c:2996
+#: ../src/tag_area.c:2986
 msgid "ID3 Tag"
 msgstr "ID3 oznaka"
 
-#: ../src/tag_area.c:3001
+#: ../src/tag_area.c:2991
 msgid "Ogg Vorbis Tag"
 msgstr "Ogg Vorbis oznaka"
 
-#: ../src/tag_area.c:3006
+#: ../src/tag_area.c:2996
 msgid "FLAC Vorbis Tag"
 msgstr "FLAC Vorbis oznaka"
 
-#: ../src/tag_area.c:3010
+#: ../src/tag_area.c:3000
 msgid "APE Tag"
 msgstr "APE oznaka"
 
-#: ../src/tag_area.c:3014
+#: ../src/tag_area.c:3004
 msgid "MP4/M4A/AAC Tag"
 msgstr "MP4/M4A/AAC oznaka"
 
-#: ../src/tag_area.c:3019
+#: ../src/tag_area.c:3009
 msgid "Wavpack Tag"
 msgstr "Vejvpak oznaka"
 
-#: ../src/tag_area.c:3024
+#: ../src/tag_area.c:3014
 msgid "Opus Tag"
 msgstr "Opus oznaka"
 
-#: ../src/tag_area.c:3264
+#: ../src/tag_area.c:3254
 #, c-format
 msgid "Images (%d)"
 msgstr "Slike (%d)"
 
-#: ../src/tags/ape_tag.c:67 ../src/tags/flac_tag.c:137
-#: ../src/tags/mp4_header.cc:58 ../src/tags/mp4_header.cc:67
-#: ../src/tags/mp4_tag.cc:67 ../src/tags/mp4_tag.cc:80
-#: ../src/tags/mp4_tag.cc:86 ../src/tags/ogg_header.c:228
+#: ../src/tags/ape_tag.c:63 ../src/tags/mp4_header.cc:58
+#: ../src/tags/mp4_header.cc:67 ../src/tags/mp4_tag.cc:65
+#: ../src/tags/mp4_tag.cc:78 ../src/tags/mp4_tag.cc:84
+#: ../src/tags/ogg_header.c:227
 #, c-format
-#| msgid "Error while opening file: '%s' (%s)"
 msgid "Error while opening file: %s"
 msgstr "Greška otvaranja datoteke: %s"
 
-#: ../src/tags/ape_tag.c:370
+#: ../src/tags/ape_tag.c:385
 msgid "Failed to write APE tag"
 msgstr "Nisam uspeo da zapišem APE oznaku"
 
-#: ../src/tags/flac_header.c:213
-#| msgid "Error reading file (%s)"
+#: ../src/tags/flac_header.c:85 ../src/tags/flac_tag.c:123
 msgid "Error opening FLAC file"
 msgstr "Greška otvaranja FLAC datoteke"
 
-#: ../src/tags/flac_header.c:300
+#: ../src/tags/flac_header.c:172
 msgid "FLAC File"
 msgstr "FLAC datoteka"
 
@@ -4962,47 +4559,26 @@ msgstr "FLAC datoteka"
 #. Mode
 #. mpeg4ip library seems to always return -1
 #. Mode
-#: ../src/tags/flac_header.c:313 ../src/tags/mp4_header.cc:152
-#: ../src/tags/ogg_header.c:417 ../src/tags/opus_header.c:236
-#: ../src/tags/wavpack_header.c:96
+#: ../src/tags/flac_header.c:185 ../src/tags/mp4_header.cc:152
+#: ../src/tags/ogg_header.c:416 ../src/tags/opus_header.c:233
+#: ../src/tags/wavpack_header.c:151
 msgid "Channels:"
 msgstr "Br. kanala:"
 
-#: ../src/tags/flac_tag.c:362 ../src/tags/ogg_tag.c:292
-#, c-format
-#| msgid ""
-#| "The year value '%s' seems to be invalid in file '%s'. The information "
-#| "will be lost while saving tag."
-msgid ""
-"The year value ‘%s’ seems to be invalid in file ‘%s’. The information will "
-"be lost when saving"
-msgstr ""
-"Vrednost godine „%s“ izgleda da nije ispravna u datoteci „%s“. Podatak će "
-"biti izgubljen prilikom čuvanja."
-
-#: ../src/tags/flac_tag.c:866 ../src/tags/flac_tag.c:878
+#: ../src/tags/flac_tag.c:845 ../src/tags/flac_tag.c:878
+#: ../src/tags/flac_tag.c:892
 #, c-format
-#| msgid "Error while opening file: '%s' as FLAC (%s)."
 msgid "Error while opening file ‘%s’ as FLAC: %s"
 msgstr "Greška pri otvaranju datoteke „%s“ kao FLAC: %s"
 
-#: ../src/tags/flac_tag.c:1098
-#, c-format
-#| msgid "Picture block isn't valid: '%s'"
-msgid "Picture block is invalid ‘%s’"
-msgstr "Blok slike nije ispravan „%s“"
-
-#: ../src/tags/flac_tag.c:1135
+#: ../src/tags/flac_tag.c:1185 ../src/tags/flac_tag.c:1197
+#: ../src/tags/flac_tag.c:1217
 #, c-format
-#| msgid "Error: Failed to write comments to file '%s' (%s)."
 msgid "Failed to write comments to file ‘%s’: %s"
 msgstr "Nisam uspeo da upišem napomene u datoteku „%s“: %s"
 
-#: ../src/tags/id3_tag.c:212
+#: ../src/tags/id3_tag.c:206
 #, c-format
-#| msgid ""
-#| "As the following corrupted file '%s' will cause an error in id3lib, it "
-#| "will not be processed"
 msgid ""
 "As the following corrupted file ‘%s’ will cause an error in id3lib, it will "
 "not be processed"
@@ -5010,31 +4586,27 @@ msgstr ""
 "Sledeća oštećena datoteka „%s“ neće biti obrađena, zato što će prouzrokovati "
 "grešku u id3bibl"
 
-#: ../src/tags/id3_tag.c:214
+#: ../src/tags/id3_tag.c:208
 msgid "Corrupted file"
 msgstr "Oštećena datoteka"
 
 #: ../src/tags/id3_tag.c:596
 #, c-format
-#| msgid "Removed tag of '%s'"
 msgid "Removed tag of ‘%s’"
 msgstr "Uklonjena je oznaka iz „%s“"
 
 #: ../src/tags/id3_tag.c:603 ../src/tags/id3_tag.c:730
 #, c-format
-#| msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgid "Error while removing ID3v1 tag of ‘%s’: %s"
 msgstr "Greška pri uklanjanju ID3v1 oznake iz „%s“: %s"
 
 #: ../src/tags/id3_tag.c:612 ../src/tags/id3_tag.c:693
 #, c-format
-#| msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgid "Error while removing ID3v2 tag of ‘%s’: %s"
 msgstr "Greška pri uklanjanju ID3v2 oznake iz „%s“: %s"
 
 #: ../src/tags/id3_tag.c:638
 #, c-format
-#| msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgid "Error while updating ID3v2 tag of ‘%s’: %s"
 msgstr "Greška pri ažuriranju ID3v2 oznake u „%s“: %s"
 
@@ -5071,7 +4643,6 @@ msgstr "Loša id3bibl"
 
 #: ../src/tags/id3_tag.c:718
 #, c-format
-#| msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgid "Error while updating ID3v1 tag of ‘%s’: %s"
 msgstr "Greška pri ažuriranju ID3v1 oznake u „%s“: %s"
 
@@ -5139,55 +4710,29 @@ msgstr "Nepoznata poruka o grešci"
 msgid "Error while creating temporary file"
 msgstr "Greška prilikom stvaranja privremene datoteke"
 
-#: ../src/tags/id3v24_tag.c:138 ../src/tags/id3v24_tag.c:193
-#: ../src/tags/mp4_tag.cc:96
-#| msgid "Error reading tags from file: '%s'"
+#: ../src/tags/id3v24_tag.c:132 ../src/tags/id3v24_tag.c:187
+#: ../src/tags/id3v24_tag.c:225 ../src/tags/id3v24_tag.c:236
+#: ../src/tags/id3v24_tag.c:941 ../src/tags/id3v24_tag.c:948
+#: ../src/tags/id3v24_tag.c:974 ../src/tags/id3v24_tag.c:1014
+#: ../src/tags/mp4_tag.cc:94
 msgid "Error reading tags from file"
 msgstr "Greška čitanja oznaka iz datoteke"
 
-#. 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/tags/id3v24_tag.c:1663
-#, 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] "Ne mogu da upišem oznaku u datoteku „%s“ (%s bajt nedostaje)"
-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/tags/id3v24_tag.c:1686
-#, c-format
-#| msgid "Cannot save tag of file '%s'"
-msgid "Cannot save tag of file ‘%s’"
-msgstr "Ne mogu da sačuvam oznaku datoteke „%s“"
-
-#: ../src/tags/id3v24_tag.c:1698
-#, c-format
-#| msgid "Size error while saving tag of '%s'"
-msgid "Size error while saving tag of ‘%s’"
-msgstr "Greška veličine pri čuvanju oznake za „%s“"
-
-#: ../src/tags/monkeyaudio_header.c:47
-#| msgid "Monkey's Audio File"
+#: ../src/tags/monkeyaudio_header.c:46
 msgid "Error opening Monkey’s Audio file"
 msgstr "Greška otvaranja Monkijeve zvučne datoteke"
 
 #. Mode changed to profile name
-#: ../src/tags/monkeyaudio_header.c:79 ../src/tags/musepack_header.c:82
+#: ../src/tags/monkeyaudio_header.c:78 ../src/tags/musepack_header.c:81
 msgid "Profile:"
 msgstr "Profil:"
 
-#: ../src/tags/mp4_header.cc:68 ../src/tags/mp4_tag.cc:87
-#: ../src/tags/mp4_tag.cc:283
+#: ../src/tags/mp4_header.cc:68 ../src/tags/mp4_tag.cc:85
+#: ../src/tags/mp4_tag.cc:281
 msgid "MP4 format invalid"
 msgstr "MP4 zapis je neispravan"
 
 #: ../src/tags/mp4_header.cc:77
-#| msgid "Error reading properties from file: '%s'"
 msgid "Error reading properties from file"
 msgstr "Greška čitanja svojstava iz datoteke"
 
@@ -5195,123 +4740,154 @@ msgstr "Greška čitanja svojstava iz datoteke"
 msgid "MP4/AAC File"
 msgstr "MP4/AAC datoteka"
 
-#: ../src/tags/mp4_header.cc:140 ../src/tags/mpeg_header.c:236
+#: ../src/tags/mp4_header.cc:140 ../src/tags/mpeg_header.c:235
 #, c-format
 msgid "~%d kb/s"
 msgstr "~%d kb/s"
 
-#: ../src/tags/mp4_tag.cc:259 ../src/tags/mp4_tag.cc:276
-#: ../src/tags/mp4_tag.cc:282
+#: ../src/tags/mp4_tag.cc:257 ../src/tags/mp4_tag.cc:274
+#: ../src/tags/mp4_tag.cc:280
 #, c-format
-#| msgid "Error while opening file: '%s' (%s)"
 msgid "Error while opening file ‘%s’: %s"
 msgstr "Greška otvaranja datoteke „%s“: %s"
 
-#: ../src/tags/mp4_tag.cc:294
+#: ../src/tags/mp4_tag.cc:292
 #, c-format
-#| msgid "Error reading tags from file: '%s'"
 msgid "Error reading tags from file ‘%s’"
 msgstr "Greška čitanja oznaka iz datoteke „%s“"
 
-#: ../src/tags/mpeg_header.c:51
+#: ../src/tags/mpeg_header.c:50
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../src/tags/mpeg_header.c:52
+#: ../src/tags/mpeg_header.c:51
 msgid "Joint stereo"
 msgstr "Pridruženi stereo"
 
-#: ../src/tags/mpeg_header.c:53
+#: ../src/tags/mpeg_header.c:52
 msgid "Dual channel"
 msgstr "Dva kanala"
 
-#: ../src/tags/mpeg_header.c:54
+#: ../src/tags/mpeg_header.c:53
 msgid "Single channel"
 msgstr "Jedan kanal"
 
-#: ../src/tags/mpeg_header.c:206
+#: ../src/tags/mpeg_header.c:205
 msgid "MP3 File"
 msgstr "MP3 datoteka"
 
-#: ../src/tags/mpeg_header.c:209
+#: ../src/tags/mpeg_header.c:208
 msgid "MP2 File"
 msgstr "MP2 datoteka"
 
 #. MPEG, Layer versions
-#: ../src/tags/mpeg_header.c:216
+#: ../src/tags/mpeg_header.c:215
 msgid "MPEG"
 msgstr "MPEG"
 
-#: ../src/tags/musepack_header.c:47
-#| msgid "Error while creating temporary file"
+#: ../src/tags/musepack_header.c:46
 msgid "Error opening Musepack file"
 msgstr "Greška otvaranja Mjuzpak datoteke"
 
-#: ../src/tags/musepack_header.c:79
+#: ../src/tags/musepack_header.c:78
 msgid "MusePack File"
 msgstr "MjuzPak datoteka"
 
-#: ../src/tags/ogg_header.c:244
-#| msgid ""
-#| "Ogg Vorbis: The specified bitstream does not exist or the file has been "
-#| "initialized improperly (file: '%s')."
+#: ../src/tags/ogg_header.c:243
 msgid ""
 "The specified bitstream does not exist or the file has been initialized "
 "improperly"
 msgstr "Izabrani bitski tok ne postoji ili je datoteka loše započeta"
 
-#: ../src/tags/ogg_header.c:263
-#| msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
+#: ../src/tags/ogg_header.c:262
 msgid "Read from media returned an error"
 msgstr "Čitanje sa medijuma je izazvalo grešku"
 
-#: ../src/tags/ogg_header.c:266
-#| msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
+#: ../src/tags/ogg_header.c:265
 msgid "Bitstream is not Vorbis data"
 msgstr "Bitski tok nije Vorbis podatak"
 
-#: ../src/tags/ogg_header.c:269
-#| msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
+#: ../src/tags/ogg_header.c:268
 msgid "Vorbis version mismatch"
 msgstr "Izdanje Vorbisa ne odgovara"
 
-#: ../src/tags/ogg_header.c:272
-#| msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
+#: ../src/tags/ogg_header.c:271
 msgid "Invalid Vorbis bitstream header"
 msgstr "Pogrešno zaglavlje bitskog toka Vorbisa"
 
-#: ../src/tags/ogg_header.c:275
-#| msgid ""
-#| "Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack "
-#| "corruption (file: '%s')."
+#: ../src/tags/ogg_header.c:274
 msgid "Internal logic fault, indicates a bug or heap/stack corruption"
 msgstr ""
 "Unutarnja logička greška, ukazuje na grešku u programu ili gomilu oštećenja"
 
-#: ../src/tags/ogg_header.c:326
+#: ../src/tags/ogg_header.c:325
 #, c-format
-#| msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
 msgid "Failed to open file as Vorbis: %s"
 msgstr "Nisam uspeo da otvorim datoteku kao Vorbis: %s"
 
-#: ../src/tags/ogg_header.c:389
+#: ../src/tags/ogg_header.c:388
 msgid "Ogg Vorbis File"
 msgstr "Ogg Vorbis datoteka"
 
-#: ../src/tags/ogg_header.c:392
+#: ../src/tags/ogg_header.c:391
 msgid "Speex File"
 msgstr "Spiks datoteka"
 
-#: ../src/tags/ogg_tag.c:699 ../src/tags/ogg_tag.c:889
-#, c-format
-#| msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
-msgid "The Ogg Vorbis file ‘%s’ contains an ID3v2 tag"
-msgstr "Ogg Vorbis datoteka „%s“ sadrži ID3v2 oznaku"
-
-#: ../src/tags/opus_header.c:223
+#: ../src/tags/opus_header.c:220
 msgid "Opus File"
 msgstr "Opus datoteka"
 
-#: ../src/tags/wavpack_header.c:83
+#: ../src/tags/wavpack_header.c:138
 msgid "Wavpack File"
-msgstr "Vejvpak datoteka"
\ No newline at end of file
+msgstr "Vejvpak datoteka"
+
+#~| msgid "Convert ' ' to '_'"
+#~ msgid "Convert ‘ ’ to ‘_’"
+#~ msgstr "Prevedi „ “ u „_“"
+
+#~| msgid "Can't load file: '%s' (%s)."
+#~ msgid "Cannot load file ‘%s’: %s"
+#~ msgstr "Ne mogu da učitam datoteku „%s“: %s"
+
+#~| msgid "Cannot create or open file '%s' (%s)"
+#~ msgid "Cannot create or open file ‘%s’: %s"
+#~ msgstr "Ne mogu da napravim ili otvorim datoteku „%s“: %s"
+
+#~| msgid "Error while writing list file: %s"
+#~ msgid "Error while writing list file ‘%s’"
+#~ msgstr "Greška prilikom pisanja datoteke spiska „%s“"
+
+#~| msgid "Migrating configuration from directory '%s' to '%s'"
+#~ msgid "Migrating configuration from directory ‘%s’ to ‘%s’"
+#~ msgstr "Selim podešavanja iz direktorijuma „%s“ u „%s“"
+
+#~| msgid "Failed to migrate configuration file '%s'"
+#~ msgid "Failed to migrate configuration file ‘%s’"
+#~ msgstr "Nisam uspeo da preselim datoteku podešavanja „%s“"
+
+#~| msgid "Error: Cannot create directory '%s' (%s)"
+#~ msgid "Cannot create directory ‘%s’: %s"
+#~ msgstr "Ne mogu da napravim direktorijum „%s“: %s"
+
+#~| msgid "Picture block isn't valid: '%s'"
+#~ msgid "Picture block is invalid ‘%s’"
+#~ msgstr "Blok slike nije ispravan „%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] "Ne mogu da upišem oznaku u datoteku „%s“ (%s bajt nedostaje)"
+#~ 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)"
+
+#~| msgid "Cannot save tag of file '%s'"
+#~ msgid "Cannot save tag of file ‘%s’"
+#~ msgstr "Ne mogu da sačuvam oznaku datoteke „%s“"
+
+#~| msgid "Size error while saving tag of '%s'"
+#~ msgid "Size error while saving tag of ‘%s’"
+#~ msgstr "Greška veličine pri čuvanju oznake za „%s“"
+
+#~| msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
+#~ msgid "The Ogg Vorbis file ‘%s’ contains an ID3v2 tag"
+#~ msgstr "Ogg Vorbis datoteka „%s“ sadrži ID3v2 oznaku"
diff --git a/po/tr.po b/po/tr.po
index 10127ba..c64308c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the easytag package.
 # Osman Karagöz <osmank3 at gmail.com>, 2013.
 # Gökhan Gurbetoğlu <ggurbet at gmail.com>, 2013.
+# Muhammet Kara <muhammetk at gmail.com>, 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: 2013-09-29 11:58+0000\n"
-"PO-Revision-Date: 2013-09-29 17:35+0300\n"
-"Last-Translator: Gökhan Gurbetoğlu <ggurbet at gmail.com>\n"
+"POT-Creation-Date: 2014-11-28 21:47+0000\n"
+"PO-Revision-Date: 2014-12-13 10:21+0200\n"
+"Last-Translator: Muhammet Kara <muhammetk at gmail.com>\n"
 "Language-Team: Türkçe <gnome-turk at gnome.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
@@ -20,4935 +21,6526 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../data/easytag.desktop.in.h:1
-msgid "Sound File Metadata Editor"
-msgstr "Ses Dosyası Üstveri Düzenleyici"
-
-#: ../data/easytag.desktop.in.h:2
-msgid "Edit sound file metadata"
-msgstr "Ses dosyası üstveri düzenle"
+#. Name and summary taken from the desktop file.
+#: ../data/easytag.appdata.xml.in.h:2 ../data/easytag.desktop.in.h:1
+msgid "EasyTAG"
+msgstr "EasyTAG"
 
-#. 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;etiket;ses;"
+#: ../data/easytag.appdata.xml.in.h:3 ../data/easytag.desktop.in.h:3
+#| msgid "Edit sound file metadata"
+msgid "Edit audio file metadata"
+msgstr "Ses dosyası üstverilerini düzenleyin"
 
-#: ../src/about.c:91
+#: ../data/easytag.appdata.xml.in.h:4
 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/>."
+"View and edit tags for MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg "
+"Vorbis, MusePack, Monkey's Audio and WavPack files."
 msgstr ""
-"Bu program özgür bir yazılımdır, onu Özgür Yazılım Vakfı'nın yayınladığı GNU "
-"Genel Kamu Lisansı'nın 2. sürümü veya (tercihinize bağlı) daha sonraki "
-"sürümleri altında dağıtabilir ve/veya değiştirebilirsiniz.\n"
-"\n"
-"Bu program kullanışlı olması amacıyla dağıtılmıştır, ancak HİÇBİR GARANTİSİ "
-"YOKTUR; hatta SATILABİLİRLİK ya da BİR AMACA HİZMET gibi garantisi de "
-"yoktur. Daha fazla ayrıntı için GNU Genel Kamu Lisansı'na bakın.\n"
-"\n"
-"Bu yazılımla birlikte GNU Genel Kamu Lisansının bir kopyasına sahip "
-"olmalısınız. Eğer yoksa, <http://www.gnu.org/licenses/> adresine "
-"bakabilirsiniz."
+"MP3, MP2, MP4/AAC, FLAC, Ogg Opus, Ogg Speex, Ogg Vorbis, MusePack, Monkey's "
+"Audio ve WavPack dosyalarının etiketlerini görüntüleyin ve düzenleyin."
 
-#. Translators: put your own name here to appear in the about dialog.
-#: ../src/about.c:108
-msgid "translator-credits"
-msgstr "Osman Karagöz <osmank3 at gmail.com>"
+#: ../data/easytag.appdata.xml.in.h:5
+msgid ""
+"Look up albums in online databases, bulk edit tags, create playlists and "
+"rename a collection of files."
+msgstr ""
+"Çevrimiçi veritabanlarında albümleri arayın, etiketleri topluca düzenleyin, "
+"çalma listeleri oluşturun ve bir grup dosyayı yeniden adlandrın."
 
-#: ../src/about.c:118
-msgid "View and edit tags in audio files"
-msgstr "Ses dosyalarının etiketlerini görüntüle ve düzenle"
+#: ../data/easytag.appdata.xml.in.h:6
+msgid ""
+"A simple and nice GTK+ interface makes tagging easier under GNU/Linux and "
+"Windows."
+msgstr ""
+"Basit ve hoş GTK+ arayüzü; GNU/Linux ve Windows ortamında etiketlemeyi "
+"kolaylaştırır."
 
-#. 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 "Dosya açılamadı: '%s' (%s)."
+#: ../data/easytag.desktop.in.h:2
+#| msgid "Sound File Metadata Editor"
+msgid "Audio File Metadata Editor"
+msgstr "Ses Dosyası Üstveri Düzenleyici"
 
-#: ../src/application.c:37
-msgid "Print the version and exit"
-msgstr "Sürümü yazdır ve çık"
+#. 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:5
+#| msgid "mp3;tag;audio;"
+msgid "mp3;tag;audio;music;"
+msgstr "mp3;etiket;ses;müzik;"
+
+#: ../data/easytag-nautilus.metainfo.xml.in.h:1
+#: ../nautilus-extension/nautilus-easytag.c:247
+msgid "Open with EasyTAG"
+msgstr "EasyTAG ile Aç"
+
+#: ../data/easytag-nautilus.metainfo.xml.in.h:2
+msgid "Open directories and audio files with EasyTAG using the context menu"
+msgstr ""
+"Bağlam menüsünü kullanarak, dizinleri ve ses dosyalarını EasyTAG ile açın"
 
-#: ../src/application.c:89
-#, c-format
-msgid "Website: %s"
-msgstr "Web sitesi: %s"
+#: ../data/browser.ui.h:1
+msgid "Browse Directory With"
+msgstr "Dizine Birlikte Gözat"
 
-#: ../src/application.c:98
-msgid "- Tag and rename audio files"
-msgstr "- Ses dosyalarını etiketle ve adını değiştir"
+#: ../data/browser.ui.h:2
+msgid "Run Program"
+msgstr "Program Çalıştır"
 
-#.
-#. * Main Menu Actions
-#.
-#: ../src/bar.c:154
-msgid "_File"
-msgstr "_Dosya"
+#: ../data/browser.ui.h:3
+#| msgid ""
+#| "Enter the program to run. It will receive the current directory as "
+#| "parameter."
+msgid ""
+"Enter the program to run; it will receive the current directory as a "
+"parameter"
+msgstr ""
+"Çalıştırmak için program adı girin; program bulunulan dizini parametre "
+"olarak alır"
+
+#: ../data/browser.ui.h:4 ../src/browser.c:3775 ../src/tag_area.c:1492
+msgid "_Open"
+msgstr "_Aç"
+
+#: ../data/browser.ui.h:5 ../data/tag_area.ui.h:3
+#: ../src/application_window.c:324 ../src/application_window.c:338
+#: ../src/application_window.c:2686 ../src/application_window.c:2724
+#: ../src/browser.c:865 ../src/browser.c:3774 ../src/cddb_dialog.c:2303
+#: ../src/easytag.c:495 ../src/easytag.c:502 ../src/easytag.c:627
+#: ../src/playlist_dialog.c:655 ../src/tag_area.c:1490 ../src/tag_area.c:1853
+msgid "_Cancel"
+msgstr "_Vazgeç"
+
+#: ../data/browser.ui.h:6
+msgid "_Execute"
+msgstr "_Çalıştır"
+
+#: ../data/browser.ui.h:7
+msgid "Open Files With"
+msgstr "Dosyaları Birlikte Aç"
 
-#: ../src/bar.c:155
-msgid "Sort List by Tag"
-msgstr "Etikete Göre Sırala"
+#: ../data/browser.ui.h:8
+#, fuzzy
+#| msgid ""
+#| "Enter the program to run. It will receive the current file as parameter."
+msgid ""
+"Enter the program to run; it will receive the current files as a parameter"
+msgstr ""
+"Çalıştırmak için program adı girin. Program şuanki dosyayı parametre olarak "
+"alır."
 
-#: ../src/bar.c:158
-msgid "Sort List by Property"
-msgstr "Özelliğe Göre Sırala"
+#. Only directories changed
+#: ../data/browser.ui.h:9 ../data/menus.ui.h:99 ../src/easytag.c:593
+msgid "Rename Directory"
+msgstr "Dizini Yeniden Adlandır"
 
-#: ../src/bar.c:159
-msgid "Ascending by filename"
-msgstr "Dosya adına göre artan"
+#: ../data/browser.ui.h:10
+#, fuzzy
+#| msgid "User Name:"
+msgid "Literal name:"
+msgstr "Kullanıcı Adı:"
 
-#: ../src/bar.c:160
-msgid "Descending by filename"
-msgstr "Dosya adına göre azalan"
+#: ../data/browser.ui.h:11 ../data/playlist_dialog.ui.h:2
+msgid "Use mask:"
+msgstr "Maske Kullan:"
 
-#: ../src/bar.c:161
-msgid "Ascending by creation date"
-msgstr "Oluşturma tarihine göre artan"
+#: ../data/browser.ui.h:12 ../data/org.gnome.EasyTAG.gschema.xml.h:188
+#, fuzzy
+#| msgid "Unable to create setting directories"
+msgid "Whether to use a mask when renaming directories"
+msgstr "Ayar dizin, oluşturulamadı"
 
-#: ../src/bar.c:162
-msgid "Descending by creation date"
-msgstr "Oluşturma tarihine göre azalan"
+#: ../data/browser.ui.h:13
+#, fuzzy
+#| msgid ""
+#| "Select or type in a mask using codes (see Legend in Scanner Window) to "
+#| "rename the directory from tag fields."
+msgid ""
+"Select or type in a mask using codes (see Legend in Scanner Window) to "
+"rename the directory from tag fields"
+msgstr ""
+"Dizini yeniden adlandırmak için etiket alanlarından maske kodunu (Tarayıcı "
+"Penceresinden Maske Biçilerine bakın) seçin veya yazın"
 
-#: ../src/bar.c:163
-msgid "Ascending by track number"
-msgstr "Parça numarasına göre artan"
+#: ../data/browser.ui.h:14
+msgid "Rename directory preview"
+msgstr "Dizin yeniden adlandırma önizlemesix"
 
-#: ../src/bar.c:164
-msgid "Descending by track number"
-msgstr "Parça numarasına göre azalan"
+#: ../data/browser.ui.h:15
+#| msgid "Rename File"
+msgid "_Rename"
+msgstr "Yeniden adlandı_r"
 
-#: ../src/bar.c:165
-msgid "Ascending by title"
-msgstr "Başlığa göre artan"
+#: ../data/browser.ui.h:16
+#, fuzzy
+#| msgid "Enter a directory to browse."
+msgid "Choose a directory to show in the browser"
+msgstr "Gezinmek için dizin girin."
 
-#: ../src/bar.c:166
-msgid "Descending by title"
-msgstr "Başlığa göre azalan"
+#: ../data/browser.ui.h:17 ../src/application.c:129
+msgid "Select a directory to browse"
+msgstr "Gezinmek için dizin seçin"
 
-#: ../src/bar.c:167
-msgid "Ascending by artist"
-msgstr "Sanatçıya göre artan"
+#: ../data/browser.ui.h:18 ../src/easytag.c:1102
+msgid "No files"
+msgstr "Dosya yok"
 
-#: ../src/bar.c:168
-msgid "Descending by artist"
-msgstr "Sanatçıya göre azalan"
+#: ../data/browser.ui.h:19 ../data/cddb_dialog.ui.h:10
+#: ../data/preferences_dialog.ui.h:63 ../data/scan_dialog.ui.h:57
+#: ../data/search_dialog.ui.h:13
+msgid "Artist"
+msgstr "Sanatçı"
 
-#: ../src/bar.c:169
-msgid "Ascending by album artist"
-msgstr "Albüm sanatçısına göre artan"
+#: ../data/browser.ui.h:20
+msgid "# Albums"
+msgstr "# Albümler"
 
-#: ../src/bar.c:170
-msgid "Descending by album artist"
-msgstr "Albüm sanatçısına göre azalan"
+#: ../data/browser.ui.h:21
+msgid "# Files"
+msgstr "# Dosyalar"
 
-#: ../src/bar.c:171
-msgid "Ascending by album"
-msgstr "Albüme göre artan"
+#: ../data/browser.ui.h:22 ../data/cddb_dialog.ui.h:11
+#: ../data/preferences_dialog.ui.h:65 ../data/scan_dialog.ui.h:60
+#: ../data/search_dialog.ui.h:15
+msgid "Album"
+msgstr "Albüm"
 
-#: ../src/bar.c:172
-msgid "Descending by album"
-msgstr "Albüme göre azalan"
+#: ../data/browser.ui.h:23 ../data/cddb_dialog.ui.h:35
+#: ../data/playlist_dialog.ui.h:1 ../data/scan_dialog.ui.h:53
+#: ../data/search_dialog.ui.h:11
+msgid "Filename"
+msgstr "Dosya adı"
 
-#: ../src/bar.c:173
-msgid "Ascending by year"
-msgstr "Yıla göre artan"
+#: ../data/browser.ui.h:24 ../data/cddb_dialog.ui.h:36
+#: ../data/preferences_dialog.ui.h:61 ../data/scan_dialog.ui.h:55
+#: ../data/search_dialog.ui.h:12
+msgid "Title"
+msgstr "Başlık"
 
-#: ../src/bar.c:174
-msgid "Descending by year"
-msgstr "Yıla göre azalan"
+#: ../data/browser.ui.h:25 ../data/scan_dialog.ui.h:59
+#: ../data/search_dialog.ui.h:14
+msgid "Album Artist"
+msgstr "Albüm Sanatçısı"
 
-#: ../src/bar.c:175
-msgid "Ascending by genre"
-msgstr "Türe göre artan"
+#: ../data/browser.ui.h:26 ../data/cddb_dialog.ui.h:37
+#: ../data/search_dialog.ui.h:17
+msgid "Year"
+msgstr "Yıl"
 
-#: ../src/bar.c:176
-msgid "Descending by genre"
-msgstr "Türe göre azalan"
+#: ../data/browser.ui.h:27
+msgid "Disc"
+msgstr "Disk"
 
-#: ../src/bar.c:177
-msgid "Ascending by comment"
-msgstr "Yoruma göre artan"
+#: ../data/browser.ui.h:28 ../data/search_dialog.ui.h:18
+msgid "Track"
+msgstr "Parça"
 
-#: ../src/bar.c:178
-msgid "Descending by comment"
-msgstr "Yoruma göre azalan"
+#: ../data/browser.ui.h:29 ../data/cddb_dialog.ui.h:40
+#: ../data/preferences_dialog.ui.h:67 ../data/scan_dialog.ui.h:62
+#: ../data/search_dialog.ui.h:19
+msgid "Genre"
+msgstr "Tür"
 
-#: ../src/bar.c:179
-msgid "Ascending by composer"
-msgstr "Besteciye göre artan"
+#: ../data/browser.ui.h:30 ../data/preferences_dialog.ui.h:69
+#: ../data/scan_dialog.ui.h:64 ../data/search_dialog.ui.h:20
+msgid "Comment"
+msgstr "Yorum"
 
-#: ../src/bar.c:180
-msgid "Descending by composer"
-msgstr "Besteciye göre azalan"
+#: ../data/browser.ui.h:31 ../data/preferences_dialog.ui.h:71
+#: ../data/scan_dialog.ui.h:66 ../data/search_dialog.ui.h:21
+#: ../src/picture.c:237
+msgid "Composer"
+msgstr "Besteci"
 
-#: ../src/bar.c:181
-msgid "Ascending by original artist"
-msgstr "Asıl sanatçıya göre artan"
+#: ../data/browser.ui.h:32 ../data/search_dialog.ui.h:22
+msgid "Original Artist"
+msgstr "Asıl Sanatçı"
 
-#: ../src/bar.c:182
-msgid "Descending by original artist"
-msgstr "Asıl sanatçıya göre azalan"
+#: ../data/browser.ui.h:33 ../data/scan_dialog.ui.h:70
+#: ../data/search_dialog.ui.h:23
+msgid "Copyright"
+msgstr "Telif Hakkı"
 
-#: ../src/bar.c:183
-msgid "Ascending by copyright"
-msgstr "Telif hakkına göre artan"
+#: ../data/browser.ui.h:34 ../data/scan_dialog.ui.h:72
+#: ../data/search_dialog.ui.h:24
+msgid "URL"
+msgstr "Bağlantı"
 
-#: ../src/bar.c:184
-msgid "Descending by copyright"
-msgstr "Telif hakkına göre azalan"
+#: ../data/browser.ui.h:35 ../data/scan_dialog.ui.h:74
+#: ../data/search_dialog.ui.h:25
+msgid "Encoded By"
+msgstr "Kodlayıcı"
 
-#: ../src/bar.c:185
-msgid "Ascending by URL"
-msgstr "Bağlantıya göre artan"
+#: ../data/cddb_dialog.ui.h:1
+#| msgid "Search:"
+msgid "Search"
+msgstr "Ara"
 
-#: ../src/bar.c:186
-msgid "Descending by URL"
-msgstr "Bağlantıya göre azalan"
+#: ../data/cddb_dialog.ui.h:2
+#, fuzzy
+#| msgid "Enter the words to search (separated by a space or '+')"
+msgid "Enter the words to search (separated by a space or ‘+’)"
+msgstr "Aramak için kelimeleri girin (boşluk veya '+' ile ayrılır)"
 
-#. 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
-msgid "Ascending by encoder name"
-msgstr "Kodlayıcıya göre artan"
+#: ../data/cddb_dialog.ui.h:3
+#| msgid "Search:"
+msgid "_Search"
+msgstr "_Ara"
 
-#. 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
-msgid "Descending by encoder name"
-msgstr "Kodlayıcıya göre azalan"
+#: ../data/cddb_dialog.ui.h:4
+#, fuzzy
+#| msgid "Scan selected files"
+msgid "Search Using Selected _Files"
+msgstr "Seçilen dosyaları tara"
 
-#: ../src/bar.c:193
-msgid "Ascending by file type"
-msgstr "Dosya türüne göre artan"
+#: ../data/cddb_dialog.ui.h:5
+#, fuzzy
+#| msgid ""
+#| "Request automatically the CDDB using the selected files (the order is "
+#| "important) to generate the CddbID"
+msgid ""
+"Generate the CDDB disc ID using the selected files (the order is important)"
+msgstr ""
+"CddbID oluşturmak için seçilen dosyalarla (sıralama önemli) CDDB veritabanı "
+"isteğini otomatik olarak yap."
 
-#: ../src/bar.c:194
-msgid "Descending by file type"
-msgstr "Dosya türüne göre azalan"
+#: ../data/cddb_dialog.ui.h:6 ../data/toolbar.ui.h:31
+msgid "Stop"
+msgstr "Dur"
 
-#: ../src/bar.c:195
-msgid "Ascending by file size"
-msgstr "Dosya boyutuna göre artan"
+#: ../data/cddb_dialog.ui.h:7
+msgid "Stop the search"
+msgstr "Aramayı durdur"
 
-#: ../src/bar.c:196
-msgid "Descending by file size"
-msgstr "Dosya boyutuna göre azalan"
+#: ../data/cddb_dialog.ui.h:8
+#| msgid "Manual Search"
+msgid "Manual Search Options"
+msgstr "Elle Arama Seçenekleri"
 
-#: ../src/bar.c:197
-msgid "Ascending by duration"
-msgstr "Süreye göre artan"
+#: ../data/cddb_dialog.ui.h:9
+#, fuzzy
+#| msgid "CDDB Search Files…"
+msgid "Search Fields"
+msgstr "Dosyaları CDDB'de Ara…"
 
-#: ../src/bar.c:198
-msgid "Descending by duration"
-msgstr "Süreye göre azalan"
+#: ../data/cddb_dialog.ui.h:12
+msgid "Track Name"
+msgstr "Parça Adı"
 
-#: ../src/bar.c:199
-msgid "Ascending by bitrate"
-msgstr "Bit oranına göre artan"
+#: ../data/cddb_dialog.ui.h:13 ../data/preferences_dialog.ui.h:91
+#: ../src/picture.c:215
+msgid "Other"
+msgstr "Diğer"
 
-#: ../src/bar.c:200
-msgid "Descending by bitrate"
-msgstr "Bit oranına göre azalan"
+#: ../data/cddb_dialog.ui.h:14
+msgid "Categories"
+msgstr "Kategoriler"
 
-#: ../src/bar.c:201
-msgid "Ascending by samplerate"
-msgstr "Örnek oranına göre artan"
+#: ../data/cddb_dialog.ui.h:15
+msgid "Blues"
+msgstr "Blues"
 
-#: ../src/bar.c:202
-msgid "Descending by samplerate"
-msgstr "örnek oranına göre azalan"
+#: ../data/cddb_dialog.ui.h:16
+msgid "Classical"
+msgstr "Classical"
 
-#: ../src/bar.c:204
-msgid "Open Files With…"
-msgstr "Dosyaları Birlikte Aç…"
+#: ../data/cddb_dialog.ui.h:17
+msgid "Country"
+msgstr "Country"
 
-#: ../src/bar.c:205
-msgid "Run a command on the selected files"
-msgstr "Seçilen dosyalar için komut çalıştır"
+#: ../data/cddb_dialog.ui.h:18
+msgid "Folk"
+msgstr "Folk"
 
-#: ../src/bar.c:208
-msgid "Select all"
-msgstr "Hepsini seç"
+#: ../data/cddb_dialog.ui.h:19
+msgid "Jazz"
+msgstr "Jazz"
 
-#: ../src/bar.c:209
-msgid "Unselect All"
-msgstr "Hiçbirini Seçme"
+#: ../data/cddb_dialog.ui.h:20
+msgid "Misc."
+msgstr "Misc."
 
-#: ../src/bar.c:210
-msgid "Clear the current selection"
-msgstr "Geçerli seçimi temizle"
+#: ../data/cddb_dialog.ui.h:21
+msgid "New Age"
+msgstr "New Age"
 
-#: ../src/bar.c:213
-msgid "Invert File Selection"
-msgstr "Dosya Seçimini Tersine Çevir"
+#: ../data/cddb_dialog.ui.h:22
+msgid "Reggae"
+msgstr "Reggae"
 
-#: ../src/bar.c:214
-msgid "Invert file selection"
-msgstr "Dosya seçimini tersine çevir"
+#: ../data/cddb_dialog.ui.h:23
+msgid "Rock"
+msgstr "Rock"
 
-#: ../src/bar.c:216
-msgid "Delete Files"
-msgstr "Dosyaları Sil"
+#: ../data/cddb_dialog.ui.h:24
+msgid "Soundtrack"
+msgstr "Soundtrack"
 
-#: ../src/bar.c:216
-msgid "Delete files"
-msgstr "Dosyaları sil"
+#: ../data/cddb_dialog.ui.h:25
+#| msgid "Results:"
+msgid "Results"
+msgstr "Sonuçlar"
 
-#: ../src/bar.c:217
-msgid "_First File"
-msgstr "_İlk Dosya"
+#: ../data/cddb_dialog.ui.h:26
+msgid "Artist / Album"
+msgstr "Sanatçı / Albüm"
 
-#: ../src/bar.c:218
-msgid "First file"
-msgstr "İlk dosya"
+#: ../data/cddb_dialog.ui.h:27
+msgid "Category"
+msgstr "Kategori"
 
-#: ../src/bar.c:219
-msgid "_Previous File"
-msgstr "_Önceki Dosya"
+#: ../data/cddb_dialog.ui.h:28
+#, fuzzy
+#| 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."
+msgid ""
+"Select lines from which tags will be applied to your files list. All lines "
+"will be processed if no line is selected.\\nYou can also reorder lines in "
+"this list before using the ‘apply’ button"
+msgstr ""
+"Dosya listenize uygulamak için satır seçin. Seçim yapılmazsa tüm satırlar "
+"işlenir.\n"
+"'Uygula' düğmesine basmadan önce tekrar sıralayabilirsiniz."
 
-#: ../src/bar.c:219
-msgid "Previous file"
-msgstr "Önceki dosya"
+#: ../data/cddb_dialog.ui.h:29
+msgid "#"
+msgstr ""
 
-#: ../src/bar.c:220
-msgid "_Next File"
-msgstr "So_nraki Dosya"
+#: ../data/cddb_dialog.ui.h:30
+msgid "Duration"
+msgstr "Süre"
 
-#: ../src/bar.c:220
-msgid "Next file"
-msgstr "Sonraki dosya"
+#: ../data/cddb_dialog.ui.h:31
+msgid "Select all lines"
+msgstr "Tüm satırları seç"
 
-#: ../src/bar.c:221
-msgid "_Last File"
-msgstr "_Son Dosya"
-
-#: ../src/bar.c:222
-msgid "Last file"
-msgstr "Son dosya"
-
-#: ../src/bar.c:223
-msgid "S_can Files"
-msgstr "Dosyaları _Tara"
+#: ../data/cddb_dialog.ui.h:32
+#, fuzzy
+#| msgid "Invert lines selection"
+msgid "Invert line selection"
+msgstr "Satır seçimini tersine çevir"
 
-#: ../src/bar.c:224 ../src/scan.c:2353
-msgid "Scan selected files"
-msgstr "Seçilen dosyaları tara"
+#: ../data/cddb_dialog.ui.h:33
+msgid "Unselect all lines"
+msgstr "Hiçbir satırı seçme"
 
-#: ../src/bar.c:225
-msgid "_Remove Tags"
-msgstr "Etiketle_ri Sil"
+#: ../data/cddb_dialog.ui.h:34 ../data/menus.ui.h:24
+#, fuzzy
+#| msgid "Fill Tag"
+msgid "Fill Tags"
+msgstr "Etiketi Doldur"
 
-#: ../src/bar.c:226
-msgid "Remove tags"
-msgstr "Etiketleri sil"
+#: ../data/cddb_dialog.ui.h:38
+msgid "Track #"
+msgstr "Parça #"
 
-#: ../src/bar.c:227
-msgid "_Undo Last Files Changes"
-msgstr "Son Dosya Değişikliğini _Geri Al"
+#: ../data/cddb_dialog.ui.h:39
+msgid "# Tracks"
+msgstr "# Parçalar"
 
-#: ../src/bar.c:228
-msgid "Undo last files changes"
-msgstr "Son dosya değişikliklerini geri al"
+#: ../data/cddb_dialog.ui.h:41 ../data/load_files_dialog.ui.h:13
+msgid "Run the current scanner for each file"
+msgstr "Şuanki tarayıcıyı tüm dosyalar için çalıştır"
 
-#: ../src/bar.c:230
-msgid "R_edo Last Files Changes"
-msgstr "Son Dosya Değişikliğini Yin_ele"
+#: ../data/cddb_dialog.ui.h:42 ../data/org.gnome.EasyTAG.gschema.xml.h:38
+msgid ""
+"Whether to run the tag scanner, with the current settings, on the CDDB "
+"results"
+msgstr ""
 
-#: ../src/bar.c:231
-msgid "Redo last files changes"
-msgstr "Son dosya değişikliklerini yinele"
+#: ../data/cddb_dialog.ui.h:43
+msgid "Match lines with the Levenshtein algorithm"
+msgstr "Satırları Levenshtein algoritmasıyla eşleştir"
 
-#: ../src/bar.c:233
-msgid "_Save Files"
-msgstr "Do_syaları Kaydet"
+#: ../data/cddb_dialog.ui.h:44 ../data/preferences_dialog.ui.h:148
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:24
+msgid "Whether to use the DLM algorithm to match CDDB results to files"
+msgstr ""
 
-#: ../src/bar.c:234
-msgid "Save changes to selected files"
-msgstr "Seçilen dosyalardaki değişiklikleri kaydet"
+#: ../data/cddb_dialog.ui.h:45 ../data/search_dialog.ui.h:10
+#: ../src/load_files_dialog.c:895 ../src/preferences_dialog.c:295
+#: ../src/scan_dialog.c:2259
+msgid "_Close"
+msgstr "_Kapat"
 
-#: ../src/bar.c:236
-msgid "_Force Save Files"
-msgstr "Dosyaları Kaydetmeye _Zorla"
+#: ../data/cddb_dialog.ui.h:46 ../src/cddb_dialog.c:2304
+#: ../src/load_files_dialog.c:896
+msgid "_Apply"
+msgstr "Uygul_a"
 
-#: ../src/bar.c:237
-msgid "Force saving files"
-msgstr "Dosyaları kaydetmeye zorla"
+#: ../data/cddb_dialog.ui.h:47
+#, fuzzy
+#| msgid "Load the selected lines or all lines (if no line selected)."
+msgid "Load the selected lines or all lines (if no lines are selected)"
+msgstr "Seçilen satırları veya tüm satırları (hiçbir satır seçilmemişse) yükle"
 
-#: ../src/bar.c:239
-msgid "Undo Last Changes"
-msgstr "Son Değişiklikleri Geri Al"
+#. Default values are MPEG data.
+#: ../data/file_area.ui.h:1 ../src/et_core.c:3034 ../src/file_area.c:192
+msgid "File"
+msgstr "Dosya"
 
-#: ../src/bar.c:239
-msgid "Undo last changes"
-msgstr "Son değişiklikleri geri al"
+#: ../data/file_area.ui.h:2
+msgid "0/0:"
+msgstr "0/0:"
 
-#: ../src/bar.c:240
-msgid "Redo Last Changes"
-msgstr "Son Değişiklikleri Yinele"
+#. Nothing to display
+#. Version changed to encoder version
+#. Encoder version
+#: ../data/file_area.ui.h:3 ../src/file_area.c:193
+#: ../src/tags/flac_header.c:303 ../src/tags/monkeyaudio_header.c:89
+#: ../src/tags/musepack_header.c:93 ../src/tags/ogg_header.c:399
+#: ../src/tags/opus_header.c:225 ../src/tags/wavpack_header.c:86
+msgid "Encoder:"
+msgstr "Kodlayıcı:"
 
-#: ../src/bar.c:240
-msgid "Redo last changes"
-msgstr "Son değişiklikleri yinele"
+#: ../data/file_area.ui.h:4
+msgid "Bitrate:"
+msgstr "Bit oranı:"
 
-#: ../src/bar.c:241
-msgid "_Quit"
-msgstr "_Çıkış"
+#: ../data/file_area.ui.h:5
+msgid "Sample rate:"
+msgstr "Örnek hızı:"
 
-#: ../src/bar.c:241 ../src/easytag.c:2424 ../src/easytag.c:4574
-#: ../src/easytag.c:4602
-msgid "Quit"
-msgstr "Çıkış"
+#. Mode
+#: ../data/file_area.ui.h:6 ../src/file_area.c:197
+#: ../src/tags/mpeg_header.c:248
+msgid "Mode:"
+msgstr "Kip:"
 
-#: ../src/bar.c:244
-msgid "_Browser"
-msgstr "G_ezgin"
+#: ../data/file_area.ui.h:7
+msgid "Size:"
+msgstr "Boyut:"
 
-#: ../src/bar.c:245
-msgid "_Home Directory"
-msgstr "_Ev Dizini"
+#: ../data/file_area.ui.h:8
+msgid "Duration:"
+msgstr "Süre:"
 
-#: ../src/bar.c:246
-msgid "Go to home directory"
-msgstr "Ev dizinine git"
+#: ../data/log_area.ui.h:1 ../data/preferences_dialog.ui.h:14
+msgid "Log"
+msgstr "Günlük"
 
-#: ../src/bar.c:248
-msgid "Desktop Directory"
-msgstr "Masaüstü Dizini"
+#: ../data/load_files_dialog.ui.h:1
+msgid "File:"
+msgstr "Dosya:"
 
-#: ../src/bar.c:249
-msgid "Go to desktop directory"
-msgstr "Masaüstü dizinine git"
+#: ../data/load_files_dialog.ui.h:2
+#| msgid "Content of Text File"
+msgid "Choose a Text File"
+msgstr "Metin Dosyası Seç"
 
-#: ../src/bar.c:251
-msgid "Documents Directory"
-msgstr "Belgeler Dizini"
+#: ../data/load_files_dialog.ui.h:3
+#| msgid " Load "
+msgid "_Load"
+msgstr "Yük_le "
 
-#: ../src/bar.c:252
-msgid "Go to documents directory"
-msgstr "Belgeler dizinine git"
+#: ../data/load_files_dialog.ui.h:4
+msgid "Content of Text File"
+msgstr "Metin Dosyası İçeriği"
 
-#: ../src/bar.c:254
-msgid "Downloads Directory"
-msgstr "İndirilenler Dizini"
+#: ../data/load_files_dialog.ui.h:5
+msgid "Insert a blank line before the selected line"
+msgstr "Seçilen satırdan önce boş satır bırak"
 
-#: ../src/bar.c:255
-msgid "Go to downloads directory"
-msgstr "İndirilenler dizinine git"
+#: ../data/load_files_dialog.ui.h:6
+msgid "Delete the selected line"
+msgstr "Seçilen satırı sil"
 
-#: ../src/bar.c:257
-msgid "Music Directory"
-msgstr "Müzik Dizini"
+#: ../data/load_files_dialog.ui.h:7 ../src/load_files_dialog.c:636
+#: ../src/load_files_dialog.c:739
+msgid "Delete all blank lines"
+msgstr "Tüm boş satırları sil"
 
-#: ../src/bar.c:258
-msgid "Go to music directory"
-msgstr "Müzik dizinine git"
+#: ../data/load_files_dialog.ui.h:8
+#| msgid "Move up the selected line"
+msgid "Move the selected line up"
+msgstr "Seçilen satırı yukarı taşı"
 
-#: ../src/bar.c:260
-msgid "_Parent Directory"
-msgstr "_Üst Dizin"
+#: ../data/load_files_dialog.ui.h:9
+#| msgid "Move up the selected line"
+msgid "Move the selected line down"
+msgstr "Seçilen satırı aşağı taşı"
 
-#: ../src/bar.c:261
-msgid "Go to parent directory"
-msgstr "Üst dizine git"
+#: ../data/load_files_dialog.ui.h:10 ../src/load_files_dialog.c:654
+#: ../src/load_files_dialog.c:757
+msgid "Reload"
+msgstr "Yenile"
 
-#: ../src/bar.c:263
-msgid "_Default Directory"
-msgstr "_Öntanımlı Dizin"
+#: ../data/load_files_dialog.ui.h:11
+msgid "List of Files"
+msgstr "Dosya Listesi"
 
-#: ../src/bar.c:264
-msgid "Go to default directory"
-msgstr "Öntanımlı dizine git"
+#: ../data/load_files_dialog.ui.h:12
+msgid "Selected line:"
+msgstr "Seçilen satır:"
 
-#: ../src/bar.c:266
-msgid "Set _Current Path as Default"
-msgstr "Bulunulan Dizini Öntan_ımlı Olarak Ayarla"
+#: ../data/load_files_dialog.ui.h:14
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:131
+#, fuzzy
+#| msgid "Run the current scanner for each file"
+msgid "Whether to run the current scanner on files loaded from a text file"
+msgstr "Şuanki tarayıcıyı tüm dosyalar için çalıştır"
 
-#: ../src/bar.c:266
-msgid "Set current path as default"
-msgstr "Bulunulan dizini öntanımlı olarak ayarla"
+#: ../data/menus.ui.h:1
+msgid "_Help"
+msgstr "_Yardım"
 
-#: ../src/bar.c:267
-msgid "Rename Directory…"
-msgstr "Dizini Yeniden Adlandır…"
+#: ../data/menus.ui.h:2
+msgid "_About"
+msgstr "_Hakkında"
 
-#: ../src/bar.c:267
-msgid "Rename directory"
-msgstr "Dizini yeniden adlandır"
+#: ../data/menus.ui.h:3 ../src/application_window.c:2725
+msgid "_Quit"
+msgstr "_Çıkış"
 
-#: ../src/bar.c:268
-msgid "Reload Directory"
-msgstr "Dizini Tekrar Yükle"
+#: ../data/menus.ui.h:4
+msgid "_File"
+msgstr "_Dosya"
 
-#: ../src/bar.c:269
-msgid "Reload directory"
-msgstr "Dizini tekrar yükle"
+#: ../data/menus.ui.h:5
+msgid "Open Files With…"
+msgstr "Dosyaları Birlikte Aç…"
 
-#: ../src/bar.c:272
-msgid "Browse Directory With…"
-msgstr "Dizine Birlikte Gözat…"
+#: ../data/menus.ui.h:6
+msgid "Run Audio Player"
+msgstr "Müzik Çaları Çalıştır"
 
-#: ../src/bar.c:273
-msgid "Run a command on the directory"
-msgstr "Dizin için komut çalıştır"
+#: ../data/menus.ui.h:7 ../data/toolbar.ui.h:23
+msgid "Invert File Selection"
+msgstr "Dosya Seçimini Tersine Çevir"
 
-#: ../src/bar.c:275
-msgid "_Collapse Tree"
-msgstr "A_ğacı Genişlet"
+#: ../data/menus.ui.h:8
+msgid "Delete Files"
+msgstr "Dosyaları Sil"
 
-#: ../src/bar.c:276
-msgid "Collapse directory tree"
-msgstr "Dizin a_ğacını daralt"
+#: ../data/menus.ui.h:9
+#, fuzzy
+#| msgid "Find Files"
+msgid "Undo for File"
+msgstr "Dosyaları Bul"
 
-#: ../src/bar.c:277
-msgid "_Reload Tree"
-msgstr "A_ğacı Yeniden Yükle"
+#: ../data/menus.ui.h:10
+msgid "Redo for File"
+msgstr ""
 
-#: ../src/bar.c:278
-msgid "Reload directory tree"
-msgstr "Dizin a_ğacını yeniden yükle"
+#: ../data/menus.ui.h:11 ../data/toolbar.ui.h:17
+msgid "_Save Files"
+msgstr "Do_syaları Kaydet"
 
-#: ../src/bar.c:281
-msgid "S_canner Mode"
-msgstr "_Tarayıcı Kipi"
+#: ../data/menus.ui.h:12
+msgid "_Force Save Files"
+msgstr "Dosyaları Kaydetmeye _Zorla"
 
-#: ../src/bar.c:283
-msgid "_Miscellaneous"
-msgstr "_Çeşitli"
+#: ../data/menus.ui.h:13
+msgid "_Edit"
+msgstr "D_üzenle"
 
-#: ../src/bar.c:284
+#: ../data/menus.ui.h:14 ../data/toolbar.ui.h:25
 msgid "_Find…"
 msgstr "_Bul…"
 
-#: ../src/bar.c:285
-msgid "Search filenames and tags"
-msgstr "Dosya adları ve etiketlerini ara"
-
-#: ../src/bar.c:287
-msgid "CDD_B Search…"
-msgstr "CDD_B Ara…"
-
-#: ../src/bar.c:288
-msgid "CDDB search"
-msgstr "CDDB ara"
-
-#: ../src/bar.c:290
-msgid "Load Filenames From a Text File…"
-msgstr "Dosya Adlarını Metin Dosyasından Yükle…"
-
-#: ../src/bar.c:291
-msgid "Load filenames from a text file"
-msgstr "Dosya adlarını metin dosyasından yükle"
-
-#: ../src/bar.c:293
-msgid "Generate Playlist…"
-msgstr "Çalma Listesi Oluştur…"
+#: ../data/menus.ui.h:15
+#| msgid "Select all"
+msgid "Select All"
+msgstr "Tümünü Seç"
 
-#: ../src/bar.c:294
-msgid "Generate a playlist"
-msgstr "Çalma listesi oluştur"
+#: ../data/menus.ui.h:16
+msgid "Unselect All"
+msgstr "Hiçbirini Seçme"
 
-#: ../src/bar.c:296 ../src/bar.c:322 ../src/bar.c:323 ../src/bar.c:324
-msgid "Run Audio Player"
-msgstr "Müzik Çaları Çalıştır"
+#: ../data/menus.ui.h:17
+msgid "Undo"
+msgstr "Geri Al"
 
-#: ../src/bar.c:297 ../src/bar.c:322 ../src/bar.c:323 ../src/bar.c:324
-msgid "Run audio player"
-msgstr "Müzik çaları çalıştır"
+#: ../data/menus.ui.h:18
+msgid "Redo"
+msgstr "Yinele"
 
-#: ../src/bar.c:300
-msgid "_Edit"
-msgstr "D_üzenle"
+#: ../data/menus.ui.h:19 ../data/toolbar.ui.h:11
+msgid "_Remove Tags"
+msgstr "Etiketle_ri Sil"
 
-#: ../src/bar.c:301
+#: ../data/menus.ui.h:20
 msgid "_Preferences"
 msgstr "_Tercihler"
 
-#. The window
-#: ../src/bar.c:302 ../src/prefs.c:110
-msgid "Preferences"
-msgstr "Tercihler"
-
-#: ../src/bar.c:304
+#: ../data/menus.ui.h:21
 msgid "_View"
 msgstr "_Görünüm"
 
-#: ../src/bar.c:305
-msgid "_Go"
-msgstr "G_it"
-
-#: ../src/bar.c:307
-msgid "_Help"
-msgstr "_Yardım"
+#: ../data/menus.ui.h:22
+#| msgid "_Show Scanner"
+msgid "Show Scanner"
+msgstr "Tarayıcıyı Göster"
 
-#: ../src/bar.c:308
-msgid "_About"
-msgstr "_Hakkında"
+#: ../data/menus.ui.h:23
+#| msgid "S_canner Mode"
+msgid "Scanner Mode"
+msgstr "Tarayıcı Kipi"
 
-#: ../src/bar.c:308
-msgid "About"
-msgstr "Hakkında"
+#: ../data/menus.ui.h:25
+#, fuzzy
+#| msgid "_Rename Files and Directories…"
+msgid "Rename Files and Directories"
+msgstr "Dosya ve Dizinleri Yeniden _Adlandır…"
 
-#.
-#. * Following items are on toolbar but not on menu
-#.
-#: ../src/bar.c:314
-msgid "Stop the current action"
-msgstr "Geçerli işlemi durdur"
+#: ../data/menus.ui.h:26 ../data/scan_dialog.ui.h:107
+msgid "Process Fields"
+msgstr "Alanları işle"
 
-#.
-#. * Popup menu's Actions
-#.
-#: ../src/bar.c:320
-msgid "_File Operations"
-msgstr "_Dosya işlemleri"
+#: ../data/menus.ui.h:27 ../data/toolbar.ui.h:19
+#| msgid "Directory renamed"
+msgid "Directory Tree"
+msgstr "Dizin Ağacı"
 
-#: ../src/bar.c:321
-msgid "S_canner"
-msgstr "_Tarayıcı"
+#: ../data/menus.ui.h:28 ../data/toolbar.ui.h:21
+#| msgid "Artist and Album"
+msgid "Artists and Albums"
+msgstr "Sanatçılar ve Albümler"
 
-#: ../src/bar.c:325
-msgid "CDDB Search Files…"
-msgstr "Dosyaları CDDB'de Ara…"
+#: ../data/menus.ui.h:29
+msgid "Sort List by Tag"
+msgstr "Etikete Göre Sırala"
 
-#: ../src/bar.c:325
-msgid "CDDB search files…"
-msgstr "Dosyaları CDDB'de ara…"
+#: ../data/menus.ui.h:30
+msgid "Ascending by track number"
+msgstr "Parça numarasına göre artan"
 
-#. { 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
-msgid "Clear log"
-msgstr "Raporu temizle"
+#: ../data/menus.ui.h:31
+msgid "Descending by track number"
+msgstr "Parça numarasına göre azalan"
 
-#. { AM_BROWSE_SUBDIR,      GTK_STOCK_INDEX,        _("Browse _Subdirectories"),                         NULL, _("Browse _Sub-directories"),                         NULL,                                    FALSE },
-#: ../src/bar.c:336
-msgid "Browse _Subdirectories"
-msgstr "A_lt Dizinleride Tara"
+#: ../data/menus.ui.h:32
+msgid "Ascending by title"
+msgstr "Başlığa göre artan"
 
-#: ../src/bar.c:336
-msgid "Browse subdirectories"
-msgstr "Alt dizinleride tara"
+#: ../data/menus.ui.h:33
+msgid "Descending by title"
+msgstr "Başlığa göre azalan"
 
-#: ../src/bar.c:340
-msgid "Show Hidden Directories"
-msgstr "Gizli Dosyaları Göster"
+#: ../data/menus.ui.h:34
+msgid "Ascending by artist"
+msgstr "Sanatçıya göre artan"
 
-#: ../src/bar.c:340
-msgid "Show hidden directories"
-msgstr "Gizli dosyaları göster"
+#: ../data/menus.ui.h:35
+msgid "Descending by artist"
+msgstr "Sanatçıya göre azalan"
 
-#: ../src/bar.c:342
-msgid "_Show Scanner"
-msgstr "_Tarayıcıyı Göster"
+#: ../data/menus.ui.h:36
+msgid "Ascending by album artist"
+msgstr "Albüm sanatçısına göre artan"
 
-#: ../src/bar.c:343
-msgid "Show scanner"
-msgstr "Tarayıcıyı göster"
+#: ../data/menus.ui.h:37
+msgid "Descending by album artist"
+msgstr "Albüm sanatçısına göre azalan"
 
-#: ../src/bar.c:349
-msgid "Tree Browser"
-msgstr "Ağaç Gezgini"
+#: ../data/menus.ui.h:38
+msgid "Ascending by album"
+msgstr "Albüme göre artan"
 
-#: ../src/bar.c:350
-msgid "View by directory tree"
-msgstr "Dizin ağacına göre göster"
+#: ../data/menus.ui.h:39
+msgid "Descending by album"
+msgstr "Albüme göre azalan"
 
-#: ../src/bar.c:352
-msgid "Artist and Album"
-msgstr "Sanatçı ve Albüm"
+#: ../data/menus.ui.h:40
+msgid "Ascending by year"
+msgstr "Yıla göre artan"
 
-#: ../src/bar.c:353
-msgid "View by artist and album"
-msgstr "Sanatçı ve albüme göre göster"
+#: ../data/menus.ui.h:41
+msgid "Descending by year"
+msgstr "Yıla göre azalan"
 
-#: ../src/bar.c:358
-msgid "_Fill Tags…"
-msgstr "Etiketleri _Doldur…"
+#: ../data/menus.ui.h:42
+msgid "Ascending by genre"
+msgstr "Türe göre artan"
 
-#: ../src/bar.c:359
-msgid "Fill tags"
-msgstr "Etiketleri doldur"
+#: ../data/menus.ui.h:43
+msgid "Descending by genre"
+msgstr "Türe göre azalan"
 
-#: ../src/bar.c:361
-msgid "_Rename Files and Directories…"
-msgstr "Dosya ve Dizinleri Yeniden _Adlandır…"
+#: ../data/menus.ui.h:44
+msgid "Ascending by comment"
+msgstr "Yoruma göre artan"
 
-#: ../src/bar.c:362
-msgid "Rename files and directories"
-msgstr "Dosya ve dizinleri yeniden adlandır"
+#: ../data/menus.ui.h:45
+msgid "Descending by comment"
+msgstr "Yoruma göre azalan"
 
-#: ../src/bar.c:364
-msgid "_Process Fields…"
-msgstr "_Alanları İşle…"
+#: ../data/menus.ui.h:46
+msgid "Ascending by composer"
+msgstr "Besteciye göre artan"
 
-#: ../src/bar.c:364 ../src/scan.c:183
-msgid "Process Fields"
-msgstr "Alanları işle"
+#: ../data/menus.ui.h:47
+msgid "Descending by composer"
+msgstr "Besteciye göre azalan"
 
-#: ../src/bar.c:421
-#, c-format
-msgid "Could not merge UI, error was: %s\n"
-msgstr "UI birleştirilemedi, hata: %s\n"
+#: ../data/menus.ui.h:48
+msgid "Ascending by original artist"
+msgstr "Asıl sanatçıya göre artan"
 
-#: ../src/bar.c:527
-msgid "Ready to start"
-msgstr "Başlamaya hazır"
+#: ../data/menus.ui.h:49
+msgid "Descending by original artist"
+msgstr "Asıl sanatçıya göre azalan"
 
-#: ../src/browser.c:369
-msgid "New default path for files selected"
-msgstr "Seçilen dosyalar için yeni öntanımlı konum"
+#: ../data/menus.ui.h:50
+msgid "Ascending by copyright"
+msgstr "Telif hakkına göre artan"
 
-#: ../src/browser.c:670 ../src/easytag.c:4570
-msgid "Some files have been modified but not saved"
-msgstr "Bazı dosyalar değiştirildi ama kaydedilmedi"
+#: ../data/menus.ui.h:51
+msgid "Descending by copyright"
+msgstr "Telif hakkına göre azalan"
 
-#: ../src/browser.c:671
-msgid "Do you want to save them before changing the directory?"
-msgstr "Dizini değiştirmeden önce değişiklikleri kaydetmek istiyor musunuz?"
+#: ../data/menus.ui.h:52
+msgid "Ascending by URL"
+msgstr "Bağlantıya göre artan"
 
-#: ../src/browser.c:675
-msgid "Confirm Directory Change"
-msgstr "Dizin Değişimini Doğrula"
+#: ../data/menus.ui.h:53
+msgid "Descending by URL"
+msgstr "Bağlantıya göre azalan"
 
-#: ../src/browser.c:2121
-msgid "<All albums>"
-msgstr "<Bütün Albümler>"
+#: ../data/menus.ui.h:54
+msgid "Ascending by encoder name"
+msgstr "Kodlayıcıya göre artan"
 
-#: ../src/browser.c:2566
-#, c-format
-msgid "Error: Searching for %s, could not find node %s in tree."
-msgstr "Hata: %s aranıyor, ağaçta %s dalı bulunamadı."
+#: ../data/menus.ui.h:55
+msgid "Descending by encoder name"
+msgstr "Kodlayıcıya göre azalan"
 
-#: ../src/browser.c:3058 ../src/browser.c:3136
-msgid "Tree"
-msgstr "Ağaç"
+#: ../data/menus.ui.h:56
+msgid "Sort List by Property"
+msgstr "Özelliğe Göre Sırala"
 
-#: ../src/browser.c:3059 ../src/cddb.c:716 ../src/misc.c:1900
-msgid "Filename"
-msgstr "Dosya adı"
+#: ../data/menus.ui.h:57
+msgid "Ascending by filename"
+msgstr "Dosya adına göre artan"
 
-#: ../src/browser.c:3059 ../src/cddb.c:717 ../src/misc.c:1901
-#: ../src/prefs.c:643
-msgid "Title"
-msgstr "Başlık"
+#: ../data/menus.ui.h:58
+msgid "Descending by filename"
+msgstr "Dosya adına göre azalan"
 
-#. 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:1902 ../src/prefs.c:644
-msgid "Artist"
-msgstr "Sanatçı"
+#: ../data/menus.ui.h:59
+msgid "Ascending by creation date"
+msgstr "Oluşturma tarihine göre artan"
 
-#: ../src/browser.c:3060 ../src/misc.c:1903
-msgid "Album Artist"
-msgstr "Albüm Sanatçısı"
+#: ../data/menus.ui.h:60
+msgid "Descending by creation date"
+msgstr "Oluşturma tarihine göre azalan"
 
-#. 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:1904 ../src/prefs.c:645
-msgid "Album"
-msgstr "Albüm"
+#: ../data/menus.ui.h:61
+msgid "Ascending by file type"
+msgstr "Dosya türüne göre artan"
 
-#: ../src/browser.c:3061 ../src/cddb.c:720 ../src/misc.c:1906
-msgid "Year"
-msgstr "Yıl"
+#: ../data/menus.ui.h:62
+msgid "Descending by file type"
+msgstr "Dosya türüne göre azalan"
 
-#: ../src/browser.c:3061
-msgid "Disc"
-msgstr "Disk"
+#: ../data/menus.ui.h:63
+msgid "Ascending by file size"
+msgstr "Dosya boyutuna göre artan"
 
-#: ../src/browser.c:3062 ../src/misc.c:1907
-msgid "Track"
-msgstr "Parça"
+#: ../data/menus.ui.h:64
+msgid "Descending by file size"
+msgstr "Dosya boyutuna göre azalan"
 
-#: ../src/browser.c:3062 ../src/cddb.c:723 ../src/misc.c:1908
-#: ../src/prefs.c:646
-msgid "Genre"
-msgstr "Tür"
+#: ../data/menus.ui.h:65
+msgid "Ascending by duration"
+msgstr "Süreye göre artan"
 
-#: ../src/browser.c:3063 ../src/misc.c:1909 ../src/prefs.c:647
-msgid "Comment"
-msgstr "Yorum"
+#: ../data/menus.ui.h:66
+msgid "Descending by duration"
+msgstr "Süreye göre azalan"
 
-#: ../src/browser.c:3063 ../src/misc.c:1910 ../src/picture.c:863
-#: ../src/prefs.c:648
-msgid "Composer"
-msgstr "Besteci"
+#: ../data/menus.ui.h:67
+#, fuzzy
+#| msgid "Ascending by bitrate"
+msgid "Ascending by bit rate"
+msgstr "Bit oranına göre artan"
 
-#: ../src/browser.c:3064 ../src/misc.c:1911
-msgid "Original Artist"
-msgstr "Asıl Sanatçı"
+#: ../data/menus.ui.h:68
+#, fuzzy
+#| msgid "Descending by bitrate"
+msgid "Descending by bit rate"
+msgstr "Bit oranına göre azalan"
 
-#: ../src/browser.c:3065 ../src/misc.c:1912
-msgid "Copyright"
-msgstr "Telif Hakkı"
+#: ../data/menus.ui.h:69
+#, fuzzy
+#| msgid "Ascending by samplerate"
+msgid "Ascending by sample rate"
+msgstr "Örnek oranına göre artan"
 
-#: ../src/browser.c:3065 ../src/misc.c:1913
-msgid "URL"
-msgstr "Bağlantı"
+#: ../data/menus.ui.h:70
+#, fuzzy
+#| msgid "Descending by samplerate"
+msgid "Descending by sample rate"
+msgstr "örnek oranına göre azalan"
 
-#: ../src/browser.c:3066 ../src/misc.c:1914
-msgid "Encoded By"
-msgstr "Kodlayıcı"
+#: ../data/menus.ui.h:71
+#, fuzzy
+#| msgid "_Collapse Tree"
+msgid "Collapse Tree"
+msgstr "A_ğacı Genişlet"
 
-#: ../src/browser.c:3067
-msgid "# Albums"
-msgstr "# Albümler"
+#: ../data/menus.ui.h:72
+#, fuzzy
+#| msgid "_Reload Tree"
+msgid "Reload Tree"
+msgstr "A_ğacı Yeniden Yükle"
 
-#: ../src/browser.c:3068 ../src/browser.c:3069
-msgid "# Files"
-msgstr "# Dosyalar"
+#: ../data/menus.ui.h:73
+msgid "Reload Directory"
+msgstr "Dizini Tekrar Yükle"
 
-#: ../src/browser.c:3094
-msgid "Enter a directory to browse."
-msgstr "Gezinmek için dizin girin."
+#: ../data/menus.ui.h:74
+msgid "Show Hidden Directories"
+msgstr "Gizli Dosyaları Göster"
 
-#: ../src/browser.c:3103
-msgid "Select a directory to browse."
-msgstr "Gezinmek için dizin seçin."
+#: ../data/menus.ui.h:75
+msgid "_Browser"
+msgstr "G_ezgin"
 
-#.
-#. * 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
-msgid "No files"
-msgstr "Dosya yok"
+#: ../data/menus.ui.h:76
+msgid "Set _Current Path as Default"
+msgstr "Bulunulan Dizini Öntan_ımlı Olarak Ayarla"
 
-#: ../src/browser.c:3188
-msgid "Artist & Album"
-msgstr "Sanatçı & Albüm"
+#: ../data/menus.ui.h:77
+msgid "Rename Directory…"
+msgstr "Dizini Yeniden Adlandır…"
 
-#. Only directories changed
-#: ../src/browser.c:3553 ../src/easytag.c:2864
-msgid "Rename Directory"
-msgstr "Dizini Yeniden Adlandır"
+#: ../data/menus.ui.h:78
+msgid "Browse Directory With…"
+msgstr "Dizine Birlikte Gözat…"
 
-#: ../src/browser.c:3575
-#, c-format
-msgid "Rename the directory '%s' to:"
-msgstr "Dizini '%s' adından:"
+#: ../data/menus.ui.h:79
+msgid "Browse _Subdirectories"
+msgstr "A_lt Dizinleride Tara"
 
-#: ../src/browser.c:3594 ../src/misc.c:1164
-msgid "Use mask:"
-msgstr "Maske Kullan:"
+#: ../data/menus.ui.h:80
+msgid "_Miscellaneous"
+msgstr "_Çeşitli"
 
-#: ../src/browser.c:3597
-msgid "If activated, it will use masks to rename directory."
-msgstr "Eğer etkinse dizini yeniden adlandırırken maskeyi kullanır."
+#: ../data/menus.ui.h:81
+msgid "CDD_B Search…"
+msgstr "CDD_B Ara…"
 
-#: ../src/browser.c:3615
-msgid ""
-"Select or type in a mask using codes (see Legend in Scanner Window) to "
-"rename the directory from tag fields."
-msgstr ""
-"Dizini yeniden adlandırmak için etiket alanlarından maske kodunu (Tarayıcı "
-"Penceresinden Maske Biçilerine bakın) seçin veya yazın"
+#: ../data/menus.ui.h:82
+msgid "Load Filenames From a Text File…"
+msgstr "Dosya Adlarını Metin Dosyasından Yükle…"
 
-#. Preview label
-#: ../src/browser.c:3639
-msgid "Rename directory preview"
-msgstr "Dizin yeniden adlandırma önizlemesix"
+#: ../data/menus.ui.h:83 ../data/toolbar.ui.h:29
+msgid "Generate Playlist…"
+msgstr "Çalma Listesi Oluştur…"
 
-#: ../src/browser.c:3731
-msgid "You must type a directory name"
-msgstr "Bir dizin adı yazmalısınız"
+#: ../data/menus.ui.h:84
+msgid "_Go"
+msgstr "G_it"
 
-#: ../src/browser.c:3732 ../src/browser.c:3753
-msgid "Directory Name Error"
-msgstr "Dizin Adı Hatası"
+#: ../data/menus.ui.h:85
+msgid "_Home Directory"
+msgstr "_Ev Dizini"
 
-#: ../src/browser.c:3750
-#, c-format
-msgid "Could not convert '%s' into filename encoding."
-msgstr "Dosya kodlanırken '%s' dönüştürülemedi."
+#: ../data/menus.ui.h:86
+msgid "Desktop Directory"
+msgstr "Masaüstü Dizini"
 
-#: ../src/browser.c:3752
-msgid "Please use another name"
-msgstr "Lütfen başka bir ad kullanın"
+#: ../data/menus.ui.h:87
+msgid "Documents Directory"
+msgstr "Belgeler Dizini"
 
-#: ../src/browser.c:3822
-#, c-format
-msgid "The directory name '%s' already exists"
-msgstr "\"%s\" adında bir dizin zaten var"
+#: ../data/menus.ui.h:88
+msgid "Downloads Directory"
+msgstr "İndirilenler Dizini"
 
-#: ../src/browser.c:3823 ../src/easytag.c:2947
-msgid "Rename File Error"
-msgstr "Dosya Yeniden Adlandırma Hatası"
+#: ../data/menus.ui.h:89
+msgid "Music Directory"
+msgstr "Müzik Dizini"
 
-#: ../src/browser.c:3861 ../src/browser.c:3890
-msgid "Rename Directory Error"
-msgstr "Dizin Yeniden Adlandırma Hatası"
+#: ../data/menus.ui.h:90
+msgid "_Parent Directory"
+msgstr "_Üst Dizin"
 
-#: ../src/browser.c:3928
-msgid "Directory renamed"
-msgstr "Dizin yeniden adlandırıldı"
+#: ../data/menus.ui.h:91
+msgid "_Default Directory"
+msgstr "_Öntanımlı Dizin"
 
-#: ../src/browser.c:3964
-msgid "Browse Directory With"
-msgstr "Dizine Birlikte Gözat"
+#: ../data/menus.ui.h:92 ../data/toolbar.ui.h:1
+msgid "_First File"
+msgstr "_İlk Dosya"
 
-#: ../src/browser.c:3980 ../src/browser.c:4106
-msgid "Program to run:"
-msgstr "Çalıştırmak için program:"
+#: ../data/menus.ui.h:93
+#, fuzzy
+#| msgid "_Previous File"
+msgid "Previous File"
+msgstr "_Önceki Dosya"
 
-#: ../src/browser.c:3992
-msgid ""
-"Enter the program to run. It will receive the current directory as parameter."
-msgstr ""
-"Çalıştırmak için program adı girin. Program bulunulan dizini parametre "
-"olarak alır."
+#: ../data/menus.ui.h:94 ../data/toolbar.ui.h:5
+msgid "_Next File"
+msgstr "So_nraki Dosya"
 
-#: ../src/browser.c:4086
-msgid "Open Files With"
-msgstr "Dosyaları Birlikte Aç"
+#: ../data/menus.ui.h:95 ../data/toolbar.ui.h:7
+msgid "_Last File"
+msgstr "_Son Dosya"
 
-#: ../src/browser.c:4118
-msgid ""
-"Enter the program to run. It will receive the current file as parameter."
-msgstr ""
-"Çalıştırmak için program adı girin. Program şuanki dosyayı parametre olarak "
-"alır."
+#: ../data/menus.ui.h:96
+#, fuzzy
+#| msgid "_Home Directory"
+msgid "Home Directory"
+msgstr "_Ev Dizini"
 
-#: ../src/browser.c:4245
-msgid "You must type a program name"
-msgstr "Bir program adı yazmalısınız."
+#: ../data/menus.ui.h:97
+#, fuzzy
+#| msgid "_Default Directory"
+msgid "Default Directory"
+msgstr "_Öntanımlı Dizin"
 
-#: ../src/browser.c:4246 ../src/browser.c:4263
-msgid "Program Name Error"
-msgstr "Program Adı Hatası"
+#: ../data/menus.ui.h:98
+#, fuzzy
+#| msgid "Set _Current Path as Default"
+msgid "Set Current Path as Default"
+msgstr "Bulunulan Dizini Öntan_ımlı Olarak Ayarla"
 
-#: ../src/browser.c:4261 ../src/misc.c:787
-#, c-format
-msgid "The program '%s' cannot be found"
-msgstr "'%s' programı bulunamadı"
+#: ../data/menus.ui.h:100
+#, fuzzy
+#| msgid "Browse _Subdirectories"
+msgid "Browse Subdirectories"
+msgstr "A_lt Dizinleride Tara"
 
-#: ../src/browser.c:4309 ../src/misc.c:829
-#, c-format
-msgid "Cannot execute %s (error %d)\n"
-msgstr "%s çalıştırılamıyor (hata %d)\n"
+#: ../data/menus.ui.h:101
+#, fuzzy
+#| msgid "Invert selection"
+msgid "Invert Selection"
+msgstr "Seçimi ters çevir"
 
-#: ../src/browser.c:4328
-msgid "Cannot fork another process\n"
-msgstr "Başka bir süreç çalıştırılamıyor\n"
+#: ../data/menus.ui.h:102
+msgid "CDDB Search Files…"
+msgstr "Dosyaları CDDB'de Ara…"
 
-#: ../src/browser.c:4362
-#, c-format
-msgid "Executed command: %s"
-msgstr "Komutu çalıştır: %s"
+#: ../data/menus.ui.h:103
+#, fuzzy
+#| msgid "_Find…"
+msgid "Find…"
+msgstr "_Bul…"
 
-#: ../src/cddb.c:226
-msgid "Artist / Album"
-msgstr "Sanatçı / Albüm"
+#: ../data/menus.ui.h:104
+#, fuzzy
+#| msgid "Clear log"
+msgid "Clear Log"
+msgstr "Raporu temizle"
 
-#: ../src/cddb.c:226
-msgid "Category"
-msgstr "Kategori"
+#: ../data/playlist_dialog.ui.h:3
+msgid "Use directory name"
+msgstr "Dizin adı kullan"
 
-#. 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
-msgid "Track Name"
-msgstr "Parça Adı"
+#: ../data/playlist_dialog.ui.h:4
+#, fuzzy
+#| msgid "Log Options"
+msgid "Options"
+msgstr "Günlük Seçenekleri"
 
-#: ../src/cddb.c:227
-msgid "Duration"
-msgstr "Süre"
+#: ../data/playlist_dialog.ui.h:5
+msgid "Include only the selected files"
+msgstr "Sadece seçilen dosyaları içer"
 
-#: ../src/cddb.c:239
-msgid "CDDB Search"
-msgstr "CDDB Ara"
+#: ../data/playlist_dialog.ui.h:6 ../data/org.gnome.EasyTAG.gschema.xml.h:164
+msgid ""
+"Whether to use only the selected files or all files when creating playlists"
+msgstr ""
 
-#.
-#. * 1 - Page for automatic search (generate the CDDBId from files)
-#.
-#: ../src/cddb.c:259
-msgid "Automatic Search"
-msgstr "Otomatik Ara"
+#: ../data/playlist_dialog.ui.h:7
+msgid "Use full path for files in playlist"
+msgstr "Çalma listesinde dosyalar için gerçek konum kullan"
 
-#: ../src/cddb.c:269
-msgid "Request CDDB"
-msgstr "CDDB isteği"
+#: ../data/playlist_dialog.ui.h:8
+msgid "Use relative path for files in playlist"
+msgstr "Çalma listesinde dosyalar için göreceli konum kullan"
 
-#: ../src/cddb.c:279
-msgid ""
-"Request automatically the CDDB using the selected files (the order is "
-"important) to generate the CddbID"
-msgstr ""
-"CddbID oluşturmak için seçilen dosyalarla (sıralama önemli) CDDB veritabanı "
-"isteğini otomatik olarak yap."
+#: ../data/playlist_dialog.ui.h:9
+msgid "Create playlist in the parent directory"
+msgstr "Çalma listesini üst dizinde oluştur"
 
-#: ../src/cddb.c:290 ../src/cddb.c:370
-msgid "Stop the search"
-msgstr "Aramayı durdur"
+#: ../data/playlist_dialog.ui.h:10 ../data/org.gnome.EasyTAG.gschema.xml.h:168
+#, fuzzy
+#| msgid "Create playlist in the parent directory"
+msgid "Whether to create the playlist in the parent directory"
+msgstr "Çalma listesini üst dizinde oluştur"
 
-#. Check box to run the scanner
-#: ../src/cddb.c:297
-msgid "Use local CDDB"
-msgstr "Yerel CDDB kullan"
+#: ../data/playlist_dialog.ui.h:11
+msgid "Use DOS directory separator"
+msgstr "DOS dizin ayıracını kullan"
 
-#: ../src/cddb.c:300 ../src/cddb.c:763
+#: ../data/playlist_dialog.ui.h:12 ../data/org.gnome.EasyTAG.gschema.xml.h:170
 msgid ""
-"When activating this option, after loading the fields, the current selected "
-"scanner will be ran (the scanner window must be opened)."
+"Whether to use backslash as directory separator when generating playlists"
 msgstr ""
-"Bu seçeneği etkinleştirirken alanlar yüklendikten sonra şuan seçilen "
-"tarayıcı çalıştırılır (Tarayıcı penceresi açık olmalıdır.)."
-
-#.
-#. * 2 - Page for manual search
-#.
-#: ../src/cddb.c:317
-msgid "Manual Search"
-msgstr "Elle Arama"
 
-#: ../src/cddb.c:329
-msgid "Words:"
-msgstr "Kelimeler:"
+#: ../data/playlist_dialog.ui.h:13
+#, fuzzy
+#| msgid "Playlist Content"
+msgid "Content"
+msgstr "Çalma Listesi İçeriği"
 
-#: ../src/cddb.c:342
-msgid "Enter the words to search (separated by a space or '+')"
-msgstr "Aramak için kelimeleri girin (boşluk veya '+' ile ayrılır)"
+#: ../data/playlist_dialog.ui.h:14
+msgid "Write only list of files"
+msgstr "Sadece dosyaların listesini yaz"
 
-#.
-#. * Search options
-#.
-#: ../src/cddb.c:382
-msgid "Search In:"
-msgstr "İçinde Ara:"
-
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "All fields".
-#: ../src/cddb.c:392
-msgid "All Fields"
-msgstr "Tüm Alanlar"
-
-#. 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
-msgid "Other"
-msgstr "Diğer"
+#: ../data/playlist_dialog.ui.h:15
+#, fuzzy
+#| msgid "Write info using filename"
+msgid "Write information using filename"
+msgstr "Bilgi olarak dosya adını yaz"
 
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "All Categories".
-#: ../src/cddb.c:429
-msgid "All Categories"
-msgstr "Tüm Kategoriler"
+#: ../data/playlist_dialog.ui.h:16
+#, fuzzy
+#| msgid "Write info using:"
+msgid "Write information using:"
+msgstr "Bilgi olarak bunu yaz:"
 
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Blues".
-#: ../src/cddb.c:433
-msgid "Blues"
-msgstr "Blues"
+#: ../data/preferences_dialog.ui.h:1
+msgid "Browser"
+msgstr "Gezgin"
 
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Classical".
-#: ../src/cddb.c:436
-msgid "Classical"
-msgstr "Classical"
+#: ../data/preferences_dialog.ui.h:2
+#, fuzzy
+#| msgid "_Default Directory"
+msgid "Default Directory:"
+msgstr "_Öntanımlı Dizin"
 
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Country".
-#: ../src/cddb.c:439
-msgid "Country"
-msgstr "Country"
+#: ../data/preferences_dialog.ui.h:3 ../data/org.gnome.EasyTAG.gschema.xml.h:4
+#, fuzzy
+#| msgid "New default path for files selected"
+msgid "The default path to search for music files"
+msgstr "Seçilen dosyalar için yeni öntanımlı konum"
 
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Folk".
-#: ../src/cddb.c:442
-msgid "Folk"
-msgstr "Folk"
+#: ../data/preferences_dialog.ui.h:4
+msgid ""
+"Load on startup the default directory or the directory passed as argument"
+msgstr "Bu dizini veya parametre olarak girilmiş dizini açılışta yükle"
 
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Jazz".
-#: ../src/cddb.c:445
-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
-msgid "Misc."
-msgstr "Misc."
-
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "New age".
-#: ../src/cddb.c:451
-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:454
-msgid "Reggae"
-msgstr "Reggae"
+#: ../data/preferences_dialog.ui.h:5 ../data/org.gnome.EasyTAG.gschema.xml.h:2
+msgid ""
+"Whether to load the default path (or the path passed as an argument) on "
+"application startup"
+msgstr ""
 
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Rock".
-#: ../src/cddb.c:457
-msgid "Rock"
-msgstr "Rock"
+#: ../data/preferences_dialog.ui.h:6 ../data/org.gnome.EasyTAG.gschema.xml.h:5
+msgid "Browse subdirectories"
+msgstr "Alt dizinleride tara"
 
-#. Translators: This option is for the previous 'search in' option. For
-#. * instance, translate this as "Search in:" "Soundtrack".
-#: ../src/cddb.c:460
-msgid "Soundtrack"
-msgstr "Soundtrack"
+#: ../data/preferences_dialog.ui.h:7 ../data/org.gnome.EasyTAG.gschema.xml.h:6
+#, fuzzy
+#| msgid ""
+#| "Search subdirectories for files when reading a directory into the tree."
+msgid ""
+"Whether to search subdirectories for audio files when reading a directory in "
+"the browser"
+msgstr "Dizini okurken alt dizinleri de arar."
 
-#: ../src/cddb.c:500
-msgid "included: funk, soul, rap, pop, industrial, metal, etc."
-msgstr "funk, soul, rap, pop, industrial, metal, vs dahil"
+#: ../data/preferences_dialog.ui.h:8 ../data/org.gnome.EasyTAG.gschema.xml.h:9
+#, fuzzy
+#| msgid "Show subdirectories when selecting a directory"
+msgid "Expand the subdirectories of the selected directory"
+msgstr "Dizin seçildiğinde alt dizinleri göster"
 
-#: ../src/cddb.c:501
-msgid "movies, shows"
-msgstr "videolar, gösteriler"
+#: ../data/preferences_dialog.ui.h:9
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:10
+msgid ""
+"Whether to expand the subdirectories of a node in the directory browser when "
+"selecting it"
+msgstr ""
 
-#: ../src/cddb.c:502
-msgid "others that do not fit in the above categories"
-msgstr "yukarıdaki kategorilere uymayan diğerleri"
+#: ../data/preferences_dialog.ui.h:10
+msgid "Search hidden directories"
+msgstr "Gizli dizinleri ara"
 
-#. Button to display/hide the categories
-#: ../src/cddb.c:505
-msgid "Categories"
-msgstr "Kategoriler"
+#: ../data/preferences_dialog.ui.h:11
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:8
+#, fuzzy
+#| msgid ""
+#| "Search subdirectories for files when reading a directory into the tree."
+msgid ""
+"Whether to show hidden directories when showing a directory in the browser"
+msgstr "Dizini okurken alt dizinleri de arar."
 
-#.
-#. * Results command
-#.
-#: ../src/cddb.c:513
-msgid "Results:"
-msgstr "Sonuçlar:"
+#: ../data/preferences_dialog.ui.h:12
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:53
+msgid "Sort files case-sensitively"
+msgstr ""
 
-#: ../src/cddb.c:519 ../src/misc.c:1948
-msgid "Search:"
-msgstr "Ara:"
+#: ../data/preferences_dialog.ui.h:13
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:54
+msgid "Whether file sorting is case-sensitive"
+msgstr ""
 
-#: ../src/cddb.c:533
-msgid "Enter the words to search in the list below"
-msgstr "Liste boyunca aramak için kelime girin"
+#: ../data/preferences_dialog.ui.h:15
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:59
+msgid "Show the log"
+msgstr ""
 
-#: ../src/cddb.c:545
-msgid "Search Next"
-msgstr "Sonrakini Ara"
+#: ../data/preferences_dialog.ui.h:16
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:60
+#, fuzzy
+#| msgid "Show log view in main window"
+msgid "Whether to show the log in the main window"
+msgstr "Günlük görünümünü ana pencerede göster"
 
-#: ../src/cddb.c:551
-msgid "Search Previous"
-msgstr "Öncekini Ara"
+#: ../data/preferences_dialog.ui.h:17
+#, fuzzy
+#| msgid "Max number of lines:"
+msgid "Maximum number of lines:"
+msgstr "En fazla satır sayısı:"
 
-#: ../src/cddb.c:562
-msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
+#: ../data/preferences_dialog.ui.h:18
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:58
+msgid "The maximum number of lines to keep in the log"
 msgstr ""
-"Sanatçı / Albüm listesinde sadece kırmızı satırları (veya tüm satırları) "
-"göster"
-
-#: ../src/cddb.c:568
-msgid "Unselect all lines"
-msgstr "Hiçbir satırı seçme"
 
-#: ../src/cddb.c:574
-msgid "Invert lines selection"
-msgstr "Satır seçimini tersine çevir"
+#: ../data/preferences_dialog.ui.h:19
+msgid "General"
+msgstr ""
 
-#: ../src/cddb.c:583
-msgid "Select all lines"
-msgstr "Tüm satırları seç"
+#: ../data/preferences_dialog.ui.h:20
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:49
+msgid "Show audio file header summary"
+msgstr ""
 
-#: ../src/cddb.c:701
+#: ../data/preferences_dialog.ui.h:21
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:50
 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."
+"Whether to show header information, such as bit rate and duration, for audio "
+"files"
 msgstr ""
-"Dosya listenize uygulamak için satır seçin. Seçim yapılmazsa tüm satırlar "
-"işlenir.\n"
-"'Uygula' düğmesine basmadan önce tekrar sıralayabilirsiniz."
 
-#.
-#. * Apply results to fields...
-#.
-#: ../src/cddb.c:708
-msgid "Set Into:"
-msgstr "Uygulanacak Alanlar:"
+#: ../data/preferences_dialog.ui.h:22
+msgid "Display changed files in list using:"
+msgstr "Listedeki değişmiş dosyaların görünümü:"
 
-#: ../src/cddb.c:714
-msgid "All"
-msgstr "Tümü"
+#: ../data/preferences_dialog.ui.h:23
+msgid "Red color"
+msgstr "Kırmızı renkli"
 
-#: ../src/cddb.c:721
-msgid "Track #"
-msgstr "Parça #"
+#: ../data/preferences_dialog.ui.h:24
+msgid "Bold style"
+msgstr "Kalın yazılı"
 
-#: ../src/cddb.c:722
-msgid "# Tracks"
-msgstr "# Parçalar"
+#: ../data/preferences_dialog.ui.h:25
+#, fuzzy
+#| msgid "User Interface"
+msgid "Interface"
+msgstr "Kullanıcı Arabirimi"
 
-#. Check box to run the scanner
-#: ../src/cddb.c:760 ../src/misc.c:2989
-msgid "Run the current scanner for each file"
-msgstr "Şuanki tarayıcıyı tüm dosyalar için çalıştır"
+#: ../data/preferences_dialog.ui.h:26
+msgid "File Settings"
+msgstr "Dosya Ayarları"
 
-#. Check box to use DLM (also used in the preferences window)
-#: ../src/cddb.c:767
-msgid "Match lines with the Levenshtein algorithm"
-msgstr "Satırları Levenshtein algoritmasıyla eşleştir"
+#: ../data/preferences_dialog.ui.h:27
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:45
+#, fuzzy
+#| msgid "Preserve modification time of the file"
+msgid "Preserve modification time when writing files"
+msgstr "Dosyanın değiştirilme zamanını koru"
 
-#. 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 "
-"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 ""
-"Bu seçeneği etkinleştirince CDDB başlığı dizindeki her dosya adı için "
-"Levenshtein algoritması (DLM: Damerau-Levenshtein Metric) ile eşleştirmeye "
-"çalışır ve en iyi eşleşeni seçer. Doğrudan konum sıralaması kullanmak yerine "
-"uygun ses dosyasını seçmekte ve CDDB sonuçlarını uygulamakta kullanılır."
-
-#: ../src/cddb.c:784
-msgid "Load the selected lines or all lines (if no line selected)."
-msgstr "Seçilen satırları veya tüm satırları (hiçbir satır seçilmemişse) yükle"
+#: ../data/preferences_dialog.ui.h:28
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:46
+#, fuzzy
+#| msgid "Preserve modification time of the file"
+msgid "Whether to preserve the existing modification time when editing files"
+msgstr "Dosyanın değiştirilme zamanını koru"
 
-#: ../src/cddb.c:794
-msgid "Ready to search"
-msgstr "Aramaya hazır"
+#: ../data/preferences_dialog.ui.h:29
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:47
+#, fuzzy
+#| msgid "Preserve modification time of the file"
+msgid "Update parent directory modification time when writing files"
+msgstr "Dosyanın değiştirilme zamanını koru"
 
-#: ../src/cddb.c:1265
-#, c-format
+#: ../data/preferences_dialog.ui.h:30
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:48
+#, fuzzy
+#| msgid ""
+#| "Preserve the modification time (in file properties) when saving the file."
 msgid ""
-"Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
+"Whether to update the modification time on the parent directory when editing "
+"files"
 msgstr ""
-"Albüm: '%s', sanatçı: '%s', uzunluk: '%s', yıl: '%s', tür: '%s', ID: '%s'"
+"Dosya kaydedilirken değiştirilme zamanını koru (dosya özellikleri içinde)"
 
-#: ../src/cddb.c:1501
-#, c-format
-msgid "Resolving host '%s'…"
-msgstr "Sunucu '%s' çözülüyor…"
+#: ../data/preferences_dialog.ui.h:31
+#, fuzzy
+#| msgid "Filename"
+msgid "Filenames"
+msgstr "Dosya adı"
 
-#: ../src/cddb.c:1542
-#, c-format
-msgid "Cannot create a new socket (%s)"
-msgstr "Yeni soket oluşturulamıyor (%s)"
+#: ../data/preferences_dialog.ui.h:32
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:195
+#, fuzzy
+#| msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
+msgid "Replace illegal characters when renaming"
+msgstr "Dosya adında geçersiz karakterler değiştirin (Windows ve CD-Rom için)"
 
-#: ../src/cddb.c:1556
-msgid "Cannot set options on the newly-created socket"
-msgstr "Yeni oluşturulmuş yuvada seçenekler ayarlanamıyor"
+#: ../data/preferences_dialog.ui.h:33
+msgid ""
+"Convert characters which cannot be represented in filenames on the FAT32/16 "
+"and Joliet filesystems (‘\\’, ‘:’, ‘;’, ‘*’, ‘?’, ‘\"’, ‘<’, ‘>’, ‘|’)"
+msgstr ""
 
-#. Open connection to the server.
-#: ../src/cddb.c:1560
-#, c-format
-msgid "Connecting to host '%s', port '%d'…"
-msgstr "'%s' sunucusuna '%d' portundan bağlanılıyor…"
+#: ../data/preferences_dialog.ui.h:34
+msgid "Convert filename extension to:"
+msgstr "Dosya uzantısını dönüşütür:"
 
-#: ../src/cddb.c:1573
-#, c-format
-msgid "Cannot connect to host '%s' (%s)"
-msgstr "'%s' sunucusuna bağlanılamıyor (%s)"
+#: ../data/preferences_dialog.ui.h:35
+msgid "Lower Case"
+msgstr "Küçük Harf"
 
-#: ../src/cddb.c:1597
-#, c-format
-msgid "Cannot resolve host '%s' (%s)"
-msgstr "'%s' sunucusu çözümlenemiyor (%s)."
+#: ../data/preferences_dialog.ui.h:36
+#, fuzzy
+#| msgid "For example, the extension will be converted to '.mp3'"
+msgid "For example, the extension will be converted to ‘.mp3’"
+msgstr "Örneğin uzantı '.mp3'e dönüştürülür"
 
-#: ../src/cddb.c:1610
-#, c-format
-msgid "Connected to host '%s'"
-msgstr "'%s' sunucusuna bağlanıldı"
+#: ../data/preferences_dialog.ui.h:37
+msgid "Upper Case"
+msgstr "Büyük Harf"
 
-#: ../src/cddb.c:1691
-#, c-format
-msgid "Error while writing CDDB results to file '%s'"
-msgstr "CDDB sonuçları '%s' dosyasına yazılırken hata oluştu"
+#: ../data/preferences_dialog.ui.h:38
+#, fuzzy
+#| msgid "For example, the extension will be converted to '.MP3'"
+msgid "For example, the extension will be converted to ‘.MP3’"
+msgstr "Örneğin uzantı '.MP3'e dönüştürülür"
 
-#: ../src/cddb.c:1702
-#, c-format
-msgid "Receiving data (%s)…"
-msgstr "Veri alınıyor (%s)…"
+#: ../data/preferences_dialog.ui.h:39
+msgid "No Change"
+msgstr "Değiştirme"
 
-#: ../src/cddb.c:1714
-#, c-format
-msgid "Error when reading CDDB response (%s)"
-msgstr "CDDB cevabı okunamıyor (%s)"
+#: ../data/preferences_dialog.ui.h:40
+#, fuzzy
+#| msgid "The extension will not be converted"
+msgid "The extension will not be modified"
+msgstr "Uzantı değiştirilmez"
 
-#: ../src/cddb.c:1721
-#, c-format
-msgid "Cannot create file '%s' (%s)"
-msgstr "'%s' dosyası oluşturulamıyor (%s)"
+#: ../data/preferences_dialog.ui.h:41
+#, fuzzy
+#| msgid "Filename translation"
+msgid "Filename Encoding"
+msgstr "Dosya adı dönüştürme"
 
-#: ../src/cddb.c:1762 ../src/setting.c:1260
-#, c-format
-msgid "Cannot open file '%s' (%s)"
-msgstr "'%s' dosyası açılamadı (%s)"
+#: ../data/preferences_dialog.ui.h:42
+msgid "Try another character encoding"
+msgstr "Başka bir karakter kodlaması kullan"
 
-#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
-#. Send the request
-#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
-#. Send the request
-#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
-#. Send the request
-#: ../src/cddb.c:2227 ../src/cddb.c:2556 ../src/cddb.c:3429
-msgid "Sending request…"
-msgstr "İstek gönderiliyor…"
+#: ../data/preferences_dialog.ui.h:43
+msgid ""
+"Try to use the encoding associated with your locale and if this fails, try "
+"the ISO-8859-1 character encoding"
+msgstr ""
 
-#: ../src/cddb.c:2231 ../src/cddb.c:2560 ../src/cddb.c:3129 ../src/cddb.c:3433
-#, c-format
-msgid "Cannot send the request (%s)"
-msgstr "İstek gönderilemiyor (%s)"
+#: ../data/preferences_dialog.ui.h:44
+#, fuzzy
+#| msgid "Try another character encoding"
+msgid "Transliterate characters into the system character encoding"
+msgstr "Başka bir karakter kodlaması kullan"
 
-#.
-#. * Read the answer
-#.
-#. Read the answer
-#: ../src/cddb.c:2257 ../src/cddb.c:3143 ../src/cddb.c:3442
-msgid "Receiving data…"
-msgstr "Veri alınıyor…"
+#: ../data/preferences_dialog.ui.h:45
+msgid ""
+"Replace unsupported characters with a similar character from the target "
+"character encoding"
+msgstr ""
 
-#: ../src/cddb.c:2264 ../src/cddb.c:2589 ../src/cddb.c:3150 ../src/cddb.c:3449
-msgid "The server returned a bad response"
-msgstr "Sunucu bozuk bir yanıt döndürdü"
+#: ../data/preferences_dialog.ui.h:46
+#, fuzzy
+#| msgid ""
+#| "Force using the system character encoding and silently discard some "
+#| "characters"
+msgid ""
+"Use the system character encoding and silently discard unsupported characters"
+msgstr "Sistem karakter kodlamasına zorla ve bazı karakterleri esgeç"
 
-#: ../src/cddb.c:2278 ../src/cddb.c:2605 ../src/cddb.c:3165 ../src/cddb.c:3466
-#: ../src/cddb.c:3481
-#, c-format
-msgid "The server returned a bad response: %s"
-msgstr "Sunucu bozuk bir yanıt döndürdü: %s"
+#: ../data/preferences_dialog.ui.h:47
+#, fuzzy
+#| msgid ""
+#| "With this option, when a character cannot be represented in the target "
+#| "character set, it will be silently discarded."
+msgid ""
+"Discard characters which cannot be represented in the target character "
+"encoding"
+msgstr "Bu seçenek ile dönüştürülemeyen karakterler yazılmadan geçilir."
 
-#: ../src/cddb.c:2425
-#, c-format
-msgid "Sorry, the web-based search is currently not available"
-msgstr "Üzgünüm, Web tabanlı arama henüz desteklenmiyor"
+#: ../data/preferences_dialog.ui.h:48
+#, fuzzy
+#| msgid "File"
+msgid "Files"
+msgstr "Dosya"
 
-#: ../src/cddb.c:2427 ../src/cddb.c:2776
-#, c-format
-msgid "Found one matching album"
-msgid_plural "Found %d matching albums"
-msgstr[0] "%d eşleşen albüm bulundu"
+#: ../data/preferences_dialog.ui.h:49
+msgid "Automatically complete date field"
+msgstr ""
 
-#: ../src/cddb.c:2577
-#, c-format
-msgid "Receiving data of page %d (album %d/%d)…"
-msgstr "Verinin %d sayfası alınıyor (albüm %d/%d)…"
+#: ../data/preferences_dialog.ui.h:50
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:94
+msgid "Whether to automatically complete the date tag"
+msgstr ""
 
-#: ../src/cddb.c:2579
-#, c-format
-msgid "Receiving data of page %d…"
-msgstr "Verinin %d sayfası alınıyor…"
+#: ../data/preferences_dialog.ui.h:51
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:99
+msgid "Automatically select the type of the image based on its filename"
+msgstr ""
 
-#: ../src/cddb.c:2743
-#, c-format
-msgid "More results to load…"
-msgstr "Daha fazla sonuç yükleniyor…"
+#: ../data/preferences_dialog.ui.h:52
+msgid ""
+"Whether to, when adding cover art, automatically select a type for an image "
+"based on its filename"
+msgstr ""
 
-#: ../src/cddb.c:2872
-#, c-format
-msgid "No file selected"
-msgstr "Hiç dosya seçilmedi"
+#: ../data/preferences_dialog.ui.h:53
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:105
+msgid "Preserve the tag field focus"
+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:2880
-#, c-format
-msgid "More than 99 files selected. Cannot send request"
-msgstr "99 dosyadan fazlası seçildi. İstek gönderilemiyor"
+#: ../data/preferences_dialog.ui.h:54
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:106
+msgid "Whether to preserve focus on the current tag field when switching file"
+msgstr ""
 
-#: ../src/cddb.c:2886
-#, c-format
-msgid "One file selected"
-msgid_plural "%d files selected"
-msgstr[0] "%d dosya seçildi"
+#: ../data/preferences_dialog.ui.h:55
+msgid "Pad the number of digits in the disc field to:"
+msgstr ""
 
-#: ../src/cddb.c:2969
-msgid "The path for 'Local CD Database' was not defined"
-msgstr "'Yerel CD Veritabanı' konumu belirtilmemiş"
+#: ../data/preferences_dialog.ui.h:56
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:96
+#, fuzzy
+#| msgid "Whether to pad the disc field with leading zeroes"
+msgid "Whether the disc number tag field should be padded with leading zeroes"
+msgstr "Disk kısımının başını hizalamak için sıfır eklenip eklenmeyeceği"
 
-#. Translators: 'it' in this sentence refers to the local CD
-#. * database path.
-#: ../src/cddb.c:2972
-msgid "Enter it in the preferences window before using this search."
-msgstr "Bu aramayı yapmadan önce tercihlerden bu bilgiyi girin."
+#: ../data/preferences_dialog.ui.h:57
+msgid "Pad the number of digits in the track field to:"
+msgstr ""
 
-#: ../src/cddb.c:2974
-msgid "Local CD search"
-msgstr "Yerel CD arama"
+#: ../data/preferences_dialog.ui.h:58
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:102
+#, fuzzy
+#| msgid "Whether to pad the disc field with leading zeroes"
+msgid "Whether the track number tag field should be padded with leading zeroes"
+msgstr "Disk kısımının başını hizalamak için sıfır eklenip eklenmeyeceği"
 
-#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
-#: ../src/cddb.c:3119
-#, c-format
-msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"
-msgstr "İstek gönderiliyor (CddbId: %s, #parçalar: %d, Disk uzunluğu: %d)…"
+#: ../data/preferences_dialog.ui.h:59
+#, fuzzy
+#| msgid "Tag Splitting"
+msgid "Splitting"
+msgstr "Etiket bölme"
 
-#: ../src/cddb.c:3276
-#, c-format
-msgid "DiscID '%s' gave one matching album"
-msgid_plural "DiscID '%s' gave %d matching albums"
-msgstr[0] "'%s' DiskID için %d albüm eşleşiyor"
+#: ../data/preferences_dialog.ui.h:60
+msgid ""
+"For Vorbis tags, selected fields will be split at dashes and saved as "
+"separate tags"
+msgstr ""
+"Vorbis etiketleri için seçilen alanlar tire ile bölünüp ayrı etiketler "
+"olarak kaydedilir."
 
-#: ../src/cddb.c:3373
-#, c-format
-msgid "Can't load file: '%s' (%s)."
-msgstr "Dosya yüklenemiyor: '%s' (%s)."
+#: ../data/preferences_dialog.ui.h:62
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:206
+msgid "Whether to split title fields at a “ - ” separator in Ogg comments"
+msgstr ""
 
-#. Load the track list of the album
-#: ../src/cddb.c:3672
-msgid "Loading album track list…"
-msgstr "Albüm parça listesi yükleniyor…"
+#: ../data/preferences_dialog.ui.h:64
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:208
+msgid "Whether to split artist fields at a “ - ” separator in Ogg comments"
+msgstr ""
 
-#: ../src/cddb.c:3871
-msgid "The number of CDDB results does not match the number of selected files"
-msgstr "CDDB sonuç sayısı seçilen parça sayısıyla eşleşmiyor"
+#: ../data/preferences_dialog.ui.h:66
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:210
+msgid "Whether to split album fields at a “ - ” separator in Ogg comments"
+msgstr ""
 
-#: ../src/cddb.c:3875
-msgid "Write Tag from CDDB"
-msgstr "Etiketleri CDDB'den Yaz"
+#: ../data/preferences_dialog.ui.h:68
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:212
+msgid "Whether to split genre fields at a “ - ” separator in Ogg comments"
+msgstr ""
 
-#: ../src/charset.c:47
-msgid "Arabic (IBM-864)"
-msgstr "Arapça (IBM-864)"
+#: ../data/preferences_dialog.ui.h:70
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:214
+msgid "Whether to split comment fields at a “ - ” separator in Ogg comments"
+msgstr ""
 
-#: ../src/charset.c:48
-msgid "Arabic (ISO-8859-6)"
-msgstr "Arapça (ISO-8859-6)"
+#: ../data/preferences_dialog.ui.h:72
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:216
+msgid "Whether to split composer fields at a “ - ” separator in Ogg comments"
+msgstr ""
 
-#: ../src/charset.c:49
-msgid "Arabic (Windows-1256)"
-msgstr "Arapça (Windows-1256)"
+#: ../data/preferences_dialog.ui.h:73
+msgid "Original artist"
+msgstr "Asıl sanatçı"
 
-#: ../src/charset.c:50
-msgid "Baltic (ISO-8859-13)"
-msgstr "Baltık (ISO-8859-13)"
+#: ../data/preferences_dialog.ui.h:74
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:218
+msgid ""
+"Whether to split original artist fields at a “ - ” separator in Ogg comments"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:75
+msgid "Tags"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:76
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:63
+#, fuzzy
+#| msgid "Strip tags if all fields are set to blank"
+msgid "Strip ID3 tags if all ID3 tags are empty"
+msgstr "Eğer tüm etiket alanları boşsa etiketi kaldır"
+
+#: ../data/preferences_dialog.ui.h:77
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:64
+msgid ""
+"Whether to remove the ID3 tag from the audio file if all the individual tag "
+"fields are empty"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:78
+#, fuzzy
+#| msgid "Character Set for reading ID3 tags"
+msgid "Non-standard encoding for reading ID3 tags:"
+msgstr "ID3 etiketleri okumak için karakter seti"
+
+#: ../data/preferences_dialog.ui.h:79
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:62
+msgid "Whether to use a non-standard character encoding when reading ID3 tags"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:80
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:72
+#, fuzzy
+#| msgid "Character Set for reading ID3 tags"
+msgid "Choose the character set to be used when reading ID3v1 and ID3v2 tags"
+msgstr "ID3 etiketleri okumak için karakter seti"
+
+#: ../data/preferences_dialog.ui.h:81
+#, fuzzy
+#| msgid "ID3v2 tags"
+msgid "ID3v2"
+msgstr "ID3v2 etiketleri"
+
+#: ../data/preferences_dialog.ui.h:82
+msgid "Write ID3v2 tag"
+msgstr "ID3v2 etiketi yaz"
+
+#: ../data/preferences_dialog.ui.h:83
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:74
+msgid "Whether to write ID3v2 tags when writing ID3 tags into audio files"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:84
+msgid "Version:"
+msgstr "Sürüm:"
+
+#: ../data/preferences_dialog.ui.h:85
+#, fuzzy
+#| msgid ""
+#| "Select the ID3v2 tag version to write:\n"
+#| " - ID3v2.3 is written using id3lib,\n"
+#| " - ID3v2.4 is written using libid3tag (recommended)."
+msgid ""
+"Select the ID3v2 tag version to write:\n"
+" • ID3v2.3 is written using id3lib,\n"
+" • ID3v2.4 is written using libid3tag (recommended)"
+msgstr ""
+"Yazmak için ID3v2 etiket sürümü seçin:\n"
+" - ID3v2.3 id3lib ile yazılır,\n"
+" - ID3v2.4 libid3tag ile yazılır (gerekli)."
+
+#: ../data/preferences_dialog.ui.h:88
+#, fuzzy
+#| msgid "Try another character encoding"
+msgid "Character encoding:"
+msgstr "Başka bir karakter kodlaması kullan"
+
+#: ../data/preferences_dialog.ui.h:89
+#, fuzzy
+#| msgid "Unicode "
+msgid "Unicode"
+msgstr "Unicode "
+
+#: ../data/preferences_dialog.ui.h:90
+msgid ""
+"Choose the Unicode character encoding to be used when writing ID3v2 tags"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:92
+msgid ""
+"Override the standard Unicode character encoding to be used when writing "
+"ID3v2 tags"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:93
+msgid "When encoding conversion fails:"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:94
+msgid "Report error"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:95
+#, fuzzy
+#| msgid ""
+#| "With this option, when a character cannot be represented in the target "
+#| "character set, it will be silently discarded."
+msgid ""
+"Display an error message when a character cannot be represented in the "
+"target character encoding and keep the original character"
+msgstr "Bu seçenek ile dönüştürülemeyen karakterler yazılmadan geçilir."
+
+#: ../data/preferences_dialog.ui.h:96
+msgid "Transliterate"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:97
+#, fuzzy
+#| msgid "Disc"
+msgid "Discard"
+msgstr "Disk"
+
+#: ../data/preferences_dialog.ui.h:98
+msgid "Automatically convert old ID3v2 tag versions"
+msgstr "Eski ID3v2 etiketleri otomatik dönüştür"
+
+#: ../data/preferences_dialog.ui.h:99
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:78
+msgid ""
+"Whether to convert ID3 tags written against old version of the "
+"specification, such as ID3v2.2, to newer ones, such as ID3v2.3 or ID3v2.4"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:100
+#, fuzzy
+#| msgid "Use CRC32"
+msgid "Use CRC-32"
+msgstr "CRC32 kullan"
+
+#: ../data/preferences_dialog.ui.h:101
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:82
+msgid "Whether to embed a CRC-32 checksum of the audio file data in ID3v2 tags"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:102
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:79
+#, fuzzy
+#| msgid "Set Compression in the ID3v2 tags"
+msgid "Compress data in ID3v2 tags"
+msgstr "ID3v2 etiketlerine sıkıltırma uygıla"
+
+#: ../data/preferences_dialog.ui.h:103
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:80
+#, fuzzy
+#| msgid "Set Compression in the ID3v2 tags"
+msgid "Whether to compress data in ID3v2 tags"
+msgstr "ID3v2 etiketlerine sıkıltırma uygıla"
+
+#: ../data/preferences_dialog.ui.h:104
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:83
+msgid "Use text-only genre in ID3v2 tags"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:105
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:84
+msgid ""
+"Whether to use only a string, and not the integer-base ID3v1 genre field, "
+"when writing a genre field to ID3v2 tags"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:106
+#, fuzzy
+#| msgid "ID3v1 tags"
+msgid "ID3v1"
+msgstr "ID3v1 etiketler"
+
+#: ../data/preferences_dialog.ui.h:107
+#, fuzzy
+#| msgid "Write ID3v1.x tag"
+msgid "Write ID3v1 tag"
+msgstr "ID3v1.x etiketleri yaz"
+
+#: ../data/preferences_dialog.ui.h:108
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:66
+msgid "Whether to write ID3v1 tags when writing ID3 tags into audio files"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:109
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "Choose the character set to be used when writing ID3v1 tag"
+msgstr "ID3 Etiketleri için Karakter Seti"
+
+#: ../data/preferences_dialog.ui.h:110
+#, fuzzy
+#| msgid "ID3 Tag"
+msgid "ID3 Tags"
+msgstr "ID3 Etiketi"
+
+#: ../data/preferences_dialog.ui.h:111
+#, fuzzy
+#| msgid "Fill Tag Scanner - Character Conversion"
+msgid "Character Conversion"
+msgstr "Etiket Doldurma Tarayıcısı - Karakter Dönüşümü"
+
+#: ../data/preferences_dialog.ui.h:112
+#, fuzzy
+#| msgid "Fill Tag"
+msgid "Fill Tag Scanner"
+msgstr "Etiketi Doldur"
+
+#: ../data/preferences_dialog.ui.h:114
+#, fuzzy, no-c-format
+#| msgid "Convert '_' and '%20' to spaces"
+msgid "Convert underscores and ‘%20’ to spaces"
+msgstr "'_' ve '%20' metinlerini boşluğa çevir"
+
+#: ../data/preferences_dialog.ui.h:116
+#, fuzzy, no-c-format
+#| msgid "Convert space ' ' to underscore '_'"
+msgid "Convert spaces and ‘%20’ to underscores"
+msgstr "Boşlukları ' ' alt çizgiye '_' dönüştür"
+
+#: ../data/preferences_dialog.ui.h:117
+msgid "No conversion"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:118
+#, fuzzy
+#| msgid "Rename File and Directory"
+msgid "Rename File and Directory Scanner"
+msgstr "Dosya ve Dizini Yeniden Adlandır"
+
+#: ../data/preferences_dialog.ui.h:119
+#, fuzzy
+#| msgid "Process Fields"
+msgid "Process Fields Scanner"
+msgstr "Alanları işle"
+
+#: ../data/preferences_dialog.ui.h:120
+#, fuzzy
+#| msgid "Capitalize the first letter of each word"
+msgid "Upper-case the first letters of all words"
+msgstr "Her kelimenin ilk harfini büyüt"
+
+#: ../data/preferences_dialog.ui.h:121
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:150
+msgid ""
+"Whether to upper-case the first letter of all words, including prepositions "
+"and other short words such as “feat.”, when processing tag fields"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:122
+msgid "Fields"
+msgstr "Alanlar"
+
+#: ../data/preferences_dialog.ui.h:123
+msgid "Overwrite fields when scanning tags"
+msgstr "Etiketleri tararken alanların üzerine yaz"
+
+#: ../data/preferences_dialog.ui.h:124
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:111
+msgid ""
+"Whether to overwrite the tag field values when filling tags. Otherwise, only "
+"blank tag fields will be filled"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:125
+msgid "Set this text as default comment:"
+msgstr "Öntanımlı yorum olarak bu yazıyı ayarla:"
+
+#: ../data/preferences_dialog.ui.h:126
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:113
+msgid ""
+"Whether to set the comment tag field to the provided default value when "
+"filling tags"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:127
+#, fuzzy
+#| msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
+msgid "Use CRC-32 as the default comment (for files with ID3 tags only)"
+msgstr ""
+"Öntanımlı yorum olarak CRC32 kullan (sadece ID3 etiketli dosyalar için)."
+
+#: ../data/preferences_dialog.ui.h:128
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:117
+#, fuzzy
+#| msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
+msgid ""
+"Whether to use the CRC-32 of the audio file data as the default comment, for "
+"files with ID3 tags only"
+msgstr ""
+"Öntanımlı yorum olarak CRC32 kullan (sadece ID3 etiketli dosyalar için)."
+
+#: ../data/preferences_dialog.ui.h:129
+msgid "Scanner"
+msgstr "Tarayıcı"
+
+#: ../data/preferences_dialog.ui.h:130
+#, fuzzy
+#| msgid "Automatic Search"
+msgid "Automatic Search Servers"
+msgstr "Otomatik Ara"
+
+#: ../data/preferences_dialog.ui.h:131
+#, fuzzy
+#| msgid "Host Name:"
+msgid "Host:"
+msgstr "Sunucu Adı:"
+
+#: ../data/preferences_dialog.ui.h:132
+msgid "Port:"
+msgstr "Port:"
+
+#: ../data/preferences_dialog.ui.h:133
+msgid "CGI Path:"
+msgstr "CGI Konumu:"
+
+#: ../data/preferences_dialog.ui.h:134
+#, fuzzy
+#| msgid "Manual Search"
+msgid "Manual Search Server"
+msgstr "Elle Arama"
+
+#: ../data/preferences_dialog.ui.h:135
+msgid "Proxy"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:136
+#, fuzzy
+#| msgid "Use a proxy"
+msgid "Use a proxy server"
+msgstr "Vekil kullan"
+
+#: ../data/preferences_dialog.ui.h:137
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:28
+msgid "Whether to access remote CDDB through a proxy"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:138
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:30
+msgid "Hostname for a proxy to access remote CDDB"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:139
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:32
+msgid "Port for a proxy to access remote CDDB"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:140
+#, fuzzy
+#| msgid "User Name:"
+msgid "User:"
+msgstr "Kullanıcı Adı:"
+
+#: ../data/preferences_dialog.ui.h:141
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:34
+msgid "Username for a proxy to access remote CDDB"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:142
+#, fuzzy
+#| msgid "User Password:"
+msgid "Password:"
+msgstr "Kullanıcı Parolası:"
+
+#: ../data/preferences_dialog.ui.h:143
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:36
+msgid "Password for a proxy to access remote CDDB"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:144
+#, fuzzy
+#| msgid "Results:"
+msgid "Results List"
+msgstr "Sonuçlar:"
+
+#: ../data/preferences_dialog.ui.h:145
+#, fuzzy
+#| msgid ""
+#| "Select corresponding audio file (according position or DLM if activated "
+#| "below)"
+msgid ""
+"Select corresponding file (according to position or DLM if activated below)"
+msgstr "Eşleşen ses dosyasını seç (Eğer aktifse uygun konum veya DLM)"
+
+#: ../data/preferences_dialog.ui.h:146
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:26
+msgid ""
+"Whether to select the file in the file list which matches the position in "
+"the CDDB results list"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:147
+#, fuzzy
+#| msgid ""
+#| "Use the Levenshtein algorithm (DLM) to match lines (using title) with "
+#| "audio files (using filename)"
+msgid ""
+"Use the Levenshtein algorithm (DLM) to match results (using title) with "
+"audio files (using filename)"
+msgstr ""
+"Satırları (başlığı kullanır) ses dosyalarıyle (dosya adını kullanır) "
+"eşleştirmek için Levenshtein algoritması (DLM) kullan"
+
+#: ../data/preferences_dialog.ui.h:149
+msgid "CDDB"
+msgstr "CDDB"
+
+#: ../data/preferences_dialog.ui.h:150
+msgid "Confirmation"
+msgstr "Doğrulama"
+
+#: ../data/preferences_dialog.ui.h:151
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:118
+#, fuzzy
+#| msgid "Confirm writing of playlist"
+msgid "Confirm before quitting the application"
+msgstr "Çalma listesi oluşturulurken doğrulama iste"
+
+#: ../data/preferences_dialog.ui.h:152
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:119
+msgid ""
+"Whether to ask for confirmation from the user before quitting the application"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:153
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:120
+#, fuzzy
+#| msgid "Confirm writing of file tag"
+msgid "Confirm before writing tags"
+msgstr "Dosya etiketi yazarken doğrulama iste"
+
+#: ../data/preferences_dialog.ui.h:154
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:121
+msgid ""
+"Whether to ask for confirmation from the user before writing tags to audio "
+"files"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:155
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:122
+#, fuzzy
+#| msgid "Confirm renaming of file"
+msgid "Confirm before renaming a file"
+msgstr "Dosya yeniden adlendırırken doğrulama iste"
+
+#: ../data/preferences_dialog.ui.h:156
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:123
+msgid "Whether to ask for confirmation from the user before renaming a file"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:157
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:126
+#, fuzzy
+#| msgid "Confirm deleting of file"
+msgid "Confirm before deleting a file"
+msgstr "Dosya silerken doğrulama iste"
+
+#: ../data/preferences_dialog.ui.h:158
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:127
+msgid "Whether to ask for confirmation from the user before deleting a file"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:159
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:124
+#, fuzzy
+#| msgid "Confirm writing of playlist"
+msgid "Confirm before writing a playlist"
+msgstr "Çalma listesi oluşturulurken doğrulama iste"
+
+#: ../data/preferences_dialog.ui.h:160
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:125
+msgid "Whether to ask for confirmation from the user before writing a playlist"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:161
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:128
+#, fuzzy
+#| msgid "Confirm renaming of file"
+msgid "Confirm before losing unsaved changes to files"
+msgstr "Dosya yeniden adlendırırken doğrulama iste"
+
+#: ../data/preferences_dialog.ui.h:162
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:129
+msgid ""
+"Whether to ask for confirmation from the user before performing an operation "
+"that would lose unsaved changes on files"
+msgstr ""
+
+#: ../data/preferences_dialog.ui.h:163
+#, fuzzy
+#| msgid "Scanner Window"
+msgid "Scanner Dialog"
+msgstr "Tarayıcı Penceresi"
+
+#: ../data/preferences_dialog.ui.h:164
+#, fuzzy
+#| msgid "Open the Scanner Window on startup"
+msgid "Show the scanner dialog on startup"
+msgstr "Tarayıcı penceresini başlangıçta aç"
+
+#: ../data/preferences_dialog.ui.h:165
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:202
+#, fuzzy
+#| msgid "Open the Scanner Window on startup"
+msgid "Whether to show the scanner window on application startup"
+msgstr "Tarayıcı penceresini başlangıçta aç"
+
+#: ../data/preferences_dialog.ui.h:166
+msgid "Application"
+msgstr ""
+
+#: ../data/scan_dialog.ui.h:1
+#, fuzzy
+#| msgid ""
+#| "Select or type in a mask using codes (see Legend) to parse filename and "
+#| "path. Used to fill in tag fields"
+msgid ""
+"Select or type in a mask using codes (see Legend) to parse filename and "
+"directory. Used to fill in tag fields"
+msgstr ""
+"Dosya ve dizin adı ayrıştırmak için maske biçimi yazın veya seçin. Etiket "
+"alanları doldurmak için kullanılacak"
+
+#: ../data/scan_dialog.ui.h:2
+msgid "Fill tag preview"
+msgstr "Etiket önizlemesini doldur"
+
+#: ../data/scan_dialog.ui.h:3
+msgid "Mask Editor"
+msgstr "Maske Düzenleyici"
+
+#: ../data/scan_dialog.ui.h:4
+#, fuzzy
+#| msgid "Create New Mask"
+msgid "Create a new mask"
+msgstr "Yeni Maske Oluştur"
+
+#: ../data/scan_dialog.ui.h:5
+#, fuzzy
+#| msgid "Move up the selected line"
+msgid "Move the selected mask up"
+msgstr "Seçilen satırı yukarı taşı"
+
+#: ../data/scan_dialog.ui.h:6
+#, fuzzy
+#| msgid "Move up the selected line"
+msgid "Move the selected mask down"
+msgstr "Seçilen satırı yukarı taşı"
+
+#: ../data/scan_dialog.ui.h:7
+#, fuzzy
+#| msgid "Delete the selected line"
+msgid "Duplicate the selected mask"
+msgstr "Seçilen satırı sil"
+
+#: ../data/scan_dialog.ui.h:8
+#, fuzzy
+#| msgid "Add Default Masks"
+msgid "Add default masks"
+msgstr "Öntanımlı Maskelere Ekle"
+
+#: ../data/scan_dialog.ui.h:9
+#, fuzzy
+#| msgid "Move up the selected line"
+msgid "Remove the selected mask"
+msgstr "Seçilen satırı yukarı taşı"
+
+#: ../data/scan_dialog.ui.h:10
+#, fuzzy
+#| msgid "Save Masks"
+msgid "Save masks"
+msgstr "Maskeleri Kaydet"
+
+#: ../data/scan_dialog.ui.h:11
+msgid "Legend"
+msgstr "Maske Biçimleri"
+
+#: ../data/scan_dialog.ui.h:13
+#, no-c-format
+msgid "%a: artist"
+msgstr "%a: sanatçı"
+
+#: ../data/scan_dialog.ui.h:15
+#, fuzzy, no-c-format
+#| msgid "%z: album artist"
+msgid "%a: album artist"
+msgstr "%z: albüm sanatçısı"
+
+#: ../data/scan_dialog.ui.h:17
+#, no-c-format
+msgid "%b: album"
+msgstr "%b: albüm"
+
+#: ../data/scan_dialog.ui.h:19
+#, no-c-format
+msgid "%c: comment"
+msgstr "%c: yorum"
+
+#: ../data/scan_dialog.ui.h:21
+#, no-c-format
+msgid "%p: composer"
+msgstr "%p: besteci"
+
+#: ../data/scan_dialog.ui.h:23
+#, no-c-format
+msgid "%r: copyright"
+msgstr "%r: telif hakkı"
+
+#: ../data/scan_dialog.ui.h:25
+#, no-c-format
+msgid "%d: disc number"
+msgstr "%d: disk numarası"
+
+#: ../data/scan_dialog.ui.h:27
+#, no-c-format
+msgid "%e: encoded by"
+msgstr "%e: kodlayıcı"
+
+#: ../data/scan_dialog.ui.h:29
+#, no-c-format
+msgid "%g: genre"
+msgstr "%g: tür"
+
+#: ../data/scan_dialog.ui.h:31
+#, no-c-format
+msgid "%i: ignored"
+msgstr "%i: ihmal"
+
+#: ../data/scan_dialog.ui.h:33
+#, no-c-format
+msgid "%l: number of tracks"
+msgstr "%l: parça sayısı"
+
+#: ../data/scan_dialog.ui.h:35
+#, fuzzy, no-c-format
+#| msgid "%o: orig. artist"
+msgid "%o: original artist"
+msgstr "%o: asıl sanatçı"
+
+#: ../data/scan_dialog.ui.h:37
+#, no-c-format
+msgid "%n: track"
+msgstr "%n: parça numarası"
+
+#: ../data/scan_dialog.ui.h:39
+#, no-c-format
+msgid "%t: title"
+msgstr "%t: başlık"
+
+#: ../data/scan_dialog.ui.h:41
+#, no-c-format
+msgid "%u: URL"
+msgstr "%u: bağlantı"
+
+#: ../data/scan_dialog.ui.h:43
+#, no-c-format
+msgid "%x: number of discs"
+msgstr "%x: disk sayısı"
+
+#: ../data/scan_dialog.ui.h:45
+#, no-c-format
+msgid "%y: year"
+msgstr "%y: yıl"
+
+#: ../data/scan_dialog.ui.h:46
+msgid "Fill Tag"
+msgstr "Etiketi Doldur"
+
+#: ../data/scan_dialog.ui.h:47
+#, fuzzy
+#| msgid "Prefix mask with current path"
+msgid "Prefix mask with current directory"
+msgstr "Şuanki dizin için maske öncülü"
+
+#: ../data/scan_dialog.ui.h:48
+#, fuzzy
+#| 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."
+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 is an "
+"absolute path, otherwise is relative to the old path"
+msgstr ""
+"Etiket alanlarını ayrıştırmak için maske biçimi yazın veya seçin. Dosyayı "
+"yeniden anlandırmak için kullanılacak.\n"
+"Dizin oluşturmak için / karakterini kullanın. İlk karakter / olursa kesin "
+"konum, değilse eski konuma göre göreceli konum olur."
+
+#: ../data/scan_dialog.ui.h:50
+msgid "Rename file preview"
+msgstr "Dosya adı değiştirme önizlemesi"
+
+#. Only filename changed
+#: ../data/scan_dialog.ui.h:51 ../src/easytag.c:602
+msgid "Rename File"
+msgstr "Dosyayı Yeniden Adlandır"
+
+#: ../data/scan_dialog.ui.h:52
+#, fuzzy
+#| msgid "Fields"
+msgid "Tag Fields"
+msgstr "Alanlar"
+
+#: ../data/scan_dialog.ui.h:54
+#, fuzzy
+#| msgid "Process filename field"
+msgid "Process filename"
+msgstr "Dosya adı alanını işle"
+
+#: ../data/scan_dialog.ui.h:56
+msgid "Process title field"
+msgstr "Başlık alanını işle"
+
+#: ../data/scan_dialog.ui.h:58
+#, fuzzy
+#| msgid "Process file artist field"
+msgid "Process artist field"
+msgstr "Sanatçi alanını işle"
+
+#: ../data/scan_dialog.ui.h:61
+msgid "Process album field"
+msgstr "Albüm alanını işle"
+
+#: ../data/scan_dialog.ui.h:63
+msgid "Process genre field"
+msgstr "Tür alanını işle"
+
+#: ../data/scan_dialog.ui.h:65
+msgid "Process comment field"
+msgstr "Yorum alanını işle"
+
+#: ../data/scan_dialog.ui.h:67
+msgid "Process composer field"
+msgstr "Besteci alanını işle"
+
+#: ../data/scan_dialog.ui.h:68
+#, fuzzy
+#| msgid "Orig. artist:"
+msgid "Orig. Artist"
+msgstr "Asıl sanatçı:"
+
+#: ../data/scan_dialog.ui.h:69
+msgid "Process original artist field"
+msgstr "Asıl Sanatçı alanını işle"
+
+#: ../data/scan_dialog.ui.h:71
+msgid "Process copyright field"
+msgstr "Telif hakkı alanını işle"
+
+#: ../data/scan_dialog.ui.h:73
+msgid "Process URL field"
+msgstr "Bağlantı alanını işle"
+
+#: ../data/scan_dialog.ui.h:75
+#, fuzzy
+#| msgid "Process encoder name field"
+msgid "Process encoded-by field"
+msgstr "Kodlayıcı alanını işle"
+
+#: ../data/scan_dialog.ui.h:76
+#, fuzzy
+#| msgid "Capitalize all"
+msgid "Capitalization"
+msgstr "Tümü Büyük Harf"
+
+#: ../data/scan_dialog.ui.h:77
+msgid "Capitalize all"
+msgstr "Tümü Büyük Harf"
+
+#: ../data/scan_dialog.ui.h:78 ../data/org.gnome.EasyTAG.gschema.xml.h:144
+msgid ""
+"Whether to upper-case all characters of the tag when processing tag fields"
+msgstr ""
+
+#: ../data/scan_dialog.ui.h:79
+msgid "Lowercase all"
+msgstr "Tümü Küçük Harf"
+
+#: ../data/scan_dialog.ui.h:80 ../data/org.gnome.EasyTAG.gschema.xml.h:142
+msgid ""
+"Whether to lower-case all characters of the tag when processing tag fields"
+msgstr ""
+
+#: ../data/scan_dialog.ui.h:81
+msgid "Capitalize first letter"
+msgstr "İlk harfi büyüt"
+
+#: ../data/scan_dialog.ui.h:82 ../data/org.gnome.EasyTAG.gschema.xml.h:146
+msgid ""
+"Whether to upper-case the first letter of the tag when processing tag fields"
+msgstr ""
+
+#: ../data/scan_dialog.ui.h:83
+msgid "Capitalize the first letter of each word"
+msgstr "Her kelimenin ilk harfini büyüt"
+
+#: ../data/scan_dialog.ui.h:84 ../data/org.gnome.EasyTAG.gschema.xml.h:148
+#, fuzzy
+#| msgid ""
+#| "Don't uppercase first letter of words for some prepositions and articles."
+msgid ""
+"Whether to upper-case the first letter of each word when processing tag "
+"fields"
+msgstr "Bazı edatlar ve yazılar için kelimelerin ilk harfini büyük harf yapma."
+
+#: ../data/scan_dialog.ui.h:85
+msgid "Detect Roman numerals"
+msgstr "Roma rakamlarını algıla"
+
+#: ../data/scan_dialog.ui.h:86 ../data/org.gnome.EasyTAG.gschema.xml.h:152
+msgid ""
+"Whether to detect Roman numerals when applying upper-case conversions while "
+"processing tag fields"
+msgstr ""
+
+#: ../data/scan_dialog.ui.h:87
+msgid "Do not change capitalization"
+msgstr "Büyük-küçük harfleri değiştirme"
+
+#: ../data/scan_dialog.ui.h:88
+msgid "Spaces Conversions"
+msgstr ""
+
+#: ../data/scan_dialog.ui.h:89 ../data/org.gnome.EasyTAG.gschema.xml.h:153
+#: ../src/tag_area.c:875
+msgid "Remove spaces"
+msgstr "Boşlukları sil"
+
+#: ../data/scan_dialog.ui.h:90 ../data/org.gnome.EasyTAG.gschema.xml.h:154
+msgid "Whether to remove all spaces when processing tag fields"
+msgstr ""
+
+#: ../data/scan_dialog.ui.h:91
+msgid "Insert a space before uppercase letters"
+msgstr "Büyük harflerden önce bir boşluk ekle"
+
+#: ../data/scan_dialog.ui.h:92 ../data/org.gnome.EasyTAG.gschema.xml.h:156
+msgid ""
+"Whether to insert spaces before capital letters when processing tag fields"
+msgstr ""
+
+#: ../data/scan_dialog.ui.h:93
+msgid "Remove duplicate spaces and underscores"
+msgstr "Çift boşluk ve alt çizgileri sil"
+
+#: ../data/scan_dialog.ui.h:94 ../data/org.gnome.EasyTAG.gschema.xml.h:158
+#, fuzzy
+#| msgid "Remove duplicate spaces and underscores"
+msgid ""
+"Whether to remove duplicate spaces and underscores when processing tag fields"
+msgstr "Çift boşluk ve alt çizgileri sil"
+
+#: ../data/scan_dialog.ui.h:95
+msgid "Do not change word separators"
+msgstr "Kelime ayraçlarını değiştirme"
+
+#: ../data/scan_dialog.ui.h:96
+#, fuzzy
+#| msgid "Fill Tag Scanner - Character Conversion"
+msgid "Character Conversions"
+msgstr "Etiket Doldurma Tarayıcısı - Karakter Dönüşümü"
+
+#: ../data/scan_dialog.ui.h:98 ../src/tag_area.c:831
+#, fuzzy, no-c-format
+#| msgid "Convert '_' and '%20' to spaces"
+msgid "Convert ‘_’ and ‘%20’ to spaces"
+msgstr "'_' ve '%20' metinlerini boşluğa çevir"
+
+#: ../data/scan_dialog.ui.h:100
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The underscore character or the string '%20' are replaced by one space. "
+#| "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
+msgid ""
+"The underscore character or the string ‘%20’ is replaced by one space. "
+"Example, before: ‘Text%20In%20An_Entry‘, after: ‘Text In An Entry’"
+msgstr ""
+"'%20' metnini ve altçizgiyi boşlukla değiştir. Örnek, önce: 'Bir"
+"%20Güzel_Yazı', sonra: 'Bir Güzel Yazı'"
+
+#: ../data/scan_dialog.ui.h:101 ../src/tag_area.c:837
+#, fuzzy
+#| msgid "Convert space ' ' to underscore '_'"
+msgid "Convert spaces to underscores"
+msgstr "Boşlukları ' ' alt çizgiye '_' dönüştür"
+
+#: ../data/scan_dialog.ui.h:102
+#, fuzzy
+#| msgid ""
+#| "The space character is replaced by one underscore character. Example, "
+#| "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
+msgid ""
+"The space character is replaced by one underscore character. Example, "
+"before: ‘Text In An Entry’, after: ‘Text_In_An_Entry’"
+msgstr ""
+"Boşluk karakterini alt çizgi ile değiştir. Örnek, önce: 'Bir Güzel Yazı', "
+"sonra: 'Bir_Güzel_Yazı'"
+
+#: ../data/scan_dialog.ui.h:103
+msgid "Convert:"
+msgstr "Dönüştür:"
+
+#: ../data/scan_dialog.ui.h:104
+#, fuzzy
+#| msgid ""
+#| "Replace a string by another one. Note that the search is case sensitive."
+msgid "Replace a string by another one. Note that the search is case sensitive"
+msgstr ""
+"Yazıyı başka biriyle yer değiştir. Bu arama büyük küçük harf duyarlıdır."
+
+#: ../data/scan_dialog.ui.h:105
+msgid "to: "
+msgstr "->:"
+
+#: ../data/scan_dialog.ui.h:106
+msgid "Do not convert"
+msgstr "Dönüştürme"
+
+#: ../data/scan_dialog.ui.h:108
+msgid "Show / Hide Masks Editor"
+msgstr "Maske Düzenleyiciyi Göster / Gizle"
+
+#: ../data/scan_dialog.ui.h:109
+msgid "Show / Hide Legend"
+msgstr "Maske Biçimlerini Göster / Gizle"
+
+#: ../data/scan_dialog.ui.h:110
+msgid "Scanner Preferences"
+msgstr "Tarayıcı Tercihleri"
+
+#: ../data/search_dialog.ui.h:1
+msgid "Search:"
+msgstr "Ara:"
+
+#: ../data/search_dialog.ui.h:2
+#, fuzzy
+#| msgid ""
+#| "Type the word to search into files. Or type nothing to display all files."
+msgid ""
+"Type the text to search for in the file list, or leave the field empty to "
+"display all files"
+msgstr ""
+"Dosyalarda aramak için bir şeyler girin veya bir şey yazmayın tüm dosyalar "
+"görünsün."
+
+#: ../data/search_dialog.ui.h:3
+#, fuzzy
+#| msgid "_Find…"
+msgid "_Find"
+msgstr "_Bul…"
+
+#: ../data/search_dialog.ui.h:4
+msgid "In:"
+msgstr "Nerede:"
+
+#. This option is for the previous 'in' option. For instance, translate this as 'Search' 'In:' 'the Filename'.
+#: ../data/search_dialog.ui.h:6
+msgid "the Filename"
+msgstr "Dosya adında"
+
+#. This option is for the previous 'in' option. For instance, translate this as 'Search' 'In:' 'the Tag'.
+#: ../data/search_dialog.ui.h:8
+msgid "the Tag"
+msgstr "Etiketlerde"
+
+#: ../data/search_dialog.ui.h:9
+msgid "Case sensitive"
+msgstr "Büyük küçük harf duyarlı"
+
+#: ../data/search_dialog.ui.h:16
+msgid "CD"
+msgstr "CD"
+
+#: ../data/tag_area.ui.h:1
+msgid "Image Type"
+msgstr "Görüntü Biçimi"
+
+#: ../data/tag_area.ui.h:2 ../src/picture.c:297
+msgid "Description"
+msgstr "Açıklama"
+
+#: ../data/tag_area.ui.h:4
+msgid "_Accept"
+msgstr ""
+
+#: ../data/tag_area.ui.h:5 ../src/tag_area.c:3031
+msgid "Tag"
+msgstr "Etiket"
+
+#: ../data/tag_area.ui.h:6
+msgid "Title:"
+msgstr "Başlık:"
+
+#: ../data/tag_area.ui.h:7
+msgid "Tag selected files with this title"
+msgstr "Seçilen dosyalara bu başlığı etiketle"
+
+#: ../data/tag_area.ui.h:8
+msgid "Artist:"
+msgstr "Sanatçı:"
+
+#: ../data/tag_area.ui.h:9
+msgid "Tag selected files with this artist"
+msgstr "Seçilen dosyalara bu sanatçıyı etiketle"
+
+#: ../data/tag_area.ui.h:10
+msgid "Album artist:"
+msgstr "Albüm Sanatçısı:"
+
+#: ../data/tag_area.ui.h:11
+msgid "Tag selected files with this album artist"
+msgstr "Seçilen dosyalara bu albüm sanatçısını etiketle"
+
+#: ../data/tag_area.ui.h:12
+msgid "Album:"
+msgstr "Albüm:"
+
+#: ../data/tag_area.ui.h:13
+msgid "Tag selected files with this album name"
+msgstr "Seçilen dosyalara bu albümü etiketle"
+
+#: ../data/tag_area.ui.h:14
+msgid "CD:"
+msgstr "CD:"
+
+#: ../data/tag_area.ui.h:15
+msgid "Tag selected files with this disc number"
+msgstr "Seçilen dosyalara bu disk numarasını etiketle"
+
+#: ../data/tag_area.ui.h:16
+msgid "Year:"
+msgstr "Yıl:"
+
+#: ../data/tag_area.ui.h:17
+msgid "Tag selected files with this year"
+msgstr "Seçilen dosyalara bu yılı etiketle"
+
+#: ../data/tag_area.ui.h:18
+#, fuzzy
+#| msgid ""
+#| "Number selected tracks sequentially. Starts at 01 in each subdirectory."
+msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory"
+msgstr "Parça numarasını otomatik doldur. Her alt dizin için 01'den başlar."
+
+#: ../data/tag_area.ui.h:19
+msgid "Track #:"
+msgstr "Parça #:"
+
+#: ../data/tag_area.ui.h:20
+#, fuzzy
+#| msgid ""
+#| "Set the number of files, in the same directory of the displayed file, to "
+#| "the selected tracks."
+msgid ""
+"Set the number of files, in the same directory of the displayed file, to the "
+"selected tracks"
+msgstr ""
+"Toplam parça sayısını otomatik doldur, her alt dizini kendi içinde sayar."
+
+#: ../data/tag_area.ui.h:21
+msgid "Tag selected files with this number of tracks"
+msgstr "Seçilen dosyalara bu parça numarasını etiketle"
+
+#: ../data/tag_area.ui.h:22
+msgid "Genre:"
+msgstr "Tür:"
+
+#: ../data/tag_area.ui.h:23
+msgid "Comment:"
+msgstr "Yorum:"
+
+#: ../data/tag_area.ui.h:24
+msgid "Tag selected files with this comment"
+msgstr "Seçilen dosyalara bu yorumu etiketle"
+
+#: ../data/tag_area.ui.h:25
+msgid "Composer:"
+msgstr "Besteci:"
+
+#: ../data/tag_area.ui.h:26
+msgid "Tag selected files with this composer"
+msgstr "Seçilen dosyalara bu besteciyi etiketle"
+
+#: ../data/tag_area.ui.h:27
+msgid "Orig. artist:"
+msgstr "Asıl sanatçı:"
+
+#: ../data/tag_area.ui.h:28
+msgid "Tag selected files with this original artist"
+msgstr "Seçilen dosyalara bu asıl sanatçıyı etiketle"
+
+#: ../data/tag_area.ui.h:29
+msgid "Copyright:"
+msgstr "Telif Hakkı:"
+
+#: ../data/tag_area.ui.h:30
+msgid "Tag selected files with this copyright"
+msgstr "Seçilen dosyalara bu telif hakkını etiketle"
+
+#: ../data/tag_area.ui.h:31
+msgid "URL:"
+msgstr "Bağlantı:"
+
+#: ../data/tag_area.ui.h:32
+msgid "Tag selected files with this URL"
+msgstr "Seçilen dosyalara bu bağlantıyı etiketle"
+
+#: ../data/tag_area.ui.h:33
+msgid "Encoded by:"
+msgstr "Kodlayıcı:"
+
+#: ../data/tag_area.ui.h:34
+msgid "Tag selected files with this encoder name"
+msgstr "Seçilen dosyalara bu kodlayıcıyı etiketle"
+
+#: ../data/tag_area.ui.h:35
+msgid "Common"
+msgstr "Genel"
+
+#: ../data/tag_area.ui.h:36
+msgid "You can use drag and drop to add an image"
+msgstr "Tut çek bırak yöntemiyle görüntüleri bırakabilirsiniz."
+
+#: ../data/tag_area.ui.h:37
+msgid "Add images to the tag"
+msgstr "Etikete görüntü ekle"
+
+#: ../data/tag_area.ui.h:38
+msgid "Remove selected images from the tag"
+msgstr "Seçilen görüntüleri etiketten sil"
+
+#: ../data/tag_area.ui.h:39
+msgid "Save the selected images to files"
+msgstr "Seçilen görüntüleri dosya olarak kaydet"
+
+#: ../data/tag_area.ui.h:40
+msgid "Edit image properties"
+msgstr "Görüntü özelliklerini düzenle"
+
+#: ../data/tag_area.ui.h:41
+msgid "Tag selected files with these images"
+msgstr "Seçilen dosyalara bu görüntüleri etiketle"
+
+#: ../data/tag_area.ui.h:42 ../src/tag_area.c:3284 ../src/tag_area.c:3287
+msgid "Images"
+msgstr "Görüntüler"
+
+#: ../data/toolbar.ui.h:2
+msgid "First file"
+msgstr "İlk dosya"
+
+#: ../data/toolbar.ui.h:3
+msgid "_Previous File"
+msgstr "_Önceki Dosya"
+
+#: ../data/toolbar.ui.h:4
+msgid "Previous file"
+msgstr "Önceki dosya"
+
+#: ../data/toolbar.ui.h:6
+msgid "Next file"
+msgstr "Sonraki dosya"
+
+#: ../data/toolbar.ui.h:8
+msgid "Last file"
+msgstr "Son dosya"
+
+#: ../data/toolbar.ui.h:9
+msgid "_Show Scanner"
+msgstr "_Tarayıcıyı Göster"
+
+#: ../data/toolbar.ui.h:10
+msgid "Show scanner"
+msgstr "Tarayıcıyı göster"
+
+#: ../data/toolbar.ui.h:12
+msgid "Remove tags"
+msgstr "Etiketleri sil"
+
+#: ../data/toolbar.ui.h:13
+msgid "_Undo"
+msgstr "_Geri Al"
+
+#: ../data/toolbar.ui.h:14
+#, fuzzy
+#| msgid "Found one file"
+#| msgid_plural "Found %d files"
+msgid "Undo for file"
+msgstr "%d adet dosya bulundu"
+
+#: ../data/toolbar.ui.h:15
+msgid "R_edo"
+msgstr "Yin_ele"
+
+#: ../data/toolbar.ui.h:16
+#, fuzzy
+#| msgid "Read-only file"
+msgid "Redo for file"
+msgstr "Salt okunur dosya"
+
+#: ../data/toolbar.ui.h:18
+msgid "Save changes to selected files"
+msgstr "Seçilen dosyalardaki değişiklikleri kaydet"
+
+#: ../data/toolbar.ui.h:20
+#| msgid "Collapse directory tree"
+msgid "Browse directory tree"
+msgstr "Dizin ağacına gözat"
+
+#: ../data/toolbar.ui.h:22
+#, fuzzy
+#| msgid "View by artist and album"
+msgid "Browse artists and albums"
+msgstr "Sanatçı ve albüme göre göster"
+
+#: ../data/toolbar.ui.h:24
+msgid "Invert file selection"
+msgstr "Dosya seçimini tersine çevir"
+
+#: ../data/toolbar.ui.h:26
+msgid "Search filenames and tags"
+msgstr "Dosya adları ve etiketlerini ara"
+
+#: ../data/toolbar.ui.h:27
+#, fuzzy
+#| msgid "CDD_B Search…"
+msgid "CDDB Search…"
+msgstr "CDD_B Ara…"
+
+#: ../data/toolbar.ui.h:28 ../src/cddb_dialog.c:2752
+msgid "CDDB Search"
+msgstr "CDDB Ara"
+
+#: ../data/toolbar.ui.h:30
+msgid "Generate a playlist"
+msgstr "Çalma listesi oluştur"
+
+#: ../data/toolbar.ui.h:32
+msgid "Stop the current action"
+msgstr "Geçerli işlemi durdur"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:1
+#, fuzzy
+#| msgid "Ready to start"
+msgid "Load on startup"
+msgstr "Başlamaya hazır"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:3
+#, fuzzy
+#| msgid "Add Default Masks"
+msgid "Default path"
+msgstr "Öntanımlı Maskelere Ekle"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:7
+#, fuzzy
+#| msgid "Show hidden directories"
+msgid "Show hidden directories while browsing"
+msgstr "Gizli dosyaları göster"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:11
+#, fuzzy
+#| msgid "Server Settings for Automatic Search"
+msgid "CDDB server hostname for automatic search"
+msgstr "Otomatik Arama için Sunucu Ayarları"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:12
+#, fuzzy
+#| msgid "Server Settings for Automatic Search"
+msgid "The CDDB server to use for the automatic search"
+msgstr "Otomatik Arama için Sunucu Ayarları"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:13
+#, fuzzy
+#| msgid "Server Settings for Automatic Search"
+msgid "CDDB server port for automatic search"
+msgstr "Otomatik Arama için Sunucu Ayarları"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:14
+#, fuzzy
+#| msgid "Server Settings for Automatic Search"
+msgid "The CDDB server port to use for the automatic search"
+msgstr "Otomatik Arama için Sunucu Ayarları"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:15
+#, fuzzy
+#| msgid "Server Settings for Automatic Search"
+msgid "CDDB server path for automatic search"
+msgstr "Otomatik Arama için Sunucu Ayarları"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:16
+#, fuzzy
+#| msgid "Server Settings for Automatic Search"
+msgid "The CDDB server path to use for the automatic search"
+msgstr "Otomatik Arama için Sunucu Ayarları"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:17
+#, fuzzy
+#| msgid "Server Settings for Manual Search"
+msgid "CDDB server hostname for manual search"
+msgstr "Elle Arama için Sunucu Ayarları"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:18
+#, fuzzy
+#| msgid "Server Settings for Manual Search"
+msgid "The CDDB server to use for a manual search"
+msgstr "Elle Arama için Sunucu Ayarları"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:19
+#, fuzzy
+#| msgid "Server Settings for Manual Search"
+msgid "CDDB server port for manual search"
+msgstr "Elle Arama için Sunucu Ayarları"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:20
+#, fuzzy
+#| msgid "Server Settings for Manual Search"
+msgid "The CDDB server port to use for a manual search"
+msgstr "Elle Arama için Sunucu Ayarları"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:21
+#, fuzzy
+#| msgid "Server Settings for Manual Search"
+msgid "CDDB server path for manual search"
+msgstr "Elle Arama için Sunucu Ayarları"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:22
+#, fuzzy
+#| msgid "Server Settings for Manual Search"
+msgid "The CDDB server path to use for a manual search"
+msgstr "Elle Arama için Sunucu Ayarları"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:23
+#, fuzzy
+#| msgid "Error while writing CDDB results to file '%s'"
+msgid "Use DLM to match CDDB results to files"
+msgstr "CDDB sonuçları '%s' dosyasına yazılırken hata oluştu"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:25
+msgid ""
+"Select the file with the position which matches the position of the CDDB "
+"result"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:27
+msgid "Enable proxy for remote CDDB"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:29
+msgid "CDDB proxy hostname"
+msgstr "CDDB vekil sunucu adı"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:31
+msgid "CDDB proxy port"
+msgstr "CDDB vekil sunucu bağlantı noktası"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:33
+msgid "CDDB proxy username"
+msgstr "CDDB vekil sunucu kullanıcı adı"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:35
+msgid "CDDB proxy password"
+msgstr "CDDB vekil sunucu parolası"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:37
+msgid "Run the scanner on CDDB results"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:39
+msgid "The fields to use in a manual CDDB search"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:40
+msgid "Which fields to search for matches of the returned CDDB results"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:41
+msgid "The categories to use in a CDDB search"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:42
+msgid "Which categories to search for matches in the returned CDDB results"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:43
+msgid "The tag fields to set when matching against CDDB results"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:44
+msgid ""
+"Which tag fields should be set when matching against selected files and CDDB "
+"results"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:51
+#, fuzzy
+#| msgid "Display changed files in list using:"
+msgid "Show changed files in bold"
+msgstr "Listedeki değişmiş dosyaların görünümü:"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:52
+msgid ""
+"Whether to highlight changed files in the file list by making them bold, or "
+"alternatively by making them red"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:55
+msgid "How to sort audio files in the file list"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:56
+msgid "Sort files in ascending or descending order for the selected type"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:57
+#, fuzzy
+#| msgid "Max number of lines:"
+msgid "Number of log lines"
+msgstr "En fazla satır sayısı:"
 
-#: ../src/charset.c:51
-msgid "Baltic (ISO-8859-4)"
-msgstr "Baltık (ISO-8859-4)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:61
+#, fuzzy
+#| msgid "Character Set for reading ID3 tags"
+msgid "Use a non-standard character encoding when reading ID3 tags"
+msgstr "ID3 etiketleri okumak için karakter seti"
 
-#: ../src/charset.c:52
-msgid "Baltic (Windows-1257)"
-msgstr "Baltık (Windows-1257)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:65
+#, fuzzy
+#| msgid "Write ID3v1.x tag"
+msgid "Write ID3v1 tags"
+msgstr "ID3v1.x etiketleri yaz"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:67
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "The character set for writing ID3v1 tags"
+msgstr "ID3 Etiketleri için Karakter Seti"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:68
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "Choose the character set to be used when writing ID3v1 tags"
+msgstr "ID3 Etiketleri için Karakter Seti"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:69
+msgid "Encoding options when writing ID3v1 tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:70
+msgid ""
+"Additional options to pass to iconv() when converting between encodings when "
+"writing ID3v1 tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:71
+#, fuzzy
+#| msgid "Character Set for reading ID3 tags"
+msgid "The character set for reading ID3v1 and ID3v2 tags"
+msgstr "ID3 etiketleri okumak için karakter seti"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:73
+#, fuzzy
+#| msgid "Write ID3v2 tag"
+msgid "Write ID3v2 tags"
+msgstr "ID3v2 etiketi yaz"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:75
+msgid "Enable ID3v2.4 support"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:76
+msgid "Whether to write ID3v2.4 tags when ID3v2 support is enabled"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:77
+#, fuzzy
+#| msgid "Automatically convert old ID3v2 tag versions"
+msgid "Convert old ID3 tag versions to new ones"
+msgstr "Eski ID3v2 etiketleri otomatik dönüştür"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:81
+#, fuzzy
+#| msgid "Set CRC32 in the ID3v2 tags"
+msgid "Use CRC-32 in ID3v2 tags"
+msgstr "ID3v2 etiketlerini CRC32 olarak ayarla"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:85
+#, fuzzy
+#| msgid "Try another character encoding"
+msgid "Use Unicode character encoding in ID3v2 tags"
+msgstr "Başka bir karakter kodlaması kullan"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:86
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "Whether to use a Unicode character set when writing ID3v2 tags"
+msgstr "ID3 Etiketleri için Karakter Seti"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:87
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "The Unicode character set for writing ID3v2 tags"
+msgstr "ID3 Etiketleri için Karakter Seti"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:88
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "Choose the Unicode character set to be used when writing ID3v2 tags"
+msgstr "ID3 Etiketleri için Karakter Seti"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:89
+#, fuzzy
+#| msgid "Character Set for writing ID3 tags"
+msgid "The character set for writing ID3v2 tags"
+msgstr "ID3 Etiketleri için Karakter Seti"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:90
+msgid ""
+"Override the typical Unicode character set to be used when writing ID3v2 tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:91
+msgid "Encoding options when writing ID3v2 tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:92
+msgid ""
+"Additional options to pass to iconv() when converting between encodings when "
+"writing ID3v2 tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:93
+msgid "Automatically complete the date"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:95
+msgid "Pad the disc number tag field"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:97
+msgid "The length of the disc number field"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:98
+msgid ""
+"The length of the disc number field, which controls if the field is padded "
+"with leading zeroes"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:100
+msgid ""
+"Whether to, when adding cover art, automatically select the type for an "
+"image based on its filename"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:101
+msgid "Pad the track number tag field"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:103
+msgid "The length of the track number field"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:104
+msgid ""
+"The length of the track number field, which controls if the field is padded "
+"with leading zeroes"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:107
+msgid "Convert spaces and underscores when filling tag fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:109
+#, no-c-format
+msgid ""
+"Whether to convert to spaces (and %20) or underscores when filling tag "
+"fields from filenames"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:110
+msgid "Overwrite tag field"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:112
+#, fuzzy
+#| msgid "Set this text as default comment:"
+msgid "Set the default comment"
+msgstr "Öntanımlı yorum olarak bu yazıyı ayarla:"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:114
+msgid "Default comment for filling tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:115
+msgid "The default comment to use when filling tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:116
+#, fuzzy
+#| msgid "Set this text as default comment:"
+msgid "Use the CRC-32 as the default comment"
+msgstr "Öntanımlı yorum olarak bu yazıyı ayarla:"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:130
+#, fuzzy
+#| msgid "Run the current scanner for each file"
+msgid "Run the current scanner when loading filenames from a file"
+msgstr "Şuanki tarayıcıyı tüm dosyalar için çalıştır"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:132
+#, fuzzy
+#| msgid "Process title field"
+msgid "Process these tag fields"
+msgstr "Başlık alanını işle"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:133
+msgid "The tag fields to process when using the scanner"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:134
+#, fuzzy
+#| msgid "Overwrite fields when scanning tags"
+msgid "Convert tag fields when processing"
+msgstr "Etiketleri tararken alanların üzerine yaz"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:136
+#, no-c-format
+msgid ""
+"Whether to convert to spaces (and %20), underscores or other characters when "
+"processing tag fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:137
+#, fuzzy
+#| msgid "Try another character encoding"
+msgid "Convert characters in tags"
+msgstr "Başka bir karakter kodlaması kullan"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:138
+msgid ""
+"Whether to convert characters of the tag from one value to another when "
+"processing tag fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:139
+msgid "Convert the following characters when processing tag fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:140
+msgid ""
+"Replace any matched sequence of characters with this string when processing "
+"tag fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:141
+#, fuzzy
+#| msgid "Lowercase all"
+msgid "Lower-case all characters"
+msgstr "Tümü Küçük Harf"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:143
+msgid "Upper-case all characters"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:145
+#, fuzzy
+#| msgid "Capitalize the first letter of each word"
+msgid "Upper-case the first letter of the tag"
+msgstr "Her kelimenin ilk harfini büyüt"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:147
+#, fuzzy
+#| msgid "Capitalize the first letter of each word"
+msgid "Upper-case the first letter of each word"
+msgstr "Her kelimenin ilk harfini büyüt"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:149
+msgid "Upper-case prepositions"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:151
+#, fuzzy
+#| msgid "Detect Roman numerals"
+msgid "Detect roman numerals"
+msgstr "Roma rakamlarını algıla"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:155
+#, fuzzy
+#| msgid "Insert space before uppercase letter"
+msgid "Insert spaces before capital letters"
+msgstr "Büyük harften önce boşluk ekle"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:157
+#, fuzzy
+#| msgid "Remove duplicate spaces or underscores"
+msgid "Remove duplicate spaces"
+msgstr "Çift boşluk ve alt çizgileri sil"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:159
+#, fuzzy
+#| msgid "Playlist File Error"
+msgid "Playlist filename mask"
+msgstr "Çalma Listesi Dosyası Hatası"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:160
+msgid "The default filename mask to use for a new playlist"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:161
+msgid "Use a filename mask when generating a playlist"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:162
+msgid "Whether to use a filename mask when creating playlists"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:163
+#, fuzzy
+#| msgid "Create playlist in the parent directory"
+msgid "Create playlists with only the selected files"
+msgstr "Çalma listesini üst dizinde oluştur"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:165
+#, fuzzy
+#| msgid "Use relative path for files in playlist"
+msgid "Use relative paths when creating playlists"
+msgstr "Çalma listesinde dosyalar için göreceli konum kullan"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:166
+#, fuzzy
+#| msgid "Use relative path for files in playlist"
+msgid "Whether to use relative paths for files when creating playlists"
+msgstr "Çalma listesinde dosyalar için göreceli konum kullan"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:167
+#, fuzzy
+#| msgid "Create playlist in the parent directory"
+msgid "Create the playlist in the parent directory"
+msgstr "Çalma listesini üst dizinde oluştur"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:169
+#, fuzzy
+#| msgid "Use full path for files in playlist"
+msgid "Use DOS separators for playlists"
+msgstr "Çalma listesinde dosyalar için gerçek konum kullan"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:171
+#, fuzzy
+#| msgid "Generate a playlist"
+msgid "Content of generated playlists"
+msgstr "Çalma listesi oluştur"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:172
+msgid ""
+"Write a plain list of files, include extended information from the filename "
+"or extended information using a supplied mask"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:173
+msgid "Playlist default mask"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:174
+#, fuzzy
+#| msgid "Use full path for files in playlist"
+msgid "The default mask to use for files in a playlist"
+msgstr "Çalma listesinde dosyalar için gerçek konum kullan"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:175
+msgid "Search for files case-sensitively"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:176
+msgid "Whether matches when searching for files are case-sensitive"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:177
+#, fuzzy
+#| msgid "Search filenames and tags"
+msgid "Search in filenames"
+msgstr "Dosya adları ve etiketlerini ara"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:178
+msgid "Perform the search on filenames"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:179
+#, fuzzy
+#| msgid "Searching"
+msgid "Search in tags"
+msgstr "Aranıyor"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:180
+msgid "Perform the search on tags"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:181
+#, fuzzy
+#| msgid "Error reading tags from file: '%s'"
+msgid "Mask for filling tags from filenames"
+msgstr "'%s' dosyasından etiketler okunamadı"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:182
+msgid ""
+"The default mask to use when automatically filling tags with information "
+"from filenames"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:183
+#, fuzzy
+#| msgid "Confirm renaming of file"
+msgid "Mask for renaming files"
+msgstr "Dosya yeniden adlendırırken doğrulama iste"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:184
+#, fuzzy
+#| msgid "Repeat action for the remaining files"
+msgid "The default mask to use when renaming files"
+msgstr "Kalan dosyalar için eylemi tekrarla"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:185
+#, fuzzy
+#| msgid "Unable to create setting directories"
+msgid "Mask for renaming directories"
+msgstr "Ayar dizin, oluşturulamadı"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:186
+msgid "The default mask to use when renaming directories"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:187
+#, fuzzy
+#| msgid "Unable to create setting directories"
+msgid "Use a mask when renaming directories"
+msgstr "Ayar dizin, oluşturulamadı"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:189
+#, fuzzy
+#| msgid "Convert space ' ' to underscore '_'"
+msgid "Convert spaces and underscores when renaming files"
+msgstr "Boşlukları ' ' alt çizgiye '_' dönüştür"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:190
+msgid "Whether to convert to spaces or underscores when renaming files"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:191
+msgid "How to modify filename extensions when renaming"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:192
+msgid ""
+"Change the file extension to all lower-case, all upper-case or do not change "
+"it"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:193
+msgid "Encoding options when renaming files"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:194
+msgid ""
+"If the encoding of the filename does not match the filesystem encoding, "
+"choose whether to try another encoding, approximate the filesystem encoding "
+"with transliteration or discard the offending characters"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:196
+#, fuzzy
+#| msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
+msgid ""
+"Whether to replace illegal characters in a filename when using the rename "
+"function"
+msgstr "Dosya adında geçersiz karakterler değiştirin (Windows ve CD-Rom için)"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:197
+#, fuzzy
+#| msgid "Show / Hide Masks Editor"
+msgid "Show the scanner mask editor"
+msgstr "Maske Düzenleyiciyi Göster / Gizle"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:198
+msgid "Whether to show the scanner mask editor in the tag scanner"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:199
+#, fuzzy
+#| msgid "Show scanner"
+msgid "Show the scanner legend"
+msgstr "Tarayıcıyı göster"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:200
+#, fuzzy
+#| msgid "Whether to pad the disc field with leading zeroes"
+msgid "Whether to show the scanner legend in the tag scanner"
+msgstr "Disk kısımının başını hizalamak için sıfır eklenip eklenmeyeceği"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:201
+#, fuzzy
+#| msgid "Open the Scanner Window on startup"
+msgid "Show the scanner window on startup"
+msgstr "Tarayıcı penceresini başlangıçta aç"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:203
+msgid "The scan mode"
+msgstr "Tarama kipi"
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:204
+msgid "Which type of scan to show in the scanner"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:205
+msgid "Split Ogg title fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:207
+msgid "Split Ogg artist fields"
+msgstr ""
+
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:209
+msgid "Split Ogg album fields"
+msgstr ""
 
-#: ../src/charset.c:53
-msgid "Celtic (ISO-8859-14)"
-msgstr "Keltçe (ISO-8859-14)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:211
+msgid "Split Ogg genre fields"
+msgstr ""
 
-#: ../src/charset.c:54
-msgid "Central European (IBM-852)"
-msgstr "Merkez Avrupa (IBM-852)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:213
+#, fuzzy
+#| msgid "Process comment field"
+msgid "Split Ogg comment fields"
+msgstr "Yorum alanını işle"
 
-#: ../src/charset.c:55
-msgid "Central European (ISO-8859-2)"
-msgstr "Merkez Avrupa (ISO-8859-2)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:215
+#, fuzzy
+#| msgid "Process composer field"
+msgid "Split Ogg composer fields"
+msgstr "Besteci alanını işle"
 
-#: ../src/charset.c:56
-msgid "Central European (Windows-1250)"
-msgstr "Merkez Avrupa (Windows-1250)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:217
+#, fuzzy
+#| msgid "Process original artist field"
+msgid "Split Ogg original artist fields"
+msgstr "Asıl Sanatçı alanını işle"
 
-#: ../src/charset.c:57
-msgid "Chinese Simplified (GB18030)"
-msgstr "Basitleştirilmiş Çince (GB18030)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:219
+msgid "Page to show in the preferences dialog"
+msgstr ""
 
-#: ../src/charset.c:58
-msgid "Chinese Simplified (GB2312)"
-msgstr "Basitleştirilmiş Çince (GB2312)"
+#: ../data/org.gnome.EasyTAG.gschema.xml.h:220
+msgid "The page in the notebook of the preferences dialog"
+msgstr ""
 
-#: ../src/charset.c:59
-msgid "Chinese Traditional (Big5)"
-msgstr "Geleneksel Çince (Big5)"
+#: ../nautilus-extension/nautilus-easytag.c:229
+msgid "Open in EasyTAG"
+msgstr ""
 
-#: ../src/charset.c:60
-msgid "Chinese Traditional (Big5-HKSCS)"
-msgstr "Geleneksel Çince (Big5-HKSCS)"
+#: ../nautilus-extension/nautilus-easytag.c:230
+#, fuzzy
+#| msgid "Save the selected images to files"
+msgid "Open the selected directory in EasyTAG"
+msgstr "Seçilen görüntüleri dosya olarak kaydet"
 
-#: ../src/charset.c:61
-msgid "Cyrillic (IBM-855)"
-msgstr "Kiril (IBM-855)"
+#: ../nautilus-extension/nautilus-easytag.c:248
+#, fuzzy
+#| msgid "Include only the selected files"
+msgid "Open the selected files in EasyTAG"
+msgstr "Sadece seçilen dosyaları içer"
 
-#: ../src/charset.c:62
-msgid "Cyrillic (ISO-8859-5)"
-msgstr "Kiril (ISO-8859-5)"
+#. Translators: put your own name here to appear in the about dialog.
+#: ../src/about.c:90
+msgid "translator-credits"
+msgstr ""
+"Osman Karagöz <osmank3 at gmail.com>\n"
+"Muhammet Kara <muhammetk at gmail.com>"
 
-#: ../src/charset.c:63
-msgid "Cyrillic (ISO-IR-111)"
-msgstr "Kiril (ISO-IR-111)"
+#: ../src/about.c:100
+msgid "View and edit tags in audio files"
+msgstr "Ses dosyalarının etiketlerini görüntüle ve düzenle"
 
-#: ../src/charset.c:64
-msgid "Cyrillic (KOI8-R)"
-msgstr "Kiril (KOI8-R)"
+#: ../src/application.c:46
+msgid "Print the version and exit"
+msgstr "Sürümü yazdır ve çık"
 
-#: ../src/charset.c:65
-msgid "Cyrillic (Windows-1251)"
-msgstr "Kiril (Windows-1251)"
+#. Starting messages
+#: ../src/application.c:176
+#, fuzzy, c-format
+#| msgid "Starting EasyTAG version %s (PID: %d)…"
+msgid "Starting EasyTAG version %s…"
+msgstr "EasyTAG %s sürümü başlatılıyor (PID: %d)…"
 
-#: ../src/charset.c:66
-msgid "Cyrillic/Russian (CP-866)"
-msgstr "Kiril/Rusça (IBM-866)"
+#: ../src/application.c:181
+#, fuzzy, c-format
+#| msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
+msgid "Variable EASYTAGLANG defined, setting locale ‘%s’"
+msgstr "EASYTAGLANG değişkeni ayarlanmış. Dil ayarı: '%s'"
 
-#: ../src/charset.c:67
-msgid "Cyrillic/Ukrainian (KOI8-U)"
-msgstr "Kiril/Ukraynaca (KOI8-U)"
+#: ../src/application.c:186
+#, fuzzy, c-format
+#| msgid "Setting locale: '%s'"
+msgid "Setting locale: ‘%s’"
+msgstr "Dil Ayarı: '%s'"
 
-#: ../src/charset.c:68
-msgid "English (US-ASCII)"
-msgstr "İngilizce (US-ASCII)"
+#: ../src/application.c:192
+#, c-format
+msgid "System locale is ‘%s’, using ‘%s’"
+msgstr ""
 
-#: ../src/charset.c:69
-msgid "Greek (ISO-8859-7)"
-msgstr "Yunanca (ISO-8859-7)"
+#: ../src/application.c:197
+msgid "Unable to create setting directories"
+msgstr "Ayar dizin, oluşturulamadı"
 
-#: ../src/charset.c:70
-msgid "Greek (Windows-1253)"
-msgstr "Yunanca (Windows-1253)"
+#: ../src/application.c:338
+#, c-format
+msgid "Website: %s"
+msgstr "Web sitesi: %s"
 
-#: ../src/charset.c:71
-msgid "Hebrew (IBM-862)"
-msgstr "İbranice (IBM-862)"
+#: ../src/application.c:347
+msgid "- Tag and rename audio files"
+msgstr "- Ses dosyalarını etiketle ve adını değiştir"
 
-#: ../src/charset.c:72
-msgid "Hebrew (Windows-1255)"
-msgstr "İbranice (Windows-1255)"
+#: ../src/application.c:431 ../src/et_core.c:679
+#, fuzzy, c-format
+#| msgid "Error while querying information for file: '%s' (%s)"
+msgid "Error while querying information for file ‘%s’: %s"
+msgstr "Dosya için bilgi sorgularken hata oluştu: '%s' (%s)"
 
-#: ../src/charset.c:73
-msgid "Japanese (EUC-JP)"
-msgstr "Japonca (EUC-JP)"
+#: ../src/application.c:495
+#, fuzzy, c-format
+#| msgid "Cannot open path '%s'"
+msgid "Cannot open path ‘%s’"
+msgstr "'%s' konumu açılamıyor"
 
-#: ../src/charset.c:74
-msgid "Japanese (ISO-2022-JP)"
-msgstr "Japonca (ISO-2022-JP)"
+#: ../src/application_window.c:318 ../src/application_window.c:335
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the file '%s'?"
+msgid "Do you really want to delete the file ‘%s’?"
+msgstr "'%s' dosyasını silmek istediğinize emin misiniz?"
 
-#: ../src/charset.c:75
-msgid "Japanese (Shift_JIS)"
-msgstr "Japonca (Shift_JIS)"
+#: ../src/application_window.c:321 ../src/easytag.c:490 ../src/easytag.c:623
+msgid "Repeat action for the remaining files"
+msgstr "Kalan dosyalar için eylemi tekrarla"
 
-#: ../src/charset.c:76
-msgid "Korean (EUC-KR)"
-msgstr "Korece (EUC-KR)"
+#: ../src/application_window.c:323
+msgid "_Skip"
+msgstr ""
 
-#: ../src/charset.c:77
-msgid "Nordic (ISO-8859-10)"
-msgstr "İskandinavca (ISO-8859-10)"
+#: ../src/application_window.c:325 ../src/application_window.c:339
+#, fuzzy
+#| msgid "Delete File"
+msgid "_Delete"
+msgstr "Dosya Sil"
 
-#: ../src/charset.c:78
-msgid "South European (ISO-8859-3)"
-msgstr "Güney Avrupa (ISO-8859-3)"
+#: ../src/application_window.c:327 ../src/application_window.c:337
+msgid "Delete File"
+msgstr "Dosya Sil"
 
-#: ../src/charset.c:79
-msgid "Thai (TIS-620)"
-msgstr "Tai (TIS-620)"
+#: ../src/application_window.c:364
+#, fuzzy, c-format
+#| msgid "File '%s' deleted"
+msgid "File ‘%s’ deleted"
+msgstr "'%s' silindi"
 
-#: ../src/charset.c:80
-msgid "Turkish (IBM-857)"
-msgstr "Türkçe (IBM-857)"
+#: ../src/application_window.c:541
+#, fuzzy, c-format
+#| msgid "Cannot delete file (%s)"
+msgid "Cannot delete file ‘%s’"
+msgstr "Dosya silinemiyor (%s)"
 
-#: ../src/charset.c:81
-msgid "Turkish (ISO-8859-9)"
-msgstr "Türkçe (ISO-8859-9)"
+#: ../src/application_window.c:562
+#, fuzzy
+#| msgid "All files have been deleted"
+msgid "Some files were not deleted"
+msgstr "Bütün dosyalar silindi"
 
-#: ../src/charset.c:82
-msgid "Turkish (Windows-1254)"
-msgstr "Türkçe (Windows-1254)"
+#: ../src/application_window.c:564
+msgid "All files have been deleted"
+msgstr "Bütün dosyalar silindi"
 
-#. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
-#: ../src/charset.c:84
-msgid "Unicode (UTF-8)"
-msgstr "Unikod (UTF-8)"
+#: ../src/application_window.c:903
+msgid "All tags have been removed"
+msgstr "Bütün etiketler silindi"
 
-#. {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:91
-msgid "Vietnamese (VISCII)"
-msgstr "Vietnamca (VISCII)"
+#: ../src/application_window.c:1507 ../src/browser.c:357 ../src/browser.c:400
+#: ../src/browser.c:434 ../src/browser.c:4711 ../src/browser.c:4785
+#, c-format
+msgid "Failed to launch program ‘%s’"
+msgstr ""
 
-#: ../src/charset.c:92
-msgid "Vietnamese (Windows-1258)"
-msgstr "Vietnamca (Windows-1258)"
+#. Quit EasyTAG.
+#: ../src/application_window.c:2647
+#, fuzzy
+#| msgid "EasyTAG: Normal exit."
+msgid "Normal exit"
+msgstr "EasyTAG: Normal çıkış."
 
-#: ../src/charset.c:93
-msgid "Visual Hebrew (ISO-8859-8)"
-msgstr "Görsel İbranice (ISO-8859-8)"
+#: ../src/application_window.c:2684 ../src/browser.c:860
+msgid "Some files have been modified but not saved"
+msgstr "Bazı dosyalar değiştirildi ama kaydedilmedi"
 
-#: ../src/charset.c:94
-msgid "Western (IBM-850)"
-msgstr "Batı (IBM-850)"
+#: ../src/application_window.c:2685 ../src/browser.c:864 ../src/easytag.c:273
+#: ../src/easytag.c:494 ../src/easytag.c:626 ../src/easytag.c:634
+#, fuzzy
+#| msgid "Disc"
+msgid "_Discard"
+msgstr "Disk"
 
-#: ../src/charset.c:95
-msgid "Western (ISO-8859-1)"
-msgstr "Batı (ISO-8859-1)"
+#: ../src/application_window.c:2687 ../src/browser.c:866 ../src/easytag.c:274
+#: ../src/easytag.c:496 ../src/easytag.c:503 ../src/easytag.c:628
+#: ../src/easytag.c:635 ../src/playlist_dialog.c:656 ../src/tag_area.c:1855
+#, fuzzy
+#| msgid "Save"
+msgid "_Save"
+msgstr "Kaydet"
 
-#: ../src/charset.c:96
-msgid "Western (ISO-8859-15)"
-msgstr "Batı (ISO-8859-15)"
+#: ../src/application_window.c:2691 ../src/application_window.c:2729
+#: ../src/easytag.c:279
+msgid "Quit"
+msgstr "Çıkış"
 
-#: ../src/charset.c:97
-msgid "Western (Windows-1252)"
-msgstr "Batı (Windows-1252)"
+#: ../src/application_window.c:2694
+msgid "Do you want to save them before quitting?"
+msgstr "Çıkmadan önce kaydedilsin mi?"
 
-#: ../src/charset.c:511
-#, c-format
-msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
-msgstr "Dosya adı '%s' UTF-8'e dönüştürülemiyor (%s)."
+#: ../src/application_window.c:2723
+msgid "Do you really want to quit?"
+msgstr "Gerçekten çıkmak istiyor musunuz?"
 
-#: ../src/charset.c:512 ../src/charset.c:611 ../src/charset.c:674
-msgid "Invalid UTF-8"
-msgstr "Geçersiz UTF-8"
+#: ../src/browser.c:570
+#, fuzzy
+#| msgid "Select a directory to browse"
+msgid "New default directory selected for browser"
+msgstr "Gezinmek için dizin seçin"
 
-#: ../src/charset.c:610
-#, c-format
-msgid ""
-"The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
-msgstr "'%s' UTF-8 metni dosya adı kodlamasına dönüştürülemiyor (%s)."
+#: ../src/browser.c:863
+#, fuzzy
+#| msgid "Do you want to save them before changing the directory?"
+msgid "Do you want to save them before changing directory?"
+msgstr "Dizini değiştirmeden önce değişiklikleri kaydetmek istiyor musunuz?"
 
-#: ../src/charset.c:673
-#, c-format
-msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
-msgstr "'%s' metni UTF-8'e dönüştürülemiyor (%s)."
+#: ../src/browser.c:870
+msgid "Confirm Directory Change"
+msgstr "Dizin Değişimini Doğrula"
 
-#. Starting messages
-#: ../src/easytag.c:181
-#, c-format
-msgid "Starting EasyTAG version %s (PID: %d)…"
-msgstr "EasyTAG %s sürümü başlatılıyor (PID: %d)…"
+#: ../src/browser.c:2558
+#, fuzzy
+#| msgid "<All albums>"
+msgid "All albums"
+msgstr "<Bütün Albümler>"
 
-#: ../src/easytag.c:183
-#, c-format
-msgid "Using libid3tag version %s"
-msgstr "libid3tag sürüm %s kullanılıyor"
+#: ../src/browser.c:3811
+msgid "Select File"
+msgstr "Dosya Seç"
 
-#: ../src/easytag.c:186
-#, c-format
-msgid "Using id3lib version %d.%d.%d"
-msgstr "id3lib sürüm %d.%d.%d kullanılıyor"
+#: ../src/browser.c:3818
+msgid "Select Directory"
+msgstr "Dizin Seç"
 
-#: ../src/easytag.c:192
-#, c-format
-msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
-msgstr "EASYTAGLANG değişkeni ayarlanmış. Dil ayarı: '%s'"
+#: ../src/browser.c:4201
+#, fuzzy, c-format
+#| msgid "Rename the directory '%s' to:"
+msgid "Rename the directory ‘%s’ to:"
+msgstr "Dizini '%s' adından:"
 
-#: ../src/easytag.c:194
-#, c-format
-msgid "Setting locale: '%s'"
-msgstr "Dil Ayarı: '%s'"
+#: ../src/browser.c:4341
+msgid "You must type a directory name"
+msgstr "Bir dizin adı yazmalısınız"
 
-#: ../src/easytag.c:199
-#, c-format
-msgid "Currently using locale '%s' (and eventually '%s')"
-msgstr "Şuan kullanılan dil '%s' (ve neticede '%s')"
+#: ../src/browser.c:4342 ../src/browser.c:4364
+msgid "Directory Name Error"
+msgstr "Dizin Adı Hatası"
 
-#: ../src/easytag.c:206
-msgid "Unable to create setting directories"
-msgstr "Ayar dizin, oluşturulamadı"
+#: ../src/browser.c:4360
+#, fuzzy, c-format
+#| msgid "Could not convert '%s' into filename encoding."
+msgid "Could not convert ‘%s’ into filename encoding"
+msgstr "Dosya kodlanırken '%s' dönüştürülemedi."
 
-#: ../src/easytag.c:422 ../src/et_core.c:583
-#, c-format
-msgid "Error while querying information for file: '%s' (%s)"
-msgstr "Dosya için bilgi sorgularken hata oluştu: '%s' (%s)"
+#: ../src/browser.c:4363
+#, fuzzy
+#| msgid "Please use another name"
+msgid "Please use another name."
+msgstr "Lütfen başka bir ad kullanın"
 
-#: ../src/easytag.c:487
-#, c-format
-msgid "Cannot open path '%s'"
-msgstr "'%s' konumu açılamıyor"
+#: ../src/browser.c:4434
+#, fuzzy, c-format
+#| msgid "The directory name '%s' already exists"
+msgid "The directory name ‘%s’ already exists."
+msgstr "\"%s\" adında bir dizin zaten var"
 
-#.
-#. * Browser
-#.
-#: ../src/easytag.c:593 ../src/prefs.c:142
-msgid "Browser"
-msgstr "Gezgin"
+#: ../src/browser.c:4435 ../src/easytag.c:683
+msgid "Rename File Error"
+msgstr "Dosya Yeniden Adlandırma Hatası"
 
-#: ../src/easytag.c:615 ../src/et_core.c:2727
-msgid "File"
-msgstr "Dosya"
+#: ../src/browser.c:4473 ../src/browser.c:4502
+msgid "Rename Directory Error"
+msgstr "Dizin Yeniden Adlandırma Hatası"
 
-#. Default values are MPs data
-#. 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:647 ../src/easytag.c:4202 ../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 "Kodlayıcı:"
+#: ../src/browser.c:4541
+msgid "Directory renamed"
+msgstr "Dizin yeniden adlandırıldı"
 
-#: ../src/easytag.c:655
-msgid "Bitrate:"
-msgstr "Bit oranı:"
+#: ../src/browser.c:4703 ../src/browser.c:4777
+#, fuzzy, c-format
+#| msgid "Executed command: %s"
+msgid "Executed command ‘%s’"
+msgstr "Komutu çalıştır: %s"
+
+#: ../src/cddb_dialog.c:271
+#, fuzzy, c-format
+#| msgid ""
+#| "Album: '%s', artist: '%s', length: '%s', year: '%s', genre: '%s', ID: '%s'"
+msgid ""
+"Album: ‘%s’, artist: ‘%s’, length: ‘%s’, year: ‘%s’, genre: ‘%s’, disc ID: "
+"‘%s’"
+msgstr ""
+"Albüm: '%s', sanatçı: '%s', uzunluk: '%s', yıl: '%s', tür: '%s', ID: '%s'"
 
-#. Translators: Please try to keep this string as short as possible as it
-#. * is shown in a narrow column.
-#: ../src/easytag.c:665
-msgid "Frequency:"
-msgstr "Frekans:"
+#: ../src/cddb_dialog.c:587
+#, c-format
+msgid "Resolving host '%s'…"
+msgstr "Sunucu '%s' çözülüyor…"
 
-#. Mode
-#: ../src/easytag.c:676 ../src/easytag.c:4206 ../src/mpeg_header.c:216
-msgid "Mode:"
-msgstr "Kip:"
+#: ../src/cddb_dialog.c:629
+#, fuzzy, c-format
+#| msgid "Cannot create a new socket (%s)"
+msgid "Cannot create a new socket ‘%s’"
+msgstr "Yeni soket oluşturulamıyor (%s)"
 
-#: ../src/easytag.c:683
-msgid "Size:"
-msgstr "Boyut:"
+#: ../src/cddb_dialog.c:643
+msgid "Cannot set options on the newly-created socket"
+msgstr "Yeni oluşturulmuş yuvada seçenekler ayarlanamıyor"
 
-#: ../src/easytag.c:690
-msgid "Duration:"
-msgstr "Süre:"
+#. Open connection to the server.
+#: ../src/cddb_dialog.c:647
+#, fuzzy, c-format
+#| msgid "Connecting to host '%s', port '%d'…"
+msgid "Connecting to host ‘%s’, port ‘%d’…"
+msgstr "'%s' sunucusuna '%d' portundan bağlanılıyor…"
 
-#. Main Frame
-#: ../src/easytag.c:736 ../src/et_core.c:2665
-msgid "Tag"
-msgstr "Etiket"
+#: ../src/cddb_dialog.c:660
+#, fuzzy, c-format
+#| msgid "Cannot connect to host '%s' (%s)"
+msgid "Cannot connect to host ‘%s’: %s"
+msgstr "'%s' sunucusuna bağlanılamıyor (%s)"
 
-#.
-#. * 1 - Page for common tag fields
-#.
-#: ../src/easytag.c:758
-msgid "Common"
-msgstr "Genel"
+#: ../src/cddb_dialog.c:684
+#, fuzzy, c-format
+#| msgid "Cannot resolve host '%s' (%s)"
+msgid "Cannot resolve host ‘%s’: %s"
+msgstr "'%s' sunucusu çözümlenemiyor (%s)."
 
-#. Title
-#: ../src/easytag.c:765
-msgid "Title:"
-msgstr "Başlık:"
+#: ../src/cddb_dialog.c:697
+#, fuzzy, c-format
+#| msgid "Connected to host '%s'"
+msgid "Connected to host ‘%s’"
+msgstr "'%s' sunucusuna bağlanıldı"
 
-#: ../src/easytag.c:779
-msgid "Tag selected files with this title"
-msgstr "Seçilen dosyalara bu başlığı etiketle"
+#: ../src/cddb_dialog.c:784
+#, fuzzy, c-format
+#| msgid "Error while writing CDDB results to file '%s'"
+msgid "Error while writing CDDB results to file ‘%s’"
+msgstr "CDDB sonuçları '%s' dosyasına yazılırken hata oluştu"
 
-#. Artist
-#: ../src/easytag.c:784
-msgid "Artist:"
-msgstr "Sanatçı:"
+#: ../src/cddb_dialog.c:795
+#, c-format
+msgid "Receiving data (%s)…"
+msgstr "Veri alınıyor (%s)…"
 
-#: ../src/easytag.c:798
-msgid "Tag selected files with this artist"
-msgstr "Seçilen dosyalara bu sanatçıyı etiketle"
+#: ../src/cddb_dialog.c:808
+#, fuzzy, c-format
+#| msgid "Error when reading CDDB response (%s)"
+msgid "Error when reading CDDB response ‘%s’"
+msgstr "CDDB cevabı okunamıyor (%s)"
 
-#. Album Artist
-#: ../src/easytag.c:803
-msgid "Album artist:"
-msgstr "Albüm Sanatçısı:"
+#: ../src/cddb_dialog.c:815
+#, fuzzy, c-format
+#| msgid "Cannot create file '%s' (%s)"
+msgid "Cannot create file ‘%s’: %s"
+msgstr "'%s' dosyası oluşturulamıyor (%s)"
 
-#: ../src/easytag.c:817
-msgid "Tag selected files with this album artist"
-msgstr "Seçilen dosyalara bu albüm sanatçısını etiketle"
+#: ../src/cddb_dialog.c:878
+#, fuzzy, c-format
+#| msgid "Can't load file: '%s' (%s)."
+msgid "Cannot load file ‘%s’: %s"
+msgstr "Dosya yüklenemiyor: '%s' (%s)."
 
-#. Album
-#: ../src/easytag.c:822
-msgid "Album:"
-msgstr "Albüm:"
+#. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Freedb : '%s'\n", cddb_in);
+#. Send the request
+#. g_print("Request Cddb_Search_Album_List_From_String_Gnudb : '%s'\n", cddb_in);
+#. Send the request
+#: ../src/cddb_dialog.c:949 ../src/cddb_dialog.c:1595
+#: ../src/cddb_dialog.c:1933
+msgid "Sending request…"
+msgstr "İstek gönderiliyor…"
 
-#: ../src/easytag.c:836
-msgid "Tag selected files with this album name"
-msgstr "Seçilen dosyalara bu albümü etiketle"
+#: ../src/cddb_dialog.c:953 ../src/cddb_dialog.c:1599
+#: ../src/cddb_dialog.c:1937 ../src/cddb_dialog.c:3496
+#, fuzzy, c-format
+#| msgid "Cannot send the request (%s)"
+msgid "Cannot send the request ‘%s’"
+msgstr "İstek gönderilemiyor (%s)"
 
-#. Disc Number
-#: ../src/easytag.c:841
-msgid "CD:"
-msgstr "CD:"
+#. Read the answer
+#.
+#. * Read the answer
+#.
+#: ../src/cddb_dialog.c:965 ../src/cddb_dialog.c:1626
+#: ../src/cddb_dialog.c:3514
+msgid "Receiving data…"
+msgstr "Veri alınıyor…"
 
-#: ../src/easytag.c:858
-msgid "Tag selected files with this disc number"
-msgstr "Seçilen dosyalara bu disk numarasını etiketle"
+#: ../src/cddb_dialog.c:972 ../src/cddb_dialog.c:1633
+#: ../src/cddb_dialog.c:1968 ../src/cddb_dialog.c:3521
+msgid "The server returned a bad response"
+msgstr "Sunucu bozuk bir yanıt döndürdü"
 
-#. Year
-#: ../src/easytag.c:863
-msgid "Year:"
-msgstr "Yıl:"
+#: ../src/cddb_dialog.c:988 ../src/cddb_dialog.c:1003
+#: ../src/cddb_dialog.c:1024 ../src/cddb_dialog.c:1646
+#: ../src/cddb_dialog.c:1984 ../src/cddb_dialog.c:3538
+#, fuzzy, c-format
+#| msgid "The server returned a bad response: %s"
+msgid "The server returned a bad response ‘%s’"
+msgstr "Sunucu bozuk bir yanıt döndürdü: %s"
 
-#: ../src/easytag.c:883
-msgid "Tag selected files with this year"
-msgstr "Seçilen dosyalara bu yılı etiketle"
+#. Load the track list of the album
+#: ../src/cddb_dialog.c:1239
+msgid "Loading album track list…"
+msgstr "Albüm parça listesi yükleniyor…"
 
-#: ../src/easytag.c:897
-msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
-msgstr "Parça numarasını otomatik doldur. Her alt dizin için 01'den başlar."
+#: ../src/cddb_dialog.c:1793
+#, c-format
+msgid "Sorry, the web-based search is currently not available"
+msgstr "Üzgünüm, Web tabanlı arama henüz desteklenmiyor"
 
-#. To have enough space to display the icon
-#. To have enough space to display the icon
-#: ../src/easytag.c:906
-msgid "Track #:"
-msgstr "Parça #:"
+#: ../src/cddb_dialog.c:1795 ../src/cddb_dialog.c:2155
+#, c-format
+msgid "Found one matching album"
+msgid_plural "Found %d matching albums"
+msgstr[0] "%d eşleşen albüm bulundu"
 
-#: ../src/easytag.c:937
-msgid ""
-"Set the number of files, in the same directory of the displayed file, to the "
-"selected tracks."
-msgstr ""
-"Toplam parça sayısını otomatik doldur, her alt dizini kendi içinde sayar."
+#: ../src/cddb_dialog.c:1956
+#, c-format
+msgid "Receiving data of page %d (album %d/%d)…"
+msgstr "Verinin %d sayfası alınıyor (albüm %d/%d)…"
 
-#: ../src/easytag.c:957
-msgid "Tag selected files with this number of tracks"
-msgstr "Seçilen dosyalara bu parça numarasını etiketle"
+#: ../src/cddb_dialog.c:1958
+#, c-format
+msgid "Receiving data of page %d…"
+msgstr "Verinin %d sayfası alınıyor…"
 
-#. Genre
-#: ../src/easytag.c:961
-msgid "Genre:"
-msgstr "Tür:"
+#: ../src/cddb_dialog.c:2122
+#, c-format
+msgid "More results to load…"
+msgstr "Daha fazla sonuç yükleniyor…"
 
-#: ../src/easytag.c:989
-msgid "Tag selected files with this genre"
-msgstr "Seçilen dosyalara bu türü etiketle"
+#: ../src/cddb_dialog.c:2302
+msgid "The number of CDDB results does not match the number of selected files"
+msgstr "CDDB sonuç sayısı seçilen parça sayısıyla eşleşmiyor"
 
-#. Comment
-#: ../src/easytag.c:994
-msgid "Comment:"
-msgstr "Yorum:"
+#: ../src/cddb_dialog.c:2308
+msgid "Write Tag from CDDB"
+msgstr "Etiketleri CDDB'den Yaz"
 
-#: ../src/easytag.c:1021
-msgid "Tag selected files with this comment"
-msgstr "Seçilen dosyalara bu yorumu etiketle"
+#: ../src/cddb_dialog.c:3012
+msgid "Ready to search"
+msgstr "Aramaya hazır"
 
-#. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
-#. Composer (name of the composers)
-#: ../src/easytag.c:1028
-msgid "Composer:"
-msgstr "Besteci:"
+#: ../src/cddb_dialog.c:3100 ../src/load_files_dialog.c:261
+#: ../src/setting.c:245
+#, fuzzy, c-format
+#| msgid "Cannot open file '%s' (%s)"
+msgid "Cannot open file ‘%s’: %s"
+msgstr "'%s' dosyası açılamadı (%s)"
 
-#: ../src/easytag.c:1042
-msgid "Tag selected files with this composer"
-msgstr "Seçilen dosyalara bu besteciyi etiketle"
+#: ../src/cddb_dialog.c:3327
+#, c-format
+msgid "No file selected"
+msgstr "Hiç dosya seçilmedi"
 
-#. 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
-msgid "Orig. artist:"
-msgstr "Asıl sanatçı:"
+#. 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_dialog.c:3335
+#, c-format
+msgid "More than 99 files selected. Cannot send request"
+msgstr "99 dosyadan fazlası seçildi. İstek gönderilemiyor"
 
-#: ../src/easytag.c:1063
-msgid "Tag selected files with this original artist"
-msgstr "Seçilen dosyalara bu asıl sanatçıyı etiketle"
+#: ../src/cddb_dialog.c:3341
+#, c-format
+msgid "One file selected"
+msgid_plural "%d files selected"
+msgstr[0] "%d dosya seçildi"
 
-#. Copyright
-#: ../src/easytag.c:1069
-msgid "Copyright:"
-msgstr "Telif Hakkı:"
+#. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
+#: ../src/cddb_dialog.c:3486
+#, fuzzy, c-format
+#| msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"
+msgid "Sending request (disc ID: %s, #tracks: %d, Disc length: %d)…"
+msgstr "İstek gönderiliyor (CddbId: %s, #parçalar: %d, Disk uzunluğu: %d)…"
 
-#: ../src/easytag.c:1083
-msgid "Tag selected files with this copyright"
-msgstr "Seçilen dosyalara bu telif hakkını etiketle"
+#: ../src/cddb_dialog.c:3652
+#, fuzzy, c-format
+#| msgid "DiscID '%s' gave one matching album"
+#| msgid_plural "DiscID '%s' gave %d matching albums"
+msgid "DiscID ‘%s’ gave one matching album"
+msgid_plural "DiscID ‘%s’ gave %d matching albums"
+msgstr[0] "'%s' DiskID için %d albüm eşleşiyor"
 
-#. URL
-#: ../src/easytag.c:1089
-msgid "URL:"
-msgstr "Bağlantı:"
+#: ../src/charset.c:49
+msgid "Arabic (IBM-864)"
+msgstr "Arapça (IBM-864)"
 
-#: ../src/easytag.c:1103
-msgid "Tag selected files with this URL"
-msgstr "Seçilen dosyalara bu bağlantıyı etiketle"
+#: ../src/charset.c:50
+msgid "Arabic (ISO-8859-6)"
+msgstr "Arapça (ISO-8859-6)"
 
-#. Encoded by
-#: ../src/easytag.c:1109
-msgid "Encoded by:"
-msgstr "Kodlayıcı:"
+#: ../src/charset.c:51
+msgid "Arabic (Windows-1256)"
+msgstr "Arapça (Windows-1256)"
 
-#: ../src/easytag.c:1123
-msgid "Tag selected files with this encoder name"
-msgstr "Seçilen dosyalara bu kodlayıcıyı etiketle"
+#: ../src/charset.c:52
+msgid "Baltic (ISO-8859-13)"
+msgstr "Baltık (ISO-8859-13)"
 
-#.
-#. * 2 - Page for extra tag fields
-#.
-#: ../src/easytag.c:1157 ../src/et_core.c:3100 ../src/et_core.c:3103
-msgid "Images"
-msgstr "Görüntüler"
+#: ../src/charset.c:53
+msgid "Baltic (ISO-8859-4)"
+msgstr "Baltık (ISO-8859-4)"
 
-#: ../src/easytag.c:1181
-msgid "You can use drag and drop to add an image"
-msgstr "Tut çek bırak yöntemiyle görüntüleri bırakabilirsiniz."
+#: ../src/charset.c:54
+msgid "Baltic (Windows-1257)"
+msgstr "Baltık (Windows-1257)"
 
-#: ../src/easytag.c:1228
-msgid "Add images to the tag"
-msgstr "Etikete görüntü ekle"
+#: ../src/charset.c:55
+msgid "Celtic (ISO-8859-14)"
+msgstr "Keltçe (ISO-8859-14)"
 
-#: ../src/easytag.c:1246
-msgid "Remove selected images from the tag"
-msgstr "Seçilen görüntüleri etiketten sil"
+#: ../src/charset.c:56
+msgid "Central European (IBM-852)"
+msgstr "Merkez Avrupa (IBM-852)"
 
-#: ../src/easytag.c:1260
-msgid "Save the selected images to files"
-msgstr "Seçilen görüntüleri dosya olarak kaydet"
+#: ../src/charset.c:57
+msgid "Central European (ISO-8859-2)"
+msgstr "Merkez Avrupa (ISO-8859-2)"
 
-#: ../src/easytag.c:1271
-msgid "Edit image properties"
-msgstr "Görüntü özelliklerini düzenle"
+#: ../src/charset.c:58
+msgid "Central European (Windows-1250)"
+msgstr "Merkez Avrupa (Windows-1250)"
 
-#: ../src/easytag.c:1285
-msgid "Tag selected files with these images"
-msgstr "Seçilen dosyalara bu görüntüleri etiketle"
+#: ../src/charset.c:59
+msgid "Chinese Simplified (GB18030)"
+msgstr "Basitleştirilmiş Çince (GB18030)"
 
-#: ../src/easytag.c:1343
-#, c-format
-msgid "Selected files tagged with title '%s'."
-msgstr "Seçilen dosyalar '%s' başlığı ile etiketlendi."
+#: ../src/charset.c:60
+msgid "Chinese Simplified (GB2312)"
+msgstr "Basitleştirilmiş Çince (GB2312)"
 
-#: ../src/easytag.c:1345
-msgid "Removed title from selected files."
-msgstr "Seçilen dosyalardan başlık silindi."
+#: ../src/charset.c:61
+msgid "Chinese Traditional (Big5)"
+msgstr "Geleneksel Çince (Big5)"
 
-#: ../src/easytag.c:1360
-#, c-format
-msgid "Selected files tagged with artist '%s'."
-msgstr "Seçilen dosyalar '%s' sanatçısı ile etiketlendi."
+#: ../src/charset.c:62
+msgid "Chinese Traditional (Big5-HKSCS)"
+msgstr "Geleneksel Çince (Big5-HKSCS)"
 
-#: ../src/easytag.c:1362
-msgid "Removed artist from selected files."
-msgstr "Seçilen dosyalardan sanatçı silindi"
+#: ../src/charset.c:63
+msgid "Cyrillic (IBM-855)"
+msgstr "Kiril (IBM-855)"
 
-#: ../src/easytag.c:1376
-#, c-format
-msgid "Selected files tagged with album artist '%s'."
-msgstr "Seçilen dosyalar '%s' albüm sanatçısı ile etiketlendi."
+#: ../src/charset.c:64
+msgid "Cyrillic (ISO-8859-5)"
+msgstr "Kiril (ISO-8859-5)"
 
-#: ../src/easytag.c:1378
-msgid "Removed album artist from selected files."
-msgstr "Seçilen dosyalardan albüm sanatçısı silindi"
+#: ../src/charset.c:65
+msgid "Cyrillic (ISO-IR-111)"
+msgstr "Kiril (ISO-IR-111)"
 
-#: ../src/easytag.c:1393
-#, c-format
-msgid "Selected files tagged with album '%s'."
-msgstr "Seçilen dosyalar '%s' albümü ile etiketlendi."
+#: ../src/charset.c:66
+msgid "Cyrillic (KOI8-R)"
+msgstr "Kiril (KOI8-R)"
 
-#: ../src/easytag.c:1395
-msgid "Removed album name from selected files."
-msgstr "Seçilen dosyalardan albümü silindi"
+#: ../src/charset.c:67
+msgid "Cyrillic (Windows-1251)"
+msgstr "Kiril (Windows-1251)"
 
-#: ../src/easytag.c:1432
-#, c-format
-msgid "Selected files tagged with disc number '%s/%s'."
-msgstr "'%s/%s' disk numarası ile etiketlenmiş seçili dosyalar."
+#: ../src/charset.c:68
+msgid "Cyrillic/Russian (CP-866)"
+msgstr "Kiril/Rusça (IBM-866)"
 
-#: ../src/easytag.c:1437
-#, c-format
-msgid "Selected files tagged with disc number like 'xx'."
-msgstr "'xx' gibi bir disk numarasıyla etiketlenmiş seçili dosyalar."
+#: ../src/charset.c:69
+msgid "Cyrillic/Ukrainian (KOI8-U)"
+msgstr "Kiril/Ukraynaca (KOI8-U)"
 
-#: ../src/easytag.c:1442
-msgid "Removed disc number from selected files."
-msgstr "Seçilen dosyalardan disk numarası silindi"
+#: ../src/charset.c:70
+msgid "English (US-ASCII)"
+msgstr "İngilizce (US-ASCII)"
+
+#: ../src/charset.c:71
+msgid "Greek (ISO-8859-7)"
+msgstr "Yunanca (ISO-8859-7)"
 
-#: ../src/easytag.c:1458
-#, c-format
-msgid "Selected files tagged with year '%s'."
-msgstr "Seçilen dosyalar '%s' yılı ile etiketlendi."
+#: ../src/charset.c:72
+msgid "Greek (Windows-1253)"
+msgstr "Yunanca (Windows-1253)"
 
-#: ../src/easytag.c:1460
-msgid "Removed year from selected files."
-msgstr "Seçilen dosyalardan yıl silindi"
+#: ../src/charset.c:73
+msgid "Hebrew (IBM-862)"
+msgstr "İbranice (IBM-862)"
 
-#: ../src/easytag.c:1486 ../src/easytag.c:1576
-#, c-format
-msgid "Selected files tagged with track like 'xx/%s'."
-msgstr "Seçilen dosyaların parça numarası 'xx/%s' şeklinde etiketlendi."
+#: ../src/charset.c:74
+msgid "Hebrew (Windows-1255)"
+msgstr "İbranice (Windows-1255)"
 
-#: ../src/easytag.c:1489
-#, c-format
-msgid "Selected files tagged with track like 'xx'."
-msgstr "Seçilen dosyaların parça numarası 'xx' şeklinde etiketlendi."
+#: ../src/charset.c:75
+msgid "Japanese (EUC-JP)"
+msgstr "Japonca (EUC-JP)"
 
-#: ../src/easytag.c:1493 ../src/easytag.c:1579
-msgid "Removed track number from selected files."
-msgstr "Seçilen dosyalardan parça numarası silindi"
+#: ../src/charset.c:76
+msgid "Japanese (ISO-2022-JP)"
+msgstr "Japonca (ISO-2022-JP)"
 
-#. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1549
-#, c-format
-msgid "Selected tracks numbered sequentially."
-msgstr "Seçilen parçalar ardışık olarak numaralandı."
+#: ../src/charset.c:77
+msgid "Japanese (Shift_JIS)"
+msgstr "Japonca (Shift_JIS)"
 
-#: ../src/easytag.c:1595
-#, c-format
-msgid "Selected files tagged with genre '%s'."
-msgstr "Seçilen dosyalar '%s' türü ile etiketlendi."
+#: ../src/charset.c:78
+msgid "Korean (EUC-KR)"
+msgstr "Korece (EUC-KR)"
 
-#: ../src/easytag.c:1597
-msgid "Removed genre from selected files."
-msgstr "Seçilen dosyalardan türü silindi"
+#: ../src/charset.c:79
+msgid "Nordic (ISO-8859-10)"
+msgstr "İskandinavca (ISO-8859-10)"
 
-#: ../src/easytag.c:1619
-#, c-format
-msgid "Selected files tagged with comment '%s'."
-msgstr "Seçilen dosyalar '%s' yorumu ile etiketlendi."
+#: ../src/charset.c:80
+msgid "South European (ISO-8859-3)"
+msgstr "Güney Avrupa (ISO-8859-3)"
 
-#: ../src/easytag.c:1621
-msgid "Removed comment from selected files."
-msgstr "Seçilen dosyalardan yorum silindi"
+#: ../src/charset.c:81
+msgid "Thai (TIS-620)"
+msgstr "Tai (TIS-620)"
 
-#: ../src/easytag.c:1635
-#, c-format
-msgid "Selected files tagged with composer '%s'."
-msgstr "Seçilen dosyalar '%s' besteci ile etiketlendi."
+#: ../src/charset.c:82
+msgid "Turkish (IBM-857)"
+msgstr "Türkçe (IBM-857)"
 
-#: ../src/easytag.c:1637
-msgid "Removed composer from selected files."
-msgstr "Seçilen dosyalardan besteci silindi"
+#: ../src/charset.c:83
+msgid "Turkish (ISO-8859-9)"
+msgstr "Türkçe (ISO-8859-9)"
 
-#: ../src/easytag.c:1652
-#, c-format
-msgid "Selected files tagged with original artist '%s'."
-msgstr "Seçilen dosyalar '%s' asıl sanatçısı ile etiketlendi."
+#: ../src/charset.c:84
+msgid "Turkish (Windows-1254)"
+msgstr "Türkçe (Windows-1254)"
 
-#: ../src/easytag.c:1654
-msgid "Removed original artist from selected files."
-msgstr "Seçilen dosyalardan asıl sanatçı silindi"
+#. {N_("Unicode (UTF-7)"),                   "UTF-7"         },
+#: ../src/charset.c:86
+msgid "Unicode (UTF-8)"
+msgstr "Unikod (UTF-8)"
 
-#: ../src/easytag.c:1669
-#, c-format
-msgid "Selected files tagged with copyright '%s'."
-msgstr "Seçilen dosyalar '%s' telif hakkı ile etiketlendi."
+#. {N_("Unicode (UTF-16BE)"),                "UTF-16BE"      },
+#. {N_("Unicode (UTF-16LE)"),                "UTF-16LE"      },
+#. {N_("Unicode (UTF-32BE)"),                "UTF-32BE"      },
+#. {N_("Unicode (UTF-32LE)"),                "UTF-32LE"      },
+#: ../src/charset.c:93
+msgid "Vietnamese (VISCII)"
+msgstr "Vietnamca (VISCII)"
 
-#: ../src/easytag.c:1671
-msgid "Removed copyright from selected files."
-msgstr "Seçilen dosyalardan telif hakkı silindi"
+#: ../src/charset.c:94
+msgid "Vietnamese (Windows-1258)"
+msgstr "Vietnamca (Windows-1258)"
 
-#: ../src/easytag.c:1686
-#, c-format
-msgid "Selected files tagged with URL '%s'."
-msgstr "Seçilen dosyalar '%s' bağlantısı ile etiketlendi."
+#: ../src/charset.c:95
+msgid "Visual Hebrew (ISO-8859-8)"
+msgstr "Görsel İbranice (ISO-8859-8)"
 
-#: ../src/easytag.c:1688
-msgid "Removed URL from selected files."
-msgstr "Seçilen dosyalardan bağlantı silindi"
+#: ../src/charset.c:96
+msgid "Western (IBM-850)"
+msgstr "Batı (IBM-850)"
 
-#: ../src/easytag.c:1703
-#, c-format
-msgid "Selected files tagged with encoder name '%s'."
-msgstr "Seçilen dosyalar '%s' kodlayıcısı ile etiketlendi."
+#: ../src/charset.c:97
+msgid "Western (ISO-8859-1)"
+msgstr "Batı (ISO-8859-1)"
 
-#: ../src/easytag.c:1705
-msgid "Removed encoder name from selected files."
-msgstr "Seçilen dosyalardan kodlayıcı silindi"
+#: ../src/charset.c:98
+msgid "Western (ISO-8859-15)"
+msgstr "Batı (ISO-8859-15)"
 
-#: ../src/easytag.c:1737
-msgid "Selected files tagged with images."
-msgstr "Seçilen dosyalar görüntülerle ile etiketlendi."
+#: ../src/charset.c:99
+msgid "Western (Windows-1252)"
+msgstr "Batı (Windows-1252)"
 
-#: ../src/easytag.c:1739
-msgid "Removed images from selected files."
-msgstr "Seçilen dosyalardan görüntüler silindi"
+#: ../src/charset.c:511
+#, fuzzy, c-format
+#| msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
+msgid "The filename ‘%s’ could not be converted into UTF-8: %s"
+msgstr "Dosya adı '%s' UTF-8'e dönüştürülemiyor (%s)."
 
-#: ../src/easytag.c:2020
-msgid "Select Mode and Mask, and redo the same action"
-msgstr "Türü ve maskeyi seçin, aynı işlemi tekrar uygulayın"
+#: ../src/charset.c:513 ../src/charset.c:626 ../src/charset.c:691
+msgid "Invalid UTF-8"
+msgstr "Geçersiz UTF-8"
 
-#: ../src/easytag.c:2072
-msgid "All tags have been scanned"
-msgstr "Bütün etiketler tarandı"
+#: ../src/charset.c:624
+#, fuzzy, c-format
+#| msgid ""
+#| "The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
+msgid "The UTF-8 string ‘%s’ could not be converted into filename encoding: %s"
+msgstr "'%s' UTF-8 metni dosya adı kodlamasına dönüştürülemiyor (%s)."
 
-#: ../src/easytag.c:2128
-msgid "All tags have been removed"
-msgstr "Bütün etiketler silindi"
+#: ../src/charset.c:689
+#, fuzzy, c-format
+#| msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
+msgid "The string ‘%s’ could not be converted into UTF-8: %s"
+msgstr "'%s' metni UTF-8'e dönüştürülemiyor (%s)."
 
-#: ../src/easytag.c:2418
-#, c-format
+#: ../src/easytag.c:269
+#, fuzzy, c-format
+#| msgid "A file was changed by an external program"
+#| msgid_plural "%d files were changed by an external program."
 msgid "A file was changed by an external program"
-msgid_plural "%d files were changed by an external program."
+msgid_plural "%d files were changed by an external program"
 msgstr[0] "%d dosya harici bir program tarafından değiştirilmiş."
 
-#: ../src/easytag.c:2423
+#: ../src/easytag.c:278
 msgid "Do you want to continue saving the file?"
 msgstr "Dosyayı kaydetmeye devam etmek istiyor musunuz?"
 
-#: ../src/easytag.c:2478 ../src/easytag.c:2498
+#: ../src/easytag.c:339 ../src/easytag.c:360
 msgid "Saving files was stopped"
 msgstr "Dosya kaydetme durduruldu"
 
-#: ../src/easytag.c:2500
+#: ../src/easytag.c:362
 msgid "All files have been saved"
 msgstr "Tüm dosyalar kaydedildi."
 
-#: ../src/easytag.c:2631
-#, c-format
-msgid "Cannot delete file (%s)"
-msgstr "Dosya silinemiyor (%s)"
-
-#: ../src/easytag.c:2651
-msgid "Files have been partially deleted"
-msgstr "Dosyalar kısmen silindi"
-
-#: ../src/easytag.c:2653
-msgid "All files have been deleted"
-msgstr "Bütün dosyalar silindi"
-
-#: ../src/easytag.c:2769
-#, c-format
-msgid "Do you want to write the tag of file '%s'?"
+#: ../src/easytag.c:483
+#, fuzzy, c-format
+#| msgid "Do you want to write the tag of file '%s'?"
+msgid "Do you want to write the tag of file ‘%s’?"
 msgstr "'%s' dosyasına etiketleri yazmak istiyor musunuz?"
 
-#: ../src/easytag.c:2771
+#: ../src/easytag.c:485
 msgid "Confirm Tag Writing"
 msgstr "Etiket Yazmayı Doğrula"
 
-#: ../src/easytag.c:2776 ../src/easytag.c:2893 ../src/easytag.c:3153
-msgid "Repeat action for the remaining files"
-msgstr "Kalan dosyalar için eylemi tekrarla"
-
 #. Directories and filename changed
-#: ../src/easytag.c:2857 ../src/scan.c:182
+#: ../src/easytag.c:586
 msgid "Rename File and Directory"
 msgstr "Dosya ve Dizini Yeniden Adlandır"
 
-#: ../src/easytag.c:2858
+#: ../src/easytag.c:587
 msgid "File and directory rename confirmation required"
 msgstr "Dosya ve dizin yeniden adlandırma doğrulaması gerekiyor"
 
-#: ../src/easytag.c:2859
-#, c-format
-msgid "Do you want to rename the file and directory '%s' to '%s'?"
+#: ../src/easytag.c:588
+#, fuzzy, c-format
+#| msgid "Do you want to rename the file and directory '%s' to '%s'?"
+msgid "Do you want to rename the file and directory ‘%s’ to ‘%s’?"
 msgstr "'%s' dosya ve dizinin adı '%s' şeklinde yeniden adlandırsın mı?"
 
-#: ../src/easytag.c:2865
+#: ../src/easytag.c:594
 msgid "Directory rename confirmation required"
 msgstr "Dizin yeniden adlandırma doğrulaması gerekiyor"
 
-#: ../src/easytag.c:2866
-#, c-format
-msgid "Do you want to rename the directory '%s' to '%s'?"
+#: ../src/easytag.c:595
+#, fuzzy, c-format
+#| msgid "Do you want to rename the directory '%s' to '%s'?"
+msgid "Do you want to rename the directory ‘%s’ to ‘%s’?"
 msgstr "'%s' dizinin adı '%s' ile yeniden adlandırılsın mı?"
 
-#. Only filename changed
-#: ../src/easytag.c:2872
-msgid "Rename File"
-msgstr "Dosyayı Yeniden Adlandır"
-
-#: ../src/easytag.c:2873
+#: ../src/easytag.c:603
 msgid "File rename confirmation required"
 msgstr "Dosya yeniden adlandırma doğrulaması gerekiyor"
 
-#: ../src/easytag.c:2874
-#, c-format
-msgid "Do you want to rename the file '%s' to '%s'?"
+#: ../src/easytag.c:604
+#, fuzzy, c-format
+#| msgid "Do you want to rename the file '%s' to '%s'?"
+msgid "Do you want to rename the file ‘%s’ to ‘%s’?"
 msgstr "'%s' dosyasının adı '%s' ile yeniden adlandırılsın mı?"
 
-#: ../src/easytag.c:2940
-#, c-format
-msgid "Cannot rename file '%s' to '%s'"
+#: ../src/easytag.c:676
+#, fuzzy, c-format
+#| msgid "Cannot rename file '%s' to '%s'"
+msgid "Cannot rename file ‘%s’ to ‘%s’"
 msgstr "'%s' dosyası '%s' olarak yeniden adlandırılamıyor"
 
-#: ../src/easytag.c:2954
-#, c-format
-msgid "Cannot rename file '%s' to '%s': %s"
+#: ../src/easytag.c:690
+#, fuzzy, c-format
+#| msgid "Cannot rename file '%s' to '%s': %s"
+msgid "Cannot rename file ‘%s’ to ‘%s’: %s"
 msgstr "'%s' dosyası '%s' olarak yeniden adlandırılamıyor: %s"
 
-#: ../src/easytag.c:2958
+#: ../src/easytag.c:695
 msgid "File(s) not renamed"
 msgstr "Dosya(lar) yeniden adlandırılamadı"
 
-#: ../src/easytag.c:3067
-#, c-format
-msgid "Writing tag of '%s'"
+#: ../src/easytag.c:883
+#, fuzzy, c-format
+#| msgid "Writing tag of '%s'"
+msgid "Writing tag of ‘%s’"
 msgstr "'%s' etiketi yazılıyor"
 
-#: ../src/easytag.c:3074
-msgid "Tag(s) written"
-msgstr "Etiket(ler) yazıldı"
-
-#: ../src/easytag.c:3089
-#, c-format
-msgid "Cannot write tag in file '%s' (%s)"
-msgstr "'%s' dosyasına etiket yazılamıyor (%s)"
+#: ../src/easytag.c:891
+#, fuzzy, c-format
+#| msgid "Written tag of '%s'"
+msgid "Wrote tag of ‘%s’"
+msgstr "'%s' etiketi yazıldı"
 
-#: ../src/easytag.c:3102
-#, c-format
-msgid "Cannot write tag in file '%s'"
+#: ../src/easytag.c:907
+#, fuzzy, c-format
+#| msgid "Cannot write tag in file '%s'"
+msgid "Cannot write tag in file ‘%s’"
 msgstr "'%s' dosyasına etiket yazılamıyor"
 
-#: ../src/easytag.c:3105
+#: ../src/easytag.c:911
 msgid "Tag Write Error"
 msgstr "Etiket Yazma Hatası"
 
-#: ../src/easytag.c:3150 ../src/easytag.c:3164
-#, c-format
-msgid "Do you really want to delete the file '%s'?"
-msgstr "'%s' dosyasını silmek istediğinize emin misiniz?"
-
-#: ../src/easytag.c:3156 ../src/easytag.c:3166
-msgid "Delete File"
-msgstr "Dosya Sil"
-
-#: ../src/easytag.c:3191
-#, c-format
-msgid "File '%s' deleted"
-msgstr "'%s' silindi"
-
-#: ../src/easytag.c:3323
-#, c-format
-msgid "Cannot read directory '%s'"
+#: ../src/easytag.c:986 ../src/easytag.c:1214
+#, fuzzy, c-format
+#| msgid "Cannot read directory '%s'"
+msgid "Cannot read directory ‘%s’"
 msgstr "'%s' dizini okunamıyor"
 
-#: ../src/easytag.c:3327
+#: ../src/easytag.c:990
 msgid "Directory Read Error"
 msgstr "Dizin Okuma Hatası"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3348
+#: ../src/easytag.c:1011
 #, c-format
 msgid "Search in progress…"
 msgstr "Arama sürüyor…"
 
-#: ../src/easytag.c:3371 ../src/et_core.c:2734
-#, c-format
-msgid "File: '%s'"
+#: ../src/easytag.c:1035 ../src/et_core.c:2986
+#, fuzzy, c-format
+#| msgid "File: '%s'"
+msgid "File: ‘%s’"
 msgstr "Dosya: '%s'"
 
-#: ../src/easytag.c:3421
+#: ../src/easytag.c:1082
 #, c-format
 msgid "Found one file in this directory and subdirectories"
 msgid_plural "Found %d files in this directory and subdirectories"
 msgstr[0] "Bu dizin ve alt dizinlerinde %d dosya bulundu"
 
-#: ../src/easytag.c:3428
+#: ../src/easytag.c:1089
 #, c-format
 msgid "Found one file in this directory"
 msgid_plural "Found %d files in this directory"
 msgstr[0] "Bu dizinde %d dosya bulundu"
 
-#: ../src/easytag.c:3450
+#: ../src/easytag.c:1106
 msgid "No file found in this directory and subdirectories"
 msgstr "Bu dizin ve alt dizinlerinde dosya bulunamadı"
 
-#: ../src/easytag.c:3452
+#: ../src/easytag.c:1108
 msgid "No file found in this directory"
 msgstr "Bu dizinde dosya bulunamadı"
 
-#: ../src/easytag.c:3520
-#, c-format
-msgid "Error opening directory '%s' (%s)"
+#: ../src/easytag.c:1178
+#, fuzzy, c-format
+#| msgid "Error opening directory '%s' (%s)"
+msgid "Error opening directory ‘%s’: %s"
 msgstr "'%s' dizini açılırken hata oluştu (%s)"
 
-#: ../src/easytag.c:3556
-#, c-format
-msgid "Cannot read directory (%s)"
-msgstr "Dizin okunamıyor (%s)"
-
-#: ../src/easytag.c:3576
+#: ../src/easytag.c:1234
 msgid "Searching for audio files…"
 msgstr "Ses dosyaları aranıyor…"
 
-#: ../src/easytag.c:3577
+#: ../src/easytag.c:1235
 msgid "Searching"
 msgstr "Aranıyor"
 
-#: ../src/easytag.c:4236
-msgid "Select a directory to browse"
-msgstr "Gezinmek için dizin seçin"
-
-#. Menu items
-#: ../src/easytag.c:4383
-msgid "Tag selected files with this field"
-msgstr "Seçilen dosyaları bu alanda etiketle"
-
-#: ../src/easytag.c:4395 ../src/scan.c:2663
-msgid "Convert '_' and '%20' to spaces"
-msgstr "'_' ve '%20' metinlerini boşluğa çevir"
-
-#: ../src/easytag.c:4402 ../src/scan.c:2665
-msgid "Convert ' ' to '_'"
-msgstr "Boşlukları '_' karakterine çevir"
-
-#: ../src/easytag.c:4413
-msgid "All uppercase"
-msgstr "Tümü büyük harf"
-
-#: ../src/easytag.c:4420
-msgid "All lowercase"
-msgstr "Tümü küçük harf"
-
-#: ../src/easytag.c:4427
-msgid "First letter uppercase"
-msgstr "İlk harf büyük"
-
-#: ../src/easytag.c:4434
-msgid "First letter uppercase of each word"
-msgstr "Her kelimenin ilk harfi büyük"
-
-#: ../src/easytag.c:4445 ../src/prefs.c:1023 ../src/scan.c:2763
-msgid "Remove spaces"
-msgstr "Boşlukları sil"
-
-#: ../src/easytag.c:4452
-msgid "Insert space before uppercase letter"
-msgstr "Büyük harften önce boşluk ekle"
-
-#: ../src/easytag.c:4459
-msgid "Remove duplicate spaces or underscores"
-msgstr "Çift boşluk ve alt çizgileri sil"
-
-#: ../src/easytag.c:4466
-msgid "Remove all text"
-msgstr "Tüm metni sil"
-
-#. gchar commmand[256];
-#: ../src/easytag.c:4489
-#, c-format
-msgid "EasyTAG version %s: Abnormal exit (PID: %d)"
-msgstr "EasyTAG sürüm %s: Olağan dışı çıkış (PID: %d)"
-
-#: ../src/easytag.c:4490 ../src/easytag.c:4501
-#, c-format
-msgid "Received signal '%s' (%d)"
-msgstr "'%s' sinyali alındı (%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"
+#: ../src/easytag.c:1236
+msgid "_Stop"
 msgstr ""
-"EasyTAG'da bir hata bulundu. Lütfen GDB geri izleme ('gdb easytag core' "
-"sonra 'bt' ve 'l') ile hata kaydedip bilgileri bize gönderin: %s"
 
-#. To send messages to the console...
-#: ../src/easytag.c:4499
-#, c-format
-msgid "EasyTAG version %s: Abnormal exit (PID: %d)."
-msgstr "EasyTAG sürüm %s: Olağan dışı çıkış (PID: %d)."
-
-#: ../src/easytag.c:4523
-msgid "EasyTAG: Normal exit."
-msgstr "EasyTAG: Normal çıkış."
-
-#: ../src/easytag.c:4575
-msgid "Do you want to save them before quitting?"
-msgstr "Çıkmadan önce kaydedilsin mi?"
-
-#: ../src/easytag.c:4598
-msgid "Do you really want to quit?"
-msgstr "Gerçekten çıkmak istiyor musunuz?"
-
-#: ../src/et_core.c:505
-#, c-format
-msgid "Error reading tag from ogg file (%s)"
+#: ../src/et_core.c:545
+#, fuzzy, c-format
+#| msgid "Error reading tag from ogg file (%s)"
+msgid "Error reading tag from Ogg file ‘%s’: %s"
 msgstr "Ogg dosyasından etiket okunurken hata oluştu (%s)"
 
-#: ../src/et_core.c:639
-#, c-format
-msgid "Automatic corrections applied for file '%s'."
-msgstr "'%s' için otomatik doğrulama uygulandı."
-
-#: ../src/et_core.c:2631
-msgid "ID3 Tag"
-msgstr "ID3 Etiketi"
-
-#: ../src/et_core.c:2637
-msgid "Ogg Vorbis Tag"
-msgstr "Ogg Vorbis Etiketi"
-
-#: ../src/et_core.c:2643
-msgid "FLAC Vorbis Tag"
-msgstr "FLAC Vorbis Etiketi"
-
-#: ../src/et_core.c:2648
-msgid "APE Tag"
-msgstr "APE Etiketi"
-
-#: ../src/et_core.c:2653
-msgid "MP4/M4A/AAC Tag"
-msgstr "MP4/M4A/AAC Etiketi"
-
-#: ../src/et_core.c:2659
-msgid "Wavpack Tag"
-msgstr "Wavpack Etiketi"
-
-#: ../src/et_core.c:2679
-msgid "MP3 File"
-msgstr "MP3 Dosyası"
-
-#: ../src/et_core.c:2683
-msgid "MP2 File"
-msgstr "MP2 Dosyası"
-
-#: ../src/et_core.c:2689
-msgid "Ogg Vorbis File"
-msgstr "Ogg Vorbis Dosyası"
-
-#: ../src/et_core.c:2695
-msgid "Speex File"
-msgstr "Speex Dosyası"
-
-#: ../src/et_core.c:2701
-msgid "FLAC File"
-msgstr "FLAC Dosyası"
-
-#: ../src/et_core.c:2706
-msgid "MusePack File"
-msgstr "MusePack Dosyası"
-
-#: ../src/et_core.c:2710
-msgid "Monkey's Audio File"
-msgstr "Monkey's Audio Dosyası"
+#: ../src/et_core.c:556
+#, fuzzy, c-format
+#| msgid "Error reading tags from file: '%s'"
+msgid "Error reading tag from FLAC file ‘%s’: %s"
+msgstr "'%s' dosyasından etiketler okunamadı"
 
-#: ../src/et_core.c:2715
-msgid "MP4/AAC File"
-msgstr "MP4/AAC Dosyası"
+#: ../src/et_core.c:566
+#, fuzzy, c-format
+#| msgid "Error reading tags from file: '%s'"
+msgid "Error reading APE tag from file ‘%s’: %s"
+msgstr "'%s' dosyasından etiketler okunamadı"
 
-#: ../src/et_core.c:2721
-msgid "Wavpack File"
-msgstr "Wavpack Dosyası"
+#: ../src/et_core.c:576
+#, fuzzy, c-format
+#| msgid "Error reading tags from file: '%s'"
+msgid "Error reading tag from MP4 file ‘%s’: %s"
+msgstr "'%s' dosyasından etiketler okunamadı"
 
-#: ../src/et_core.c:2778 ../src/et_core.c:2833
-msgid "File not found"
-msgstr "Dosya bulunamadı"
+#: ../src/et_core.c:587
+#, fuzzy, c-format
+#| msgid "Error reading tags from file: '%s'"
+msgid "Error reading tag from WavPack file ‘%s’: %s"
+msgstr "'%s' dosyasından etiketler okunamadı"
 
-#: ../src/et_core.c:2783
-#, c-format
-msgid "Cannot query file information (%s)"
-msgstr "Dosya bilgileri sorgulanamıyor (%s)"
+#: ../src/et_core.c:598
+#, fuzzy, c-format
+#| msgid "Error reading tags from file: '%s'"
+msgid "Error reading tag from Opus file ‘%s’: %s"
+msgstr "'%s' dosyasından etiketler okunamadı"
 
-#: ../src/et_core.c:2817
-msgid "Read-only file"
-msgstr "Salt okunur dosya"
+#: ../src/et_core.c:614
+#, fuzzy, c-format
+#| msgid ""
+#| "The year value '%s' seems to be invalid in file '%s'. The information "
+#| "will be lost while saving tag."
+msgid ""
+"The year value ‘%s’ seems to be invalid in file ‘%s’. The information will "
+"be lost when saving"
+msgstr ""
+"'%1s' dosyasındaki '%2s' yıl değeri geçersiz gibi görünüyor. Bu bilgi etiket "
+"kaydedilirken kaybolacak."
+
+#: ../src/et_core.c:749
+#, fuzzy, c-format
+#| msgid "Automatic corrections applied for file '%s'."
+msgid "Automatic corrections applied for file ‘%s’"
+msgstr "'%s' için otomatik doğrulama uygulandı."
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2881
+#: ../src/et_core.c:3010
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
 msgstr[0] "%u dosya"
 
-#: ../src/et_core.c:3086
-#, c-format
-msgid "Images (%d)"
-msgstr "Görüntüler (%d)"
-
 #. Bitrate
-#: ../src/et_core.c:3128 ../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/et_core.c:3041 ../src/tags/flac_header.c:307
+#: ../src/tags/monkeyaudio_header.c:83 ../src/tags/mp4_header.cc:144
+#: ../src/tags/mpeg_header.c:240 ../src/tags/musepack_header.c:87
+#: ../src/tags/ogg_header.c:411 ../src/tags/opus_header.c:229
+#: ../src/tags/wavpack_header.c:90
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: ../src/et_core.c:3133 ../src/flac_header.c:210
-#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
-#: ../src/mpeg_header.c:211 ../src/musepack_header.c:93
-#: ../src/ogg_header.c:406 ../src/wavpack_header.c:83
+#: ../src/et_core.c:3044 ../src/tags/flac_header.c:310
+#: ../src/tags/monkeyaudio_header.c:86 ../src/tags/mp4_header.cc:148
+#: ../src/tags/mpeg_header.c:245 ../src/tags/musepack_header.c:90
+#: ../src/tags/ogg_header.c:414 ../src/tags/opus_header.c:232
+#: ../src/tags/wavpack_header.c:93
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/et_core.c:3276 ../src/scan.c:691
-#, c-format
-msgid "Could not convert filename '%s' into system filename encoding"
+#: ../src/et_core.c:3173
+#, fuzzy, c-format
+#| msgid "Could not convert filename '%s' into system filename encoding"
+msgid "Could not convert filename ‘%s’ to system filename encoding"
 msgstr "'%s' dosya adı sistem dosya adı kodlamasına dönüştürülemiyor"
 
-#: ../src/et_core.c:3278
+#: ../src/et_core.c:3175
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "G_FILENAME_ENCODING ortam değişkenini ayarlamayı deneyin."
 
-#: ../src/et_core.c:3279 ../src/scan.c:693
+#: ../src/et_core.c:3176 ../src/scan_dialog.c:719
 msgid "Filename translation"
 msgstr "Dosya adı dönüştürme"
 
-#: ../src/et_core.c:3940
-#, c-format
-msgid "Cannot change the permissions of file '%s' (%s)"
-msgstr "'%s' dosyasının izinleri değiştirilemiyor (%s)"
+#: ../src/file_area.c:279 ../src/file_area.c:334
+msgid "File not found"
+msgstr "Dosya bulunamadı"
 
-#: ../src/et_core.c:3978
-#, c-format
-msgid "Error writing tag type %d to file %s (%s)"
-msgstr "%d tipi etiket %s dosyasına yazılırken hata oluştu (%s)"
+#: ../src/file_area.c:284 ../src/load_files_dialog.c:221
+#, fuzzy, c-format
+#| msgid "Cannot query file information (%s)"
+msgid "Cannot query file information ‘%s’"
+msgstr "Dosya bilgileri sorgulanamıyor (%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
-msgid "Channels:"
-msgstr "Kanallar:"
+#: ../src/file_area.c:318
+msgid "Read-only file"
+msgstr "Salt okunur dosya"
 
-#: ../src/flac_tag.c:131 ../src/flac_tag.c:850 ../src/flac_tag.c:860
+#: ../src/load_files_dialog.c:291
 #, c-format
-msgid "Error while opening file: '%s' as FLAC (%s)."
-msgstr "Dosya açılamadı: '%s' FLAC (%s)."
+#| msgid "Error reading file (%s)"
+msgid "Error reading file ‘%s’"
+msgstr "‘%s’ dosyası okunurken hata oluştu"
 
-#: ../src/flac_tag.c:352 ../src/ogg_tag.c:347
-#, c-format
-msgid ""
-"The year value '%s' seems to be invalid in file '%s'. The information will "
-"be lost while saving tag."
-msgstr ""
-"'%1s' dosyasındaki '%2s' yıl değeri geçersiz gibi görünüyor. Bu bilgi etiket "
-"kaydedilirken kaybolacak."
+#: ../src/load_files_dialog.c:628 ../src/load_files_dialog.c:731
+msgid "Insert a blank line"
+msgstr "Boş satır ekle"
 
-#: ../src/flac_tag.c:1061
-#, c-format
-msgid "Picture block isn't valid: '%s'"
-msgstr "Görüntü bloğu geçersiz: '%s'"
+#: ../src/load_files_dialog.c:632 ../src/load_files_dialog.c:735
+msgid "Delete this line"
+msgstr "Satırı sil"
 
-#: ../src/flac_tag.c:1094
-#, c-format
-msgid "Error: Failed to write comments to file '%s' (%s)."
-msgstr "Hata: '%s' dosyasına yorum yazılamadı (%s)."
+#: ../src/load_files_dialog.c:643 ../src/load_files_dialog.c:746
+#| msgid "Move up this line"
+msgid "Move this line up"
+msgstr "Satırı yukarı taşı"
 
-#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:922
-#, c-format
-msgid "Written tag of '%s'"
-msgstr "'%s' etiketi yazıldı"
+#: ../src/load_files_dialog.c:647 ../src/load_files_dialog.c:750
+#| msgid "Move up this line"
+msgid "Move this line down"
+msgstr "Satırı aşağı taşı"
 
-#: ../src/id3_tag.c:158
-#, c-format
-msgid "Error while reading file: '%s' (%s)"
-msgstr "Dosya okunurken hata oluştu: '%s' (%s)"
+#: ../src/load_files_dialog.c:893
+msgid "Load Filenames From a Text File"
+msgstr "Dosya Adlarını Metin Dosyasından Yükle"
 
-#: ../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 "'%s' dosyası id3lib ile ilgili hata verdi, işlenmeyecek"
+#: ../src/misc.c:208
+msgid "You must type a program name"
+msgstr "Bir program adı yazmalısınız."
 
-#: ../src/id3_tag.c:172
-msgid "Corrupted file"
-msgstr "Bozuk Dosya"
+#: ../src/misc.c:209
+msgid "Program Name Error"
+msgstr "Program Adı Hatası"
 
-#: ../src/id3_tag.c:540
-#, c-format
-msgid "Removed tag of '%s'"
-msgstr "'%s' etiketi silindi"
+#: ../src/picture.c:199
+msgid "JPEG image"
+msgstr "JPEG görüntüsü"
 
-#: ../src/id3_tag.c:544 ../src/id3_tag.c:644
-#, c-format
-msgid "Error while removing ID3v1 tag of '%s' (%s)"
-msgstr "'%s' dosyasının ID3v1 etiketi silinemiyor (%s)"
+#: ../src/picture.c:201
+msgid "PNG image"
+msgstr "PNG görüntüsü"
 
-#: ../src/id3_tag.c:546 ../src/id3_tag.c:616
-#, c-format
-msgid "Error while removing ID3v2 tag of '%s' (%s)"
-msgstr "'%s' dosyasının ID3v2 etiketi silinemiyor (%s)"
+#: ../src/picture.c:203
+#| msgid "PNG image"
+msgid "GIF image"
+msgstr "GIF görüntüsü"
 
-#: ../src/id3_tag.c:565
-#, c-format
-msgid "Error while updating ID3v2 tag of '%s' (%s)"
-msgstr "'%s' dosyasının ID3v2 etiketi güncellenemiyor (%s)"
+#: ../src/picture.c:205
+msgid "Unknown image"
+msgstr "Bilinmeyen görüntü"
 
-#: ../src/id3_tag.c:593
-msgid ""
-"You have tried to save this tag to Unicode but it was detected that your "
-"version of id3lib is buggy"
-msgstr ""
-"Etiketi Unicode olarak yazmayı denediniz ama id3lib'in hatalı olduğu tespit "
-"edildi."
+#: ../src/picture.c:217
+#| msgid "32x32 pixel PNG file icon"
+msgid "32×32 pixel PNG file icon"
+msgstr "32x32 piksel PNG dosya simgesi"
 
-#: ../src/id3_tag.c:595
-#, 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 is available in "
-"the EasyTAG package sources.\n"
-"Note that this message will appear only once.\n"
-"\n"
-"File: %s"
-msgstr ""
-"Bu dosyayı tekrar yüklerseniz etiketteki bazı karakterler  doğru "
-"görünmeyebilir. Lütfen EasyTAG kaynak dosyalarında bulunan src/id3lib/"
-"patch_id3lib_3.8.3_UTF16_writing_bug.diff yamasını id3lib'e uygulayın.\n"
-"Bu mesaj sadece bir kere görüntülenir.\n"
-"\n"
-"Dosya: %s"
+#: ../src/picture.c:219
+msgid "Other file icon"
+msgstr "Diğer dosya simgesi"
 
-#: ../src/id3_tag.c:602
-msgid "Buggy id3lib"
-msgstr "Hatalı id3lib"
+#: ../src/picture.c:221
+msgid "Cover (front)"
+msgstr "Kapak (ön)"
 
-#: ../src/id3_tag.c:636
-#, c-format
-msgid "Error while updating ID3v1 tag of '%s' (%s)"
-msgstr "'%s' dosyasının ID3v1 etiketi güncellenemiyor (%s)"
+#: ../src/picture.c:223
+msgid "Cover (back)"
+msgstr "Kapak (arka)"
 
-#: ../src/id3_tag.c:650 ../src/id3v24_tag.c:1049
-#, c-format
-msgid "Updated tag of '%s'"
-msgstr "'%s' etiketi güncellendi"
+#: ../src/picture.c:225
+msgid "Leaflet page"
+msgstr "Kitapçık sayfası"
 
-#: ../src/id3_tag.c:669
-msgid "No error reported"
-msgstr "Hata iletisi yok"
+#: ../src/picture.c:227
+#, fuzzy
+#| msgid "Media (e.g. label side of CD)"
+msgid "Media (such as label side of CD)"
+msgstr "Ortam (örn. CD'nin üzeri)"
 
-#: ../src/id3_tag.c:671
-msgid "No available memory"
-msgstr "Erişilebilir hafıza yok"
+#: ../src/picture.c:229
+msgid "Lead artist/lead performer/soloist"
+msgstr "lider sanatçı/solist"
 
-#: ../src/id3_tag.c:673
-msgid "No data to parse"
-msgstr "Ayrıştırılacak veri yok"
+#: ../src/picture.c:231
+msgid "Artist/performer"
+msgstr "Sanatçı"
 
-#: ../src/id3_tag.c:675
-msgid "Improperly formatted data"
-msgstr "Yanlış biçimlendirilmiş veri"
+#: ../src/picture.c:233
+msgid "Conductor"
+msgstr "Yapımcı"
 
-#: ../src/id3_tag.c:677
-msgid "No buffer to write to"
-msgstr "Yazmak için tampon yok"
+#: ../src/picture.c:235
+msgid "Band/Orchestra"
+msgstr "Orkestra"
 
-#: ../src/id3_tag.c:679
-msgid "Buffer is too small"
-msgstr "Tampon çok küçük"
+#: ../src/picture.c:239
+msgid "Lyricist/text writer"
+msgstr "Şarkı sözleri"
 
-#: ../src/id3_tag.c:681
-msgid "Invalid frame ID"
-msgstr "Geçersiz katman ID"
+#: ../src/picture.c:241
+msgid "Recording location"
+msgstr "Kayıt yeri"
 
-#: ../src/id3_tag.c:683
-msgid "Requested field not found"
-msgstr "İstenen alan bulunamadı"
+#: ../src/picture.c:243
+msgid "During recording"
+msgstr "Kayıt sırasında"
 
-#: ../src/id3_tag.c:685
-msgid "Unknown field type"
-msgstr "Bilinmeyen alan tipi"
+#: ../src/picture.c:245
+msgid "During performance"
+msgstr "Performans sırasında"
 
-#: ../src/id3_tag.c:687
-msgid "Tag is already attached to a file"
-msgstr "Etiket zaten bir dosyaya eklendi"
+#: ../src/picture.c:247
+msgid "Movie/video screen capture"
+msgstr "Ekran kaydı videosu"
 
-#: ../src/id3_tag.c:689
-msgid "Invalid tag version"
-msgstr "Geçersiz etiket sürümü"
+#: ../src/picture.c:249
+msgid "A bright colored fish"
+msgstr "Parlak renkli balık"
 
-#: ../src/id3_tag.c:691
-msgid "No file to parse"
-msgstr "Ayrıştırılacak dosya yok"
+#: ../src/picture.c:251
+msgid "Illustration"
+msgstr "İlizyon"
 
-#: ../src/id3_tag.c:693
-msgid "Attempting to write to a read-only file"
-msgstr "Salt okunur dosyaya yazmaya çalışıyor"
+#: ../src/picture.c:253
+msgid "Band/Artist logotype"
+msgstr "Sanatçı logosu"
 
-#: ../src/id3_tag.c:695
-msgid "Error in compression/uncompression"
-msgstr "Sıkıştırmada/açmada hata"
+#: ../src/picture.c:255
+msgid "Publisher/studio logotype"
+msgstr "Stüdyo logosu"
 
-#: ../src/id3_tag.c:697
-msgid "Unknown error message"
-msgstr "Bilinmeyen hata iletisi"
+#: ../src/picture.c:259
+msgid "Unknown image type"
+msgstr "Bilinmeyen görüntü biçimi"
 
-#: ../src/id3_tag.c:1301
-#, c-format
-msgid "Error while creating temporary file: '%s'"
-msgstr "Geçici dosya oluşturulamadı: '%s'"
+#: ../src/picture.c:287 ../src/picture.c:296
+msgid "pixels"
+msgstr "piksel"
 
-#: ../src/id3_tag.c:1308
-msgid "Error while creating temporary file"
-msgstr "Geçici dosya oluşturulamadı"
+#: ../src/picture.c:287 ../src/picture.c:296
+msgid "Type"
+msgstr "Biçim"
 
-#: ../src/id3_tag.c:1328
-#, c-format
-msgid "Error while writing to file: '%s' (%s)"
-msgstr "Dosyaya yazılamadı: '%s' (%s)"
+#: ../src/playlist_dialog.c:528
+#, fuzzy, c-format
+#| msgid "Cannot write playlist file '%s'"
+msgid "Cannot write playlist file ‘%s’"
+msgstr "'%s' çalma listesi oluşturulamıyor"
 
-#. 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
-#, 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] "'%s' dosyasına etiket yazılamıyor (%s bayt eksik)"
+#: ../src/playlist_dialog.c:532
+msgid "Playlist File Error"
+msgstr "Çalma Listesi Dosyası Hatası"
 
-#: ../src/id3v24_tag.c:1525
-#, c-format
-msgid "Cannot save tag of file '%s'"
-msgstr "'%s' dosyasının etiketi kaydedilemiyor"
+#: ../src/playlist_dialog.c:540
+#, fuzzy, c-format
+#| msgid "Written playlist file '%s'"
+msgid "Wrote playlist file ‘%s’"
+msgstr "'%s' dosyasına çalma listesi yazıldı"
 
-#: ../src/id3v24_tag.c:1536
-#, c-format
-msgid "Size error while saving tag of '%s'"
-msgstr "'%s' etiketi yazılırken boyut hatası oluştu"
+#: ../src/playlist_dialog.c:622 ../src/scan_dialog.c:2770
+#: ../src/scan_dialog.c:2832
+msgid "Invalid scanner mask"
+msgstr "Geçersiz tarayıcı maskesi"
 
-#: ../src/log.c:100
-msgid "Log"
-msgstr "Günlük"
+#: ../src/playlist_dialog.c:653
+msgid "Generate Playlist"
+msgstr "Çalma Listesi Oluştur"
 
-#: ../src/misc.c:686
-msgid "Select File"
-msgstr "Dosya Seç"
+#. The window
+#: ../src/preferences_dialog.c:293
+msgid "Preferences"
+msgstr "Tercihler"
 
-#: ../src/misc.c:692
-msgid "Select Directory"
-msgstr "Dizin Seç"
+#: ../src/preferences_dialog.c:1130
+#, fuzzy
+#| msgid "The selected path for 'Default path to files' is invalid"
+msgid "The selected default path is invalid"
+msgstr "'Dosyalar için öntanımlı konum' için seçilen konum geçersiz"
 
-#: ../src/misc.c:776
-msgid "No audio player defined"
-msgstr "Müzik oynatıcı tanımlanmadı"
+#: ../src/preferences_dialog.c:1132
+#, fuzzy, c-format
+#| msgid ""
+#| "Path: '%s'\n"
+#| "Error: %s"
+msgid ""
+"Path: ‘%s’\n"
+"Error: %s"
+msgstr ""
+"Konum: '%s'\n"
+"Hata: %s"
 
-#: ../src/misc.c:777
-msgid "Audio Player Warning"
-msgstr "Müzik Oynatıcı Uyarısı"
+#: ../src/preferences_dialog.c:1136
+msgid "Invalid Path Error"
+msgstr "Geçersiz Konum Hatası"
 
-#: ../src/misc.c:868
-msgid "Cannot fork another process"
-msgstr "Başka bir süreç çatallanamıyor"
+#: ../src/scan_dialog.c:307
+#, fuzzy, c-format
+#| msgid "Cannot calculate CRC value of file (%s)"
+msgid "Cannot calculate CRC value of file ‘%s’"
+msgstr "Dosyanın CRC değeri hesaplanamıyor (%s)"
 
-#: ../src/misc.c:874
-#, c-format
-msgid "Cannot execute %s (%s)"
-msgstr "Çalıştırılamıyor %s (%s)"
+#: ../src/scan_dialog.c:323
+msgid "Tag successfully scanned"
+msgstr "Etiket başarıyla tarandı"
 
-#. Translators: file size (bytes, kilobytes, megabytes, gigabytes,
-#. * terabytes).
-#: ../src/misc.c:1035 ../src/misc.c:1055
-msgid "B"
-msgstr "B"
+#: ../src/scan_dialog.c:326
+#, fuzzy, c-format
+#| msgid "Tag successfully scanned: %s"
+msgid "Tag successfully scanned ‘%s’"
+msgstr "Etiket başarıyla tarandı: %s"
 
-#: ../src/misc.c:1035 ../src/misc.c:1055
-msgid "kB"
-msgstr "kB"
+#: ../src/scan_dialog.c:369
+#, fuzzy, c-format
+#| msgid ""
+#| "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
+msgid "The extension ‘%s’ was not found in filename ‘%s’"
+msgstr "Etiket tarayıcı:yabancı… '%s' eklentisi '%s' dosyasında bulunamadı"
 
-#: ../src/misc.c:1035 ../src/misc.c:1055
-msgid "MB"
-msgstr "MB"
+#: ../src/scan_dialog.c:459 ../src/scan_dialog.c:490
+#, fuzzy, c-format
+#| msgid "Scan Error: can't find separator '%s' within '%s'"
+msgid "Cannot find separator ‘%s’ within ‘%s’"
+msgstr "Tarama Hatası: '%s' ile '%s' arasına ayırıcı bulunamadı"
 
-#: ../src/misc.c:1035 ../src/misc.c:1055
-msgid "GB"
-msgstr "GB"
+#: ../src/scan_dialog.c:717
+#, fuzzy, c-format
+#| msgid "Could not convert filename '%s' into system filename encoding"
+msgid "Could not convert filename ‘%s’ into system filename encoding"
+msgstr "'%s' dosya adı sistem dosya adı kodlamasına dönüştürülemiyor"
 
-#: ../src/misc.c:1035 ../src/misc.c:1055
-msgid "TB"
-msgstr "TB"
+#: ../src/scan_dialog.c:742
+msgid "New filename successfully scanned"
+msgstr "Yeni dosya adı başarıyla tarandı"
 
-#: ../src/misc.c:1134
-msgid "Generate Playlist"
-msgstr "Çalma Listesi Oluştur"
+#: ../src/scan_dialog.c:746
+#, fuzzy, c-format
+#| msgid "New filename successfully scanned: %s"
+msgid "New filename successfully scanned ‘%s’"
+msgstr "Yeni dosya adı başarıyla tarandı: %s"
 
-#: ../src/misc.c:1158
-msgid "M3U Playlist Name"
-msgstr "M3U Çalma Listesi Adı"
+#: ../src/scan_dialog.c:1109
+#, fuzzy, c-format
+#| msgid "Error while processing fields: %s"
+msgid "Error while processing fields ‘%s’"
+msgstr "Alanlar işlenemiyor: %s"
 
-#: ../src/misc.c:1173
-msgid "Use directory name"
-msgstr "Dizin adı kullan"
+#: ../src/scan_dialog.c:2040
+msgid "New_mask"
+msgstr "Yeni_make"
+
+#. The window
+#: ../src/scan_dialog.c:2257
+msgid "Tag and Filename Scan"
+msgstr "Etiket ve Dosya Adı Tarayıcı"
+
+#. 'Scan selected files' button
+#: ../src/scan_dialog.c:2263
+msgid "Scan Files"
+msgstr "Dosyaları Tara"
+
+#: ../src/scan_dialog.c:2269
+msgid "Scan selected files"
+msgstr "Seçilen dosyaları tara"
+
+#: ../src/scan_dialog.c:2907
+msgid "All tags have been scanned"
+msgstr "Bütün etiketler tarandı"
+
+#: ../src/search_dialog.c:545
+#, c-format
+msgid "Found one file"
+msgid_plural "Found %d files"
+msgstr[0] "%d adet dosya bulundu"
+
+#: ../src/search_dialog.c:594
+msgid "Find Files"
+msgstr "Dosyaları Bul"
+
+#: ../src/search_dialog.c:678
+msgid "Ready to search…"
+msgstr "Aramaya hazır…"
+
+#: ../src/setting.c:142
+#, fuzzy, c-format
+#| msgid "Cannot create or open file '%s' (%s)"
+msgid "Cannot create or open file ‘%s’: %s"
+msgstr "'%s' dosyası oluşturulamıyor veya okunamıyor (%s)"
+
+#: ../src/setting.c:192
+#, fuzzy, c-format
+#| msgid "Error: Cannot write list to file: %s (%s)"
+msgid "Cannot write list to file ‘%s’: %s"
+msgstr "Hata: Liste dosyaya yazılamıyor: %s (%s)"
 
-#. Playlist options
-#: ../src/misc.c:1190
-msgid "Playlist Options"
-msgstr "Çalma Listesi"
+#: ../src/setting.c:210
+#, fuzzy, c-format
+#| msgid "Error while writing list file: %s"
+msgid "Error while writing list file ‘%s’"
+msgstr "Dosya listesi yazılırken hata oluştu: %s"
 
-#: ../src/misc.c:1196
-msgid "Include only the selected files"
-msgstr "Sadece seçilen dosyaları içer"
+#. Fall back to defaults.
+#: ../src/setting.c:290
+#, fuzzy
+#| msgid "Loading default 'Fill Tag' masks…"
+msgid "Loading default ‘Fill Tag’ masks…"
+msgstr "Öntanımlı 'Etiketleri Doldur' maskesi yükleniyor…"
 
-#: ../src/misc.c:1199
-msgid ""
-"If activated, only the selected files will be written in the playlist file. "
-"Else, all the files will be written."
-msgstr ""
-"Eğer işaretliyse sadece seçilen dosyalardan çalma listesi oluşturulur. "
-"Değilse tüm dosyalardan oluşturulur."
+#. Fall back to defaults.
+#: ../src/setting.c:320
+#, fuzzy
+#| msgid "Loading default 'Rename File' masks…"
+msgid "Loading default ‘Rename File’ masks…"
+msgstr "Öntanımlı 'Dosya Yeniden Adlandırma' maskesi yükleniyor…"
 
-#: ../src/misc.c:1202
-msgid "Use full path for files in playlist"
-msgstr "Çalma listesinde dosyalar için gerçek konum kullan"
+#: ../src/setting.c:406
+#, fuzzy, c-format
+#| msgid "Migrating configuration from directory '%s' to '%s'"
+msgid "Migrating configuration from directory ‘%s’ to ‘%s’"
+msgstr "Yapılandırma '%s' dizininden '%s' dizinine taşınıyor."
 
-#: ../src/misc.c:1205
-msgid "Use relative path for files in playlist"
-msgstr "Çalma listesinde dosyalar için göreceli konum kullan"
+#: ../src/setting.c:430
+#, fuzzy, c-format
+#| msgid "Failed to migrate configuration file '%s'"
+msgid "Failed to migrate configuration file ‘%s’"
+msgstr "'%s' yapılandırma dosyası taşınamadı"
 
-#. Create playlist in parent directory
-#: ../src/misc.c:1211
-msgid "Create playlist in the parent directory"
-msgstr "Çalma listesini üst dizinde oluştur"
+#: ../src/setting.c:467
+#, fuzzy, c-format
+#| msgid "Cannot create target directory '%s': %s"
+msgid "Cannot create directory ‘%s’: %s"
+msgstr "'%s' hedef dizini oluşturulamıyor: %s"
 
-#: ../src/misc.c:1214
-msgid "If activated, the playlist will be created in the parent directory."
-msgstr "Eğer işaretlenmişse çalma listesini üst dizinde oluşturur."
+#: ../src/status_bar.c:145
+msgid "Ready to start"
+msgstr "Başlamaya hazır"
 
-#. DOS Separator
-#: ../src/misc.c:1218
-msgid "Use DOS directory separator"
-msgstr "DOS dizin ayıracını kullan"
+#: ../src/tag_area.c:187
+#, fuzzy, c-format
+#| msgid "Selected files tagged with title '%s'."
+msgid "Selected files tagged with title ‘%s’"
+msgstr "Seçilen dosyalar '%s' başlığı ile etiketlendi."
 
-#: ../src/misc.c:1224
-msgid ""
-"This option replaces the UNIX directory separator '/' into DOS separator "
-"'\\'."
-msgstr "Bu seçenek UNIX dizin ayıracı '/' yerine DOS ayıracı '\\' kullanır."
+#: ../src/tag_area.c:192
+#, fuzzy
+#| msgid "Removed title from selected files."
+msgid "Removed title from selected files"
+msgstr "Seçilen dosyalardan başlık silindi."
 
-#: ../src/misc.c:1233
-msgid "Playlist Content"
-msgstr "Çalma Listesi İçeriği"
+#: ../src/tag_area.c:209
+#, fuzzy, c-format
+#| msgid "Selected files tagged with artist '%s'."
+msgid "Selected files tagged with artist ‘%s’"
+msgstr "Seçilen dosyalar '%s' sanatçısı ile etiketlendi."
 
-#: ../src/misc.c:1239
-msgid "Write only list of files"
-msgstr "Sadece dosyaların listesini yaz"
+#: ../src/tag_area.c:214
+#, fuzzy
+#| msgid "Removed artist from selected files."
+msgid "Removed artist from selected files"
+msgstr "Seçilen dosyalardan sanatçı silindi"
 
-#: ../src/misc.c:1243
-msgid "Write info using filename"
-msgstr "Bilgi olarak dosya adını yaz"
+#: ../src/tag_area.c:230
+#, fuzzy, c-format
+#| msgid "Selected files tagged with album artist '%s'."
+msgid "Selected files tagged with album artist ‘%s’"
+msgstr "Seçilen dosyalar '%s' albüm sanatçısı ile etiketlendi."
 
-#: ../src/misc.c:1246
-msgid "Write info using:"
-msgstr "Bilgi olarak bunu yaz:"
+#: ../src/tag_area.c:235
+#, fuzzy
+#| msgid "Removed album artist from selected files."
+msgid "Removed album artist from selected files"
+msgstr "Seçilen dosyalardan albüm sanatçısı silindi"
 
-#: ../src/misc.c:1465
-#, c-format
-msgid "Cannot write playlist file '%s'"
-msgstr "'%s' çalma listesi oluşturulamıyor"
+#: ../src/tag_area.c:252
+#, fuzzy, c-format
+#| msgid "Selected files tagged with album '%s'."
+msgid "Selected files tagged with album ‘%s’"
+msgstr "Seçilen dosyalar '%s' albümü ile etiketlendi."
 
-#: ../src/misc.c:1469
-msgid "Playlist File Error"
-msgstr "Çalma Listesi Dosyası Hatası"
+#: ../src/tag_area.c:257
+#, fuzzy
+#| msgid "Removed album name from selected files."
+msgid "Removed album name from selected files"
+msgstr "Seçilen dosyalardan albümü silindi"
 
-#: ../src/misc.c:1477
-#, c-format
-msgid "Written playlist file '%s'"
-msgstr "'%s' dosyasına çalma listesi yazıldı"
+#: ../src/tag_area.c:295
+#, fuzzy, c-format
+#| msgid "Selected files tagged with disc number '%s/%s'."
+msgid "Selected files tagged with disc number ‘%s/%s’"
+msgstr "'%s/%s' disk numarası ile etiketlenmiş seçili dosyalar."
 
-#: ../src/misc.c:1541 ../src/scan.c:3248 ../src/scan.c:3310
-msgid "Invalid scanner mask"
-msgstr "Geçersiz tarayıcı maskesi"
+#: ../src/tag_area.c:300
+#, fuzzy, c-format
+#| msgid "Selected files tagged with disc number like 'xx'."
+msgid "Selected files tagged with disc number like ‘xx’"
+msgstr "'xx' gibi bir disk numarasıyla etiketlenmiş seçili dosyalar."
 
-#: ../src/misc.c:1905
-msgid "CD"
-msgstr "CD"
+#: ../src/tag_area.c:305
+#, fuzzy
+#| msgid "Removed disc number from selected files."
+msgid "Removed disc number from selected files"
+msgstr "Seçilen dosyalardan disk numarası silindi"
 
-#: ../src/misc.c:1927
-msgid "Find Files"
-msgstr "Dosyaları Bul"
+#: ../src/tag_area.c:322
+#, fuzzy, c-format
+#| msgid "Selected files tagged with year '%s'."
+msgid "Selected files tagged with year ‘%s’"
+msgstr "Seçilen dosyalar '%s' yılı ile etiketlendi."
 
-#: ../src/misc.c:1959
-msgid ""
-"Type the word to search into files. Or type nothing to display all files."
-msgstr ""
-"Dosyalarda aramak için bir şeyler girin veya bir şey yazmayın tüm dosyalar "
-"görünsün."
+#: ../src/tag_area.c:327
+#, fuzzy
+#| msgid "Removed year from selected files."
+msgid "Removed year from selected files"
+msgstr "Seçilen dosyalardan yıl silindi"
 
-#. Where...
-#: ../src/misc.c:1965
-msgid "In:"
-msgstr "Nerede:"
+#: ../src/tag_area.c:354 ../src/tag_area.c:448
+#, fuzzy, c-format
+#| msgid "Selected files tagged with track like 'xx/%s'."
+msgid "Selected files tagged with track like ‘xx/%s’"
+msgstr "Seçilen dosyaların parça numarası 'xx/%s' şeklinde etiketlendi."
 
-#. Translators: This option is for the previous 'in' option. For instance,
-#. * translate this as "Search" "In:" "the Filename".
-#: ../src/misc.c:1970
-msgid "the Filename"
-msgstr "Dosya adında"
+#: ../src/tag_area.c:358
+#, fuzzy, c-format
+#| msgid "Selected files tagged with track like 'xx'."
+msgid "Selected files tagged with track like ‘xx’"
+msgstr "Seçilen dosyaların parça numarası 'xx' şeklinde etiketlendi."
 
-#. 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:1976
-msgid "the Tag"
-msgstr "Etiketlerde"
+#: ../src/tag_area.c:363 ../src/tag_area.c:453
+#, fuzzy
+#| msgid "Removed track number from selected files."
+msgid "Removed track number from selected files"
+msgstr "Seçilen dosyalardan parça numarası silindi"
 
-#. Property of the search
-#: ../src/misc.c:1987 ../src/prefs.c:335
-msgid "Case sensitive"
-msgstr "Büyük küçük harf duyarlı"
+#. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
+#: ../src/tag_area.c:421
+#, fuzzy, c-format
+#| msgid "Selected tracks numbered sequentially."
+msgid "Selected tracks numbered sequentially"
+msgstr "Seçilen parçalar ardışık olarak numaralandı."
 
-#: ../src/misc.c:2214
-msgid "Ready to search…"
-msgstr "Aramaya hazır…"
+#: ../src/tag_area.c:470
+#, fuzzy, c-format
+#| msgid "Selected files tagged with genre '%s'."
+msgid "Selected files tagged with genre ‘%s’"
+msgstr "Seçilen dosyalar '%s' türü ile etiketlendi."
 
-#: ../src/misc.c:2434
-#, c-format
-msgid "Found one file"
-msgid_plural "Found %d files"
-msgstr[0] "%d adet dosya bulundu"
+#: ../src/tag_area.c:475
+#, fuzzy
+#| msgid "Removed genre from selected files."
+msgid "Removed genre from selected files"
+msgstr "Seçilen dosyalardan türü silindi"
 
-#: ../src/misc.c:2719
-msgid "Load Filenames From a Text File"
-msgstr "Dosya Adlarını Metin Dosyasından Yükle"
+#: ../src/tag_area.c:499
+#, fuzzy, c-format
+#| msgid "Selected files tagged with comment '%s'."
+msgid "Selected files tagged with comment ‘%s’"
+msgstr "Seçilen dosyalar '%s' yorumu ile etiketlendi."
 
-#: ../src/misc.c:2748
-msgid "File:"
-msgstr "Dosya:"
+#: ../src/tag_area.c:504
+#, fuzzy
+#| msgid "Removed comment from selected files."
+msgid "Removed comment from selected files"
+msgstr "Seçilen dosyalardan yorum silindi"
 
-#. Button 'load'
-#. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: ../src/misc.c:2767
-msgid " Load "
-msgstr " Yükle "
+#: ../src/tag_area.c:520
+#, fuzzy, c-format
+#| msgid "Selected files tagged with composer '%s'."
+msgid "Selected files tagged with composer ‘%s’"
+msgstr "Seçilen dosyalar '%s' besteci ile etiketlendi."
 
-#: ../src/misc.c:2785
-msgid "Content of Text File"
-msgstr "Metin Dosyası İçeriği"
+#: ../src/tag_area.c:525
+#, fuzzy
+#| msgid "Removed composer from selected files."
+msgid "Removed composer from selected files"
+msgstr "Seçilen dosyalardan besteci silindi"
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2806 ../src/misc.c:2901
-msgid "Insert a blank line before the selected line"
-msgstr "Seçilen satırdan önce boş satır bırak"
+#: ../src/tag_area.c:542
+#, fuzzy, c-format
+#| msgid "Selected files tagged with original artist '%s'."
+msgid "Selected files tagged with original artist ‘%s’"
+msgstr "Seçilen dosyalar '%s' asıl sanatçısı ile etiketlendi."
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2815 ../src/misc.c:2910
-msgid "Delete the selected line"
-msgstr "Seçilen satırı sil"
+#: ../src/tag_area.c:547
+#, fuzzy
+#| msgid "Removed original artist from selected files."
+msgid "Removed original artist from selected files"
+msgstr "Seçilen dosyalardan asıl sanatçı silindi"
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2824 ../src/misc.c:2919 ../src/misc.c:3405
-msgid "Delete all blank lines"
-msgstr "Tüm boş satırları sil"
+#: ../src/tag_area.c:564
+#, fuzzy, c-format
+#| msgid "Selected files tagged with copyright '%s'."
+msgid "Selected files tagged with copyright ‘%s’"
+msgstr "Seçilen dosyalar '%s' telif hakkı ile etiketlendi."
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2836 ../src/misc.c:2931
-msgid "Move up the selected line"
-msgstr "Seçilen satırı yukarı taşı"
+#: ../src/tag_area.c:569
+#, fuzzy
+#| msgid "Removed copyright from selected files."
+msgid "Removed copyright from selected files"
+msgstr "Seçilen dosyalardan telif hakkı silindi"
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2845 ../src/misc.c:2940
-msgid "Move down the selected line"
-msgstr "Seçilen satırı aşağı taşı"
+#: ../src/tag_area.c:586
+#, fuzzy, c-format
+#| msgid "Selected files tagged with URL '%s'."
+msgid "Selected files tagged with URL ‘%s’"
+msgstr "Seçilen dosyalar '%s' bağlantısı ile etiketlendi."
 
-#. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2857 ../src/misc.c:2952 ../src/misc.c:3429
-msgid "Reload"
-msgstr "Yenile"
+#: ../src/tag_area.c:591
+#, fuzzy
+#| msgid "Removed URL from selected files."
+msgid "Removed URL from selected files"
+msgstr "Seçilen dosyalardan bağlantı silindi"
 
-#: ../src/misc.c:2879
-msgid "List of Files"
-msgstr "Dosya Listesi"
+#: ../src/tag_area.c:608
+#, fuzzy, c-format
+#| msgid "Selected files tagged with encoder name '%s'."
+msgid "Selected files tagged with encoder name ‘%s’"
+msgstr "Seçilen dosyalar '%s' kodlayıcısı ile etiketlendi."
 
-#: ../src/misc.c:2974
-msgid "Selected line:"
-msgstr "Seçilen satır:"
+#: ../src/tag_area.c:613
+#, fuzzy
+#| msgid "Removed encoder name from selected files."
+msgid "Removed encoder name from selected files"
+msgstr "Seçilen dosyalardan kodlayıcı silindi"
 
-#: ../src/misc.c:2992
-msgid ""
-"When activating this option, after loading the filenames, the current "
-"selected scanner will be ran (the scanner window must be opened)."
-msgstr ""
-"Bu seçenek işaretlenirse dosya adları yüklendikten sonra seçilen tarayıcı "
-"çalıştırılır (tarayıcı penceresi açık olmalı)."
+#: ../src/tag_area.c:647
+#, fuzzy
+#| msgid "Selected files tagged with images."
+msgid "Selected files tagged with images"
+msgstr "Seçilen dosyalar görüntülerle ile etiketlendi."
 
-#: ../src/misc.c:3079
-#, c-format
-msgid "Cannot retrieve file info (%s)"
-msgstr "Dosya bilgisi alınamıyor (%s)"
+#: ../src/tag_area.c:651
+#, fuzzy
+#| msgid "Removed images from selected files."
+msgid "Removed images from selected files"
+msgstr "Seçilen dosyalardan görüntüler silindi"
 
-#: ../src/misc.c:3141
-#, c-format
-msgid "Can't open file '%s' (%s)"
-msgstr "'%s' dosyası açılamıyor (%s)"
+#. Menu items
+#: ../src/tag_area.c:820
+msgid "Tag selected files with this field"
+msgstr "Seçilen dosyaları bu alanda etiketle"
 
-#: ../src/misc.c:3177
-#, c-format
-msgid "Error reading file (%s)"
-msgstr "Dosya okunurken hata oluştu (%s)"
+#: ../src/tag_area.c:847
+msgid "All uppercase"
+msgstr "Tümü büyük harf"
 
-#: ../src/misc.c:3393
-msgid "Insert a blank line"
-msgstr "Boş satır ekle"
+#: ../src/tag_area.c:853
+msgid "All lowercase"
+msgstr "Tümü küçük harf"
 
-#: ../src/misc.c:3399
-msgid "Delete this line"
-msgstr "Satırı sil"
+#: ../src/tag_area.c:859
+msgid "First letter uppercase"
+msgstr "İlk harf büyük"
 
-#: ../src/misc.c:3414
-msgid "Move up this line"
-msgstr "Satırı yukarı taşı"
+#: ../src/tag_area.c:865
+msgid "First letter uppercase of each word"
+msgstr "Her kelimenin ilk harfi büyük"
 
-#: ../src/misc.c:3420
-msgid "Move down this line"
-msgstr "Satırı aşağı taşı"
+#: ../src/tag_area.c:881
+msgid "Insert space before uppercase letter"
+msgstr "Büyük harften önce boşluk ekle"
 
-#. Mode changed to profile name
-#: ../src/monkeyaudio_header.c:78 ../src/musepack_header.c:80
-#, c-format
-msgid "Profile:"
-msgstr "Profil:"
+#: ../src/tag_area.c:887
+msgid "Remove duplicate spaces or underscores"
+msgstr "Çift boşluk ve alt çizgileri sil"
 
-#: ../src/mp4_header.c:63 ../src/mp4_tag.c:65 ../src/mp4_tag.c:186
-msgid "MP4 format invalid"
-msgstr "Geçersiz MP4 biçimi"
+#: ../src/tag_area.c:893
+msgid "Remove all text"
+msgstr "Tüm metni sil"
 
-#: ../src/mp4_header.c:72 ../src/mp4_tag.c:74
+#: ../src/tag_area.c:1269 ../src/tag_area.c:1347
 #, c-format
-msgid "File contains no audio track: '%s'"
-msgstr "Dosya içeriği ses parçası içermiyor: '%s'"
+msgid "Error parsing image data ‘%s’"
+msgstr ""
 
-#: ../src/mp4_header.c:82
-#, c-format
-msgid "Error reading properties from file: '%s'"
-msgstr "'%s' dosyasından özellikler okunamadı"
+#: ../src/tag_area.c:1329
+#, fuzzy
+#| msgid ""
+#| "Cannot display the image because not enough data has been read to "
+#| "determine how to create the image buffer."
+msgid ""
+"Cannot display the image because not enough data has been read to determine "
+"how to create the image buffer"
+msgstr ""
+"Görüntü gösterilemiyor çünkü görüntü arabelleği belirlemek için yeterli veri "
+"yok"
 
-#: ../src/mp4_header.c:132 ../src/mpeg_header.c:204
-#, c-format
-msgid "~%d kb/s"
-msgstr "~%d kb/s"
+#: ../src/tag_area.c:1336
+msgid "Cannot display the image"
+msgstr "Görüntü gösterilemiyor"
 
-#: ../src/mp4_tag.c:85 ../src/mp4_tag.c:194
-#, c-format
-msgid "Error reading tags from file: '%s'"
-msgstr "'%s' dosyasından etiketler okunamadı"
+#: ../src/tag_area.c:1338
+msgid ""
+"Not enough data has been read to determine how to create the image buffer."
+msgstr "Görüntü arabelleği belirlemek için yeterli veri yok"
 
-#: ../src/mpeg_header.c:64
-msgid "Stereo"
-msgstr "Stereo"
+#: ../src/tag_area.c:1340
+msgid "Load Image File"
+msgstr "Görüntü Dosyası Yükle"
 
-#: ../src/mpeg_header.c:65
-msgid "Joint stereo"
-msgstr "Ortak stereo"
+#: ../src/tag_area.c:1384 ../src/tag_area.c:1409
+#, fuzzy, c-format
+#| msgid "Image file not loaded: %s"
+msgid "Image file not loaded ‘%s’"
+msgstr "'%s' görüntü dosyası yüklenemiyor"
 
-#: ../src/mpeg_header.c:66
-msgid "Dual channel"
-msgstr "Çift kanal"
+#: ../src/tag_area.c:1401
+#, c-format
+#| msgid "Cannot open file: '%s'"
+msgid "Cannot open file ‘%s’"
+msgstr "‘%s’ dosyası açılamıyor"
 
-#: ../src/mpeg_header.c:67
-msgid "Single channel"
-msgstr "Tek kanal"
+#: ../src/tag_area.c:1405
+msgid "Image File Error"
+msgstr "Görüntü Dosyası Hatası"
 
-#. MPEG, Layer versions
-#: ../src/mpeg_header.c:194
-msgid "MPEG"
-msgstr "MPEG"
+#: ../src/tag_area.c:1416
+msgid "Image file loaded"
+msgstr "Görüntü dosyası yüklendi"
 
-#. FIXME: Pass error back to calling function.
-#: ../src/ogg_header.c:227
-#, c-format
-msgid "Error while opening file: '%s' (%s)"
-msgstr "Dosya açılırken hata oluştu: '%s' (%s)"
+#: ../src/tag_area.c:1487
+msgid "Add Images"
+msgstr "Görüntü ekle"
 
-#: ../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: Belirtilen veri akışı yok veya dosya yanlış başlatıldı. (dosya: "
-"'%s')."
+#: ../src/tag_area.c:1498 ../src/tag_area.c:1863
+msgid "All Files"
+msgstr "Tüm Dosyalar"
 
-#: ../src/ogg_header.c:279
-#, c-format
-msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
-msgstr "Ogg Vorbis: Ortamdan okunamadı (dosya: '%s')."
+#: ../src/tag_area.c:1504 ../src/tag_area.c:1869
+msgid "PNG and JPEG"
+msgstr "PNG ve JPEG"
 
-#: ../src/ogg_header.c:282
+#: ../src/tag_area.c:1648
 #, c-format
-msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
-msgstr "Ogg Vorbis: Veri akışı Vorbis verisi değil (file: '%s')."
+msgid "Image Properties %d/%d"
+msgstr "Görüntü özellikleri %d/%d"
 
-#: ../src/ogg_header.c:285
+#: ../src/tag_area.c:1848
 #, c-format
-msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
-msgstr "Ogg Vorbis: Vorbis sürümü eşleşmiyor (file: '%s')."
+msgid "Save Image %d/%d"
+msgstr "Görüntüyü Kaydet %d/%d"
 
-#: ../src/ogg_header.c:288
-#, c-format
-msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
-msgstr "Ogg Vorbis: Geçersiz Vorbis veri akışı başlığı (dosya: '%s')."
+#: ../src/tag_area.c:1925
+#, fuzzy, c-format
+#| msgid "Image file not saved: %s"
+msgid "Image file not saved ‘%s’"
+msgstr "Görüntü dosyası kaydedilmedi: %s"
 
-#: ../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: İçsel Mantık hatası, hata veya yığın bozulmasını gösterir "
-"(dosya: '%s')."
+#: ../src/tag_area.c:2268
+msgid "Tag selected files with this genre"
+msgstr "Seçilen dosyalara bu türü etiketle"
 
-#: ../src/ogg_header.c:337
-#, c-format
-msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
-msgstr "Hata: '%s' dosyası Vorbis olarak açılamadı (%s)."
+#: ../src/tag_area.c:2998
+msgid "ID3 Tag"
+msgstr "ID3 Etiketi"
 
-#: ../src/ogg_tag.c:186 ../src/ogg_tag.c:739
-#, c-format
-msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
-msgstr "Uyarı: '%s' Ogg Vorbis dosyası ID3v2 etiketi içeriyor."
+#: ../src/tag_area.c:3003
+msgid "Ogg Vorbis Tag"
+msgstr "Ogg Vorbis Etiketi"
 
-#: ../src/picture.c:244 ../src/picture.c:269
-#, c-format
-msgid "Image file not loaded: %s"
-msgstr "'%s' görüntü dosyası yüklenemiyor"
+#: ../src/tag_area.c:3008
+msgid "FLAC Vorbis Tag"
+msgstr "FLAC Vorbis Etiketi"
 
-#: ../src/picture.c:261
-#, c-format
-msgid "Cannot open file: '%s'"
-msgstr "'%s' dosyası açılamıyor"
+#: ../src/tag_area.c:3012
+msgid "APE Tag"
+msgstr "APE Etiketi"
 
-#: ../src/picture.c:265
-msgid "Image File Error"
-msgstr "Görüntü Dosyası Hatası"
+#: ../src/tag_area.c:3016
+msgid "MP4/M4A/AAC Tag"
+msgstr "MP4/M4A/AAC Etiketi"
 
-#: ../src/picture.c:276
-msgid "Image file loaded"
-msgstr "Görüntü dosyası yüklendi"
+#: ../src/tag_area.c:3021
+msgid "Wavpack Tag"
+msgstr "Wavpack Etiketi"
+
+#: ../src/tag_area.c:3026
+msgid "Opus Tag"
+msgstr "Opus Etiketi"
 
-#: ../src/picture.c:334
-msgid "Add Images"
-msgstr "Görüntü ekle"
+#: ../src/tag_area.c:3266
+#, c-format
+msgid "Images (%d)"
+msgstr "Görüntüler (%d)"
 
-#: ../src/picture.c:344 ../src/picture.c:700
-msgid "All Files"
-msgstr "Tüm Dosyalar"
+#: ../src/tags/ape_tag.c:66 ../src/tags/flac_tag.c:136
+#: ../src/tags/mp4_header.cc:58 ../src/tags/mp4_header.cc:67
+#: ../src/tags/mp4_tag.cc:66 ../src/tags/mp4_tag.cc:79
+#: ../src/tags/mp4_tag.cc:85 ../src/tags/ogg_header.c:228
+#, fuzzy, c-format
+#| msgid "Error while opening file: '%s' (%s)"
+msgid "Error while opening file: %s"
+msgstr "Dosya açılırken hata oluştu: '%s' (%s)"
 
-#: ../src/picture.c:350 ../src/picture.c:706
-msgid "PNG and JPEG"
-msgstr "PNG ve JPEG"
+#: ../src/tags/ape_tag.c:369
+msgid "Failed to write APE tag"
+msgstr ""
 
-#: ../src/picture.c:477
-#, c-format
-msgid "Image Properties %d/%d"
-msgstr "Görüntü özellikleri %d/%d"
+#: ../src/tags/flac_header.c:213
+#, fuzzy
+#| msgid "Error reading file (%s)"
+msgid "Error opening FLAC file"
+msgstr "Dosya okunurken hata oluştu (%s)"
 
-#: ../src/picture.c:501
-msgid "Image Type"
-msgstr "Görüntü Biçimi"
+#: ../src/tags/flac_header.c:300
+msgid "FLAC File"
+msgstr "FLAC Dosyası"
 
-#. Description of the picture
-#: ../src/picture.c:560
-msgid "Image Description:"
-msgstr "Görüntü açıklaması:"
+#. Mode
+#. Mode
+#. mpeg4ip library seems to always return -1
+#. Mode
+#: ../src/tags/flac_header.c:313 ../src/tags/mp4_header.cc:152
+#: ../src/tags/ogg_header.c:417 ../src/tags/opus_header.c:235
+#: ../src/tags/wavpack_header.c:96
+msgid "Channels:"
+msgstr "Kanallar:"
 
-#: ../src/picture.c:687
-#, c-format
-msgid "Save Image %d/%d"
-msgstr "Görüntüyü Kaydet %d/%d"
+#: ../src/tags/flac_tag.c:857 ../src/tags/flac_tag.c:869
+#, fuzzy, c-format
+#| msgid "Error while opening file: '%s' as FLAC (%s)."
+msgid "Error while opening file ‘%s’ as FLAC: %s"
+msgstr "Dosya açılamadı: '%s' FLAC (%s)."
 
-#: ../src/picture.c:759
-#, c-format
-msgid "Image file not saved: %s"
-msgstr "Görüntü dosyası kaydedilmedi: %s"
+#: ../src/tags/flac_tag.c:1130
+#, fuzzy, c-format
+#| msgid "Error: Failed to write comments to file '%s' (%s)."
+msgid "Failed to write comments to file ‘%s’: %s"
+msgstr "Hata: '%s' dosyasına yorum yazılamadı (%s)."
 
-#: ../src/picture.c:827
-msgid "JPEG image"
-msgstr "JPEG görüntüsü"
+#: ../src/tags/id3_tag.c:211
+#, fuzzy, c-format
+#| msgid ""
+#| "As the following corrupted file '%s' will cause an error in id3lib, it "
+#| "will not be processed"
+msgid ""
+"As the following corrupted file ‘%s’ will cause an error in id3lib, it will "
+"not be processed"
+msgstr "'%s' dosyası id3lib ile ilgili hata verdi, işlenmeyecek"
 
-#: ../src/picture.c:829
-msgid "PNG image"
-msgstr "PNG görüntüsü"
+#: ../src/tags/id3_tag.c:213
+msgid "Corrupted file"
+msgstr "Bozuk Dosya"
 
-#: ../src/picture.c:831
-msgid "Unknown image"
-msgstr "Bilinmeyen görüntü"
+#: ../src/tags/id3_tag.c:595
+#, fuzzy, c-format
+#| msgid "Removed tag of '%s'"
+msgid "Removed tag of ‘%s’"
+msgstr "'%s' etiketi silindi"
 
-#: ../src/picture.c:843
-msgid "32x32 pixel PNG file icon"
-msgstr "32x32 piksel PNG dosya simgesi"
+#: ../src/tags/id3_tag.c:602 ../src/tags/id3_tag.c:729
+#, fuzzy, c-format
+#| msgid "Error while removing ID3v1 tag of '%s' (%s)"
+msgid "Error while removing ID3v1 tag of ‘%s’: %s"
+msgstr "'%s' dosyasının ID3v1 etiketi silinemiyor (%s)"
 
-#: ../src/picture.c:845
-msgid "Other file icon"
-msgstr "Diğer dosya simgesi"
+#: ../src/tags/id3_tag.c:611 ../src/tags/id3_tag.c:692
+#, fuzzy, c-format
+#| msgid "Error while removing ID3v2 tag of '%s' (%s)"
+msgid "Error while removing ID3v2 tag of ‘%s’: %s"
+msgstr "'%s' dosyasının ID3v2 etiketi silinemiyor (%s)"
 
-#: ../src/picture.c:847
-msgid "Cover (front)"
-msgstr "Kapak (ön)"
+#: ../src/tags/id3_tag.c:637
+#, fuzzy, c-format
+#| msgid "Error while updating ID3v2 tag of '%s' (%s)"
+msgid "Error while updating ID3v2 tag of ‘%s’: %s"
+msgstr "'%s' dosyasının ID3v2 etiketi güncellenemiyor (%s)"
 
-#: ../src/picture.c:849
-msgid "Cover (back)"
-msgstr "Kapak (arka)"
+#: ../src/tags/id3_tag.c:667
+msgid ""
+"You have tried to save this tag to Unicode but it was detected that your "
+"version of id3lib is buggy"
+msgstr ""
+"Etiketi Unicode olarak yazmayı denediniz ama id3lib'in hatalı olduğu tespit "
+"edildi."
 
-#: ../src/picture.c:851
-msgid "Leaflet page"
-msgstr "Kitapçık sayfası"
+#: ../src/tags/id3_tag.c:669
+#, 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 is available in "
+"the EasyTAG package sources.\n"
+"Note that this message will appear only once.\n"
+"\n"
+"File: %s"
+msgstr ""
+"Bu dosyayı tekrar yüklerseniz etiketteki bazı karakterler  doğru "
+"görünmeyebilir. Lütfen EasyTAG kaynak dosyalarında bulunan src/id3lib/"
+"patch_id3lib_3.8.3_UTF16_writing_bug.diff yamasını id3lib'e uygulayın.\n"
+"Bu mesaj sadece bir kere görüntülenir.\n"
+"\n"
+"Dosya: %s"
 
-#: ../src/picture.c:853
-msgid "Media (e.g. label side of CD)"
-msgstr "Ortam (örn. CD'nin üzeri)"
+#: ../src/tags/id3_tag.c:676
+msgid "Buggy id3lib"
+msgstr "Hatalı id3lib"
 
-#: ../src/picture.c:855
-msgid "Lead artist/lead performer/soloist"
-msgstr "lider sanatçı/solist"
+#: ../src/tags/id3_tag.c:717
+#, fuzzy, c-format
+#| msgid "Error while updating ID3v1 tag of '%s' (%s)"
+msgid "Error while updating ID3v1 tag of ‘%s’: %s"
+msgstr "'%s' dosyasının ID3v1 etiketi güncellenemiyor (%s)"
 
-#: ../src/picture.c:857
-msgid "Artist/performer"
-msgstr "Sanatçı"
+#: ../src/tags/id3_tag.c:751
+msgid "No error reported"
+msgstr "Hata iletisi yok"
 
-#: ../src/picture.c:859
-msgid "Conductor"
-msgstr "Yapımcı"
+#: ../src/tags/id3_tag.c:753
+msgid "No available memory"
+msgstr "Erişilebilir hafıza yok"
 
-#: ../src/picture.c:861
-msgid "Band/Orchestra"
-msgstr "Orkestra"
+#: ../src/tags/id3_tag.c:755
+msgid "No data to parse"
+msgstr "Ayrıştırılacak veri yok"
 
-#: ../src/picture.c:865
-msgid "Lyricist/text writer"
-msgstr "Şarkı sözleri"
+#: ../src/tags/id3_tag.c:757
+msgid "Improperly formatted data"
+msgstr "Yanlış biçimlendirilmiş veri"
 
-#: ../src/picture.c:867
-msgid "Recording location"
-msgstr "Kayıt yeri"
+#: ../src/tags/id3_tag.c:759
+msgid "No buffer to write to"
+msgstr "Yazmak için tampon yok"
 
-#: ../src/picture.c:869
-msgid "During recording"
-msgstr "Kayıt sırasında"
+#: ../src/tags/id3_tag.c:761
+msgid "Buffer is too small"
+msgstr "Tampon çok küçük"
 
-#: ../src/picture.c:871
-msgid "During performance"
-msgstr "Performans sırasında"
+#: ../src/tags/id3_tag.c:763
+msgid "Invalid frame ID"
+msgstr "Geçersiz katman ID"
 
-#: ../src/picture.c:873
-msgid "Movie/video screen capture"
-msgstr "Ekran kaydı videosu"
+#: ../src/tags/id3_tag.c:765
+msgid "Requested field not found"
+msgstr "İstenen alan bulunamadı"
 
-#: ../src/picture.c:875
-msgid "A bright colored fish"
-msgstr "Parlak renkli balık"
+#: ../src/tags/id3_tag.c:767
+msgid "Unknown field type"
+msgstr "Bilinmeyen alan tipi"
 
-#: ../src/picture.c:877
-msgid "Illustration"
-msgstr "İlizyon"
+#: ../src/tags/id3_tag.c:769
+msgid "Tag is already attached to a file"
+msgstr "Etiket zaten bir dosyaya eklendi"
 
-#: ../src/picture.c:879
-msgid "Band/Artist logotype"
-msgstr "Sanatçı logosu"
+#: ../src/tags/id3_tag.c:771
+msgid "Invalid tag version"
+msgstr "Geçersiz etiket sürümü"
 
-#: ../src/picture.c:881
-msgid "Publisher/studio logotype"
-msgstr "Stüdyo logosu"
+#: ../src/tags/id3_tag.c:773
+msgid "No file to parse"
+msgstr "Ayrıştırılacak dosya yok"
 
-#: ../src/picture.c:885
-msgid "Unknown image type"
-msgstr "Bilinmeyen görüntü biçimi"
+#: ../src/tags/id3_tag.c:775
+msgid "Attempting to write to a read-only file"
+msgstr "Salt okunur dosyaya yazmaya çalışıyor"
 
-#: ../src/picture.c:915 ../src/picture.c:926
-msgid "pixels"
-msgstr "piksel"
+#: ../src/tags/id3_tag.c:777
+msgid "Error in compression/uncompression"
+msgstr "Sıkıştırmada/açmada hata"
 
-#: ../src/picture.c:916 ../src/picture.c:927
-msgid "Type"
-msgstr "Biçim"
+#: ../src/tags/id3_tag.c:779
+msgid "Unknown error message"
+msgstr "Bilinmeyen hata iletisi"
 
-#: ../src/picture.c:928
-msgid "Description"
-msgstr "Açıklama"
+#: ../src/tags/id3_tag.c:1456
+msgid "Error while creating temporary file"
+msgstr "Geçici dosya oluşturulamadı"
+
+#: ../src/tags/id3v24_tag.c:137 ../src/tags/id3v24_tag.c:192
+#: ../src/tags/id3v24_tag.c:230 ../src/tags/id3v24_tag.c:241
+#: ../src/tags/id3v24_tag.c:941 ../src/tags/id3v24_tag.c:948
+#: ../src/tags/id3v24_tag.c:974 ../src/tags/id3v24_tag.c:1014
+#: ../src/tags/mp4_tag.cc:95
+#, fuzzy
+#| msgid "Error reading tags from file: '%s'"
+msgid "Error reading tags from file"
+msgstr "'%s' dosyasından etiketler okunamadı"
 
-#: ../src/picture.c:984
+#. 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/tags/id3v24_tag.c:1678
 #, c-format
-msgid "Error with 'loader_close': %s"
-msgstr "'loader_close' ile hata: %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] "'%s' dosyasına etiket yazılamıyor (%s bayt eksik)"
 
-#: ../src/picture.c:1044
-msgid ""
-"Cannot display the image because not enough data has been read to determine "
-"how to create the image buffer."
-msgstr ""
-"Görüntü gösterilemiyor çünkü görüntü arabelleği belirlemek için yeterli veri "
-"yok"
+#: ../src/tags/id3v24_tag.c:1701
+#, fuzzy, c-format
+#| msgid "Cannot save tag of file '%s'"
+msgid "Cannot save tag of file ‘%s’"
+msgstr "'%s' dosyasının etiketi kaydedilemiyor"
 
-#: ../src/picture.c:1051
-msgid "Cannot display the image"
-msgstr "Görüntü gösterilemiyor"
+#: ../src/tags/id3v24_tag.c:1713
+#, fuzzy, c-format
+#| msgid "Size error while saving tag of '%s'"
+msgid "Size error while saving tag of ‘%s’"
+msgstr "'%s' etiketi yazılırken boyut hatası oluştu"
 
-#: ../src/picture.c:1053
-msgid ""
-"Not enough data has been read to determine how to create the image buffer."
-msgstr "Görüntü arabelleği belirlemek için yeterli veri yok"
+#: ../src/tags/monkeyaudio_header.c:47
+#, fuzzy
+#| msgid "Monkey's Audio File"
+msgid "Error opening Monkey’s Audio file"
+msgstr "Monkey's Audio Dosyası"
 
-#: ../src/picture.c:1055
-msgid "Load Image File"
-msgstr "Görüntü Dosyası Yükle"
+#. Mode changed to profile name
+#: ../src/tags/monkeyaudio_header.c:79 ../src/tags/musepack_header.c:82
+msgid "Profile:"
+msgstr "Profil:"
 
-#: ../src/picture.c:1061
-#, c-format
-msgid "Error with 'loader_write': %s"
-msgstr "'loader_write' ile hata: %s"
+#: ../src/tags/mp4_header.cc:68 ../src/tags/mp4_tag.cc:86
+#: ../src/tags/mp4_tag.cc:282
+msgid "MP4 format invalid"
+msgstr "Geçersiz MP4 biçimi"
 
-#. Label
-#: ../src/prefs.c:152
-msgid "Default directory:"
-msgstr "Öntanımlı dizin:"
+#: ../src/tags/mp4_header.cc:77
+#, fuzzy
+#| msgid "Error reading properties from file: '%s'"
+msgid "Error reading properties from file"
+msgstr "'%s' dosyasından özellikler okunamadı"
 
-#: ../src/prefs.c:165
-msgid ""
-"Specify the directory where your files are located. This path will be loaded "
-"when EasyTAG starts without parameter."
-msgstr ""
-"Dosyalarınızın bulunduğu dizini belirtir. Bu dizin EasyTAG parametresiz "
-"çalıştırıldığında otomatik yüklenir."
+#: ../src/tags/mp4_header.cc:131
+msgid "MP4/AAC File"
+msgstr "MP4/AAC Dosyası"
 
-#. Load directory on startup
-#: ../src/prefs.c:186
-msgid ""
-"Load on startup the default directory or the directory passed as argument"
-msgstr "Bu dizini veya parametre olarak girilmiş dizini açılışta yükle"
+#: ../src/tags/mp4_header.cc:140 ../src/tags/mpeg_header.c:236
+#, c-format
+msgid "~%d kb/s"
+msgstr "~%d kb/s"
 
-#: ../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 ""
-"EasyTAG başlatıldığında öntanımlı dizindeki dosyaları otomatik arar. Bu "
-"durum programı parametre girerek çalıştırdığınızda geçersiz olabilir "
-"(easytag /mp3_dosyaların/konumu)."
+#: ../src/tags/mp4_tag.cc:258 ../src/tags/mp4_tag.cc:275
+#: ../src/tags/mp4_tag.cc:281
+#, fuzzy, c-format
+#| msgid "Error while opening file: '%s' (%s)"
+msgid "Error while opening file ‘%s’: %s"
+msgstr "Dosya açılırken hata oluştu: '%s' (%s)"
 
-#. Browse subdirectories
-#: ../src/prefs.c:194
-msgid "Search subdirectories"
-msgstr "Alt dizinleride ara"
+#: ../src/tags/mp4_tag.cc:293
+#, fuzzy, c-format
+#| msgid "Error reading tags from file: '%s'"
+msgid "Error reading tags from file ‘%s’"
+msgstr "'%s' dosyasından etiketler okunamadı"
 
-#: ../src/prefs.c:197
-msgid "Search subdirectories for files when reading a directory into the tree."
-msgstr "Dizini okurken alt dizinleri de arar."
+#: ../src/tags/mpeg_header.c:51
+msgid "Stereo"
+msgstr "Stereo"
 
-#. Open the node to show subdirectories
-#: ../src/prefs.c:201
-msgid "Show subdirectories when selecting a directory"
-msgstr "Dizin seçildiğinde alt dizinleri göster"
+#: ../src/tags/mpeg_header.c:52
+msgid "Joint stereo"
+msgstr "Ortak stereo"
 
-#: ../src/prefs.c:205
-msgid ""
-"This expands the selected node into the file browser to display the sub-"
-"directories."
-msgstr ""
-"Bu seçenek dizin seçildiğinde ağacın açılıp içindeki dizinleri görünür kılar."
+#: ../src/tags/mpeg_header.c:53
+msgid "Dual channel"
+msgstr "Çift kanal"
 
-#. Browse hidden directories
-#: ../src/prefs.c:209
-msgid "Search hidden directories"
-msgstr "Gizli dizinleri ara"
+#: ../src/tags/mpeg_header.c:54
+msgid "Single channel"
+msgstr "Tek kanal"
 
-#: ../src/prefs.c:214
-msgid "Search hidden directories for files (directories starting by a '.')."
-msgstr "Dosyalar için gizli dizinleri de arar (dizin adı '.' ile başlayanlar)"
+#: ../src/tags/mpeg_header.c:206
+msgid "MP3 File"
+msgstr "MP3 Dosyası"
 
-#.
-#. * Misc
-#.
-#: ../src/prefs.c:222
-msgid "Misc"
-msgstr "Çeşitli"
+#: ../src/tags/mpeg_header.c:209
+msgid "MP2 File"
+msgstr "MP2 Dosyası"
 
-#. User interface
-#: ../src/prefs.c:228
-msgid "User Interface"
-msgstr "Kullanıcı Arabirimi"
+#. MPEG, Layer versions
+#: ../src/tags/mpeg_header.c:216
+msgid "MPEG"
+msgstr "MPEG"
 
-#. Show header infos
-#: ../src/prefs.c:235
-msgid "Show header information of file"
-msgstr "Dosyanın bilgilerini göster"
+#: ../src/tags/musepack_header.c:47
+#| msgid "Error while creating temporary file"
+msgid "Error opening Musepack file"
+msgstr "Musepack dosyası açılırken hata oluştu"
 
-#: ../src/prefs.c:238
+#: ../src/tags/musepack_header.c:79
+msgid "MusePack File"
+msgstr "MusePack Dosyası"
+
+#: ../src/tags/ogg_header.c:244
+#, fuzzy
+#| msgid ""
+#| "Ogg Vorbis: The specified bitstream does not exist or the file has been "
+#| "initialized improperly (file: '%s')."
 msgid ""
-"If activated, information about the file as the bitrate, the time, the size, "
-"will be displayed under the filename entry."
+"The specified bitstream does not exist or the file has been initialized "
+"improperly"
 msgstr ""
-"Eğer işaretlenirse dosyanın bit oranı, süresi, boyutu vb değerler dosya "
-"isminin altında görünür."
-
-#: ../src/prefs.c:244
-msgid "Display changed files in list using:"
-msgstr "Listedeki değişmiş dosyaların görünümü:"
-
-#: ../src/prefs.c:247
-msgid "Red color"
-msgstr "Kırmızı renkli"
+"Ogg Vorbis: Belirtilen veri akışı yok veya dosya yanlış başlatıldı. (dosya: "
+"'%s')."
 
-#: ../src/prefs.c:253
-msgid "Bold style"
-msgstr "Kalın yazılı"
+#: ../src/tags/ogg_header.c:263
+#, fuzzy
+#| msgid "Ogg Vorbis: Read from media returned an error (file: '%s')."
+msgid "Read from media returned an error"
+msgstr "Ogg Vorbis: Ortamdan okunamadı (dosya: '%s')."
 
-#. Sorting List Options
-#: ../src/prefs.c:259
-msgid "Sorting List Options"
-msgstr "Liste Sıralama Seçenekleri"
+#: ../src/tags/ogg_header.c:266
+#, fuzzy
+#| msgid "Ogg Vorbis: Bitstream is not Vorbis data (file: '%s')."
+msgid "Bitstream is not Vorbis data"
+msgstr "Ogg Vorbis: Veri akışı Vorbis verisi değil (file: '%s')."
 
-#. Sorting method
-#: ../src/prefs.c:268
-msgid "Sort the file list by:"
-msgstr "Sıralama biçimi:"
+#: ../src/tags/ogg_header.c:269
+#, fuzzy
+#| msgid "Ogg Vorbis: Vorbis version mismatch (file: '%s')."
+msgid "Vorbis version mismatch"
+msgstr "Ogg Vorbis: Vorbis sürümü eşleşmiyor (file: '%s')."
 
-#: ../src/prefs.c:278
-msgid "Ascending filename"
-msgstr "Dosya adına göre artan"
+#: ../src/tags/ogg_header.c:272
+#, fuzzy
+#| msgid "Ogg Vorbis: Invalid Vorbis bitstream header (file: '%s')."
+msgid "Invalid Vorbis bitstream header"
+msgstr "Ogg Vorbis: Geçersiz Vorbis veri akışı başlığı (dosya: '%s')."
 
-#: ../src/prefs.c:280
-msgid "Descending filename"
-msgstr "Dosya adına göre azalan"
+#: ../src/tags/ogg_header.c:275
+#, fuzzy
+#| msgid ""
+#| "Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack "
+#| "corruption (file: '%s')."
+msgid "Internal logic fault, indicates a bug or heap/stack corruption"
+msgstr ""
+"Ogg Vorbis: İçsel Mantık hatası, hata veya yığın bozulmasını gösterir "
+"(dosya: '%s')."
 
-#: ../src/prefs.c:281
-msgid "Ascending title"
-msgstr "Başlığa göre artan"
+#: ../src/tags/ogg_header.c:326
+#, fuzzy, c-format
+#| msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
+msgid "Failed to open file as Vorbis: %s"
+msgstr "Hata: '%s' dosyası Vorbis olarak açılamadı (%s)."
 
-#: ../src/prefs.c:282
-msgid "Descending title"
-msgstr "Başlığa göre azalan"
+#: ../src/tags/ogg_header.c:389
+msgid "Ogg Vorbis File"
+msgstr "Ogg Vorbis Dosyası"
 
-#: ../src/prefs.c:283
-msgid "Ascending artist"
-msgstr "Sanatçıya göre artan"
+#: ../src/tags/ogg_header.c:392
+msgid "Speex File"
+msgstr "Speex Dosyası"
 
-#: ../src/prefs.c:284
-msgid "Descending artist"
-msgstr "Sanatçıya göre azalan"
+#: ../src/tags/opus_header.c:222
+#| msgid "MusePack File"
+msgid "Opus File"
+msgstr "Opus Dosyası"
 
-#: ../src/prefs.c:286
-msgid "Ascending album artist"
-msgstr "Albüm sanatçısına göre artan"
+#: ../src/tags/wavpack_header.c:83
+msgid "Wavpack File"
+msgstr "Wavpack Dosyası"
 
-#: ../src/prefs.c:288
-msgid "Descending album artist"
-msgstr "Albüm sanatçısına göre azalan"
+#~ 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 ""
+#~ "Bu program özgür bir yazılımdır, onu Özgür Yazılım Vakfı'nın yayınladığı "
+#~ "GNU Genel Kamu Lisansı'nın 2. sürümü veya (tercihinize bağlı) daha "
+#~ "sonraki sürümleri altında dağıtabilir ve/veya değiştirebilirsiniz.\n"
+#~ "\n"
+#~ "Bu program kullanışlı olması amacıyla dağıtılmıştır, ancak HİÇBİR "
+#~ "GARANTİSİ YOKTUR; hatta SATILABİLİRLİK ya da BİR AMACA HİZMET gibi "
+#~ "garantisi de yoktur. Daha fazla ayrıntı için GNU Genel Kamu Lisansı'na "
+#~ "bakın.\n"
+#~ "\n"
+#~ "Bu yazılımla birlikte GNU Genel Kamu Lisansının bir kopyasına sahip "
+#~ "olmalısınız. Eğer yoksa, <http://www.gnu.org/licenses/> adresine "
+#~ "bakabilirsiniz."
 
-#: ../src/prefs.c:289
-msgid "Ascending album"
-msgstr "Albüme böre artan"
+#~ msgid "Error while opening file: '%s' (%s)."
+#~ msgstr "Dosya açılamadı: '%s' (%s)."
 
-#: ../src/prefs.c:290
-msgid "Descending album"
-msgstr "Albüme göre azalan"
+#~ msgid "Run a command on the selected files"
+#~ msgstr "Seçilen dosyalar için komut çalıştır"
 
-#: ../src/prefs.c:291
-msgid "Ascending year"
-msgstr "Yıla göre artan"
+#~ msgid "Clear the current selection"
+#~ msgstr "Geçerli seçimi temizle"
 
-#: ../src/prefs.c:292
-msgid "Descending year"
-msgstr "Yıla göre azalan"
+#~ msgid "Delete files"
+#~ msgstr "Dosyaları sil"
 
-#: ../src/prefs.c:294
-msgid "Ascending disc number"
-msgstr "Disk numarasına göre artan"
+#~ msgid "S_can Files"
+#~ msgstr "Dosyaları _Tara"
 
-#: ../src/prefs.c:296
-msgid "Descending disc number"
-msgstr "Disk numarasına göre azalan"
+#~ msgid "_Undo Last Files Changes"
+#~ msgstr "Son Dosya Değişikliğini _Geri Al"
 
-#: ../src/prefs.c:298
-msgid "Ascending track number"
-msgstr "Parça numarasına göre artan"
+#~ msgid "Undo last files changes"
+#~ msgstr "Son dosya değişikliklerini geri al"
 
-#: ../src/prefs.c:300
-msgid "Descending track number"
-msgstr "Parça numarasına göre azalan"
+#~ msgid "R_edo Last Files Changes"
+#~ msgstr "Son Dosya Değişikliğini Yin_ele"
 
-#: ../src/prefs.c:301
-msgid "Ascending genre"
-msgstr "Türe göre artan"
+#~ msgid "Redo last files changes"
+#~ msgstr "Son dosya değişikliklerini yinele"
 
-#: ../src/prefs.c:302
-msgid "Descending genre"
-msgstr "Türe göre azalan"
+#~ msgid "Force saving files"
+#~ msgstr "Dosyaları kaydetmeye zorla"
 
-#: ../src/prefs.c:303
-msgid "Ascending comment"
-msgstr "Yoruma göre artan"
+#~ msgid "Undo Last Changes"
+#~ msgstr "Son Değişiklikleri Geri Al"
 
-#: ../src/prefs.c:304
-msgid "Descending comment"
-msgstr "Yoruma göre azalan"
+#~ msgid "Undo last changes"
+#~ msgstr "Son değişiklikleri geri al"
 
-#: ../src/prefs.c:306
-msgid "Ascending composer"
-msgstr "Besteciye göre artan"
+#~ msgid "Redo Last Changes"
+#~ msgstr "Son Değişiklikleri Yinele"
 
-#: ../src/prefs.c:308
-msgid "Descending composer"
-msgstr "Besteciye göre azalan"
+#~ msgid "Redo last changes"
+#~ msgstr "Son değişiklikleri yinele"
 
-#: ../src/prefs.c:310
-msgid "Ascending original artist"
-msgstr "Asıl sanatçıya göre artan"
+#~ msgid "Go to home directory"
+#~ msgstr "Ev dizinine git"
 
-#: ../src/prefs.c:312
-msgid "Descending original artist"
-msgstr "Asıl sanatçıya göre azalan"
+#~ msgid "Go to desktop directory"
+#~ msgstr "Masaüstü dizinine git"
 
-#: ../src/prefs.c:314
-msgid "Ascending copyright"
-msgstr "Telif hakkında göre artan"
+#~ msgid "Go to documents directory"
+#~ msgstr "Belgeler dizinine git"
 
-#: ../src/prefs.c:316
-msgid "Descending copyright"
-msgstr "Telif hakkına göre azalan"
+#~ msgid "Go to downloads directory"
+#~ msgstr "İndirilenler dizinine git"
 
-#: ../src/prefs.c:318
-msgid "Ascending URL"
-msgstr "Bağlantıya göre artan"
+#~ msgid "Go to music directory"
+#~ msgstr "Müzik dizinine git"
 
-#: ../src/prefs.c:320
-msgid "Descending URL"
-msgstr "Bağlantıya göre azalan"
+#~ msgid "Go to parent directory"
+#~ msgstr "Üst dizine git"
 
-#: ../src/prefs.c:322
-msgid "Ascending encoded by"
-msgstr "Kodlayıcıya göre artan"
+#~ msgid "Go to default directory"
+#~ msgstr "Öntanımlı dizine git"
 
-#: ../src/prefs.c:324
-msgid "Descending encoded by"
-msgstr "Kodlayıcıya göre azalan"
+#~ msgid "Set current path as default"
+#~ msgstr "Bulunulan dizini öntanımlı olarak ayarla"
 
-#: ../src/prefs.c:326
-msgid "Ascending creation date"
-msgstr "Oluşturma tarihine göre artan"
+#~ msgid "Rename directory"
+#~ msgstr "Dizini yeniden adlandır"
 
-#: ../src/prefs.c:328
-msgid "Descending creation date"
-msgstr "Oluşturma tarihine göre azalan"
+#~ msgid "Reload directory"
+#~ msgstr "Dizini tekrar yükle"
 
-#: ../src/prefs.c:332
-msgid "Select the type of file sorting when loading a directory."
-msgstr "Dizini yüklerken dosya sıralaması biçimini seçin."
+#~ msgid "Run a command on the directory"
+#~ msgstr "Dizin için komut çalıştır"
 
-#: ../src/prefs.c:344
-msgid "If activated, the sorting of the list will be dependent on the case."
-msgstr "Eğer işaretliyse büyük küçük harfe duyarlı olarak sıralanır."
+#~ msgid "Reload directory tree"
+#~ msgstr "Dizin a_ğacını yeniden yükle"
 
-#. File Player
-#: ../src/prefs.c:348
-msgid "File Audio Player"
-msgstr "Dosya Müzik Oynatıcı"
+#~ msgid "CDDB search"
+#~ msgstr "CDDB ara"
 
-#: ../src/prefs.c:360
-msgid "Player to run:"
-msgstr "Çalıştırmak için oynatıcı"
+#~ msgid "Load filenames from a text file"
+#~ msgstr "Dosya adlarını metin dosyasından yükle"
 
-#: ../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 ""
-"Dosyaları oynatmak için program girin. Dosya adından önce parametre vermek "
-"gerekiyor olabilir ('xmmp -p' gibi)."
+#~ msgid "Run audio player"
+#~ msgstr "Müzik çaları çalıştır"
 
-#. Log options
-#: ../src/prefs.c:384
-msgid "Log Options"
-msgstr "Günlük Seçenekleri"
+#~ msgid "About"
+#~ msgstr "Hakkında"
 
-#. Show / hide log view
-#: ../src/prefs.c:391
-msgid "Show log view in main window"
-msgstr "Günlük görünümünü ana pencerede göster"
+#~ msgid "_File Operations"
+#~ msgstr "_Dosya işlemleri"
 
-#: ../src/prefs.c:394
-msgid "If activated, the log view would be visible in the main window."
-msgstr "Eğer işaretlenirse ana pencerede günlük görünümü görünür olur."
+#~ msgid "S_canner"
+#~ msgstr "_Tarayıcı"
 
-#: ../src/prefs.c:400
-msgid "Max number of lines:"
-msgstr "En fazla satır sayısı:"
+#~ msgid "CDDB search files…"
+#~ msgstr "Dosyaları CDDB'de ara…"
 
-#. 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);
-#.
-#.
-#. * File Settings
-#.
-#: ../src/prefs.c:418
-msgid "File Settings"
-msgstr "Dosya Ayarları"
+#~ msgid "Tree Browser"
+#~ msgstr "Ağaç Gezgini"
 
-#. File (name) Options
-#: ../src/prefs.c:424
-msgid "File Options"
-msgstr "Dosya Seçenekleri"
+#~ msgid "View by directory tree"
+#~ msgstr "Dizin ağacına göre göster"
 
-#: ../src/prefs.c:430
-msgid "Replace illegal characters in filename (for Windows and CD-Rom)"
-msgstr "Dosya adında geçersiz karakterler değiştirin (Windows ve CD-Rom için)"
+#~ msgid "_Fill Tags…"
+#~ msgstr "Etiketleri _Doldur…"
 
-#: ../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 ""
-"FAT32/16 ve ISO9660 + Joliet dosya sistemi için geçersiz karakterler "
-"değiştirin ('\\', ':', ';', '*', '?', '\"', '<', '>', '|') karakterleri "
-"dosya adlandırırken problem oluştururlar. Bu etiketlerden dosya "
-"isimlediriken kullanışlıdır."
-
-#. Extension case (lower/upper?)
-#: ../src/prefs.c:441
-msgid "Convert filename extension to:"
-msgstr "Dosya uzantısını dönüşütür:"
+#~ msgid "Fill tags"
+#~ msgstr "Etiketleri doldur"
 
-#: ../src/prefs.c:444
-msgid "Lower Case"
-msgstr "Küçük Harf"
+#~ msgid "Rename files and directories"
+#~ msgstr "Dosya ve dizinleri yeniden adlandır"
 
-#: ../src/prefs.c:447
-msgid "For example, the extension will be converted to '.mp3'"
-msgstr "Örneğin uzantı '.mp3'e dönüştürülür"
+#~ msgid "_Process Fields…"
+#~ msgstr "_Alanları İşle…"
 
-#: ../src/prefs.c:450
-msgid "Upper Case"
-msgstr "Büyük Harf"
+#~ msgid "Could not merge UI, error was: %s\n"
+#~ msgstr "UI birleştirilemedi, hata: %s\n"
 
-#: ../src/prefs.c:453
-msgid "For example, the extension will be converted to '.MP3'"
-msgstr "Örneğin uzantı '.MP3'e dönüştürülür"
+#~ msgid "Error: Searching for %s, could not find node %s in tree."
+#~ msgstr "Hata: %s aranıyor, ağaçta %s dalı bulunamadı."
 
-#: ../src/prefs.c:456
-msgid "No Change"
-msgstr "Değiştirme"
+#~ msgid "Tree"
+#~ msgstr "Ağaç"
 
-#: ../src/prefs.c:459
-msgid "The extension will not be converted"
-msgstr "Uzantı değiştirilmez"
+#~ msgid "Select a directory to browse."
+#~ msgstr "Gezinmek için dizin seçin."
 
-#. Preserve modification time
-#: ../src/prefs.c:462
-msgid "Preserve modification time of the file"
-msgstr "Dosyanın değiştirilme zamanını koru"
+#~ msgid "Artist & Album"
+#~ msgstr "Sanatçı & Albüm"
 
-#: ../src/prefs.c:465
-msgid ""
-"Preserve the modification time (in file properties) when saving the file."
-msgstr ""
-"Dosya kaydedilirken değiştirilme zamanını koru (dosya özellikleri içinde)"
+#~ msgid "If activated, it will use masks to rename directory."
+#~ msgstr "Eğer etkinse dizini yeniden adlandırırken maskeyi kullanır."
 
-#. Change directory modification time
-#: ../src/prefs.c:469
-msgid ""
-"Update modification time of the parent directory of the file (recommended "
-"when using Amarok)"
-msgstr ""
-"Dosyanın üst dizininin değiştirilme tarihini güncelle (Amarok kullanırken "
-"gerekli)"
+#~ msgid "Program to run:"
+#~ msgstr "Çalıştırmak için program:"
 
-#: ../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 "
-"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."
-msgstr ""
-"Dosyanın üst dizininin değiştirme tarihi etiketler dosyaya yazılırken "
-"güncellenir. Aynı zamanda dosyanın ismi değiştirildiğinde otomatik olarak "
-"yapılır.\n"
-"Amarok benzeri uygulamalar kullanıyorsanız ilginizi çekebilir. Bu tip "
-"uygulamalar performans nedeniyle dosya bilgileri güncellenirken üst dizinin "
-"değiştirilme tarihine bakar."
-
-#. Character Set for Filename
-#: ../src/prefs.c:481
-msgid "Character Set for Filename"
-msgstr "Dosya Adı İçin Karakter Seti"
-
-#. Rules for character set
-#: ../src/prefs.c:493
-msgid ""
-"Rules to apply if some characters can't be converted to the system character "
-"encoding when writing filename:"
-msgstr ""
-"Bazı nedenlerden dolayı dosya adı yazılırken sistem karakterlerine "
-"dönüştürülemezse yapılacak işlem:"
+#~ msgid "The program '%s' cannot be found"
+#~ msgstr "'%s' programı bulunamadı"
 
-#: ../src/prefs.c:499
-msgid "Try another character encoding"
-msgstr "Başka bir karakter kodlaması kullan"
+#~ msgid "Cannot execute %s (error %d)\n"
+#~ msgstr "%s çalıştırılamıyor (hata %d)\n"
 
-#: ../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 ""
-"Bu seçenekle sizin yerel dilinize göre kodlamayı deneyecek (örneğin: 'tr' "
-"için ISO-8859-9, 'ru' için KOI8-R gibi). Eğer başarısız olursa ISO-8859-1 "
-"karakter kodlamasını deneyecek."
+#~ msgid "Cannot fork another process\n"
+#~ msgstr "Başka bir süreç çalıştırılamıyor\n"
 
-#: ../src/prefs.c:510
-msgid ""
-"Force using the system character encoding and activate the transliteration"
-msgstr "Sistem karakter kodlamasına zorla ve başka dil kullanmayı etkinleştir"
+#~ msgid "Request CDDB"
+#~ msgstr "CDDB isteği"
 
-#: ../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 ""
-"Bu seçenek ile yazılamayan karakterler karaktere en çok benzeyen bir-iki "
-"karaktere dünüştürülür."
+#~ msgid "Use local CDDB"
+#~ msgstr "Yerel CDDB kullan"
 
-#: ../src/prefs.c:520
-msgid ""
-"Force using the system character encoding and silently discard some "
-"characters"
-msgstr "Sistem karakter kodlamasına zorla ve bazı karakterleri esgeç"
+#~ msgid ""
+#~ "When activating this option, after loading the fields, the current "
+#~ "selected scanner will be ran (the scanner window must be opened)."
+#~ msgstr ""
+#~ "Bu seçeneği etkinleştirirken alanlar yüklendikten sonra şuan seçilen "
+#~ "tarayıcı çalıştırılır (Tarayıcı penceresi açık olmalıdır.)."
 
-#: ../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 "Bu seçenek ile dönüştürülemeyen karakterler yazılmadan geçilir."
+#~ msgid "Words:"
+#~ msgstr "Kelimeler:"
 
-#.
-#. * Tag Settings
-#.
-#: ../src/prefs.c:533
-msgid "Tag Settings"
-msgstr "Etiket Ayarları"
+#~ msgid "Search In:"
+#~ msgstr "İçinde Ara:"
 
-#. Tag Options
-#: ../src/prefs.c:539
-msgid "Tag Options"
-msgstr "Etiket Seçenekleri"
+#~ msgid "All Fields"
+#~ msgstr "Tüm Alanlar"
 
-#: ../src/prefs.c:545
-msgid "Auto completion of date if not complete"
-msgstr "Tarih eksikse otomatik tamamla"
+#~ msgid "All Categories"
+#~ msgstr "Tüm Kategoriler"
 
-#: ../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 ""
-"Tarihin sadece son karakterleri mevcutsa yıl alanın otomatik tamamlamayı "
-"dener (örnek olay, 2005 yılındaysak: 5 => 2005, 4 => 2005, 6 => 1996, 95 => "
-"1995…)."
+#~ msgid "included: funk, soul, rap, pop, industrial, metal, etc."
+#~ msgstr "funk, soul, rap, pop, industrial, metal, vs dahil"
 
-#: ../src/prefs.c:556
-msgid "Write the track field with the following number of digits:"
-msgstr "Parça numarası için kullanılacak basamak sayısı:"
+#~ msgid "movies, shows"
+#~ msgstr "videolar, gösteriler"
 
-#: ../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 ""
-"Eğer işaretlenirse parça numarası belirlenen basamağa tamamlanan kadar "
-"başına '0' eklenir. (örnek, 2 basamak: '05', '09', '10'…). İşaretlenmemişse "
-"geçerli parça numarası korunur"
+#~ msgid "others that do not fit in the above categories"
+#~ msgstr "yukarıdaki kategorilere uymayan diğerleri"
 
-#: ../src/prefs.c:578
-msgid "Write the disc field with the following number of digits:"
-msgstr "Disk kısımını şu kadar rakam kullanarak yaz:"
+#~ msgid "Enter the words to search in the list below"
+#~ msgstr "Liste boyunca aramak için kelime girin"
 
-#: ../src/prefs.c:583
-msgid "Whether to pad the disc field with leading zeroes"
-msgstr "Disk kısımının başını hizalamak için sıfır eklenip eklenmeyeceği"
+#~ msgid "Search Next"
+#~ msgstr "Sonrakini Ara"
 
-#: ../src/prefs.c:613
-msgid ""
-"Tag field focus when switching files in list with shortcuts Page Up/Page "
-"Down:"
-msgstr ""
-"Page Up/Down tuşlarıyla listedeki dosyalara arasında geçildiğinde etiket "
-"alanı odağı:"
+#~ msgid "Search Previous"
+#~ msgstr "Öncekini Ara"
 
-#: ../src/prefs.c:619
-msgid "Keep focus to the same tag field"
-msgstr "Odağı aynı etikette tut"
+#~ msgid "Show only red lines (or show all lines) in the 'Artist / Album' list"
+#~ msgstr ""
+#~ "Sanatçı / Albüm listesinde sadece kırmızı satırları (veya tüm satırları) "
+#~ "göster"
 
-#: ../src/prefs.c:625
-msgid "Return focus to the first tag field (i.e. 'Title' field)"
-msgstr "Odağı ilk etiket alanına al (örn. 'Başlık' alanı)"
+#~ msgid "Set Into:"
+#~ msgstr "Uygulanacak Alanlar:"
 
-#. 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 "Etiket bölme"
+#~ msgid "All"
+#~ msgstr "Tümü"
 
-#: ../src/prefs.c:639
-msgid ""
-"For Vorbis tags, selected fields will be split at dashes and saved as "
-"separate tags"
-msgstr ""
-"Vorbis etiketleri için seçilen alanlar tire ile bölünüp ayrı etiketler "
-"olarak kaydedilir."
+#~ msgid ""
+#~ "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 ""
+#~ "Bu seçeneği etkinleştirince CDDB başlığı dizindeki her dosya adı için "
+#~ "Levenshtein algoritması (DLM: Damerau-Levenshtein Metric) ile "
+#~ "eşleştirmeye çalışır ve en iyi eşleşeni seçer. Doğrudan konum sıralaması "
+#~ "kullanmak yerine uygun ses dosyasını seçmekte ve CDDB sonuçlarını "
+#~ "uygulamakta kullanılır."
 
-#: ../src/prefs.c:649
-msgid "Original artist"
-msgstr "Asıl sanatçı"
+#~ msgid "The path for 'Local CD Database' was not defined"
+#~ msgstr "'Yerel CD Veritabanı' konumu belirtilmemiş"
 
-#.
-#. * ID3 Tag Settings
-#.
-#: ../src/prefs.c:670
-msgid "ID3 Tag Settings"
-msgstr "ID3 Etiket Ayarları"
-
-#. Tag Rules frame
-#: ../src/prefs.c:679
-msgid "ID3 Tag Rules"
-msgstr "ID3 etiket rolleri"
-
-#. Strip tag when fields (managed by EasyTAG) are empty
-#: ../src/prefs.c:691
-msgid "Strip tags if all fields are set to blank"
-msgstr "Eğer tüm etiket alanları boşsa etiketi kaldır"
+#~ msgid "Enter it in the preferences window before using this search."
+#~ msgstr "Bu aramayı yapmadan önce tercihlerden bu bilgiyi girin."
 
-#: ../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 "
-"strip the whole tag when these seven standard data fields have been set to "
-"blank."
-msgstr ""
-"ID3v2 etiketleri Başlık, Artist, Albüm, Yıl, Parça, Tür ve Yorum'dan farklı "
-"verilerde içerebilir (eklenmiş görüntü ve şarkı sözü gibi), bu seçenek "
-"standart alanlar boşsa diğer verileri de silmenizi sağlayabilir."
+#~ msgid "Local CD search"
+#~ msgstr "Yerel CD arama"
 
-#. Convert old ID3v2 tag version
-#: ../src/prefs.c:700
-msgid "Automatically convert old ID3v2 tag versions"
-msgstr "Eski ID3v2 etiketleri otomatik dönüştür"
+#~ msgid "Using libid3tag version %s"
+#~ msgstr "libid3tag sürüm %s kullanılıyor"
 
-#: ../src/prefs.c:703
-msgid ""
-"If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to the "
-"ID3v2.3 version."
-msgstr ""
-"Eğer işaretlenirse eski ID3v2 etiketleri (ID3v2.2 gibi) yeni sürüme "
-"yükseltilir."
+#~ msgid "Using id3lib version %d.%d.%d"
+#~ msgstr "id3lib sürüm %d.%d.%d kullanılıyor"
 
-#. Use CRC32
-#: ../src/prefs.c:707
-msgid "Use CRC32"
-msgstr "CRC32 kullan"
+#~ msgid "Currently using locale '%s' (and eventually '%s')"
+#~ msgstr "Şuan kullanılan dil '%s' (ve neticede '%s')"
 
-#: ../src/prefs.c:710
-msgid "Set CRC32 in the ID3v2 tags"
-msgstr "ID3v2 etiketlerini CRC32 olarak ayarla"
+#~ msgid "Frequency:"
+#~ msgstr "Frekans:"
 
-#. Use Compression
-#: ../src/prefs.c:713
-msgid "Use Compression"
-msgstr "Sıkıştırma kullan"
+#~ msgid "Select Mode and Mask, and redo the same action"
+#~ msgstr "Türü ve maskeyi seçin, aynı işlemi tekrar uygulayın"
 
-#: ../src/prefs.c:717
-msgid "Set Compression in the ID3v2 tags"
-msgstr "ID3v2 etiketlerine sıkıltırma uygıla"
+#~ msgid "Files have been partially deleted"
+#~ msgstr "Dosyalar kısmen silindi"
 
-#. Write Genre in text
-#: ../src/prefs.c:720
-msgid "Write Genre in text only"
-msgstr "Türü sadece metin olarak yaz"
+#~ msgid "Tag(s) written"
+#~ msgstr "Etiket(ler) yazıldı"
 
-#: ../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 ""
-"Tür etiketi için ID3v1 numara referansı kullanma. Eğer müzik oynatıcınızda "
-"tür kısmında numara görüyorsanız etkinleştirin."
+#~ msgid "Cannot write tag in file '%s' (%s)"
+#~ msgstr "'%s' dosyasına etiket yazılamıyor (%s)"
 
-#. Character Set for writing ID3 tag
-#: ../src/prefs.c:727
-msgid "Character Set for writing ID3 tags"
-msgstr "ID3 Etiketleri için Karakter Seti"
+#~ msgid "Cannot read directory (%s)"
+#~ msgstr "Dizin okunamıyor (%s)"
 
-#. ID3v2 tags
-#: ../src/prefs.c:734
-msgid "ID3v2 tags"
-msgstr "ID3v2 etiketleri"
+#~ msgid "Convert ' ' to '_'"
+#~ msgstr "Boşlukları '_' karakterine çevir"
 
-#. Write ID3v2 tag
-#: ../src/prefs.c:747
-msgid "Write ID3v2 tag"
-msgstr "ID3v2 etiketi yaz"
+#~ msgid "EasyTAG version %s: Abnormal exit (PID: %d)"
+#~ msgstr "EasyTAG sürüm %s: Olağan dışı çıkış (PID: %d)"
 
-#: ../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 ""
-"Eğer etkinse MP3 dosyasının başına ID3v2.4 etiketi eklenir veya güncellenir. "
-"Değilse bu etiket yazılmaz."
+#~ msgid "Received signal '%s' (%d)"
+#~ msgstr "'%s' sinyali alındı (%d)"
 
-#. ID3v2 tag version
-#: ../src/prefs.c:757
-msgid "Version:"
-msgstr "Sürüm:"
+#~ 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 ""
+#~ "EasyTAG'da bir hata bulundu. Lütfen GDB geri izleme ('gdb easytag core' "
+#~ "sonra 'bt' ve 'l') ile hata kaydedip bilgileri bize gönderin: %s"
 
-#: ../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 ""
-"Yazmak için ID3v2 etiket sürümü seçin:\n"
-" - ID3v2.3 id3lib ile yazılır,\n"
-" - ID3v2.4 libid3tag ile yazılır (gerekli)."
+#~ msgid "EasyTAG version %s: Abnormal exit (PID: %d)."
+#~ msgstr "EasyTAG sürüm %s: Olağan dışı çıkış (PID: %d)."
 
-#. Charset
-#. Id3V1 writing character set
-#: ../src/prefs.c:778 ../src/prefs.c:882
-msgid "Charset:"
-msgstr "Karakter seti:"
+#~ msgid "Cannot change the permissions of file '%s' (%s)"
+#~ msgstr "'%s' dosyasının izinleri değiştirilemiyor (%s)"
 
-#. Unicode
-#: ../src/prefs.c:783
-msgid "Unicode "
-msgstr "Unicode "
+#~ msgid "Error writing tag type %d to file %s (%s)"
+#~ msgstr "%d tipi etiket %s dosyasına yazılırken hata oluştu (%s)"
 
-#: ../src/prefs.c:791
-msgid "Unicode type to use"
-msgstr "Kullanmak için unicode biçimi"
+#~ msgid "Picture block isn't valid: '%s'"
+#~ msgstr "Görüntü bloğu geçersiz: '%s'"
 
-#: ../src/prefs.c:815
-msgid "Character set used to write the tag data in the file."
-msgstr "Dosyaya etiket verilerini yazmak için karakter seti"
+#~ msgid "Error while reading file: '%s' (%s)"
+#~ msgstr "Dosya okunurken hata oluştu: '%s' (%s)"
 
-#. ID3v2 Additional iconv() options
-#. ID3V1 Additional iconv() options
-#: ../src/prefs.c:825 ../src/prefs.c:894
-msgid "Additional settings for iconv():"
-msgstr "iconv() için ek ayarlar:"
+#~ msgid "Updated tag of '%s'"
+#~ msgstr "'%s' etiketi güncellendi"
 
-#: ../src/prefs.c:831 ../src/prefs.c:900
-msgid "No"
-msgstr "Hayır"
+#~ msgid "Error while creating temporary file: '%s'"
+#~ msgstr "Geçici dosya oluşturulamadı: '%s'"
 
-#: ../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 ""
-"Bu seçenekle karakter hedef karakter setine dönüştürülemiyorsa "
-"dönüştürülmez. Ama bu durum sonucu bir hata mesajı gösterilmez."
+#~ msgid "Error while writing to file: '%s' (%s)"
+#~ msgstr "Dosyaya yazılamadı: '%s' (%s)"
 
-#: ../src/prefs.c:840 ../src/prefs.c:909
-msgid "//TRANSLIT"
-msgstr "//BaşkaAlfabe"
+#~ msgid "No audio player defined"
+#~ msgstr "Müzik oynatıcı tanımlanmadı"
 
-#: ../src/prefs.c:850 ../src/prefs.c:919
-msgid "//IGNORE"
-msgstr "//İhmal"
+#~ msgid "Audio Player Warning"
+#~ msgstr "Müzik Oynatıcı Uyarısı"
 
-#. ID3v1 tags
-#: ../src/prefs.c:859
-msgid "ID3v1 tags"
-msgstr "ID3v1 etiketler"
+#~ msgid "Cannot fork another process"
+#~ msgstr "Başka bir süreç çatallanamıyor"
 
-#. Write ID3v1 tag
-#: ../src/prefs.c:873
-msgid "Write ID3v1.x tag"
-msgstr "ID3v1.x etiketleri yaz"
+#~ msgid "Cannot execute %s (%s)"
+#~ msgstr "Çalıştırılamıyor %s (%s)"
 
-#: ../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 ""
-"Eğer etkinse MP3 dosyasının sonuna ID3v1 etiketi eklenir veya güncellenir. "
-"Değilse bu etiket yazılmaz."
+#~ msgid "B"
+#~ msgstr "B"
 
-#: ../src/prefs.c:890
-msgid "Character set used to write ID3v1 tag data in the file."
-msgstr "Dosyaya ID3v1 etiketlerini yazmak için karakter seti."
+#~ msgid "kB"
+#~ msgstr "kB"
 
-#. Character Set for reading tag
-#: ../src/prefs.c:928
-msgid "Character Set for reading ID3 tags"
-msgstr "ID3 etiketleri okumak için karakter seti"
+#~ msgid "MB"
+#~ msgstr "MB"
 
-#: ../src/prefs.c:942
-msgid "Non-standard:"
-msgstr "Standart dışı:"
+#~ msgid "GB"
+#~ msgstr "GB"
 
-#: ../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 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."
-msgstr ""
-"Bu karakter seti etiketleri okurken kullanılacak, etiketteki ISO-8859-1 "
-"alanlardaki her metni dönüştürmek için (ID3v2 ve/veya ID3v1 etiketleri "
-"için).\n"
-"\n"
-"Örneğin:\n"
-"  - EasyTAG'in eski sürümlerinde ISO-8859-1 alana UTF-8 ile yazıp "
-"kaydettiniz, Bu doğru değil. Bu etiketleri Unicode'a dönüştürmek için bu "
-"seçeneği etkinleştirin ve UTF-8'i seçin. Eğer bu olmuyorsa 'UNICODE "
-"(gerekli)' veya 'Daima etiketleri UNICODE olarak kaydet' şeklinde kullanın.\n"
-"  - Eğer Unicode kullanılmamışsa, Ruslar 'Windows-1251' kodlamasını "
-"kullanarak windowsta yazılan etiketleri okuyup yükleyebilirler. Unix "
-"sistemler içinse 'KOI8-R' kodlamasını kullanabilirler."
-
-#: ../src/prefs.c:966
-msgid "Character set used to read tag data in the file."
-msgstr "Dosyadaki etiketleri okumak için karakter seti"
+#~ msgid "TB"
+#~ msgstr "TB"
 
-#.
-#. * Scanner
-#.
-#: ../src/prefs.c:980
-msgid "Scanner"
-msgstr "Tarayıcı"
+#~ msgid "M3U Playlist Name"
+#~ msgstr "M3U Çalma Listesi Adı"
 
-#. Character conversion for the 'Fill Tag' scanner (=> FTS...)
-#: ../src/prefs.c:990
-msgid "Fill Tag Scanner - Character Conversion"
-msgstr "Etiket Doldurma Tarayıcısı - Karakter Dönüşümü"
+#~ msgid "Playlist Options"
+#~ msgstr "Çalma Listesi"
 
-#: ../src/prefs.c:996 ../src/prefs.c:1021
-msgid "Convert underscore character '_' and string '%20' to space ' '"
-msgstr "Alt çizgi '_' ve '%20' metinlerini boşluğa ' ' dönüştür"
+#~ msgid ""
+#~ "If activated, only the selected files will be written in the playlist "
+#~ "file. Else, all the files will be written."
+#~ msgstr ""
+#~ "Eğer işaretliyse sadece seçilen dosyalardan çalma listesi oluşturulur. "
+#~ "Değilse tüm dosyalardan oluşturulur."
 
-#: ../src/prefs.c:998 ../src/prefs.c:1022
-msgid "Convert space ' ' to underscore '_'"
-msgstr "Boşlukları ' ' alt çizgiye '_' dönüştür"
+#~ msgid "If activated, the playlist will be created in the parent directory."
+#~ msgstr "Eğer işaretlenmişse çalma listesini üst dizinde oluşturur."
 
-#: ../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 ""
-"Eğer işaretlenirse tarayıcı etiketleri doldururken bu dönüşümleri kullanır."
+#~ msgid ""
+#~ "This option replaces the UNIX directory separator '/' into DOS separator "
+#~ "'\\'."
+#~ msgstr "Bu seçenek UNIX dizin ayıracı '/' yerine DOS ayıracı '\\' kullanır."
 
-#. Character conversion for the 'Rename File' scanner (=> RFS...)
-#: ../src/prefs.c:1016
-msgid "Rename File Scanner - Character Conversion"
-msgstr "Dosya Yeniden Adlandırma Tarayıcısı - Karakter Dönüşümü"
+#~ msgid "Move down the selected line"
+#~ msgstr "Seçilen satırı aşağı taşı"
 
-#: ../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 ""
-"Eğer işaretlenirse tarayıcı dosya adlarını doldururken bu dönüşümleri "
-"kullanır."
+#~ msgid ""
+#~ "When activating this option, after loading the filenames, the current "
+#~ "selected scanner will be ran (the scanner window must be opened)."
+#~ msgstr ""
+#~ "Bu seçenek işaretlenirse dosya adları yüklendikten sonra seçilen tarayıcı "
+#~ "çalıştırılır (tarayıcı penceresi açık olmalı)."
 
-#. Character conversion for the 'Process Fields' scanner (=> PFS...)
-#: ../src/prefs.c:1040
-msgid "Process Fields Scanner - Character Conversion"
-msgstr "Alanları İşleme Tarayıcısı - Karakter Dönüşümü"
+#~ msgid "Cannot retrieve file info (%s)"
+#~ msgstr "Dosya bilgisi alınamıyor (%s)"
 
-#. 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 "Bazı edatlar ve yazılar için kelimelerin ilk harfini büyük harf yapma."
+#~ msgid "Can't open file '%s' (%s)"
+#~ msgstr "'%s' dosyası açılamıyor (%s)"
 
-#: ../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 "
-"word' (for example, you will obtain 'Text in an Entry' instead of 'Text In "
-"An Entry')."
-msgstr ""
-"Tarayıcıyla 'Her kelimenin ilk harfi büyük' kullanırken edat ve 'feat.' gibi "
-"bazı yazıların ilk harfini büyütme (Örneğin 'Leyla İle Mecnun' yerine 'Leyla "
-"ile Mecnun' elde edersiniz.)."
-
-#. Properties of the scanner window
-#: ../src/prefs.c:1057
-msgid "Scanner Window"
-msgstr "Tarayıcı Penceresi"
+#~ msgid "Move down this line"
+#~ msgstr "Satırı aşağı taşı"
 
-#: ../src/prefs.c:1063
-msgid "Open the Scanner Window on startup"
-msgstr "Tarayıcı penceresini başlangıçta aç"
+#~ msgid "File contains no audio track: '%s'"
+#~ msgstr "Dosya içeriği ses parçası içermiyor: '%s'"
 
-#: ../src/prefs.c:1066
-msgid ""
-"Activate this option to open automatically the scanner window when EasyTAG "
-"starts."
-msgstr ""
-"EasyTAG açılırken tarayıcı penceresinin açılması için bu seçeneği "
-"etkinleştirin."
+#~ msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
+#~ msgstr "Uyarı: '%s' Ogg Vorbis dosyası ID3v2 etiketi içeriyor."
 
-#. Other options
-#: ../src/prefs.c:1071
-msgid "Fields"
-msgstr "Alanlar"
+#~ msgid "Image Description:"
+#~ msgstr "Görüntü açıklaması:"
 
-#. Overwrite text into tag fields
-#: ../src/prefs.c:1078
-msgid "Overwrite fields when scanning tags"
-msgstr "Etiketleri tararken alanların üzerine yaz"
+#~ msgid "Error with 'loader_close': %s"
+#~ msgstr "'loader_close' ile hata: %s"
 
-#: ../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 ""
-"Etkinse tarayıcı alandaki mevcut metin yerine yenisini yazar. Etkin değilse "
-"sadece boş alanlar doldurulur."
+#~ msgid "Error with 'loader_write': %s"
+#~ msgstr "'loader_write' ile hata: %s"
 
-#: ../src/prefs.c:1092
-msgid "Set this text as default comment:"
-msgstr "Öntanımlı yorum olarak bu yazıyı ayarla:"
+#~ msgid "Default directory:"
+#~ msgstr "Öntanımlı dizin:"
 
-#: ../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 ""
-"'Etiketleri Doldur' tarayıcısını kullanırken yorum alanına yandaki metni "
-"eklemek için bu seçeneği etkinleştirin"
+#~ msgid ""
+#~ "Specify the directory where your files are located. This path will be "
+#~ "loaded when EasyTAG starts without parameter."
+#~ msgstr ""
+#~ "Dosyalarınızın bulunduğu dizini belirtir. Bu dizin EasyTAG parametresiz "
+#~ "çalıştırıldığında otomatik yüklenir."
 
-#. CRC32 comment
-#: ../src/prefs.c:1113
-msgid "Use CRC32 as the default comment (for files with ID3 tags only)."
-msgstr ""
-"Öntanımlı yorum olarak CRC32 kullan (sadece ID3 etiketli dosyalar için)."
+#~ 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 ""
+#~ "EasyTAG başlatıldığında öntanımlı dizindeki dosyaları otomatik arar. Bu "
+#~ "durum programı parametre girerek çalıştırdığınızda geçersiz olabilir "
+#~ "(easytag /mp3_dosyaların/konumu)."
 
-#: ../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 ""
-"'Etiketleri Doldur' tarayıcısını kullanırken dosyanın CRC-32 değerini "
-"hesaplar ve yorum alanına yazar."
+#~ msgid "Search subdirectories"
+#~ msgstr "Alt dizinleride ara"
 
-#.
-#. * CDDB
-#.
-#: ../src/prefs.c:1128
-msgid "CDDB"
-msgstr "CDDB"
+#~ msgid ""
+#~ "This expands the selected node into the file browser to display the sub-"
+#~ "directories."
+#~ msgstr ""
+#~ "Bu seçenek dizin seçildiğinde ağacın açılıp içindeki dizinleri görünür "
+#~ "kılar."
 
-#. CDDB Server Settings (Automatic Search)
-#: ../src/prefs.c:1134
-msgid "Server Settings for Automatic Search"
-msgstr "Otomatik Arama için Sunucu Ayarları"
+#~ msgid "Search hidden directories for files (directories starting by a '.')."
+#~ msgstr ""
+#~ "Dosyalar için gizli dizinleri de arar (dizin adı '.' ile başlayanlar)"
 
-#: ../src/prefs.c:1143 ../src/prefs.c:1182 ../src/prefs.c:1216
-msgid "Name:"
-msgstr "İsim:"
+#~ msgid "Misc"
+#~ msgstr "Çeşitli"
 
-#: ../src/prefs.c:1162 ../src/prefs.c:1190 ../src/prefs.c:1225
-#: ../src/prefs.c:1310
-msgid "Port:"
-msgstr "Port:"
+#~ msgid "Show header information of file"
+#~ msgstr "Dosyanın bilgilerini göster"
 
-#: ../src/prefs.c:1172 ../src/prefs.c:1200 ../src/prefs.c:1234
-msgid "CGI Path:"
-msgstr "CGI Konumu:"
+#~ msgid ""
+#~ "If activated, information about the file as the bitrate, the time, the "
+#~ "size, will be displayed under the filename entry."
+#~ msgstr ""
+#~ "Eğer işaretlenirse dosyanın bit oranı, süresi, boyutu vb değerler dosya "
+#~ "isminin altında görünür."
 
-#. CDDB Server Settings (Manual Search)
-#: ../src/prefs.c:1208
-msgid "Server Settings for Manual Search"
-msgstr "Elle Arama için Sunucu Ayarları"
+#~ msgid "Sorting List Options"
+#~ msgstr "Liste Sıralama Seçenekleri"
 
-#. Local access for CDDB (Automatic Search)
-#: ../src/prefs.c:1242
-msgid "Local CDDB"
-msgstr "Yerel CDDB"
+#~ msgid "Sort the file list by:"
+#~ msgstr "Sıralama biçimi:"
 
-#: ../src/prefs.c:1250
-msgid "Path:"
-msgstr "Konum:"
+#~ msgid "Ascending filename"
+#~ msgstr "Dosya adına göre artan"
 
-#: ../src/prefs.c:1262
-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 ""
-"Yerel CD veritabanının bulunduğu dizini belirtin. Yerel CD veritabanı "
-"'blues', 'classical', 'country', 'data', 'folk', 'jazz', 'newage', 'reggae', "
-"'rock', 'soundtrack' ve 'misc' dizilerini içerir."
-
-#. CDDB Proxy Settings
-#: ../src/prefs.c:1288
-msgid "Proxy Settings"
-msgstr "Vekil Ayarları"
-
-#: ../src/prefs.c:1297
-msgid "Use a proxy"
-msgstr "Vekil kullan"
+#~ msgid "Descending filename"
+#~ msgstr "Dosya adına göre azalan"
 
-#: ../src/prefs.c:1300
-msgid "Set active the settings of the proxy server."
-msgstr "Vekil sunucu kullanmak için etkinleştir."
+#~ msgid "Ascending title"
+#~ msgstr "Başlığa göre artan"
 
-#: ../src/prefs.c:1302
-msgid "Host Name:"
-msgstr "Sunucu Adı:"
+#~ msgid "Descending title"
+#~ msgstr "Başlığa göre azalan"
 
-#: ../src/prefs.c:1309
-msgid "Name of the proxy server."
-msgstr "Vekil sunucunun adı."
+#~ msgid "Ascending artist"
+#~ msgstr "Sanatçıya göre artan"
 
-#: ../src/prefs.c:1317
-msgid "Port of the proxy server."
-msgstr "Vekil sunucunun portu."
+#~ msgid "Descending artist"
+#~ msgstr "Sanatçıya göre azalan"
 
-#: ../src/prefs.c:1321
-msgid "User Name:"
-msgstr "Kullanıcı Adı:"
+#~ msgid "Ascending album artist"
+#~ msgstr "Albüm sanatçısına göre artan"
 
-#: ../src/prefs.c:1328
-msgid "Name of user for the the proxy server."
-msgstr "Vekil sunucu için kullanıcı adı."
+#~ msgid "Descending album artist"
+#~ msgstr "Albüm sanatçısına göre azalan"
 
-#: ../src/prefs.c:1329
-msgid "User Password:"
-msgstr "Kullanıcı Parolası:"
+#~ msgid "Ascending album"
+#~ msgstr "Albüme böre artan"
 
-#: ../src/prefs.c:1337
-msgid "Password of user for the the proxy server."
-msgstr "Vekil sunucu için kullanıcı parolası."
+#~ msgid "Descending album"
+#~ msgstr "Albüme göre azalan"
 
-#. Track Name list (CDDB results)
-#: ../src/prefs.c:1342
-msgid "Track Name List"
-msgstr "Parça Adı Listesi"
+#~ msgid "Ascending year"
+#~ msgstr "Yıla göre artan"
 
-#: ../src/prefs.c:1349
-msgid ""
-"Select corresponding audio file (according position or DLM if activated "
-"below)"
-msgstr "Eşleşen ses dosyasını seç (Eğer aktifse uygun konum veya DLM)"
+#~ msgid "Descending year"
+#~ msgstr "Yıla göre azalan"
 
-#: ../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 ""
-"Etkinleştirilmişse parça adı listesinden satır seçerken ana listedeki "
-"eşleşen ses dosyası seçilir."
+#~ msgid "Ascending disc number"
+#~ msgstr "Disk numarasına göre artan"
 
-#. Check box to use DLM (also used in the cddb window)
-#: ../src/prefs.c:1358
-msgid ""
-"Use the Levenshtein algorithm (DLM) to match lines (using title) with audio "
-"files (using filename)"
-msgstr ""
-"Satırları (başlığı kullanır) ses dosyalarıyle (dosya adını kullanır) "
-"eşleştirmek için Levenshtein algoritması (DLM) kullan"
+#~ msgid "Descending disc number"
+#~ msgstr "Disk numarasına göre azalan"
 
-#.
-#. * Confirmation
-#.
-#: ../src/prefs.c:1373
-msgid "Confirmation"
-msgstr "Doğrulama"
+#~ msgid "Ascending track number"
+#~ msgstr "Parça numarasına göre artan"
 
-#: ../src/prefs.c:1378
-msgid "Confirm exit from program"
-msgstr "Programdan çıkarken doğrulama iste"
+#~ msgid "Descending track number"
+#~ msgstr "Parça numarasına göre azalan"
 
-#: ../src/prefs.c:1381
-msgid ""
-"If activated, opens a dialog box to ask confirmation before exiting the "
-"program."
-msgstr ""
-"Eğer işaretlenmişse, bir diyalog penceresi açılıp çıkmadan önce doğrulama "
-"sorar."
+#~ msgid "Ascending genre"
+#~ msgstr "Türe göre artan"
 
-#: ../src/prefs.c:1384
-msgid "Confirm writing of file tag"
-msgstr "Dosya etiketi yazarken doğrulama iste"
+#~ msgid "Descending genre"
+#~ msgstr "Türe göre azalan"
 
-#: ../src/prefs.c:1388
-msgid "Confirm renaming of file"
-msgstr "Dosya yeniden adlendırırken doğrulama iste"
+#~ msgid "Ascending comment"
+#~ msgstr "Yoruma göre artan"
 
-#: ../src/prefs.c:1392
-msgid "Confirm deleting of file"
-msgstr "Dosya silerken doğrulama iste"
+#~ msgid "Descending comment"
+#~ msgstr "Yoruma göre azalan"
 
-#: ../src/prefs.c:1396
-msgid "Confirm writing of playlist"
-msgstr "Çalma listesi oluşturulurken doğrulama iste"
+#~ msgid "Ascending composer"
+#~ msgstr "Besteciye göre artan"
 
-#: ../src/prefs.c:1400
-msgid "Confirm changing directory when there are unsaved changes"
-msgstr ""
-"Kaydedilmemiş değişiklikler varken dizin değiştirmek istenirse doğrulama iste"
+#~ msgid "Descending composer"
+#~ msgstr "Besteciye göre azalan"
 
-#. For translators : be aware to NOT translate '%.*d' in this string
-#: ../src/prefs.c:1438
-#, c-format
-msgid "(Example: %.*d_-_Track_name_1.mp3)"
-msgstr "(Örnek: %.*d_-_Parça_adı_1.mp3)"
+#~ msgid "Ascending original artist"
+#~ msgstr "Asıl sanatçıya göre artan"
 
-#. 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 "(Örnek: disk_%.*d/10_/_Parça_adı_1.mp3)"
+#~ msgid "Descending original artist"
+#~ msgstr "Asıl sanatçıya göre azalan"
 
-#: ../src/prefs.c:1613 ../src/setting.c:904
-msgid "Configuration saved"
-msgstr "Yapılandırma kaydedildi"
+#~ msgid "Ascending copyright"
+#~ msgstr "Telif hakkında göre artan"
 
-#: ../src/prefs.c:1621
-msgid "Configuration unchanged"
-msgstr "Yapılandırma değiştirilmedi"
+#~ msgid "Descending copyright"
+#~ msgstr "Telif hakkına göre azalan"
 
-#: ../src/prefs.c:1707
-msgid "The selected path for 'Default path to files' is invalid"
-msgstr "'Dosyalar için öntanımlı konum' için seçilen konum geçersiz"
+#~ msgid "Ascending URL"
+#~ msgstr "Bağlantıya göre artan"
 
-#: ../src/prefs.c:1708
-#, c-format
-msgid ""
-"Path: '%s'\n"
-"Error: %s"
-msgstr ""
-"Konum: '%s'\n"
-"Hata: %s"
+#~ msgid "Descending URL"
+#~ msgstr "Bağlantıya göre azalan"
 
-#: ../src/prefs.c:1709
-msgid "Invalid Path Error"
-msgstr "Geçersiz Konum Hatası"
+#~ msgid "Ascending encoded by"
+#~ msgstr "Kodlayıcıya göre artan"
 
-#: ../src/prefs.c:1823
-#, c-format
-msgid "The audio file player '%s' cannot be found"
-msgstr "'%s' müzik çalar bulunamadı"
+#~ msgid "Descending encoded by"
+#~ msgstr "Kodlayıcıya göre azalan"
 
-#: ../src/prefs.c:1825
-msgid "Audio Player Error"
-msgstr "Müzik Çalar Hatası"
+#~ msgid "Ascending creation date"
+#~ msgstr "Oluşturma tarihine göre artan"
 
-#: ../src/scan.c:181
-msgid "Fill Tag"
-msgstr "Etiketi Doldur"
+#~ msgid "Descending creation date"
+#~ msgstr "Oluşturma tarihine göre azalan"
 
-#: ../src/scan.c:359
-#, c-format
-msgid "Cannot calculate CRC value of file (%s)"
-msgstr "Dosyanın CRC değeri hesaplanamıyor (%s)"
+#~ msgid "Select the type of file sorting when loading a directory."
+#~ msgstr "Dizini yüklerken dosya sıralaması biçimini seçin."
 
-#: ../src/scan.c:374
-msgid "Tag successfully scanned"
-msgstr "Etiket başarıyla tarandı"
+#~ msgid "If activated, the sorting of the list will be dependent on the case."
+#~ msgstr "Eğer işaretliyse büyük küçük harfe duyarlı olarak sıralanır."
 
-#: ../src/scan.c:376
-#, c-format
-msgid "Tag successfully scanned: %s"
-msgstr "Etiket başarıyla tarandı: %s"
+#~ msgid "File Audio Player"
+#~ msgstr "Dosya Müzik Oynatıcı"
 
-#: ../src/scan.c:417
-#, c-format
-msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
-msgstr "Etiket tarayıcı:yabancı… '%s' eklentisi '%s' dosyasında bulunamadı"
+#~ msgid "Player to run:"
+#~ msgstr "Çalıştırmak için oynatıcı"
 
-#: ../src/scan.c:499 ../src/scan.c:528
-#, c-format
-msgid "Scan Error: can't find separator '%s' within '%s'"
-msgstr "Tarama Hatası: '%s' ile '%s' arasına ayırıcı bulunamadı"
+#~ 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 ""
+#~ "Dosyaları oynatmak için program girin. Dosya adından önce parametre "
+#~ "vermek gerekiyor olabilir ('xmmp -p' gibi)."
 
-#: ../src/scan.c:715
-msgid "New filename successfully scanned"
-msgstr "Yeni dosya adı başarıyla tarandı"
+#~ msgid "If activated, the log view would be visible in the main window."
+#~ msgstr "Eğer işaretlenirse ana pencerede günlük görünümü görünür olur."
 
-#: ../src/scan.c:718
-#, c-format
-msgid "New filename successfully scanned: %s"
-msgstr "Yeni dosya adı başarıyla tarandı: %s"
+#~ msgid "File Options"
+#~ msgstr "Dosya Seçenekleri"
 
-#: ../src/scan.c:1818
-#, c-format
-msgid "Error while processing fields: %s"
-msgstr "Alanlar işlenemiyor: %s"
+#~ 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 ""
+#~ "FAT32/16 ve ISO9660 + Joliet dosya sistemi için geçersiz karakterler "
+#~ "değiştirin ('\\', ':', ';', '*', '?', '\"', '<', '>', '|') karakterleri "
+#~ "dosya adlandırırken problem oluştururlar. Bu etiketlerden dosya "
+#~ "isimlediriken kullanışlıdır."
 
-#. The window
-#: ../src/scan.c:2337
-msgid "Tag and Filename Scan"
-msgstr "Etiket ve Dosya Adı Tarayıcı"
+#~ msgid ""
+#~ "Update modification time of the parent directory of the file (recommended "
+#~ "when using Amarok)"
+#~ msgstr ""
+#~ "Dosyanın üst dizininin değiştirilme tarihini güncelle (Amarok kullanırken "
+#~ "gerekli)"
 
-#. TODO: Set related action to match AM_SCAN_FILES.
-#: ../src/scan.c:2346
-msgid "Scan Files"
-msgstr "Dosyaları Tara"
+#~ msgid ""
+#~ "The modification time of the parent directory of the file will be updated "
+#~ "when saving tag the file. At the present time it is automatically done "
+#~ "only when renaming a file.\n"
+#~ "This feature is interesting when using applications like Amarok. For "
+#~ "performance reasons, they refresh file information by detecting changes "
+#~ "of the parent directory."
+#~ msgstr ""
+#~ "Dosyanın üst dizininin değiştirme tarihi etiketler dosyaya yazılırken "
+#~ "güncellenir. Aynı zamanda dosyanın ismi değiştirildiğinde otomatik olarak "
+#~ "yapılır.\n"
+#~ "Amarok benzeri uygulamalar kullanıyorsanız ilginizi çekebilir. Bu tip "
+#~ "uygulamalar performans nedeniyle dosya bilgileri güncellenirken üst "
+#~ "dizinin değiştirilme tarihine bakar."
 
-#. Option Menu
-#: ../src/scan.c:2374
-msgid "Scanner:"
-msgstr "Tarayıcı:"
+#~ msgid "Character Set for Filename"
+#~ msgstr "Dosya Adı İçin Karakter Seti"
 
-#: ../src/scan.c:2395
-msgid "Select the type of scanner to use"
-msgstr "Kullanmak için tarayıcı tipi seçin"
+#~ msgid ""
+#~ "Rules to apply if some characters can't be converted to the system "
+#~ "character encoding when writing filename:"
+#~ msgstr ""
+#~ "Bazı nedenlerden dolayı dosya adı yazılırken sistem karakterlerine "
+#~ "dönüştürülemezse yapılacak işlem:"
 
-#: ../src/scan.c:2404
-msgid "Scanner Preferences"
-msgstr "Tarayıcı Tercihleri"
+#~ 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 ""
+#~ "Bu seçenekle sizin yerel dilinize göre kodlamayı deneyecek (örneğin: 'tr' "
+#~ "için ISO-8859-9, 'ru' için KOI8-R gibi). Eğer başarısız olursa ISO-8859-1 "
+#~ "karakter kodlamasını deneyecek."
 
-#: ../src/scan.c:2413
-msgid "Show / Hide Masks Editor"
-msgstr "Maske Düzenleyiciyi Göster / Gizle"
+#~ msgid ""
+#~ "Force using the system character encoding and activate the transliteration"
+#~ msgstr ""
+#~ "Sistem karakter kodlamasına zorla ve başka dil kullanmayı etkinleştir"
 
-#: ../src/scan.c:2423
-msgid "Show / Hide Legend"
-msgstr "Maske Biçimlerini Göster / Gizle"
+#~ 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 ""
+#~ "Bu seçenek ile yazılamayan karakterler karaktere en çok benzeyen bir-iki "
+#~ "karaktere dünüştürülür."
 
-#: ../src/scan.c:2453
-msgid ""
-"Select or type in a mask using codes (see Legend) to parse filename and "
-"path. Used to fill in tag fields"
-msgstr ""
-"Dosya ve dizin adı ayrıştırmak için maske biçimi yazın veya seçin. Etiket "
-"alanları doldurmak için kullanılacak"
+#~ msgid "Tag Settings"
+#~ msgstr "Etiket Ayarları"
 
-#. Preview label
-#: ../src/scan.c:2477
-msgid "Fill tag preview"
-msgstr "Etiket önizlemesini doldur"
+#~ msgid "Tag Options"
+#~ msgstr "Etiket Seçenekleri"
 
-#: ../src/scan.c:2507
-msgid "Prefix mask with current path"
-msgstr "Şuanki dizin için maske öncülü"
+#~ msgid "Auto completion of date if not complete"
+#~ msgstr "Tarih eksikse otomatik tamamla"
 
-#: ../src/scan.c:2521
-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 ""
-"Etiket alanlarını ayrıştırmak için maske biçimi yazın veya seçin. Dosyayı "
-"yeniden anlandırmak için kullanılacak.\n"
-"Dizin oluşturmak için / karakterini kullanın. İlk karakter / olursa kesin "
-"konum, değilse eski konuma göre göreceli konum olur."
+#~ 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 ""
+#~ "Tarihin sadece son karakterleri mevcutsa yıl alanın otomatik tamamlamayı "
+#~ "dener (örnek olay, 2005 yılındaysak: 5 => 2005, 4 => 2005, 6 => 1996, 95 "
+#~ "=> 1995…)."
 
-#. Preview label
-#: ../src/scan.c:2546
-msgid "Rename file preview"
-msgstr "Dosya adı değiştirme önizlemesi"
+#~ msgid "Write the track field with the following number of digits:"
+#~ msgstr "Parça numarası için kullanılacak basamak sayısı:"
 
-#: ../src/scan.c:2565
-msgid "Select fields:"
-msgstr "Alanları Seçin:"
+#~ 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 ""
+#~ "Eğer işaretlenirse parça numarası belirlenen basamağa tamamlanan kadar "
+#~ "başına '0' eklenir. (örnek, 2 basamak: '05', '09', '10'…). "
+#~ "İşaretlenmemişse geçerli parça numarası korunur"
 
-#: ../src/scan.c:2568
-msgid ""
-"The buttons on the right represent the fields which can be processed. Select "
-"those which interest you"
-msgstr ""
-"İşlenebilecek alanlar için sağda düğmeler bulunuyor. İlgilendiklerinizi "
-"işaretleyin"
+#~ msgid "Write the disc field with the following number of digits:"
+#~ msgstr "Disk kısımını şu kadar rakam kullanarak yaz:"
 
-#. Advice for Translators: set the first letter of filename translated
-#: ../src/scan.c:2572
-msgid "F"
-msgstr "D"
+#~ msgid ""
+#~ "Tag field focus when switching files in list with shortcuts Page Up/Page "
+#~ "Down:"
+#~ msgstr ""
+#~ "Page Up/Down tuşlarıyla listedeki dosyalara arasında geçildiğinde etiket "
+#~ "alanı odağı:"
 
-#: ../src/scan.c:2574
-msgid "Process filename field"
-msgstr "Dosya adı alanını işle"
+#~ msgid "Keep focus to the same tag field"
+#~ msgstr "Odağı aynı etikette tut"
 
-#. Advice for Translators: set the first letter of title translated
-#: ../src/scan.c:2576
-msgid "T"
-msgstr "B"
+#~ msgid "Return focus to the first tag field (i.e. 'Title' field)"
+#~ msgstr "Odağı ilk etiket alanına al (örn. 'Başlık' alanı)"
 
-#: ../src/scan.c:2577
-msgid "Process title field"
-msgstr "Başlık alanını işle"
+#~ msgid "ID3 Tag Settings"
+#~ msgstr "ID3 Etiket Ayarları"
 
-#. Advice for Translators: set the first letter of artist translated
-#: ../src/scan.c:2579
-msgid "Ar"
-msgstr "S"
+#~ msgid "ID3 Tag Rules"
+#~ msgstr "ID3 etiket rolleri"
 
-#: ../src/scan.c:2580
-msgid "Process file artist field"
-msgstr "Sanatçi alanını işle"
+#~ 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 strip the whole tag when these seven standard data fields "
+#~ "have been set to blank."
+#~ msgstr ""
+#~ "ID3v2 etiketleri Başlık, Artist, Albüm, Yıl, Parça, Tür ve Yorum'dan "
+#~ "farklı verilerde içerebilir (eklenmiş görüntü ve şarkı sözü gibi), bu "
+#~ "seçenek standart alanlar boşsa diğer verileri de silmenizi sağlayabilir."
 
-#. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan.c:2582
-msgid "AA"
-msgstr "AS"
+#~ msgid ""
+#~ "If activated, an old ID3v2 tag version (as ID3v2.2) will be updated to "
+#~ "the ID3v2.3 version."
+#~ msgstr ""
+#~ "Eğer işaretlenirse eski ID3v2 etiketleri (ID3v2.2 gibi) yeni sürüme "
+#~ "yükseltilir."
 
-#: ../src/scan.c:2583
-msgid "Process album artist field"
-msgstr "Albüm sanatçısı alanını işle"
+#~ msgid "Use Compression"
+#~ msgstr "Sıkıştırma kullan"
 
-#. Advice for Translators: set the first letter of album translated
-#: ../src/scan.c:2585
-msgid "Al"
-msgstr "A"
+#~ msgid "Write Genre in text only"
+#~ msgstr "Türü sadece metin olarak yaz"
 
-#: ../src/scan.c:2586
-msgid "Process album field"
-msgstr "Albüm alanını işle"
+#~ msgid ""
+#~ "Don't use ID3v1 number references in genre tag. Enable this if you see "
+#~ "numbers as genre in your music player."
+#~ msgstr ""
+#~ "Tür etiketi için ID3v1 numara referansı kullanma. Eğer müzik "
+#~ "oynatıcınızda tür kısmında numara görüyorsanız etkinleştirin."
 
-#. Advice for Translators: set the first letter of genre translated
-#: ../src/scan.c:2588
-msgid "G"
-msgstr "T"
+#~ 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 ""
+#~ "Eğer etkinse MP3 dosyasının başına ID3v2.4 etiketi eklenir veya "
+#~ "güncellenir. Değilse bu etiket yazılmaz."
 
-#: ../src/scan.c:2589
-msgid "Process genre field"
-msgstr "Tür alanını işle"
+#~ msgid "Charset:"
+#~ msgstr "Karakter seti:"
 
-#. Advice for Translators: set the first letter of comment translated
-#: ../src/scan.c:2591
-msgid "Cm"
-msgstr "Yo"
+#~ msgid "Unicode type to use"
+#~ msgstr "Kullanmak için unicode biçimi"
 
-#: ../src/scan.c:2592
-msgid "Process comment field"
-msgstr "Yorum alanını işle"
+#~ msgid "Character set used to write the tag data in the file."
+#~ msgstr "Dosyaya etiket verilerini yazmak için karakter seti"
 
-#. Advice for Translators: set the first letter of composer translated
-#: ../src/scan.c:2594
-msgid "Cp"
-msgstr "Be"
+#~ msgid "Additional settings for iconv():"
+#~ msgstr "iconv() için ek ayarlar:"
 
-#: ../src/scan.c:2595
-msgid "Process composer field"
-msgstr "Besteci alanını işle"
+#~ msgid "No"
+#~ msgstr "Hayır"
 
-#. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan.c:2597
-msgid "O"
-msgstr "Sa"
+#~ 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 ""
+#~ "Bu seçenekle karakter hedef karakter setine dönüştürülemiyorsa "
+#~ "dönüştürülmez. Ama bu durum sonucu bir hata mesajı gösterilmez."
 
-#: ../src/scan.c:2598
-msgid "Process original artist field"
-msgstr "Asıl Sanatçı alanını işle"
+#~ msgid "//TRANSLIT"
+#~ msgstr "//BaşkaAlfabe"
 
-#. Advice for Translators: set the first letter of copyright translated
-#: ../src/scan.c:2600
-msgid "Cr"
-msgstr "Th"
+#~ msgid "//IGNORE"
+#~ msgstr "//İhmal"
 
-#: ../src/scan.c:2601
-msgid "Process copyright field"
-msgstr "Telif hakkı alanını işle"
+#~ msgid ""
+#~ "If activated, an ID3v1 tag will be added or updated at the end of the MP3 "
+#~ "files. Else it will be stripped."
+#~ msgstr ""
+#~ "Eğer etkinse MP3 dosyasının sonuna ID3v1 etiketi eklenir veya "
+#~ "güncellenir. Değilse bu etiket yazılmaz."
 
-#. Advice for Translators: set the first letter of URL translated
-#: ../src/scan.c:2603
-msgid "U"
-msgstr "Ba"
+#~ msgid "Character set used to write ID3v1 tag data in the file."
+#~ msgstr "Dosyaya ID3v1 etiketlerini yazmak için karakter seti."
 
-#: ../src/scan.c:2604
-msgid "Process URL field"
-msgstr "Bağlantı alanını işle"
+#~ msgid "Non-standard:"
+#~ msgstr "Standart dışı:"
 
-#. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan.c:2606
-msgid "E"
-msgstr "K"
+#~ 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 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."
+#~ msgstr ""
+#~ "Bu karakter seti etiketleri okurken kullanılacak, etiketteki ISO-8859-1 "
+#~ "alanlardaki her metni dönüştürmek için (ID3v2 ve/veya ID3v1 etiketleri "
+#~ "için).\n"
+#~ "\n"
+#~ "Örneğin:\n"
+#~ "  - EasyTAG'in eski sürümlerinde ISO-8859-1 alana UTF-8 ile yazıp "
+#~ "kaydettiniz, Bu doğru değil. Bu etiketleri Unicode'a dönüştürmek için bu "
+#~ "seçeneği etkinleştirin ve UTF-8'i seçin. Eğer bu olmuyorsa 'UNICODE "
+#~ "(gerekli)' veya 'Daima etiketleri UNICODE olarak kaydet' şeklinde "
+#~ "kullanın.\n"
+#~ "  - Eğer Unicode kullanılmamışsa, Ruslar 'Windows-1251' kodlamasını "
+#~ "kullanarak windowsta yazılan etiketleri okuyup yükleyebilirler. Unix "
+#~ "sistemler içinse 'KOI8-R' kodlamasını kullanabilirler."
+
+#~ msgid "Character set used to read tag data in the file."
+#~ msgstr "Dosyadaki etiketleri okumak için karakter seti"
+
+#~ msgid "Convert underscore character '_' and string '%20' to space ' '"
+#~ msgstr "Alt çizgi '_' ve '%20' metinlerini boşluğa ' ' dönüştür"
 
-#: ../src/scan.c:2607
-msgid "Process encoder name field"
-msgstr "Kodlayıcı alanını işle"
+#~ msgid ""
+#~ "If activated, this conversion will be used when applying a mask from the "
+#~ "scanner for tags."
+#~ msgstr ""
+#~ "Eğer işaretlenirse tarayıcı etiketleri doldururken bu dönüşümleri "
+#~ "kullanır."
 
-#: ../src/scan.c:2651
-msgid "Invert selection"
-msgstr "Seçimi ters çevir"
+#~ msgid "Rename File Scanner - Character Conversion"
+#~ msgstr "Dosya Yeniden Adlandırma Tarayıcısı - Karakter Dönüşümü"
 
-#: ../src/scan.c:2658
-msgid "Select/Unselect all"
-msgstr "Tümünü seç/Hiçbirini seçme"
+#~ msgid ""
+#~ "If activated, this conversion will be used when applying a mask from the "
+#~ "scanner for filenames."
+#~ msgstr ""
+#~ "Eğer işaretlenirse tarayıcı dosya adlarını doldururken bu dönüşümleri "
+#~ "kullanır."
 
-#: ../src/scan.c:2673
-msgid "Convert:"
-msgstr "Dönüştür:"
+#~ msgid "Process Fields Scanner - Character Conversion"
+#~ msgstr "Alanları İşleme Tarayıcısı - Karakter Dönüşümü"
 
-#: ../src/scan.c:2675
-msgid "to: "
-msgstr "->:"
+#~ msgid ""
+#~ "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 ""
+#~ "Tarayıcıyla 'Her kelimenin ilk harfi büyük' kullanırken edat ve 'feat.' "
+#~ "gibi bazı yazıların ilk harfini büyütme (Örneğin 'Leyla İle Mecnun' "
+#~ "yerine 'Leyla ile Mecnun' elde edersiniz.)."
 
-#: ../src/scan.c:2682
-msgid "Do not convert"
-msgstr "Dönüştürme"
+#~ msgid ""
+#~ "Activate this option to open automatically the scanner window when "
+#~ "EasyTAG starts."
+#~ msgstr ""
+#~ "EasyTAG açılırken tarayıcı penceresinin açılması için bu seçeneği "
+#~ "etkinleştirin."
 
-#: ../src/scan.c:2701
-msgid ""
-"The underscore character or the string '%20' are replaced by one space. "
-"Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
-msgstr ""
-"'%20' metnini ve altçizgiyi boşlukla değiştir. Örnek, önce: 'Bir"
-"%20Güzel_Yazı', sonra: 'Bir Güzel Yazı'"
+#~ 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 ""
+#~ "Etkinse tarayıcı alandaki mevcut metin yerine yenisini yazar. Etkin "
+#~ "değilse sadece boş alanlar doldurulur."
 
-#: ../src/scan.c:2704
-msgid ""
-"The space character is replaced by one underscore character. Example, "
-"before: 'Text In An Entry', after: 'Text_In_An_Entry'."
-msgstr ""
-"Boşluk karakterini alt çizgi ile değiştir. Örnek, önce: 'Bir Güzel Yazı', "
-"sonra: 'Bir_Güzel_Yazı'"
+#~ msgid ""
+#~ "Activate this option if you want to put the following string into the "
+#~ "comment field when using the 'Fill Tag' scanner."
+#~ msgstr ""
+#~ "'Etiketleri Doldur' tarayıcısını kullanırken yorum alanına yandaki metni "
+#~ "eklemek için bu seçeneği etkinleştirin"
 
-#: ../src/scan.c:2707
-msgid ""
-"Replace a string by another one. Note that the search is case sensitive."
-msgstr ""
-"Yazıyı başka biriyle yer değiştir. Bu arama büyük küçük harf duyarlıdır."
+#~ msgid ""
+#~ "Calculates the CRC-32 value of the file and writes it into the comment "
+#~ "field when using the 'Fill Tag' scanner."
+#~ msgstr ""
+#~ "'Etiketleri Doldur' tarayıcısını kullanırken dosyanın CRC-32 değerini "
+#~ "hesaplar ve yorum alanına yazar."
 
-#: ../src/scan.c:2714
-msgid "Capitalize all"
-msgstr "Tümü Büyük Harf"
+#~ msgid "Name:"
+#~ msgstr "İsim:"
 
-#: ../src/scan.c:2716
-msgid "Lowercase all"
-msgstr "Tümü Küçük Harf"
+#~ msgid "Local CDDB"
+#~ msgstr "Yerel CDDB"
 
-#: ../src/scan.c:2718
-msgid "Capitalize first letter"
-msgstr "İlk harfi büyüt"
+#~ msgid "Path:"
+#~ msgstr "Konum:"
 
-#: ../src/scan.c:2720
-msgid "Capitalize the first letter of each word"
-msgstr "Her kelimenin ilk harfini büyüt"
+#~ 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 ""
+#~ "Yerel CD veritabanının bulunduğu dizini belirtin. Yerel CD veritabanı "
+#~ "'blues', 'classical', 'country', 'data', 'folk', 'jazz', 'newage', "
+#~ "'reggae', 'rock', 'soundtrack' ve 'misc' dizilerini içerir."
 
-#: ../src/scan.c:2721
-msgid "Detect Roman numerals"
-msgstr "Roma rakamlarını algıla"
+#~ msgid "Proxy Settings"
+#~ msgstr "Vekil Ayarları"
 
-#: ../src/scan.c:2723
-msgid "Do not change capitalization"
-msgstr "Büyük-küçük harfleri değiştirme"
+#~ msgid "Set active the settings of the proxy server."
+#~ msgstr "Vekil sunucu kullanmak için etkinleştir."
 
-#: ../src/scan.c:2745
-msgid ""
-"Convert all words in all fields to upper case. Example, before: 'Text IN AN "
-"entry', after: 'TEXT IN AN ENTRY'."
-msgstr ""
-"Tüm kelimelerin tüm harflerini büyüt. Örnek, önce: 'Bir güzel Yazı', sonra: "
-"'BİR GÜZEL YAZI'"
+#~ msgid "Name of the proxy server."
+#~ msgstr "Vekil sunucunun adı."
 
-#: ../src/scan.c:2748
-msgid ""
-"Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
-"entry', after: 'text in an entry'."
-msgstr ""
-"Tüm kelimelerdeki harfleri küçült. Örnek, önce: 'BİR Güzel Yazı', sonra: "
-"'bir güzel yazı'"
+#~ msgid "Port of the proxy server."
+#~ msgstr "Vekil sunucunun portu."
 
-#: ../src/scan.c:2751
-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 ""
-"Sadece ilk kelimenin ilk harfini büyüt. Örnek, önce: 'bir Güzel YAZI', "
-"sonra: 'Bir güzel yazı'"
+#~ msgid "Name of user for the the proxy server."
+#~ msgstr "Vekil sunucu için kullanıcı adı."
 
-#: ../src/scan.c:2754
-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 ""
-"Her kelimenin ilk harfini büyüt. Örnek, önce: 'Bir güzel YAZI', sonra: 'Bir "
-"Güzel Yazı'"
+#~ msgid "Password of user for the the proxy server."
+#~ msgstr "Vekil sunucu için kullanıcı parolası."
 
-#: ../src/scan.c:2757
-msgid ""
-"Force to convert to upper case the Roman numerals. Example, before: 'ix. "
-"text in an entry', after: 'IX. Text In An Entry'."
-msgstr ""
-"Romen rakamlarını büyük harfe zorla. Örnek, önce: 'ix. bir güzel yazı', "
-"sonra: 'IX. Bir Güzel Yazı'"
+#~ msgid "Track Name List"
+#~ msgstr "Parça Adı Listesi"
 
-#: ../src/scan.c:2765
-msgid "Insert a space before uppercase letters"
-msgstr "Büyük harflerden önce bir boşluk ekle"
+#~ 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 ""
+#~ "Etkinleştirilmişse parça adı listesinden satır seçerken ana listedeki "
+#~ "eşleşen ses dosyası seçilir."
 
-#: ../src/scan.c:2767
-msgid "Remove duplicate spaces and underscores"
-msgstr "Çift boşluk ve alt çizgileri sil"
+#~ msgid "Confirm exit from program"
+#~ msgstr "Programdan çıkarken doğrulama iste"
 
-#: ../src/scan.c:2769
-msgid "Do not change word separators"
-msgstr "Kelime ayraçlarını değiştirme"
+#~ msgid ""
+#~ "If activated, opens a dialog box to ask confirmation before exiting the "
+#~ "program."
+#~ msgstr ""
+#~ "Eğer işaretlenmişse, bir diyalog penceresi açılıp çıkmadan önce doğrulama "
+#~ "sorar."
 
-#: ../src/scan.c:2783
-msgid ""
-"All spaces between words are removed. Example, before: 'Text In An Entry', "
-"after: 'TextInAnEntry'."
-msgstr ""
-"Kelime aralarındaki boşluklar silindi. Örnek, önce: 'Bir Güzel Yazı', sonra "
-"'BirGüzelYazı'"
+#~ msgid "Confirm changing directory when there are unsaved changes"
+#~ msgstr ""
+#~ "Kaydedilmemiş değişiklikler varken dizin değiştirmek istenirse doğrulama "
+#~ "iste"
 
-#: ../src/scan.c:2786
-msgid ""
-"A space is inserted before each upper case letter. Example, before: "
-"'TextInAnEntry', after: 'Text In An Entry'."
-msgstr ""
-"Büyük harflerden önce boşluk oluşturuldu. Örnek, önce: 'BirGüzelYazı', "
-"sonra: 'Bir Güzel Yazı'"
+#~ msgid "(Example: %.*d_-_Track_name_1.mp3)"
+#~ msgstr "(Örnek: %.*d_-_Parça_adı_1.mp3)"
 
-#: ../src/scan.c:2789
-msgid ""
-"Duplicate spaces and underscores are removed. Example, before: "
-"'Text__In__An   Entry', after: 'Text_In_An Entry'."
-msgstr ""
-"Çift boşluk ve alt çizgiler silindi. Örnek, önce: 'Bir   Güzel__Yazı', sonra "
-"'Bir Güzel_Yazı'"
+#~ msgid "(Example: disc_%.*d_of_10/Track_name_1.mp3)"
+#~ msgstr "(Örnek: disk_%.*d/10_/_Parça_adı_1.mp3)"
 
-#.
-#. * Frame to display codes legend
-#.
-#: ../src/scan.c:2796
-msgid "Legend"
-msgstr "Maske Biçimleri"
+#~ msgid "Configuration saved"
+#~ msgstr "Yapılandırma kaydedildi"
 
-#: ../src/scan.c:2802
-#, c-format
-msgid "%a: artist"
-msgstr "%a: sanatçı"
+#~ msgid "Configuration unchanged"
+#~ msgstr "Yapılandırma değiştirilmedi"
 
-#: ../src/scan.c:2805
-msgid "%z: album artist"
-msgstr "%z: albüm sanatçısı"
+#~ msgid "The audio file player '%s' cannot be found"
+#~ msgstr "'%s' müzik çalar bulunamadı"
 
-#: ../src/scan.c:2808
-msgid "%b: album"
-msgstr "%b: albüm"
+#~ msgid "Audio Player Error"
+#~ msgstr "Müzik Çalar Hatası"
 
-#: ../src/scan.c:2811
-#, c-format
-msgid "%c: comment"
-msgstr "%c: yorum"
+#~ msgid "Scanner:"
+#~ msgstr "Tarayıcı:"
 
-#: ../src/scan.c:2814
-#, c-format
-msgid "%p: composer"
-msgstr "%p: besteci"
+#~ msgid "Select the type of scanner to use"
+#~ msgstr "Kullanmak için tarayıcı tipi seçin"
 
-#: ../src/scan.c:2817
-msgid "%r: copyright"
-msgstr "%r: telif hakkı"
+#~ msgid "Select fields:"
+#~ msgstr "Alanları Seçin:"
 
-#: ../src/scan.c:2820
-#, c-format
-msgid "%d: disc number"
-msgstr "%d: disk numarası"
+#~ msgid ""
+#~ "The buttons on the right represent the fields which can be processed. "
+#~ "Select those which interest you"
+#~ msgstr ""
+#~ "İşlenebilecek alanlar için sağda düğmeler bulunuyor. İlgilendiklerinizi "
+#~ "işaretleyin"
 
-#: ../src/scan.c:2823
-#, c-format
-msgid "%e: encoded by"
-msgstr "%e: kodlayıcı"
+#~ msgid "F"
+#~ msgstr "D"
 
-#: ../src/scan.c:2826
-#, c-format
-msgid "%g: genre"
-msgstr "%g: tür"
+#~ msgid "T"
+#~ msgstr "B"
 
-#: ../src/scan.c:2829
-#, c-format
-msgid "%i: ignored"
-msgstr "%i: ihmal"
+#~ msgid "Ar"
+#~ msgstr "S"
 
-#: ../src/scan.c:2832
-msgid "%l: number of tracks"
-msgstr "%l: parça sayısı"
+#~ msgid "AA"
+#~ msgstr "AS"
 
-#: ../src/scan.c:2835
-#, c-format
-msgid "%o: orig. artist"
-msgstr "%o: asıl sanatçı"
+#~ msgid "Process album artist field"
+#~ msgstr "Albüm sanatçısı alanını işle"
 
-#: ../src/scan.c:2838
-#, c-format
-msgid "%n: track"
-msgstr "%n: parça numarası"
+#~ msgid "Al"
+#~ msgstr "A"
 
-#: ../src/scan.c:2841
-msgid "%t: title"
-msgstr "%t: başlık"
+#~ msgid "G"
+#~ msgstr "T"
 
-#: ../src/scan.c:2844
-#, c-format
-msgid "%u: URL"
-msgstr "%u: bağlantı"
+#~ msgid "Cm"
+#~ msgstr "Yo"
 
-#: ../src/scan.c:2847
-#, c-format
-msgid "%x: number of discs"
-msgstr "%x: disk sayısı"
+#~ msgid "Cp"
+#~ msgstr "Be"
 
-#: ../src/scan.c:2850
-msgid "%y: year"
-msgstr "%y: yıl"
+#~ msgid "O"
+#~ msgstr "Sa"
 
-#.
-#. * Masks Editor
-#.
-#: ../src/scan.c:2857
-msgid "Mask Editor"
-msgstr "Maske Düzenleyici"
+#~ msgid "Cr"
+#~ msgstr "Th"
 
-#: ../src/scan.c:2911
-msgid "Create New Mask"
-msgstr "Yeni Maske Oluştur"
+#~ msgid "U"
+#~ msgstr "Ba"
 
-#: ../src/scan.c:2921
-msgid "Move Up this Mask"
-msgstr "Bu Maskeyi Yukarı Taşı"
+#~ msgid "E"
+#~ msgstr "K"
 
-#: ../src/scan.c:2931
-msgid "Move Down this Mask"
-msgstr "Bu Maskeyi Aşağı Taşı"
+#~ msgid "Select/Unselect all"
+#~ msgstr "Tümünü seç/Hiçbirini seçme"
 
-#: ../src/scan.c:2941
-msgid "Duplicate Mask"
-msgstr "Maskeyi Çoğalt"
+#~ msgid ""
+#~ "Convert all words in all fields to upper case. Example, before: 'Text IN "
+#~ "AN entry', after: 'TEXT IN AN ENTRY'."
+#~ msgstr ""
+#~ "Tüm kelimelerin tüm harflerini büyüt. Örnek, önce: 'Bir güzel Yazı', "
+#~ "sonra: 'BİR GÜZEL YAZI'"
 
-#: ../src/scan.c:2951
-msgid "Add Default Masks"
-msgstr "Öntanımlı Maskelere Ekle"
+#~ msgid ""
+#~ "Convert all words in all fields to lower case. Example, before: 'TEXT IN "
+#~ "an entry', after: 'text in an entry'."
+#~ msgstr ""
+#~ "Tüm kelimelerdeki harfleri küçült. Örnek, önce: 'BİR Güzel Yazı', sonra: "
+#~ "'bir güzel yazı'"
 
-#: ../src/scan.c:2961
-msgid "Remove Mask"
-msgstr "Maskeyi Sil"
+#~ 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 ""
+#~ "Sadece ilk kelimenin ilk harfini büyüt. Örnek, önce: 'bir Güzel YAZI', "
+#~ "sonra: 'Bir güzel yazı'"
 
-#: ../src/scan.c:2971
-msgid "Save Masks"
-msgstr "Maskeleri Kaydet"
+#~ 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 ""
+#~ "Her kelimenin ilk harfini büyüt. Örnek, önce: 'Bir güzel YAZI', sonra: "
+#~ "'Bir Güzel Yazı'"
 
-#: ../src/scan.c:3551
-msgid "New_mask"
-msgstr "Yeni_make"
+#~ msgid ""
+#~ "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
+#~ "text in an entry', after: 'IX. Text In An Entry'."
+#~ msgstr ""
+#~ "Romen rakamlarını büyük harfe zorla. Örnek, önce: 'ix. bir güzel yazı', "
+#~ "sonra: 'IX. Bir Güzel Yazı'"
 
-#: ../src/scan.c:3590
-msgid "Copy: No row selected"
-msgstr "Kopyala: Satır seçilmedi"
+#~ msgid ""
+#~ "All spaces between words are removed. Example, before: 'Text In An "
+#~ "Entry', after: 'TextInAnEntry'."
+#~ msgstr ""
+#~ "Kelime aralarındaki boşluklar silindi. Örnek, önce: 'Bir Güzel Yazı', "
+#~ "sonra 'BirGüzelYazı'"
 
-#: ../src/scan.c:3683
-msgid "Remove: No row selected"
-msgstr "Sil: Satır seçilmesi"
+#~ msgid ""
+#~ "A space is inserted before each upper case letter. Example, before: "
+#~ "'TextInAnEntry', after: 'Text In An Entry'."
+#~ msgstr ""
+#~ "Büyük harflerden önce boşluk oluşturuldu. Örnek, önce: 'BirGüzelYazı', "
+#~ "sonra: 'Bir Güzel Yazı'"
 
-#: ../src/scan.c:3730
-msgid "Move Up: No row selected"
-msgstr "Yukarı Taşı: Satır seçilmedi"
+#~ msgid ""
+#~ "Duplicate spaces and underscores are removed. Example, before: "
+#~ "'Text__In__An   Entry', after: 'Text_In_An Entry'."
+#~ msgstr ""
+#~ "Çift boşluk ve alt çizgiler silindi. Örnek, önce: 'Bir   Güzel__Yazı', "
+#~ "sonra 'Bir Güzel_Yazı'"
 
-#: ../src/scan.c:3774
-msgid "Move Down: No row selected"
-msgstr "Aşağı Taşı: Satır seçilmedi"
+#~ msgid "Move Up this Mask"
+#~ msgstr "Bu Maskeyi Yukarı Taşı"
 
-#: ../src/setting.c:924
-#, c-format
-msgid "Error: Cannot write configuration file: %s (%s)"
-msgstr "Hata: Yapılandırma dosyası %s yazılamıyor (%s)"
+#~ msgid "Move Down this Mask"
+#~ msgstr "Bu Maskeyi Aşağı Taşı"
 
-#: ../src/setting.c:944 ../src/setting.c:961 ../src/setting.c:981
-#, c-format
-msgid "Error while writing configuration file: %s"
-msgstr "Yapılandırma dosyası yazılırken hata oluştu: %s"
+#~ msgid "Duplicate Mask"
+#~ msgstr "Maskeyi Çoğalt"
 
-#: ../src/setting.c:1104
-#, c-format
-msgid "Cannot open configuration file '%s' (%s)"
-msgstr "'%s' yapılandırma dosyası açılamıyor (%s)"
+#~ msgid "Remove Mask"
+#~ msgstr "Maskeyi Sil"
 
-#: ../src/setting.c:1106
-msgid "Loading default configuration"
-msgstr "Öntanımlı yapılandırma yükleniyor"
+#~ msgid "Copy: No row selected"
+#~ msgstr "Kopyala: Satır seçilmedi"
 
-#: ../src/setting.c:1147
-#, c-format
-msgid "Cannot create or open file '%s' (%s)"
-msgstr "'%s' dosyası oluşturulamıyor veya okunamıyor (%s)"
+#~ msgid "Remove: No row selected"
+#~ msgstr "Sil: Satır seçilmesi"
 
-#: ../src/setting.c:1207
-#, c-format
-msgid "Error: Cannot write list to file: %s (%s)"
-msgstr "Hata: Liste dosyaya yazılamıyor: %s (%s)"
+#~ msgid "Move Up: No row selected"
+#~ msgstr "Yukarı Taşı: Satır seçilmedi"
 
-#: ../src/setting.c:1225
-#, c-format
-msgid "Error while writing list file: %s"
-msgstr "Dosya listesi yazılırken hata oluştu: %s"
+#~ msgid "Move Down: No row selected"
+#~ msgstr "Aşağı Taşı: Satır seçilmedi"
 
-#. Fall back to defaults
-#: ../src/setting.c:1305
-msgid "Loading default 'Fill Tag' masks…"
-msgstr "Öntanımlı 'Etiketleri Doldur' maskesi yükleniyor…"
+#~ msgid "Error: Cannot write configuration file: %s (%s)"
+#~ msgstr "Hata: Yapılandırma dosyası %s yazılamıyor (%s)"
 
-#. Fall back to defaults
-#: ../src/setting.c:1335
-msgid "Loading default 'Rename File' masks…"
-msgstr "Öntanımlı 'Dosya Yeniden Adlandırma' maskesi yükleniyor…"
+#~ msgid "Error while writing configuration file: %s"
+#~ msgstr "Yapılandırma dosyası yazılırken hata oluştu: %s"
 
-#. Fall back to defaults
-#: ../src/setting.c:1361
-msgid "Loading default 'Rename Directory' masks…"
-msgstr "Öntanımlı 'Dizin Yeniden Adlandırma' maskesi yükleniyor…"
+#~ msgid "Cannot open configuration file '%s' (%s)"
+#~ msgstr "'%s' yapılandırma dosyası açılamıyor (%s)"
 
-#: ../src/setting.c:1572
-#, c-format
-msgid "Migrating configuration from directory '%s' to '%s'"
-msgstr "Yapılandırma '%s' dizininden '%s' dizinine taşınıyor."
+#~ msgid "Loading default configuration"
+#~ msgstr "Öntanımlı yapılandırma yükleniyor"
 
-#: ../src/setting.c:1596
-#, c-format
-msgid "Failed to migrate configuration file '%s'"
-msgstr "'%s' yapılandırma dosyası taşınamadı"
+#~ msgid "Loading default 'Rename Directory' masks…"
+#~ msgstr "Öntanımlı 'Dizin Yeniden Adlandırma' maskesi yükleniyor…"
 
-#: ../src/setting.c:1633
-#, c-format
-msgid "Error: Cannot create directory '%s' (%s)"
-msgstr "Hata: '%s' dizini oluşturulamıyor (%s)"
+#~ msgid "Error: Cannot create directory '%s' (%s)"
+#~ msgstr "Hata: '%s' dizini oluşturulamıyor (%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' DLL'si henüz yüklenmedi. Yüklemeye çalışıyor..."
+#~ msgid "DLL '%s' not already loaded. Try loading it..."
+#~ msgstr "'%s' DLL'si henüz yüklenmedi. Yüklemeye çalışıyor..."
 
-#. 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' DLL'si yüklenemedi"
+#~ msgid "DLL '%s' could not be loaded"
+#~ msgstr "'%s' DLL'si yüklenemedi"
 
-#. 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 "Bu sürüm '%s' '%s' içeriyor"
+#~ msgid "This version of '%s' contains '%s'"
+#~ msgstr "Bu sürüm '%s' '%s' içeriyor"
 
-#. 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' işlevi '%s' DLL'de bulunamadı"
+#~ msgid "Function '%s' not found in DLL '%s'"
+#~ msgstr "'%s' işlevi '%s' DLL'de bulunamadı"
 
-#. 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 ayarlar dizini: '%s'"
+#~ msgid "EasyTAG settings directory: '%s'"
+#~ msgstr "EasyTAG ayarlar dizini: '%s'"
 
-#. Log_Print(_("weasytag_init start..."));
-#: ../src/win32/win32dep.c:472
-#, c-format
-msgid "weasytag_init start..."
-msgstr "weasytag_init başladı..."
+#~ msgid "weasytag_init start..."
+#~ msgstr "weasytag_init başladı..."
 
-#. 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 sürüm: %u.%u.%u\n"
+#~ msgid "GLib version: %u.%u.%u\n"
+#~ msgstr "GLib sürüm: %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 bitti..."
+#~ msgid "weasytag_init end..."
+#~ msgstr "weasytag_init bitti..."
 
-#. Log_Print(_("Audio player: '%s'"), player);
-#: ../src/win32/win32dep.c:620
-#, c-format
-msgid "Audio player: '%s'"
-msgstr "Ses Çalıcısı: '%s'"
+#~ msgid "Audio player: '%s'"
+#~ msgstr "Ses Çalıcısı: '%s'"
 
 #~ msgid ""
 #~ "\n"
@@ -5019,9 +6611,6 @@ msgstr "Ses Çalıcısı: '%s'"
 #~ msgid "Cannot create target directory '%s'"
 #~ msgstr "'%s' hedef dizini oluşturulamıyor"
 
-#~ msgid "Cannot create target directory '%s': %s"
-#~ msgstr "'%s' hedef dizini oluşturulamıyor: %s"
-
 #~ msgid "Renamed file '%s' to '%s'"
 #~ msgstr "'%s' dosyası '%s' olarak yeniden adlandırıldı"
 
@@ -5183,9 +6772,6 @@ msgstr "Ses Çalıcısı: '%s'"
 #~ msgid "Do you want to save anyway, overwriting the file?"
 #~ msgstr "Dosyanın üzerine yazılacak, yinede kaydetmek istiyor musunuz?"
 
-#~ msgid "Save"
-#~ msgstr "Kaydet"
-
 #~ msgid "Image file cannot be saved: %s"
 #~ msgstr "%s görüntü dosyası kaydedilemiyor"
 
diff --git a/src/about.c b/src/about.c
index 6cd010d..360beca 100644
--- a/src/about.c
+++ b/src/about.c
@@ -1,29 +1,28 @@
-/* about.c - 2000/05/05 */
-/*
- *  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>
+ * 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 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.
  */
 
 #include "config.h"
 
-#include <gtk/gtk.h>
+#include "about.h"
+
 #include <glib/gi18n.h>
 
-#include "about.h"
 #include "easytag.h"
 
 void
diff --git a/src/application.c b/src/application.c
index 7476fd6..a970cc4 100644
--- a/src/application.c
+++ b/src/application.c
@@ -20,14 +20,15 @@
 
 #include "application.h"
 
+#include <glib/gi18n.h>
+#include <stdlib.h>
+
 #include "about.h"
 #include "charset.h"
 #include "easytag.h"
 #include "log.h"
 #include "misc.h"
-
-#include <glib/gi18n.h>
-#include <stdlib.h>
+#include "setting.h"
 
 /* TODO: Use G_DEFINE_TYPE_WITH_PRIVATE. */
 G_DEFINE_TYPE (EtApplication, et_application, GTK_TYPE_APPLICATION)
@@ -110,7 +111,7 @@ on_idle_init (EtApplication *self)
     priv = et_application_get_instance_private (self);
 
     ET_Core_Free ();
-    ET_Core_Initialize ();
+    ET_Core_Create ();
 
     if (g_settings_get_boolean (MainSettings, "scan-startup"))
     {
diff --git a/src/application.h b/src/application.h
index 5195907..3a7f5cd 100644
--- a/src/application.h
+++ b/src/application.h
@@ -19,7 +19,6 @@
 #ifndef ET_APPLICATION_H_
 #define ET_APPLICATION_H_
 
-#include <gio/gio.h>
 #include <gtk/gtk.h>
 
 #include "application_window.h"
diff --git a/src/application_window.c b/src/application_window.c
index 3d2a424..db1318f 100644
--- a/src/application_window.c
+++ b/src/application_window.c
@@ -20,13 +20,13 @@
 
 #include "application_window.h"
 
-#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
 #include "browser.h"
 #include "cddb_dialog.h"
 #include "easytag.h"
 #include "file_area.h"
+#include "file_list.h"
 #include "load_files_dialog.h"
 #include "log.h"
 #include "misc.h"
@@ -288,8 +288,8 @@ delete_file (ET_File *ETFile, gboolean multiple_files, GError **error)
 {
     GtkWidget *msgdialog;
     GtkWidget *msgdialog_check_button = NULL;
-    gchar *cur_filename;
-    gchar *cur_filename_utf8;
+    const gchar *cur_filename;
+    const gchar *cur_filename_utf8;
     gchar *basename_utf8;
     gint response;
     gint stop_loop;
@@ -1482,7 +1482,7 @@ run_audio_player_using_directory (GError **error)
     for (l = g_list_first (ETCore->ETFileList); l != NULL; l = g_list_next (l))
     {
         ET_File *etfile = (ET_File *)l->data;
-        gchar *path = ((File_Name *)etfile->FileNameCur->data)->value;
+        const gchar *path = ((File_Name *)etfile->FileNameCur->data)->value;
         file_list = g_list_prepend (file_list, g_file_new_for_path (path));
     }
 
@@ -1592,7 +1592,10 @@ et_application_window_dispose (GObject *object)
 
     save_state (self);
 
-    ET_Core_Destroy ();
+    if (ETCore)
+    {
+        ET_Core_Free ();
+    }
 
     if (priv->cddb_dialog)
     {
diff --git a/src/browser.c b/src/browser.c
index 19eb418..e359395 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -28,25 +28,24 @@
 
 #include "browser.h"
 
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdk.h>
 #include <glib/gi18n.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <dirent.h>
 #include <string.h>
 #include <errno.h>
 
 #include "application_window.h"
+#include "charset.h"
+#include "dlm.h"
 #include "easytag.h"
 #include "et_core.h"
+#include "file_list.h"
 #include "scan_dialog.h"
 #include "log.h"
 #include "misc.h"
 #include "setting.h"
-#include "charset.h"
-#include "dlm.h"
 
 #include "win32/win32dep.h"
 
@@ -346,7 +345,7 @@ et_browser_run_player_for_album_list (EtBrowser *self)
     for (; l != NULL; l = g_list_next (l))
     {
         ET_File *etfile = (ET_File *)l->data;
-        gchar *path = ((File_Name *)etfile->FileNameCur->data)->value;
+        const gchar *path = ((File_Name *)etfile->FileNameCur->data)->value;
         file_list = g_list_prepend (file_list, g_file_new_for_path (path));
     }
 
@@ -388,7 +387,7 @@ et_browser_run_player_for_artist_list (EtBrowser *self)
         for (m = l->data; m != NULL; m = g_list_next (m))
         {
             ET_File *etfile = (ET_File *)m->data;
-            gchar *path = ((File_Name *)etfile->FileNameCur->data)->value;
+            const gchar *path = ((File_Name *)etfile->FileNameCur->data)->value;
             file_list = g_list_prepend (file_list, g_file_new_for_path (path));
         }
     }
@@ -423,7 +422,7 @@ et_browser_run_player_for_selection (EtBrowser *self)
     for (l = selfilelist; l != NULL; l = g_list_next (l))
     {
         ET_File *etfile = et_browser_get_et_file_from_path (self, l->data);
-        gchar *path = ((File_Name *)etfile->FileNameCur->data)->value;
+        const gchar *path = ((File_Name *)etfile->FileNameCur->data)->value;
         file_list = g_list_prepend (file_list, g_file_new_for_path (path));
     }
 
@@ -1189,6 +1188,7 @@ Browser_List_Row_Selected (EtBrowser *self, GtkTreeSelection *selection)
      */
     if (n_selected == 0)
     {
+        /* TODO: Clear the tag area and file area. */
         return;
     }
 
@@ -1203,11 +1203,16 @@ Browser_List_Row_Selected (EtBrowser *self, GtkTreeSelection *selection)
     if (gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->file_model),
                                  &cursor_iter, cursor_path))
     {
-        gtk_tree_model_get (GTK_TREE_MODEL (priv->file_model),
-                            &cursor_iter, LIST_FILE_POINTER,
-                            &cursor_et_file, -1);
-        et_application_window_select_file_by_et_file (ET_APPLICATION_WINDOW (MainWindow),
-                                                      cursor_et_file);
+        if (gtk_tree_selection_iter_is_selected (selection, &cursor_iter))
+        {
+            gtk_tree_model_get (GTK_TREE_MODEL (priv->file_model),
+                                &cursor_iter, LIST_FILE_POINTER,
+                                &cursor_et_file, -1);
+            et_application_window_select_file_by_et_file (ET_APPLICATION_WINDOW (MainWindow),
+                                                          cursor_et_file);
+        }
+        /* TODO: Clear the tag/file area if the cursor row was unselected, such
+         * as by inverting the selection or Ctrl-clicking. */
     }
     else
     {
@@ -1263,8 +1268,8 @@ et_browser_load_file_list (EtBrowser *self,
     for (l = g_list_first (etfilelist); l != NULL; l = g_list_next (l))
     {
         guint fileKey = ((ET_File *)l->data)->ETFileKey;
-        gchar *current_filename_utf8 = ((File_Name *)((ET_File *)l->data)->FileNameCur->data)->value_utf8;
-        gchar *basename_utf8         = g_path_get_basename(current_filename_utf8);
+        const gchar *current_filename_utf8 = ((File_Name *)((ET_File *)l->data)->FileNameCur->data)->value_utf8;
+        gchar *basename_utf8 = g_path_get_basename (current_filename_utf8);
         File_Tag *FileTag = ((File_Tag *)((ET_File *)l->data)->FileTag->data);
         gchar *track;
         gchar *disc;
@@ -1274,7 +1279,7 @@ et_browser_load_file_list (EtBrowser *self,
         {
             gchar *dir1_utf8;
             gchar *dir2_utf8;
-            gchar *previous_filename_utf8 = ((File_Name *)((ET_File *)l->prev->data)->FileNameCur->data)->value_utf8;
+            const gchar *previous_filename_utf8 = ((File_Name *)((ET_File *)l->prev->data)->FileNameCur->data)->value_utf8;
 
             dir1_utf8 = g_path_get_dirname(previous_filename_utf8);
             dir2_utf8 = g_path_get_dirname(current_filename_utf8);
@@ -1344,9 +1349,6 @@ void
 et_browser_refresh_list (EtBrowser *self)
 {
     EtBrowserPrivate *priv;
-    ET_File   *ETFile;
-    File_Tag  *FileTag;
-    File_Name *FileName;
     //GtkTreeIter iter;
     GtkTreePath *currentPath = NULL;
     GtkTreeIter iter;
@@ -1376,6 +1378,9 @@ et_browser_refresh_list (EtBrowser *self)
     valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(priv->file_model), &iter, currentPath);
     while (valid)
     {
+        const ET_File *ETFile;
+        const File_Tag *FileTag;
+        const File_Name *FileName;
         // Refresh filename and other fields
         gtk_tree_model_get(GTK_TREE_MODEL(priv->file_model), &iter,
                            LIST_FILE_POINTER, &ETFile, -1);
@@ -1467,9 +1472,9 @@ et_browser_refresh_file_in_list (EtBrowser *self,
     GVariant *variant;
     GtkTreeSelection *selection;
     GtkTreeIter selectedIter;
-    ET_File   *etfile;
-    File_Tag  *FileTag;
-    File_Name *FileName;
+    const ET_File *etfile;
+    const File_Tag *FileTag;
+    const File_Name *FileName;
     gboolean row_found = FALSE;
     gchar *current_basename_utf8;
     gchar *track;
@@ -4385,6 +4390,7 @@ Rename_Directory (EtBrowser *self)
     new_path = g_strconcat(directory_parent, directory_new_name_file, NULL);
     new_path_utf8 = filename_to_display(new_path);
 
+    /* TODO: Replace with g_open_dir() (or more likely g_file_move()). */
     /* Check if the new directory name doesn't already exists, and detect if
      * it's only a case change (needed for vfat) */
     if ( (dir=opendir(new_path))!=NULL )
@@ -4721,7 +4727,6 @@ Run_Program_With_Selected_Files (EtBrowser *self)
 {
     EtBrowserPrivate *priv;
     gchar   *program_name;
-    ET_File *ETFile;
     GList   *selected_paths;
     GList *l;
     GList   *args_list = NULL;
@@ -4745,6 +4750,8 @@ Run_Program_With_Selected_Files (EtBrowser *self)
         if (gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->file_model), &iter,
                                      (GtkTreePath *)l->data))
         {
+            const ET_File *ETFile;
+
             gtk_tree_model_get (GTK_TREE_MODEL (priv->file_model), &iter,
                                 LIST_FILE_POINTER, &ETFile, -1);
 
diff --git a/src/browser.h b/src/browser.h
index f9fa977..92cf503 100644
--- a/src/browser.h
+++ b/src/browser.h
@@ -21,12 +21,12 @@
 #ifndef ET_BROWSER_H_
 #define ET_BROWSER_H_
 
-#include "et_core.h"
-
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
+#include "et_core.h"
+
 #define ET_TYPE_BROWSER (et_browser_get_type ())
 #define ET_BROWSER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), ET_TYPE_BROWSER, EtBrowser))
 
diff --git a/src/cddb_dialog.c b/src/cddb_dialog.c
index c459d28..7df3964 100644
--- a/src/cddb_dialog.c
+++ b/src/cddb_dialog.c
@@ -19,8 +19,8 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
+#include "cddb_dialog.h"
+
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -39,7 +39,6 @@
 #include <errno.h>
 
 #include "application_window.h"
-#include "cddb_dialog.h"
 #include "easytag.h"
 #include "enums.h"
 #include "et_core.h"
@@ -820,6 +819,12 @@ Cddb_Write_Result_To_File (EtCDDBDialog *self,
     return 0;
 }
 
+static void
+cddb_track_frame_offset_free (CddbTrackFrameOffset *offset)
+{
+    g_slice_free (CddbTrackFrameOffset, offset);
+}
+
 /*
  * Look up a specific album in freedb, and save to a CddbAlbum structure
  */
@@ -870,17 +875,6 @@ Cddb_Get_Album_Tracks_List (EtCDDBDialog *self, GtkTreeSelection* selection)
     cddb_server_port     = cddbalbum->server_port;
     cddb_server_cgi_path = cddbalbum->server_cgi_path;
 
-    if (!cddb_server_name)
-    {
-        // Local access
-        if ( (file=fopen(cddb_server_cgi_path,"r"))==0 )
-        {
-            Log_Print (LOG_ERROR, _("Cannot load file ‘%s’: %s"),
-                       cddb_server_cgi_path, g_strerror (errno));
-            return FALSE;
-        }
-
-    }else
     {
         /* Connection to the server. */
         proxy_enabled = g_settings_get_boolean (MainSettings,
@@ -1071,7 +1065,7 @@ Cddb_Get_Album_Tracks_List (EtCDDBDialog *self, GtkTreeSelection* selection)
         {
             if ( strtoul(cddb_out+1,NULL,10)>0 )
             {
-                CddbTrackFrameOffset *cddbtrackframeoffset = g_malloc0(sizeof(CddbTrackFrameOffset));
+                CddbTrackFrameOffset *cddbtrackframeoffset = g_slice_new (CddbTrackFrameOffset);
                 cddbtrackframeoffset->offset = strtoul(cddb_out+1,NULL,10);
                 TrackOffsetList = g_list_append(TrackOffsetList,cddbtrackframeoffset);
             }else
@@ -1087,7 +1081,7 @@ Cddb_Get_Album_Tracks_List (EtCDDBDialog *self, GtkTreeSelection* selection)
             cddbalbum->duration = atoi(strchr(cddb_out,':')+1);
             if (TrackOffsetList) // As it must be the last item, do nothing if no previous data
             {
-                CddbTrackFrameOffset *cddbtrackframeoffset = g_malloc0(sizeof(CddbTrackFrameOffset));
+                CddbTrackFrameOffset *cddbtrackframeoffset = g_slice_new (CddbTrackFrameOffset);
                 cddbtrackframeoffset->offset = cddbalbum->duration * 75; // It's the last offset
                 TrackOffsetList = g_list_append(TrackOffsetList,cddbtrackframeoffset);
             }
@@ -1151,7 +1145,7 @@ Cddb_Get_Album_Tracks_List (EtCDDBDialog *self, GtkTreeSelection* selection)
         {
             CddbTrackAlbum *cddbtrackalbum_last = NULL;
 
-            CddbTrackAlbum *cddbtrackalbum = g_malloc0(sizeof(CddbTrackAlbum));
+            CddbTrackAlbum *cddbtrackalbum = g_slice_new0 (CddbTrackAlbum);
             cddbtrackalbum->cddbalbum = cddbalbum; // To find the CddbAlbum father quickly
 
             // Here is a fix when TTITLExx doesn't contain an "=", we skip the line
@@ -1180,9 +1174,9 @@ Cddb_Get_Album_Tracks_List (EtCDDBDialog *self, GtkTreeSelection* selection)
 
                 cddbtrackalbum_last->track_name = Try_To_Validate_Utf8_String(track_name);
 
-                // Frees useless allocated data previously
+                /* Frees useless allocated data previously. */
                 g_free(cddbtrackalbum->track_name);
-                g_free(cddbtrackalbum);
+                g_slice_free (CddbTrackAlbum, cddbtrackalbum);
             }else
             {
                 if (TrackOffsetList && TrackOffsetList->next)
@@ -1242,7 +1236,8 @@ Cddb_Get_Album_Tracks_List (EtCDDBDialog *self, GtkTreeSelection* selection)
 
     show_album_info (self, gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->album_list_view)));
 
-    g_list_free_full (g_list_first (TrackOffsetList), (GDestroyNotify)g_free);
+    g_list_free_full (g_list_first (TrackOffsetList),
+                      (GDestroyNotify)cddb_track_frame_offset_free);
     return TRUE;
 }
 
@@ -1370,8 +1365,7 @@ Cddb_Free_Album_List (EtCDDBDialog *self)
             g_free(cddbalbum->genre);
             g_free(cddbalbum->year);
 
-            g_free(cddbalbum);
-            cddbalbum = NULL;
+            g_slice_free (CddbAlbum, cddbalbum);
         }
     }
 
@@ -1690,7 +1684,7 @@ Cddb_Search_Album_List_From_String_Freedb (EtCDDBDialog *self)
             gchar *copy;
             CddbAlbum *cddbalbum;
 
-            cddbalbum = g_malloc0(sizeof(CddbAlbum));
+            cddbalbum = g_slice_new0 (CddbAlbum);
 
 
             // Parameters of the server used
@@ -2040,7 +2034,7 @@ Cddb_Search_Album_List_From_String_Gnudb (EtCDDBDialog *self)
                 gchar *valid;
                 CddbAlbum *cddbalbum;
 
-                cddbalbum = g_malloc0(sizeof(CddbAlbum));
+                cddbalbum = g_slice_new0 (CddbAlbum);
 
                 // Parameters of the server used
                 cddbalbum->server_name     = g_strdup(cddb_server_name);
@@ -2374,29 +2368,29 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
 
                 if (set_fields & ET_CDDB_SET_FIELD_TITLE)
                 {
-                    ET_Set_Field_File_Tag_Item (&FileTag->title,
-                                                cddbtrackalbum->track_name);
+                    et_file_tag_set_title (FileTag,
+                                           cddbtrackalbum->track_name);
                 }
 
                 if ((set_fields & ET_CDDB_SET_FIELD_ARTIST)
                     && cddbtrackalbum->cddbalbum->artist)
                 {
-                    ET_Set_Field_File_Tag_Item (&FileTag->artist,
-                                                cddbtrackalbum->cddbalbum->artist);
+                    et_file_tag_set_artist (FileTag,
+                                            cddbtrackalbum->cddbalbum->artist);
                 }
 
                 if ((set_fields & ET_CDDB_SET_FIELD_ALBUM)
                     && cddbtrackalbum->cddbalbum->album)
                 {
-                    ET_Set_Field_File_Tag_Item (&FileTag->album,
-                                                cddbtrackalbum->cddbalbum->album);
+                    et_file_tag_set_album (FileTag,
+                                           cddbtrackalbum->cddbalbum->album);
                 }
 
                 if ((set_fields & ET_CDDB_SET_FIELD_YEAR)
                     && cddbtrackalbum->cddbalbum->year)
                 {
-                    ET_Set_Field_File_Tag_Item (&FileTag->year,
-                                                cddbtrackalbum->cddbalbum->year);
+                    et_file_tag_set_year (FileTag,
+                                          cddbtrackalbum->cddbalbum->year);
                 }
 
                 if (set_fields & ET_CDDB_SET_FIELD_TRACK)
@@ -2405,7 +2399,7 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
 
                     track_number = et_track_number_to_string (cddbtrackalbum->track_number);
 
-                    ET_Set_Field_File_Tag_Item (&FileTag->track, track_number);
+                    et_file_tag_set_track_number (FileTag, track_number);
 
                     g_free (track_number);
                 }
@@ -2416,8 +2410,7 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
 
                     track_total = et_track_number_to_string (list_length);
 
-                    ET_Set_Field_File_Tag_Item (&FileTag->track_total,
-                                                track_total);
+                    et_file_tag_set_track_total (FileTag, track_total);
 
                     g_free (track_total);
                 }
@@ -2429,13 +2422,13 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
                     if (cddbtrackalbum->cddbalbum->genre
                         && g_utf8_strlen (cddbtrackalbum->cddbalbum->genre, -1) > 0)
                     {
-                        ET_Set_Field_File_Tag_Item (&FileTag->genre,
-                                                    Cddb_Get_Id3_Genre_From_Cddb_Genre (cddbtrackalbum->cddbalbum->genre));
+                        et_file_tag_set_genre (FileTag,
+                                               Cddb_Get_Id3_Genre_From_Cddb_Genre (cddbtrackalbum->cddbalbum->genre));
                     }
                     else
                     {
-                        ET_Set_Field_File_Tag_Item (&FileTag->genre,
-                                                    Cddb_Get_Id3_Genre_From_Cddb_Genre (cddbtrackalbum->cddbalbum->category));
+                        et_file_tag_set_genre (FileTag,
+                                               Cddb_Get_Id3_Genre_From_Cddb_Genre (cddbtrackalbum->cddbalbum->category));
                     }
                 }
             }
@@ -2504,29 +2497,29 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
 
                 if (set_fields & ET_CDDB_SET_FIELD_TITLE)
                 {
-                    ET_Set_Field_File_Tag_Item (&FileTag->title,
-                                                cddbtrackalbum->track_name);
+                    et_file_tag_set_title (FileTag,
+                                           cddbtrackalbum->track_name);
                 }
 
                 if ((set_fields & ET_CDDB_SET_FIELD_ARTIST)
                     && cddbtrackalbum->cddbalbum->artist)
                 {
-                    ET_Set_Field_File_Tag_Item (&FileTag->artist,
-                                                cddbtrackalbum->cddbalbum->artist);
+                    et_file_tag_set_artist (FileTag,
+                                            cddbtrackalbum->cddbalbum->artist);
                 }
 
                 if ((set_fields & ET_CDDB_SET_FIELD_ALBUM)
                     && cddbtrackalbum->cddbalbum->album)
                 {
-                    ET_Set_Field_File_Tag_Item (&FileTag->album,
-                                                cddbtrackalbum->cddbalbum->album);
+                    et_file_tag_set_album (FileTag,
+                                           cddbtrackalbum->cddbalbum->album);
                 }
 
                 if ((set_fields & ET_CDDB_SET_FIELD_YEAR)
                     && cddbtrackalbum->cddbalbum->year)
                 {
-                    ET_Set_Field_File_Tag_Item (&FileTag->year,
-                                                cddbtrackalbum->cddbalbum->year);
+                    et_file_tag_set_year (FileTag,
+                                          cddbtrackalbum->cddbalbum->year);
                 }
 
                 if (set_fields & ET_CDDB_SET_FIELD_TRACK)
@@ -2535,7 +2528,7 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
 
                     track_number = et_track_number_to_string (cddbtrackalbum->track_number);
 
-                    ET_Set_Field_File_Tag_Item (&FileTag->track, track_number);
+                    et_file_tag_set_track_number (FileTag, track_number);
 
                     g_free (track_number);
                 }
@@ -2546,8 +2539,7 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
 
                     track_total = et_track_number_to_string (list_length);
 
-                    ET_Set_Field_File_Tag_Item (&FileTag->track_total,
-                                                track_total);
+                    et_file_tag_set_track_total (FileTag, track_total);
 
                     g_free (track_total);
                 }
@@ -2559,13 +2551,13 @@ Cddb_Set_Track_Infos_To_File_List (EtCDDBDialog *self)
                     if (cddbtrackalbum->cddbalbum->genre
                         && g_utf8_strlen (cddbtrackalbum->cddbalbum->genre, -1) > 0)
                     {
-                        ET_Set_Field_File_Tag_Item (&FileTag->genre,
-                                                    Cddb_Get_Id3_Genre_From_Cddb_Genre (cddbtrackalbum->cddbalbum->genre));
+                        et_file_tag_set_genre (FileTag,
+                                               Cddb_Get_Id3_Genre_From_Cddb_Genre (cddbtrackalbum->cddbalbum->genre));
                     }
                     else
                     {
-                        ET_Set_Field_File_Tag_Item (&FileTag->genre,
-                                                    Cddb_Get_Id3_Genre_From_Cddb_Genre (cddbtrackalbum->cddbalbum->category));
+                        et_file_tag_set_genre (FileTag,
+                                               Cddb_Get_Id3_Genre_From_Cddb_Genre (cddbtrackalbum->cddbalbum->category));
                     }
                 }
             }
@@ -3225,11 +3217,11 @@ Cddb_Free_Track_Album_List (GList *track_list)
     for (l = track_list; l != NULL; l = g_list_next (l))
     {
         CddbTrackAlbum *cddbtrackalbum = l->data;
+
         if (cddbtrackalbum)
         {
             g_free(cddbtrackalbum->track_name);
-            g_free(cddbtrackalbum);
-            cddbtrackalbum = NULL;
+            g_slice_free (CddbTrackAlbum, cddbtrackalbum);
         }
     }
 
@@ -3580,6 +3572,7 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
                     && strstr (cddb_out_tmp, CDDB_END_STR) != NULL)
                 {
                     g_free (cddb_out);
+                    cddb_out = NULL;
                     break;
                 }
 
@@ -3597,7 +3590,7 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
                     gchar* ptr;
                     CddbAlbum *cddbalbum;
 
-                    cddbalbum = g_malloc0(sizeof(CddbAlbum));
+                    cddbalbum = g_slice_new0 (CddbAlbum);
 
                     // Parameters of the server used
                     cddbalbum->server_name     = g_strdup(cddb_server_name);
@@ -3631,6 +3624,7 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
 
                 g_free(cddb_out);
             }
+            g_free (cddb_out);
             g_free(cddb_server_name);
             g_free(cddb_server_cgi_path);
             g_free (proxy_hostname);
diff --git a/src/charset.c b/src/charset.c
index 661b625..4ad9c77 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -25,9 +25,6 @@
 #include "charset.h"
 
 #include <stdlib.h>
-#include <glib.h>
-#include <string.h>
-#include <errno.h>
 #include <glib/gi18n.h>
 
 #ifdef HAVE_LANGINFO_CODESET
diff --git a/src/core_types.h b/src/core_types.h
new file mode 100644
index 0000000..36e5050
--- /dev/null
+++ b/src/core_types.h
@@ -0,0 +1,123 @@
+/* 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 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_CORE_TYPES_H_
+#define ET_CORE_TYPES_H_
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+/*
+ * ET_File_Type:
+ * @MP2_FILE: MPEG audio Layer 2: .mp2 (.mpg) (.mpga)
+ * @MP3_FILE: MPEG audio Layer 3: .mp3 (.mpg) (.mpga)
+ * @MP4_FILE: MPEG audio Layer 4 / AAC: .mp4 (.m4a) (.m4p) (.m4v)
+ * @OGG_FILE: Ogg Vorbis audio: .ogg (.ogm)
+ * @FLAC_FILE: FLAC (lossless): .flac .fla
+ * @MPC_FILE: MusePack: .mpc .mp+ .mpp
+ * @MAC_FILE: Monkey's Audio (lossless): .ape (.mac)
+ * @SPEEX_FILE: Speech audio files: .spx
+ * @OFR_FILE: OptimFROG (lossless): .ofr .ofs
+ * @WAVPACK_FILE: Wavpack (lossless): .wv
+ * @OPUS_FILE: Ogg Opus audio: .opus
+ * @UNKNOWN_FILE: not a recognized file
+ * Types of files
+ */
+typedef enum
+{ /* (.ext) is not so popular. */
+    MP2_FILE = 0,
+    MP3_FILE,
+    MP4_FILE,
+    OGG_FILE,
+    FLAC_FILE,
+    MPC_FILE,
+    MAC_FILE,
+    SPEEX_FILE,
+    OFR_FILE,
+    WAVPACK_FILE,
+    OPUS_FILE,
+    UNKNOWN_FILE
+} ET_File_Type;
+
+/*
+ * Types of tags
+ */
+typedef enum
+{
+    ID3_TAG = 0,
+    OGG_TAG,
+    APE_TAG,
+    FLAC_TAG,
+    MP4_TAG,
+    WAVPACK_TAG,
+    OPUS_TAG,
+    UNKNOWN_TAG
+} ET_Tag_Type;
+
+/*
+ * Structure containing informations of the header of file
+ * Nota: This struct was copied from an "MP3 structure", and will change later.
+ */
+typedef struct
+{
+    gint version;               /* Version of bitstream (mpeg version for mp3, encoder version for ogg) */
+    gint mpeg25;                /* Version is MPEG 2.5? */
+    gint layer;                 /* "MP3 data" */
+    gint bitrate;               /* Bitrate (kb/s) */
+    gboolean variable_bitrate;  /* Is a VBR file? */
+    gint samplerate;            /* Samplerate (Hz) */
+    gint mode;                  /* Stereo, ... or channels for ogg */
+    goffset size;               /* The size of file (in bytes) */
+    gint duration;              /* The duration of file (in seconds) */
+    gchar *mpc_profile;         /* MPC data */
+    gchar *mpc_version;         /* MPC data : encoder version  (also for Speex) */
+} ET_File_Info;
+
+/*
+ * EtFileHeaderFields:
+ * @description: a description of the file type, such as MP3 File
+ * @version_label: the label for the encoder version, such as MPEG
+ * @version: the encoder version (such as 2, Layer III)
+ * @bitrate: the bitrate of the file (not the bit depth of the samples)
+ * @samplerate: the sample rate of the primary audio track, generally in Hz
+ * @mode_label: the label for the audio mode, for example Mode
+ * @mode: the audio mode (stereo, mono, and so on)
+ * @size: the size of the audio file
+ * @duration: the length of the primary audio track
+ *
+ * UI-visible strings, populated by the tagging support code to be displayed in
+ * the EtFileArea.
+ */
+typedef struct
+{
+    /*< public >*/
+    gchar *description;
+    gchar *version_label;
+    gchar *version;
+    gchar *bitrate;
+    gchar *samplerate;
+    gchar *mode_label;
+    gchar *mode;
+    gchar *size;
+    gchar *duration;
+} EtFileHeaderFields;
+
+G_END_DECLS
+
+#endif /* ET_TYPES_H_ */
diff --git a/src/crc32.c b/src/crc32.c
index 88469cf..2fc91a6 100644
--- a/src/crc32.c
+++ b/src/crc32.c
@@ -1,25 +1,23 @@
-/* crc32.c - the crc check algorithm for cksfv modified by oliver for easytag
-
-   Copyright (C) 2000 Bryan Call <bc at fodder.org>
-   Copyright (C) 2003 Oliver Schinagl <oliver at are-b.org>
-
-   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. */
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
+ * Copyright (C) 2000 Bryan Call <bc at fodder.org>
+ * Copyright (C) 2003 Oliver Schinagl <oliver at are-b.org>
+ *
+ * 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 <stdio.h>
-#include <glib.h>
-#include <gio/gio.h>
 #include "crc32.h"
 
 #define BUFFERSIZE 16384   /* (16k) buffer size for reading from the file */
@@ -96,7 +94,7 @@ static const guint32 crc32table[] = {
 
 /*
  * crc32_file_with_ID3_tag:
- * @filename: (type filename): an absolute path
+ * @file: a file from which to read audio data
  * @main_val: (out): the CRC32 value
  *
  * Calculate the CRC32 value of audio data (skips the ID3v2 and ID3v1 tags).
@@ -104,12 +102,13 @@ static const guint32 crc32table[] = {
  * Returns: %TRUE if the CRC calculation was successful, %FALSE otherwise
  */
 gboolean
-crc32_file_with_ID3_tag (const gchar *filename, guint32 *crc32, GError **err)
+crc32_file_with_ID3_tag (GFile *file,
+                         guint32 *crc32,
+                         GError **err)
 {
     gchar buf[BUFFERSIZE], *p;
     gint nr;
     guint32 crc = ~0, crc32_total = ~0;
-    GFile *file;
     guchar tmp_id3[4];
     glong id3v2size = 0;
     GFileInfo *info;
@@ -118,16 +117,14 @@ crc32_file_with_ID3_tag (const gchar *filename, guint32 *crc32, GError **err)
     gsize bytes_read;
     gboolean has_id3v1 = FALSE;
 
-    g_return_val_if_fail (filename != NULL, FALSE);
+    g_return_val_if_fail (file != NULL, FALSE);
     g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
-    file = g_file_new_for_path (filename);
     info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SIZE,
                               G_FILE_QUERY_INFO_NONE, NULL, err);
 
     if (!info)
     {
-        g_object_unref (file);
         g_assert (err == NULL || *err != NULL);
         return FALSE;
     }
@@ -138,7 +135,6 @@ crc32_file_with_ID3_tag (const gchar *filename, guint32 *crc32, GError **err)
     if (!istream)
     {
         g_object_unref (info);
-        g_object_unref (file);
         g_assert (err == NULL || *err != NULL);
         return FALSE;
     }
@@ -249,7 +245,6 @@ crc32_file_with_ID3_tag (const gchar *filename, guint32 *crc32, GError **err)
 out:
     g_object_unref (info);
     g_object_unref (istream);
-    g_object_unref (file);
     *crc32 = ~crc;
 
     return nr == 0;
diff --git a/src/crc32.h b/src/crc32.h
index 0560106..bd39f85 100644
--- a/src/crc32.h
+++ b/src/crc32.h
@@ -1,29 +1,33 @@
-/* crc32.h - the crc check algorithm for cksfv modified by oliver for easytag
-   
-   Copyright (C) 2000 Bryan Call <bc at fodder.org>
-   Copyright (C) 2003 Oliver Schinagl <oliver at are-b.org>
-
-   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 __CRC32_H__
-#define __CRC32_H__
-
-
-gboolean crc32_file_with_ID3_tag (const gchar *filename, guint32 *crc32,
-                                  GError **err);
-
-
-#endif /* __CRC32_H__ */
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
+ * Copyright (C) 2000 Bryan Call <bc at fodder.org>
+ * Copyright (C) 2003 Oliver Schinagl <oliver at are-b.org>
+ *
+ * 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_CRC32_H_
+#define ET_CRC32_H_
+
+#include <glib.h>
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+gboolean crc32_file_with_ID3_tag (GFile *file, guint32 *crc32, GError **err);
+
+G_END_DECLS
+
+#endif /* ET_CRC32_H_ */
diff --git a/src/easytag.c b/src/easytag.c
index 8a90ea5..d48810e 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -17,46 +17,30 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "config.h" // For definition of ENABLE_OGG
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <string.h>
-#include <gdk/gdkkeysyms.h>
+#include "config.h"
+
+#include "easytag.h"
+
 #include <glib/gi18n.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <errno.h>
-#ifdef ENABLE_MP3
-#include <id3tag.h>
-#endif
-#if defined ENABLE_MP3 && defined ENABLE_ID3LIB
-#include <id3.h>
-#endif
 #include <sys/types.h>
 
-#include "easytag.h"
 #include "application_window.h"
 #include "browser.h"
+#include "file_description.h"
+#include "file_list.h"
 #include "log.h"
 #include "misc.h"
 #include "cddb_dialog.h"
-#include "preferences_dialog.h"
 #include "setting.h"
 #include "scan_dialog.h"
-#include "mpeg_header.h"
-#include "id3_tag.h"
-#include "ogg_tag.h"
 #include "et_core.h"
-#include "picture.h"
 #include "charset.h"
 
 #include "win32/win32dep.h"
 
-
-/****************
- * Declarations *
- ****************/
 static GtkWidget *QuitRecursionWindow = NULL;
 
 /* Used to force to hide the msgbox when saving tag */
@@ -68,14 +52,6 @@ static gboolean SF_HideMsgbox_Rename_File;
 /* To remember which button was pressed when renaming file */
 static gint SF_ButtonPressed_Rename_File;
 
-#ifdef ENABLE_FLAC
-    #include <FLAC/metadata.h>
-#endif
-
-
-/**************
- * Prototypes *
- **************/
 static gboolean Write_File_Tag (ET_File *ETFile, gboolean hide_msgbox);
 static gint Save_File (ET_File *ETFile, gboolean multiple_files,
                        gboolean force_saving_files);
@@ -201,11 +177,11 @@ Save_List_Of_Files (GList *etfilelist, gboolean force_saving_files)
         GFile *file;
         GFileInfo *fileinfo;
 
-        ET_File *ETFile = (ET_File *)l->data;
-        File_Tag  *FileTag  = (File_Tag *)ETFile->FileTag->data;
-        File_Name *FileName = (File_Name *)ETFile->FileNameNew->data;
-        gchar *filename_cur = ((File_Name *)ETFile->FileNameCur->data)->value;
-        gchar *filename_cur_utf8 = ((File_Name *)ETFile->FileNameCur->data)->value_utf8;
+        const ET_File *ETFile = (ET_File *)l->data;
+        const File_Tag  *FileTag  = (File_Tag *)ETFile->FileTag->data;
+        const File_Name *FileName = (File_Name *)ETFile->FileNameNew->data;
+        const gchar *filename_cur = ((File_Name *)ETFile->FileNameCur->data)->value;
+        const gchar *filename_cur_utf8 = ((File_Name *)ETFile->FileNameCur->data)->value_utf8;
         gchar *basename_cur_utf8 = g_path_get_basename(filename_cur_utf8);
 
         // Count only the changed files or all files if force_saving_files==TRUE
@@ -402,13 +378,11 @@ static gint
 Save_File (ET_File *ETFile, gboolean multiple_files,
            gboolean force_saving_files)
 {
-    File_Tag  *FileTag;
-    File_Name *FileNameNew;
+    const File_Tag *FileTag;
+    const File_Name *FileNameNew;
     gint stop_loop = 0;
-    //struct stat   statbuf;
-    //gchar *filename_cur = ((File_Name *)ETFile->FileNameCur->data)->value;
-    gchar *filename_cur_utf8 = ((File_Name *)ETFile->FileNameCur->data)->value_utf8;
-    gchar *filename_new_utf8 = ((File_Name *)ETFile->FileNameNew->data)->value_utf8;
+    const gchar *filename_cur_utf8 = ((File_Name *)ETFile->FileNameCur->data)->value_utf8;
+    const gchar *filename_new_utf8 = ((File_Name *)ETFile->FileNameNew->data)->value_utf8;
     gchar *basename_cur_utf8, *basename_new_utf8;
     gchar *dirname_cur_utf8, *dirname_new_utf8;
 
@@ -658,8 +632,8 @@ Save_File (ET_File *ETFile, gboolean multiple_files,
             {
                 gboolean rc;
                 GError *error = NULL;
-                gchar *cur_filename = ((File_Name *)ETFile->FileNameCur->data)->value;
-                gchar *new_filename = ((File_Name *)ETFile->FileNameNew->data)->value;
+                const gchar *cur_filename = ((File_Name *)ETFile->FileNameCur->data)->value;
+                const gchar *new_filename = ((File_Name *)ETFile->FileNameNew->data)->value;
                 rc = et_rename_file (cur_filename, new_filename, &error);
 
                 // if 'SF_HideMsgbox_Rename_File is TRUE', then errors are displayed only in log
@@ -769,12 +743,10 @@ et_rename_file (const char *old_filepath, const char *new_filepath,
         /* Ignore an error if the directory already exists. */
         if (!g_error_matches (*error, G_IO_ERROR, G_IO_ERROR_EXISTS))
         {
-            g_object_unref (file_old);
-            g_object_unref (file_new);
             g_object_unref (file_new_parent);
-            g_assert (error == NULL || *error != NULL);
-            return FALSE;
+            goto err;
         }
+
         g_clear_error (error);
     }
 
@@ -858,7 +830,6 @@ out:
     return TRUE;
 
 err:
-    g_object_unref (file_new_parent);
     g_object_unref (file_old);
     g_object_unref (file_new);
     g_assert (error == NULL || *error != NULL);
@@ -874,7 +845,7 @@ static gboolean
 Write_File_Tag (ET_File *ETFile, gboolean hide_msgbox)
 {
     GError *error = NULL;
-    gchar *cur_filename_utf8 = ((File_Name *)ETFile->FileNameCur->data)->value_utf8;
+    const gchar *cur_filename_utf8 = ((File_Name *)ETFile->FileNameCur->data)->value_utf8;
     gchar *msg = NULL;
     gchar *basename_utf8;
     GtkWidget *msgdialog;
@@ -949,8 +920,8 @@ Read_Directory (const gchar *path_real)
     ReadingDirectory = TRUE;    /* A flag to avoid to start another reading */
 
     /* Initialize file list */
-    ET_Core_Free();
-    ET_Core_Initialize();
+    ET_Core_Free ();
+    ET_Core_Create ();
     et_application_window_update_actions (ET_APPLICATION_WINDOW (MainWindow));
 
     window = ET_APPLICATION_WINDOW (MainWindow);
@@ -1192,7 +1163,7 @@ read_directory_recursively (GList *file_list, GFileEnumerator *dir_enumerator,
                 }
             }
             else if (type == G_FILE_TYPE_REGULAR &&
-                      ET_File_Is_Supported (file_name))
+                     et_file_is_supported (file_name))
             {
                 GFile *file = g_file_get_child (g_file_enumerator_get_container (dir_enumerator),
                                                 file_name);
diff --git a/src/easytag.h b/src/easytag.h
index cae28ad..2047657 100644
--- a/src/easytag.h
+++ b/src/easytag.h
@@ -1,4 +1,3 @@
-/* easytag.h - 2000/04/28 */
 /*
  *  EasyTAG - Tag editor for MP3 and Ogg Vorbis files
  *  Copyright (C) 2000-2003  Jerome Couderc <easytag at gmail.com>
@@ -19,19 +18,17 @@
  */
 
 
-#ifndef __EASYTAG_H__
-#define __EASYTAG_H__
+#ifndef ET_EASYTAG_H_
+#define ET_EASYTAG_H_
 
-
-/* 'include' and 'define' created by autoconf/automake */
 #include "config.h"
 
-#include "et_core.h"
+#include <gtk/gtk.h>
 
+#include "et_core.h"
 
 #define MAX_STRING_LEN     1024
 
-
 /***************
  * Declaration *
  ***************/
diff --git a/src/et_core.c b/src/et_core.c
index a07b0f9..ebe33c0 100644
--- a/src/et_core.c
+++ b/src/et_core.c
@@ -17,274 +17,35 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
-
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <utime.h>
-#include <ctype.h>
-#include <locale.h>
-#include <errno.h>
-
-#include "application_window.h"
-#include "easytag.h"
 #include "et_core.h"
-#include "mpeg_header.h"
-#include "monkeyaudio_header.h"
-#include "musepack_header.h"
-#ifdef ENABLE_MP3
-#   include "id3_tag.h"
-#endif
-#include "picture.h"
-#include "ape_tag.h"
-#ifdef ENABLE_OGG
-#   include "ogg_header.h"
-#   include "ogg_tag.h"
-#endif
-#ifdef ENABLE_FLAC
-#   include "flac_header.h"
-#   include "flac_tag.h"
-#endif
-#ifdef ENABLE_MP4
-#   include "mp4_header.h"
-#   include "mp4_tag.h"
-#endif
-#ifdef ENABLE_WAVPACK
-#   include "wavpack_header.h"
-#   include "wavpack_tag.h"
-#endif
-#ifdef ENABLE_OPUS
-#include "opus_tag.h"
-#include "opus_header.h"
-#endif
-#include "browser.h"
-#include "log.h"
-#include "misc.h"
-#include "setting.h"
-#include "charset.h"
-
-#include "win32/win32dep.h"
 
-
-/***************
- * Declaration *
- ***************/
+#include "application_window.h"
+#include "file.h"
+#include "file_list.h"
 
 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. */
-    { MP4_FILE, ".m4v", MP4_TAG},
-#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
  */
 GdkRGBA RED = {1.0, 0.0, 0.0, 1.0 };
 
-
-/**************
- * Prototypes *
- **************/
-
-//gboolean ET_File_Is_Supported (gchar *filename);
-static const ET_File_Description *ET_Get_File_Description (const gchar *filename);
-static const ET_File_Description *ET_Get_File_Description_From_Extension (const gchar *extension);
-
-static gboolean ET_Free_File_List                 (void);
-static gboolean ET_Free_File_Name_List            (GList *FileNameList);
-static gboolean ET_Free_File_Tag_List (GList *FileTagList);
-static void ET_Free_File_Name_Item (File_Name *FileName);
-static gboolean ET_Free_File_Tag_Item_Other_Field (File_Tag *FileTag);
-static gboolean ET_Free_File_Info_Item (ET_File_Info *ETFileInfo);
-static gboolean ET_Free_History_File_List (void);
-static gboolean ET_Free_Displayed_File_List (void);
-static gboolean ET_Free_Artist_Album_File_List (void);
-
-static void ET_Initialize_File_Item (ET_File *ETFile);
-static void ET_Initialize_File_Tag_Item (File_Tag *FileTag);
-static void ET_Initialize_File_Name_Item (File_Name *FileName);
-static void ET_Initialize_File_Info_Item (ET_File_Info *ETFileInfo);
-
-//gboolean ET_Set_Field_File_Tag_Picture (gchar **FileTagField, Picture *pic);
-
-static guint ET_File_Key_New (void);
-static guint ET_Undo_Key_New (void);
-
-static gboolean ET_Remove_File_From_Artist_Album_List (ET_File *ETFile);
-
-static void ET_Display_Filename_To_UI (const ET_File *ETFile);
-static EtFileHeaderFields * ET_Display_File_Info_To_UI (const ET_File *ETFile);
-
-static gboolean ET_Save_File_Name_From_UI (const ET_File *ETFile,
-                                           File_Name *FileName);
-static gboolean ET_Save_File_Name_Internal (const ET_File *ETFile, File_Name *FileName);
-static gboolean ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag);
-
-static void ET_Mark_File_Tag_As_Saved (ET_File *ETFile);
-
-static gboolean ET_Detect_Changes_Of_File_Name (const File_Name *FileName1,
-                                                const File_Name *FileName2);
-static gboolean ET_Add_File_Name_To_List (ET_File *ETFile,
-                                          File_Name *FileName);
-static gboolean ET_Add_File_Tag_To_List (ET_File *ETFile, File_Tag  *FileTag);
-static gboolean ET_Add_File_To_History_List (ET_File *ETFile);
-static gboolean ET_Add_File_To_Artist_Album_File_List (ET_File *ETFile);
-
-static guint ET_Displayed_File_List_Get_Length      (void);
-static void ET_Displayed_File_List_Number (void);
-
-static gboolean et_core_read_file_info (GFile *file,
-                                        ET_File_Info *ETFileInfo,
-                                        GError **error);
-
-static gint ET_Comp_Func_Sort_Artist_Item_By_Ascending_Artist (const GList *AlbumList1,
-                                                               const GList *AlbumList2);
-static gint ET_Comp_Func_Sort_Album_Item_By_Ascending_Album (const GList *etfilelist1,
-                                                             const GList *etfilelist2);
-static gint ET_Comp_Func_Sort_Etfile_Item_By_Ascending_Filename (const ET_File *ETFile1,
-                                                                 const ET_File *ETFile2);
-static gchar *ET_File_Name_Format_Extension (const ET_File *ETFile);
-
-static void set_sort_order_for_column_id (gint column_id,
-                                          GtkTreeViewColumn *column,
-                                          EtSortMode sort_type);
-
-
-/*******************
- * Basic functions *
- *******************/
-
-/*
- * Returns the extension of the file
- */
-static const gchar *
-ET_Get_File_Extension (const gchar *filename)
-{
-    if (filename)
-        return strrchr(filename, '.');
-    else
-        return NULL;
-}
-
-
-/*
- * Determine description of file using his extension.
- * If extension is NULL or not found into the tab, it returns the last entry for UNKNOWN_FILE.
- */
-static const ET_File_Description *
-ET_Get_File_Description_From_Extension (const gchar *extension)
-{
-    guint i;
-
-    if (!extension) // Unknown file
-        return &ETFileDescription[ET_FILE_DESCRIPTION_SIZE];
-
-    for (i=0; i<ET_FILE_DESCRIPTION_SIZE; i++)  // Use of '<' instead of '<=' to avoid to test for Unknown file
-        if ( strcasecmp(extension,ETFileDescription[i].Extension)==0 )
-            return &ETFileDescription[i];
-
-    // If not found in the list
-    return &ETFileDescription[ET_FILE_DESCRIPTION_SIZE];
-}
-
-
-/*
- * Determines description of file.
- * Determines first the extension. If extension is NULL or not found into the tab,
- * it returns the last entry for UNKNOWN_FILE.
- */
-static const ET_File_Description *
-ET_Get_File_Description (const gchar *filename)
-{
-    return ET_Get_File_Description_From_Extension(ET_Get_File_Extension(filename));
-}
-
-
-/*
- * Returns TRUE if the file is supported, else returns FALSE
- */
-gboolean ET_File_Is_Supported (const gchar *filename)
-{
-    if (ET_Get_File_Description(filename)->FileType != UNKNOWN_FILE)
-        return TRUE;
-    else
-        return FALSE;
-}
-
-
-
-
-/*****************************************************************************
- * Manipulation of ET_Core functions (main functions needed for the program) *
- *****************************************************************************/
-void ET_Core_Create (void)
+void
+ET_Core_Create (void)
 {
-    // Allocate
+    /* Allocate. */
     if (ETCore == NULL)
-        ETCore = g_malloc0(sizeof(ET_Core));
-
-    // Initialize
-    ET_Core_Initialize();
+    {
+        ETCore = g_slice_new0 (ET_Core);
+    }
 }
 
-void ET_Core_Initialize (void)
+void
+ET_Core_Free (void)
 {
-    ETCore->ETFileList                        = NULL;
-    ETCore->ETFileDisplayedList               = NULL;
-    ETCore->ETFileDisplayedListPtr            = NULL;
-    ETCore->ETFileDisplayedList_Length        = 0;
-    ETCore->ETFileDisplayedList_TotalSize     = 0;
-    ETCore->ETFileDisplayedList_TotalDuration = 0;
-    ETCore->ETFileDisplayed                   = NULL;
-    ETCore->ETHistoryFileList                 = NULL;
-    ETCore->ETArtistAlbumFileList             = NULL;
-}
+    g_return_if_fail (ETCore != NULL);
 
-void ET_Core_Free (void)
-{
-    // Frees first lists, then initialize
+    /* First frees lists. */
     if (ETCore->ETFileList)
         ET_Free_File_List();
 
@@ -297,4318 +58,9 @@ void ET_Core_Free (void)
     if (ETCore->ETArtistAlbumFileList)
         ET_Free_Artist_Album_File_List();
 
-    // Initialize by security
-    ET_Core_Initialize();
-}
-
-void
-ET_Core_Destroy (void)
-{
     if (ETCore)
     {
-        ET_Core_Free ();
-        g_free (ETCore);
+        g_slice_free (ET_Core, ETCore);
         ETCore = NULL;
     }
 }
-
-
-
-/**************************
- * Initializing functions *
- **************************/
-
-/*
- * Create a new File_Name structure
- */
-File_Name *ET_File_Name_Item_New (void)
-{
-    File_Name *FileName;
-
-    FileName = g_malloc0(sizeof(File_Name));
-    ET_Initialize_File_Name_Item(FileName);
-
-    return FileName;
-}
-
-
-/*
- * Create a new File_Tag structure
- */
-File_Tag *ET_File_Tag_Item_New (void)
-{
-    File_Tag *FileTag;
-
-    FileTag = g_malloc0(sizeof(File_Tag));
-    ET_Initialize_File_Tag_Item(FileTag);
-
-    return FileTag;
-}
-
-
-/*
- * Create a new File_Info structure
- */
-static ET_File_Info *
-ET_File_Info_Item_New (void)
-{
-    ET_File_Info *ETFileInfo;
-
-    ETFileInfo = g_malloc0(sizeof(ET_File_Info));
-    ET_Initialize_File_Info_Item(ETFileInfo);
-
-    return ETFileInfo;
-}
-
-
-/*
- * Create a new ET_File structure
- */
-ET_File *ET_File_Item_New (void)
-{
-    ET_File *ETFile;
-
-    ETFile = g_malloc0(sizeof(ET_File));
-    ET_Initialize_File_Item(ETFile);
-
-    return ETFile;
-}
-
-
-static void
-ET_Initialize_File_Name_Item (File_Name *FileName)
-{
-    if (FileName)
-    {
-        FileName->key        = ET_Undo_Key_New();
-        FileName->saved      = FALSE;
-        FileName->value      = NULL;
-        FileName->value_utf8 = NULL;
-        FileName->value_ck   = NULL;
-    }
-}
-
-
-static void
-ET_Initialize_File_Tag_Item (File_Tag *FileTag)
-{
-    if (FileTag)
-    {
-        FileTag->key         = ET_Undo_Key_New();
-        FileTag->saved       = FALSE;
-        FileTag->title       = NULL;
-        FileTag->artist      = NULL;
-        FileTag->album_artist= NULL;
-        FileTag->album       = NULL;
-        FileTag->disc_number = NULL;
-        FileTag->disc_total = NULL;
-        FileTag->track       = NULL;
-        FileTag->track_total = NULL;
-        FileTag->year        = NULL;
-        FileTag->genre       = NULL;
-        FileTag->comment     = NULL;
-        FileTag->composer    = NULL;
-        FileTag->orig_artist = NULL;
-        FileTag->copyright   = NULL;
-        FileTag->url         = NULL;
-        FileTag->encoded_by  = NULL;
-        FileTag->picture     = NULL;
-        FileTag->other       = NULL;
-    }
-}
-
-
-static void
-ET_Initialize_File_Info_Item (ET_File_Info *ETFileInfo)
-{
-    if (ETFileInfo)
-    {
-        ETFileInfo->mpc_profile = NULL;
-        ETFileInfo->mpc_version = NULL;
-    }
-}
-
-
-static void
-ET_Initialize_File_Item (ET_File *ETFile)
-{
-    if (ETFile)
-    {
-        ETFile->IndexKey          = 0;
-        ETFile->ETFileKey         = 0;
-        ETFile->ETFileDescription = NULL;
-        ETFile->ETFileInfo        = NULL;
-        ETFile->FileNameCur       = NULL;
-        ETFile->FileNameNew       = NULL;
-        ETFile->FileNameList      = NULL;
-        ETFile->FileNameListBak   = NULL;
-        ETFile->FileTag           = NULL;
-        ETFile->FileTagList       = NULL;
-        ETFile->FileTagListBak    = NULL;
-    }
-}
-
-
-/* Key for each item of ETFileList */
-static guint
-ET_File_Key_New (void)
-{
-    static guint ETFileKey = 0;
-    return ++ETFileKey;
-}
-
-/* Key for Undo */
-static guint
-ET_Undo_Key_New (void)
-{
-    static guint ETUndoKey = 0;
-    return ++ETUndoKey;
-}
-
-
-
-
-/**********************************
- * File adding/removing functions *
- **********************************/
-
-/*
- * ET_Add_File_To_File_List: Add a file to the "main" list. And get all information of the file.
- * The filename passed in should be in raw format, only convert it to UTF8 when displaying it.
- */
-GList *ET_Add_File_To_File_List (gchar *filename)
-{
-    const ET_File_Description *ETFileDescription;
-    ET_File      *ETFile;
-    File_Name    *FileName;
-    File_Tag     *FileTag;
-    ET_File_Info *ETFileInfo;
-    gchar        *ETFileExtension;
-    guint         ETFileKey;
-    guint         undo_key;
-    GFile *file;
-    GFileInfo *fileinfo;
-    gchar        *filename_utf8 = filename_to_display(filename);
-    const gchar  *locale_lc_ctype = getenv("LC_CTYPE");
-    GError *error = NULL;
-    gboolean success;
-
-    if (!filename)
-        return ETCore->ETFileList;
-
-    file = g_file_new_for_path (filename);
-
-    /* Primary Key for this file */
-    ETFileKey = ET_File_Key_New();
-
-    /* Get description of the file */
-    ETFileDescription = ET_Get_File_Description(filename);
-
-    /* Get real extension of the file (keeping the case) */
-    ETFileExtension = g_strdup(ET_Get_File_Extension(filename));
-
-    /* Fill the File_Name structure for FileNameList */
-    FileName = ET_File_Name_Item_New();
-    FileName->saved      = TRUE;    /* The file hasn't been changed, so it's saved */
-    FileName->value      = filename;
-    FileName->value_utf8 = filename_utf8;
-    FileName->value_ck   = g_utf8_collate_key_for_filename(filename_utf8, -1);
-
-    /* Fill the File_Tag structure for FileTagList */
-    FileTag = ET_File_Tag_Item_New();
-    FileTag->saved = TRUE;    /* The file hasn't been changed, so it's saved */
-
-    /* Patch from Doruk Fisek and Onur Kucuk: avoid upper/lower conversion bugs
-     * (like I->i conversion in some locales) in tag parsing. The problem occurs
-     * for example with Turkish language where it can't read 'TITLE=' field if
-     * it is written as 'Title=' in the file */
-    setlocale(LC_CTYPE, "C");
-
-    switch (ETFileDescription->TagType)
-    {
-#ifdef ENABLE_MP3
-        case ID3_TAG:
-            if (!id3tag_read_file_tag (file, FileTag, &error))
-            {
-                Log_Print (LOG_ERROR,
-                           "Error reading ID3 tag from file ‘%s’: %s",
-                           filename_utf8, error->message);
-                g_clear_error (&error);
-            }
-            break;
-#endif
-#ifdef ENABLE_OGG
-        case OGG_TAG:
-            if (!ogg_tag_read_file_tag (file, FileTag, &error))
-            {
-                Log_Print (LOG_ERROR,
-                           _("Error reading tag from Ogg file ‘%s’: %s"),
-                           filename_utf8, error->message);
-                g_clear_error (&error);
-            }
-            break;
-#endif
-#ifdef ENABLE_FLAC
-        case FLAC_TAG:
-            if (!flac_tag_read_file_tag (file, FileTag, &error))
-            {
-                Log_Print (LOG_ERROR,
-                           _("Error reading tag from FLAC file ‘%s’: %s"),
-                           filename_utf8, error->message);
-                g_clear_error (&error);
-            }
-            break;
-#endif
-        case APE_TAG:
-            if (!ape_tag_read_file_tag (file, FileTag, &error))
-            {
-                Log_Print (LOG_ERROR,
-                           _("Error reading APE tag from file ‘%s’: %s"),
-                           filename_utf8, error->message);
-                g_clear_error (&error);
-            }
-            break;
-#ifdef ENABLE_MP4
-        case MP4_TAG:
-            if (!mp4tag_read_file_tag (file, FileTag, &error))
-            {
-                Log_Print (LOG_ERROR,
-                           _("Error reading tag from MP4 file ‘%s’: %s"),
-                           filename_utf8, error->message);
-                g_clear_error (&error);
-            }
-            break;
-#endif
-#ifdef ENABLE_WAVPACK
-        case WAVPACK_TAG:
-            if (!wavpack_tag_read_file_tag (file, FileTag, &error))
-            {
-                Log_Print (LOG_ERROR,
-                           _("Error reading tag from WavPack file ‘%s’: %s"),
-                           filename_utf8, error->message);
-                g_clear_error (&error);
-            }
-        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’: %s"),
-                           filename_utf8, error->message);
-                g_clear_error (&error);
-            }
-            break;
-#endif
-        case UNKNOWN_TAG:
-        default:
-            /* FIXME: Translatable string. */
-            Log_Print(LOG_ERROR,"FileTag: Undefined tag type (%d) for file %s",ETFileDescription->TagType,filename_utf8);
-            break;
-    }
-
-    if (FileTag->year && g_utf8_strlen (FileTag->year, -1) > 4)
-    {
-        Log_Print (LOG_WARNING,
-                   _("The year value ‘%s’ seems to be invalid in file ‘%s’. The information will be lost when saving"),
-                   FileTag->year, filename_utf8);
-    }
-
-    /* Fill the ET_File_Info structure */
-    ETFileInfo = ET_File_Info_Item_New ();
-
-    switch (ETFileDescription->FileType)
-    {
-#if defined ENABLE_MP3 && defined ENABLE_ID3LIB
-        case MP3_FILE:
-        case MP2_FILE:
-            success = et_mpeg_header_read_file_info (file, ETFileInfo, &error);
-            break;
-#endif
-#ifdef ENABLE_OGG
-        case OGG_FILE:
-            success = et_ogg_header_read_file_info (file, ETFileInfo, &error);
-            break;
-#endif
-#ifdef ENABLE_SPEEX
-        case SPEEX_FILE:
-            success = et_speex_header_read_file_info (file, ETFileInfo,
-                                                      &error);
-            break;
-#endif
-#ifdef ENABLE_FLAC
-        case FLAC_FILE:
-            success = et_flac_header_read_file_info (file, ETFileInfo, &error);
-            break;
-#endif
-        case MPC_FILE:
-            success = et_mpc_header_read_file_info (file, ETFileInfo, &error);
-            break;
-        case MAC_FILE:
-            success = et_mac_header_read_file_info (file, ETFileInfo, &error);
-            break;
-#ifdef ENABLE_WAVPACK
-        case WAVPACK_FILE:
-            success = et_wavpack_header_read_file_info (file, ETFileInfo,
-                                                        &error);
-            break;
-#endif
-#ifdef ENABLE_MP4
-        case MP4_FILE:
-            success = et_mp4_header_read_file_info (file, ETFileInfo, &error);
-            break;
-#endif
-#ifdef ENABLE_OPUS
-        case OPUS_FILE:
-            success = et_opus_read_file_info (file, ETFileInfo, &error);
-            break;
-#endif
-        case UNKNOWN_FILE:
-        default:
-            /* FIXME: Translatable string. */
-            Log_Print(LOG_ERROR,"ETFileInfo: Undefined file type (%d) for file %s",ETFileDescription->FileType,filename_utf8);
-            /* To get at least the file size. */
-            success = et_core_read_file_info (file, ETFileInfo, &error);
-            break;
-    }
-
-    if (!success)
-    {
-        Log_Print (LOG_ERROR,
-                   _("Error while querying information for file ‘%s’: %s"),
-                   filename_utf8, error->message);
-        g_error_free (error);
-    }
-
-    /* Restore previous value */
-    setlocale(LC_CTYPE, locale_lc_ctype ? locale_lc_ctype : "");
-
-    /* Store the modification time of the file to check if the file was changed
-     * before saving */
-    fileinfo = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED,
-                                  G_FILE_QUERY_INFO_NONE, NULL, NULL);
-    g_object_unref (file);
-
-    /* Attach all data defined above to this ETFile item */
-    ETFile = ET_File_Item_New();
-
-    if (fileinfo)
-    {
-        ETFile->FileModificationTime = g_file_info_get_attribute_uint64 (fileinfo,
-                                                                         G_FILE_ATTRIBUTE_TIME_MODIFIED);
-        g_object_unref (fileinfo);
-    }
-    else
-    {
-        ETFile->FileModificationTime = 0;
-    }
-
-    ETFile->IndexKey             = 0; // Will be renumered after...
-    ETFile->ETFileKey            = ETFileKey;
-    ETFile->ETFileDescription    = ETFileDescription;
-    ETFile->ETFileExtension      = ETFileExtension;
-    ETFile->FileNameList         = g_list_append(NULL,FileName);
-    ETFile->FileNameCur          = ETFile->FileNameList;
-    ETFile->FileNameNew          = ETFile->FileNameList;
-    ETFile->FileTagList          = g_list_append(NULL,FileTag);
-    ETFile->FileTag              = ETFile->FileTagList;
-    ETFile->ETFileInfo           = ETFileInfo;
-
-    /* Add the item to the "main list" */
-    ETCore->ETFileList = g_list_append(ETCore->ETFileList,ETFile);
-
-
-    /*
-     * Process the filename and tag to generate undo if needed...
-     * The undo key must be the same for FileName and FileTag => changed in the same time
-     */
-    undo_key = ET_Undo_Key_New();
-
-    FileName = ET_File_Name_Item_New();
-    FileName->key = undo_key;
-    ET_Save_File_Name_Internal(ETFile,FileName);
-
-    FileTag = ET_File_Tag_Item_New();
-    FileTag->key = undo_key;
-    ET_Save_File_Tag_Internal(ETFile,FileTag);
-
-    /*
-     * Generate undo for the file and the main undo list.
-     * If no changes detected, FileName and FileTag item are deleted.
-     */
-    ET_Manage_Changes_Of_File_Data(ETFile,FileName,FileTag);
-
-    /*
-     * Display a message if the file was changed at start
-     */
-    FileTag  = (File_Tag *)ETFile->FileTag->data;
-    FileName = (File_Name *)ETFile->FileNameNew->data;
-    if ( (FileName && FileName->saved==FALSE) || (FileTag && FileTag->saved==FALSE) )
-    {
-        Log_Print (LOG_INFO, _("Automatic corrections applied for file ‘%s’"),
-                   filename_utf8);
-    }
-
-    /* Add the item to the ArtistAlbum list (placed here to take advantage of previous changes) */
-    //ET_Add_File_To_Artist_Album_File_List(ETFile);
-
-    //ET_Debug_Print_File_List(ETCore->ETFileList,__FILE__,__LINE__,__FUNCTION__);
-    return ETCore->ETFileList;
-}
-
-gboolean ET_Create_Artist_Album_File_List (void)
-{
-    GList *l;
-
-    if (ETCore->ETArtistAlbumFileList)
-        ET_Free_Artist_Album_File_List();
-
-    for (l = g_list_first (ETCore->ETFileList); l != NULL; l = g_list_next (l))
-    {
-        ET_File *ETFile = (ET_File *)l->data;
-        ET_Add_File_To_Artist_Album_File_List(ETFile);
-    }
-    //ET_Debug_Print_Artist_Album_List(__FILE__,__LINE__,__FUNCTION__);
-    return TRUE;
-}
-/*
- * The ETArtistAlbumFileList contains 3 levels of lists to sort the ETFile by artist then by album :
- *  - "ETArtistAlbumFileList" list is a list of "ArtistList" items,
- *  - "ArtistList" list is a list of "AlbumList" items,
- *  - "AlbumList" list is a list of ETFile items.
- * Note : use the function ET_Debug_Print_Artist_Album_List(...) to understand how it works, it needed...
- */
-static gboolean
-ET_Add_File_To_Artist_Album_File_List (ET_File *ETFile)
-{
-    const gchar *ETFile_Artist;
-    const gchar *ETFile_Album;
-    const gchar *etfile_artist;
-    const gchar *etfile_album;
-    GList *ArtistList;
-    GList *AlbumList = NULL;
-    GList *etfilelist = NULL;
-    ET_File *etfile = NULL;
-
-    g_return_val_if_fail (ETFile != NULL, FALSE);
-
-    /* Album value of the ETFile passed in parameter. */
-    ETFile_Album = ((File_Tag *)ETFile->FileTag->data)->album;
-    /* Artist value of the ETFile passed in parameter. */
-    ETFile_Artist = ((File_Tag *)ETFile->FileTag->data)->artist;
-
-    for (ArtistList = ETCore->ETArtistAlbumFileList; ArtistList != NULL;
-         ArtistList = g_list_next (ArtistList))
-    {
-        AlbumList = (GList *)ArtistList->data;  /* Take the first item */
-        /* Take the first item, and the first etfile item. */
-        if (AlbumList && (etfilelist = (GList *)AlbumList->data)
-            && (etfile = (ET_File *)etfilelist->data)
-            && ((File_Tag *)etfile->FileTag->data) != NULL)
-        {
-            etfile_artist = ((File_Tag *)etfile->FileTag->data)->artist;
-        }
-        else
-        {
-            etfile_artist = NULL;
-        }
-
-        if ((etfile_artist &&  ETFile_Artist && strcmp (etfile_artist,
-                                                        ETFile_Artist) == 0)
-            || (!etfile_artist && !ETFile_Artist)) /* The "artist" values correspond? */
-        {
-            /* The "ArtistList" item was found! */
-            while (AlbumList)
-            {
-                if ((etfilelist = (GList *)AlbumList->data)
-                    && (etfile = (ET_File *)etfilelist->data)
-                    && ((File_Tag *)etfile->FileTag->data) != NULL)
-                {
-                    etfile_album = ((File_Tag *)etfile->FileTag->data)->album;
-                }
-                else
-                {
-                    etfile_album = NULL;
-                }
-
-                if ((etfile_album && ETFile_Album && strcmp (etfile_album,
-                                                             ETFile_Album) == 0)
-                    || (!etfile_album && !ETFile_Album))
-                    /* The "album" values correspond? */
-                {
-                    /* The "AlbumList" item was found!
-                     * Add the ETFile to this AlbumList item */
-                    AlbumList->data = g_list_append ((GList *)AlbumList->data,
-                                                     ETFile);
-                    AlbumList->data = g_list_sort ((GList *)AlbumList->data,
-                                                   (GCompareFunc)ET_Comp_Func_Sort_Etfile_Item_By_Ascending_Filename);
-                    return TRUE;
-                }
-
-                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);
-            ArtistList->data = g_list_append ((GList *)ArtistList->data,
-                                              etfilelist);
-            ArtistList->data = g_list_sort ((GList *)ArtistList->data,
-                                            (GCompareFunc)ET_Comp_Func_Sort_Album_Item_By_Ascending_Album);
-            return TRUE;
-        }
-    }
-
-    /* The "ArtistList" item was NOT found! => Add a new "ArtistList" to the
-     * main list (=ETArtistAlbumFileList). */
-    etfilelist = g_list_append (NULL, ETFile);
-    AlbumList  = g_list_append (NULL, etfilelist);
-    ETCore->ETArtistAlbumFileList = g_list_append (ETCore->ETArtistAlbumFileList,
-                                                   AlbumList);
-
-    /* Sort the list by ascending Artist. */
-    ETCore->ETArtistAlbumFileList = g_list_sort (ETCore->ETArtistAlbumFileList,
-                                                 (GCompareFunc)ET_Comp_Func_Sort_Artist_Item_By_Ascending_Artist);
-
-    return TRUE;
-}
-
-
-
-/*
- * Delete the corresponding file and free the allocated data. Return TRUE if deleted.
- */
-gboolean ET_Remove_File_From_File_List (ET_File *ETFile)
-{
-    GList *ETFileList = NULL;          // Item containing the ETFile to delete... (in ETCore->ETFileList)
-    GList *ETFileDisplayedList = NULL; // Item containing the ETFile to delete... (in ETCore->ETFileDisplayedList)
-
-    // Remove infos of the file
-    ETCore->ETFileDisplayedList_TotalSize     -= ((ET_File_Info *)ETFile->ETFileInfo)->size;
-    ETCore->ETFileDisplayedList_TotalDuration -= ((ET_File_Info *)ETFile->ETFileInfo)->duration;
-
-    // Find the ETFileList containing the ETFile item
-    ETFileDisplayedList = g_list_find(g_list_first(ETCore->ETFileDisplayedList),ETFile);
-    ETFileList          = g_list_find(g_list_first(ETCore->ETFileList),ETFile);
-
-    // Note : this ETFileList must be used only for ETCore->ETFileDisplayedList, and not ETCore->ETFileDisplayed
-    if (ETCore->ETFileDisplayedList == ETFileDisplayedList)
-    {
-        if (ETFileList->next)
-            ETCore->ETFileDisplayedList = ETFileDisplayedList->next;
-        else if (ETFileList->prev)
-            ETCore->ETFileDisplayedList = ETFileDisplayedList->prev;
-        else
-            ETCore->ETFileDisplayedList = NULL;
-    }
-    // If the current displayed file is just removing, it will be unable to display it again!
-    if (ETCore->ETFileDisplayed == ETFile)
-    {
-        if (ETCore->ETFileDisplayedList)
-            ETCore->ETFileDisplayed = (ET_File *)ETCore->ETFileDisplayedList->data;
-        else
-            ETCore->ETFileDisplayed = (ET_File *)NULL;
-    }
-
-    /* Remove the file from the ETFileList list. */
-    ETCore->ETFileList = g_list_remove (g_list_first (ETCore->ETFileList),
-                                        ETFileList);
-
-    // Remove the file from the ETArtistAlbumList list
-    ET_Remove_File_From_Artist_Album_List(ETFile);
-
-    /* Remove the file from the ETFileDisplayedList list (if not already). */
-    ETCore->ETFileDisplayedList = g_list_remove (g_list_first (ETCore->ETFileDisplayedList),
-                                                 ETFileDisplayedList);
-
-    // Free data of the file
-    ET_Free_File_List_Item(ETFile);
-    if (ETFileList)
-        g_list_free(ETFileList);
-    if (ETFileDisplayedList)
-        g_list_free(ETFileDisplayedList);
-
-    // Recalculate length of ETFileDisplayedList list
-    ET_Displayed_File_List_Get_Length();
-
-    // To number the ETFile in the list
-    ET_Displayed_File_List_Number();
-
-    // Displaying...
-    if (ETCore->ETFileDisplayedList)
-    {
-        if (ETCore->ETFileDisplayed)
-        {
-            ET_Displayed_File_List_By_Etfile(ETCore->ETFileDisplayed);
-        }else if (ETCore->ETFileDisplayedList->data)
-        {
-            // Select the new file (synchronize index,...)
-            ET_Displayed_File_List_By_Etfile((ET_File *)ETCore->ETFileDisplayedList->data);
-        }
-    }else
-    {
-        // Reinit the tag and file area
-        et_application_window_file_area_clear (ET_APPLICATION_WINDOW (MainWindow));
-        et_application_window_tag_area_clear (ET_APPLICATION_WINDOW (MainWindow));
-        et_application_window_update_actions (ET_APPLICATION_WINDOW (MainWindow));
-    }
-
-    return TRUE;
-}
-
-
-/*
- * Delete the corresponding file (allocated data was previously freed!). Return TRUE if deleted.
- */
-static gboolean
-ET_Remove_File_From_Artist_Album_List (ET_File *ETFile)
-{
-    GList *ArtistList;
-    GList *AlbumList;
-    GList *etfilelist;
-
-    g_return_val_if_fail (ETFile != NULL, FALSE);
-
-    /* Search for the ETFile in the list. */
-    for (ArtistList = ETCore->ETArtistAlbumFileList; ArtistList != NULL;
-         ArtistList = g_list_next (ArtistList))
-    {
-        for (AlbumList = g_list_first ((GList *)ArtistList->data);
-             AlbumList != NULL; AlbumList = g_list_next (AlbumList))
-        {
-            for (etfilelist = g_list_first ((GList *)AlbumList->data);
-                 etfilelist != NULL; etfilelist = g_list_next (etfilelist))
-            {
-                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. */
-                    {
-                        AlbumList->data = (gpointer) g_list_first (etfilelist);
-                    }
-                    else
-                    {
-                        AlbumList = g_list_remove (AlbumList, AlbumList->data);
-
-                        if (AlbumList) /* Delete from ArtistList. */
-                        {
-                            ArtistList->data = AlbumList;
-                        }
-                        else
-                        {
-                            /* Delete from the main list. */
-                            ETCore->ETArtistAlbumFileList = g_list_remove (ArtistList,ArtistList->data);
-
-                            return TRUE;
-                        }
-
-                        return TRUE;
-                    }
-
-                    return TRUE;
-                }
-            }
-        }
-    }
-
-    return FALSE; /* ETFile is NUL, or not found in the list. */
-}
-
-/**************************
- * File sorting functions *
- **************************/
-
-/*
- * Sort the 'ETFileDisplayedList' following the 'Sorting_Type'
- * Note : Add also new sorting in 'Browser_List_Sort_Func'
- */
-static void
-ET_Sort_Displayed_File_List (EtSortMode Sorting_Type)
-{
-    ETCore->ETFileDisplayedList = ET_Sort_File_List(ETCore->ETFileDisplayedList,Sorting_Type);
-}
-
-/*
- * Sort an 'ETFileList'
- */
-GList *
-ET_Sort_File_List (GList *ETFileList, EtSortMode Sorting_Type)
-{
-    EtApplicationWindow *window;
-    GtkTreeViewColumn *column;
-    GList *etfilelist;
-    gint column_id = Sorting_Type / 2;
-
-    window = ET_APPLICATION_WINDOW (MainWindow);
-    column = et_application_window_browser_get_column_for_column_id (window,
-                                                                     column_id);
-
-    /* Important to rewind before. */
-    etfilelist = g_list_first (ETFileList);
-
-    /* FIXME: Port to sort-mode? */
-    set_sort_order_for_column_id (column_id, column, Sorting_Type);
-
-    /* Sort... */
-    switch (Sorting_Type)
-    {
-        case ET_SORT_MODE_ASCENDING_FILENAME:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Filename);
-            break;
-        case ET_SORT_MODE_DESCENDING_FILENAME:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Filename);
-            break;
-        case ET_SORT_MODE_ASCENDING_TITLE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Title);
-            break;
-        case ET_SORT_MODE_DESCENDING_TITLE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Title);
-            break;
-        case ET_SORT_MODE_ASCENDING_ARTIST:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Artist);
-            break;
-        case ET_SORT_MODE_DESCENDING_ARTIST:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Artist);
-            break;
-        case ET_SORT_MODE_ASCENDING_ALBUM_ARTIST:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Album_Artist);
-            break;
-        case ET_SORT_MODE_DESCENDING_ALBUM_ARTIST:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Album_Artist);
-            break;
-		case ET_SORT_MODE_ASCENDING_ALBUM:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Album);
-            break;
-        case ET_SORT_MODE_DESCENDING_ALBUM:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Album);
-            break;
-        case ET_SORT_MODE_ASCENDING_YEAR:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Year);
-            break;
-        case ET_SORT_MODE_DESCENDING_YEAR:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Year);
-            break;
-        case ET_SORT_MODE_ASCENDING_DISC_NUMBER:
-            etfilelist = g_list_sort (etfilelist,
-                                      (GCompareFunc)et_comp_func_sort_file_by_ascending_disc_number);
-            break;
-        case ET_SORT_MODE_DESCENDING_DISC_NUMBER:
-            etfilelist = g_list_sort (etfilelist,
-                                      (GCompareFunc)et_comp_func_sort_file_by_descending_disc_number);
-            break;
-        case ET_SORT_MODE_ASCENDING_TRACK_NUMBER:
-            etfilelist = g_list_sort (etfilelist,
-                                      (GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Track_Number);
-            break;
-        case ET_SORT_MODE_DESCENDING_TRACK_NUMBER:
-            etfilelist = g_list_sort (etfilelist,
-                                      (GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Track_Number);
-            break;
-        case ET_SORT_MODE_ASCENDING_GENRE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Genre);
-            break;
-        case ET_SORT_MODE_DESCENDING_GENRE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Genre);
-            break;
-        case ET_SORT_MODE_ASCENDING_COMMENT:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Comment);
-            break;
-        case ET_SORT_MODE_DESCENDING_COMMENT:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Comment);
-            break;
-        case ET_SORT_MODE_ASCENDING_COMPOSER:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Composer);
-            break;
-        case ET_SORT_MODE_DESCENDING_COMPOSER:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Composer);
-            break;
-        case ET_SORT_MODE_ASCENDING_ORIG_ARTIST:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Orig_Artist);
-            break;
-        case ET_SORT_MODE_DESCENDING_ORIG_ARTIST:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Orig_Artist);
-            break;
-        case ET_SORT_MODE_ASCENDING_COPYRIGHT:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Copyright);
-            break;
-        case ET_SORT_MODE_DESCENDING_COPYRIGHT:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Copyright);
-            break;
-        case ET_SORT_MODE_ASCENDING_URL:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Url);
-            break;
-        case ET_SORT_MODE_DESCENDING_URL:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Url);
-            break;
-        case ET_SORT_MODE_ASCENDING_ENCODED_BY:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Encoded_By);
-            break;
-        case ET_SORT_MODE_DESCENDING_ENCODED_BY:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Encoded_By);
-            break;
-        case ET_SORT_MODE_ASCENDING_CREATION_DATE:
-            etfilelist = g_list_sort (etfilelist,
-                                      (GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Creation_Date);
-            break;
-        case ET_SORT_MODE_DESCENDING_CREATION_DATE:
-            etfilelist = g_list_sort (etfilelist,
-                                      (GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Creation_Date);
-            break;
-        case ET_SORT_MODE_ASCENDING_FILE_TYPE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Type);
-            break;
-        case ET_SORT_MODE_DESCENDING_FILE_TYPE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Type);
-            break;
-        case ET_SORT_MODE_ASCENDING_FILE_SIZE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Size);
-            break;
-        case ET_SORT_MODE_DESCENDING_FILE_SIZE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Size);
-            break;
-        case ET_SORT_MODE_ASCENDING_FILE_DURATION:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Duration);
-            break;
-        case ET_SORT_MODE_DESCENDING_FILE_DURATION:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Duration);
-            break;
-        case ET_SORT_MODE_ASCENDING_FILE_BITRATE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Bitrate);
-            break;
-        case ET_SORT_MODE_DESCENDING_FILE_BITRATE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Bitrate);
-            break;
-        case ET_SORT_MODE_ASCENDING_FILE_SAMPLERATE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Samplerate);
-            break;
-        case ET_SORT_MODE_DESCENDING_FILE_SAMPLERATE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Samplerate);
-            break;
-    }
-    /* Save sorting mode (note: needed when called from UI). */
-    g_settings_set_enum (MainSettings, "sort-mode", Sorting_Type);
-
-    //ETFileList = g_list_first(etfilelist);
-    return etfilelist;
-}
-
-
-/*
- * Sort the list of files following the 'Sorting_Type' value. The new sorting is displayed in the UI.
- */
-void
-ET_Sort_Displayed_File_List_And_Update_UI (EtSortMode Sorting_Type)
-{
-    g_return_if_fail (ETCore->ETFileList != NULL);
-
-    ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
-
-    /* Sort the list */
-    ET_Sort_Displayed_File_List(Sorting_Type);
-
-    /* To number the ETFile in the list */
-    ET_Displayed_File_List_Number();
-
-    /* Reload files in browser list */
-    ET_Displayed_File_List_By_Etfile(ETCore->ETFileDisplayed);  // Just to update 'ETFileDisplayedList'
-    et_application_window_browser_select_file_by_et_file (ET_APPLICATION_WINDOW (MainWindow),
-                                                          ETCore->ETFileDisplayed,
-                                                          TRUE);
-    ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);
-
-    et_application_window_browser_refresh_sort (ET_APPLICATION_WINDOW (MainWindow));
-    et_application_window_update_actions (ET_APPLICATION_WINDOW (MainWindow));
-}
-
-
-/*
- * Comparison function for sorting by ascending filename.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Filename (const ET_File *ETFile1,
-                                              const ET_File *ETFile2)
-{
-    const gchar *file1_ck = ((File_Name *)((GList *)ETFile1->FileNameCur)->data)->value_ck;
-    const gchar *file2_ck = ((File_Name *)((GList *)ETFile2->FileNameCur)->data)->value_ck;
-    // !!!! : Must be the same rules as "Cddb_Track_List_Sort_Func" to be
-    // able to sort in the same order files in cddb and in the file list.
-    return g_settings_get_boolean (MainSettings,
-                                   "sort-case-sensitive") ? strcmp (file1_ck, file2_ck)
-                                                          : strcasecmp (file1_ck, file2_ck);
-}
-
-/*
- * Comparison function for sorting by descending filename.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Filename (const ET_File *ETFile1,
-                                               const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending disc number.
- */
-gint
-et_comp_func_sort_file_by_ascending_disc_number (const ET_File *ETFile1,
-                                                 const ET_File *ETFile2)
-{
-    gint track1, track2;
-
-    if (!ETFile1->FileTag->data
-        || !((File_Tag *)ETFile1->FileTag->data)->disc_number)
-    {
-        track1 = 0;
-    }
-    else
-    {
-        track1 = atoi (((File_Tag *)ETFile1->FileTag->data)->disc_number);
-    }
-
-    if (!ETFile2->FileTag->data
-        || !((File_Tag *)ETFile2->FileTag->data)->disc_number)
-    {
-        track2 = 0;
-    }
-    else
-    {
-        track2 = atoi (((File_Tag *)ETFile2->FileTag->data)->disc_number);
-    }
-
-    /* Second criterion. */
-    if (track1 == track2)
-    {
-        return ET_Comp_Func_Sort_File_By_Ascending_Filename (ETFile1, ETFile2);
-    }
-
-    /* First criterion. */
-    return (track1 - track2);
-}
-
-/*
- * Comparison function for sorting by descending disc number.
- */
-gint
-et_comp_func_sort_file_by_descending_disc_number (const ET_File *ETFile1,
-                                                  const ET_File *ETFile2)
-{
-    return et_comp_func_sort_file_by_ascending_disc_number (ETFile2, ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending track number.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Track_Number (const ET_File *ETFile1,
-                                                  const ET_File *ETFile2)
-{
-    gint track1, track2;
-
-    if ( !ETFile1->FileTag->data || !((File_Tag *)ETFile1->FileTag->data)->track )
-        track1 = 0;
-    else
-        track1 = atoi( ((File_Tag *)ETFile1->FileTag->data)->track );
-
-    if ( !ETFile2->FileTag->data || !((File_Tag *)ETFile2->FileTag->data)->track )
-        track2 = 0;
-    else
-        track2 = atoi( ((File_Tag *)ETFile2->FileTag->data)->track );
-
-    // Second criterion
-    if (track1 == track2)
-        return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-
-    // First criterion
-    return (track1 - track2);
-}
-
-/*
- * Comparison function for sorting by descending track number.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Track_Number (const ET_File *ETFile1,
-                                                   const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Track_Number(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending creation date.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Creation_Date (const ET_File *ETFile1,
-                                                   const ET_File *ETFile2)
-{
-    GFile *file;
-    GFileInfo *info;
-    guint64 time1 = 0;
-    guint64 time2 = 0;
-
-    /* TODO: Report errors? */
-    file = g_file_new_for_path (((File_Name *)ETFile1->FileNameCur->data)->value);
-    info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_CHANGED,
-                              G_FILE_QUERY_INFO_NONE, NULL, NULL);
-
-    g_object_unref (file);
-
-    if (info)
-    {
-        time1 = g_file_info_get_attribute_uint64 (info,
-                                                  G_FILE_ATTRIBUTE_TIME_CHANGED);
-        g_object_unref (info);
-    }
-
-    file = g_file_new_for_path (((File_Name *)ETFile2->FileNameCur->data)->value);
-    info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_CHANGED,
-                              G_FILE_QUERY_INFO_NONE, NULL, NULL);
-
-    g_object_unref (file);
-
-    if (info)
-    {
-        time2 = g_file_info_get_attribute_uint64 (info,
-                                                  G_FILE_ATTRIBUTE_TIME_CHANGED);
-        g_object_unref (info);
-    }
-
-    /* Second criterion. */
-    if (time1 == time2)
-    {
-        return ET_Comp_Func_Sort_File_By_Ascending_Filename (ETFile1, ETFile2);
-    }
-
-    /* First criterion. */
-    return (gint64)(time1 - time2);
-}
-
-/*
- * Comparison function for sorting by descending creation date.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Creation_Date (const ET_File *ETFile1,
-                                                    const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Creation_Date(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending title.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Title (const ET_File *ETFile1,
-                                           const ET_File *ETFile2)
-{
-   // Compare pointers just in case they are the same (e.g. both are NULL)
-   if ((ETFile1->FileTag->data == ETFile2->FileTag->data)
-   ||  (((File_Tag *)ETFile1->FileTag->data)->title == ((File_Tag *)ETFile2->FileTag->data)->title))
-        return 0;
-
-    if ( !ETFile1->FileTag->data || !((File_Tag *)ETFile1->FileTag->data)->title )
-        return -1;
-    if ( !ETFile2->FileTag->data || !((File_Tag *)ETFile2->FileTag->data)->title )
-        return 1;
-
-    if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
-    {
-        if ( strcmp(((File_Tag *)ETFile1->FileTag->data)->title,((File_Tag *)ETFile2->FileTag->data)->title) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcmp(((File_Tag *)ETFile1->FileTag->data)->title,((File_Tag *)ETFile2->FileTag->data)->title);
-    }else
-    {
-        if ( strcasecmp(((File_Tag *)ETFile1->FileTag->data)->title,((File_Tag *)ETFile2->FileTag->data)->title) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-      else
-            // First criterion
-            return strcasecmp(((File_Tag *)ETFile1->FileTag->data)->title,((File_Tag *)ETFile2->FileTag->data)->title);
-    }
-}
-
-/*
- * Comparison function for sorting by descending title.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Title (const ET_File *ETFile1,
-                                            const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Title(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending artist.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Artist (const ET_File *ETFile1,
-                                            const ET_File *ETFile2)
-{
-   // Compare pointers just in case they are the same (e.g. both are NULL)
-   if ((ETFile1->FileTag->data == ETFile2->FileTag->data)
-   ||  (((File_Tag *)ETFile1->FileTag->data)->artist == ((File_Tag *)ETFile2->FileTag->data)->artist))
-        return 0;
-
-    if ( !ETFile1->FileTag->data || !((File_Tag *)ETFile1->FileTag->data)->artist )
-        return -1;
-    if ( !ETFile2->FileTag->data || !((File_Tag *)ETFile2->FileTag->data)->artist )
-        return 1;
-
-    if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
-    {
-        if ( strcmp(((File_Tag *)ETFile1->FileTag->data)->artist,((File_Tag *)ETFile2->FileTag->data)->artist) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcmp(((File_Tag *)ETFile1->FileTag->data)->artist,((File_Tag *)ETFile2->FileTag->data)->artist);
-    }else
-    {
-        if ( strcasecmp(((File_Tag *)ETFile1->FileTag->data)->artist,((File_Tag *)ETFile2->FileTag->data)->artist) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcasecmp(((File_Tag *)ETFile1->FileTag->data)->artist,((File_Tag *)ETFile2->FileTag->data)->artist);
-    }
-}
-
-/*
- * Comparison function for sorting by descending artist.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Artist (const ET_File *ETFile1,
-                                             const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Artist(ETFile2,ETFile1);
-}
-
-/*
- * Comparison function for sorting by ascending album artist.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Album_Artist (const ET_File *ETFile1,
-                                                  const ET_File *ETFile2)
-{
-   // Compare pointers just in case they are the same (e.g. both are NULL)
-   if ((ETFile1->FileTag->data == ETFile2->FileTag->data)
-   ||  (((File_Tag *)ETFile1->FileTag->data)->album_artist == ((File_Tag *)ETFile2->FileTag->data)->album_artist))
-        return 0;
-
-    if ( !ETFile1->FileTag->data || !((File_Tag *)ETFile1->FileTag->data)->album_artist )
-        return -1;
-    if ( !ETFile2->FileTag->data || !((File_Tag *)ETFile2->FileTag->data)->album_artist )
-        return 1;
-
-    if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
-    {
-        if ( strcmp(((File_Tag *)ETFile1->FileTag->data)->album_artist,((File_Tag *)ETFile2->FileTag->data)->album_artist) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Artist(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcmp(((File_Tag *)ETFile1->FileTag->data)->album_artist,((File_Tag *)ETFile2->FileTag->data)->album_artist);
-    }else
-    {
-        if ( strcasecmp(((File_Tag *)ETFile1->FileTag->data)->album_artist,((File_Tag *)ETFile2->FileTag->data)->album_artist) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Artist(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcasecmp(((File_Tag *)ETFile1->FileTag->data)->album_artist,((File_Tag *)ETFile2->FileTag->data)->album_artist);
-    }
-}
-
-/*
- * Comparison function for sorting by descending album artist.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Album_Artist (const ET_File *ETFile1,
-                                                   const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Album_Artist(ETFile2,ETFile1);
-}
-
-/*
- * Comparison function for sorting by ascending album.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Album (const ET_File *ETFile1,
-                                           const ET_File *ETFile2)
-{
-   // Compare pointers just in case they are the same (e.g. both are NULL)
-   if ((ETFile1->FileTag->data == ETFile2->FileTag->data)
-   ||  (((File_Tag *)ETFile1->FileTag->data)->album == ((File_Tag *)ETFile2->FileTag->data)->album))
-        return 0;
-
-    if ( !ETFile1->FileTag->data || !((File_Tag *)ETFile1->FileTag->data)->album )
-        return -1;
-    if ( !ETFile2->FileTag->data || !((File_Tag *)ETFile2->FileTag->data)->album )
-        return 1;
-
-    if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
-    {
-        if ( strcmp(((File_Tag *)ETFile1->FileTag->data)->album,((File_Tag *)ETFile2->FileTag->data)->album) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcmp(((File_Tag *)ETFile1->FileTag->data)->album,((File_Tag *)ETFile2->FileTag->data)->album);
-    }else
-    {
-        if ( strcasecmp(((File_Tag *)ETFile1->FileTag->data)->album,((File_Tag *)ETFile2->FileTag->data)->album) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcasecmp(((File_Tag *)ETFile1->FileTag->data)->album,((File_Tag *)ETFile2->FileTag->data)->album);
-    }
-}
-
-/*
- * Comparison function for sorting by descending album.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Album (const ET_File *ETFile1,
-                                            const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Album(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending year.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Year (const ET_File *ETFile1,
-                                          const ET_File *ETFile2)
-{
-    gint year1, year2;
-
-    if ( !ETFile1->FileTag->data || !((File_Tag *)ETFile1->FileTag->data)->year )
-        year1 = 0;
-    else
-        year1 = atoi( ((File_Tag *)ETFile1->FileTag->data)->year );
-
-    if ( !ETFile2->FileTag->data || !((File_Tag *)ETFile2->FileTag->data)->year )
-        year2 = 0;
-    else
-        year2 = atoi( ((File_Tag *)ETFile2->FileTag->data)->year );
-
-    // Second criterion
-    if (year1 == year2)
-        return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-
-    // First criterion
-    return (year1 - year2);
-}
-
-/*
- * Comparison function for sorting by descending year.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Year (const ET_File *ETFile1,
-                                           const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Year(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending genre.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Genre (const ET_File *ETFile1,
-                                           const ET_File *ETFile2)
-{
-   // Compare pointers just in case they are the same (e.g. both are NULL)
-   if ((ETFile1->FileTag->data == ETFile2->FileTag->data)
-   ||  (((File_Tag *)ETFile1->FileTag->data)->genre == ((File_Tag *)ETFile2->FileTag->data)->genre))
-        return 0;
-
-    if ( !ETFile1->FileTag->data || !((File_Tag *)ETFile1->FileTag->data)->genre ) return -1;
-    if ( !ETFile2->FileTag->data || !((File_Tag *)ETFile2->FileTag->data)->genre ) return 1;
-
-    if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
-    {
-        if ( strcmp(((File_Tag *)ETFile1->FileTag->data)->genre,((File_Tag *)ETFile2->FileTag->data)->genre) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcmp(((File_Tag *)ETFile1->FileTag->data)->genre,((File_Tag *)ETFile2->FileTag->data)->genre);
-    }else
-    {
-        if ( strcasecmp(((File_Tag *)ETFile1->FileTag->data)->genre,((File_Tag *)ETFile2->FileTag->data)->genre) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcasecmp(((File_Tag *)ETFile1->FileTag->data)->genre,((File_Tag *)ETFile2->FileTag->data)->genre);
-    }
-}
-
-/*
- * Comparison function for sorting by descending genre.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Genre (const ET_File *ETFile1,
-                                            const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Genre(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending comment.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Comment (const ET_File *ETFile1,
-                                             const ET_File *ETFile2)
-{
-   // Compare pointers just in case they are the same (e.g. both are NULL)
-   if ((ETFile1->FileTag->data == ETFile2->FileTag->data)
-   ||  (((File_Tag *)ETFile1->FileTag->data)->comment == ((File_Tag *)ETFile2->FileTag->data)->comment))
-        return 0;
-
-    if ( !ETFile1->FileTag->data || !((File_Tag *)ETFile1->FileTag->data)->comment )
-        return -1;
-    if ( !ETFile2->FileTag->data || !((File_Tag *)ETFile2->FileTag->data)->comment )
-        return 1;
-
-    if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
-    {
-        if ( strcmp(((File_Tag *)ETFile1->FileTag->data)->comment,((File_Tag *)ETFile2->FileTag->data)->comment) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcmp(((File_Tag *)ETFile1->FileTag->data)->comment,((File_Tag *)ETFile2->FileTag->data)->comment);
-    }else
-    {
-        if ( strcasecmp(((File_Tag *)ETFile1->FileTag->data)->comment,((File_Tag *)ETFile2->FileTag->data)->comment) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcasecmp(((File_Tag *)ETFile1->FileTag->data)->comment,((File_Tag *)ETFile2->FileTag->data)->comment);
-    }
-}
-
-/*
- * Comparison function for sorting by descending comment.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Comment (const ET_File *ETFile1,
-                                              const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Comment(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending composer.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Composer (const ET_File *ETFile1,
-                                              const ET_File *ETFile2)
-{
-   // Compare pointers just in case they are the same (e.g. both are NULL)
-   if ((ETFile1->FileTag->data == ETFile2->FileTag->data)
-   ||  (((File_Tag *)ETFile1->FileTag->data)->composer == ((File_Tag *)ETFile2->FileTag->data)->composer))
-        return 0;
-
-    if ( !ETFile1->FileTag->data || !((File_Tag *)ETFile1->FileTag->data)->composer )
-        return -1;
-    if ( !ETFile2->FileTag->data || !((File_Tag *)ETFile2->FileTag->data)->composer )
-        return 1;
-
-    if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
-    {
-        if ( strcmp(((File_Tag *)ETFile1->FileTag->data)->composer,((File_Tag *)ETFile2->FileTag->data)->composer) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcmp(((File_Tag *)ETFile1->FileTag->data)->composer,((File_Tag *)ETFile2->FileTag->data)->composer);
-    }else
-    {
-        if ( strcasecmp(((File_Tag *)ETFile1->FileTag->data)->composer,((File_Tag *)ETFile2->FileTag->data)->composer) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcasecmp(((File_Tag *)ETFile1->FileTag->data)->composer,((File_Tag *)ETFile2->FileTag->data)->composer);
-    }
-}
-
-/*
- * Comparison function for sorting by descending composer.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Composer (const ET_File *ETFile1,
-                                               const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Composer(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending original artist.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Orig_Artist (const ET_File *ETFile1,
-                                                 const ET_File *ETFile2)
-{
-   // Compare pointers just in case they are the same (e.g. both are NULL)
-   if ((ETFile1->FileTag->data == ETFile2->FileTag->data)
-   ||  (((File_Tag *)ETFile1->FileTag->data)->orig_artist == ((File_Tag *)ETFile2->FileTag->data)->orig_artist))
-        return 0;
-
-    if ( !ETFile1->FileTag->data || !((File_Tag *)ETFile1->FileTag->data)->orig_artist )
-        return -1;
-    if ( !ETFile2->FileTag->data || !((File_Tag *)ETFile2->FileTag->data)->orig_artist )
-        return 1;
-
-    if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
-    {
-        if ( strcmp(((File_Tag *)ETFile1->FileTag->data)->orig_artist,((File_Tag *)ETFile2->FileTag->data)->orig_artist) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcmp(((File_Tag *)ETFile1->FileTag->data)->orig_artist,((File_Tag *)ETFile2->FileTag->data)->orig_artist);
-    }else
-    {
-        if ( strcasecmp(((File_Tag *)ETFile1->FileTag->data)->orig_artist,((File_Tag *)ETFile2->FileTag->data)->orig_artist) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcasecmp(((File_Tag *)ETFile1->FileTag->data)->orig_artist,((File_Tag *)ETFile2->FileTag->data)->orig_artist);
-    }
-}
-
-/*
- * Comparison function for sorting by descending original artist.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Orig_Artist (const ET_File *ETFile1,
-                                                  const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Orig_Artist(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending copyright.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Copyright (const ET_File *ETFile1,
-                                               const ET_File *ETFile2)
-{
-   // Compare pointers just in case they are the same (e.g. both are NULL)
-   if ((ETFile1->FileTag->data == ETFile2->FileTag->data)
-   ||  (((File_Tag *)ETFile1->FileTag->data)->copyright == ((File_Tag *)ETFile2->FileTag->data)->copyright))
-        return 0;
-
-    if ( !ETFile1->FileTag->data || !((File_Tag *)ETFile1->FileTag->data)->copyright )
-        return -1;
-    if ( !ETFile2->FileTag->data || !((File_Tag *)ETFile2->FileTag->data)->copyright )
-        return 1;
-
-    if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
-    {
-        if ( strcmp(((File_Tag *)ETFile1->FileTag->data)->copyright,((File_Tag *)ETFile2->FileTag->data)->copyright) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcmp(((File_Tag *)ETFile1->FileTag->data)->copyright,((File_Tag *)ETFile2->FileTag->data)->copyright);
-    }else
-    {
-        if ( strcasecmp(((File_Tag *)ETFile1->FileTag->data)->copyright,((File_Tag *)ETFile2->FileTag->data)->copyright) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcasecmp(((File_Tag *)ETFile1->FileTag->data)->copyright,((File_Tag *)ETFile2->FileTag->data)->copyright);
-    }
-}
-
-/*
- * Comparison function for sorting by descending copyright.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Copyright (const ET_File *ETFile1,
-                                                const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Copyright(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending URL.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Url (const ET_File *ETFile1,
-                                         const ET_File *ETFile2)
-{
-   // Compare pointers just in case they are the same (e.g. both are NULL)
-   if ((ETFile1->FileTag->data == ETFile2->FileTag->data)
-   ||  (((File_Tag *)ETFile1->FileTag->data)->url == ((File_Tag *)ETFile2->FileTag->data)->url))
-        return 0;
-
-    if ( !ETFile1->FileTag->data || !((File_Tag *)ETFile1->FileTag->data)->url )
-        return -1;
-    if ( !ETFile2->FileTag->data || !((File_Tag *)ETFile2->FileTag->data)->url )
-        return 1;
-
-    if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
-    {
-        if ( strcmp(((File_Tag *)ETFile1->FileTag->data)->url,((File_Tag *)ETFile2->FileTag->data)->url) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcmp(((File_Tag *)ETFile1->FileTag->data)->url,((File_Tag *)ETFile2->FileTag->data)->url);
-    }else
-    {
-        if ( strcasecmp(((File_Tag *)ETFile1->FileTag->data)->url,((File_Tag *)ETFile2->FileTag->data)->url) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcasecmp(((File_Tag *)ETFile1->FileTag->data)->url,((File_Tag *)ETFile2->FileTag->data)->url);
-    }
-}
-
-/*
- * Comparison function for sorting by descending URL.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Url (const ET_File *ETFile1,
-                                          const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Url(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending encoded by.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Encoded_By (const ET_File *ETFile1,
-                                                const ET_File *ETFile2)
-{
-   // Compare pointers just in case they are the same (e.g. both are NULL)
-   if ((ETFile1->FileTag->data == ETFile2->FileTag->data)
-   ||  (((File_Tag *)ETFile1->FileTag->data)->encoded_by == ((File_Tag *)ETFile2->FileTag->data)->encoded_by))
-        return 0;
-
-    if ( !ETFile1->FileTag->data || !((File_Tag *)ETFile1->FileTag->data)->encoded_by )
-        return -1;
-    if ( !ETFile2->FileTag->data || !((File_Tag *)ETFile2->FileTag->data)->encoded_by )
-        return 1;
-
-    if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
-    {
-        if ( strcmp(((File_Tag *)ETFile1->FileTag->data)->encoded_by,((File_Tag *)ETFile2->FileTag->data)->encoded_by) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcmp(((File_Tag *)ETFile1->FileTag->data)->encoded_by,((File_Tag *)ETFile2->FileTag->data)->encoded_by);
-    }else
-    {
-        if ( strcasecmp(((File_Tag *)ETFile1->FileTag->data)->encoded_by,((File_Tag *)ETFile2->FileTag->data)->encoded_by) == 0 )
-            // Second criterion
-            return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-        else
-            // First criterion
-            return strcasecmp(((File_Tag *)ETFile1->FileTag->data)->encoded_by,((File_Tag *)ETFile2->FileTag->data)->encoded_by);
-    }
-}
-
-/*
- * Comparison function for sorting by descendingencoded by.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Encoded_By (const ET_File *ETFile1,
-                                                 const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Encoded_By(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending file type (mp3, ogg, ...).
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_File_Type (const ET_File *ETFile1,
-                                               const ET_File *ETFile2)
-{
-    if ( !ETFile1->ETFileDescription ) return -1;
-    if ( !ETFile2->ETFileDescription ) return 1;
-
-    // Second criterion
-    if (ETFile1->ETFileDescription->FileType == ETFile2->ETFileDescription->FileType)
-        return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-
-    // First criterion
-    return (ETFile1->ETFileDescription->FileType - ETFile2->ETFileDescription->FileType);
-}
-
-/*
- * Comparison function for sorting by descending file type (mp3, ogg, ...).
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_File_Type (const ET_File *ETFile1,
-                                                const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_File_Type(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending file size.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_File_Size (const ET_File *ETFile1,
-                                               const ET_File *ETFile2)
-{
-    if ( !ETFile1->ETFileInfo ) return -1;
-    if ( !ETFile2->ETFileInfo ) return 1;
-
-    // Second criterion
-    if (ETFile1->ETFileInfo->size == ETFile2->ETFileInfo->size)
-        return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-
-    // First criterion
-    return (ETFile1->ETFileInfo->size - ETFile2->ETFileInfo->size);
-}
-
-/*
- * Comparison function for sorting by descending file size.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_File_Size (const ET_File *ETFile1,
-                                                const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_File_Size(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending file duration.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_File_Duration (const ET_File *ETFile1,
-                                                   const ET_File *ETFile2)
-{
-    if ( !ETFile1->ETFileInfo ) return -1;
-    if ( !ETFile2->ETFileInfo ) return 1;
-
-    // Second criterion
-    if (ETFile1->ETFileInfo->duration == ETFile2->ETFileInfo->duration)
-        return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-
-    // First criterion
-    return (ETFile1->ETFileInfo->duration - ETFile2->ETFileInfo->duration);
-}
-
-/*
- * Comparison function for sorting by descending file duration.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_File_Duration (const ET_File *ETFile1,
-                                                    const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_File_Duration(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending file bitrate.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_File_Bitrate (const ET_File *ETFile1,
-                                                  const ET_File *ETFile2)
-{
-    if ( !ETFile1->ETFileInfo ) return -1;
-    if ( !ETFile2->ETFileInfo ) return 1;
-
-    // Second criterion
-    if (ETFile1->ETFileInfo->bitrate == ETFile2->ETFileInfo->bitrate)
-        return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-
-    // First criterion
-    return (ETFile1->ETFileInfo->bitrate - ETFile2->ETFileInfo->bitrate);
-}
-
-/*
- * Comparison function for sorting by descending file bitrate.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_File_Bitrate (const ET_File *ETFile1,
-                                                   const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_File_Bitrate(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending file samplerate.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_File_Samplerate (const ET_File *ETFile1,
-                                                     const ET_File *ETFile2)
-{
-    if ( !ETFile1->ETFileInfo ) return -1;
-    if ( !ETFile2->ETFileInfo ) return 1;
-
-    // Second criterion
-    if (ETFile1->ETFileInfo->samplerate == ETFile2->ETFileInfo->samplerate)
-        return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-
-    // First criterion
-    return (ETFile1->ETFileInfo->samplerate - ETFile2->ETFileInfo->samplerate);
-}
-
-/*
- * Comparison function for sorting by descending file samplerate.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_File_Samplerate (const ET_File *ETFile1,
-                                                      const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_File_Samplerate(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending artist in the ArtistAlbumList.
- */
-static gint
-ET_Comp_Func_Sort_Artist_Item_By_Ascending_Artist (const GList *AlbumList1,
-                                                   const GList *AlbumList2)
-{
-    const GList *etfilelist1 = NULL;
-    const GList *etfilelist2 = NULL;
-    const ET_File *etfile1 = NULL;
-    const ET_File *etfile2 = NULL;
-    const gchar *etfile1_artist;
-    const gchar *etfile2_artist;
-
-    if (!AlbumList1
-    || !(etfilelist1    = (GList *)AlbumList1->data)
-    || !(etfile1        = (ET_File *)etfilelist1->data)
-    || !(etfile1_artist = ((File_Tag *)etfile1->FileTag->data)->artist) )
-        return -1;
-
-    if (!AlbumList2
-    || !(etfilelist2    = (GList *)AlbumList2->data)
-    || !(etfile2        = (ET_File *)etfilelist2->data)
-    || !(etfile2_artist = ((File_Tag *)etfile2->FileTag->data)->artist) )
-        return 1;
-
-    /*if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
-     *    return strcmp(etfile1_artist,etfile2_artist); */
-    //else
-        return strcasecmp(etfile1_artist,etfile2_artist);
-}
-
-/*
- * Comparison function for sorting by ascending album in the ArtistAlbumList.
- */
-static gint
-ET_Comp_Func_Sort_Album_Item_By_Ascending_Album (const GList *etfilelist1,
-                                                 const GList *etfilelist2)
-{
-    const ET_File *etfile1;
-    const ET_File *etfile2;
-    const gchar *etfile1_album;
-    const gchar *etfile2_album;
-
-    if (!etfilelist1
-    || !(etfile1        = (ET_File *)etfilelist1->data)
-    || !(etfile1_album  = ((File_Tag *)etfile1->FileTag->data)->album) )
-        return -1;
-
-    if (!etfilelist2
-    || !(etfile2        = (ET_File *)etfilelist2->data)
-    || !(etfile2_album  = ((File_Tag *)etfile2->FileTag->data)->album) )
-        return 1;
-
-    /*if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
-     *    return strcmp(etfile1_album,etfile2_album); */
-    //else
-        return strcasecmp(etfile1_album,etfile2_album);
-}
-
-/*
- * Comparison function for sorting etfile in the ArtistAlbumList.
- * FIX ME : should use the default sorting!
- */
-static gint
-ET_Comp_Func_Sort_Etfile_Item_By_Ascending_Filename (const ET_File *ETFile1,
-                                                     const ET_File *ETFile2)
-{
-
-    if (!ETFile1) return -1;
-    if (!ETFile2) return  1;
-
-    return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-}
-
-
-
-
-/***************************
- * List handling functions *
- ***************************/
-
-/*
- * Returns the first item of the "displayed list"
- */
-GList *ET_Displayed_File_List_First (void)
-{
-    ETCore->ETFileDisplayedList = g_list_first(ETCore->ETFileDisplayedList);
-    return ETCore->ETFileDisplayedList;
-}
-
-/*
- * Returns the previous item of the "displayed list". When no more item, it returns NULL.
- */
-GList *ET_Displayed_File_List_Previous (void)
-{
-    if (ETCore->ETFileDisplayedList && ETCore->ETFileDisplayedList->prev)
-        return ETCore->ETFileDisplayedList = ETCore->ETFileDisplayedList->prev;
-    else
-        return NULL;
-}
-
-/*
- * Returns the next item of the "displayed list".
- * When no more item, it returns NULL to don't "overwrite" the list.
- */
-GList *ET_Displayed_File_List_Next (void)
-{
-    if (ETCore->ETFileDisplayedList && ETCore->ETFileDisplayedList->next)
-        return ETCore->ETFileDisplayedList = ETCore->ETFileDisplayedList->next;
-    else
-        return NULL;
-}
-
-/*
- * Returns the last item of the "displayed list"
- */
-GList *ET_Displayed_File_List_Last (void)
-{
-    ETCore->ETFileDisplayedList = g_list_last(ETCore->ETFileDisplayedList);
-    return ETCore->ETFileDisplayedList;
-}
-
-/*
- * Returns the item of the "displayed list" which correspond to the given 'ETFile' (used into browser list).
- */
-GList *
-ET_Displayed_File_List_By_Etfile (const ET_File *ETFile)
-{
-    GList *etfilelist;
-
-    for (etfilelist = ET_Displayed_File_List_First (); etfilelist != NULL;
-         etfilelist = ET_Displayed_File_List_Next ())
-    {
-        if (ETFile == (ET_File *)etfilelist->data)
-            break;
-    }
-
-    if (etfilelist)
-    {
-        /* To "save" the position like in ET_File_List_Next... (not very good -
-         * FIXME) */
-        ETCore->ETFileDisplayedList = etfilelist;
-    }
-    return etfilelist;
-}
-
-/*
- * Just returns the current item of the "main list"
- */
-/*GList *ET_Displayed_File_List_Current (void)
-{
-    return ETCore->ETFileDisplayedList;
-    //return ETCore->ETFileDisplayedListPtr;
-}*/
-
-/*
- * Renumber the list of displayed files (IndexKey) from 1 to n
- */
-static void
-ET_Displayed_File_List_Number (void)
-{
-    GList *l = NULL;
-    guint i = 1;
-
-    for (l = g_list_first (ETCore->ETFileDisplayedList); l != NULL;
-         l = g_list_next (l))
-    {
-        ((ET_File *)l->data)->IndexKey = i++;
-    }
-}
-
-/*
- * Returns the length of the list of displayed files
- */
-static guint
-ET_Displayed_File_List_Get_Length (void)
-{
-    GList *list = NULL;
-
-    list = g_list_first(ETCore->ETFileDisplayedList);
-    ETCore->ETFileDisplayedList_Length = g_list_length(list);
-    return ETCore->ETFileDisplayedList_Length;
-}
-
-/*
- * Load the list of displayed files (calculate length, size, ...)
- * It contains part (filtrated : view by artists and albums) or full ETCore->ETFileList list
- */
-gboolean ET_Set_Displayed_File_List (GList *ETFileList)
-{
-    GList *l = NULL;
-
-    ETCore->ETFileDisplayedList = g_list_first(ETFileList);
-
-    //ETCore->ETFileDisplayedListPtr = ETCore->ETFileDisplayedList;
-    ETCore->ETFileDisplayedList_Length = ET_Displayed_File_List_Get_Length();
-    ETCore->ETFileDisplayedList_TotalSize     = 0;
-    ETCore->ETFileDisplayedList_TotalDuration = 0;
-
-    // Get size and duration of files in the list
-    for (l = ETCore->ETFileDisplayedList; l != NULL; l = g_list_next (l))
-    {
-        ETCore->ETFileDisplayedList_TotalSize += ((ET_File_Info *)((ET_File *)l->data)->ETFileInfo)->size;
-        ETCore->ETFileDisplayedList_TotalDuration += ((ET_File_Info *)((ET_File *)l->data)->ETFileInfo)->duration;
-    }
-
-    /* Sort the file list. */
-    ET_Sort_Displayed_File_List (g_settings_get_enum (MainSettings,
-                                 "sort-mode"));
-
-    // Should renums ETCore->ETFileDisplayedList only!
-    ET_Displayed_File_List_Number();
-
-    return TRUE;
-}
-
-
-
-/*********************
- * Freeing functions *
- *********************/
-
-/*
- * Frees the full main list of files: GList *ETFileList and reinitialize it.
- */
-gboolean ET_Free_File_List (void)
-{
-    g_return_val_if_fail (ETCore != NULL && ETCore->ETFileList != NULL, FALSE);
-
-    g_list_free_full (ETCore->ETFileList,
-                      (GDestroyNotify)ET_Free_File_List_Item);
-    ETCore->ETFileList = NULL;
-
-    return TRUE;
-}
-
-
-/*
- * Frees one item of the full main list of files.
- */
-void
-ET_Free_File_List_Item (ET_File *ETFile)
-{
-    if (ETFile)
-    {
-        /* Frees the lists */
-        if (ETFile->FileNameList)
-        {
-            ET_Free_File_Name_List(ETFile->FileNameList);
-        }
-        if (ETFile->FileNameListBak)
-        {
-            ET_Free_File_Name_List(ETFile->FileNameListBak);
-        }
-        if (ETFile->FileTagList)
-        {
-            ET_Free_File_Tag_List (ETFile->FileTagList);
-        }
-        if (ETFile->FileTagListBak)
-        {
-            ET_Free_File_Tag_List (ETFile->FileTagListBak);
-        }
-        /* Frees infos of ETFileInfo */
-        if (ETFile->ETFileInfo)
-        {
-            ET_Free_File_Info_Item (ETFile->ETFileInfo);
-        }
-        g_free(ETFile->ETFileExtension);
-        g_free(ETFile);
-    }
-}
-
-
-/*
- * Frees the full list: GList *FileNameList.
- */
-gboolean ET_Free_File_Name_List (GList *FileNameList)
-{
-    g_return_val_if_fail (FileNameList != NULL, FALSE);
-
-    FileNameList = g_list_first (FileNameList);
-
-    g_list_free_full (FileNameList, (GDestroyNotify)ET_Free_File_Name_Item);
-
-    return TRUE;
-}
-
-
-/*
- * Frees a File_Name item.
- */
-static void
-ET_Free_File_Name_Item (File_Name *FileName)
-{
-    g_return_if_fail (FileName != NULL);
-
-    g_free(FileName->value);
-    g_free(FileName->value_utf8);
-    g_free(FileName->value_ck);
-    g_free(FileName);
-
-}
-
-
-/*
- * Frees the full list: GList *TagList.
- */
-static gboolean
-ET_Free_File_Tag_List (GList *FileTagList)
-{
-    GList *l;
-
-    g_return_val_if_fail (FileTagList != NULL, FALSE);
-
-    FileTagList = g_list_first (FileTagList);
-
-    for (l = FileTagList; l != NULL; l = g_list_next (l))
-    {
-        if ((File_Tag *)l->data)
-            ET_Free_File_Tag_Item ((File_Tag *)l->data);
-    }
-
-    g_list_free (FileTagList);
-
-    return TRUE;
-}
-
-
-/*
- * Frees the list of 'other' field in a File_Tag item (contains attached gchar data).
- */
-static gboolean
-ET_Free_File_Tag_Item_Other_Field (File_Tag *FileTag)
-{
-    g_list_free_full (FileTag->other, g_free);
-
-    return TRUE;
-}
-
-
-/*
- * Frees a File_Tag item.
- */
-gboolean ET_Free_File_Tag_Item (File_Tag *FileTag)
-{
-    g_return_val_if_fail (FileTag != NULL, FALSE);
-
-    g_free(FileTag->title);
-    g_free(FileTag->artist);
-    g_free(FileTag->album_artist);
-    g_free(FileTag->album);
-    g_free(FileTag->disc_number);
-    g_free (FileTag->disc_total);
-    g_free(FileTag->year);
-    g_free(FileTag->track);
-    g_free(FileTag->track_total);
-    g_free(FileTag->genre);
-    g_free(FileTag->comment);
-    g_free(FileTag->composer);
-    g_free(FileTag->orig_artist);
-    g_free(FileTag->copyright);
-    g_free(FileTag->url);
-    g_free(FileTag->encoded_by);
-    Picture_Free(FileTag->picture);
-    // Free list of other fields
-    ET_Free_File_Tag_Item_Other_Field(FileTag);
-
-    g_free(FileTag);
-    return TRUE;
-}
-
-
-/*
- * Frees a File_Info item.
- */
-static gboolean
-ET_Free_File_Info_Item (ET_File_Info *ETFileInfo)
-{
-    g_return_val_if_fail (ETFileInfo != NULL, FALSE);
-
-    g_free(ETFileInfo->mpc_profile);
-    g_free(ETFileInfo->mpc_version);
-
-    g_free(ETFileInfo);
-    return TRUE;
-}
-
-
-/*
- * History list contains only pointers, so no data to free except the history structure.
- */
-static gboolean
-ET_Free_History_File_List (void)
-{
-    g_return_val_if_fail (ETCore != NULL && ETCore->ETHistoryFileList != NULL,
-                          FALSE);
-
-    ETCore->ETHistoryFileList = g_list_first (ETCore->ETHistoryFileList);
-
-    g_list_free_full (ETCore->ETHistoryFileList, g_free);
-
-    ETCore->ETHistoryFileList = NULL;
-
-    return TRUE;
-}
-
-/*
- * "Display" list contains only pointers, so NOTHING to free
- */
-static gboolean
-ET_Free_Displayed_File_List (void)
-{
-    g_return_val_if_fail (ETCore != NULL
-                          && ETCore->ETFileDisplayedList != NULL, FALSE);
-
-    ETCore->ETFileDisplayedList = NULL;
-
-    return TRUE;
-}
-
-
-/*
- * ArtistAlbum list contains 3 levels of lists
- */
-static gboolean
-ET_Free_Artist_Album_File_List (void)
-{
-    GList *l;
-
-    g_return_val_if_fail (ETCore != NULL
-                          && ETCore->ETArtistAlbumFileList != NULL, FALSE);
-
-    /* Pointers are stored inside the artist/album list-stores, so free them
-     * first. */
-    et_application_window_browser_clear_artist_model (ET_APPLICATION_WINDOW (MainWindow));
-    et_application_window_browser_clear_album_model (ET_APPLICATION_WINDOW (MainWindow));
-
-    for (l = ETCore->ETArtistAlbumFileList; l != NULL; l = g_list_next (l))
-    {
-        GList *m;
-
-        for (m = (GList *)l->data; m != NULL; m = g_list_next (m))
-        {
-            GList *n = (GList *)m->data;
-            if (n)
-                g_list_free (n);
-        }
-
-        if (l->data) /* Free AlbumList list. */
-            g_list_free ((GList *)l->data);
-    }
-
-    if (ETCore->ETArtistAlbumFileList)
-        g_list_free(ETCore->ETArtistAlbumFileList);
-
-    ETCore->ETArtistAlbumFileList = NULL;
-
-    return TRUE;
-}
-
-
-
-
-/*********************
- * Copying functions *
- *********************/
-
-/*
- * Duplicate the 'other' list
- */
-static void
-ET_Copy_File_Tag_Item_Other_Field (const ET_File *ETFile,
-                                   File_Tag *FileTag)
-{
-    const File_Tag *FileTagCur;
-    GList *l;
-
-    FileTagCur = (File_Tag *)(ETFile->FileTag)->data;
-
-    for (l = FileTagCur->other; l != NULL; l = g_list_next (l))
-    {
-        FileTag->other = g_list_prepend (FileTag->other,
-                                         g_strdup ((gchar *)l->data));
-    }
-
-    FileTag->other = g_list_reverse (FileTag->other);
-}
-
-
-/*
- * Copy data of the File_Tag structure (of ETFile) to the FileTag item.
- * Reallocate data if not null.
- */
-gboolean
-ET_Copy_File_Tag_Item (const ET_File *ETFile, File_Tag *FileTag)
-{
-    const File_Tag *FileTagCur;
-
-    g_return_val_if_fail (ETFile != NULL && ETFile->FileTag != NULL &&
-                          (File_Tag *)(ETFile->FileTag)->data != NULL, FALSE);
-    g_return_val_if_fail (FileTag != NULL, FALSE);
-
-    /* The data to duplicate to FileTag */
-    FileTagCur = (File_Tag *)(ETFile->FileTag)->data;
-    // Key for the item, may be overwritten
-    FileTag->key = ET_Undo_Key_New();
-
-    if (FileTagCur->title)
-    {
-        FileTag->title = g_strdup(FileTagCur->title);
-    }else
-    {
-        g_free(FileTag->title);
-        FileTag->title = NULL;
-    }
-
-    if (FileTagCur->artist)
-    {
-        FileTag->artist = g_strdup(FileTagCur->artist);
-    }else
-    {
-        g_free(FileTag->artist);
-        FileTag->artist = NULL;
-    }
-
-    if (FileTagCur->album_artist)
-    {
-        FileTag->album_artist = g_strdup(FileTagCur->album_artist);
-    }else
-    {
-        g_free(FileTag->album_artist);
-        FileTag->album_artist = NULL;
-    }
-
-    if (FileTagCur->album)
-    {
-        FileTag->album = g_strdup(FileTagCur->album);
-    }else
-    {
-        g_free(FileTag->album);
-        FileTag->album = NULL;
-    }
-
-    if (FileTagCur->disc_number)
-    {
-        FileTag->disc_number = g_strdup(FileTagCur->disc_number);
-    }else
-    {
-        g_free(FileTag->disc_number);
-        FileTag->disc_number = NULL;
-    }
-
-    if (FileTagCur->disc_total)
-    {
-        FileTag->disc_total = g_strdup (FileTagCur->disc_total);
-    }
-    else
-    {
-        g_free (FileTag->disc_total);
-        FileTag->disc_total = NULL;
-    }
-
-    if (FileTagCur->year)
-    {
-        FileTag->year = g_strdup(FileTagCur->year);
-    }else
-    {
-        g_free(FileTag->year);
-        FileTag->year = NULL;
-    }
-
-    if (FileTagCur->track)
-    {
-        FileTag->track = g_strdup(FileTagCur->track);
-    }else
-    {
-        g_free(FileTag->track);
-        FileTag->track = NULL;
-    }
-
-    if (FileTagCur->track_total)
-    {
-        FileTag->track_total = g_strdup(FileTagCur->track_total);
-    }else
-    {
-        g_free(FileTag->track_total);
-        FileTag->track_total = NULL;
-    }
-
-    if (FileTagCur->genre)
-    {
-        FileTag->genre = g_strdup(FileTagCur->genre);
-    }else
-    {
-        g_free(FileTag->genre);
-        FileTag->genre = NULL;
-    }
-
-    if (FileTagCur->comment)
-    {
-        FileTag->comment = g_strdup(FileTagCur->comment);
-    }else
-    {
-        g_free(FileTag->comment);
-        FileTag->comment = NULL;
-    }
-
-    if (FileTagCur->composer)
-    {
-        FileTag->composer = g_strdup(FileTagCur->composer);
-    }else
-    {
-        g_free(FileTag->composer);
-        FileTag->composer = NULL;
-    }
-
-    if (FileTagCur->orig_artist)
-    {
-        FileTag->orig_artist = g_strdup(FileTagCur->orig_artist);
-    }else
-    {
-        g_free(FileTag->orig_artist);
-        FileTag->orig_artist = NULL;
-    }
-
-    if (FileTagCur->copyright)
-    {
-        FileTag->copyright = g_strdup(FileTagCur->copyright);
-    }else
-    {
-        g_free(FileTag->copyright);
-        FileTag->copyright = NULL;
-    }
-
-    if (FileTagCur->url)
-    {
-        FileTag->url = g_strdup(FileTagCur->url);
-    }else
-    {
-        g_free(FileTag->url);
-        FileTag->url = NULL;
-    }
-
-    if (FileTagCur->encoded_by)
-    {
-        FileTag->encoded_by = g_strdup(FileTagCur->encoded_by);
-    }else
-    {
-        g_free(FileTag->encoded_by);
-        FileTag->encoded_by = NULL;
-    }
-
-    if (FileTagCur->picture)
-    {
-        if (FileTag->picture)
-            Picture_Free(FileTag->picture);
-        FileTag->picture = Picture_Copy(FileTagCur->picture);
-    }else if (FileTag->picture)
-    {
-        Picture_Free(FileTag->picture);
-        FileTag->picture = NULL;
-    }
-
-    if (FileTagCur->other)
-    {
-        ET_Copy_File_Tag_Item_Other_Field(ETFile,FileTag);
-    }else
-    {
-        ET_Free_File_Tag_Item_Other_Field (FileTag);
-    }
-
-    return TRUE;
-}
-
-
-/*
- * Fill content of a FileName item according to the filename passed in argument (UTF-8 filename or not)
- * Calculate also the collate key.
- * It treats numbers intelligently so that "file1" "file10" "file5" is sorted as "file1" "file5" "file10"
- */
-gboolean
-ET_Set_Filename_File_Name_Item (File_Name *FileName,
-                                const gchar *filename_utf8,
-                                const gchar *filename)
-{
-    g_return_val_if_fail (FileName != NULL, FALSE);
-
-    if (filename_utf8 && filename)
-    {
-        FileName->value_utf8 = g_strdup(filename_utf8);
-        FileName->value      = g_strdup(filename);
-        FileName->value_ck   = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
-    }else if (filename_utf8)
-    {
-        FileName->value_utf8 = g_strdup(filename_utf8);
-        FileName->value      = filename_from_display(filename_utf8);
-        FileName->value_ck   = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
-    }else if (filename)
-    {
-        FileName->value_utf8 = filename_to_display(filename);;
-        FileName->value      = g_strdup(filename);
-        FileName->value_ck   = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
-    }else
-    {
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-
-/*
- * Set the value of a field of a FileTag item (for ex, value of FileTag->title)
- * Must be used only for the 'gchar *' components
- */
-gboolean ET_Set_Field_File_Tag_Item (gchar **FileTagField, const gchar *value)
-{
-    g_return_val_if_fail (FileTagField != NULL, FALSE);
-
-    if (*FileTagField != NULL)
-    {
-        g_free(*FileTagField);
-        *FileTagField = NULL;
-    }
-
-    if (value != NULL)
-    {
-        if (g_utf8_strlen(value, -1) > 0)
-            *FileTagField = g_strdup(value);
-        else
-            *FileTagField = NULL;
-    }
-
-    return TRUE;
-}
-
-
-/*
- * Set the value of a field of a FileTag Picture item.
- */
-gboolean
-ET_Set_Field_File_Tag_Picture (Picture **FileTagField, const Picture *pic)
-{
-    g_return_val_if_fail (FileTagField != NULL, FALSE);
-
-    if (*FileTagField != NULL)
-    {
-        Picture_Free((Picture *)*FileTagField);
-        *FileTagField = NULL;
-    }
-
-    if (pic)
-        *FileTagField = Picture_Copy(pic);
-
-    return TRUE;
-}
-
-
-/************************
- * Displaying functions *
- ************************/
-
-static void
-et_file_header_fields_free (EtFileHeaderFields *fields)
-{
-    g_free (fields->version);
-    g_free (fields->bitrate);
-    g_free (fields->samplerate);
-    g_free (fields->mode);
-    g_free (fields->size);
-    g_free (fields->duration);
-    g_slice_free (EtFileHeaderFields, fields);
-}
-
-/*
- * Display information of the file (Position + Header + Tag) to the user interface.
- * Before doing it, it saves data of the file currently displayed
- */
-void
-ET_Display_File_Data_To_UI (ET_File *ETFile)
-{
-    EtApplicationWindow *window;
-    const ET_File_Description *ETFileDescription;
-    const gchar *cur_filename_utf8;
-    gchar *msg;
-    EtFileHeaderFields *fields;
-
-    g_return_if_fail (ETFile != NULL &&
-                      ((GList *)ETFile->FileNameCur)->data != NULL);
-                      /* For the case where ETFile is an "empty" structure. */
-
-    cur_filename_utf8 = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value_utf8;
-    ETFileDescription = ETFile->ETFileDescription;
-
-    /* Save the current displayed file */
-    ETCore->ETFileDisplayed = ETFile;
-
-    window = ET_APPLICATION_WINDOW (MainWindow);
-
-    /* Display position in list + show/hide icon if file writable/read_only (cur_filename) */
-    et_application_window_file_area_set_file_fields (window, ETFile);
-
-    /* Display filename (and his path) (value in FileNameNew) */
-    ET_Display_Filename_To_UI(ETFile);
-
-    /* Display tag data */
-    et_application_window_tag_area_display_et_file (window, ETFile);
-
-    /* Display controls in tag area */
-    et_application_window_tag_area_display_controls (window, ETFile);
-
-    /* Display file data, header data and file type */
-    switch (ETFileDescription->FileType)
-    {
-#if defined ENABLE_MP3 && defined ENABLE_ID3LIB
-        case MP3_FILE:
-        case MP2_FILE:
-            fields = et_mpeg_header_display_file_info_to_ui (ETFile);
-            et_application_window_file_area_set_header_fields (window, fields);
-            et_mpeg_file_header_fields_free (fields);
-            break;
-#endif
-#ifdef ENABLE_OGG
-        case OGG_FILE:
-            fields = et_ogg_header_display_file_info_to_ui (ETFile);
-            et_application_window_file_area_set_header_fields (window, fields);
-            et_ogg_file_header_fields_free (fields);
-            break;
-#endif
-#ifdef ENABLE_SPEEX
-        case SPEEX_FILE:
-            fields = et_ogg_header_display_file_info_to_ui (ETFile);
-            et_application_window_file_area_set_header_fields (window, fields);
-            et_ogg_file_header_fields_free (fields);
-            break;
-#endif
-#ifdef ENABLE_FLAC
-        case FLAC_FILE:
-            fields = et_flac_header_display_file_info_to_ui (ETFile);
-            et_application_window_file_area_set_header_fields (window, fields);
-            et_flac_file_header_fields_free (fields);
-            break;
-#endif
-        case MPC_FILE:
-            fields = et_mpc_header_display_file_info_to_ui (ETFile);
-            et_application_window_file_area_set_header_fields (window, fields);
-            et_mpc_file_header_fields_free (fields);
-            break;
-        case MAC_FILE:
-            fields = et_mac_header_display_file_info_to_ui (ETFile);
-            et_application_window_file_area_set_header_fields (window, fields);
-            et_mac_file_header_fields_free (fields);
-            break;
-#ifdef ENABLE_MP4
-        case MP4_FILE:
-            fields = et_mp4_header_display_file_info_to_ui (ETFile);
-            et_application_window_file_area_set_header_fields (window, fields);
-            et_mp4_file_header_fields_free (fields);
-            break;
-#endif
-#ifdef ENABLE_WAVPACK
-        case WAVPACK_FILE:
-            fields = et_wavpack_header_display_file_info_to_ui (ETFile);
-            et_application_window_file_area_set_header_fields (window, fields);
-            et_wavpack_file_header_fields_free (fields);
-            break;
-#endif
-#ifdef ENABLE_OPUS
-        case OPUS_FILE:
-            fields = et_opus_header_display_file_info_to_ui (ETFile);
-            et_application_window_file_area_set_header_fields (window, fields);
-            et_opus_file_header_fields_free (fields);
-            break;
-#endif
-        case UNKNOWN_FILE:
-        default:
-            /* Default displaying. */
-            fields = ET_Display_File_Info_To_UI (ETFile);
-            et_application_window_file_area_set_header_fields (window, fields);
-            et_file_header_fields_free (fields);
-            Log_Print (LOG_ERROR,
-                       "ETFileInfo: Undefined file type %d for file %s.",
-                       ETFileDescription->FileType, cur_filename_utf8);
-            break;
-    }
-
-    msg = g_strdup_printf (_("File: ‘%s’"), cur_filename_utf8);
-    et_application_window_status_bar_message (window, msg, FALSE);
-    g_free (msg);
-}
-
-static void
-ET_Display_Filename_To_UI (const ET_File *ETFile)
-{
-    const gchar *new_filename_utf8;
-    gchar *dirname_utf8;
-    gchar *text;
-
-    g_return_if_fail (ETFile != NULL);
-
-    new_filename_utf8 = ((File_Name *)((GList *)ETFile->FileNameNew)->data)->value_utf8;
-
-    /*
-     * Set the path to the file into BrowserEntry (dirbrowser)
-     */
-    dirname_utf8 = g_path_get_dirname(new_filename_utf8);
-    et_application_window_browser_entry_set_text (ET_APPLICATION_WINDOW (MainWindow),
-                                                  dirname_utf8);
-
-    // And refresh the number of files in this directory
-    text = g_strdup_printf(ngettext("One file","%u files",ET_Get_Number_Of_Files_In_Directory(dirname_utf8)),ET_Get_Number_Of_Files_In_Directory(dirname_utf8));
-    et_application_window_browser_label_set_text (ET_APPLICATION_WINDOW (MainWindow),
-                                                  text);
-    g_free(dirname_utf8);
-    g_free(text);
-}
-
-
-/*
- * "Default" way to display File Info to the user interface.
- */
-static EtFileHeaderFields *
-ET_Display_File_Info_To_UI (const ET_File *ETFile)
-{
-    EtFileHeaderFields *fields;
-    ET_File_Info *info;
-    gchar *time  = NULL;
-    gchar *time1 = NULL;
-    gchar *size  = NULL;
-    gchar *size1 = NULL;
-
-    info = ETFile->ETFileInfo;
-    fields = g_slice_new (EtFileHeaderFields);
-
-    fields->description = _("File");
-
-    /* MPEG, Layer versions */
-    fields->version = g_strdup_printf ("%d, Layer %d", info->version,
-                                       info->layer);
-
-    /* Bitrate */
-    fields->bitrate = g_strdup_printf (_("%d kb/s"), info->bitrate);
-
-    /* Samplerate */
-    fields->samplerate = g_strdup_printf (_("%d Hz"), info->samplerate);
-
-    /* Mode */
-    fields->mode = g_strdup_printf ("%d", info->mode);
-
-    /* Size */
-    size = g_format_size (info->size);
-    size1 = g_format_size (ETCore->ETFileDisplayedList_TotalSize);
-    fields->size = g_strdup_printf ("%s (%s)", size, size1);
-    g_free (size);
-    g_free (size1);
-
-    /* Duration */
-    time = Convert_Duration (info->duration);
-    time1 = Convert_Duration (ETCore->ETFileDisplayedList_TotalDuration);
-    fields->duration = g_strdup_printf ("%s (%s)", time, time1);
-    g_free (time);
-    g_free (time1);
-
-    return fields;
-}
-
-/********************
- * Saving functions *
- ********************/
-
-/*
- * Save information of the file, contained into the entries of the user interface, in the list.
- * An undo key is generated to be used for filename and tag if there are changed is the same time.
- * Filename and Tag.
- */
-void ET_Save_File_Data_From_UI (ET_File *ETFile)
-{
-    const ET_File_Description *ETFileDescription;
-    File_Name *FileName;
-    File_Tag  *FileTag;
-    guint      undo_key;
-    const gchar *cur_filename_utf8;
-
-    g_return_if_fail (ETFile != NULL && ETFile->FileNameCur != NULL
-                      && ETFile->FileNameCur->data != NULL);
-
-    cur_filename_utf8 = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value_utf8;
-    ETFileDescription = ETFile->ETFileDescription;
-    undo_key = ET_Undo_Key_New();
-
-
-    /*
-     * Save filename and generate undo for filename
-     */
-    FileName = g_malloc0(sizeof(File_Name));
-    ET_Initialize_File_Name_Item(FileName);
-    FileName->key = undo_key;
-    ET_Save_File_Name_From_UI(ETFile,FileName); // Used for all files!
-
-    switch (ETFileDescription->TagType)
-    {
-#ifdef ENABLE_MP3
-        case ID3_TAG:
-#endif
-#ifdef ENABLE_OGG
-        case OGG_TAG:
-#endif
-#ifdef ENABLE_FLAC
-        case FLAC_TAG:
-#endif
-#ifdef ENABLE_MP4
-        case MP4_TAG:
-#endif
-#ifdef ENABLE_WAVPACK
-        case WAVPACK_TAG:
-#endif
-#ifdef ENABLE_OPUS
-        case OPUS_TAG:
-#endif
-        case APE_TAG:
-            FileTag = et_application_window_tag_area_create_file_tag (ET_APPLICATION_WINDOW (MainWindow));
-            ET_Copy_File_Tag_Item_Other_Field (ETFile, FileTag);
-            break;
-        case UNKNOWN_TAG:
-        default:
-            FileTag = ET_File_Tag_Item_New ();
-            Log_Print(LOG_ERROR,"FileTag: Undefined tag type %d for file %s.",ETFileDescription->TagType,cur_filename_utf8);
-            break;
-    }
-
-    /*
-     * Generate undo for the file and the main undo list.
-     * If no changes detected, FileName and FileTag item are deleted.
-     */
-    ET_Manage_Changes_Of_File_Data(ETFile,FileName,FileTag);
-
-    /* Refresh file into browser list */
-    et_application_window_browser_refresh_file_in_list (ET_APPLICATION_WINDOW (MainWindow),
-                                                        ETFile);
-}
-
-
-/*
- * Save displayed filename into list if it had been changed. Generates also an history list for undo/redo.
- *  - ETFile : the current etfile that we want to save,
- *  - FileName : where is 'temporary' saved the new filename.
- *
- * Note : it builds new filename (with path) from strings encoded into file system
- *        encoding, not UTF-8 (it preserves file system encoding of parent directories).
- */
-static gboolean
-ET_Save_File_Name_From_UI (const ET_File *ETFile, File_Name *FileName)
-{
-    gchar *filename_new = NULL;
-    gchar *dirname = NULL;
-    gchar *filename;
-    const gchar *filename_utf8;
-    gchar *extension;
-
-    g_return_val_if_fail (ETFile != NULL && FileName != NULL, FALSE);
-
-    filename_utf8 = et_application_window_file_area_get_filename (ET_APPLICATION_WINDOW (MainWindow));
-    filename = filename_from_display (filename_utf8);
-
-    if (!filename)
-    {
-        // If translation fails...
-        GtkWidget *msgdialog;
-        gchar *filename_escaped_utf8 = g_strescape(filename_utf8, NULL);
-        msgdialog = gtk_message_dialog_new(GTK_WINDOW(MainWindow),
-                                           GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_ERROR,
-                                           GTK_BUTTONS_CLOSE,
-                                           _("Could not convert filename ‘%s’ to system filename encoding"),
-                                           filename_escaped_utf8);
-        gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(msgdialog),_("Try setting the environment variable G_FILENAME_ENCODING."));
-        gtk_window_set_title(GTK_WINDOW(msgdialog), _("Filename translation"));
-
-        gtk_dialog_run(GTK_DIALOG(msgdialog));
-        gtk_widget_destroy(msgdialog);
-        g_free(filename_escaped_utf8);
-        return FALSE;
-    }
-
-    // Get the current path to the file
-    dirname = g_path_get_dirname( ((File_Name *)ETFile->FileNameNew->data)->value );
-
-    // Convert filename extension (lower or upper)
-    extension = ET_File_Name_Format_Extension(ETFile);
-
-    // Check length of filename (limit ~255 characters)
-    //ET_File_Name_Check_Length(ETFile,filename);
-
-    // Filename (in file system encoding!)
-    if (filename && strlen(filename)>0)
-    {
-        // Regenerate the new filename (without path)
-        filename_new = g_strconcat(filename,extension,NULL);
-    }else
-    {
-        // Keep the 'last' filename (if a 'blank' filename was entered in the fileentry for ex)...
-        filename_new = g_path_get_basename( ((File_Name *)ETFile->FileNameNew->data)->value );
-    }
-    g_free (filename);
-    g_free (extension);
-
-    // Check if new filename seems to be correct
-    if ( !filename_new || strlen(filename_new) <= strlen(ETFile->ETFileDescription->Extension) )
-    {
-        FileName->value      = NULL;
-        FileName->value_utf8 = NULL;
-        FileName->value_ck   = NULL;
-
-        g_free(filename_new);
-        g_free(dirname);
-        return FALSE;
-    }
-
-    // Convert the illegal characters
-    ET_File_Name_Convert_Character(filename_new); // FIX ME : should be in UTF8?
-
-    /* Set the new filename (in file system encoding). */
-    FileName->value = g_strconcat(dirname,G_DIR_SEPARATOR_S,filename_new,NULL);
-    /* Set the new filename (in UTF-8 encoding). */
-    FileName->value_utf8 = filename_to_display(FileName->value);
-    // Calculates collate key
-    FileName->value_ck = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
-
-    g_free(filename_new);
-    g_free(dirname);
-    return TRUE;
-}
-
-
-/*
- * Do the same thing of ET_Save_File_Name_From_UI, but without getting the
- * data from the UI.
- */
-static gboolean
-ET_Save_File_Name_Internal (const ET_File *ETFile,
-                            File_Name *FileName)
-{
-    gchar *filename_new = NULL;
-    gchar *dirname = NULL;
-    gchar *filename;
-    gchar *extension;
-    gchar *pos;
-
-    g_return_val_if_fail (ETFile != NULL && FileName != NULL, FALSE);
-
-    // Get the current path to the file
-    dirname = g_path_get_dirname( ((File_Name *)ETFile->FileNameNew->data)->value );
-
-    // Get the name of file (and rebuild it with extension with a 'correct' case)
-    filename = g_path_get_basename( ((File_Name *)ETFile->FileNameNew->data)->value );
-
-    // Remove the extension
-    if ((pos=strrchr(filename, '.'))!=NULL)
-        *pos = 0;
-
-    // Convert filename extension (lower/upper)
-    extension = ET_File_Name_Format_Extension(ETFile);
-
-    // Check length of filename
-    //ET_File_Name_Check_Length(ETFile,filename);
-
-    // Regenerate the new filename (without path)
-    filename_new = g_strconcat(filename,extension,NULL);
-    g_free(extension);
-    g_free(filename);
-
-    // Check if new filename seems to be correct
-    if (filename_new)
-    {
-        // Convert the illegal characters
-        ET_File_Name_Convert_Character(filename_new);
-
-        /* Set the new filename (in file system encoding). */
-        FileName->value = g_strconcat(dirname,G_DIR_SEPARATOR_S,filename_new,NULL);
-        /* Set the new filename (in UTF-8 encoding). */
-        FileName->value_utf8 = filename_to_display(FileName->value);
-        // Calculate collate key
-        FileName->value_ck = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
-
-        g_free(filename_new);
-        g_free(dirname);
-        return TRUE;
-    }else
-    {
-        FileName->value = NULL;
-        FileName->value_utf8 = NULL;
-        FileName->value_ck = NULL;
-
-        g_free(filename_new);
-        g_free(dirname);
-        return FALSE;
-    }
-}
-
-/*
- * Do the same thing of et_tag_area_create_file_tag without getting the data from the UI.
- */
-static gboolean
-ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
-{
-    File_Tag *FileTagCur;
-
-
-    g_return_val_if_fail (ETFile != NULL && ETFile->FileTag != NULL
-                          && FileTag != NULL, FALSE);
-
-    FileTagCur = (File_Tag *)ETFile->FileTag->data;
-
-    /* Title */
-    if ( FileTagCur->title && g_utf8_strlen(FileTagCur->title, -1)>0 )
-    {
-        FileTag->title = g_strdup(FileTagCur->title);
-        g_strstrip (FileTag->title);
-    } else
-    {
-        FileTag->title = NULL;
-    }
-
-    /* Artist */
-    if ( FileTagCur->artist && g_utf8_strlen(FileTagCur->artist, -1)>0 )
-    {
-        FileTag->artist = g_strdup(FileTagCur->artist);
-        g_strstrip (FileTag->artist);
-    } else
-    {
-        FileTag->artist = NULL;
-    }
-
-	/* Album Artist */
-    if ( FileTagCur->album_artist && g_utf8_strlen(FileTagCur->album_artist, -1)>0 )
-    {
-        FileTag->album_artist = g_strdup(FileTagCur->album_artist);
-        g_strstrip (FileTag->album_artist);
-    } else
-    {
-        FileTag->album_artist = NULL;
-    }
-
-
-    /* Album */
-    if ( FileTagCur->album && g_utf8_strlen(FileTagCur->album, -1)>0 )
-    {
-        FileTag->album = g_strdup(FileTagCur->album);
-        g_strstrip (FileTag->album);
-    } else
-    {
-        FileTag->album = NULL;
-    }
-
-
-    /* Disc Number */
-    if ( FileTagCur->disc_number && g_utf8_strlen(FileTagCur->disc_number, -1)>0 )
-    {
-        FileTag->disc_number = g_strdup(FileTagCur->disc_number);
-        g_strstrip (FileTag->disc_number);
-    } else
-    {
-        FileTag->disc_number = NULL;
-    }
-
-
-    /* Discs Total */
-    if (FileTagCur->disc_total
-        && g_utf8_strlen (FileTagCur->disc_total, -1) > 0)
-    {
-        FileTag->disc_total = et_disc_number_to_string (atoi (FileTagCur->disc_total));
-        g_strstrip (FileTag->disc_total);
-    }
-    else
-    {
-        FileTag->disc_total = NULL;
-    }
-
-
-    /* Year */
-    if ( FileTagCur->year && g_utf8_strlen(FileTagCur->year, -1)>0 )
-    {
-        FileTag->year = g_strdup(FileTagCur->year);
-        g_strstrip (FileTag->year);
-    } else
-    {
-        FileTag->year = NULL;
-    }
-
-
-    /* Track */
-    if ( FileTagCur->track && g_utf8_strlen(FileTagCur->track, -1)>0 )
-    {
-        gchar *tmp_str;
-
-        FileTag->track = et_track_number_to_string (atoi (FileTagCur->track));
-
-        // This field must contain only digits
-        tmp_str = FileTag->track;
-        while (isdigit((guchar)*tmp_str)) tmp_str++;
-            *tmp_str = 0;
-        g_strstrip (FileTag->track);
-    } else
-    {
-        FileTag->track = NULL;
-    }
-
-
-    /* Track Total */
-    if ( FileTagCur->track_total && g_utf8_strlen(FileTagCur->track_total, -1)>0 )
-    {
-        FileTag->track_total = et_track_number_to_string (atoi (FileTagCur->track_total));
-        g_strstrip (FileTag->track_total);
-    } else
-    {
-        FileTag->track_total = NULL;
-    }
-
-
-    /* Genre */
-    if ( FileTagCur->genre && g_utf8_strlen(FileTagCur->genre, -1)>0 )
-    {
-        FileTag->genre = g_strdup(FileTagCur->genre);
-        g_strstrip (FileTag->genre);
-    } else
-    {
-        FileTag->genre = NULL;
-    }
-
-
-    /* Comment */
-    if ( FileTagCur->comment && g_utf8_strlen(FileTagCur->comment, -1)>0 )
-    {
-        FileTag->comment = g_strdup(FileTagCur->comment);
-        g_strstrip (FileTag->comment);
-    } else
-    {
-        FileTag->comment = NULL;
-    }
-
-
-    /* Composer */
-    if ( FileTagCur->composer && g_utf8_strlen(FileTagCur->composer, -1)>0 )
-    {
-        FileTag->composer = g_strdup(FileTagCur->composer);
-        g_strstrip (FileTag->composer);
-    } else
-    {
-        FileTag->composer = NULL;
-    }
-
-
-    /* Original Artist */
-    if ( FileTagCur->orig_artist && g_utf8_strlen(FileTagCur->orig_artist, -1)>0 )
-    {
-        FileTag->orig_artist = g_strdup(FileTagCur->orig_artist);
-        g_strstrip (FileTag->orig_artist);
-    } else
-    {
-        FileTag->orig_artist = NULL;
-    }
-
-
-    /* Copyright */
-    if ( FileTagCur->copyright && g_utf8_strlen(FileTagCur->copyright, -1)>0 )
-    {
-        FileTag->copyright = g_strdup(FileTagCur->copyright);
-        g_strstrip (FileTag->copyright);
-    } else
-    {
-        FileTag->copyright = NULL;
-    }
-
-
-    /* URL */
-    if ( FileTagCur->url && g_utf8_strlen(FileTagCur->url, -1)>0 )
-    {
-        FileTag->url = g_strdup(FileTagCur->url);
-        g_strstrip (FileTag->url);
-    } else
-    {
-        FileTag->url = NULL;
-    }
-
-
-    /* Encoded by */
-    if ( FileTagCur->encoded_by && g_utf8_strlen(FileTagCur->encoded_by, -1)>0 )
-    {
-        FileTag->encoded_by = g_strdup(FileTagCur->encoded_by);
-        g_strstrip (FileTag->encoded_by);
-    } else
-    {
-        FileTag->encoded_by = NULL;
-    }
-
-
-    /* Picture */
-    if(FileTagCur->picture)
-    {
-        if (FileTag->picture)
-            Picture_Free(FileTag->picture);
-        FileTag->picture = Picture_Copy(FileTagCur->picture);
-    }else if (FileTag->picture)
-    {
-        Picture_Free(FileTag->picture);
-        FileTag->picture = NULL;
-    }
-
-    return TRUE;
-}
-
-
-/*
- * Save data contained into File_Tag structure to the file on hard disk.
- */
-gboolean
-ET_Save_File_Tag_To_HD (ET_File *ETFile, GError **error)
-{
-    const ET_File_Description *ETFileDescription;
-    const gchar *cur_filename;
-    const gchar *cur_filename_utf8;
-    gboolean state;
-    GFile *file;
-    GFileInfo *fileinfo;
-
-    g_return_val_if_fail (ETFile != NULL, FALSE);
-    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-    cur_filename = ((File_Name *)(ETFile->FileNameCur)->data)->value;
-    cur_filename_utf8 = ((File_Name *)(ETFile->FileNameCur)->data)->value_utf8;
-
-    ETFileDescription = ETFile->ETFileDescription;
-
-    /* Store the file timestamps (in case they are to be preserved) */
-    file = g_file_new_for_path (cur_filename);
-    fileinfo = g_file_query_info (file, "time::*", G_FILE_QUERY_INFO_NONE,
-                                  NULL, NULL);
-
-    switch (ETFileDescription->TagType)
-    {
-#ifdef ENABLE_MP3
-        case ID3_TAG:
-            state = id3tag_write_file_tag (ETFile, error);
-            break;
-#endif
-#ifdef ENABLE_OGG
-        case OGG_TAG:
-            state = ogg_tag_write_file_tag (ETFile, error);
-            break;
-#endif
-#ifdef ENABLE_FLAC
-        case FLAC_TAG:
-            state = flac_tag_write_file_tag (ETFile, error);
-            break;
-#endif
-        case APE_TAG:
-            state = ape_tag_write_file_tag (ETFile, error);
-            break;
-#ifdef ENABLE_MP4
-        case MP4_TAG:
-            state = mp4tag_write_file_tag (ETFile, error);
-            break;
-#endif
-#ifdef ENABLE_WAVPACK
-        case WAVPACK_TAG:
-            state = wavpack_tag_write_file_tag (ETFile, error);
-            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).",
-                ETFileDescription->TagType,cur_filename_utf8);
-            state = FALSE;
-            break;
-    }
-
-    /* Update properties for the file. */
-    if (fileinfo)
-    {
-        if (g_settings_get_boolean (MainSettings,
-                                    "file-preserve-modification-time"))
-        {
-            g_file_set_attributes_from_info (file, fileinfo,
-                                             G_FILE_QUERY_INFO_NONE,
-                                             NULL, NULL);
-        }
-
-        g_object_unref (fileinfo);
-    }
-
-    /* Update the stored file modification time to prevent EasyTAG from warning
-     * that an external program has changed the file. */
-    fileinfo = g_file_query_info (file,
-                                  G_FILE_ATTRIBUTE_TIME_MODIFIED,
-                                  G_FILE_QUERY_INFO_NONE, NULL, NULL);
-
-    if (fileinfo)
-    {
-        ETFile->FileModificationTime = g_file_info_get_attribute_uint64 (fileinfo,
-                                                                         G_FILE_ATTRIBUTE_TIME_MODIFIED);
-        g_object_unref (fileinfo);
-    }
-
-    g_object_unref (file);
-
-    if (state==TRUE)
-    {
-
-        /* Update date and time of the parent directory of the file after
-         * changing the tag value (ex: needed for Amarok for refreshing). Note
-         * that when renaming a file the parent directory is automatically
-         * updated.
-         */
-        if (g_settings_get_boolean (MainSettings,
-                                    "file-update-parent-modification-time"))
-        {
-            gchar *path = g_path_get_dirname (cur_filename);
-            utime (path, NULL);
-            g_free (path);
-        }
-
-        ET_Mark_File_Tag_As_Saved(ETFile);
-        return TRUE;
-    }
-    else
-    {
-        g_assert (error == NULL || *error != NULL);
-
-        return FALSE;
-    }
-}
-
-/*
- * Function used to update path of filenames into list after renaming a parent directory
- * (for ex: "/mp3/old_path/file.mp3" to "/mp3/new_path/file.mp3"
- */
-void
-ET_Update_Directory_Name_Into_File_List (const gchar *last_path,
-                                         const gchar *new_path)
-{
-    GList *filelist;
-    ET_File *file;
-    GList *filenamelist;
-    gchar *filename;
-    gchar *last_path_tmp;
-
-    if (!ETCore->ETFileList || !last_path || !new_path ||
-        strlen(last_path) < 1 || strlen(new_path) < 1 )
-        return;
-
-    // Add '/' to end of path to avoid ambiguity between a directory and a filename...
-    if (last_path[strlen(last_path)-1]==G_DIR_SEPARATOR)
-        last_path_tmp = g_strdup(last_path);
-    else
-        last_path_tmp = g_strconcat(last_path,G_DIR_SEPARATOR_S,NULL);
-
-    for (filelist = g_list_first (ETCore->ETFileList); filelist != NULL;
-         filelist = g_list_next (filelist))
-    {
-        if ((file = filelist->data))
-        {
-            for (filenamelist = file->FileNameList; filenamelist != NULL;
-                 filenamelist = g_list_next (filenamelist))
-            {
-                File_Name *FileName = (File_Name *)filenamelist->data;
-
-                if ( FileName && (filename=FileName->value) )
-                {
-                    // Replace path of filename
-                    if ( strncmp(filename,last_path_tmp,strlen(last_path_tmp))==0 )
-                    {
-                        gchar *filename_tmp;
-
-                        // Create the new filename
-                        filename_tmp = g_strconcat(new_path,
-                                                   (new_path[strlen(new_path)-1]==G_DIR_SEPARATOR) ? "" : G_DIR_SEPARATOR_S,
-                                                   &filename[strlen(last_path_tmp)],NULL);
-
-                        /* Replace the filename (in file system encoding). */
-                        g_free(FileName->value);
-                        FileName->value = filename_tmp;
-                        /* Replace the filename (in file system encoding). */
-                        g_free(FileName->value_utf8);
-                        FileName->value_utf8 = filename_to_display(FileName->value);
-                        // Recalculate the collate key
-                        g_free(FileName->value_ck);
-                        FileName->value_ck = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
-                    }
-                }
-             }
-        }
-    }
-
-    g_free(last_path_tmp);
-}
-
-
-
-/***********************
- * Undo/Redo functions *
- ***********************/
-
-/*
- * Check if 'FileName' and 'FileTag' differ with those of 'ETFile'.
- * Manage undo feature for the ETFile and the main undo list.
- */
-gboolean ET_Manage_Changes_Of_File_Data (ET_File *ETFile, File_Name *FileName, File_Tag *FileTag)
-{
-    gboolean undo_added = FALSE;
-
-    g_return_val_if_fail (ETFile != NULL, FALSE);
-
-    /*
-     * Detect changes of filename and generate the filename undo list
-     */
-    if (FileName)
-    {
-        if ( ETFile->FileNameNew && ET_Detect_Changes_Of_File_Name( (File_Name *)(ETFile->FileNameNew)->data,FileName )==TRUE )
-        {
-            ET_Add_File_Name_To_List(ETFile,FileName);
-            undo_added |= TRUE;
-        }else
-        {
-            ET_Free_File_Name_Item(FileName);
-        }
-    }
-
-    /*
-     * Detect changes in tag data and generate the tag undo list
-     */
-    if (FileTag)
-    {
-        if ( ETFile->FileTag && ET_Detect_Changes_Of_File_Tag( (File_Tag *)(ETFile->FileTag)->data,FileTag )==TRUE )
-        {
-            ET_Add_File_Tag_To_List(ETFile,FileTag);
-            undo_added |= TRUE;
-        }else
-        {
-            ET_Free_File_Tag_Item(FileTag);
-        }
-    }
-
-    /*
-     * Generate main undo (file history of modifications)
-     */
-    if (undo_added)
-        ET_Add_File_To_History_List(ETFile);
-
-    //return TRUE;
-    return undo_added;
-}
-
-
-/*
- * Compares two File_Name items :
- *  - returns TRUE if there aren't the same
- *  - else returns FALSE
- */
-static gboolean
-ET_Detect_Changes_Of_File_Name (const File_Name *FileName1,
-                                const File_Name *FileName2)
-{
-    const gchar *filename1_ck;
-    const gchar *filename2_ck;
-
-    if (!FileName1 && !FileName2) return FALSE;
-    if (FileName1 && !FileName2) return TRUE;
-    if (!FileName1 && FileName2) return TRUE;
-
-    /* Both FileName1 and FileName2 are != NULL. */
-    if (!FileName1->value && !FileName2->value) return FALSE;
-    if (FileName1->value && !FileName2->value) return TRUE;
-    if (!FileName1->value && FileName2->value) return TRUE;
-
-    /* Compare collate keys (with FileName->value converted to UTF-8 as it
-     * contains raw data). */
-    filename1_ck = FileName1->value_ck;
-    filename2_ck = FileName2->value_ck;
-
-    /* Filename changed ? (we check path + file). */
-    if (strcmp (filename1_ck, filename2_ck) != 0)
-    {
-        return TRUE;
-    }
-    else
-    {
-        return FALSE;
-    }
-}
-
-/*
- * Compares two File_Tag items and returns TRUE if there aren't the same.
- * Notes:
- *  - if field is '' or NULL => will be removed
- */
-gboolean
-ET_Detect_Changes_Of_File_Tag (const File_Tag *FileTag1,
-                               const File_Tag *FileTag2)
-{
-    const Picture *pic1;
-    const Picture *pic2;
-
-    g_return_val_if_fail (FileTag1 != NULL && FileTag2 != NULL, FALSE);
-
-    if ( ( FileTag1 && !FileTag2)
-      || (!FileTag1 &&  FileTag2) )
-        return TRUE;
-
-    /* Title */
-    if ( FileTag1->title && !FileTag2->title && g_utf8_strlen(FileTag1->title, -1)>0 ) return TRUE;
-    if (!FileTag1->title &&  FileTag2->title && g_utf8_strlen(FileTag2->title, -1)>0 ) return TRUE;
-    if ( FileTag1->title &&  FileTag2->title && g_utf8_collate(FileTag1->title,FileTag2->title)!=0 ) return TRUE;
-
-    /* Artist */
-    if ( FileTag1->artist && !FileTag2->artist && g_utf8_strlen(FileTag1->artist, -1)>0 ) return TRUE;
-    if (!FileTag1->artist &&  FileTag2->artist && g_utf8_strlen(FileTag2->artist, -1)>0 ) return TRUE;
-    if ( FileTag1->artist &&  FileTag2->artist && g_utf8_collate(FileTag1->artist,FileTag2->artist)!=0 ) return TRUE;
-
-	/* Album Artist */
-    if ( FileTag1->album_artist && !FileTag2->album_artist && g_utf8_strlen(FileTag1->album_artist, -1)>0 ) return TRUE;
-    if (!FileTag1->album_artist &&  FileTag2->album_artist && g_utf8_strlen(FileTag2->album_artist, -1)>0 ) return TRUE;
-    if ( FileTag1->album_artist &&  FileTag2->album_artist && g_utf8_collate(FileTag1->album_artist,FileTag2->album_artist)!=0 ) return TRUE;
-
-    /* Album */
-    if ( FileTag1->album && !FileTag2->album && g_utf8_strlen(FileTag1->album, -1)>0 ) return TRUE;
-    if (!FileTag1->album &&  FileTag2->album && g_utf8_strlen(FileTag2->album, -1)>0 ) return TRUE;
-    if ( FileTag1->album &&  FileTag2->album && g_utf8_collate(FileTag1->album,FileTag2->album)!=0 ) return TRUE;
-
-    /* Disc Number */
-    if ( FileTag1->disc_number && !FileTag2->disc_number && g_utf8_strlen(FileTag1->disc_number, -1)>0 ) return TRUE;
-    if (!FileTag1->disc_number &&  FileTag2->disc_number && g_utf8_strlen(FileTag2->disc_number, -1)>0 ) return TRUE;
-    if ( FileTag1->disc_number &&  FileTag2->disc_number && g_utf8_collate(FileTag1->disc_number,FileTag2->disc_number)!=0 ) return TRUE;
-
-    /* Discs Total */
-    if (FileTag1->disc_total && !FileTag2->disc_total
-        && g_utf8_strlen (FileTag1->disc_total, -1) > 0)
-    {
-        return TRUE;
-    }
-
-    if (!FileTag1->disc_total &&  FileTag2->disc_total
-        && g_utf8_strlen (FileTag2->disc_total, -1) > 0)
-    {
-        return TRUE;
-    }
-
-    if (FileTag1->disc_total &&  FileTag2->disc_total
-        && g_utf8_collate (FileTag1->disc_total, FileTag2->disc_total) != 0)
-    {
-        return TRUE;
-    }
-
-    /* Year */
-    if ( FileTag1->year && !FileTag2->year && g_utf8_strlen(FileTag1->year, -1)>0 ) return TRUE;
-    if (!FileTag1->year &&  FileTag2->year && g_utf8_strlen(FileTag2->year, -1)>0 ) return TRUE;
-    if ( FileTag1->year &&  FileTag2->year && g_utf8_collate(FileTag1->year,FileTag2->year)!=0 ) return TRUE;
-
-    /* Track */
-    if ( FileTag1->track && !FileTag2->track && g_utf8_strlen(FileTag1->track, -1)>0 ) return TRUE;
-    if (!FileTag1->track &&  FileTag2->track && g_utf8_strlen(FileTag2->track, -1)>0 ) return TRUE;
-    if ( FileTag1->track &&  FileTag2->track && g_utf8_collate(FileTag1->track,FileTag2->track)!=0 ) return TRUE;
-
-    /* Track Total */
-    if ( FileTag1->track_total && !FileTag2->track_total && g_utf8_strlen(FileTag1->track_total, -1)>0 ) return TRUE;
-    if (!FileTag1->track_total &&  FileTag2->track_total && g_utf8_strlen(FileTag2->track_total, -1)>0 ) return TRUE;
-    if ( FileTag1->track_total &&  FileTag2->track_total && g_utf8_collate(FileTag1->track_total,FileTag2->track_total)!=0 ) return TRUE;
-
-    /* Genre */
-    if ( FileTag1->genre && !FileTag2->genre && g_utf8_strlen(FileTag1->genre, -1)>0 ) return TRUE;
-    if (!FileTag1->genre &&  FileTag2->genre && g_utf8_strlen(FileTag2->genre, -1)>0 ) return TRUE;
-    if ( FileTag1->genre &&  FileTag2->genre && g_utf8_collate(FileTag1->genre,FileTag2->genre)!=0 ) return TRUE;
-
-    /* Comment */
-    if ( FileTag1->comment && !FileTag2->comment && g_utf8_strlen(FileTag1->comment, -1)>0 ) return TRUE;
-    if (!FileTag1->comment &&  FileTag2->comment && g_utf8_strlen(FileTag2->comment, -1)>0 ) return TRUE;
-    if ( FileTag1->comment &&  FileTag2->comment && g_utf8_collate(FileTag1->comment,FileTag2->comment)!=0 ) return TRUE;
-
-    /* Composer */
-    if ( FileTag1->composer && !FileTag2->composer && g_utf8_strlen(FileTag1->composer, -1)>0 ) return TRUE;
-    if (!FileTag1->composer &&  FileTag2->composer && g_utf8_strlen(FileTag2->composer, -1)>0 ) return TRUE;
-    if ( FileTag1->composer &&  FileTag2->composer && g_utf8_collate(FileTag1->composer,FileTag2->composer)!=0 ) return TRUE;
-
-    /* Original artist */
-    if ( FileTag1->orig_artist && !FileTag2->orig_artist && g_utf8_strlen(FileTag1->orig_artist, -1)>0 ) return TRUE;
-    if (!FileTag1->orig_artist &&  FileTag2->orig_artist && g_utf8_strlen(FileTag2->orig_artist, -1)>0 ) return TRUE;
-    if ( FileTag1->orig_artist &&  FileTag2->orig_artist && g_utf8_collate(FileTag1->orig_artist,FileTag2->orig_artist)!=0 ) return TRUE;
-
-    /* Copyright */
-    if ( FileTag1->copyright && !FileTag2->copyright && g_utf8_strlen(FileTag1->copyright, -1)>0 ) return TRUE;
-    if (!FileTag1->copyright &&  FileTag2->copyright && g_utf8_strlen(FileTag2->copyright, -1)>0 ) return TRUE;
-    if ( FileTag1->copyright &&  FileTag2->copyright && g_utf8_collate(FileTag1->copyright,FileTag2->copyright)!=0 ) return TRUE;
-
-    /* URL */
-    if ( FileTag1->url && !FileTag2->url && g_utf8_strlen(FileTag1->url, -1)>0 ) return TRUE;
-    if (!FileTag1->url &&  FileTag2->url && g_utf8_strlen(FileTag2->url, -1)>0 ) return TRUE;
-    if ( FileTag1->url &&  FileTag2->url && g_utf8_collate(FileTag1->url,FileTag2->url)!=0 ) return TRUE;
-
-    /* Encoded by */
-    if ( FileTag1->encoded_by && !FileTag2->encoded_by && g_utf8_strlen(FileTag1->encoded_by, -1)>0 ) return TRUE;
-    if (!FileTag1->encoded_by &&  FileTag2->encoded_by && g_utf8_strlen(FileTag2->encoded_by, -1)>0 ) return TRUE;
-    if ( FileTag1->encoded_by &&  FileTag2->encoded_by && g_utf8_collate(FileTag1->encoded_by,FileTag2->encoded_by)!=0 ) return TRUE;
-
-    /* Picture */
-    for (pic1 = FileTag1->picture, pic2 = FileTag2->picture; ;
-         pic1 = pic1->next, pic2 = pic2->next)
-    {
-        if( (pic1 && !pic2) || (!pic1 && pic2) )
-            return TRUE;
-        if (!pic1 || !pic2)
-            break; // => no changes
-        //if (!pic1->data || !pic2->data)
-        //    break; // => no changes
-
-        if (!pic1->data && !pic2->data)
-            return FALSE;
-        if (pic1->data && !pic2->data)
-            return TRUE;
-        if (!pic1->data && pic2->data)
-            return TRUE;
-        if (pic1->size != pic2->size
-        ||  memcmp(pic1->data, pic2->data, pic1->size))
-            return TRUE;
-        if (pic1->type != pic2->type)
-            return TRUE;
-        if (pic1->description && !pic2->description
-        &&  g_utf8_strlen(pic1->description, -1)>0 )
-            return TRUE;
-        if (!pic1->description && pic2->description
-        &&  g_utf8_strlen(pic2->description, -1)>0 )
-            return TRUE;
-        if (pic1->description && pic2->description
-        &&  g_utf8_collate(pic1->description, pic2->description)!=0 )
-            return TRUE;
-    }
-
-    return FALSE; /* No changes */
-}
-
-
-/*
- * Add a FileName item to the history list of ETFile
- */
-static gboolean
-ET_Add_File_Name_To_List (ET_File *ETFile, File_Name *FileName)
-{
-    GList *cut_list = NULL;
-
-    g_return_val_if_fail (ETFile != NULL && FileName != NULL, FALSE);
-
-    /* How it works : Cut the FileNameList list after the current item,
-     * and appends it to the FileNameListBak list for saving the data.
-     * Then appends the new item to the FileNameList list */
-    if (ETFile->FileNameList)
-    {
-        cut_list = ETFile->FileNameNew->next; // Cut after the current item...
-        ETFile->FileNameNew->next = NULL;
-    }
-    if (cut_list)
-        cut_list->prev = NULL;
-
-    /* Add the new item to the list */
-    ETFile->FileNameList = g_list_append(ETFile->FileNameList,FileName);
-    /* Set the current item to use */
-    ETFile->FileNameNew  = g_list_last(ETFile->FileNameList);
-    /* Backup list */
-    /* FIX ME! Keep only the saved item */
-    ETFile->FileNameListBak = g_list_concat(ETFile->FileNameListBak,cut_list);
-
-    return TRUE;
-}
-
-/*
- * Add a FileTag item to the history list of ETFile
- */
-static gboolean
-ET_Add_File_Tag_To_List (ET_File *ETFile, File_Tag *FileTag)
-{
-    GList *cut_list = NULL;
-
-    g_return_val_if_fail (ETFile != NULL && FileTag != NULL, FALSE);
-
-    if (ETFile->FileTag)
-    {
-        cut_list = ETFile->FileTag->next; // Cut after the current item...
-        ETFile->FileTag->next = NULL;
-    }
-    if (cut_list)
-        cut_list->prev = NULL;
-
-    /* Add the new item to the list */
-    ETFile->FileTagList = g_list_append(ETFile->FileTagList,FileTag);
-    /* Set the current item to use */
-    ETFile->FileTag     = g_list_last(ETFile->FileTagList);
-    /* Backup list */
-    ETFile->FileTagListBak = g_list_concat(ETFile->FileTagListBak,cut_list);
-
-    return TRUE;
-}
-
-/*
- * Add a ETFile item to the main undo list of files
- */
-static gboolean
-ET_Add_File_To_History_List (ET_File *ETFile)
-{
-    ET_History_File *ETHistoryFile;
-
-    g_return_val_if_fail (ETFile != NULL, FALSE);
-
-    ETHistoryFile = g_malloc0(sizeof(ET_History_File));
-    ETHistoryFile->ETFile = ETFile;
-
-    /* The undo list must contains one item before the 'first undo' data */
-    if (!ETCore->ETHistoryFileList)
-        ETCore->ETHistoryFileList = g_list_append(ETCore->ETHistoryFileList,g_malloc0(sizeof(ET_History_File)));
-
-    /* Add the item to the list (cut end of list from the current element) */
-    ETCore->ETHistoryFileList = g_list_append(ETCore->ETHistoryFileList,ETHistoryFile);
-    ETCore->ETHistoryFileList = g_list_last(ETCore->ETHistoryFileList);
-
-    return TRUE;
-}
-
-
-/*
- * Applies one undo to the ETFile data (to reload the previous data).
- * Returns TRUE if an undo had been applied.
- */
-gboolean ET_Undo_File_Data (ET_File *ETFile)
-{
-    gboolean has_filename_undo_data = FALSE;
-    gboolean has_filetag_undo_data  = FALSE;
-    guint    filename_key, filetag_key, undo_key;
-
-    g_return_val_if_fail (ETFile != NULL, FALSE);
-
-    /* Find the valid key */
-    if (ETFile->FileNameNew->prev && ETFile->FileNameNew->data)
-        filename_key = ((File_Name *)ETFile->FileNameNew->data)->key;
-    else
-        filename_key = 0;
-    if (ETFile->FileTag->prev && ETFile->FileTag->data)
-        filetag_key = ((File_Tag *)ETFile->FileTag->data)->key;
-    else
-        filetag_key = 0;
-    // The key to use
-    undo_key = MAX(filename_key,filetag_key);
-
-    /* Undo filename */
-    if (ETFile->FileNameNew->prev && ETFile->FileNameNew->data
-    && (undo_key==((File_Name *)ETFile->FileNameNew->data)->key))
-    {
-        ETFile->FileNameNew = ETFile->FileNameNew->prev;
-        has_filename_undo_data = TRUE; // To indicate that an undo has been applied
-    }
-
-    /* Undo tag data */
-    if (ETFile->FileTag->prev && ETFile->FileTag->data
-    && (undo_key==((File_Tag *)ETFile->FileTag->data)->key))
-    {
-        ETFile->FileTag = ETFile->FileTag->prev;
-        has_filetag_undo_data  = TRUE;
-    }
-
-    return has_filename_undo_data | has_filetag_undo_data;
-}
-
-
-/*
- * Returns TRUE if file contains undo data (filename or tag)
- */
-gboolean
-ET_File_Data_Has_Undo_Data (const ET_File *ETFile)
-{
-    gboolean has_filename_undo_data = FALSE;
-    gboolean has_filetag_undo_data  = FALSE;
-
-    g_return_val_if_fail (ETFile != NULL, FALSE);
-
-    if (ETFile->FileNameNew && ETFile->FileNameNew->prev) has_filename_undo_data = TRUE;
-    if (ETFile->FileTag && ETFile->FileTag->prev)         has_filetag_undo_data  = TRUE;
-
-    return has_filename_undo_data | has_filetag_undo_data;
-}
-
-
-/*
- * Applies one redo to the ETFile data. Returns TRUE if a redo had been applied.
- */
-gboolean ET_Redo_File_Data (ET_File *ETFile)
-{
-    gboolean has_filename_redo_data = FALSE;
-    gboolean has_filetag_redo_data  = FALSE;
-    guint    filename_key, filetag_key, undo_key;
-
-    g_return_val_if_fail (ETFile != NULL, FALSE);
-
-    /* Find the valid key */
-    if (ETFile->FileNameNew->next && ETFile->FileNameNew->next->data)
-        filename_key = ((File_Name *)ETFile->FileNameNew->next->data)->key;
-    else
-        filename_key = (guint)~0; // To have the max value for guint
-    if (ETFile->FileTag->next && ETFile->FileTag->next->data)
-        filetag_key = ((File_Tag *)ETFile->FileTag->next->data)->key;
-    else
-        filetag_key = (guint)~0; // To have the max value for guint
-    // The key to use
-    undo_key = MIN(filename_key,filetag_key);
-
-    /* Redo filename */
-    if (ETFile->FileNameNew->next && ETFile->FileNameNew->next->data
-    && (undo_key==((File_Name *)ETFile->FileNameNew->next->data)->key))
-    {
-        ETFile->FileNameNew = ETFile->FileNameNew->next;
-        has_filename_redo_data = TRUE; // To indicate that a redo has been applied
-    }
-
-    /* Redo tag data */
-    if (ETFile->FileTag->next && ETFile->FileTag->next->data
-    && (undo_key==((File_Tag *)ETFile->FileTag->next->data)->key))
-    {
-        ETFile->FileTag = ETFile->FileTag->next;
-        has_filetag_redo_data  = TRUE;
-    }
-
-    return has_filename_redo_data | has_filetag_redo_data;
-}
-
-
-/*
- * Returns TRUE if file contains redo data (filename or tag)
- */
-gboolean
-ET_File_Data_Has_Redo_Data (const ET_File *ETFile)
-{
-    gboolean has_filename_redo_data = FALSE;
-    gboolean has_filetag_redo_data  = FALSE;
-
-    g_return_val_if_fail (ETFile != NULL, FALSE);
-
-    if (ETFile->FileNameNew && ETFile->FileNameNew->next) has_filename_redo_data = TRUE;
-    if (ETFile->FileTag && ETFile->FileTag->next)         has_filetag_redo_data  = TRUE;
-
-    return has_filename_redo_data | has_filetag_redo_data;
-}
-
-
-/*
- * Execute one 'undo' in the main undo list (it selects the last ETFile changed,
- * before to apply an undo action)
- */
-ET_File *ET_Undo_History_File_Data (void)
-{
-    ET_File *ETFile;
-    const ET_History_File *ETHistoryFile;
-
-    g_return_val_if_fail (ETCore->ETHistoryFileList != NULL ||
-                          ET_History_File_List_Has_Undo_Data (), NULL);
-
-    ETHistoryFile = (ET_History_File *)ETCore->ETHistoryFileList->data;
-    ETFile        = (ET_File *)ETHistoryFile->ETFile;
-    ET_Displayed_File_List_By_Etfile(ETFile);
-    ET_Undo_File_Data(ETFile);
-
-    if (ETCore->ETHistoryFileList->prev)
-        ETCore->ETHistoryFileList = ETCore->ETHistoryFileList->prev;
-    return ETFile;
-}
-
-
-/*
- * Returns TRUE if undo file list contains undo data
- */
-gboolean ET_History_File_List_Has_Undo_Data (void)
-{
-    if (ETCore->ETHistoryFileList && ETCore->ETHistoryFileList->prev)
-        return TRUE;
-    else
-        return FALSE;
-}
-
-
-/*
- * Execute one 'redo' in the main undo list
- */
-ET_File *ET_Redo_History_File_Data (void)
-{
-    ET_File *ETFile;
-    ET_History_File *ETHistoryFile;
-
-    if (!ETCore->ETHistoryFileList || !ET_History_File_List_Has_Redo_Data()) return NULL;
-
-    ETHistoryFile = (ET_History_File *)ETCore->ETHistoryFileList->next->data;
-    ETFile        = (ET_File *)ETHistoryFile->ETFile;
-    ET_Displayed_File_List_By_Etfile(ETFile);
-    ET_Redo_File_Data(ETFile);
-
-    if (ETCore->ETHistoryFileList->next)
-        ETCore->ETHistoryFileList = ETCore->ETHistoryFileList->next;
-    return ETFile;
-}
-
-
-/*
- * Returns TRUE if undo file list contains redo data
- */
-gboolean ET_History_File_List_Has_Redo_Data (void)
-{
-    if (ETCore->ETHistoryFileList && ETCore->ETHistoryFileList->next)
-        return TRUE;
-    else
-        return FALSE;
-}
-
-
-
-
-/**********************
- * Checking functions *
- **********************/
-
-
-/*
- * Ckecks if the current files had been changed but not saved.
- * Returns TRUE if the file has been saved.
- * Returns FALSE if some changes haven't been saved.
- */
-gboolean
-ET_Check_If_File_Is_Saved (const ET_File *ETFile)
-{
-    File_Tag  *FileTag     = NULL;
-    File_Name *FileNameNew = NULL;
-
-    g_return_val_if_fail (ETFile != NULL, TRUE);
-
-    if (ETFile->FileTag)
-        FileTag     = ETFile->FileTag->data;
-    if (ETFile->FileNameNew)
-        FileNameNew = ETFile->FileNameNew->data;
-
-    // Check if the tag has been changed
-    if ( FileTag && FileTag->saved != TRUE )
-        return FALSE;
-
-    // Check if name of file has been changed
-    if ( FileNameNew && FileNameNew->saved != TRUE )
-        return FALSE;
-
-    // No changes
-    return TRUE;
-}
-
-
-/*
- * Ckecks if some files, in the list, had been changed but not saved.
- * Returns TRUE if all files have been saved.
- * Returns FALSE if some changes haven't been saved.
- */
-gboolean ET_Check_If_All_Files_Are_Saved (void)
-{
-    /* Check if some files haven't been saved, if didn't nochange=0 */
-    if (!ETCore->ETFileList)
-    {
-        return TRUE;
-    }else
-    {
-        GList *l;
-
-        for (l = g_list_first (ETCore->ETFileList); l != NULL;
-             l = g_list_next (l))
-        {
-            if (ET_Check_If_File_Is_Saved ((ET_File *)l->data) == FALSE)
-                return FALSE;
-        }
-        return TRUE;
-    }
-}
-
-
-
-
-/*******************
- * Extra functions *
- *******************/
-
-/*
- * Set to TRUE the value of 'FileTag->saved' for the File_Tag item passed in parameter.
- * And set ALL other values of the list to FALSE.
- */
-static void
-Set_Saved_Value_Of_File_Tag (File_Tag *FileTag, gboolean saved)
-{
-    if (FileTag) FileTag->saved = saved;
-}
-
-static void
-ET_Mark_File_Tag_As_Saved (ET_File *ETFile)
-{
-    File_Tag *FileTag;
-    GList *FileTagList;
-
-    FileTag     = (File_Tag *)ETFile->FileTag->data;    // The current FileTag, to set to TRUE
-    FileTagList = ETFile->FileTagList;
-    g_list_foreach(FileTagList,(GFunc)Set_Saved_Value_Of_File_Tag,FALSE); // All other FileTag set to FALSE
-    FileTag->saved = TRUE; // The current FileTag set to TRUE
-}
-
-
-void ET_Mark_File_Name_As_Saved (ET_File *ETFile)
-{
-    File_Name *FileNameNew;
-    GList *FileNameList;
-
-    FileNameNew  = (File_Name *)ETFile->FileNameNew->data;    // The current FileName, to set to TRUE
-    FileNameList = ETFile->FileNameList;
-    g_list_foreach(FileNameList,(GFunc)Set_Saved_Value_Of_File_Tag,FALSE);
-    FileNameNew->saved = TRUE;
-}
-
-
-/*
- * et_core_read_file_info:
- * @file: a file from which to read information
- * @ETFileInfo: (out caller-allocates): a file information structure
- * @error: a #GError to provide information on erros, or %NULL to ignore
- *
- * Fille @ETFileInfo with information about the file. Currently, this only
- * fills the file size.
- *
- * Returns: %TRUE on success, %FALSE otherwise
- */
-static gboolean
-et_core_read_file_info (GFile *file,
-                        ET_File_Info *ETFileInfo,
-                        GError **error)
-{
-    GFileInfo *info;
-
-    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-    g_return_val_if_fail (file != NULL && ETFileInfo != NULL, FALSE);
-
-    info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SIZE,
-                              G_FILE_QUERY_INFO_NONE, NULL, error);
-
-    if (!info)
-    {
-        g_assert (error == NULL || *error != NULL);
-        return FALSE;
-    }
-
-    ETFileInfo->version    = 0;
-    ETFileInfo->bitrate    = 0;
-    ETFileInfo->samplerate = 0;
-    ETFileInfo->mode       = 0;
-    ETFileInfo->size = g_file_info_get_size (info);
-    ETFileInfo->duration   = 0;
-
-    g_assert (error == NULL || *error == NULL);
-    g_object_unref (info);
-
-    return TRUE;
-}
-
-/*
- * This function generates a new filename using path of the old file and the
- * new name.
- * - ETFile -> old_file_name : "/path_to_file/old_name.ext"
- * - new_file_name_utf8      : "new_name.ext"
- * Returns "/path_to_file/new_name.ext" into allocated data (in UTF-8)!
- * Notes :
- *   - filenames (basemane) musn't exceed 255 characters (i.e. : "new_name.ext")
- *   - ogg filename musn't exceed 255-6 characters as we use mkstemp
- */
-#if 1
-gchar *
-ET_File_Name_Generate (const ET_File *ETFile,
-                       const gchar *new_file_name_utf8)
-{
-    gchar *dirname_utf8;
-
-    if (ETFile && ETFile->FileNameNew->data && new_file_name_utf8
-    && (dirname_utf8=g_path_get_dirname(((File_Name *)ETFile->FileNameNew->data)->value_utf8)) )
-    {
-        gchar *extension;
-        gchar *new_file_name_path_utf8;
-
-        // Convert filename extension (lower/upper)
-        extension = ET_File_Name_Format_Extension(ETFile);
-
-        // Check length of filename (limit ~255 characters)
-        //ET_File_Name_Check_Length(ETFile,new_file_name_utf8);
-
-        // If filemame starts with /, it's a full filename with path but without extension
-        if (g_path_is_absolute(new_file_name_utf8))
-        {
-            // We just add the extension
-            new_file_name_path_utf8 = g_strconcat(new_file_name_utf8,extension,NULL);
-        }else
-        {
-            // New path (with filename)
-            if ( strcmp(dirname_utf8,G_DIR_SEPARATOR_S)==0 ) // Root directory?
-                new_file_name_path_utf8 = g_strconcat(dirname_utf8,new_file_name_utf8,extension,NULL);
-            else
-                new_file_name_path_utf8 = g_strconcat(dirname_utf8,G_DIR_SEPARATOR_S,new_file_name_utf8,extension,NULL);
-        }
-
-        g_free (dirname_utf8);
-        g_free(extension);
-        return new_file_name_path_utf8; // in UTF-8
-    }else
-    {
-        return NULL;
-    }
-}
-#else
-/* FOR TESTING */
-/* Returns filename in file system encoding */
-gchar *ET_File_Name_Generate (ET_File *ETFile, gchar *new_file_name_utf8)
-{
-    gchar *dirname;
-
-    if (ETFile && ETFile->FileNameNew->data && new_file_name_utf8
-    && (dirname=g_path_get_dirname(((File_Name *)ETFile->FileNameNew->data)->value)) )
-    {
-        gchar *extension;
-        gchar *new_file_name_path;
-        gchar *new_file_name;
-
-        new_file_name = filename_from_display(new_file_name_utf8);
-
-        // Convert filename extension (lower/upper)
-        extension = ET_File_Name_Format_Extension(ETFile);
-
-        // Check length of filename (limit ~255 characters)
-        //ET_File_Name_Check_Length(ETFile,new_file_name_utf8);
-
-        // If filemame starts with /, it's a full filename with path but without extension
-        if (g_path_is_absolute(new_file_name))
-        {
-            // We just add the extension
-            new_file_name_path = g_strconcat(new_file_name,extension,NULL);
-        }else
-        {
-            // New path (with filename)
-            if ( strcmp(dirname,G_DIR_SEPARATOR_S)==0 ) // Root directory?
-                new_file_name_path = g_strconcat(dirname,new_file_name,extension,NULL);
-            else
-                new_file_name_path = g_strconcat(dirname,G_DIR_SEPARATOR_S,new_file_name,extension,NULL);
-        }
-
-        g_free(dirname);
-        g_free(new_file_name);
-        g_free(extension);
-        return new_file_name_path; // in file system encoding
-    }else
-    {
-        return NULL;
-    }
-}
-#endif
-
-
-/* Convert filename extension (lower/upper/no change). */
-static gchar *
-ET_File_Name_Format_Extension (const ET_File *ETFile)
-{
-    EtFilenameExtensionMode mode;
-
-    mode = g_settings_get_enum (MainSettings, "rename-extension-mode");
-
-    switch (mode)
-    {
-        /* FIXME: Should use filename encoding, not UTF-8! */
-        case ET_FILENAME_EXTENSION_LOWER_CASE:
-            return g_utf8_strdown (ETFile->ETFileDescription->Extension, -1);
-        case ET_FILENAME_EXTENSION_UPPER_CASE:
-            return g_utf8_strup (ETFile->ETFileDescription->Extension, -1);
-        case ET_FILENAME_EXTENSION_NO_CHANGE:
-        default:
-            return g_strdup (ETFile->ETFileExtension);
-    };
-}
-
-
-/*
- * Used to replace the illegal characters in the filename
- * Paremeter 'filename' musn't contain the path, else directories separators would be replaced!
- */
-gboolean ET_File_Name_Convert_Character (gchar *filename_utf8)
-{
-    gchar *character;
-
-    g_return_val_if_fail (filename_utf8 != NULL, FALSE);
-
-    // Convert automatically the directory separator ('/' on LINUX and '\' on WIN32) to '-'.
-    while ( (character=g_utf8_strchr(filename_utf8, -1, G_DIR_SEPARATOR))!=NULL )
-        *character = '-';
-
-#ifdef G_OS_WIN32
-    /* Convert character '\' on WIN32 to '-'. */
-    while ( (character=g_utf8_strchr(filename_utf8, -1, '\\'))!=NULL )
-        *character = '-';
-    /* Convert character '/' on WIN32 to '-'. May be converted to '\' after. */
-    while ( (character=g_utf8_strchr(filename_utf8, -1, '/'))!=NULL )
-        *character = '-';
-#endif /* G_OS_WIN32 */
-
-    /* Convert other illegal characters on FAT32/16 filesystems and ISO9660 and
-     * Joliet (CD-ROM filesystems). */
-    if (g_settings_get_boolean (MainSettings, "rename-replace-illegal-chars"))
-    {
-        // Commented as we display unicode values as "\351" for "é"
-        //while ( (character=g_utf8_strchr(filename_utf8, -1, '\\'))!=NULL )
-        //    *character = ',';
-        while ( (character=g_utf8_strchr(filename_utf8, -1, ':'))!=NULL )
-            *character = '-';
-        //while ( (character=g_utf8_strchr(filename_utf8, -1, ';'))!=NULL )
-        //    *character = '-';
-        while ( (character=g_utf8_strchr(filename_utf8, -1, '*'))!=NULL )
-            *character = '+';
-        while ( (character=g_utf8_strchr(filename_utf8, -1, '?'))!=NULL )
-            *character = '_';
-        while ( (character=g_utf8_strchr(filename_utf8, -1, '\"'))!=NULL )
-            *character = '\'';
-        while ( (character=g_utf8_strchr(filename_utf8, -1, '<'))!=NULL )
-            *character = '(';
-        while ( (character=g_utf8_strchr(filename_utf8, -1, '>'))!=NULL )
-            *character = ')';
-        while ( (character=g_utf8_strchr(filename_utf8, -1, '|'))!=NULL )
-            *character = '-';
-    }
-    return TRUE;
-}
-
-
-/*
- * Returns the number of file in the directory of the selected file.
- * Parameter "path" should be in UTF-8
- */
-guint
-ET_Get_Number_Of_Files_In_Directory (const gchar *path_utf8)
-{
-    GList *l;
-    guint  count = 0;
-
-    g_return_val_if_fail (path_utf8 != NULL, count);
-
-    for (l = g_list_first (ETCore->ETFileList); l != NULL; l = g_list_next (l))
-    {
-        ET_File *ETFile = (ET_File *)l->data;
-        gchar *cur_filename_utf8 = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value_utf8;
-        gchar *dirname_utf8      = g_path_get_dirname(cur_filename_utf8);
-
-        if (g_utf8_collate(dirname_utf8, path_utf8) == 0)
-            count++;
-
-        g_free(dirname_utf8 );
-    }
-
-    return count;
-}
-
-/*
- * Set appropriate sort order for the given column_id
- */
-static void
-set_sort_order_for_column_id (gint column_id, GtkTreeViewColumn *column,
-                              EtSortMode sort_type)
-{
-    EtApplicationWindow *window;
-    EtSortMode current_mode;
-
-    window = ET_APPLICATION_WINDOW (MainWindow);
-
-    /* Removing the sort indicator for the currently selected treeview
-     * column. */
-    current_mode = g_settings_get_enum (MainSettings, "sort-mode");
-
-    if (current_mode < ET_SORT_MODE_ASCENDING_CREATION_DATE)
-    {
-        gtk_tree_view_column_set_sort_indicator (et_application_window_browser_get_column_for_column_id (window, current_mode / 2),
-                                                 FALSE);
-    }
-
-    if (sort_type < ET_SORT_MODE_ASCENDING_CREATION_DATE)
-    {
-        gtk_tree_view_column_clicked (et_application_window_browser_get_column_for_column_id (window, column_id));
-
-        if (sort_type % 2 == 0)
-        {
-            /* GTK_SORT_ASCENDING */
-            if (et_application_window_browser_get_sort_order_for_column_id (window, column_id)
-                == GTK_SORT_DESCENDING)
-            {
-                gtk_tree_view_column_set_sort_order (column,
-                                                     GTK_SORT_ASCENDING);
-            }
-        }
-        else
-        {
-            /* GTK_SORT_DESCENDING */
-            if (et_application_window_browser_get_sort_order_for_column_id (window, column_id)
-                == GTK_SORT_ASCENDING)
-            {
-                gtk_tree_view_column_set_sort_order (column,
-                                                     GTK_SORT_DESCENDING);
-            }
-        }
-    }
-}
diff --git a/src/et_core.h b/src/et_core.h
index 3feaecb..1fb6bfe 100644
--- a/src/et_core.h
+++ b/src/et_core.h
@@ -20,14 +20,13 @@
 #ifndef ET_CORE_H_
 #define ET_CORE_H_
 
-#include "config.h" /* For definition of ENABLE_OGG and so on. */
+#include <glib.h>
 
-#include "setting.h"
+G_BEGIN_DECLS
 
-#include <glib.h>
 #include <gdk/gdk.h>
 
-G_BEGIN_DECLS
+#include "file.h"
 
 /*
  * Colors Used (see declaration into et_core.c)
@@ -35,216 +34,9 @@ G_BEGIN_DECLS
 extern GdkRGBA RED;
 
 /*
- * Types of files
- */
-typedef enum
-{                    //                                             (.ext) is not so popular 
-    MP2_FILE = 0,    // Mpeg audio Layer 2        : .mp2            (.mpg) (.mpga)
-    MP3_FILE,        // Mpeg audio Layer 3        : .mp3            (.mpg) (.mpga)
-    MP4_FILE, /* MPEG audio Layer 4 / AAC: .mp4 (.m4a) (.m4p) (.m4v) */
-    OGG_FILE,        // Ogg Vorbis audio          : .ogg            (.ogm)
-    FLAC_FILE,       // FLAC (lossless)           : .flac .fla
-    MPC_FILE,        // MusePack                  : .mpc .mp+ .mpp
-    MAC_FILE,        // Monkey's Audio (lossless) : .ape            (.mac)
-    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;
-
-
-/*
- * Types of tags
- */
-typedef enum
-{
-    ID3_TAG = 0,
-    OGG_TAG,
-    APE_TAG,
-    FLAC_TAG,
-    MP4_TAG,
-    WAVPACK_TAG,
-    OPUS_TAG,
-    UNKNOWN_TAG
-} ET_Tag_Type;
-
-
-/*
- * Description of each item of the FileNameList list
- */
-typedef struct _File_Name File_Name;
-struct _File_Name
-{
-    guint key;
-    gboolean saved;        /* Set to TRUE if this filename had been saved */
-    gchar *value;          /* The filename containing the full path and the extension of the file */
-    gchar *value_utf8;     /* Same than "value", but converted to UTF-8 to avoid multiple call to the convertion function */
-    gchar *value_ck;       /* Collate key of "value_utf8" to speed up comparaison */
-};
-
-
-/*
- * Description of Picture item (see picture.h)
- */
-typedef struct _Picture Picture;
-struct _Picture
-{
-    gint     type;
-    gchar   *description;
-    gint     width;         /* Original width of the picture */
-    gint     height;        /* Original height of the picture */
-    gsize size; /* Picture size in bytes (like stat) */
-    guchar  *data;
-    Picture *next;
-};
-
-
-/*
- * Description of each item of the TagList list
- */
-typedef struct _File_Tag File_Tag;
-struct _File_Tag
-{
-    guint key;             /* Incremented value */
-    gboolean saved;        /* Set to TRUE if this tag had been saved */
-
-    gchar *title;          /* Title of track */
-    gchar *artist;         /* Artist name */
-    gchar *album_artist;   /* Album Artist */
-    gchar *album;          /* Album name */
-    gchar *disc_number;    /* Disc number */
-    gchar *disc_total; /* The total number of discs of the album (ex: 1/2). */
-    gchar *year;           /* Year of track */
-    gchar *track;          /* Position of track in the album */
-    gchar *track_total;    /* The number of tracks for the album (ex: 12/20) */
-    gchar *genre;          /* Genre of song */
-    gchar *comment;        /* Comment */
-    gchar *composer;       /* Composer */
-    gchar *orig_artist;    /* Original artist / Performer */
-    gchar *copyright;      /* Copyright */
-    gchar *url;            /* URL */
-    gchar *encoded_by;     /* Encoded by */
-    Picture *picture;      /* Picture */
-    GList *other;          /* List of unsupported fields (used for ogg only) */
-};
-
-
-/*
- * Structure containing informations of the header of file
- * Nota: This struct was copied from an "MP3 structure", and will change later.
- */
-typedef struct _ET_File_Info ET_File_Info;
-struct _ET_File_Info
-{
-    gint version;               /* Version of bitstream (mpeg version for mp3, encoder version for ogg) */
-    gint mpeg25;                /* Version is MPEG 2.5? */
-    gint layer;                 /* "MP3 data" */
-    gint bitrate;               /* Bitrate (kb/s) */
-    gboolean variable_bitrate;  /* Is a VBR file? */
-    gint samplerate;            /* Samplerate (Hz) */
-    gint mode;                  /* Stereo, ... or channels for ogg */
-    goffset size;               /* The size of file (in bytes) */
-    gint duration;              /* The duration of file (in seconds) */
-    gchar *mpc_profile;         /* MPC data */
-    gchar *mpc_version;         /* MPC data : encoder version  (also for Speex) */
-};
-
-/*
- * EtFileHeaderFields:
- * @description: a description of the file type, such as MP3 File
- * @version_label: the label for the encoder version, such as MPEG
- * @version: the encoder version (such as 2, Layer III)
- * @bitrate: the bitrate of the file (not the bit depth of the samples)
- * @samplerate: the sample rate of the primary audio track, generally in Hz
- * @mode_label: the label for the audio mode, for example Mode
- * @mode: the audio mode (stereo, mono, and so on)
- * @size: the size of the audio file
- * @duration: the length of the primary audio track
- *
- * UI-visible strings, populated by the tagging support code to be displayed in
- * the EtFileArea.
- */
-typedef struct
-{
-    /*< public >*/
-    gchar *description;
-    gchar *version_label;
-    gchar *version;
-    gchar *bitrate;
-    gchar *samplerate;
-    gchar *mode_label;
-    gchar *mode;
-    gchar *size;
-    gchar *duration;
-} EtFileHeaderFields;
-
-/*
- * Structure for descripting supported files
- */
-typedef struct _ET_File_Description ET_File_Description;
-struct _ET_File_Description
-{
-    ET_File_Type FileType;    /* Type of file (ex: MP3) */
-    const gchar *Extension; /* Extension (ex: ".mp3") */
-    ET_Tag_Type  TagType;     /* Type of tag (ex: ID3) */
-};
-
-
-/*
- * Description of supported files
- */
-extern const ET_File_Description ETFileDescription[];
-
-/* Calculate the last index of the previous tab */
-extern const gsize ET_FILE_DESCRIPTION_SIZE;
-
-
-/*
- * Description of each item of the ETFileList list
- */
-typedef struct _ET_File ET_File;
-struct _ET_File
-{
-    guint IndexKey;           /* Value used to display the position in the list (and in the BrowserList) - Must be renumered after resorting the list - This value varies when resorting list */
-
-    guint ETFileKey;          /* Primary key to identify each item of the list (no longer used?) */
-
-    time_t FileModificationTime;            /* Save modification time of the file */
-
-    const ET_File_Description *ETFileDescription;
-    gchar               *ETFileExtension;   /* Real extension of the file (keeping the case) (should be placed in ETFileDescription?) */
-    ET_File_Info        *ETFileInfo;        /* Header infos: bitrate, duration, ... */
-
-    GList *FileNameCur;       /* Points to item of FileNameList that represents the current value of filename state (i.e. file on hard disk) */
-    GList *FileNameNew;       /* Points to item of FileNameList that represents the new value of filename state */
-    GList *FileNameList; /* Contains the history of changes about the filename. */
-    GList *FileNameListBak;   /* Contains items of FileNameList removed by 'undo' procedure but have data currently saved (for example, when you save your last changes, make some 'undo', then make new changes) */
-    
-    GList *FileTag;           /* Points to the current item used of FileTagList */
-    GList *FileTagList;       /* Contains the history of changes about file tag data */
-    GList *FileTagListBak;    /* Contains items of FileTagList removed by 'undo' procedure but have data currently saved */
-    
-};
-
-
-
-/*
- * Description of each item of the ETHistoryFileList list
- */
-typedef struct _ET_History_File ET_History_File;
-struct _ET_History_File
-{
-    ET_File *ETFile;           /* Pointer to item of ETFileList changed */
-};
-
-
-
-/*
  * Description of all variables, lists needed by EasyTAG
  */
-typedef struct _ET_Core ET_Core;
-struct _ET_Core
+typedef struct
 {
     // The main list of files
     GList *ETFileList;                  // List of ALL FILES (ET_File) loaded in the directory and sub-directories (List of ET_File) (This list musn't be altered, and points always to the first item)
@@ -252,135 +44,25 @@ struct _ET_Core
     // The list of files organized by artist then album
     GList *ETArtistAlbumFileList;
 
-
     // Displayed list (part of the main list of files displayed in BrowserList) (used when displaying by Artist & Album) 
     GList *ETFileDisplayedList;                 // List of files displayed (List of ET_File from ETFileList / ATArtistAlbumFileList) | !! May not point to the first item!!
     GList *ETFileDisplayedListPtr;              // Pointer to the current item of ETFileDisplayedList used with ET_Displayed_File_List_First, ET_Displayed_File_List_Previous
     guint  ETFileDisplayedList_Length;          // Contains the length of the displayed list
     gfloat ETFileDisplayedList_TotalSize;       // Total of the size of files in displayed list (in bytes)
     gulong ETFileDisplayedList_TotalDuration;   // Total of duration of files in displayed list (in seconds)
-    
+
     // Displayed item
     ET_File *ETFileDisplayed;           // Pointer to the current ETFile displayed in EasyTAG (may be NULL)
 
 
     // History list
     GList *ETHistoryFileList;           // History list of files changes for undo/redo actions
-};
+} ET_Core;
 
 extern ET_Core *ETCore; /* Main pointer to structure needed by EasyTAG. */
 
-
-
-/**************
- * Prototypes *
- **************/
-
-void ET_Core_Create     (void);
-void ET_Core_Initialize (void);
-void ET_Core_Free       (void);
-void ET_Core_Destroy    (void);
-
-gboolean ET_File_Is_Supported (const gchar *filename);
-GList   *ET_Add_File_To_File_List        (gchar *filename);
-gboolean ET_Remove_File_From_File_List   (ET_File *ETFile);
-
-gboolean ET_Create_Artist_Album_File_List      (void);
-gboolean ET_Remove_File_From_File_List         (ET_File *ETFile);
-
-gboolean ET_Check_If_File_Is_Saved (const ET_File *ETFile);
-gboolean ET_Check_If_All_Files_Are_Saved (void);
-
-ET_File      *ET_File_Item_New       (void);
-File_Name    *ET_File_Name_Item_New  (void);
-File_Tag     *ET_File_Tag_Item_New   (void);
-gboolean      ET_Free_File_Tag_Item  (File_Tag *FileTag);
-void      ET_Free_File_List_Item (ET_File *ETFile);
-
-gboolean ET_Copy_File_Tag_Item (const ET_File *ETFile, File_Tag *FileTag);
-gboolean ET_Set_Field_File_Name_Item    (gchar **FileNameField, gchar *value);
-gboolean ET_Set_Filename_File_Name_Item (File_Name *FileName, const gchar *filename_utf8, const gchar *filename);
-gboolean ET_Set_Field_File_Tag_Item (gchar **FileTagField, const gchar *value);
-gboolean ET_Set_Field_File_Tag_Picture (Picture **FileTagField, const Picture *pic);
-
-GList   *ET_Displayed_File_List_First       (void);
-GList   *ET_Displayed_File_List_Previous    (void);
-GList   *ET_Displayed_File_List_Next        (void);
-GList   *ET_Displayed_File_List_Last        (void);
-GList *ET_Displayed_File_List_By_Etfile (const ET_File *ETFile);
-
-gboolean ET_Set_Displayed_File_List         (GList *ETFileList);
-
-void     ET_Display_File_Data_To_UI (ET_File *ETFile);
-void     ET_Save_File_Data_From_UI  (ET_File *ETFile);
-gboolean ET_Save_File_Tag_To_HD (ET_File *ETFile, GError **error);
-
-gboolean ET_Undo_File_Data          (ET_File *ETFile);
-gboolean ET_Redo_File_Data          (ET_File *ETFile);
-gboolean ET_File_Data_Has_Undo_Data (const ET_File *ETFile);
-gboolean ET_File_Data_Has_Redo_Data (const ET_File *ETFile);
-
-ET_File *ET_Undo_History_File_Data          (void);
-ET_File *ET_Redo_History_File_Data          (void);
-gboolean ET_History_File_List_Has_Undo_Data (void);
-gboolean ET_History_File_List_Has_Redo_Data (void);
-
-gboolean ET_Manage_Changes_Of_File_Data          (ET_File *ETFile, File_Name *FileName, File_Tag *FileTag);
-void     ET_Mark_File_Name_As_Saved              (ET_File *ETFile);
-void ET_Update_Directory_Name_Into_File_List (const gchar *last_path, const gchar *new_path);
-gboolean ET_File_Name_Convert_Character          (gchar *filename_utf8);
-gchar *ET_File_Name_Generate (const ET_File *ETFile, const gchar *new_file_name);
-guint ET_Get_Number_Of_Files_In_Directory (const gchar *path_utf8);
-
-gboolean ET_Detect_Changes_Of_File_Tag (const File_Tag *FileTag1, const File_Tag  *FileTag2);
-
-GList *ET_Sort_File_List (GList *ETFileList, EtSortMode Sorting_Type);
-void ET_Sort_Displayed_File_List_And_Update_UI (EtSortMode Sorting_Type);
-gint ET_Comp_Func_Sort_File_By_Ascending_Filename (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_Filename (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_Creation_Date (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_Creation_Date (const ET_File *ETFile1, const ET_File *ETFile2);
-gint et_comp_func_sort_file_by_ascending_disc_number (const ET_File *ETFile1,
-                                                      const ET_File *ETFile2);
-gint et_comp_func_sort_file_by_descending_disc_number (const ET_File *ETFile1,
-                                                       const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_Track_Number (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_Track_Number (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_Title (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_Title (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_Artist (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_Artist (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_Album_Artist (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_Album_Artist (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_Album (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_Album (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_Year (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_Year (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_Genre (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_Genre (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_Comment (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_Comment (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_Composer (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_Composer (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_Orig_Artist (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_Orig_Artist (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_Copyright (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_Copyright (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_Url (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_Url (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_Encoded_By (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_Encoded_By (const ET_File *ETFile1, const ET_File *ETFile2);
-
-gint ET_Comp_Func_Sort_File_By_Ascending_File_Type (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_File_Type (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_File_Size (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_File_Size (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_File_Duration (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_File_Duration (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_File_Bitrate (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_File_Bitrate (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Ascending_File_Samplerate (const ET_File *ETFile1, const ET_File *ETFile2);
-gint ET_Comp_Func_Sort_File_By_Descending_File_Samplerate (const ET_File *ETFile1, const ET_File *ETFile2);
+void ET_Core_Create (void);
+void ET_Core_Free (void);
 
 G_END_DECLS
 
diff --git a/src/et_core.c b/src/file.c
similarity index 51%
copy from src/et_core.c
copy to src/file.c
index a07b0f9..57f19ca 100644
--- a/src/et_core.c
+++ b/src/file.c
@@ -1,39 +1,37 @@
-/* EasyTAG - Tag editor for audio files
+/* EasyTAG - tag editor for audio files
  * Copyright (C) 2014  David King <amigadave at amigadave.com>
- * 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 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.
  */
 
-#include <config.h>
+#include "config.h"
+
+#include "file.h"
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <utime.h>
-#include <ctype.h>
-#include <locale.h>
-#include <errno.h>
 
 #include "application_window.h"
 #include "easytag.h"
-#include "et_core.h"
+#include "file_tag.h"
+#include "file_list.h"
 #include "mpeg_header.h"
 #include "monkeyaudio_header.h"
 #include "musepack_header.h"
@@ -70,97 +68,18 @@
 
 #include "win32/win32dep.h"
 
-
-/***************
- * Declaration *
- ***************/
-
-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. */
-    { MP4_FILE, ".m4v", MP4_TAG},
-#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
- */
-GdkRGBA RED = {1.0, 0.0, 0.0, 1.0 };
-
-
-/**************
- * Prototypes *
- **************/
-
-//gboolean ET_File_Is_Supported (gchar *filename);
-static const ET_File_Description *ET_Get_File_Description (const gchar *filename);
-static const ET_File_Description *ET_Get_File_Description_From_Extension (const gchar *extension);
-
-static gboolean ET_Free_File_List                 (void);
 static gboolean ET_Free_File_Name_List            (GList *FileNameList);
 static gboolean ET_Free_File_Tag_List (GList *FileTagList);
 static void ET_Free_File_Name_Item (File_Name *FileName);
-static gboolean ET_Free_File_Tag_Item_Other_Field (File_Tag *FileTag);
 static gboolean ET_Free_File_Info_Item (ET_File_Info *ETFileInfo);
-static gboolean ET_Free_History_File_List (void);
-static gboolean ET_Free_Displayed_File_List (void);
-static gboolean ET_Free_Artist_Album_File_List (void);
 
-static void ET_Initialize_File_Item (ET_File *ETFile);
-static void ET_Initialize_File_Tag_Item (File_Tag *FileTag);
 static void ET_Initialize_File_Name_Item (File_Name *FileName);
-static void ET_Initialize_File_Info_Item (ET_File_Info *ETFileInfo);
-
-//gboolean ET_Set_Field_File_Tag_Picture (gchar **FileTagField, Picture *pic);
-
-static guint ET_File_Key_New (void);
-static guint ET_Undo_Key_New (void);
-
-static gboolean ET_Remove_File_From_Artist_Album_List (ET_File *ETFile);
 
 static void ET_Display_Filename_To_UI (const ET_File *ETFile);
 static EtFileHeaderFields * ET_Display_File_Info_To_UI (const ET_File *ETFile);
 
 static gboolean ET_Save_File_Name_From_UI (const ET_File *ETFile,
                                            File_Name *FileName);
-static gboolean ET_Save_File_Name_Internal (const ET_File *ETFile, File_Name *FileName);
-static gboolean ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag);
 
 static void ET_Mark_File_Tag_As_Saved (ET_File *ETFile);
 
@@ -169,154 +88,8 @@ static gboolean ET_Detect_Changes_Of_File_Name (const File_Name *FileName1,
 static gboolean ET_Add_File_Name_To_List (ET_File *ETFile,
                                           File_Name *FileName);
 static gboolean ET_Add_File_Tag_To_List (ET_File *ETFile, File_Tag  *FileTag);
-static gboolean ET_Add_File_To_History_List (ET_File *ETFile);
-static gboolean ET_Add_File_To_Artist_Album_File_List (ET_File *ETFile);
-
-static guint ET_Displayed_File_List_Get_Length      (void);
-static void ET_Displayed_File_List_Number (void);
-
-static gboolean et_core_read_file_info (GFile *file,
-                                        ET_File_Info *ETFileInfo,
-                                        GError **error);
-
-static gint ET_Comp_Func_Sort_Artist_Item_By_Ascending_Artist (const GList *AlbumList1,
-                                                               const GList *AlbumList2);
-static gint ET_Comp_Func_Sort_Album_Item_By_Ascending_Album (const GList *etfilelist1,
-                                                             const GList *etfilelist2);
-static gint ET_Comp_Func_Sort_Etfile_Item_By_Ascending_Filename (const ET_File *ETFile1,
-                                                                 const ET_File *ETFile2);
-static gchar *ET_File_Name_Format_Extension (const ET_File *ETFile);
-
-static void set_sort_order_for_column_id (gint column_id,
-                                          GtkTreeViewColumn *column,
-                                          EtSortMode sort_type);
-
-
-/*******************
- * Basic functions *
- *******************/
-
-/*
- * Returns the extension of the file
- */
-static const gchar *
-ET_Get_File_Extension (const gchar *filename)
-{
-    if (filename)
-        return strrchr(filename, '.');
-    else
-        return NULL;
-}
-
-
-/*
- * Determine description of file using his extension.
- * If extension is NULL or not found into the tab, it returns the last entry for UNKNOWN_FILE.
- */
-static const ET_File_Description *
-ET_Get_File_Description_From_Extension (const gchar *extension)
-{
-    guint i;
-
-    if (!extension) // Unknown file
-        return &ETFileDescription[ET_FILE_DESCRIPTION_SIZE];
-
-    for (i=0; i<ET_FILE_DESCRIPTION_SIZE; i++)  // Use of '<' instead of '<=' to avoid to test for Unknown file
-        if ( strcasecmp(extension,ETFileDescription[i].Extension)==0 )
-            return &ETFileDescription[i];
-
-    // If not found in the list
-    return &ETFileDescription[ET_FILE_DESCRIPTION_SIZE];
-}
-
-
-/*
- * Determines description of file.
- * Determines first the extension. If extension is NULL or not found into the tab,
- * it returns the last entry for UNKNOWN_FILE.
- */
-static const ET_File_Description *
-ET_Get_File_Description (const gchar *filename)
-{
-    return ET_Get_File_Description_From_Extension(ET_Get_File_Extension(filename));
-}
-
-
-/*
- * Returns TRUE if the file is supported, else returns FALSE
- */
-gboolean ET_File_Is_Supported (const gchar *filename)
-{
-    if (ET_Get_File_Description(filename)->FileType != UNKNOWN_FILE)
-        return TRUE;
-    else
-        return FALSE;
-}
-
-
-
-
-/*****************************************************************************
- * Manipulation of ET_Core functions (main functions needed for the program) *
- *****************************************************************************/
-void ET_Core_Create (void)
-{
-    // Allocate
-    if (ETCore == NULL)
-        ETCore = g_malloc0(sizeof(ET_Core));
-
-    // Initialize
-    ET_Core_Initialize();
-}
-
-void ET_Core_Initialize (void)
-{
-    ETCore->ETFileList                        = NULL;
-    ETCore->ETFileDisplayedList               = NULL;
-    ETCore->ETFileDisplayedListPtr            = NULL;
-    ETCore->ETFileDisplayedList_Length        = 0;
-    ETCore->ETFileDisplayedList_TotalSize     = 0;
-    ETCore->ETFileDisplayedList_TotalDuration = 0;
-    ETCore->ETFileDisplayed                   = NULL;
-    ETCore->ETHistoryFileList                 = NULL;
-    ETCore->ETArtistAlbumFileList             = NULL;
-}
-
-void ET_Core_Free (void)
-{
-    // Frees first lists, then initialize
-    if (ETCore->ETFileList)
-        ET_Free_File_List();
-
-    if (ETCore->ETFileDisplayedList)
-        ET_Free_Displayed_File_List();
 
-    if (ETCore->ETHistoryFileList)
-        ET_Free_History_File_List();
-
-    if (ETCore->ETArtistAlbumFileList)
-        ET_Free_Artist_Album_File_List();
-
-    // Initialize by security
-    ET_Core_Initialize();
-}
-
-void
-ET_Core_Destroy (void)
-{
-    if (ETCore)
-    {
-        ET_Core_Free ();
-        g_free (ETCore);
-        ETCore = NULL;
-    }
-}
-
-
-
-/**************************
- * Initializing functions *
- **************************/
+static gchar *ET_File_Name_Format_Extension (const ET_File *ETFile);
 
 /*
  * Create a new File_Name structure
@@ -325,51 +98,34 @@ File_Name *ET_File_Name_Item_New (void)
 {
     File_Name *FileName;
 
-    FileName = g_malloc0(sizeof(File_Name));
-    ET_Initialize_File_Name_Item(FileName);
+    FileName = g_slice_new (File_Name);
+    ET_Initialize_File_Name_Item (FileName);
 
     return FileName;
 }
 
-
-/*
- * Create a new File_Tag structure
- */
-File_Tag *ET_File_Tag_Item_New (void)
-{
-    File_Tag *FileTag;
-
-    FileTag = g_malloc0(sizeof(File_Tag));
-    ET_Initialize_File_Tag_Item(FileTag);
-
-    return FileTag;
-}
-
-
 /*
  * Create a new File_Info structure
  */
-static ET_File_Info *
+ET_File_Info *
 ET_File_Info_Item_New (void)
 {
     ET_File_Info *ETFileInfo;
 
-    ETFileInfo = g_malloc0(sizeof(ET_File_Info));
-    ET_Initialize_File_Info_Item(ETFileInfo);
+    ETFileInfo = g_slice_new0 (ET_File_Info);
 
     return ETFileInfo;
 }
 
-
 /*
  * Create a new ET_File structure
  */
-ET_File *ET_File_Item_New (void)
+ET_File *
+ET_File_Item_New (void)
 {
     ET_File *ETFile;
 
-    ETFile = g_malloc0(sizeof(ET_File));
-    ET_Initialize_File_Item(ETFile);
+    ETFile = g_slice_new0 (ET_File);
 
     return ETFile;
 }
@@ -388,991 +144,162 @@ ET_Initialize_File_Name_Item (File_Name *FileName)
     }
 }
 
+/* Key for Undo */
+guint
+ET_Undo_Key_New (void)
+{
+    static guint ETUndoKey = 0;
+    return ++ETUndoKey;
+}
 
-static void
-ET_Initialize_File_Tag_Item (File_Tag *FileTag)
+/*
+ * Comparison function for sorting by ascending filename.
+ */
+gint
+ET_Comp_Func_Sort_File_By_Ascending_Filename (const ET_File *ETFile1,
+                                              const ET_File *ETFile2)
 {
-    if (FileTag)
-    {
-        FileTag->key         = ET_Undo_Key_New();
-        FileTag->saved       = FALSE;
-        FileTag->title       = NULL;
-        FileTag->artist      = NULL;
-        FileTag->album_artist= NULL;
-        FileTag->album       = NULL;
-        FileTag->disc_number = NULL;
-        FileTag->disc_total = NULL;
-        FileTag->track       = NULL;
-        FileTag->track_total = NULL;
-        FileTag->year        = NULL;
-        FileTag->genre       = NULL;
-        FileTag->comment     = NULL;
-        FileTag->composer    = NULL;
-        FileTag->orig_artist = NULL;
-        FileTag->copyright   = NULL;
-        FileTag->url         = NULL;
-        FileTag->encoded_by  = NULL;
-        FileTag->picture     = NULL;
-        FileTag->other       = NULL;
-    }
+    const gchar *file1_ck = ((File_Name *)((GList *)ETFile1->FileNameCur)->data)->value_ck;
+    const gchar *file2_ck = ((File_Name *)((GList *)ETFile2->FileNameCur)->data)->value_ck;
+    // !!!! : Must be the same rules as "Cddb_Track_List_Sort_Func" to be
+    // able to sort in the same order files in cddb and in the file list.
+    return g_settings_get_boolean (MainSettings,
+                                   "sort-case-sensitive") ? strcmp (file1_ck, file2_ck)
+                                                          : strcasecmp (file1_ck, file2_ck);
+}
+
+/*
+ * Comparison function for sorting by descending filename.
+ */
+gint
+ET_Comp_Func_Sort_File_By_Descending_Filename (const ET_File *ETFile1,
+                                               const ET_File *ETFile2)
+{
+    return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile2,ETFile1);
 }
 
 
-static void
-ET_Initialize_File_Info_Item (ET_File_Info *ETFileInfo)
+/*
+ * Comparison function for sorting by ascending disc number.
+ */
+gint
+et_comp_func_sort_file_by_ascending_disc_number (const ET_File *ETFile1,
+                                                 const ET_File *ETFile2)
 {
-    if (ETFileInfo)
+    gint track1, track2;
+
+    if (!ETFile1->FileTag->data
+        || !((File_Tag *)ETFile1->FileTag->data)->disc_number)
     {
-        ETFileInfo->mpc_profile = NULL;
-        ETFileInfo->mpc_version = NULL;
+        track1 = 0;
+    }
+    else
+    {
+        track1 = atoi (((File_Tag *)ETFile1->FileTag->data)->disc_number);
     }
-}
 
+    if (!ETFile2->FileTag->data
+        || !((File_Tag *)ETFile2->FileTag->data)->disc_number)
+    {
+        track2 = 0;
+    }
+    else
+    {
+        track2 = atoi (((File_Tag *)ETFile2->FileTag->data)->disc_number);
+    }
 
-static void
-ET_Initialize_File_Item (ET_File *ETFile)
-{
-    if (ETFile)
+    /* Second criterion. */
+    if (track1 == track2)
     {
-        ETFile->IndexKey          = 0;
-        ETFile->ETFileKey         = 0;
-        ETFile->ETFileDescription = NULL;
-        ETFile->ETFileInfo        = NULL;
-        ETFile->FileNameCur       = NULL;
-        ETFile->FileNameNew       = NULL;
-        ETFile->FileNameList      = NULL;
-        ETFile->FileNameListBak   = NULL;
-        ETFile->FileTag           = NULL;
-        ETFile->FileTagList       = NULL;
-        ETFile->FileTagListBak    = NULL;
+        return ET_Comp_Func_Sort_File_By_Ascending_Filename (ETFile1, ETFile2);
     }
-}
 
+    /* First criterion. */
+    return (track1 - track2);
+}
 
-/* Key for each item of ETFileList */
-static guint
-ET_File_Key_New (void)
+/*
+ * Comparison function for sorting by descending disc number.
+ */
+gint
+et_comp_func_sort_file_by_descending_disc_number (const ET_File *ETFile1,
+                                                  const ET_File *ETFile2)
 {
-    static guint ETFileKey = 0;
-    return ++ETFileKey;
+    return et_comp_func_sort_file_by_ascending_disc_number (ETFile2, ETFile1);
 }
 
-/* Key for Undo */
-static guint
-ET_Undo_Key_New (void)
+
+/*
+ * Comparison function for sorting by ascending track number.
+ */
+gint
+ET_Comp_Func_Sort_File_By_Ascending_Track_Number (const ET_File *ETFile1,
+                                                  const ET_File *ETFile2)
 {
-    static guint ETUndoKey = 0;
-    return ++ETUndoKey;
-}
+    gint track1, track2;
 
+    if ( !ETFile1->FileTag->data || !((File_Tag *)ETFile1->FileTag->data)->track )
+        track1 = 0;
+    else
+        track1 = atoi( ((File_Tag *)ETFile1->FileTag->data)->track );
 
+    if ( !ETFile2->FileTag->data || !((File_Tag *)ETFile2->FileTag->data)->track )
+        track2 = 0;
+    else
+        track2 = atoi( ((File_Tag *)ETFile2->FileTag->data)->track );
 
+    // Second criterion
+    if (track1 == track2)
+        return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
 
-/**********************************
- * File adding/removing functions *
- **********************************/
+    // First criterion
+    return (track1 - track2);
+}
 
 /*
- * ET_Add_File_To_File_List: Add a file to the "main" list. And get all information of the file.
- * The filename passed in should be in raw format, only convert it to UTF8 when displaying it.
+ * Comparison function for sorting by descending track number.
  */
-GList *ET_Add_File_To_File_List (gchar *filename)
+gint
+ET_Comp_Func_Sort_File_By_Descending_Track_Number (const ET_File *ETFile1,
+                                                   const ET_File *ETFile2)
 {
-    const ET_File_Description *ETFileDescription;
-    ET_File      *ETFile;
-    File_Name    *FileName;
-    File_Tag     *FileTag;
-    ET_File_Info *ETFileInfo;
-    gchar        *ETFileExtension;
-    guint         ETFileKey;
-    guint         undo_key;
-    GFile *file;
-    GFileInfo *fileinfo;
-    gchar        *filename_utf8 = filename_to_display(filename);
-    const gchar  *locale_lc_ctype = getenv("LC_CTYPE");
-    GError *error = NULL;
-    gboolean success;
-
-    if (!filename)
-        return ETCore->ETFileList;
+    return ET_Comp_Func_Sort_File_By_Ascending_Track_Number(ETFile2,ETFile1);
+}
 
-    file = g_file_new_for_path (filename);
 
-    /* Primary Key for this file */
-    ETFileKey = ET_File_Key_New();
+/*
+ * Comparison function for sorting by ascending creation date.
+ */
+gint
+ET_Comp_Func_Sort_File_By_Ascending_Creation_Date (const ET_File *ETFile1,
+                                                   const ET_File *ETFile2)
+{
+    GFile *file;
+    GFileInfo *info;
+    guint64 time1 = 0;
+    guint64 time2 = 0;
 
-    /* Get description of the file */
-    ETFileDescription = ET_Get_File_Description(filename);
+    /* TODO: Report errors? */
+    file = g_file_new_for_path (((File_Name *)ETFile1->FileNameCur->data)->value);
+    info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_CHANGED,
+                              G_FILE_QUERY_INFO_NONE, NULL, NULL);
 
-    /* Get real extension of the file (keeping the case) */
-    ETFileExtension = g_strdup(ET_Get_File_Extension(filename));
+    g_object_unref (file);
 
-    /* Fill the File_Name structure for FileNameList */
-    FileName = ET_File_Name_Item_New();
-    FileName->saved      = TRUE;    /* The file hasn't been changed, so it's saved */
-    FileName->value      = filename;
-    FileName->value_utf8 = filename_utf8;
-    FileName->value_ck   = g_utf8_collate_key_for_filename(filename_utf8, -1);
+    if (info)
+    {
+        time1 = g_file_info_get_attribute_uint64 (info,
+                                                  G_FILE_ATTRIBUTE_TIME_CHANGED);
+        g_object_unref (info);
+    }
 
-    /* Fill the File_Tag structure for FileTagList */
-    FileTag = ET_File_Tag_Item_New();
-    FileTag->saved = TRUE;    /* The file hasn't been changed, so it's saved */
+    file = g_file_new_for_path (((File_Name *)ETFile2->FileNameCur->data)->value);
+    info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_CHANGED,
+                              G_FILE_QUERY_INFO_NONE, NULL, NULL);
 
-    /* Patch from Doruk Fisek and Onur Kucuk: avoid upper/lower conversion bugs
-     * (like I->i conversion in some locales) in tag parsing. The problem occurs
-     * for example with Turkish language where it can't read 'TITLE=' field if
-     * it is written as 'Title=' in the file */
-    setlocale(LC_CTYPE, "C");
+    g_object_unref (file);
 
-    switch (ETFileDescription->TagType)
-    {
-#ifdef ENABLE_MP3
-        case ID3_TAG:
-            if (!id3tag_read_file_tag (file, FileTag, &error))
-            {
-                Log_Print (LOG_ERROR,
-                           "Error reading ID3 tag from file ‘%s’: %s",
-                           filename_utf8, error->message);
-                g_clear_error (&error);
-            }
-            break;
-#endif
-#ifdef ENABLE_OGG
-        case OGG_TAG:
-            if (!ogg_tag_read_file_tag (file, FileTag, &error))
-            {
-                Log_Print (LOG_ERROR,
-                           _("Error reading tag from Ogg file ‘%s’: %s"),
-                           filename_utf8, error->message);
-                g_clear_error (&error);
-            }
-            break;
-#endif
-#ifdef ENABLE_FLAC
-        case FLAC_TAG:
-            if (!flac_tag_read_file_tag (file, FileTag, &error))
-            {
-                Log_Print (LOG_ERROR,
-                           _("Error reading tag from FLAC file ‘%s’: %s"),
-                           filename_utf8, error->message);
-                g_clear_error (&error);
-            }
-            break;
-#endif
-        case APE_TAG:
-            if (!ape_tag_read_file_tag (file, FileTag, &error))
-            {
-                Log_Print (LOG_ERROR,
-                           _("Error reading APE tag from file ‘%s’: %s"),
-                           filename_utf8, error->message);
-                g_clear_error (&error);
-            }
-            break;
-#ifdef ENABLE_MP4
-        case MP4_TAG:
-            if (!mp4tag_read_file_tag (file, FileTag, &error))
-            {
-                Log_Print (LOG_ERROR,
-                           _("Error reading tag from MP4 file ‘%s’: %s"),
-                           filename_utf8, error->message);
-                g_clear_error (&error);
-            }
-            break;
-#endif
-#ifdef ENABLE_WAVPACK
-        case WAVPACK_TAG:
-            if (!wavpack_tag_read_file_tag (file, FileTag, &error))
-            {
-                Log_Print (LOG_ERROR,
-                           _("Error reading tag from WavPack file ‘%s’: %s"),
-                           filename_utf8, error->message);
-                g_clear_error (&error);
-            }
-        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’: %s"),
-                           filename_utf8, error->message);
-                g_clear_error (&error);
-            }
-            break;
-#endif
-        case UNKNOWN_TAG:
-        default:
-            /* FIXME: Translatable string. */
-            Log_Print(LOG_ERROR,"FileTag: Undefined tag type (%d) for file %s",ETFileDescription->TagType,filename_utf8);
-            break;
-    }
-
-    if (FileTag->year && g_utf8_strlen (FileTag->year, -1) > 4)
-    {
-        Log_Print (LOG_WARNING,
-                   _("The year value ‘%s’ seems to be invalid in file ‘%s’. The information will be lost when saving"),
-                   FileTag->year, filename_utf8);
-    }
-
-    /* Fill the ET_File_Info structure */
-    ETFileInfo = ET_File_Info_Item_New ();
-
-    switch (ETFileDescription->FileType)
-    {
-#if defined ENABLE_MP3 && defined ENABLE_ID3LIB
-        case MP3_FILE:
-        case MP2_FILE:
-            success = et_mpeg_header_read_file_info (file, ETFileInfo, &error);
-            break;
-#endif
-#ifdef ENABLE_OGG
-        case OGG_FILE:
-            success = et_ogg_header_read_file_info (file, ETFileInfo, &error);
-            break;
-#endif
-#ifdef ENABLE_SPEEX
-        case SPEEX_FILE:
-            success = et_speex_header_read_file_info (file, ETFileInfo,
-                                                      &error);
-            break;
-#endif
-#ifdef ENABLE_FLAC
-        case FLAC_FILE:
-            success = et_flac_header_read_file_info (file, ETFileInfo, &error);
-            break;
-#endif
-        case MPC_FILE:
-            success = et_mpc_header_read_file_info (file, ETFileInfo, &error);
-            break;
-        case MAC_FILE:
-            success = et_mac_header_read_file_info (file, ETFileInfo, &error);
-            break;
-#ifdef ENABLE_WAVPACK
-        case WAVPACK_FILE:
-            success = et_wavpack_header_read_file_info (file, ETFileInfo,
-                                                        &error);
-            break;
-#endif
-#ifdef ENABLE_MP4
-        case MP4_FILE:
-            success = et_mp4_header_read_file_info (file, ETFileInfo, &error);
-            break;
-#endif
-#ifdef ENABLE_OPUS
-        case OPUS_FILE:
-            success = et_opus_read_file_info (file, ETFileInfo, &error);
-            break;
-#endif
-        case UNKNOWN_FILE:
-        default:
-            /* FIXME: Translatable string. */
-            Log_Print(LOG_ERROR,"ETFileInfo: Undefined file type (%d) for file %s",ETFileDescription->FileType,filename_utf8);
-            /* To get at least the file size. */
-            success = et_core_read_file_info (file, ETFileInfo, &error);
-            break;
-    }
-
-    if (!success)
-    {
-        Log_Print (LOG_ERROR,
-                   _("Error while querying information for file ‘%s’: %s"),
-                   filename_utf8, error->message);
-        g_error_free (error);
-    }
-
-    /* Restore previous value */
-    setlocale(LC_CTYPE, locale_lc_ctype ? locale_lc_ctype : "");
-
-    /* Store the modification time of the file to check if the file was changed
-     * before saving */
-    fileinfo = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED,
-                                  G_FILE_QUERY_INFO_NONE, NULL, NULL);
-    g_object_unref (file);
-
-    /* Attach all data defined above to this ETFile item */
-    ETFile = ET_File_Item_New();
-
-    if (fileinfo)
-    {
-        ETFile->FileModificationTime = g_file_info_get_attribute_uint64 (fileinfo,
-                                                                         G_FILE_ATTRIBUTE_TIME_MODIFIED);
-        g_object_unref (fileinfo);
-    }
-    else
-    {
-        ETFile->FileModificationTime = 0;
-    }
-
-    ETFile->IndexKey             = 0; // Will be renumered after...
-    ETFile->ETFileKey            = ETFileKey;
-    ETFile->ETFileDescription    = ETFileDescription;
-    ETFile->ETFileExtension      = ETFileExtension;
-    ETFile->FileNameList         = g_list_append(NULL,FileName);
-    ETFile->FileNameCur          = ETFile->FileNameList;
-    ETFile->FileNameNew          = ETFile->FileNameList;
-    ETFile->FileTagList          = g_list_append(NULL,FileTag);
-    ETFile->FileTag              = ETFile->FileTagList;
-    ETFile->ETFileInfo           = ETFileInfo;
-
-    /* Add the item to the "main list" */
-    ETCore->ETFileList = g_list_append(ETCore->ETFileList,ETFile);
-
-
-    /*
-     * Process the filename and tag to generate undo if needed...
-     * The undo key must be the same for FileName and FileTag => changed in the same time
-     */
-    undo_key = ET_Undo_Key_New();
-
-    FileName = ET_File_Name_Item_New();
-    FileName->key = undo_key;
-    ET_Save_File_Name_Internal(ETFile,FileName);
-
-    FileTag = ET_File_Tag_Item_New();
-    FileTag->key = undo_key;
-    ET_Save_File_Tag_Internal(ETFile,FileTag);
-
-    /*
-     * Generate undo for the file and the main undo list.
-     * If no changes detected, FileName and FileTag item are deleted.
-     */
-    ET_Manage_Changes_Of_File_Data(ETFile,FileName,FileTag);
-
-    /*
-     * Display a message if the file was changed at start
-     */
-    FileTag  = (File_Tag *)ETFile->FileTag->data;
-    FileName = (File_Name *)ETFile->FileNameNew->data;
-    if ( (FileName && FileName->saved==FALSE) || (FileTag && FileTag->saved==FALSE) )
-    {
-        Log_Print (LOG_INFO, _("Automatic corrections applied for file ‘%s’"),
-                   filename_utf8);
-    }
-
-    /* Add the item to the ArtistAlbum list (placed here to take advantage of previous changes) */
-    //ET_Add_File_To_Artist_Album_File_List(ETFile);
-
-    //ET_Debug_Print_File_List(ETCore->ETFileList,__FILE__,__LINE__,__FUNCTION__);
-    return ETCore->ETFileList;
-}
-
-gboolean ET_Create_Artist_Album_File_List (void)
-{
-    GList *l;
-
-    if (ETCore->ETArtistAlbumFileList)
-        ET_Free_Artist_Album_File_List();
-
-    for (l = g_list_first (ETCore->ETFileList); l != NULL; l = g_list_next (l))
-    {
-        ET_File *ETFile = (ET_File *)l->data;
-        ET_Add_File_To_Artist_Album_File_List(ETFile);
-    }
-    //ET_Debug_Print_Artist_Album_List(__FILE__,__LINE__,__FUNCTION__);
-    return TRUE;
-}
-/*
- * The ETArtistAlbumFileList contains 3 levels of lists to sort the ETFile by artist then by album :
- *  - "ETArtistAlbumFileList" list is a list of "ArtistList" items,
- *  - "ArtistList" list is a list of "AlbumList" items,
- *  - "AlbumList" list is a list of ETFile items.
- * Note : use the function ET_Debug_Print_Artist_Album_List(...) to understand how it works, it needed...
- */
-static gboolean
-ET_Add_File_To_Artist_Album_File_List (ET_File *ETFile)
-{
-    const gchar *ETFile_Artist;
-    const gchar *ETFile_Album;
-    const gchar *etfile_artist;
-    const gchar *etfile_album;
-    GList *ArtistList;
-    GList *AlbumList = NULL;
-    GList *etfilelist = NULL;
-    ET_File *etfile = NULL;
-
-    g_return_val_if_fail (ETFile != NULL, FALSE);
-
-    /* Album value of the ETFile passed in parameter. */
-    ETFile_Album = ((File_Tag *)ETFile->FileTag->data)->album;
-    /* Artist value of the ETFile passed in parameter. */
-    ETFile_Artist = ((File_Tag *)ETFile->FileTag->data)->artist;
-
-    for (ArtistList = ETCore->ETArtistAlbumFileList; ArtistList != NULL;
-         ArtistList = g_list_next (ArtistList))
-    {
-        AlbumList = (GList *)ArtistList->data;  /* Take the first item */
-        /* Take the first item, and the first etfile item. */
-        if (AlbumList && (etfilelist = (GList *)AlbumList->data)
-            && (etfile = (ET_File *)etfilelist->data)
-            && ((File_Tag *)etfile->FileTag->data) != NULL)
-        {
-            etfile_artist = ((File_Tag *)etfile->FileTag->data)->artist;
-        }
-        else
-        {
-            etfile_artist = NULL;
-        }
-
-        if ((etfile_artist &&  ETFile_Artist && strcmp (etfile_artist,
-                                                        ETFile_Artist) == 0)
-            || (!etfile_artist && !ETFile_Artist)) /* The "artist" values correspond? */
-        {
-            /* The "ArtistList" item was found! */
-            while (AlbumList)
-            {
-                if ((etfilelist = (GList *)AlbumList->data)
-                    && (etfile = (ET_File *)etfilelist->data)
-                    && ((File_Tag *)etfile->FileTag->data) != NULL)
-                {
-                    etfile_album = ((File_Tag *)etfile->FileTag->data)->album;
-                }
-                else
-                {
-                    etfile_album = NULL;
-                }
-
-                if ((etfile_album && ETFile_Album && strcmp (etfile_album,
-                                                             ETFile_Album) == 0)
-                    || (!etfile_album && !ETFile_Album))
-                    /* The "album" values correspond? */
-                {
-                    /* The "AlbumList" item was found!
-                     * Add the ETFile to this AlbumList item */
-                    AlbumList->data = g_list_append ((GList *)AlbumList->data,
-                                                     ETFile);
-                    AlbumList->data = g_list_sort ((GList *)AlbumList->data,
-                                                   (GCompareFunc)ET_Comp_Func_Sort_Etfile_Item_By_Ascending_Filename);
-                    return TRUE;
-                }
-
-                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);
-            ArtistList->data = g_list_append ((GList *)ArtistList->data,
-                                              etfilelist);
-            ArtistList->data = g_list_sort ((GList *)ArtistList->data,
-                                            (GCompareFunc)ET_Comp_Func_Sort_Album_Item_By_Ascending_Album);
-            return TRUE;
-        }
-    }
-
-    /* The "ArtistList" item was NOT found! => Add a new "ArtistList" to the
-     * main list (=ETArtistAlbumFileList). */
-    etfilelist = g_list_append (NULL, ETFile);
-    AlbumList  = g_list_append (NULL, etfilelist);
-    ETCore->ETArtistAlbumFileList = g_list_append (ETCore->ETArtistAlbumFileList,
-                                                   AlbumList);
-
-    /* Sort the list by ascending Artist. */
-    ETCore->ETArtistAlbumFileList = g_list_sort (ETCore->ETArtistAlbumFileList,
-                                                 (GCompareFunc)ET_Comp_Func_Sort_Artist_Item_By_Ascending_Artist);
-
-    return TRUE;
-}
-
-
-
-/*
- * Delete the corresponding file and free the allocated data. Return TRUE if deleted.
- */
-gboolean ET_Remove_File_From_File_List (ET_File *ETFile)
-{
-    GList *ETFileList = NULL;          // Item containing the ETFile to delete... (in ETCore->ETFileList)
-    GList *ETFileDisplayedList = NULL; // Item containing the ETFile to delete... (in ETCore->ETFileDisplayedList)
-
-    // Remove infos of the file
-    ETCore->ETFileDisplayedList_TotalSize     -= ((ET_File_Info *)ETFile->ETFileInfo)->size;
-    ETCore->ETFileDisplayedList_TotalDuration -= ((ET_File_Info *)ETFile->ETFileInfo)->duration;
-
-    // Find the ETFileList containing the ETFile item
-    ETFileDisplayedList = g_list_find(g_list_first(ETCore->ETFileDisplayedList),ETFile);
-    ETFileList          = g_list_find(g_list_first(ETCore->ETFileList),ETFile);
-
-    // Note : this ETFileList must be used only for ETCore->ETFileDisplayedList, and not ETCore->ETFileDisplayed
-    if (ETCore->ETFileDisplayedList == ETFileDisplayedList)
-    {
-        if (ETFileList->next)
-            ETCore->ETFileDisplayedList = ETFileDisplayedList->next;
-        else if (ETFileList->prev)
-            ETCore->ETFileDisplayedList = ETFileDisplayedList->prev;
-        else
-            ETCore->ETFileDisplayedList = NULL;
-    }
-    // If the current displayed file is just removing, it will be unable to display it again!
-    if (ETCore->ETFileDisplayed == ETFile)
-    {
-        if (ETCore->ETFileDisplayedList)
-            ETCore->ETFileDisplayed = (ET_File *)ETCore->ETFileDisplayedList->data;
-        else
-            ETCore->ETFileDisplayed = (ET_File *)NULL;
-    }
-
-    /* Remove the file from the ETFileList list. */
-    ETCore->ETFileList = g_list_remove (g_list_first (ETCore->ETFileList),
-                                        ETFileList);
-
-    // Remove the file from the ETArtistAlbumList list
-    ET_Remove_File_From_Artist_Album_List(ETFile);
-
-    /* Remove the file from the ETFileDisplayedList list (if not already). */
-    ETCore->ETFileDisplayedList = g_list_remove (g_list_first (ETCore->ETFileDisplayedList),
-                                                 ETFileDisplayedList);
-
-    // Free data of the file
-    ET_Free_File_List_Item(ETFile);
-    if (ETFileList)
-        g_list_free(ETFileList);
-    if (ETFileDisplayedList)
-        g_list_free(ETFileDisplayedList);
-
-    // Recalculate length of ETFileDisplayedList list
-    ET_Displayed_File_List_Get_Length();
-
-    // To number the ETFile in the list
-    ET_Displayed_File_List_Number();
-
-    // Displaying...
-    if (ETCore->ETFileDisplayedList)
-    {
-        if (ETCore->ETFileDisplayed)
-        {
-            ET_Displayed_File_List_By_Etfile(ETCore->ETFileDisplayed);
-        }else if (ETCore->ETFileDisplayedList->data)
-        {
-            // Select the new file (synchronize index,...)
-            ET_Displayed_File_List_By_Etfile((ET_File *)ETCore->ETFileDisplayedList->data);
-        }
-    }else
-    {
-        // Reinit the tag and file area
-        et_application_window_file_area_clear (ET_APPLICATION_WINDOW (MainWindow));
-        et_application_window_tag_area_clear (ET_APPLICATION_WINDOW (MainWindow));
-        et_application_window_update_actions (ET_APPLICATION_WINDOW (MainWindow));
-    }
-
-    return TRUE;
-}
-
-
-/*
- * Delete the corresponding file (allocated data was previously freed!). Return TRUE if deleted.
- */
-static gboolean
-ET_Remove_File_From_Artist_Album_List (ET_File *ETFile)
-{
-    GList *ArtistList;
-    GList *AlbumList;
-    GList *etfilelist;
-
-    g_return_val_if_fail (ETFile != NULL, FALSE);
-
-    /* Search for the ETFile in the list. */
-    for (ArtistList = ETCore->ETArtistAlbumFileList; ArtistList != NULL;
-         ArtistList = g_list_next (ArtistList))
-    {
-        for (AlbumList = g_list_first ((GList *)ArtistList->data);
-             AlbumList != NULL; AlbumList = g_list_next (AlbumList))
-        {
-            for (etfilelist = g_list_first ((GList *)AlbumList->data);
-                 etfilelist != NULL; etfilelist = g_list_next (etfilelist))
-            {
-                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. */
-                    {
-                        AlbumList->data = (gpointer) g_list_first (etfilelist);
-                    }
-                    else
-                    {
-                        AlbumList = g_list_remove (AlbumList, AlbumList->data);
-
-                        if (AlbumList) /* Delete from ArtistList. */
-                        {
-                            ArtistList->data = AlbumList;
-                        }
-                        else
-                        {
-                            /* Delete from the main list. */
-                            ETCore->ETArtistAlbumFileList = g_list_remove (ArtistList,ArtistList->data);
-
-                            return TRUE;
-                        }
-
-                        return TRUE;
-                    }
-
-                    return TRUE;
-                }
-            }
-        }
-    }
-
-    return FALSE; /* ETFile is NUL, or not found in the list. */
-}
-
-/**************************
- * File sorting functions *
- **************************/
-
-/*
- * Sort the 'ETFileDisplayedList' following the 'Sorting_Type'
- * Note : Add also new sorting in 'Browser_List_Sort_Func'
- */
-static void
-ET_Sort_Displayed_File_List (EtSortMode Sorting_Type)
-{
-    ETCore->ETFileDisplayedList = ET_Sort_File_List(ETCore->ETFileDisplayedList,Sorting_Type);
-}
-
-/*
- * Sort an 'ETFileList'
- */
-GList *
-ET_Sort_File_List (GList *ETFileList, EtSortMode Sorting_Type)
-{
-    EtApplicationWindow *window;
-    GtkTreeViewColumn *column;
-    GList *etfilelist;
-    gint column_id = Sorting_Type / 2;
-
-    window = ET_APPLICATION_WINDOW (MainWindow);
-    column = et_application_window_browser_get_column_for_column_id (window,
-                                                                     column_id);
-
-    /* Important to rewind before. */
-    etfilelist = g_list_first (ETFileList);
-
-    /* FIXME: Port to sort-mode? */
-    set_sort_order_for_column_id (column_id, column, Sorting_Type);
-
-    /* Sort... */
-    switch (Sorting_Type)
-    {
-        case ET_SORT_MODE_ASCENDING_FILENAME:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Filename);
-            break;
-        case ET_SORT_MODE_DESCENDING_FILENAME:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Filename);
-            break;
-        case ET_SORT_MODE_ASCENDING_TITLE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Title);
-            break;
-        case ET_SORT_MODE_DESCENDING_TITLE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Title);
-            break;
-        case ET_SORT_MODE_ASCENDING_ARTIST:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Artist);
-            break;
-        case ET_SORT_MODE_DESCENDING_ARTIST:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Artist);
-            break;
-        case ET_SORT_MODE_ASCENDING_ALBUM_ARTIST:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Album_Artist);
-            break;
-        case ET_SORT_MODE_DESCENDING_ALBUM_ARTIST:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Album_Artist);
-            break;
-		case ET_SORT_MODE_ASCENDING_ALBUM:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Album);
-            break;
-        case ET_SORT_MODE_DESCENDING_ALBUM:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Album);
-            break;
-        case ET_SORT_MODE_ASCENDING_YEAR:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Year);
-            break;
-        case ET_SORT_MODE_DESCENDING_YEAR:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Year);
-            break;
-        case ET_SORT_MODE_ASCENDING_DISC_NUMBER:
-            etfilelist = g_list_sort (etfilelist,
-                                      (GCompareFunc)et_comp_func_sort_file_by_ascending_disc_number);
-            break;
-        case ET_SORT_MODE_DESCENDING_DISC_NUMBER:
-            etfilelist = g_list_sort (etfilelist,
-                                      (GCompareFunc)et_comp_func_sort_file_by_descending_disc_number);
-            break;
-        case ET_SORT_MODE_ASCENDING_TRACK_NUMBER:
-            etfilelist = g_list_sort (etfilelist,
-                                      (GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Track_Number);
-            break;
-        case ET_SORT_MODE_DESCENDING_TRACK_NUMBER:
-            etfilelist = g_list_sort (etfilelist,
-                                      (GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Track_Number);
-            break;
-        case ET_SORT_MODE_ASCENDING_GENRE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Genre);
-            break;
-        case ET_SORT_MODE_DESCENDING_GENRE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Genre);
-            break;
-        case ET_SORT_MODE_ASCENDING_COMMENT:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Comment);
-            break;
-        case ET_SORT_MODE_DESCENDING_COMMENT:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Comment);
-            break;
-        case ET_SORT_MODE_ASCENDING_COMPOSER:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Composer);
-            break;
-        case ET_SORT_MODE_DESCENDING_COMPOSER:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Composer);
-            break;
-        case ET_SORT_MODE_ASCENDING_ORIG_ARTIST:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Orig_Artist);
-            break;
-        case ET_SORT_MODE_DESCENDING_ORIG_ARTIST:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Orig_Artist);
-            break;
-        case ET_SORT_MODE_ASCENDING_COPYRIGHT:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Copyright);
-            break;
-        case ET_SORT_MODE_DESCENDING_COPYRIGHT:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Copyright);
-            break;
-        case ET_SORT_MODE_ASCENDING_URL:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Url);
-            break;
-        case ET_SORT_MODE_DESCENDING_URL:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Url);
-            break;
-        case ET_SORT_MODE_ASCENDING_ENCODED_BY:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Encoded_By);
-            break;
-        case ET_SORT_MODE_DESCENDING_ENCODED_BY:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Encoded_By);
-            break;
-        case ET_SORT_MODE_ASCENDING_CREATION_DATE:
-            etfilelist = g_list_sort (etfilelist,
-                                      (GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Creation_Date);
-            break;
-        case ET_SORT_MODE_DESCENDING_CREATION_DATE:
-            etfilelist = g_list_sort (etfilelist,
-                                      (GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Creation_Date);
-            break;
-        case ET_SORT_MODE_ASCENDING_FILE_TYPE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Type);
-            break;
-        case ET_SORT_MODE_DESCENDING_FILE_TYPE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Type);
-            break;
-        case ET_SORT_MODE_ASCENDING_FILE_SIZE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Size);
-            break;
-        case ET_SORT_MODE_DESCENDING_FILE_SIZE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Size);
-            break;
-        case ET_SORT_MODE_ASCENDING_FILE_DURATION:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Duration);
-            break;
-        case ET_SORT_MODE_DESCENDING_FILE_DURATION:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Duration);
-            break;
-        case ET_SORT_MODE_ASCENDING_FILE_BITRATE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Bitrate);
-            break;
-        case ET_SORT_MODE_DESCENDING_FILE_BITRATE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Bitrate);
-            break;
-        case ET_SORT_MODE_ASCENDING_FILE_SAMPLERATE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Samplerate);
-            break;
-        case ET_SORT_MODE_DESCENDING_FILE_SAMPLERATE:
-            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Samplerate);
-            break;
-    }
-    /* Save sorting mode (note: needed when called from UI). */
-    g_settings_set_enum (MainSettings, "sort-mode", Sorting_Type);
-
-    //ETFileList = g_list_first(etfilelist);
-    return etfilelist;
-}
-
-
-/*
- * Sort the list of files following the 'Sorting_Type' value. The new sorting is displayed in the UI.
- */
-void
-ET_Sort_Displayed_File_List_And_Update_UI (EtSortMode Sorting_Type)
-{
-    g_return_if_fail (ETCore->ETFileList != NULL);
-
-    ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
-
-    /* Sort the list */
-    ET_Sort_Displayed_File_List(Sorting_Type);
-
-    /* To number the ETFile in the list */
-    ET_Displayed_File_List_Number();
-
-    /* Reload files in browser list */
-    ET_Displayed_File_List_By_Etfile(ETCore->ETFileDisplayed);  // Just to update 'ETFileDisplayedList'
-    et_application_window_browser_select_file_by_et_file (ET_APPLICATION_WINDOW (MainWindow),
-                                                          ETCore->ETFileDisplayed,
-                                                          TRUE);
-    ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);
-
-    et_application_window_browser_refresh_sort (ET_APPLICATION_WINDOW (MainWindow));
-    et_application_window_update_actions (ET_APPLICATION_WINDOW (MainWindow));
-}
-
-
-/*
- * Comparison function for sorting by ascending filename.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Filename (const ET_File *ETFile1,
-                                              const ET_File *ETFile2)
-{
-    const gchar *file1_ck = ((File_Name *)((GList *)ETFile1->FileNameCur)->data)->value_ck;
-    const gchar *file2_ck = ((File_Name *)((GList *)ETFile2->FileNameCur)->data)->value_ck;
-    // !!!! : Must be the same rules as "Cddb_Track_List_Sort_Func" to be
-    // able to sort in the same order files in cddb and in the file list.
-    return g_settings_get_boolean (MainSettings,
-                                   "sort-case-sensitive") ? strcmp (file1_ck, file2_ck)
-                                                          : strcasecmp (file1_ck, file2_ck);
-}
-
-/*
- * Comparison function for sorting by descending filename.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Filename (const ET_File *ETFile1,
-                                               const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending disc number.
- */
-gint
-et_comp_func_sort_file_by_ascending_disc_number (const ET_File *ETFile1,
-                                                 const ET_File *ETFile2)
-{
-    gint track1, track2;
-
-    if (!ETFile1->FileTag->data
-        || !((File_Tag *)ETFile1->FileTag->data)->disc_number)
-    {
-        track1 = 0;
-    }
-    else
-    {
-        track1 = atoi (((File_Tag *)ETFile1->FileTag->data)->disc_number);
-    }
-
-    if (!ETFile2->FileTag->data
-        || !((File_Tag *)ETFile2->FileTag->data)->disc_number)
-    {
-        track2 = 0;
-    }
-    else
-    {
-        track2 = atoi (((File_Tag *)ETFile2->FileTag->data)->disc_number);
-    }
-
-    /* Second criterion. */
-    if (track1 == track2)
-    {
-        return ET_Comp_Func_Sort_File_By_Ascending_Filename (ETFile1, ETFile2);
-    }
-
-    /* First criterion. */
-    return (track1 - track2);
-}
-
-/*
- * Comparison function for sorting by descending disc number.
- */
-gint
-et_comp_func_sort_file_by_descending_disc_number (const ET_File *ETFile1,
-                                                  const ET_File *ETFile2)
-{
-    return et_comp_func_sort_file_by_ascending_disc_number (ETFile2, ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending track number.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Track_Number (const ET_File *ETFile1,
-                                                  const ET_File *ETFile2)
-{
-    gint track1, track2;
-
-    if ( !ETFile1->FileTag->data || !((File_Tag *)ETFile1->FileTag->data)->track )
-        track1 = 0;
-    else
-        track1 = atoi( ((File_Tag *)ETFile1->FileTag->data)->track );
-
-    if ( !ETFile2->FileTag->data || !((File_Tag *)ETFile2->FileTag->data)->track )
-        track2 = 0;
-    else
-        track2 = atoi( ((File_Tag *)ETFile2->FileTag->data)->track );
-
-    // Second criterion
-    if (track1 == track2)
-        return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-
-    // First criterion
-    return (track1 - track2);
-}
-
-/*
- * Comparison function for sorting by descending track number.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_Track_Number (const ET_File *ETFile1,
-                                                   const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_Track_Number(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending creation date.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_Creation_Date (const ET_File *ETFile1,
-                                                   const ET_File *ETFile2)
-{
-    GFile *file;
-    GFileInfo *info;
-    guint64 time1 = 0;
-    guint64 time2 = 0;
-
-    /* TODO: Report errors? */
-    file = g_file_new_for_path (((File_Name *)ETFile1->FileNameCur->data)->value);
-    info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_CHANGED,
-                              G_FILE_QUERY_INFO_NONE, NULL, NULL);
-
-    g_object_unref (file);
-
-    if (info)
-    {
-        time1 = g_file_info_get_attribute_uint64 (info,
-                                                  G_FILE_ATTRIBUTE_TIME_CHANGED);
-        g_object_unref (info);
-    }
-
-    file = g_file_new_for_path (((File_Name *)ETFile2->FileNameCur->data)->value);
-    info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_CHANGED,
-                              G_FILE_QUERY_INFO_NONE, NULL, NULL);
-
-    g_object_unref (file);
-
-    if (info)
+    if (info)
     {
         time2 = g_file_info_get_attribute_uint64 (info,
                                                   G_FILE_ATTRIBUTE_TIME_CHANGED);
@@ -2051,288 +978,53 @@ ET_Comp_Func_Sort_File_By_Ascending_File_Bitrate (const ET_File *ETFile1,
     // Second criterion
     if (ETFile1->ETFileInfo->bitrate == ETFile2->ETFileInfo->bitrate)
         return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-
-    // First criterion
-    return (ETFile1->ETFileInfo->bitrate - ETFile2->ETFileInfo->bitrate);
-}
-
-/*
- * Comparison function for sorting by descending file bitrate.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_File_Bitrate (const ET_File *ETFile1,
-                                                   const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_File_Bitrate(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending file samplerate.
- */
-gint
-ET_Comp_Func_Sort_File_By_Ascending_File_Samplerate (const ET_File *ETFile1,
-                                                     const ET_File *ETFile2)
-{
-    if ( !ETFile1->ETFileInfo ) return -1;
-    if ( !ETFile2->ETFileInfo ) return 1;
-
-    // Second criterion
-    if (ETFile1->ETFileInfo->samplerate == ETFile2->ETFileInfo->samplerate)
-        return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-
-    // First criterion
-    return (ETFile1->ETFileInfo->samplerate - ETFile2->ETFileInfo->samplerate);
-}
-
-/*
- * Comparison function for sorting by descending file samplerate.
- */
-gint
-ET_Comp_Func_Sort_File_By_Descending_File_Samplerate (const ET_File *ETFile1,
-                                                      const ET_File *ETFile2)
-{
-    return ET_Comp_Func_Sort_File_By_Ascending_File_Samplerate(ETFile2,ETFile1);
-}
-
-
-/*
- * Comparison function for sorting by ascending artist in the ArtistAlbumList.
- */
-static gint
-ET_Comp_Func_Sort_Artist_Item_By_Ascending_Artist (const GList *AlbumList1,
-                                                   const GList *AlbumList2)
-{
-    const GList *etfilelist1 = NULL;
-    const GList *etfilelist2 = NULL;
-    const ET_File *etfile1 = NULL;
-    const ET_File *etfile2 = NULL;
-    const gchar *etfile1_artist;
-    const gchar *etfile2_artist;
-
-    if (!AlbumList1
-    || !(etfilelist1    = (GList *)AlbumList1->data)
-    || !(etfile1        = (ET_File *)etfilelist1->data)
-    || !(etfile1_artist = ((File_Tag *)etfile1->FileTag->data)->artist) )
-        return -1;
-
-    if (!AlbumList2
-    || !(etfilelist2    = (GList *)AlbumList2->data)
-    || !(etfile2        = (ET_File *)etfilelist2->data)
-    || !(etfile2_artist = ((File_Tag *)etfile2->FileTag->data)->artist) )
-        return 1;
-
-    /*if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
-     *    return strcmp(etfile1_artist,etfile2_artist); */
-    //else
-        return strcasecmp(etfile1_artist,etfile2_artist);
-}
-
-/*
- * Comparison function for sorting by ascending album in the ArtistAlbumList.
- */
-static gint
-ET_Comp_Func_Sort_Album_Item_By_Ascending_Album (const GList *etfilelist1,
-                                                 const GList *etfilelist2)
-{
-    const ET_File *etfile1;
-    const ET_File *etfile2;
-    const gchar *etfile1_album;
-    const gchar *etfile2_album;
-
-    if (!etfilelist1
-    || !(etfile1        = (ET_File *)etfilelist1->data)
-    || !(etfile1_album  = ((File_Tag *)etfile1->FileTag->data)->album) )
-        return -1;
-
-    if (!etfilelist2
-    || !(etfile2        = (ET_File *)etfilelist2->data)
-    || !(etfile2_album  = ((File_Tag *)etfile2->FileTag->data)->album) )
-        return 1;
-
-    /*if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
-     *    return strcmp(etfile1_album,etfile2_album); */
-    //else
-        return strcasecmp(etfile1_album,etfile2_album);
-}
-
-/*
- * Comparison function for sorting etfile in the ArtistAlbumList.
- * FIX ME : should use the default sorting!
- */
-static gint
-ET_Comp_Func_Sort_Etfile_Item_By_Ascending_Filename (const ET_File *ETFile1,
-                                                     const ET_File *ETFile2)
-{
-
-    if (!ETFile1) return -1;
-    if (!ETFile2) return  1;
-
-    return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-}
-
-
-
-
-/***************************
- * List handling functions *
- ***************************/
-
-/*
- * Returns the first item of the "displayed list"
- */
-GList *ET_Displayed_File_List_First (void)
-{
-    ETCore->ETFileDisplayedList = g_list_first(ETCore->ETFileDisplayedList);
-    return ETCore->ETFileDisplayedList;
-}
-
-/*
- * Returns the previous item of the "displayed list". When no more item, it returns NULL.
- */
-GList *ET_Displayed_File_List_Previous (void)
-{
-    if (ETCore->ETFileDisplayedList && ETCore->ETFileDisplayedList->prev)
-        return ETCore->ETFileDisplayedList = ETCore->ETFileDisplayedList->prev;
-    else
-        return NULL;
-}
-
-/*
- * Returns the next item of the "displayed list".
- * When no more item, it returns NULL to don't "overwrite" the list.
- */
-GList *ET_Displayed_File_List_Next (void)
-{
-    if (ETCore->ETFileDisplayedList && ETCore->ETFileDisplayedList->next)
-        return ETCore->ETFileDisplayedList = ETCore->ETFileDisplayedList->next;
-    else
-        return NULL;
-}
-
-/*
- * Returns the last item of the "displayed list"
- */
-GList *ET_Displayed_File_List_Last (void)
-{
-    ETCore->ETFileDisplayedList = g_list_last(ETCore->ETFileDisplayedList);
-    return ETCore->ETFileDisplayedList;
-}
-
-/*
- * Returns the item of the "displayed list" which correspond to the given 'ETFile' (used into browser list).
- */
-GList *
-ET_Displayed_File_List_By_Etfile (const ET_File *ETFile)
-{
-    GList *etfilelist;
-
-    for (etfilelist = ET_Displayed_File_List_First (); etfilelist != NULL;
-         etfilelist = ET_Displayed_File_List_Next ())
-    {
-        if (ETFile == (ET_File *)etfilelist->data)
-            break;
-    }
-
-    if (etfilelist)
-    {
-        /* To "save" the position like in ET_File_List_Next... (not very good -
-         * FIXME) */
-        ETCore->ETFileDisplayedList = etfilelist;
-    }
-    return etfilelist;
-}
-
-/*
- * Just returns the current item of the "main list"
- */
-/*GList *ET_Displayed_File_List_Current (void)
-{
-    return ETCore->ETFileDisplayedList;
-    //return ETCore->ETFileDisplayedListPtr;
-}*/
-
-/*
- * Renumber the list of displayed files (IndexKey) from 1 to n
- */
-static void
-ET_Displayed_File_List_Number (void)
-{
-    GList *l = NULL;
-    guint i = 1;
-
-    for (l = g_list_first (ETCore->ETFileDisplayedList); l != NULL;
-         l = g_list_next (l))
-    {
-        ((ET_File *)l->data)->IndexKey = i++;
-    }
+
+    // First criterion
+    return (ETFile1->ETFileInfo->bitrate - ETFile2->ETFileInfo->bitrate);
 }
 
 /*
- * Returns the length of the list of displayed files
+ * Comparison function for sorting by descending file bitrate.
  */
-static guint
-ET_Displayed_File_List_Get_Length (void)
+gint
+ET_Comp_Func_Sort_File_By_Descending_File_Bitrate (const ET_File *ETFile1,
+                                                   const ET_File *ETFile2)
 {
-    GList *list = NULL;
-
-    list = g_list_first(ETCore->ETFileDisplayedList);
-    ETCore->ETFileDisplayedList_Length = g_list_length(list);
-    return ETCore->ETFileDisplayedList_Length;
+    return ET_Comp_Func_Sort_File_By_Ascending_File_Bitrate(ETFile2,ETFile1);
 }
 
+
 /*
- * Load the list of displayed files (calculate length, size, ...)
- * It contains part (filtrated : view by artists and albums) or full ETCore->ETFileList list
+ * Comparison function for sorting by ascending file samplerate.
  */
-gboolean ET_Set_Displayed_File_List (GList *ETFileList)
+gint
+ET_Comp_Func_Sort_File_By_Ascending_File_Samplerate (const ET_File *ETFile1,
+                                                     const ET_File *ETFile2)
 {
-    GList *l = NULL;
-
-    ETCore->ETFileDisplayedList = g_list_first(ETFileList);
-
-    //ETCore->ETFileDisplayedListPtr = ETCore->ETFileDisplayedList;
-    ETCore->ETFileDisplayedList_Length = ET_Displayed_File_List_Get_Length();
-    ETCore->ETFileDisplayedList_TotalSize     = 0;
-    ETCore->ETFileDisplayedList_TotalDuration = 0;
-
-    // Get size and duration of files in the list
-    for (l = ETCore->ETFileDisplayedList; l != NULL; l = g_list_next (l))
-    {
-        ETCore->ETFileDisplayedList_TotalSize += ((ET_File_Info *)((ET_File *)l->data)->ETFileInfo)->size;
-        ETCore->ETFileDisplayedList_TotalDuration += ((ET_File_Info *)((ET_File *)l->data)->ETFileInfo)->duration;
-    }
-
-    /* Sort the file list. */
-    ET_Sort_Displayed_File_List (g_settings_get_enum (MainSettings,
-                                 "sort-mode"));
+    if ( !ETFile1->ETFileInfo ) return -1;
+    if ( !ETFile2->ETFileInfo ) return 1;
 
-    // Should renums ETCore->ETFileDisplayedList only!
-    ET_Displayed_File_List_Number();
+    // Second criterion
+    if (ETFile1->ETFileInfo->samplerate == ETFile2->ETFileInfo->samplerate)
+        return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
 
-    return TRUE;
+    // First criterion
+    return (ETFile1->ETFileInfo->samplerate - ETFile2->ETFileInfo->samplerate);
 }
 
-
-
-/*********************
- * Freeing functions *
- *********************/
-
 /*
- * Frees the full main list of files: GList *ETFileList and reinitialize it.
+ * Comparison function for sorting by descending file samplerate.
  */
-gboolean ET_Free_File_List (void)
+gint
+ET_Comp_Func_Sort_File_By_Descending_File_Samplerate (const ET_File *ETFile1,
+                                                      const ET_File *ETFile2)
 {
-    g_return_val_if_fail (ETCore != NULL && ETCore->ETFileList != NULL, FALSE);
-
-    g_list_free_full (ETCore->ETFileList,
-                      (GDestroyNotify)ET_Free_File_List_Item);
-    ETCore->ETFileList = NULL;
-
-    return TRUE;
+    return ET_Comp_Func_Sort_File_By_Ascending_File_Samplerate(ETFile2,ETFile1);
 }
 
+/*********************
+ * Freeing functions *
+ *********************/
 
 /*
  * Frees one item of the full main list of files.
@@ -2364,8 +1056,9 @@ ET_Free_File_List_Item (ET_File *ETFile)
         {
             ET_Free_File_Info_Item (ETFile->ETFileInfo);
         }
+
         g_free(ETFile->ETFileExtension);
-        g_free(ETFile);
+        g_slice_free (ET_File, ETFile);
     }
 }
 
@@ -2373,7 +1066,8 @@ ET_Free_File_List_Item (ET_File *ETFile)
 /*
  * Frees the full list: GList *FileNameList.
  */
-gboolean ET_Free_File_Name_List (GList *FileNameList)
+static gboolean
+ET_Free_File_Name_List (GList *FileNameList)
 {
     g_return_val_if_fail (FileNameList != NULL, FALSE);
 
@@ -2396,8 +1090,7 @@ ET_Free_File_Name_Item (File_Name *FileName)
     g_free(FileName->value);
     g_free(FileName->value_utf8);
     g_free(FileName->value_ck);
-    g_free(FileName);
-
+    g_slice_free (File_Name, FileName);
 }
 
 
@@ -2426,50 +1119,6 @@ ET_Free_File_Tag_List (GList *FileTagList)
 
 
 /*
- * Frees the list of 'other' field in a File_Tag item (contains attached gchar data).
- */
-static gboolean
-ET_Free_File_Tag_Item_Other_Field (File_Tag *FileTag)
-{
-    g_list_free_full (FileTag->other, g_free);
-
-    return TRUE;
-}
-
-
-/*
- * Frees a File_Tag item.
- */
-gboolean ET_Free_File_Tag_Item (File_Tag *FileTag)
-{
-    g_return_val_if_fail (FileTag != NULL, FALSE);
-
-    g_free(FileTag->title);
-    g_free(FileTag->artist);
-    g_free(FileTag->album_artist);
-    g_free(FileTag->album);
-    g_free(FileTag->disc_number);
-    g_free (FileTag->disc_total);
-    g_free(FileTag->year);
-    g_free(FileTag->track);
-    g_free(FileTag->track_total);
-    g_free(FileTag->genre);
-    g_free(FileTag->comment);
-    g_free(FileTag->composer);
-    g_free(FileTag->orig_artist);
-    g_free(FileTag->copyright);
-    g_free(FileTag->url);
-    g_free(FileTag->encoded_by);
-    Picture_Free(FileTag->picture);
-    // Free list of other fields
-    ET_Free_File_Tag_Item_Other_Field(FileTag);
-
-    g_free(FileTag);
-    return TRUE;
-}
-
-
-/*
  * Frees a File_Info item.
  */
 static gboolean
@@ -2478,300 +1127,17 @@ ET_Free_File_Info_Item (ET_File_Info *ETFileInfo)
     g_return_val_if_fail (ETFileInfo != NULL, FALSE);
 
     g_free(ETFileInfo->mpc_profile);
-    g_free(ETFileInfo->mpc_version);
-
-    g_free(ETFileInfo);
-    return TRUE;
-}
-
-
-/*
- * History list contains only pointers, so no data to free except the history structure.
- */
-static gboolean
-ET_Free_History_File_List (void)
-{
-    g_return_val_if_fail (ETCore != NULL && ETCore->ETHistoryFileList != NULL,
-                          FALSE);
-
-    ETCore->ETHistoryFileList = g_list_first (ETCore->ETHistoryFileList);
-
-    g_list_free_full (ETCore->ETHistoryFileList, g_free);
-
-    ETCore->ETHistoryFileList = NULL;
-
-    return TRUE;
-}
-
-/*
- * "Display" list contains only pointers, so NOTHING to free
- */
-static gboolean
-ET_Free_Displayed_File_List (void)
-{
-    g_return_val_if_fail (ETCore != NULL
-                          && ETCore->ETFileDisplayedList != NULL, FALSE);
-
-    ETCore->ETFileDisplayedList = NULL;
-
-    return TRUE;
-}
-
-
-/*
- * ArtistAlbum list contains 3 levels of lists
- */
-static gboolean
-ET_Free_Artist_Album_File_List (void)
-{
-    GList *l;
-
-    g_return_val_if_fail (ETCore != NULL
-                          && ETCore->ETArtistAlbumFileList != NULL, FALSE);
-
-    /* Pointers are stored inside the artist/album list-stores, so free them
-     * first. */
-    et_application_window_browser_clear_artist_model (ET_APPLICATION_WINDOW (MainWindow));
-    et_application_window_browser_clear_album_model (ET_APPLICATION_WINDOW (MainWindow));
-
-    for (l = ETCore->ETArtistAlbumFileList; l != NULL; l = g_list_next (l))
-    {
-        GList *m;
-
-        for (m = (GList *)l->data; m != NULL; m = g_list_next (m))
-        {
-            GList *n = (GList *)m->data;
-            if (n)
-                g_list_free (n);
-        }
-
-        if (l->data) /* Free AlbumList list. */
-            g_list_free ((GList *)l->data);
-    }
-
-    if (ETCore->ETArtistAlbumFileList)
-        g_list_free(ETCore->ETArtistAlbumFileList);
-
-    ETCore->ETArtistAlbumFileList = NULL;
-
-    return TRUE;
-}
-
-
-
-
-/*********************
- * Copying functions *
- *********************/
-
-/*
- * Duplicate the 'other' list
- */
-static void
-ET_Copy_File_Tag_Item_Other_Field (const ET_File *ETFile,
-                                   File_Tag *FileTag)
-{
-    const File_Tag *FileTagCur;
-    GList *l;
-
-    FileTagCur = (File_Tag *)(ETFile->FileTag)->data;
-
-    for (l = FileTagCur->other; l != NULL; l = g_list_next (l))
-    {
-        FileTag->other = g_list_prepend (FileTag->other,
-                                         g_strdup ((gchar *)l->data));
-    }
-
-    FileTag->other = g_list_reverse (FileTag->other);
-}
-
-
-/*
- * Copy data of the File_Tag structure (of ETFile) to the FileTag item.
- * Reallocate data if not null.
- */
-gboolean
-ET_Copy_File_Tag_Item (const ET_File *ETFile, File_Tag *FileTag)
-{
-    const File_Tag *FileTagCur;
-
-    g_return_val_if_fail (ETFile != NULL && ETFile->FileTag != NULL &&
-                          (File_Tag *)(ETFile->FileTag)->data != NULL, FALSE);
-    g_return_val_if_fail (FileTag != NULL, FALSE);
-
-    /* The data to duplicate to FileTag */
-    FileTagCur = (File_Tag *)(ETFile->FileTag)->data;
-    // Key for the item, may be overwritten
-    FileTag->key = ET_Undo_Key_New();
-
-    if (FileTagCur->title)
-    {
-        FileTag->title = g_strdup(FileTagCur->title);
-    }else
-    {
-        g_free(FileTag->title);
-        FileTag->title = NULL;
-    }
-
-    if (FileTagCur->artist)
-    {
-        FileTag->artist = g_strdup(FileTagCur->artist);
-    }else
-    {
-        g_free(FileTag->artist);
-        FileTag->artist = NULL;
-    }
-
-    if (FileTagCur->album_artist)
-    {
-        FileTag->album_artist = g_strdup(FileTagCur->album_artist);
-    }else
-    {
-        g_free(FileTag->album_artist);
-        FileTag->album_artist = NULL;
-    }
-
-    if (FileTagCur->album)
-    {
-        FileTag->album = g_strdup(FileTagCur->album);
-    }else
-    {
-        g_free(FileTag->album);
-        FileTag->album = NULL;
-    }
-
-    if (FileTagCur->disc_number)
-    {
-        FileTag->disc_number = g_strdup(FileTagCur->disc_number);
-    }else
-    {
-        g_free(FileTag->disc_number);
-        FileTag->disc_number = NULL;
-    }
-
-    if (FileTagCur->disc_total)
-    {
-        FileTag->disc_total = g_strdup (FileTagCur->disc_total);
-    }
-    else
-    {
-        g_free (FileTag->disc_total);
-        FileTag->disc_total = NULL;
-    }
-
-    if (FileTagCur->year)
-    {
-        FileTag->year = g_strdup(FileTagCur->year);
-    }else
-    {
-        g_free(FileTag->year);
-        FileTag->year = NULL;
-    }
-
-    if (FileTagCur->track)
-    {
-        FileTag->track = g_strdup(FileTagCur->track);
-    }else
-    {
-        g_free(FileTag->track);
-        FileTag->track = NULL;
-    }
-
-    if (FileTagCur->track_total)
-    {
-        FileTag->track_total = g_strdup(FileTagCur->track_total);
-    }else
-    {
-        g_free(FileTag->track_total);
-        FileTag->track_total = NULL;
-    }
-
-    if (FileTagCur->genre)
-    {
-        FileTag->genre = g_strdup(FileTagCur->genre);
-    }else
-    {
-        g_free(FileTag->genre);
-        FileTag->genre = NULL;
-    }
-
-    if (FileTagCur->comment)
-    {
-        FileTag->comment = g_strdup(FileTagCur->comment);
-    }else
-    {
-        g_free(FileTag->comment);
-        FileTag->comment = NULL;
-    }
-
-    if (FileTagCur->composer)
-    {
-        FileTag->composer = g_strdup(FileTagCur->composer);
-    }else
-    {
-        g_free(FileTag->composer);
-        FileTag->composer = NULL;
-    }
-
-    if (FileTagCur->orig_artist)
-    {
-        FileTag->orig_artist = g_strdup(FileTagCur->orig_artist);
-    }else
-    {
-        g_free(FileTag->orig_artist);
-        FileTag->orig_artist = NULL;
-    }
-
-    if (FileTagCur->copyright)
-    {
-        FileTag->copyright = g_strdup(FileTagCur->copyright);
-    }else
-    {
-        g_free(FileTag->copyright);
-        FileTag->copyright = NULL;
-    }
-
-    if (FileTagCur->url)
-    {
-        FileTag->url = g_strdup(FileTagCur->url);
-    }else
-    {
-        g_free(FileTag->url);
-        FileTag->url = NULL;
-    }
-
-    if (FileTagCur->encoded_by)
-    {
-        FileTag->encoded_by = g_strdup(FileTagCur->encoded_by);
-    }else
-    {
-        g_free(FileTag->encoded_by);
-        FileTag->encoded_by = NULL;
-    }
-
-    if (FileTagCur->picture)
-    {
-        if (FileTag->picture)
-            Picture_Free(FileTag->picture);
-        FileTag->picture = Picture_Copy(FileTagCur->picture);
-    }else if (FileTag->picture)
-    {
-        Picture_Free(FileTag->picture);
-        FileTag->picture = NULL;
-    }
-
-    if (FileTagCur->other)
-    {
-        ET_Copy_File_Tag_Item_Other_Field(ETFile,FileTag);
-    }else
-    {
-        ET_Free_File_Tag_Item_Other_Field (FileTag);
-    }
+    g_free(ETFileInfo->mpc_version);
 
+    g_slice_free (ET_File_Info, ETFileInfo);
     return TRUE;
 }
 
 
+/*********************
+ * Copying functions *
+ *********************/
+
 /*
  * Fill content of a FileName item according to the filename passed in argument (UTF-8 filename or not)
  * Calculate also the collate key.
@@ -2807,54 +1173,6 @@ ET_Set_Filename_File_Name_Item (File_Name *FileName,
     return TRUE;
 }
 
-
-/*
- * Set the value of a field of a FileTag item (for ex, value of FileTag->title)
- * Must be used only for the 'gchar *' components
- */
-gboolean ET_Set_Field_File_Tag_Item (gchar **FileTagField, const gchar *value)
-{
-    g_return_val_if_fail (FileTagField != NULL, FALSE);
-
-    if (*FileTagField != NULL)
-    {
-        g_free(*FileTagField);
-        *FileTagField = NULL;
-    }
-
-    if (value != NULL)
-    {
-        if (g_utf8_strlen(value, -1) > 0)
-            *FileTagField = g_strdup(value);
-        else
-            *FileTagField = NULL;
-    }
-
-    return TRUE;
-}
-
-
-/*
- * Set the value of a field of a FileTag Picture item.
- */
-gboolean
-ET_Set_Field_File_Tag_Picture (Picture **FileTagField, const Picture *pic)
-{
-    g_return_val_if_fail (FileTagField != NULL, FALSE);
-
-    if (*FileTagField != NULL)
-    {
-        Picture_Free((Picture *)*FileTagField);
-        *FileTagField = NULL;
-    }
-
-    if (pic)
-        *FileTagField = Picture_Copy(pic);
-
-    return TRUE;
-}
-
-
 /************************
  * Displaying functions *
  ************************/
@@ -3091,8 +1409,8 @@ void ET_Save_File_Data_From_UI (ET_File *ETFile)
     /*
      * Save filename and generate undo for filename
      */
-    FileName = g_malloc0(sizeof(File_Name));
-    ET_Initialize_File_Name_Item(FileName);
+    FileName = g_slice_new (File_Name);
+    ET_Initialize_File_Name_Item (FileName);
     FileName->key = undo_key;
     ET_Save_File_Name_From_UI(ETFile,FileName); // Used for all files!
 
@@ -3235,7 +1553,7 @@ ET_Save_File_Name_From_UI (const ET_File *ETFile, File_Name *FileName)
  * Do the same thing of ET_Save_File_Name_From_UI, but without getting the
  * data from the UI.
  */
-static gboolean
+gboolean
 ET_Save_File_Name_Internal (const ET_File *ETFile,
                             File_Name *FileName)
 {
@@ -3299,7 +1617,7 @@ ET_Save_File_Name_Internal (const ET_File *ETFile,
 /*
  * Do the same thing of et_tag_area_create_file_tag without getting the data from the UI.
  */
-static gboolean
+gboolean
 ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
 {
     File_Tag *FileTagCur;
@@ -3394,9 +1712,9 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
 
         FileTag->track = et_track_number_to_string (atoi (FileTagCur->track));
 
-        // This field must contain only digits
+        /* This field must contain only digits. */
         tmp_str = FileTag->track;
-        while (isdigit((guchar)*tmp_str)) tmp_str++;
+        while (g_ascii_isdigit (*tmp_str)) tmp_str++;
             *tmp_str = 0;
         g_strstrip (FileTag->track);
     } else
@@ -3494,16 +1812,7 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
 
 
     /* Picture */
-    if(FileTagCur->picture)
-    {
-        if (FileTag->picture)
-            Picture_Free(FileTag->picture);
-        FileTag->picture = Picture_Copy(FileTagCur->picture);
-    }else if (FileTag->picture)
-    {
-        Picture_Free(FileTag->picture);
-        FileTag->picture = NULL;
-    }
+    et_file_tag_set_picture (FileTag, FileTagCur->picture);
 
     return TRUE;
 }
@@ -3635,80 +1944,13 @@ ET_Save_File_Tag_To_HD (ET_File *ETFile, GError **error)
 }
 
 /*
- * Function used to update path of filenames into list after renaming a parent directory
- * (for ex: "/mp3/old_path/file.mp3" to "/mp3/new_path/file.mp3"
- */
-void
-ET_Update_Directory_Name_Into_File_List (const gchar *last_path,
-                                         const gchar *new_path)
-{
-    GList *filelist;
-    ET_File *file;
-    GList *filenamelist;
-    gchar *filename;
-    gchar *last_path_tmp;
-
-    if (!ETCore->ETFileList || !last_path || !new_path ||
-        strlen(last_path) < 1 || strlen(new_path) < 1 )
-        return;
-
-    // Add '/' to end of path to avoid ambiguity between a directory and a filename...
-    if (last_path[strlen(last_path)-1]==G_DIR_SEPARATOR)
-        last_path_tmp = g_strdup(last_path);
-    else
-        last_path_tmp = g_strconcat(last_path,G_DIR_SEPARATOR_S,NULL);
-
-    for (filelist = g_list_first (ETCore->ETFileList); filelist != NULL;
-         filelist = g_list_next (filelist))
-    {
-        if ((file = filelist->data))
-        {
-            for (filenamelist = file->FileNameList; filenamelist != NULL;
-                 filenamelist = g_list_next (filenamelist))
-            {
-                File_Name *FileName = (File_Name *)filenamelist->data;
-
-                if ( FileName && (filename=FileName->value) )
-                {
-                    // Replace path of filename
-                    if ( strncmp(filename,last_path_tmp,strlen(last_path_tmp))==0 )
-                    {
-                        gchar *filename_tmp;
-
-                        // Create the new filename
-                        filename_tmp = g_strconcat(new_path,
-                                                   (new_path[strlen(new_path)-1]==G_DIR_SEPARATOR) ? "" : G_DIR_SEPARATOR_S,
-                                                   &filename[strlen(last_path_tmp)],NULL);
-
-                        /* Replace the filename (in file system encoding). */
-                        g_free(FileName->value);
-                        FileName->value = filename_tmp;
-                        /* Replace the filename (in file system encoding). */
-                        g_free(FileName->value_utf8);
-                        FileName->value_utf8 = filename_to_display(FileName->value);
-                        // Recalculate the collate key
-                        g_free(FileName->value_ck);
-                        FileName->value_ck = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
-                    }
-                }
-             }
-        }
-    }
-
-    g_free(last_path_tmp);
-}
-
-
-
-/***********************
- * Undo/Redo functions *
- ***********************/
-
-/*
  * Check if 'FileName' and 'FileTag' differ with those of 'ETFile'.
  * Manage undo feature for the ETFile and the main undo list.
  */
-gboolean ET_Manage_Changes_Of_File_Data (ET_File *ETFile, File_Name *FileName, File_Tag *FileTag)
+gboolean
+ET_Manage_Changes_Of_File_Data (ET_File *ETFile,
+                                File_Name *FileName,
+                                File_Tag *FileTag)
 {
     gboolean undo_added = FALSE;
 
@@ -3754,7 +1996,6 @@ gboolean ET_Manage_Changes_Of_File_Data (ET_File *ETFile, File_Name *FileName, F
     return undo_added;
 }
 
-
 /*
  * Compares two File_Name items :
  *  - returns TRUE if there aren't the same
@@ -3793,155 +2034,6 @@ ET_Detect_Changes_Of_File_Name (const File_Name *FileName1,
 }
 
 /*
- * Compares two File_Tag items and returns TRUE if there aren't the same.
- * Notes:
- *  - if field is '' or NULL => will be removed
- */
-gboolean
-ET_Detect_Changes_Of_File_Tag (const File_Tag *FileTag1,
-                               const File_Tag *FileTag2)
-{
-    const Picture *pic1;
-    const Picture *pic2;
-
-    g_return_val_if_fail (FileTag1 != NULL && FileTag2 != NULL, FALSE);
-
-    if ( ( FileTag1 && !FileTag2)
-      || (!FileTag1 &&  FileTag2) )
-        return TRUE;
-
-    /* Title */
-    if ( FileTag1->title && !FileTag2->title && g_utf8_strlen(FileTag1->title, -1)>0 ) return TRUE;
-    if (!FileTag1->title &&  FileTag2->title && g_utf8_strlen(FileTag2->title, -1)>0 ) return TRUE;
-    if ( FileTag1->title &&  FileTag2->title && g_utf8_collate(FileTag1->title,FileTag2->title)!=0 ) return TRUE;
-
-    /* Artist */
-    if ( FileTag1->artist && !FileTag2->artist && g_utf8_strlen(FileTag1->artist, -1)>0 ) return TRUE;
-    if (!FileTag1->artist &&  FileTag2->artist && g_utf8_strlen(FileTag2->artist, -1)>0 ) return TRUE;
-    if ( FileTag1->artist &&  FileTag2->artist && g_utf8_collate(FileTag1->artist,FileTag2->artist)!=0 ) return TRUE;
-
-	/* Album Artist */
-    if ( FileTag1->album_artist && !FileTag2->album_artist && g_utf8_strlen(FileTag1->album_artist, -1)>0 ) return TRUE;
-    if (!FileTag1->album_artist &&  FileTag2->album_artist && g_utf8_strlen(FileTag2->album_artist, -1)>0 ) return TRUE;
-    if ( FileTag1->album_artist &&  FileTag2->album_artist && g_utf8_collate(FileTag1->album_artist,FileTag2->album_artist)!=0 ) return TRUE;
-
-    /* Album */
-    if ( FileTag1->album && !FileTag2->album && g_utf8_strlen(FileTag1->album, -1)>0 ) return TRUE;
-    if (!FileTag1->album &&  FileTag2->album && g_utf8_strlen(FileTag2->album, -1)>0 ) return TRUE;
-    if ( FileTag1->album &&  FileTag2->album && g_utf8_collate(FileTag1->album,FileTag2->album)!=0 ) return TRUE;
-
-    /* Disc Number */
-    if ( FileTag1->disc_number && !FileTag2->disc_number && g_utf8_strlen(FileTag1->disc_number, -1)>0 ) return TRUE;
-    if (!FileTag1->disc_number &&  FileTag2->disc_number && g_utf8_strlen(FileTag2->disc_number, -1)>0 ) return TRUE;
-    if ( FileTag1->disc_number &&  FileTag2->disc_number && g_utf8_collate(FileTag1->disc_number,FileTag2->disc_number)!=0 ) return TRUE;
-
-    /* Discs Total */
-    if (FileTag1->disc_total && !FileTag2->disc_total
-        && g_utf8_strlen (FileTag1->disc_total, -1) > 0)
-    {
-        return TRUE;
-    }
-
-    if (!FileTag1->disc_total &&  FileTag2->disc_total
-        && g_utf8_strlen (FileTag2->disc_total, -1) > 0)
-    {
-        return TRUE;
-    }
-
-    if (FileTag1->disc_total &&  FileTag2->disc_total
-        && g_utf8_collate (FileTag1->disc_total, FileTag2->disc_total) != 0)
-    {
-        return TRUE;
-    }
-
-    /* Year */
-    if ( FileTag1->year && !FileTag2->year && g_utf8_strlen(FileTag1->year, -1)>0 ) return TRUE;
-    if (!FileTag1->year &&  FileTag2->year && g_utf8_strlen(FileTag2->year, -1)>0 ) return TRUE;
-    if ( FileTag1->year &&  FileTag2->year && g_utf8_collate(FileTag1->year,FileTag2->year)!=0 ) return TRUE;
-
-    /* Track */
-    if ( FileTag1->track && !FileTag2->track && g_utf8_strlen(FileTag1->track, -1)>0 ) return TRUE;
-    if (!FileTag1->track &&  FileTag2->track && g_utf8_strlen(FileTag2->track, -1)>0 ) return TRUE;
-    if ( FileTag1->track &&  FileTag2->track && g_utf8_collate(FileTag1->track,FileTag2->track)!=0 ) return TRUE;
-
-    /* Track Total */
-    if ( FileTag1->track_total && !FileTag2->track_total && g_utf8_strlen(FileTag1->track_total, -1)>0 ) return TRUE;
-    if (!FileTag1->track_total &&  FileTag2->track_total && g_utf8_strlen(FileTag2->track_total, -1)>0 ) return TRUE;
-    if ( FileTag1->track_total &&  FileTag2->track_total && g_utf8_collate(FileTag1->track_total,FileTag2->track_total)!=0 ) return TRUE;
-
-    /* Genre */
-    if ( FileTag1->genre && !FileTag2->genre && g_utf8_strlen(FileTag1->genre, -1)>0 ) return TRUE;
-    if (!FileTag1->genre &&  FileTag2->genre && g_utf8_strlen(FileTag2->genre, -1)>0 ) return TRUE;
-    if ( FileTag1->genre &&  FileTag2->genre && g_utf8_collate(FileTag1->genre,FileTag2->genre)!=0 ) return TRUE;
-
-    /* Comment */
-    if ( FileTag1->comment && !FileTag2->comment && g_utf8_strlen(FileTag1->comment, -1)>0 ) return TRUE;
-    if (!FileTag1->comment &&  FileTag2->comment && g_utf8_strlen(FileTag2->comment, -1)>0 ) return TRUE;
-    if ( FileTag1->comment &&  FileTag2->comment && g_utf8_collate(FileTag1->comment,FileTag2->comment)!=0 ) return TRUE;
-
-    /* Composer */
-    if ( FileTag1->composer && !FileTag2->composer && g_utf8_strlen(FileTag1->composer, -1)>0 ) return TRUE;
-    if (!FileTag1->composer &&  FileTag2->composer && g_utf8_strlen(FileTag2->composer, -1)>0 ) return TRUE;
-    if ( FileTag1->composer &&  FileTag2->composer && g_utf8_collate(FileTag1->composer,FileTag2->composer)!=0 ) return TRUE;
-
-    /* Original artist */
-    if ( FileTag1->orig_artist && !FileTag2->orig_artist && g_utf8_strlen(FileTag1->orig_artist, -1)>0 ) return TRUE;
-    if (!FileTag1->orig_artist &&  FileTag2->orig_artist && g_utf8_strlen(FileTag2->orig_artist, -1)>0 ) return TRUE;
-    if ( FileTag1->orig_artist &&  FileTag2->orig_artist && g_utf8_collate(FileTag1->orig_artist,FileTag2->orig_artist)!=0 ) return TRUE;
-
-    /* Copyright */
-    if ( FileTag1->copyright && !FileTag2->copyright && g_utf8_strlen(FileTag1->copyright, -1)>0 ) return TRUE;
-    if (!FileTag1->copyright &&  FileTag2->copyright && g_utf8_strlen(FileTag2->copyright, -1)>0 ) return TRUE;
-    if ( FileTag1->copyright &&  FileTag2->copyright && g_utf8_collate(FileTag1->copyright,FileTag2->copyright)!=0 ) return TRUE;
-
-    /* URL */
-    if ( FileTag1->url && !FileTag2->url && g_utf8_strlen(FileTag1->url, -1)>0 ) return TRUE;
-    if (!FileTag1->url &&  FileTag2->url && g_utf8_strlen(FileTag2->url, -1)>0 ) return TRUE;
-    if ( FileTag1->url &&  FileTag2->url && g_utf8_collate(FileTag1->url,FileTag2->url)!=0 ) return TRUE;
-
-    /* Encoded by */
-    if ( FileTag1->encoded_by && !FileTag2->encoded_by && g_utf8_strlen(FileTag1->encoded_by, -1)>0 ) return TRUE;
-    if (!FileTag1->encoded_by &&  FileTag2->encoded_by && g_utf8_strlen(FileTag2->encoded_by, -1)>0 ) return TRUE;
-    if ( FileTag1->encoded_by &&  FileTag2->encoded_by && g_utf8_collate(FileTag1->encoded_by,FileTag2->encoded_by)!=0 ) return TRUE;
-
-    /* Picture */
-    for (pic1 = FileTag1->picture, pic2 = FileTag2->picture; ;
-         pic1 = pic1->next, pic2 = pic2->next)
-    {
-        if( (pic1 && !pic2) || (!pic1 && pic2) )
-            return TRUE;
-        if (!pic1 || !pic2)
-            break; // => no changes
-        //if (!pic1->data || !pic2->data)
-        //    break; // => no changes
-
-        if (!pic1->data && !pic2->data)
-            return FALSE;
-        if (pic1->data && !pic2->data)
-            return TRUE;
-        if (!pic1->data && pic2->data)
-            return TRUE;
-        if (pic1->size != pic2->size
-        ||  memcmp(pic1->data, pic2->data, pic1->size))
-            return TRUE;
-        if (pic1->type != pic2->type)
-            return TRUE;
-        if (pic1->description && !pic2->description
-        &&  g_utf8_strlen(pic1->description, -1)>0 )
-            return TRUE;
-        if (!pic1->description && pic2->description
-        &&  g_utf8_strlen(pic2->description, -1)>0 )
-            return TRUE;
-        if (pic1->description && pic2->description
-        &&  g_utf8_collate(pic1->description, pic2->description)!=0 )
-            return TRUE;
-    }
-
-    return FALSE; /* No changes */
-}
-
-
-/*
  * Add a FileName item to the history list of ETFile
  */
 static gboolean
@@ -4002,31 +2094,6 @@ ET_Add_File_Tag_To_List (ET_File *ETFile, File_Tag *FileTag)
 }
 
 /*
- * Add a ETFile item to the main undo list of files
- */
-static gboolean
-ET_Add_File_To_History_List (ET_File *ETFile)
-{
-    ET_History_File *ETHistoryFile;
-
-    g_return_val_if_fail (ETFile != NULL, FALSE);
-
-    ETHistoryFile = g_malloc0(sizeof(ET_History_File));
-    ETHistoryFile->ETFile = ETFile;
-
-    /* The undo list must contains one item before the 'first undo' data */
-    if (!ETCore->ETHistoryFileList)
-        ETCore->ETHistoryFileList = g_list_append(ETCore->ETHistoryFileList,g_malloc0(sizeof(ET_History_File)));
-
-    /* Add the item to the list (cut end of list from the current element) */
-    ETCore->ETHistoryFileList = g_list_append(ETCore->ETHistoryFileList,ETHistoryFile);
-    ETCore->ETHistoryFileList = g_list_last(ETCore->ETHistoryFileList);
-
-    return TRUE;
-}
-
-
-/*
  * Applies one undo to the ETFile data (to reload the previous data).
  * Returns TRUE if an undo had been applied.
  */
@@ -4148,82 +2215,6 @@ ET_File_Data_Has_Redo_Data (const ET_File *ETFile)
     return has_filename_redo_data | has_filetag_redo_data;
 }
 
-
-/*
- * Execute one 'undo' in the main undo list (it selects the last ETFile changed,
- * before to apply an undo action)
- */
-ET_File *ET_Undo_History_File_Data (void)
-{
-    ET_File *ETFile;
-    const ET_History_File *ETHistoryFile;
-
-    g_return_val_if_fail (ETCore->ETHistoryFileList != NULL ||
-                          ET_History_File_List_Has_Undo_Data (), NULL);
-
-    ETHistoryFile = (ET_History_File *)ETCore->ETHistoryFileList->data;
-    ETFile        = (ET_File *)ETHistoryFile->ETFile;
-    ET_Displayed_File_List_By_Etfile(ETFile);
-    ET_Undo_File_Data(ETFile);
-
-    if (ETCore->ETHistoryFileList->prev)
-        ETCore->ETHistoryFileList = ETCore->ETHistoryFileList->prev;
-    return ETFile;
-}
-
-
-/*
- * Returns TRUE if undo file list contains undo data
- */
-gboolean ET_History_File_List_Has_Undo_Data (void)
-{
-    if (ETCore->ETHistoryFileList && ETCore->ETHistoryFileList->prev)
-        return TRUE;
-    else
-        return FALSE;
-}
-
-
-/*
- * Execute one 'redo' in the main undo list
- */
-ET_File *ET_Redo_History_File_Data (void)
-{
-    ET_File *ETFile;
-    ET_History_File *ETHistoryFile;
-
-    if (!ETCore->ETHistoryFileList || !ET_History_File_List_Has_Redo_Data()) return NULL;
-
-    ETHistoryFile = (ET_History_File *)ETCore->ETHistoryFileList->next->data;
-    ETFile        = (ET_File *)ETHistoryFile->ETFile;
-    ET_Displayed_File_List_By_Etfile(ETFile);
-    ET_Redo_File_Data(ETFile);
-
-    if (ETCore->ETHistoryFileList->next)
-        ETCore->ETHistoryFileList = ETCore->ETHistoryFileList->next;
-    return ETFile;
-}
-
-
-/*
- * Returns TRUE if undo file list contains redo data
- */
-gboolean ET_History_File_List_Has_Redo_Data (void)
-{
-    if (ETCore->ETHistoryFileList && ETCore->ETHistoryFileList->next)
-        return TRUE;
-    else
-        return FALSE;
-}
-
-
-
-
-/**********************
- * Checking functions *
- **********************/
-
-
 /*
  * Ckecks if the current files had been changed but not saved.
  * Returns TRUE if the file has been saved.
@@ -4254,35 +2245,6 @@ ET_Check_If_File_Is_Saved (const ET_File *ETFile)
     return TRUE;
 }
 
-
-/*
- * Ckecks if some files, in the list, had been changed but not saved.
- * Returns TRUE if all files have been saved.
- * Returns FALSE if some changes haven't been saved.
- */
-gboolean ET_Check_If_All_Files_Are_Saved (void)
-{
-    /* Check if some files haven't been saved, if didn't nochange=0 */
-    if (!ETCore->ETFileList)
-    {
-        return TRUE;
-    }else
-    {
-        GList *l;
-
-        for (l = g_list_first (ETCore->ETFileList); l != NULL;
-             l = g_list_next (l))
-        {
-            if (ET_Check_If_File_Is_Saved ((ET_File *)l->data) == FALSE)
-                return FALSE;
-        }
-        return TRUE;
-    }
-}
-
-
-
-
 /*******************
  * Extra functions *
  *******************/
@@ -4321,50 +2283,6 @@ void ET_Mark_File_Name_As_Saved (ET_File *ETFile)
     FileNameNew->saved = TRUE;
 }
 
-
-/*
- * et_core_read_file_info:
- * @file: a file from which to read information
- * @ETFileInfo: (out caller-allocates): a file information structure
- * @error: a #GError to provide information on erros, or %NULL to ignore
- *
- * Fille @ETFileInfo with information about the file. Currently, this only
- * fills the file size.
- *
- * Returns: %TRUE on success, %FALSE otherwise
- */
-static gboolean
-et_core_read_file_info (GFile *file,
-                        ET_File_Info *ETFileInfo,
-                        GError **error)
-{
-    GFileInfo *info;
-
-    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-    g_return_val_if_fail (file != NULL && ETFileInfo != NULL, FALSE);
-
-    info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SIZE,
-                              G_FILE_QUERY_INFO_NONE, NULL, error);
-
-    if (!info)
-    {
-        g_assert (error == NULL || *error != NULL);
-        return FALSE;
-    }
-
-    ETFileInfo->version    = 0;
-    ETFileInfo->bitrate    = 0;
-    ETFileInfo->samplerate = 0;
-    ETFileInfo->mode       = 0;
-    ETFileInfo->size = g_file_info_get_size (info);
-    ETFileInfo->duration   = 0;
-
-    g_assert (error == NULL || *error == NULL);
-    g_object_unref (info);
-
-    return TRUE;
-}
-
 /*
  * This function generates a new filename using path of the old file and the
  * new name.
@@ -4535,80 +2453,3 @@ gboolean ET_File_Name_Convert_Character (gchar *filename_utf8)
     }
     return TRUE;
 }
-
-
-/*
- * Returns the number of file in the directory of the selected file.
- * Parameter "path" should be in UTF-8
- */
-guint
-ET_Get_Number_Of_Files_In_Directory (const gchar *path_utf8)
-{
-    GList *l;
-    guint  count = 0;
-
-    g_return_val_if_fail (path_utf8 != NULL, count);
-
-    for (l = g_list_first (ETCore->ETFileList); l != NULL; l = g_list_next (l))
-    {
-        ET_File *ETFile = (ET_File *)l->data;
-        gchar *cur_filename_utf8 = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value_utf8;
-        gchar *dirname_utf8      = g_path_get_dirname(cur_filename_utf8);
-
-        if (g_utf8_collate(dirname_utf8, path_utf8) == 0)
-            count++;
-
-        g_free(dirname_utf8 );
-    }
-
-    return count;
-}
-
-/*
- * Set appropriate sort order for the given column_id
- */
-static void
-set_sort_order_for_column_id (gint column_id, GtkTreeViewColumn *column,
-                              EtSortMode sort_type)
-{
-    EtApplicationWindow *window;
-    EtSortMode current_mode;
-
-    window = ET_APPLICATION_WINDOW (MainWindow);
-
-    /* Removing the sort indicator for the currently selected treeview
-     * column. */
-    current_mode = g_settings_get_enum (MainSettings, "sort-mode");
-
-    if (current_mode < ET_SORT_MODE_ASCENDING_CREATION_DATE)
-    {
-        gtk_tree_view_column_set_sort_indicator (et_application_window_browser_get_column_for_column_id (window, current_mode / 2),
-                                                 FALSE);
-    }
-
-    if (sort_type < ET_SORT_MODE_ASCENDING_CREATION_DATE)
-    {
-        gtk_tree_view_column_clicked (et_application_window_browser_get_column_for_column_id (window, column_id));
-
-        if (sort_type % 2 == 0)
-        {
-            /* GTK_SORT_ASCENDING */
-            if (et_application_window_browser_get_sort_order_for_column_id (window, column_id)
-                == GTK_SORT_DESCENDING)
-            {
-                gtk_tree_view_column_set_sort_order (column,
-                                                     GTK_SORT_ASCENDING);
-            }
-        }
-        else
-        {
-            /* GTK_SORT_DESCENDING */
-            if (et_application_window_browser_get_sort_order_for_column_id (window, column_id)
-                == GTK_SORT_ASCENDING)
-            {
-                gtk_tree_view_column_set_sort_order (column,
-                                                     GTK_SORT_DESCENDING);
-            }
-        }
-    }
-}
diff --git a/src/file.h b/src/file.h
new file mode 100644
index 0000000..10129dc
--- /dev/null
+++ b/src/file.h
@@ -0,0 +1,154 @@
+/* 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 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_FILE_H_
+#define ET_FILE_H_
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+#include "core_types.h"
+#include "file_description.h"
+#include "file_tag.h"
+
+/*
+ * Description of each item of the FileNameList list
+ */
+typedef struct
+{
+    guint key;
+    gboolean saved;        /* Set to TRUE if this filename had been saved */
+    gchar *value;          /* The filename containing the full path and the extension of the file */
+    gchar *value_utf8;     /* Same than "value", but converted to UTF-8 to avoid multiple call to the convertion function */
+    gchar *value_ck;       /* Collate key of "value_utf8" to speed up comparaison */
+} File_Name;
+
+/*
+ * Description of each item of the ETFileList list
+ */
+typedef struct
+{
+    guint IndexKey;           /* Value used to display the position in the list (and in the BrowserList) - Must be renumered after resorting the list - This value varies when resorting list */
+
+    guint ETFileKey;          /* Primary key to identify each item of the list (no longer used?) */
+
+    time_t FileModificationTime;            /* Save modification time of the file */
+
+    const ET_File_Description *ETFileDescription;
+    gchar               *ETFileExtension;   /* Real extension of the file (keeping the case) (should be placed in ETFileDescription?) */
+    ET_File_Info        *ETFileInfo;        /* Header infos: bitrate, duration, ... */
+
+    GList *FileNameCur;       /* Points to item of FileNameList that represents the current value of filename state (i.e. file on hard disk) */
+    GList *FileNameNew;       /* Points to item of FileNameList that represents the new value of filename state */
+    GList *FileNameList; /* Contains the history of changes about the filename. */
+    GList *FileNameListBak;   /* Contains items of FileNameList removed by 'undo' procedure but have data currently saved (for example, when you save your last changes, make some 'undo', then make new changes) */
+
+    GList *FileTag;           /* Points to the current item used of FileTagList */
+    GList *FileTagList;       /* Contains the history of changes about file tag data */
+    GList *FileTagListBak;    /* Contains items of FileTagList removed by 'undo' procedure but have data currently saved */
+} ET_File;
+
+/*
+ * Description of each item of the ETHistoryFileList list
+ */
+typedef struct
+{
+    ET_File *ETFile;           /* Pointer to item of ETFileList changed */
+} ET_History_File;
+
+gboolean ET_Check_If_File_Is_Saved (const ET_File *ETFile);
+
+ET_File * ET_File_Item_New (void);
+ET_File_Info * ET_File_Info_Item_New (void);
+File_Name * ET_File_Name_Item_New (void);
+void ET_Free_File_List_Item (ET_File *ETFile);
+
+gboolean ET_Set_Filename_File_Name_Item (File_Name *FileName, const gchar *filename_utf8, const gchar *filename);
+
+/* FIXME: Move to file_tag.h. */
+gboolean ET_Copy_File_Tag_Item (const ET_File *ETFile, File_Tag *FileTag);
+void ET_Copy_File_Tag_Item_Other_Field (const ET_File *ETFile, File_Tag *FileTag);
+
+void ET_Display_File_Data_To_UI (ET_File *ETFile);
+void ET_Save_File_Data_From_UI (ET_File *ETFile);
+gboolean ET_Save_File_Name_Internal (const ET_File *ETFile, File_Name *FileName);
+gboolean ET_Save_File_Tag_To_HD (ET_File *ETFile, GError **error);
+gboolean ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag);
+
+guint ET_Undo_Key_New (void);
+
+gboolean ET_Undo_File_Data (ET_File *ETFile);
+gboolean ET_Redo_File_Data (ET_File *ETFile);
+gboolean ET_File_Data_Has_Undo_Data (const ET_File *ETFile);
+gboolean ET_File_Data_Has_Redo_Data (const ET_File *ETFile);
+
+gboolean ET_Manage_Changes_Of_File_Data (ET_File *ETFile, File_Name *FileName, File_Tag *FileTag);
+void ET_Mark_File_Name_As_Saved (ET_File *ETFile);
+gboolean ET_File_Name_Convert_Character (gchar *filename_utf8);
+gchar *ET_File_Name_Generate (const ET_File *ETFile, const gchar *new_file_name);
+
+gint ET_Comp_Func_Sort_File_By_Ascending_Filename (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_Filename (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_Creation_Date (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_Creation_Date (const ET_File *ETFile1, const ET_File *ETFile2);
+gint et_comp_func_sort_file_by_ascending_disc_number (const ET_File *ETFile1,
+                                                      const ET_File *ETFile2);
+gint et_comp_func_sort_file_by_descending_disc_number (const ET_File *ETFile1,
+                                                       const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_Track_Number (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_Track_Number (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_Title (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_Title (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_Artist (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_Artist (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_Album_Artist (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_Album_Artist (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_Album (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_Album (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_Year (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_Year (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_Genre (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_Genre (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_Comment (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_Comment (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_Composer (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_Composer (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_Orig_Artist (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_Orig_Artist (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_Copyright (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_Copyright (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_Url (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_Url (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_Encoded_By (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_Encoded_By (const ET_File *ETFile1, const ET_File *ETFile2);
+
+gint ET_Comp_Func_Sort_File_By_Ascending_File_Type (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_File_Type (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_File_Size (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_File_Size (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_File_Duration (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_File_Duration (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_File_Bitrate (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_File_Bitrate (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Ascending_File_Samplerate (const ET_File *ETFile1, const ET_File *ETFile2);
+gint ET_Comp_Func_Sort_File_By_Descending_File_Samplerate (const ET_File *ETFile1, const ET_File *ETFile2);
+
+G_END_DECLS
+
+#endif /* !ET_FILE_H_ */
diff --git a/src/file_area.c b/src/file_area.c
index 67c2ba4..dddc311 100644
--- a/src/file_area.c
+++ b/src/file_area.c
@@ -25,6 +25,7 @@
 #include "charset.h"
 #include "et_core.h"
 #include "log.h"
+#include "setting.h"
 #include "tag_area.h"
 
 /* TODO: Use G_DEFINE_TYPE_WITH_PRIVATE. */
@@ -242,7 +243,7 @@ et_file_area_set_file_fields (EtFileArea *self,
     EtFileAreaPrivate *priv;
     GFile *file;
     gchar *text;
-    gchar *cur_filename;
+    const gchar *cur_filename;
     gchar *basename_utf8;
     gchar *pos;
     GFileInfo *info;
diff --git a/src/file_description.c b/src/file_description.c
new file mode 100644
index 0000000..9a2b684
--- /dev/null
+++ b/src/file_description.c
@@ -0,0 +1,125 @@
+/* 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 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 "file_description.h"
+
+#include <string.h>
+
+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. */
+    { MP4_FILE, ".m4v", MP4_TAG},
+#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;
+
+/*
+ * Returns the extension of the file
+ */
+const gchar *
+ET_Get_File_Extension (const gchar *filename)
+{
+    if (filename)
+    {
+        return strrchr (filename, '.');
+    }
+    else
+    {
+        return NULL;
+    }
+}
+
+
+/*
+ * Determine description of file using his extension.
+ * If extension is NULL or not found into the tab, it returns the last entry for UNKNOWN_FILE.
+ */
+static const ET_File_Description *
+ET_Get_File_Description_From_Extension (const gchar *extension)
+{
+    guint i;
+
+    if (!extension) // Unknown file
+        return &ETFileDescription[ET_FILE_DESCRIPTION_SIZE];
+
+    for (i=0; i<ET_FILE_DESCRIPTION_SIZE; i++)  // Use of '<' instead of '<=' to avoid to test for Unknown file
+        if ( strcasecmp(extension,ETFileDescription[i].Extension)==0 )
+            return &ETFileDescription[i];
+
+    // If not found in the list
+    return &ETFileDescription[ET_FILE_DESCRIPTION_SIZE];
+}
+
+
+/*
+ * Determines description of file.
+ * Determines first the extension. If extension is NULL or not found into the tab,
+ * it returns the last entry for UNKNOWN_FILE.
+ */
+const ET_File_Description *
+ET_Get_File_Description (const gchar *filename)
+{
+    return ET_Get_File_Description_From_Extension(ET_Get_File_Extension(filename));
+}
+
+
+/*
+ * Returns TRUE if the file is supported, else returns FALSE
+ */
+gboolean
+et_file_is_supported (const gchar *filename)
+{
+    if (ET_Get_File_Description(filename)->FileType != UNKNOWN_FILE)
+        return TRUE;
+    else
+        return FALSE;
+}
diff --git a/src/file_description.h b/src/file_description.h
new file mode 100644
index 0000000..cac2c88
--- /dev/null
+++ b/src/file_description.h
@@ -0,0 +1,52 @@
+/* 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 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_FILE_DESCRIPTION_H_
+#define ET_FILE_DESCRIPTION_H_
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+#include "core_types.h"
+
+/*
+ * Structure for descripting supported files
+ */
+typedef struct
+{
+    ET_File_Type FileType;    /* Type of file (ex: MP3) */
+    const gchar *Extension; /* Extension (ex: ".mp3") */
+    ET_Tag_Type  TagType;     /* Type of tag (ex: ID3) */
+} ET_File_Description;
+
+/*
+ * Description of supported files
+ */
+extern const ET_File_Description ETFileDescription[];
+
+/* Calculate the last index of the previous tab */
+extern const gsize ET_FILE_DESCRIPTION_SIZE;
+
+const gchar * ET_Get_File_Extension (const gchar *filename);
+const ET_File_Description * ET_Get_File_Description (const gchar *filename);
+gboolean et_file_is_supported (const gchar *filename);
+
+G_END_DECLS
+
+#endif /* !ET_FILE_DESCRIPTION_H_ */
diff --git a/src/file_list.c b/src/file_list.c
new file mode 100644
index 0000000..c4d79d8
--- /dev/null
+++ b/src/file_list.c
@@ -0,0 +1,1445 @@
+/* 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 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 "file_list.h"
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <utime.h>
+
+#include "application_window.h"
+#include "charset.h"
+#include "easytag.h"
+#include "log.h"
+#include "mpeg_header.h"
+#include "monkeyaudio_header.h"
+#include "musepack_header.h"
+#include "picture.h"
+#include "ape_tag.h"
+#ifdef ENABLE_MP3
+#include "id3_tag.h"
+#endif
+#ifdef ENABLE_OGG
+#include "ogg_header.h"
+#include "ogg_tag.h"
+#endif
+#ifdef ENABLE_FLAC
+#include "flac_header.h"
+#include "flac_tag.h"
+#endif
+#ifdef ENABLE_MP4
+#include "mp4_header.h"
+#include "mp4_tag.h"
+#endif
+#ifdef ENABLE_WAVPACK
+#include "wavpack_header.h"
+#include "wavpack_tag.h"
+#endif
+#ifdef ENABLE_OPUS
+#include "opus_header.h"
+#include "opus_tag.h"
+#endif
+
+/*
+ * Frees the full main list of files: GList *ETFileList and reinitialize it.
+ */
+gboolean
+ET_Free_File_List (void)
+{
+    g_return_val_if_fail (ETCore != NULL && ETCore->ETFileList != NULL, FALSE);
+
+    g_list_free_full (ETCore->ETFileList,
+                      (GDestroyNotify)ET_Free_File_List_Item);
+    ETCore->ETFileList = NULL;
+
+    return TRUE;
+}
+
+static void
+et_history_file_free (ET_History_File *file)
+{
+    g_slice_free (ET_History_File, file);
+}
+
+/*
+ * History list contains only pointers, so no data to free except the history structure.
+ */
+gboolean
+ET_Free_History_File_List (void)
+{
+    g_return_val_if_fail (ETCore != NULL && ETCore->ETHistoryFileList != NULL,
+                          FALSE);
+
+    ETCore->ETHistoryFileList = g_list_first (ETCore->ETHistoryFileList);
+
+    g_list_free_full (ETCore->ETHistoryFileList,
+                      (GDestroyNotify)et_history_file_free);
+
+    ETCore->ETHistoryFileList = NULL;
+
+    return TRUE;
+}
+
+/*
+ * "Display" list contains only pointers, so NOTHING to free
+ */
+gboolean
+ET_Free_Displayed_File_List (void)
+{
+    g_return_val_if_fail (ETCore != NULL
+                          && ETCore->ETFileDisplayedList != NULL, FALSE);
+
+    ETCore->ETFileDisplayedList = NULL;
+
+    return TRUE;
+}
+
+/*
+ * ArtistAlbum list contains 3 levels of lists
+ */
+gboolean
+ET_Free_Artist_Album_File_List (void)
+{
+    GList *l;
+
+    g_return_val_if_fail (ETCore != NULL
+                          && ETCore->ETArtistAlbumFileList != NULL, FALSE);
+
+    /* Pointers are stored inside the artist/album list-stores, so free them
+     * first. */
+    et_application_window_browser_clear_artist_model (ET_APPLICATION_WINDOW (MainWindow));
+    et_application_window_browser_clear_album_model (ET_APPLICATION_WINDOW (MainWindow));
+
+    for (l = ETCore->ETArtistAlbumFileList; l != NULL; l = g_list_next (l))
+    {
+        GList *m;
+
+        for (m = (GList *)l->data; m != NULL; m = g_list_next (m))
+        {
+            GList *n = (GList *)m->data;
+            if (n)
+                g_list_free (n);
+        }
+
+        if (l->data) /* Free AlbumList list. */
+            g_list_free ((GList *)l->data);
+    }
+
+    if (ETCore->ETArtistAlbumFileList)
+        g_list_free(ETCore->ETArtistAlbumFileList);
+
+    ETCore->ETArtistAlbumFileList = NULL;
+
+    return TRUE;
+}
+
+/* Key for each item of ETFileList */
+static guint
+ET_File_Key_New (void)
+{
+    static guint ETFileKey = 0;
+    return ++ETFileKey;
+}
+
+/*
+ * et_core_read_file_info:
+ * @file: a file from which to read information
+ * @ETFileInfo: (out caller-allocates): a file information structure
+ * @error: a #GError to provide information on erros, or %NULL to ignore
+ *
+ * Fille @ETFileInfo with information about the file. Currently, this only
+ * fills the file size.
+ *
+ * Returns: %TRUE on success, %FALSE otherwise
+ */
+static gboolean
+et_core_read_file_info (GFile *file,
+                        ET_File_Info *ETFileInfo,
+                        GError **error)
+{
+    GFileInfo *info;
+
+    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+    g_return_val_if_fail (file != NULL && ETFileInfo != NULL, FALSE);
+
+    info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SIZE,
+                              G_FILE_QUERY_INFO_NONE, NULL, error);
+
+    if (!info)
+    {
+        g_assert (error == NULL || *error != NULL);
+        return FALSE;
+    }
+
+    ETFileInfo->version    = 0;
+    ETFileInfo->bitrate    = 0;
+    ETFileInfo->samplerate = 0;
+    ETFileInfo->mode       = 0;
+    ETFileInfo->size = g_file_info_get_size (info);
+    ETFileInfo->duration   = 0;
+
+    g_assert (error == NULL || *error == NULL);
+    g_object_unref (info);
+
+    return TRUE;
+}
+
+/*
+ * ET_Add_File_To_File_List: Add a file to the "main" list. And get all information of the file.
+ * The filename passed in should be in raw format, only convert it to UTF8 when displaying it.
+ */
+GList *
+ET_Add_File_To_File_List (gchar *filename)
+{
+    const ET_File_Description *ETFileDescription;
+    ET_File      *ETFile;
+    File_Name    *FileName;
+    File_Tag     *FileTag;
+    ET_File_Info *ETFileInfo;
+    gchar        *ETFileExtension;
+    guint         ETFileKey;
+    guint         undo_key;
+    GFile *file;
+    GFileInfo *fileinfo;
+    gchar        *filename_utf8 = filename_to_display(filename);
+    const gchar  *locale_lc_ctype = getenv("LC_CTYPE");
+    GError *error = NULL;
+    gboolean success;
+
+    if (!filename)
+        return ETCore->ETFileList;
+
+    file = g_file_new_for_path (filename);
+
+    /* Primary Key for this file */
+    ETFileKey = ET_File_Key_New();
+
+    /* Get description of the file */
+    ETFileDescription = ET_Get_File_Description(filename);
+
+    /* Get real extension of the file (keeping the case) */
+    ETFileExtension = g_strdup(ET_Get_File_Extension(filename));
+
+    /* Fill the File_Name structure for FileNameList */
+    FileName = ET_File_Name_Item_New();
+    FileName->saved      = TRUE;    /* The file hasn't been changed, so it's saved */
+    FileName->value      = filename;
+    FileName->value_utf8 = filename_utf8;
+    FileName->value_ck   = g_utf8_collate_key_for_filename(filename_utf8, -1);
+
+    /* Fill the File_Tag structure for FileTagList */
+    FileTag = ET_File_Tag_Item_New();
+    FileTag->saved = TRUE;    /* The file hasn't been changed, so it's saved */
+
+    /* Patch from Doruk Fisek and Onur Kucuk: avoid upper/lower conversion bugs
+     * (like I->i conversion in some locales) in tag parsing. The problem occurs
+     * for example with Turkish language where it can't read 'TITLE=' field if
+     * it is written as 'Title=' in the file */
+    setlocale(LC_CTYPE, "C");
+
+    switch (ETFileDescription->TagType)
+    {
+#ifdef ENABLE_MP3
+        case ID3_TAG:
+            if (!id3tag_read_file_tag (file, FileTag, &error))
+            {
+                Log_Print (LOG_ERROR,
+                           "Error reading ID3 tag from file ‘%s’: %s",
+                           filename_utf8, error->message);
+                g_clear_error (&error);
+            }
+            break;
+#endif
+#ifdef ENABLE_OGG
+        case OGG_TAG:
+            if (!ogg_tag_read_file_tag (file, FileTag, &error))
+            {
+                Log_Print (LOG_ERROR,
+                           _("Error reading tag from Ogg file ‘%s’: %s"),
+                           filename_utf8, error->message);
+                g_clear_error (&error);
+            }
+            break;
+#endif
+#ifdef ENABLE_FLAC
+        case FLAC_TAG:
+            if (!flac_tag_read_file_tag (file, FileTag, &error))
+            {
+                Log_Print (LOG_ERROR,
+                           _("Error reading tag from FLAC file ‘%s’: %s"),
+                           filename_utf8, error->message);
+                g_clear_error (&error);
+            }
+            break;
+#endif
+        case APE_TAG:
+            if (!ape_tag_read_file_tag (file, FileTag, &error))
+            {
+                Log_Print (LOG_ERROR,
+                           _("Error reading APE tag from file ‘%s’: %s"),
+                           filename_utf8, error->message);
+                g_clear_error (&error);
+            }
+            break;
+#ifdef ENABLE_MP4
+        case MP4_TAG:
+            if (!mp4tag_read_file_tag (file, FileTag, &error))
+            {
+                Log_Print (LOG_ERROR,
+                           _("Error reading tag from MP4 file ‘%s’: %s"),
+                           filename_utf8, error->message);
+                g_clear_error (&error);
+            }
+            break;
+#endif
+#ifdef ENABLE_WAVPACK
+        case WAVPACK_TAG:
+            if (!wavpack_tag_read_file_tag (file, FileTag, &error))
+            {
+                Log_Print (LOG_ERROR,
+                           _("Error reading tag from WavPack file ‘%s’: %s"),
+                           filename_utf8, error->message);
+                g_clear_error (&error);
+            }
+        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’: %s"),
+                           filename_utf8, error->message);
+                g_clear_error (&error);
+            }
+            break;
+#endif
+        case UNKNOWN_TAG:
+        default:
+            /* FIXME: Translatable string. */
+            Log_Print(LOG_ERROR,"FileTag: Undefined tag type (%d) for file %s",ETFileDescription->TagType,filename_utf8);
+            break;
+    }
+
+    if (FileTag->year && g_utf8_strlen (FileTag->year, -1) > 4)
+    {
+        Log_Print (LOG_WARNING,
+                   _("The year value ‘%s’ seems to be invalid in file ‘%s’. The information will be lost when saving"),
+                   FileTag->year, filename_utf8);
+    }
+
+    /* Fill the ET_File_Info structure */
+    ETFileInfo = ET_File_Info_Item_New ();
+
+    switch (ETFileDescription->FileType)
+    {
+#if defined ENABLE_MP3 && defined ENABLE_ID3LIB
+        case MP3_FILE:
+        case MP2_FILE:
+            success = et_mpeg_header_read_file_info (file, ETFileInfo, &error);
+            break;
+#endif
+#ifdef ENABLE_OGG
+        case OGG_FILE:
+            success = et_ogg_header_read_file_info (file, ETFileInfo, &error);
+            break;
+#endif
+#ifdef ENABLE_SPEEX
+        case SPEEX_FILE:
+            success = et_speex_header_read_file_info (file, ETFileInfo,
+                                                      &error);
+            break;
+#endif
+#ifdef ENABLE_FLAC
+        case FLAC_FILE:
+            success = et_flac_header_read_file_info (file, ETFileInfo, &error);
+            break;
+#endif
+        case MPC_FILE:
+            success = et_mpc_header_read_file_info (file, ETFileInfo, &error);
+            break;
+        case MAC_FILE:
+            success = et_mac_header_read_file_info (file, ETFileInfo, &error);
+            break;
+#ifdef ENABLE_WAVPACK
+        case WAVPACK_FILE:
+            success = et_wavpack_header_read_file_info (file, ETFileInfo,
+                                                        &error);
+            break;
+#endif
+#ifdef ENABLE_MP4
+        case MP4_FILE:
+            success = et_mp4_header_read_file_info (file, ETFileInfo, &error);
+            break;
+#endif
+#ifdef ENABLE_OPUS
+        case OPUS_FILE:
+            success = et_opus_read_file_info (file, ETFileInfo, &error);
+            break;
+#endif
+        case UNKNOWN_FILE:
+        default:
+            /* FIXME: Translatable string. */
+            Log_Print(LOG_ERROR,"ETFileInfo: Undefined file type (%d) for file %s",ETFileDescription->FileType,filename_utf8);
+            /* To get at least the file size. */
+            success = et_core_read_file_info (file, ETFileInfo, &error);
+            break;
+    }
+
+    if (!success)
+    {
+        Log_Print (LOG_ERROR,
+                   _("Error while querying information for file ‘%s’: %s"),
+                   filename_utf8, error->message);
+        g_error_free (error);
+    }
+
+    /* Restore previous value */
+    setlocale(LC_CTYPE, locale_lc_ctype ? locale_lc_ctype : "");
+
+    /* Store the modification time of the file to check if the file was changed
+     * before saving */
+    fileinfo = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED,
+                                  G_FILE_QUERY_INFO_NONE, NULL, NULL);
+    g_object_unref (file);
+
+    /* Attach all data defined above to this ETFile item */
+    ETFile = ET_File_Item_New();
+
+    if (fileinfo)
+    {
+        ETFile->FileModificationTime = g_file_info_get_attribute_uint64 (fileinfo,
+                                                                         G_FILE_ATTRIBUTE_TIME_MODIFIED);
+        g_object_unref (fileinfo);
+    }
+    else
+    {
+        ETFile->FileModificationTime = 0;
+    }
+
+    ETFile->IndexKey             = 0; // Will be renumered after...
+    ETFile->ETFileKey            = ETFileKey;
+    ETFile->ETFileDescription    = ETFileDescription;
+    ETFile->ETFileExtension      = ETFileExtension;
+    ETFile->FileNameList         = g_list_append(NULL,FileName);
+    ETFile->FileNameCur          = ETFile->FileNameList;
+    ETFile->FileNameNew          = ETFile->FileNameList;
+    ETFile->FileTagList          = g_list_append(NULL,FileTag);
+    ETFile->FileTag              = ETFile->FileTagList;
+    ETFile->ETFileInfo           = ETFileInfo;
+
+    /* Add the item to the "main list" */
+    ETCore->ETFileList = g_list_append(ETCore->ETFileList,ETFile);
+
+
+    /*
+     * Process the filename and tag to generate undo if needed...
+     * The undo key must be the same for FileName and FileTag => changed in the same time
+     */
+    undo_key = ET_Undo_Key_New();
+
+    FileName = ET_File_Name_Item_New();
+    FileName->key = undo_key;
+    ET_Save_File_Name_Internal(ETFile,FileName);
+
+    FileTag = ET_File_Tag_Item_New();
+    FileTag->key = undo_key;
+    ET_Save_File_Tag_Internal(ETFile,FileTag);
+
+    /*
+     * Generate undo for the file and the main undo list.
+     * If no changes detected, FileName and FileTag item are deleted.
+     */
+    ET_Manage_Changes_Of_File_Data(ETFile,FileName,FileTag);
+
+    /*
+     * Display a message if the file was changed at start
+     */
+    FileTag  = (File_Tag *)ETFile->FileTag->data;
+    FileName = (File_Name *)ETFile->FileNameNew->data;
+    if ( (FileName && FileName->saved==FALSE) || (FileTag && FileTag->saved==FALSE) )
+    {
+        Log_Print (LOG_INFO, _("Automatic corrections applied for file ‘%s’"),
+                   filename_utf8);
+    }
+
+    /* Add the item to the ArtistAlbum list (placed here to take advantage of previous changes) */
+    //ET_Add_File_To_Artist_Album_File_List(ETFile);
+
+    //ET_Debug_Print_File_List(ETCore->ETFileList,__FILE__,__LINE__,__FUNCTION__);
+    return ETCore->ETFileList;
+}
+
+/*
+ * Comparison function for sorting by ascending artist in the ArtistAlbumList.
+ */
+static gint
+ET_Comp_Func_Sort_Artist_Item_By_Ascending_Artist (const GList *AlbumList1,
+                                                   const GList *AlbumList2)
+{
+    const GList *etfilelist1 = NULL;
+    const GList *etfilelist2 = NULL;
+    const ET_File *etfile1 = NULL;
+    const ET_File *etfile2 = NULL;
+    const gchar *etfile1_artist;
+    const gchar *etfile2_artist;
+
+    if (!AlbumList1
+    || !(etfilelist1    = (GList *)AlbumList1->data)
+    || !(etfile1        = (ET_File *)etfilelist1->data)
+    || !(etfile1_artist = ((File_Tag *)etfile1->FileTag->data)->artist) )
+        return -1;
+
+    if (!AlbumList2
+    || !(etfilelist2    = (GList *)AlbumList2->data)
+    || !(etfile2        = (ET_File *)etfilelist2->data)
+    || !(etfile2_artist = ((File_Tag *)etfile2->FileTag->data)->artist) )
+        return 1;
+
+    /*if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
+     *    return strcmp(etfile1_artist,etfile2_artist); */
+    //else
+        return strcasecmp(etfile1_artist,etfile2_artist);
+}
+
+/*
+ * Comparison function for sorting by ascending album in the ArtistAlbumList.
+ */
+static gint
+ET_Comp_Func_Sort_Album_Item_By_Ascending_Album (const GList *etfilelist1,
+                                                 const GList *etfilelist2)
+{
+    const ET_File *etfile1;
+    const ET_File *etfile2;
+    const gchar *etfile1_album;
+    const gchar *etfile2_album;
+
+    if (!etfilelist1
+    || !(etfile1        = (ET_File *)etfilelist1->data)
+    || !(etfile1_album  = ((File_Tag *)etfile1->FileTag->data)->album) )
+        return -1;
+
+    if (!etfilelist2
+    || !(etfile2        = (ET_File *)etfilelist2->data)
+    || !(etfile2_album  = ((File_Tag *)etfile2->FileTag->data)->album) )
+        return 1;
+
+    /*if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
+     *    return strcmp(etfile1_album,etfile2_album); */
+    //else
+        return strcasecmp(etfile1_album,etfile2_album);
+}
+
+/*
+ * Comparison function for sorting etfile in the ArtistAlbumList.
+ * FIX ME : should use the default sorting!
+ */
+static gint
+ET_Comp_Func_Sort_Etfile_Item_By_Ascending_Filename (const ET_File *ETFile1,
+                                                     const ET_File *ETFile2)
+{
+
+    if (!ETFile1) return -1;
+    if (!ETFile2) return  1;
+
+    return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
+}
+
+/*
+ * The ETArtistAlbumFileList contains 3 levels of lists to sort the ETFile by artist then by album :
+ *  - "ETArtistAlbumFileList" list is a list of "ArtistList" items,
+ *  - "ArtistList" list is a list of "AlbumList" items,
+ *  - "AlbumList" list is a list of ETFile items.
+ * Note : use the function ET_Debug_Print_Artist_Album_List(...) to understand how it works, it needed...
+ */
+static gboolean
+ET_Add_File_To_Artist_Album_File_List (ET_File *ETFile)
+{
+    const gchar *ETFile_Artist;
+    const gchar *ETFile_Album;
+    const gchar *etfile_artist;
+    const gchar *etfile_album;
+    GList *ArtistList;
+    GList *AlbumList = NULL;
+    GList *etfilelist = NULL;
+    ET_File *etfile = NULL;
+
+    g_return_val_if_fail (ETFile != NULL, FALSE);
+
+    /* Album value of the ETFile passed in parameter. */
+    ETFile_Album = ((File_Tag *)ETFile->FileTag->data)->album;
+    /* Artist value of the ETFile passed in parameter. */
+    ETFile_Artist = ((File_Tag *)ETFile->FileTag->data)->artist;
+
+    for (ArtistList = ETCore->ETArtistAlbumFileList; ArtistList != NULL;
+         ArtistList = g_list_next (ArtistList))
+    {
+        AlbumList = (GList *)ArtistList->data;  /* Take the first item */
+        /* Take the first item, and the first etfile item. */
+        if (AlbumList && (etfilelist = (GList *)AlbumList->data)
+            && (etfile = (ET_File *)etfilelist->data)
+            && ((File_Tag *)etfile->FileTag->data) != NULL)
+        {
+            etfile_artist = ((File_Tag *)etfile->FileTag->data)->artist;
+        }
+        else
+        {
+            etfile_artist = NULL;
+        }
+
+        if ((etfile_artist &&  ETFile_Artist && strcmp (etfile_artist,
+                                                        ETFile_Artist) == 0)
+            || (!etfile_artist && !ETFile_Artist)) /* The "artist" values correspond? */
+        {
+            /* The "ArtistList" item was found! */
+            while (AlbumList)
+            {
+                if ((etfilelist = (GList *)AlbumList->data)
+                    && (etfile = (ET_File *)etfilelist->data)
+                    && ((File_Tag *)etfile->FileTag->data) != NULL)
+                {
+                    etfile_album = ((File_Tag *)etfile->FileTag->data)->album;
+                }
+                else
+                {
+                    etfile_album = NULL;
+                }
+
+                if ((etfile_album && ETFile_Album && strcmp (etfile_album,
+                                                             ETFile_Album) == 0)
+                    || (!etfile_album && !ETFile_Album))
+                    /* The "album" values correspond? */
+                {
+                    /* The "AlbumList" item was found!
+                     * Add the ETFile to this AlbumList item */
+                    AlbumList->data = g_list_append ((GList *)AlbumList->data,
+                                                     ETFile);
+                    AlbumList->data = g_list_sort ((GList *)AlbumList->data,
+                                                   (GCompareFunc)ET_Comp_Func_Sort_Etfile_Item_By_Ascending_Filename);
+                    return TRUE;
+                }
+
+                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);
+            ArtistList->data = g_list_append ((GList *)ArtistList->data,
+                                              etfilelist);
+            ArtistList->data = g_list_sort ((GList *)ArtistList->data,
+                                            (GCompareFunc)ET_Comp_Func_Sort_Album_Item_By_Ascending_Album);
+            return TRUE;
+        }
+    }
+
+    /* The "ArtistList" item was NOT found! => Add a new "ArtistList" to the
+     * main list (=ETArtistAlbumFileList). */
+    etfilelist = g_list_append (NULL, ETFile);
+    AlbumList  = g_list_append (NULL, etfilelist);
+    ETCore->ETArtistAlbumFileList = g_list_append (ETCore->ETArtistAlbumFileList,
+                                                   AlbumList);
+
+    /* Sort the list by ascending Artist. */
+    ETCore->ETArtistAlbumFileList = g_list_sort (ETCore->ETArtistAlbumFileList,
+                                                 (GCompareFunc)ET_Comp_Func_Sort_Artist_Item_By_Ascending_Artist);
+
+    return TRUE;
+}
+
+gboolean
+ET_Create_Artist_Album_File_List (void)
+{
+    GList *l;
+
+    if (ETCore->ETArtistAlbumFileList)
+        ET_Free_Artist_Album_File_List();
+
+    for (l = g_list_first (ETCore->ETFileList); l != NULL; l = g_list_next (l))
+    {
+        ET_File *ETFile = (ET_File *)l->data;
+        ET_Add_File_To_Artist_Album_File_List(ETFile);
+    }
+    //ET_Debug_Print_Artist_Album_List(__FILE__,__LINE__,__FUNCTION__);
+    return TRUE;
+}
+
+/*
+ * Delete the corresponding file (allocated data was previously freed!). Return TRUE if deleted.
+ */
+static gboolean
+ET_Remove_File_From_Artist_Album_List (ET_File *ETFile)
+{
+    GList *ArtistList;
+    GList *AlbumList;
+    GList *etfilelist;
+
+    g_return_val_if_fail (ETFile != NULL, FALSE);
+
+    /* Search for the ETFile in the list. */
+    for (ArtistList = ETCore->ETArtistAlbumFileList; ArtistList != NULL;
+         ArtistList = g_list_next (ArtistList))
+    {
+        for (AlbumList = g_list_first ((GList *)ArtistList->data);
+             AlbumList != NULL; AlbumList = g_list_next (AlbumList))
+        {
+            for (etfilelist = g_list_first ((GList *)AlbumList->data);
+                 etfilelist != NULL; etfilelist = g_list_next (etfilelist))
+            {
+                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. */
+                    {
+                        AlbumList->data = (gpointer) g_list_first (etfilelist);
+                    }
+                    else
+                    {
+                        AlbumList = g_list_remove (AlbumList, AlbumList->data);
+
+                        if (AlbumList) /* Delete from ArtistList. */
+                        {
+                            ArtistList->data = AlbumList;
+                        }
+                        else
+                        {
+                            /* Delete from the main list. */
+                            ETCore->ETArtistAlbumFileList = g_list_remove (ArtistList,ArtistList->data);
+
+                            return TRUE;
+                        }
+
+                        return TRUE;
+                    }
+
+                    return TRUE;
+                }
+            }
+        }
+    }
+
+    return FALSE; /* ETFile is NUL, or not found in the list. */
+}
+
+/*
+ * Returns the length of the list of displayed files
+ */
+static guint
+ET_Displayed_File_List_Get_Length (void)
+{
+    GList *list = NULL;
+
+    list = g_list_first(ETCore->ETFileDisplayedList);
+    ETCore->ETFileDisplayedList_Length = g_list_length(list);
+    return ETCore->ETFileDisplayedList_Length;
+}
+
+/*
+ * Renumber the list of displayed files (IndexKey) from 1 to n
+ */
+static void
+ET_Displayed_File_List_Number (void)
+{
+    GList *l = NULL;
+    guint i = 1;
+
+    for (l = g_list_first (ETCore->ETFileDisplayedList); l != NULL;
+         l = g_list_next (l))
+    {
+        ((ET_File *)l->data)->IndexKey = i++;
+    }
+}
+
+/*
+ * Delete the corresponding file and free the allocated data. Return TRUE if deleted.
+ */
+gboolean
+ET_Remove_File_From_File_List (ET_File *ETFile)
+{
+    GList *ETFileList = NULL;          // Item containing the ETFile to delete... (in ETCore->ETFileList)
+    GList *ETFileDisplayedList = NULL; // Item containing the ETFile to delete... (in ETCore->ETFileDisplayedList)
+
+    // Remove infos of the file
+    ETCore->ETFileDisplayedList_TotalSize     -= ((ET_File_Info *)ETFile->ETFileInfo)->size;
+    ETCore->ETFileDisplayedList_TotalDuration -= ((ET_File_Info *)ETFile->ETFileInfo)->duration;
+
+    // Find the ETFileList containing the ETFile item
+    ETFileDisplayedList = g_list_find(g_list_first(ETCore->ETFileDisplayedList),ETFile);
+    ETFileList          = g_list_find(g_list_first(ETCore->ETFileList),ETFile);
+
+    // Note : this ETFileList must be used only for ETCore->ETFileDisplayedList, and not ETCore->ETFileDisplayed
+    if (ETCore->ETFileDisplayedList == ETFileDisplayedList)
+    {
+        if (ETFileList->next)
+            ETCore->ETFileDisplayedList = ETFileDisplayedList->next;
+        else if (ETFileList->prev)
+            ETCore->ETFileDisplayedList = ETFileDisplayedList->prev;
+        else
+            ETCore->ETFileDisplayedList = NULL;
+    }
+    // If the current displayed file is just removing, it will be unable to display it again!
+    if (ETCore->ETFileDisplayed == ETFile)
+    {
+        if (ETCore->ETFileDisplayedList)
+            ETCore->ETFileDisplayed = (ET_File *)ETCore->ETFileDisplayedList->data;
+        else
+            ETCore->ETFileDisplayed = (ET_File *)NULL;
+    }
+
+    /* Remove the file from the ETFileList list. */
+    ETCore->ETFileList = g_list_remove (g_list_first (ETCore->ETFileList),
+                                        ETFileList);
+
+    // Remove the file from the ETArtistAlbumList list
+    ET_Remove_File_From_Artist_Album_List(ETFile);
+
+    /* Remove the file from the ETFileDisplayedList list (if not already). */
+    ETCore->ETFileDisplayedList = g_list_remove (g_list_first (ETCore->ETFileDisplayedList),
+                                                 ETFileDisplayedList);
+
+    // Free data of the file
+    ET_Free_File_List_Item(ETFile);
+    if (ETFileList)
+        g_list_free(ETFileList);
+    if (ETFileDisplayedList)
+        g_list_free(ETFileDisplayedList);
+
+    // Recalculate length of ETFileDisplayedList list
+    ET_Displayed_File_List_Get_Length();
+
+    // To number the ETFile in the list
+    ET_Displayed_File_List_Number();
+
+    // Displaying...
+    if (ETCore->ETFileDisplayedList)
+    {
+        if (ETCore->ETFileDisplayed)
+        {
+            ET_Displayed_File_List_By_Etfile(ETCore->ETFileDisplayed);
+        }else if (ETCore->ETFileDisplayedList->data)
+        {
+            // Select the new file (synchronize index,...)
+            ET_Displayed_File_List_By_Etfile((ET_File *)ETCore->ETFileDisplayedList->data);
+        }
+    }else
+    {
+        // Reinit the tag and file area
+        et_application_window_file_area_clear (ET_APPLICATION_WINDOW (MainWindow));
+        et_application_window_tag_area_clear (ET_APPLICATION_WINDOW (MainWindow));
+        et_application_window_update_actions (ET_APPLICATION_WINDOW (MainWindow));
+    }
+
+    return TRUE;
+}
+
+/**************************
+ * File sorting functions *
+ **************************/
+
+/*
+ * Sort the 'ETFileDisplayedList' following the 'Sorting_Type'
+ * Note : Add also new sorting in 'Browser_List_Sort_Func'
+ */
+void
+ET_Sort_Displayed_File_List (EtSortMode Sorting_Type)
+{
+    ETCore->ETFileDisplayedList = ET_Sort_File_List(ETCore->ETFileDisplayedList,Sorting_Type);
+}
+
+
+/*
+ * Set appropriate sort order for the given column_id
+ */
+static void
+set_sort_order_for_column_id (gint column_id, GtkTreeViewColumn *column,
+                              EtSortMode sort_type)
+{
+    EtApplicationWindow *window;
+    EtSortMode current_mode;
+
+    window = ET_APPLICATION_WINDOW (MainWindow);
+
+    /* Removing the sort indicator for the currently selected treeview
+     * column. */
+    current_mode = g_settings_get_enum (MainSettings, "sort-mode");
+
+    if (current_mode < ET_SORT_MODE_ASCENDING_CREATION_DATE)
+    {
+        gtk_tree_view_column_set_sort_indicator (et_application_window_browser_get_column_for_column_id (window, current_mode / 2),
+                                                 FALSE);
+    }
+
+    if (sort_type < ET_SORT_MODE_ASCENDING_CREATION_DATE)
+    {
+        gtk_tree_view_column_clicked (et_application_window_browser_get_column_for_column_id (window, column_id));
+
+        if (sort_type % 2 == 0)
+        {
+            /* GTK_SORT_ASCENDING */
+            if (et_application_window_browser_get_sort_order_for_column_id (window, column_id)
+                == GTK_SORT_DESCENDING)
+            {
+                gtk_tree_view_column_set_sort_order (column,
+                                                     GTK_SORT_ASCENDING);
+            }
+        }
+        else
+        {
+            /* GTK_SORT_DESCENDING */
+            if (et_application_window_browser_get_sort_order_for_column_id (window, column_id)
+                == GTK_SORT_ASCENDING)
+            {
+                gtk_tree_view_column_set_sort_order (column,
+                                                     GTK_SORT_DESCENDING);
+            }
+        }
+    }
+}
+
+/*
+ * Sort an 'ETFileList'
+ */
+GList *
+ET_Sort_File_List (GList *ETFileList,
+                   EtSortMode Sorting_Type)
+{
+    EtApplicationWindow *window;
+    GtkTreeViewColumn *column;
+    GList *etfilelist;
+    gint column_id = Sorting_Type / 2;
+
+    window = ET_APPLICATION_WINDOW (MainWindow);
+    column = et_application_window_browser_get_column_for_column_id (window,
+                                                                     column_id);
+
+    /* Important to rewind before. */
+    etfilelist = g_list_first (ETFileList);
+
+    /* FIXME: Port to sort-mode? */
+    set_sort_order_for_column_id (column_id, column, Sorting_Type);
+
+    /* Sort... */
+    switch (Sorting_Type)
+    {
+        case ET_SORT_MODE_ASCENDING_FILENAME:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Filename);
+            break;
+        case ET_SORT_MODE_DESCENDING_FILENAME:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Filename);
+            break;
+        case ET_SORT_MODE_ASCENDING_TITLE:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Title);
+            break;
+        case ET_SORT_MODE_DESCENDING_TITLE:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Title);
+            break;
+        case ET_SORT_MODE_ASCENDING_ARTIST:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Artist);
+            break;
+        case ET_SORT_MODE_DESCENDING_ARTIST:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Artist);
+            break;
+        case ET_SORT_MODE_ASCENDING_ALBUM_ARTIST:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Album_Artist);
+            break;
+        case ET_SORT_MODE_DESCENDING_ALBUM_ARTIST:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Album_Artist);
+            break;
+		case ET_SORT_MODE_ASCENDING_ALBUM:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Album);
+            break;
+        case ET_SORT_MODE_DESCENDING_ALBUM:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Album);
+            break;
+        case ET_SORT_MODE_ASCENDING_YEAR:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Year);
+            break;
+        case ET_SORT_MODE_DESCENDING_YEAR:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Year);
+            break;
+        case ET_SORT_MODE_ASCENDING_DISC_NUMBER:
+            etfilelist = g_list_sort (etfilelist,
+                                      (GCompareFunc)et_comp_func_sort_file_by_ascending_disc_number);
+            break;
+        case ET_SORT_MODE_DESCENDING_DISC_NUMBER:
+            etfilelist = g_list_sort (etfilelist,
+                                      (GCompareFunc)et_comp_func_sort_file_by_descending_disc_number);
+            break;
+        case ET_SORT_MODE_ASCENDING_TRACK_NUMBER:
+            etfilelist = g_list_sort (etfilelist,
+                                      (GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Track_Number);
+            break;
+        case ET_SORT_MODE_DESCENDING_TRACK_NUMBER:
+            etfilelist = g_list_sort (etfilelist,
+                                      (GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Track_Number);
+            break;
+        case ET_SORT_MODE_ASCENDING_GENRE:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Genre);
+            break;
+        case ET_SORT_MODE_DESCENDING_GENRE:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Genre);
+            break;
+        case ET_SORT_MODE_ASCENDING_COMMENT:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Comment);
+            break;
+        case ET_SORT_MODE_DESCENDING_COMMENT:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Comment);
+            break;
+        case ET_SORT_MODE_ASCENDING_COMPOSER:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Composer);
+            break;
+        case ET_SORT_MODE_DESCENDING_COMPOSER:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Composer);
+            break;
+        case ET_SORT_MODE_ASCENDING_ORIG_ARTIST:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Orig_Artist);
+            break;
+        case ET_SORT_MODE_DESCENDING_ORIG_ARTIST:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Orig_Artist);
+            break;
+        case ET_SORT_MODE_ASCENDING_COPYRIGHT:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Copyright);
+            break;
+        case ET_SORT_MODE_DESCENDING_COPYRIGHT:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Copyright);
+            break;
+        case ET_SORT_MODE_ASCENDING_URL:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Url);
+            break;
+        case ET_SORT_MODE_DESCENDING_URL:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Url);
+            break;
+        case ET_SORT_MODE_ASCENDING_ENCODED_BY:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Encoded_By);
+            break;
+        case ET_SORT_MODE_DESCENDING_ENCODED_BY:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Encoded_By);
+            break;
+        case ET_SORT_MODE_ASCENDING_CREATION_DATE:
+            etfilelist = g_list_sort (etfilelist,
+                                      (GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Creation_Date);
+            break;
+        case ET_SORT_MODE_DESCENDING_CREATION_DATE:
+            etfilelist = g_list_sort (etfilelist,
+                                      (GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Creation_Date);
+            break;
+        case ET_SORT_MODE_ASCENDING_FILE_TYPE:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Type);
+            break;
+        case ET_SORT_MODE_DESCENDING_FILE_TYPE:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Type);
+            break;
+        case ET_SORT_MODE_ASCENDING_FILE_SIZE:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Size);
+            break;
+        case ET_SORT_MODE_DESCENDING_FILE_SIZE:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Size);
+            break;
+        case ET_SORT_MODE_ASCENDING_FILE_DURATION:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Duration);
+            break;
+        case ET_SORT_MODE_DESCENDING_FILE_DURATION:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Duration);
+            break;
+        case ET_SORT_MODE_ASCENDING_FILE_BITRATE:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Bitrate);
+            break;
+        case ET_SORT_MODE_DESCENDING_FILE_BITRATE:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Bitrate);
+            break;
+        case ET_SORT_MODE_ASCENDING_FILE_SAMPLERATE:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Samplerate);
+            break;
+        case ET_SORT_MODE_DESCENDING_FILE_SAMPLERATE:
+            etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Samplerate);
+            break;
+    }
+    /* Save sorting mode (note: needed when called from UI). */
+    g_settings_set_enum (MainSettings, "sort-mode", Sorting_Type);
+
+    //ETFileList = g_list_first(etfilelist);
+    return etfilelist;
+}
+
+/*
+ * Sort the list of files following the 'Sorting_Type' value. The new sorting is displayed in the UI.
+ */
+void
+ET_Sort_Displayed_File_List_And_Update_UI (EtSortMode Sorting_Type)
+{
+    g_return_if_fail (ETCore->ETFileList != NULL);
+
+    ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+
+    /* Sort the list */
+    ET_Sort_Displayed_File_List(Sorting_Type);
+
+    /* To number the ETFile in the list */
+    ET_Displayed_File_List_Number();
+
+    /* Reload files in browser list */
+    ET_Displayed_File_List_By_Etfile(ETCore->ETFileDisplayed);  // Just to update 'ETFileDisplayedList'
+    et_application_window_browser_select_file_by_et_file (ET_APPLICATION_WINDOW (MainWindow),
+                                                          ETCore->ETFileDisplayed,
+                                                          TRUE);
+    ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);
+
+    et_application_window_browser_refresh_sort (ET_APPLICATION_WINDOW (MainWindow));
+    et_application_window_update_actions (ET_APPLICATION_WINDOW (MainWindow));
+}
+
+/*
+ * Returns the first item of the "displayed list"
+ */
+GList *
+ET_Displayed_File_List_First (void)
+{
+    ETCore->ETFileDisplayedList = g_list_first(ETCore->ETFileDisplayedList);
+    return ETCore->ETFileDisplayedList;
+}
+
+/*
+ * Returns the previous item of the "displayed list". When no more item, it returns NULL.
+ */
+GList *
+ET_Displayed_File_List_Previous (void)
+{
+    if (ETCore->ETFileDisplayedList && ETCore->ETFileDisplayedList->prev)
+        return ETCore->ETFileDisplayedList = ETCore->ETFileDisplayedList->prev;
+    else
+        return NULL;
+}
+
+/*
+ * Returns the next item of the "displayed list".
+ * When no more item, it returns NULL to don't "overwrite" the list.
+ */
+GList *
+ET_Displayed_File_List_Next (void)
+{
+    if (ETCore->ETFileDisplayedList && ETCore->ETFileDisplayedList->next)
+        return ETCore->ETFileDisplayedList = ETCore->ETFileDisplayedList->next;
+    else
+        return NULL;
+}
+
+/*
+ * Returns the last item of the "displayed list"
+ */
+GList *
+ET_Displayed_File_List_Last (void)
+{
+    ETCore->ETFileDisplayedList = g_list_last(ETCore->ETFileDisplayedList);
+    return ETCore->ETFileDisplayedList;
+}
+
+/*
+ * Returns the item of the "displayed list" which correspond to the given 'ETFile' (used into browser list).
+ */
+GList *
+ET_Displayed_File_List_By_Etfile (const ET_File *ETFile)
+{
+    GList *etfilelist;
+
+    for (etfilelist = ET_Displayed_File_List_First (); etfilelist != NULL;
+         etfilelist = ET_Displayed_File_List_Next ())
+    {
+        if (ETFile == (ET_File *)etfilelist->data)
+            break;
+    }
+
+    if (etfilelist)
+    {
+        /* To "save" the position like in ET_File_List_Next... (not very good -
+         * FIXME) */
+        ETCore->ETFileDisplayedList = etfilelist;
+    }
+    return etfilelist;
+}
+
+/*
+ * Just returns the current item of the "main list"
+ */
+/*GList *ET_Displayed_File_List_Current (void)
+{
+    return ETCore->ETFileDisplayedList;
+    //return ETCore->ETFileDisplayedListPtr;
+}*/
+
+/*
+ * Load the list of displayed files (calculate length, size, ...)
+ * It contains part (filtrated : view by artists and albums) or full ETCore->ETFileList list
+ */
+gboolean
+ET_Set_Displayed_File_List (GList *ETFileList)
+{
+    GList *l = NULL;
+
+    ETCore->ETFileDisplayedList = g_list_first(ETFileList);
+
+    //ETCore->ETFileDisplayedListPtr = ETCore->ETFileDisplayedList;
+    ETCore->ETFileDisplayedList_Length = ET_Displayed_File_List_Get_Length();
+    ETCore->ETFileDisplayedList_TotalSize     = 0;
+    ETCore->ETFileDisplayedList_TotalDuration = 0;
+
+    // Get size and duration of files in the list
+    for (l = ETCore->ETFileDisplayedList; l != NULL; l = g_list_next (l))
+    {
+        ETCore->ETFileDisplayedList_TotalSize += ((ET_File_Info *)((ET_File *)l->data)->ETFileInfo)->size;
+        ETCore->ETFileDisplayedList_TotalDuration += ((ET_File_Info *)((ET_File *)l->data)->ETFileInfo)->duration;
+    }
+
+    /* Sort the file list. */
+    ET_Sort_Displayed_File_List (g_settings_get_enum (MainSettings,
+                                 "sort-mode"));
+
+    // Should renums ETCore->ETFileDisplayedList only!
+    ET_Displayed_File_List_Number();
+
+    return TRUE;
+}
+
+/*
+ * Function used to update path of filenames into list after renaming a parent directory
+ * (for ex: "/mp3/old_path/file.mp3" to "/mp3/new_path/file.mp3"
+ */
+void
+ET_Update_Directory_Name_Into_File_List (const gchar *last_path,
+                                         const gchar *new_path)
+{
+    GList *filelist;
+    ET_File *file;
+    GList *filenamelist;
+    gchar *filename;
+    gchar *last_path_tmp;
+
+    if (!ETCore->ETFileList || !last_path || !new_path ||
+        strlen(last_path) < 1 || strlen(new_path) < 1 )
+        return;
+
+    // Add '/' to end of path to avoid ambiguity between a directory and a filename...
+    if (last_path[strlen(last_path)-1]==G_DIR_SEPARATOR)
+        last_path_tmp = g_strdup(last_path);
+    else
+        last_path_tmp = g_strconcat(last_path,G_DIR_SEPARATOR_S,NULL);
+
+    for (filelist = g_list_first (ETCore->ETFileList); filelist != NULL;
+         filelist = g_list_next (filelist))
+    {
+        if ((file = filelist->data))
+        {
+            for (filenamelist = file->FileNameList; filenamelist != NULL;
+                 filenamelist = g_list_next (filenamelist))
+            {
+                File_Name *FileName = (File_Name *)filenamelist->data;
+
+                if ( FileName && (filename=FileName->value) )
+                {
+                    // Replace path of filename
+                    if ( strncmp(filename,last_path_tmp,strlen(last_path_tmp))==0 )
+                    {
+                        gchar *filename_tmp;
+
+                        // Create the new filename
+                        filename_tmp = g_strconcat(new_path,
+                                                   (new_path[strlen(new_path)-1]==G_DIR_SEPARATOR) ? "" : G_DIR_SEPARATOR_S,
+                                                   &filename[strlen(last_path_tmp)],NULL);
+
+                        /* Replace the filename (in file system encoding). */
+                        g_free(FileName->value);
+                        FileName->value = filename_tmp;
+                        /* Replace the filename (in file system encoding). */
+                        g_free(FileName->value_utf8);
+                        FileName->value_utf8 = filename_to_display(FileName->value);
+                        // Recalculate the collate key
+                        g_free(FileName->value_ck);
+                        FileName->value_ck = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
+                    }
+                }
+             }
+        }
+    }
+
+    g_free(last_path_tmp);
+}
+
+/*
+ * Execute one 'undo' in the main undo list (it selects the last ETFile changed,
+ * before to apply an undo action)
+ */
+ET_File *
+ET_Undo_History_File_Data (void)
+{
+    ET_File *ETFile;
+    const ET_History_File *ETHistoryFile;
+
+    g_return_val_if_fail (ETCore->ETHistoryFileList != NULL ||
+                          ET_History_File_List_Has_Undo_Data (), NULL);
+
+    ETHistoryFile = (ET_History_File *)ETCore->ETHistoryFileList->data;
+    ETFile        = (ET_File *)ETHistoryFile->ETFile;
+    ET_Displayed_File_List_By_Etfile(ETFile);
+    ET_Undo_File_Data(ETFile);
+
+    if (ETCore->ETHistoryFileList->prev)
+        ETCore->ETHistoryFileList = ETCore->ETHistoryFileList->prev;
+    return ETFile;
+}
+
+/*
+ * Returns TRUE if undo file list contains undo data
+ */
+gboolean
+ET_History_File_List_Has_Undo_Data (void)
+{
+    if (ETCore->ETHistoryFileList && ETCore->ETHistoryFileList->prev)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+
+/*
+ * Execute one 'redo' in the main undo list
+ */
+ET_File *
+ET_Redo_History_File_Data (void)
+{
+    ET_File *ETFile;
+    ET_History_File *ETHistoryFile;
+
+    if (!ETCore->ETHistoryFileList || !ET_History_File_List_Has_Redo_Data()) return NULL;
+
+    ETHistoryFile = (ET_History_File *)ETCore->ETHistoryFileList->next->data;
+    ETFile        = (ET_File *)ETHistoryFile->ETFile;
+    ET_Displayed_File_List_By_Etfile(ETFile);
+    ET_Redo_File_Data(ETFile);
+
+    if (ETCore->ETHistoryFileList->next)
+        ETCore->ETHistoryFileList = ETCore->ETHistoryFileList->next;
+    return ETFile;
+}
+
+
+/*
+ * Returns TRUE if undo file list contains redo data
+ */
+gboolean ET_History_File_List_Has_Redo_Data (void)
+{
+    if (ETCore->ETHistoryFileList && ETCore->ETHistoryFileList->next)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+/*
+* - * Add a ETFile item to the main undo list of files
+*   - */
+gboolean
+ET_Add_File_To_History_List (ET_File *ETFile)
+{
+    ET_History_File *ETHistoryFile;
+
+    g_return_val_if_fail (ETFile != NULL, FALSE);
+
+    ETHistoryFile = g_slice_new0 (ET_History_File);
+    ETHistoryFile->ETFile = ETFile;
+
+    /* The undo list must contains one item before the 'first undo' data */
+    if (!ETCore->ETHistoryFileList)
+    {
+        ETCore->ETHistoryFileList = g_list_append (ETCore->ETHistoryFileList,
+                                                   g_slice_new0 (ET_History_File));
+    }
+
+    /* Add the item to the list (cut end of list from the current element) */
+    ETCore->ETHistoryFileList = g_list_append(ETCore->ETHistoryFileList,ETHistoryFile);
+    ETCore->ETHistoryFileList = g_list_last(ETCore->ETHistoryFileList);
+
+    return TRUE;
+}
+/*
+ * Ckecks if some files, in the list, had been changed but not saved.
+ * Returns TRUE if all files have been saved.
+ * Returns FALSE if some changes haven't been saved.
+ */
+gboolean
+ET_Check_If_All_Files_Are_Saved (void)
+{
+    /* Check if some files haven't been saved, if didn't nochange=0 */
+    if (!ETCore->ETFileList)
+    {
+        return TRUE;
+    }else
+    {
+        GList *l;
+
+        for (l = g_list_first (ETCore->ETFileList); l != NULL;
+             l = g_list_next (l))
+        {
+            if (ET_Check_If_File_Is_Saved ((ET_File *)l->data) == FALSE)
+                return FALSE;
+        }
+        return TRUE;
+    }
+}
+
+/*
+ * Returns the number of file in the directory of the selected file.
+ * Parameter "path" should be in UTF-8
+ */
+guint
+ET_Get_Number_Of_Files_In_Directory (const gchar *path_utf8)
+{
+    gchar *path_key;
+    GList *l;
+    guint  count = 0;
+
+    g_return_val_if_fail (path_utf8 != NULL, count);
+
+    path_key = g_utf8_collate_key (path_utf8, -1);
+
+    for (l = g_list_first (ETCore->ETFileList); l != NULL; l = g_list_next (l))
+    {
+        ET_File *ETFile = (ET_File *)l->data;
+        const gchar *cur_filename_utf8 = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value_utf8;
+        gchar *dirname_utf8      = g_path_get_dirname(cur_filename_utf8);
+        gchar *dirname_key = g_utf8_collate_key (dirname_utf8, -1);
+
+        if (strcmp (dirname_utf8, path_utf8) == 0)
+        {
+            count++;
+        }
+
+        g_free (dirname_utf8);
+        g_free (dirname_key);
+    }
+
+    g_free (path_key);
+
+    return count;
+}
diff --git a/src/file_list.h b/src/file_list.h
new file mode 100644
index 0000000..be7ba20
--- /dev/null
+++ b/src/file_list.h
@@ -0,0 +1,65 @@
+/* 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 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_FILE_LIST_H_
+#define ET_FILE_LIST_H_
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+#include "file.h"
+#include "file_tag.h"
+#include "setting.h"
+
+GList * ET_Add_File_To_File_List (gchar *filename);
+gboolean ET_Remove_File_From_File_List (ET_File *ETFile);
+gboolean ET_Free_File_List (void);
+
+gboolean ET_Create_Artist_Album_File_List (void);
+gboolean ET_Free_Artist_Album_File_List (void);
+gboolean ET_Remove_File_From_File_List (ET_File *ETFile);
+
+gboolean ET_Check_If_All_Files_Are_Saved (void);
+
+GList * ET_Displayed_File_List_First (void);
+GList * ET_Displayed_File_List_Previous (void);
+GList * ET_Displayed_File_List_Next (void);
+GList * ET_Displayed_File_List_Last (void);
+GList * ET_Displayed_File_List_By_Etfile (const ET_File *ETFile);
+
+gboolean ET_Set_Displayed_File_List (GList *ETFileList);
+gboolean ET_Free_Displayed_File_List (void);
+
+gboolean ET_Add_File_To_History_List (ET_File *ETFile);
+ET_File * ET_Undo_History_File_Data (void);
+ET_File * ET_Redo_History_File_Data (void);
+gboolean ET_History_File_List_Has_Undo_Data (void);
+gboolean ET_History_File_List_Has_Redo_Data (void);
+gboolean ET_Free_History_File_List (void);
+
+void ET_Update_Directory_Name_Into_File_List (const gchar *last_path, const gchar *new_path);
+guint ET_Get_Number_Of_Files_In_Directory (const gchar *path_utf8);
+
+GList *ET_Sort_File_List (GList *ETFileList, EtSortMode Sorting_Type);
+void ET_Sort_Displayed_File_List (EtSortMode Sorting_Type);
+void ET_Sort_Displayed_File_List_And_Update_UI (EtSortMode Sorting_Type);
+
+G_END_DECLS
+
+#endif /* !ET_FILE_H_ */
diff --git a/src/file_tag.c b/src/file_tag.c
new file mode 100644
index 0000000..ab2748b
--- /dev/null
+++ b/src/file_tag.c
@@ -0,0 +1,641 @@
+/* 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 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 "file_tag.h"
+
+#include "et_core.h"
+
+static void
+ET_Initialize_File_Tag_Item (File_Tag *FileTag)
+{
+    if (FileTag)
+    {
+        FileTag->key         = ET_Undo_Key_New();
+        FileTag->saved       = FALSE;
+        FileTag->title       = NULL;
+        FileTag->artist      = NULL;
+        FileTag->album_artist= NULL;
+        FileTag->album       = NULL;
+        FileTag->disc_number = NULL;
+        FileTag->disc_total = NULL;
+        FileTag->track       = NULL;
+        FileTag->track_total = NULL;
+        FileTag->year        = NULL;
+        FileTag->genre       = NULL;
+        FileTag->comment     = NULL;
+        FileTag->composer    = NULL;
+        FileTag->orig_artist = NULL;
+        FileTag->copyright   = NULL;
+        FileTag->url         = NULL;
+        FileTag->encoded_by  = NULL;
+        FileTag->picture     = NULL;
+        FileTag->other       = NULL;
+    }
+}
+
+/*
+ * Create a new File_Tag structure
+ */
+File_Tag *ET_File_Tag_Item_New (void)
+{
+    File_Tag *FileTag;
+
+    FileTag = g_slice_new (File_Tag);
+    ET_Initialize_File_Tag_Item (FileTag);
+
+    return FileTag;
+}
+
+/*
+ * Frees the list of 'other' field in a File_Tag item (contains attached gchar data).
+ */
+static gboolean
+ET_Free_File_Tag_Item_Other_Field (File_Tag *FileTag)
+{
+    g_list_free_full (FileTag->other, g_free);
+
+    return TRUE;
+}
+
+
+/*
+ * Frees a File_Tag item.
+ */
+gboolean ET_Free_File_Tag_Item (File_Tag *FileTag)
+{
+    g_return_val_if_fail (FileTag != NULL, FALSE);
+
+    g_free(FileTag->title);
+    g_free(FileTag->artist);
+    g_free(FileTag->album_artist);
+    g_free(FileTag->album);
+    g_free(FileTag->disc_number);
+    g_free (FileTag->disc_total);
+    g_free(FileTag->year);
+    g_free(FileTag->track);
+    g_free(FileTag->track_total);
+    g_free(FileTag->genre);
+    g_free(FileTag->comment);
+    g_free(FileTag->composer);
+    g_free(FileTag->orig_artist);
+    g_free(FileTag->copyright);
+    g_free(FileTag->url);
+    g_free(FileTag->encoded_by);
+    et_file_tag_set_picture (FileTag, NULL);
+    // Free list of other fields
+    ET_Free_File_Tag_Item_Other_Field(FileTag);
+
+    g_slice_free (File_Tag, FileTag);
+    return TRUE;
+}
+
+/*
+ * Duplicate the 'other' list
+ */
+void
+ET_Copy_File_Tag_Item_Other_Field (const ET_File *ETFile,
+                                   File_Tag *FileTag)
+{
+    const File_Tag *FileTagCur;
+    GList *l;
+
+    FileTagCur = (File_Tag *)(ETFile->FileTag)->data;
+
+    for (l = FileTagCur->other; l != NULL; l = g_list_next (l))
+    {
+        FileTag->other = g_list_prepend (FileTag->other,
+                                         g_strdup ((gchar *)l->data));
+    }
+
+    FileTag->other = g_list_reverse (FileTag->other);
+}
+
+
+/*
+ * Copy data of the File_Tag structure (of ETFile) to the FileTag item.
+ * Reallocate data if not null.
+ */
+gboolean
+ET_Copy_File_Tag_Item (const ET_File *ETFile, File_Tag *FileTag)
+{
+    const File_Tag *FileTagCur;
+
+    g_return_val_if_fail (ETFile != NULL && ETFile->FileTag != NULL &&
+                          (File_Tag *)(ETFile->FileTag)->data != NULL, FALSE);
+    g_return_val_if_fail (FileTag != NULL, FALSE);
+
+    /* The data to duplicate to FileTag */
+    FileTagCur = (File_Tag *)(ETFile->FileTag)->data;
+    // Key for the item, may be overwritten
+    FileTag->key = ET_Undo_Key_New();
+
+    if (FileTagCur->title)
+    {
+        FileTag->title = g_strdup(FileTagCur->title);
+    }else
+    {
+        g_free(FileTag->title);
+        FileTag->title = NULL;
+    }
+
+    if (FileTagCur->artist)
+    {
+        FileTag->artist = g_strdup(FileTagCur->artist);
+    }else
+    {
+        g_free(FileTag->artist);
+        FileTag->artist = NULL;
+    }
+
+    if (FileTagCur->album_artist)
+    {
+        FileTag->album_artist = g_strdup(FileTagCur->album_artist);
+    }else
+    {
+        g_free(FileTag->album_artist);
+        FileTag->album_artist = NULL;
+    }
+
+    if (FileTagCur->album)
+    {
+        FileTag->album = g_strdup(FileTagCur->album);
+    }else
+    {
+        g_free(FileTag->album);
+        FileTag->album = NULL;
+    }
+
+    if (FileTagCur->disc_number)
+    {
+        FileTag->disc_number = g_strdup(FileTagCur->disc_number);
+    }else
+    {
+        g_free(FileTag->disc_number);
+        FileTag->disc_number = NULL;
+    }
+
+    if (FileTagCur->disc_total)
+    {
+        FileTag->disc_total = g_strdup (FileTagCur->disc_total);
+    }
+    else
+    {
+        g_free (FileTag->disc_total);
+        FileTag->disc_total = NULL;
+    }
+
+    if (FileTagCur->year)
+    {
+        FileTag->year = g_strdup(FileTagCur->year);
+    }else
+    {
+        g_free(FileTag->year);
+        FileTag->year = NULL;
+    }
+
+    if (FileTagCur->track)
+    {
+        FileTag->track = g_strdup(FileTagCur->track);
+    }else
+    {
+        g_free(FileTag->track);
+        FileTag->track = NULL;
+    }
+
+    if (FileTagCur->track_total)
+    {
+        FileTag->track_total = g_strdup(FileTagCur->track_total);
+    }else
+    {
+        g_free(FileTag->track_total);
+        FileTag->track_total = NULL;
+    }
+
+    if (FileTagCur->genre)
+    {
+        FileTag->genre = g_strdup(FileTagCur->genre);
+    }else
+    {
+        g_free(FileTag->genre);
+        FileTag->genre = NULL;
+    }
+
+    if (FileTagCur->comment)
+    {
+        FileTag->comment = g_strdup(FileTagCur->comment);
+    }else
+    {
+        g_free(FileTag->comment);
+        FileTag->comment = NULL;
+    }
+
+    if (FileTagCur->composer)
+    {
+        FileTag->composer = g_strdup(FileTagCur->composer);
+    }else
+    {
+        g_free(FileTag->composer);
+        FileTag->composer = NULL;
+    }
+
+    if (FileTagCur->orig_artist)
+    {
+        FileTag->orig_artist = g_strdup(FileTagCur->orig_artist);
+    }else
+    {
+        g_free(FileTag->orig_artist);
+        FileTag->orig_artist = NULL;
+    }
+
+    if (FileTagCur->copyright)
+    {
+        FileTag->copyright = g_strdup(FileTagCur->copyright);
+    }else
+    {
+        g_free(FileTag->copyright);
+        FileTag->copyright = NULL;
+    }
+
+    if (FileTagCur->url)
+    {
+        FileTag->url = g_strdup(FileTagCur->url);
+    }else
+    {
+        g_free(FileTag->url);
+        FileTag->url = NULL;
+    }
+
+    if (FileTagCur->encoded_by)
+    {
+        FileTag->encoded_by = g_strdup(FileTagCur->encoded_by);
+    }else
+    {
+        g_free(FileTag->encoded_by);
+        FileTag->encoded_by = NULL;
+    }
+
+    et_file_tag_set_picture (FileTag, FileTagCur->picture);
+
+    if (FileTagCur->other)
+    {
+        ET_Copy_File_Tag_Item_Other_Field(ETFile,FileTag);
+    }else
+    {
+        ET_Free_File_Tag_Item_Other_Field (FileTag);
+    }
+
+    return TRUE;
+}
+
+/*
+ * Set the value of a field of a FileTag item (for ex, value of FileTag->title)
+ * Must be used only for the 'gchar *' components
+ */
+static void
+ET_Set_Field_File_Tag_Item (gchar **FileTagField,
+                            const gchar *value)
+{
+    g_return_if_fail (FileTagField != NULL);
+
+    if (*FileTagField != NULL)
+    {
+        g_free (*FileTagField);
+        *FileTagField = NULL;
+    }
+
+    if (value != NULL)
+    {
+        if (*value != '\0')
+        {
+            *FileTagField = g_strdup (value);
+        }
+    }
+}
+
+void
+et_file_tag_set_title (File_Tag *file_tag,
+                       const gchar *title)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    ET_Set_Field_File_Tag_Item (&file_tag->title, title);
+}
+
+void
+et_file_tag_set_artist (File_Tag *file_tag,
+                        const gchar *artist)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    ET_Set_Field_File_Tag_Item (&file_tag->artist, artist);
+}
+
+void
+et_file_tag_set_album_artist (File_Tag *file_tag,
+                              const gchar *album_artist)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    ET_Set_Field_File_Tag_Item (&file_tag->album_artist, album_artist);
+}
+
+void
+et_file_tag_set_album (File_Tag *file_tag,
+                       const gchar *album)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    ET_Set_Field_File_Tag_Item (&file_tag->album, album);
+}
+
+void
+et_file_tag_set_disc_number (File_Tag *file_tag,
+                             const gchar *disc_number)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    ET_Set_Field_File_Tag_Item (&file_tag->disc_number, disc_number);
+}
+
+void
+et_file_tag_set_disc_total (File_Tag *file_tag,
+                            const gchar *disc_total)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    ET_Set_Field_File_Tag_Item (&file_tag->disc_total, disc_total);
+}
+
+void
+et_file_tag_set_year (File_Tag *file_tag,
+                      const gchar *year)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    ET_Set_Field_File_Tag_Item (&file_tag->year, year);
+}
+
+void
+et_file_tag_set_track_number (File_Tag *file_tag,
+                              const gchar *track_number)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    ET_Set_Field_File_Tag_Item (&file_tag->track, track_number);
+}
+
+void
+et_file_tag_set_track_total (File_Tag *file_tag,
+                             const gchar *track_total)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    ET_Set_Field_File_Tag_Item (&file_tag->track_total, track_total);
+}
+
+void
+et_file_tag_set_genre (File_Tag *file_tag,
+                       const gchar *genre)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    ET_Set_Field_File_Tag_Item (&file_tag->genre, genre);
+}
+
+void
+et_file_tag_set_comment (File_Tag *file_tag,
+                         const gchar *comment)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    ET_Set_Field_File_Tag_Item (&file_tag->comment, comment);
+}
+
+void
+et_file_tag_set_composer (File_Tag *file_tag,
+                          const gchar *composer)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    ET_Set_Field_File_Tag_Item (&file_tag->composer, composer);
+}
+
+void
+et_file_tag_set_orig_artist (File_Tag *file_tag,
+                             const gchar *orig_artist)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    ET_Set_Field_File_Tag_Item (&file_tag->orig_artist, orig_artist);
+}
+
+void
+et_file_tag_set_copyright (File_Tag *file_tag,
+                           const gchar *copyright)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    ET_Set_Field_File_Tag_Item (&file_tag->copyright, copyright);
+}
+
+void
+et_file_tag_set_url (File_Tag *file_tag,
+                     const gchar *url)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    ET_Set_Field_File_Tag_Item (&file_tag->url, url);
+}
+
+void
+et_file_tag_set_encoded_by (File_Tag *file_tag,
+                            const gchar *encoded_by)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    ET_Set_Field_File_Tag_Item (&file_tag->encoded_by, encoded_by);
+}
+
+/*
+ * et_file_tag_set_picture:
+ * @file_tag: the #File_Tag on which to set the image
+ * @pic: the image to set
+ *
+ * Set the images inside @file_tag to be @pic, freeing existing images as
+ * necessary. Copies @pic with et_picture_copy_all().
+ */
+void
+et_file_tag_set_picture (File_Tag *file_tag,
+                         const EtPicture *pic)
+{
+    g_return_if_fail (file_tag != NULL);
+
+    if (file_tag->picture != NULL)
+    {
+        et_picture_free (file_tag->picture);
+        file_tag->picture = NULL;
+    }
+
+    if (pic)
+    {
+        file_tag->picture = et_picture_copy_all (pic);
+    }
+}
+
+/*
+ * Compares two File_Tag items and returns TRUE if there aren't the same.
+ * Notes:
+ *  - if field is '' or NULL => will be removed
+ */
+gboolean
+ET_Detect_Changes_Of_File_Tag (const File_Tag *FileTag1,
+                               const File_Tag *FileTag2)
+{
+    const EtPicture *pic1;
+    const EtPicture *pic2;
+
+    g_return_val_if_fail (FileTag1 != NULL && FileTag2 != NULL, FALSE);
+
+    if ( ( FileTag1 && !FileTag2)
+      || (!FileTag1 &&  FileTag2) )
+        return TRUE;
+
+    /* Title */
+    if ( FileTag1->title && !FileTag2->title && g_utf8_strlen(FileTag1->title, -1)>0 ) return TRUE;
+    if (!FileTag1->title &&  FileTag2->title && g_utf8_strlen(FileTag2->title, -1)>0 ) return TRUE;
+    if ( FileTag1->title &&  FileTag2->title && g_utf8_collate(FileTag1->title,FileTag2->title)!=0 ) return TRUE;
+
+    /* Artist */
+    if ( FileTag1->artist && !FileTag2->artist && g_utf8_strlen(FileTag1->artist, -1)>0 ) return TRUE;
+    if (!FileTag1->artist &&  FileTag2->artist && g_utf8_strlen(FileTag2->artist, -1)>0 ) return TRUE;
+    if ( FileTag1->artist &&  FileTag2->artist && g_utf8_collate(FileTag1->artist,FileTag2->artist)!=0 ) return TRUE;
+
+	/* Album Artist */
+    if ( FileTag1->album_artist && !FileTag2->album_artist && g_utf8_strlen(FileTag1->album_artist, -1)>0 ) return TRUE;
+    if (!FileTag1->album_artist &&  FileTag2->album_artist && g_utf8_strlen(FileTag2->album_artist, -1)>0 ) return TRUE;
+    if ( FileTag1->album_artist &&  FileTag2->album_artist && g_utf8_collate(FileTag1->album_artist,FileTag2->album_artist)!=0 ) return TRUE;
+
+    /* Album */
+    if ( FileTag1->album && !FileTag2->album && g_utf8_strlen(FileTag1->album, -1)>0 ) return TRUE;
+    if (!FileTag1->album &&  FileTag2->album && g_utf8_strlen(FileTag2->album, -1)>0 ) return TRUE;
+    if ( FileTag1->album &&  FileTag2->album && g_utf8_collate(FileTag1->album,FileTag2->album)!=0 ) return TRUE;
+
+    /* Disc Number */
+    if ( FileTag1->disc_number && !FileTag2->disc_number && g_utf8_strlen(FileTag1->disc_number, -1)>0 ) return TRUE;
+    if (!FileTag1->disc_number &&  FileTag2->disc_number && g_utf8_strlen(FileTag2->disc_number, -1)>0 ) return TRUE;
+    if ( FileTag1->disc_number &&  FileTag2->disc_number && g_utf8_collate(FileTag1->disc_number,FileTag2->disc_number)!=0 ) return TRUE;
+
+    /* Discs Total */
+    if (FileTag1->disc_total && !FileTag2->disc_total
+        && g_utf8_strlen (FileTag1->disc_total, -1) > 0)
+    {
+        return TRUE;
+    }
+
+    if (!FileTag1->disc_total &&  FileTag2->disc_total
+        && g_utf8_strlen (FileTag2->disc_total, -1) > 0)
+    {
+        return TRUE;
+    }
+
+    if (FileTag1->disc_total &&  FileTag2->disc_total
+        && g_utf8_collate (FileTag1->disc_total, FileTag2->disc_total) != 0)
+    {
+        return TRUE;
+    }
+
+    /* Year */
+    if ( FileTag1->year && !FileTag2->year && g_utf8_strlen(FileTag1->year, -1)>0 ) return TRUE;
+    if (!FileTag1->year &&  FileTag2->year && g_utf8_strlen(FileTag2->year, -1)>0 ) return TRUE;
+    if ( FileTag1->year &&  FileTag2->year && g_utf8_collate(FileTag1->year,FileTag2->year)!=0 ) return TRUE;
+
+    /* Track */
+    if ( FileTag1->track && !FileTag2->track && g_utf8_strlen(FileTag1->track, -1)>0 ) return TRUE;
+    if (!FileTag1->track &&  FileTag2->track && g_utf8_strlen(FileTag2->track, -1)>0 ) return TRUE;
+    if ( FileTag1->track &&  FileTag2->track && g_utf8_collate(FileTag1->track,FileTag2->track)!=0 ) return TRUE;
+
+    /* Track Total */
+    if ( FileTag1->track_total && !FileTag2->track_total && g_utf8_strlen(FileTag1->track_total, -1)>0 ) return TRUE;
+    if (!FileTag1->track_total &&  FileTag2->track_total && g_utf8_strlen(FileTag2->track_total, -1)>0 ) return TRUE;
+    if ( FileTag1->track_total &&  FileTag2->track_total && g_utf8_collate(FileTag1->track_total,FileTag2->track_total)!=0 ) return TRUE;
+
+    /* Genre */
+    if ( FileTag1->genre && !FileTag2->genre && g_utf8_strlen(FileTag1->genre, -1)>0 ) return TRUE;
+    if (!FileTag1->genre &&  FileTag2->genre && g_utf8_strlen(FileTag2->genre, -1)>0 ) return TRUE;
+    if ( FileTag1->genre &&  FileTag2->genre && g_utf8_collate(FileTag1->genre,FileTag2->genre)!=0 ) return TRUE;
+
+    /* Comment */
+    if ( FileTag1->comment && !FileTag2->comment && g_utf8_strlen(FileTag1->comment, -1)>0 ) return TRUE;
+    if (!FileTag1->comment &&  FileTag2->comment && g_utf8_strlen(FileTag2->comment, -1)>0 ) return TRUE;
+    if ( FileTag1->comment &&  FileTag2->comment && g_utf8_collate(FileTag1->comment,FileTag2->comment)!=0 ) return TRUE;
+
+    /* Composer */
+    if ( FileTag1->composer && !FileTag2->composer && g_utf8_strlen(FileTag1->composer, -1)>0 ) return TRUE;
+    if (!FileTag1->composer &&  FileTag2->composer && g_utf8_strlen(FileTag2->composer, -1)>0 ) return TRUE;
+    if ( FileTag1->composer &&  FileTag2->composer && g_utf8_collate(FileTag1->composer,FileTag2->composer)!=0 ) return TRUE;
+
+    /* Original artist */
+    if ( FileTag1->orig_artist && !FileTag2->orig_artist && g_utf8_strlen(FileTag1->orig_artist, -1)>0 ) return TRUE;
+    if (!FileTag1->orig_artist &&  FileTag2->orig_artist && g_utf8_strlen(FileTag2->orig_artist, -1)>0 ) return TRUE;
+    if ( FileTag1->orig_artist &&  FileTag2->orig_artist && g_utf8_collate(FileTag1->orig_artist,FileTag2->orig_artist)!=0 ) return TRUE;
+
+    /* Copyright */
+    if ( FileTag1->copyright && !FileTag2->copyright && g_utf8_strlen(FileTag1->copyright, -1)>0 ) return TRUE;
+    if (!FileTag1->copyright &&  FileTag2->copyright && g_utf8_strlen(FileTag2->copyright, -1)>0 ) return TRUE;
+    if ( FileTag1->copyright &&  FileTag2->copyright && g_utf8_collate(FileTag1->copyright,FileTag2->copyright)!=0 ) return TRUE;
+
+    /* URL */
+    if ( FileTag1->url && !FileTag2->url && g_utf8_strlen(FileTag1->url, -1)>0 ) return TRUE;
+    if (!FileTag1->url &&  FileTag2->url && g_utf8_strlen(FileTag2->url, -1)>0 ) return TRUE;
+    if ( FileTag1->url &&  FileTag2->url && g_utf8_collate(FileTag1->url,FileTag2->url)!=0 ) return TRUE;
+
+    /* Encoded by */
+    if ( FileTag1->encoded_by && !FileTag2->encoded_by && g_utf8_strlen(FileTag1->encoded_by, -1)>0 ) return TRUE;
+    if (!FileTag1->encoded_by &&  FileTag2->encoded_by && g_utf8_strlen(FileTag2->encoded_by, -1)>0 ) return TRUE;
+    if ( FileTag1->encoded_by &&  FileTag2->encoded_by && g_utf8_collate(FileTag1->encoded_by,FileTag2->encoded_by)!=0 ) return TRUE;
+
+    /* Picture */
+    for (pic1 = FileTag1->picture, pic2 = FileTag2->picture; ;
+         pic1 = pic1->next, pic2 = pic2->next)
+    {
+        if( (pic1 && !pic2) || (!pic1 && pic2) )
+            return TRUE;
+        if (!pic1 || !pic2)
+            break; // => no changes
+        //if (!pic1->data || !pic2->data)
+        //    break; // => no changes
+
+        if (!g_bytes_equal (pic1->bytes, pic2->bytes))
+        {
+            return TRUE;
+        }
+        if (pic1->type != pic2->type)
+            return TRUE;
+        if (pic1->description && !pic2->description
+        &&  g_utf8_strlen(pic1->description, -1)>0 )
+            return TRUE;
+        if (!pic1->description && pic2->description
+        &&  g_utf8_strlen(pic2->description, -1)>0 )
+            return TRUE;
+        if (pic1->description && pic2->description
+        &&  g_utf8_collate(pic1->description, pic2->description)!=0 )
+            return TRUE;
+    }
+
+    return FALSE; /* No changes */
+}
diff --git a/src/file_tag.h b/src/file_tag.h
new file mode 100644
index 0000000..9793535
--- /dev/null
+++ b/src/file_tag.h
@@ -0,0 +1,103 @@
+/* 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 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_FILE_TAG_H_
+#define ET_FILE_TAG_H_
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+#include "picture.h"
+
+/*
+ * File_Tag:
+ * @key: incremented value
+ * @saved: %TRUE if the tag has been saved, %FALSE otherwise
+ * @title: track name
+ * @artist: track artist
+ * @album_artist: artist for the album of which this track is part
+ * @album: album name
+ * @disc_number: disc number within a set (as a string)
+ * @disc_total: total number of discs in the set (as a string)
+ * @year: year (as a string)
+ * @track: track number (as a string)
+ * @track_total: total number of tracks (as a string)
+ * @genre: text genre
+ * @comment: comment
+ * @composer: composer
+ * @orig_artist: original artist
+ * @copyright: copyright
+ * @url: URL
+ * @encoded_by: encoded by (strictly, a person, but often the encoding
+ *              application)
+ * @picture: #EtPicture, which may have several other linked instances
+ * @other: a list of other tags, used for Vorbis comments
+ * Description of each item of the TagList list
+ */
+typedef struct
+{
+    guint key;
+    gboolean saved;
+
+    gchar *title;
+    gchar *artist;
+    gchar *album_artist;
+    gchar *album;
+    gchar *disc_number;
+    gchar *disc_total;
+    gchar *year;
+    gchar *track;
+    gchar *track_total;
+    gchar *genre;
+    gchar *comment;
+    gchar *composer;
+    gchar *orig_artist;
+    gchar *copyright;
+    gchar *url;
+    gchar *encoded_by;
+    EtPicture *picture;
+    GList *other;
+} File_Tag;
+
+File_Tag * ET_File_Tag_Item_New (void);
+gboolean ET_Free_File_Tag_Item (File_Tag *FileTag);
+
+void et_file_tag_set_title (File_Tag *file_tag, const gchar *title);
+void et_file_tag_set_artist (File_Tag *file_tag, const gchar *artist);
+void et_file_tag_set_album_artist (File_Tag *file_tag, const gchar *album_artist);
+void et_file_tag_set_album (File_Tag *file_tag, const gchar *album);
+void et_file_tag_set_disc_number (File_Tag *file_tag, const gchar *disc_number);
+void et_file_tag_set_disc_total (File_Tag *file_tag, const gchar *disc_total);
+void et_file_tag_set_year (File_Tag *file_tag, const gchar *year);
+void et_file_tag_set_track_number (File_Tag *file_tag, const gchar *track_number);
+void et_file_tag_set_track_total (File_Tag *file_tag, const gchar *track_total);
+void et_file_tag_set_genre (File_Tag *file_tag, const gchar *genre);
+void et_file_tag_set_comment (File_Tag *file_tag, const gchar *comment);
+void et_file_tag_set_composer (File_Tag *file_tag, const gchar *composer);
+void et_file_tag_set_orig_artist (File_Tag *file_tag, const gchar *orig_artist);
+void et_file_tag_set_copyright (File_Tag *file_tag, const gchar *copyright);
+void et_file_tag_set_url (File_Tag *file_tag, const gchar *url);
+void et_file_tag_set_encoded_by (File_Tag *file_tag, const gchar *encoded_by);
+void et_file_tag_set_picture (File_Tag *file_tag, const EtPicture *pic);
+
+gboolean ET_Detect_Changes_Of_File_Tag (const File_Tag *FileTag1, const File_Tag  *FileTag2);
+
+G_END_DECLS
+
+#endif /* !ET_FILE_TAG_H_ */
diff --git a/src/log.c b/src/log.c
index bc8c7fa..07b67d6 100644
--- a/src/log.c
+++ b/src/log.c
@@ -17,16 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <glib/gi18n.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <time.h>
-#include <unistd.h>
 
 #include "log.h"
 #include "application_window.h"
@@ -45,9 +40,6 @@ struct _EtLogAreaPrivate
 {
     GtkWidget *log_view;
     GtkListStore *log_model;
-    /* Temporary list to store messages for the LogList when this control was
-     * not yet created. */
-    GList *log_tmp_list;
 
     /* Popup menu. */
     GtkWidget *menu;
@@ -64,20 +56,10 @@ enum
 /* File for log. */
 static const gchar LOG_FILE[] = "easytag.log";
 
-// Structure used to store information for the temporary list
-typedef struct
-{
-    gchar *time;    /* The time of this line of log */
-    EtLogAreaKind error_type;
-    gchar *string;  /* The string of the line of log to display */
-} EtLogAreaData;
-
-
 /**************
  * Prototypes *
  **************/
 static void Log_List_Set_Row_Visible (EtLogArea *self, GtkTreeIter *rowIter);
-static void Log_Print_Tmp_List (EtLogArea *self);
 static gchar *Log_Format_Date (void);
 
 
@@ -198,9 +180,6 @@ et_log_area_init (EtLogArea *self)
                       self);
     g_signal_connect (priv->log_view, "button-press-event",
                       G_CALLBACK (on_button_press_event), self);
-
-    /* Load pending messages in the Log list. */
-    Log_Print_Tmp_List (self);
 }
 
 
@@ -307,6 +286,8 @@ Log_Print (EtLogAreaKind error_type, const gchar * const format, ...)
     EtLogAreaPrivate *priv;
     va_list args;
     gchar *string;
+    gchar *time;
+    gint n_items;
     GtkTreeIter iter;
     static gboolean first_time = TRUE;
     static gchar *file_path = NULL;
@@ -315,48 +296,36 @@ Log_Print (EtLogAreaKind error_type, const gchar * const format, ...)
     GError *error = NULL;
 
     self = ET_LOG_AREA (et_application_window_get_log_area (ET_APPLICATION_WINDOW (MainWindow)));
+
+    g_return_if_fail (self != NULL);
+
     priv = et_log_area_get_instance_private (self);
 
     va_start (args, format);
     string = g_strdup_vprintf (format, args);
     va_end (args);
 
-    // If the log window is displayed then messages are displayed, else
-    // the messages are stored in a temporary list.
-    if (priv->log_view && priv->log_model)
-    {
-        gint n_items;
-        gchar *time = Log_Format_Date();
+    time = Log_Format_Date ();
 
-        /* Remove lines that exceed the limit. */
-        n_items = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (priv->log_model),
-                                                  NULL);
-
-        if (n_items > g_settings_get_uint (MainSettings, "log-lines") - 1
-            &&  gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->log_model),
-                                               &iter))
-        {
-            gtk_list_store_remove (GTK_LIST_STORE (priv->log_model), &iter);
-        }
+    /* Remove lines that exceed the limit. */
+    n_items = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (priv->log_model),
+                                              NULL);
 
-        gtk_list_store_insert_with_values (priv->log_model, &iter, G_MAXINT,
-                                           LOG_ICON_NAME,
-                                           get_icon_name_from_error_kind (error_type),
-                                           LOG_TIME_TEXT, time, LOG_TEXT,
-                                           string, -1);
-        Log_List_Set_Row_Visible (self, &iter);
-        g_free (time);
-    }
-    else
+    if (n_items > g_settings_get_uint (MainSettings, "log-lines") - 1
+        && gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->log_model),
+                                          &iter))
     {
-        EtLogAreaData *log_data = g_malloc0 (sizeof (EtLogAreaData));
-        log_data->time = Log_Format_Date ();
-        log_data->error_type = error_type;
-        log_data->string = g_strdup (string);
-
-        priv->log_tmp_list = g_list_append (priv->log_tmp_list, log_data);
+        gtk_list_store_remove (GTK_LIST_STORE (priv->log_model), &iter);
     }
 
+    gtk_list_store_insert_with_values (priv->log_model, &iter, G_MAXINT,
+                                       LOG_ICON_NAME,
+                                       get_icon_name_from_error_kind (error_type),
+                                       LOG_TIME_TEXT, time, LOG_TEXT,
+                                       string, -1);
+    Log_List_Set_Row_Visible (self, &iter);
+    g_free (time);
+
     // Store also the messages in the log file.
     if (!file_path)
     {
@@ -446,50 +415,3 @@ Log_Print (EtLogAreaKind error_type, const gchar * const format, ...)
     g_object_unref (file_ostream);
     g_object_unref (file);
 }
-
-/*
- * Display pending messages in the LogList
- */
-static void
-Log_Print_Tmp_List (EtLogArea *self)
-{
-    EtLogAreaPrivate *priv;
-    GList *l;
-    GtkTreeIter iter;
-
-    priv = et_log_area_get_instance_private (self);
-
-    priv->log_tmp_list = g_list_first (priv->log_tmp_list);
-
-    for (l = priv->log_tmp_list; l != NULL; l = g_list_next (l))
-    {
-        if (priv->log_model && priv->log_view)
-        {
-            EtLogAreaData *log_data = (EtLogAreaData *)l->data;
-            gtk_list_store_insert_with_values (priv->log_model, &iter,
-                                               G_MAXINT, LOG_ICON_NAME,
-                                               get_icon_name_from_error_kind (log_data->error_type),
-                                               LOG_TIME_TEXT, log_data->time,
-                                               LOG_TEXT, log_data->string, -1);
-            Log_List_Set_Row_Visible (self, &iter);
-        }
-    }
-
-    /* Free the list. */
-    if (priv->log_tmp_list)
-    {
-        GList *l;
-
-        for (l = priv->log_tmp_list; l != NULL; l = g_list_next (l))
-        {
-            EtLogAreaData *log_data = (EtLogAreaData *)l->data;
-
-            g_free (log_data->string);
-            g_free (log_data->time);
-            g_free (log_data);
-        }
-
-        g_list_free (priv->log_tmp_list);
-        priv->log_tmp_list = NULL;
-    }
-}
diff --git a/src/misc.c b/src/misc.c
index 7e3043e..c76cd2f 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -19,14 +19,10 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
+#include "misc.h"
+
 #include <glib/gi18n.h>
-#include <ctype.h>
-#include <sys/stat.h>
-#include <errno.h>
 
-#include "misc.h"
 #include "easytag.h"
 #include "id3_tag.h"
 #include "browser.h"
diff --git a/src/picture.c b/src/picture.c
index c5164fb..a9f53cd 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -17,20 +17,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config.h"
+
+#include "picture.h"
+
 #include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdk.h>
 #include <glib/gi18n.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
 
-#include "picture.h"
 #include "easytag.h"
 #include "log.h"
 #include "misc.h"
@@ -39,13 +32,7 @@
 
 #include "win32/win32dep.h"
 
-
-/**************
- * Prototypes *
- **************/
-
-static const gchar *Picture_Format_String (Picture_Format format);
-
+G_DEFINE_BOXED_TYPE (EtPicture, et_picture, et_picture_copy_single, et_picture_free)
 
 /*
  * Note :
@@ -55,10 +42,6 @@ static const gchar *Picture_Format_String (Picture_Format format);
  *
  */
 
-/*************
- * Functions *
- *************/
-
 /*
  * et_picture_type_from_filename:
  * @filename: UTF-8 representation of a filename
@@ -128,44 +111,35 @@ et_picture_type_from_filename (const gchar *filename_utf8)
 
 /* FIXME: Possibly use gnome_vfs_get_mime_type_for_buffer. */
 Picture_Format
-Picture_Format_From_Data (const Picture *pic)
+Picture_Format_From_Data (const EtPicture *pic)
 {
-    // JPEG : "\xff\xd8"
-    if (pic->data && pic->size > 2
-    &&  pic->data[0] == 0xff
-    &&  pic->data[1] == 0xd8)
+    gsize size;
+    gconstpointer data;
+
+    g_return_val_if_fail (pic != NULL, PICTURE_FORMAT_UNKNOWN);
+
+    data = g_bytes_get_data (pic->bytes, &size);
+
+    /* JPEG : "\xff\xd8\xff". */
+    if (size > 3 && (memcmp (data, "\xff\xd8\xff", 3) == 0))
+    {
         return PICTURE_FORMAT_JPEG;
+    }
 
-    // PNG : "\x89PNG\x0d\x0a\x1a\x0a"
-    if (pic->data && pic->size > 8
-    &&  pic->data[0] == 0x89
-    &&  pic->data[1] == 0x50
-    &&  pic->data[2] == 0x4e
-    &&  pic->data[3] == 0x47
-    &&  pic->data[4] == 0x0d
-    &&  pic->data[5] == 0x0a
-    &&  pic->data[6] == 0x1a
-    &&  pic->data[7] == 0x0a)
+    /* PNG : "\x89PNG\x0d\x0a\x1a\x0a". */
+    if (size > 8 && (memcmp (data, "\x89PNG\x0d\x0a\x1a\x0a", 8) == 0))
+    {
         return PICTURE_FORMAT_PNG;
+    }
     
     /* GIF: "GIF87a" */
-    if (pic->data && pic->size > 6
-    &&  pic->data[0] == 0x47
-    &&  pic->data[1] == 0x49
-    &&  pic->data[2] == 0x46
-    &&  pic->data[3] == 0x38
-    &&  pic->data[4] == 0x37
-    &&  pic->data[5] == 0x61)
+    if (size > 6 && (memcmp (data, "GIF87a", 6) == 0))
+    {
         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)
+    if (size > 6 && (memcmp (data, "GIF89a", 6) == 0))
     {
         return PICTURE_FORMAT_GIF;
     }
@@ -173,7 +147,8 @@ Picture_Format_From_Data (const Picture *pic)
     return PICTURE_FORMAT_UNKNOWN;
 }
 
-const gchar *Picture_Mime_Type_String (Picture_Format format)
+const gchar *
+Picture_Mime_Type_String (Picture_Format format)
 {
     switch (format)
     {
@@ -261,8 +236,8 @@ Picture_Type_String (EtPictureType type)
 }
 
 gchar *
-Picture_Info (const Picture *pic,
-              ET_Tag_Type tag_type)
+et_picture_format_info (const EtPicture *pic,
+                        ET_Tag_Type tag_type)
 {
     const gchar *format, *desc, *type;
     gchar *r, *size_str;
@@ -274,8 +249,8 @@ Picture_Info (const Picture *pic,
     else
         desc = "";
 
-    type = Picture_Type_String(pic->type);
-    size_str = g_format_size (pic->size);
+    type = Picture_Type_String (pic->type);
+    size_str = g_format_size (g_bytes_get_size (pic->bytes));
 
     // Behaviour following the tag type...
     switch (tag_type)
@@ -304,52 +279,87 @@ Picture_Info (const Picture *pic,
     return r;
 }
 
-Picture *Picture_Allocate (void)
+/*
+ * et_picture_new:
+ * @type: the image type
+ * @description: a text description
+ * @width: image width
+ * @height image height
+ * @bytes: image data
+ *
+ * Create a new #EtPicture instance, copying the string and adding a reference
+ * to the image data.
+ *
+ * Returns: a new #EtPicture, or %NULL on failure
+ */
+EtPicture *
+et_picture_new (EtPictureType type,
+                const gchar *description,
+                guint width,
+                guint height,
+                GBytes *bytes)
 {
-    Picture *pic = g_malloc0(sizeof(Picture));
+    EtPicture *pic;
+
+    g_return_val_if_fail (description != NULL, NULL);
+    g_return_val_if_fail (bytes != NULL, NULL);
+
+    pic = g_slice_new (EtPicture);
+
+    pic->type = type;
+    pic->description = g_strdup (description);
+    pic->width = width;
+    pic->height = height;
+    pic->bytes = g_bytes_ref (bytes);
+    pic->next = NULL;
+
     return pic;
 }
 
-Picture *Picture_Copy_One (const Picture *pic)
+EtPicture *
+et_picture_copy_single (const EtPicture *pic)
 {
-    Picture *pic2;
+    EtPicture *pic2;
 
     g_return_val_if_fail (pic != NULL, NULL);
 
-    pic2 = Picture_Allocate();
-    pic2->type = pic->type;
-    pic2->width  = pic->width;
-    pic2->height = pic->height;
-    if (pic->description)
-        pic2->description = g_strdup(pic->description);
-    if (pic->data)
-    {
-        pic2->size = pic->size;
-        pic2->data = g_malloc(pic2->size);
-        memcpy(pic2->data, pic->data, pic->size);
-    }
+    pic2 = et_picture_new (pic->type, pic->description, pic->width,
+                           pic->height, pic->bytes);
+
     return pic2;
 }
 
-Picture *Picture_Copy (const Picture *pic)
+EtPicture *
+et_picture_copy_all (const EtPicture *pic)
 {
-    Picture *pic2 = Picture_Copy_One(pic);
+    EtPicture *pic2 = et_picture_copy_single (pic);
+
     if (pic->next)
-        pic2->next = Picture_Copy(pic->next);
+    {
+        pic2->next = et_picture_copy_all (pic->next);
+    }
+
     return pic2;
 }
 
-void Picture_Free (Picture *pic)
+void
+et_picture_free (EtPicture *pic)
 {
-    if (!pic)
+    if (pic == NULL)
+    {
         return;
+    }
+
     if (pic->next)
-        Picture_Free(pic->next);
-    if (pic->description)
-        g_free(pic->description);
-    if (pic->data)
-        g_free(pic->data);
-    g_free(pic);
+    {
+        et_picture_free (pic->next);
+    }
+
+    g_free (pic->description);
+    g_bytes_unref (pic->bytes);
+    pic->bytes = NULL;
+
+    g_slice_free (EtPicture, pic);
 }
 
 
@@ -360,9 +370,9 @@ void Picture_Free (Picture *pic)
  *
  * Load an image from the supplied @file.
  *
- * Returns: an image on success, %NULL otherwise
+ * Returns: image data on success, %NULL otherwise
  */
-Picture *
+GBytes *
 et_picture_load_file_data (GFile *file, GError **error)
 {
     gsize size;
@@ -415,7 +425,9 @@ et_picture_load_file_data (GFile *file, GError **error)
     else
     {
         /* Image loaded. */
-        Picture *pic;
+        GBytes *bytes;
+        gpointer data;
+        gsize data_size;
 
         g_object_unref (file_istream);
 
@@ -428,19 +440,20 @@ et_picture_load_file_data (GFile *file, GError **error)
 
         g_assert (error == NULL || *error == NULL);
 
-        pic = Picture_Allocate ();
-        pic->data = g_memory_output_stream_steal_data (G_MEMORY_OUTPUT_STREAM (ostream));
-        pic->size = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (ostream));
+        data = g_memory_output_stream_steal_data (G_MEMORY_OUTPUT_STREAM (ostream));
+        data_size = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (ostream));
+        bytes = g_bytes_new_take (data, data_size);
+        /* TODO: Use g_memory_output_stream_steal_as_bytes(). */
 
         g_object_unref (ostream);
         g_assert (error == NULL || *error == NULL);
-        return pic;
+        return bytes;
     }
 }
 
 /*
  * et_picture_save_file_data:
- * @pic: the #Picture from which to take an image
+ * @pic: the #EtPicture from which to take an image
  * @file: the #GFile for which to save an image
  * @error: a #GError to provide information on errors, or %NULL to ignore
  *
@@ -449,9 +462,13 @@ et_picture_load_file_data (GFile *file, GError **error)
  * Returns: %TRUE on success, %FALSE otherwise
  */
 gboolean
-et_picture_save_file_data (const Picture *pic, GFile *file, GError **error)
+et_picture_save_file_data (const EtPicture *pic,
+                           GFile *file,
+                           GError **error)
 {
     GFileOutputStream *file_ostream;
+    gconstpointer data;
+    gsize data_size;
     gsize bytes_written;
 
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -465,12 +482,14 @@ et_picture_save_file_data (const Picture *pic, GFile *file, GError **error)
         return FALSE;
     }
 
-    if (!g_output_stream_write_all (G_OUTPUT_STREAM (file_ostream), pic->data,
-                                    pic->size, &bytes_written, NULL, error))
+    data = g_bytes_get_data (pic->bytes, &data_size);
+
+    if (!g_output_stream_write_all (G_OUTPUT_STREAM (file_ostream), data,
+                                    data_size, &bytes_written, NULL, error))
     {
         g_debug ("Only %" G_GSIZE_FORMAT " bytes out of %" G_GSIZE_FORMAT
                  " bytes of picture data were written", bytes_written,
-                 pic->size);
+                 g_bytes_get_size (pic->bytes));
         g_object_unref (file_ostream);
         g_assert (error == NULL || *error != NULL);
         return FALSE;
diff --git a/src/picture.h b/src/picture.h
index 0bc680b..34a8ab5 100644
--- a/src/picture.h
+++ b/src/picture.h
@@ -1,46 +1,32 @@
-/* picture.h - 2004/11/21 */
-/*
- *  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>
+ * 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 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_PICTURE_H_
 #define ET_PICTURE_H_
 
-#include "et_core.h"
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 
-/***************
- * Declaration *
- ***************/
+#include "core_types.h"
 
-/* Defined in et_core.h
-typedef struct _Picture Picture;
-struct _Picture
-{
-    gint     type;
-    gchar   *description;
-    gint     width;         // Original width of the picture
-    gint     height;        // Original height of the picture
-    gulong   size;          // Picture size in bits
-    guchar  *data;
-    Picture *next;
-};*/
+#define ET_TYPE_PICTURE (et_picture_get_type ())
 
 typedef enum // Picture types
 {
@@ -70,6 +56,26 @@ typedef enum // Picture types
     ET_PICTURE_TYPE_UNDEFINED
 } EtPictureType;
 
+/*
+ * EtPicture:
+ * @type: type of cover art
+ * @description: string to describe the image, often a suitable filename
+ * @width: original width, or 0 if unknown
+ * @height: original height, or 0 if unknown
+ * @bytes: image data
+ * @next: next image data in the list, or %NULL
+ */
+typedef struct _EtPicture EtPicture;
+struct _EtPicture
+{
+    EtPictureType type;
+    gchar *description;
+    gint width;
+    gint height;
+    GBytes *bytes;
+    EtPicture *next;
+};
+
 typedef enum
 {
     PICTURE_FORMAT_JPEG,
@@ -78,21 +84,18 @@ typedef enum
     PICTURE_FORMAT_UNKNOWN
 } Picture_Format;
 
-/**************
- * Prototypes *
- **************/
-
-Picture       *Picture_Allocate         (void);
-Picture       *Picture_Copy_One         (const Picture *pic);
-Picture       *Picture_Copy             (const Picture *pic);
-void           Picture_Free             (Picture *pic);
-Picture_Format Picture_Format_From_Data (const Picture *pic);
+GType et_picture_get_type (void);
+EtPicture * et_picture_new (EtPictureType type, const gchar *description, guint width, guint height, GBytes *bytes);
+EtPicture * et_picture_copy_single (const EtPicture *pic);
+EtPicture * et_picture_copy_all (const EtPicture *pic);
+void et_picture_free (EtPicture *pic);
+Picture_Format Picture_Format_From_Data (const EtPicture *pic);
 const gchar   *Picture_Mime_Type_String (Picture_Format format);
 const gchar * Picture_Type_String (EtPictureType type);
-gchar * Picture_Info (const Picture *pic, ET_Tag_Type tag_type);
+gchar * et_picture_format_info (const EtPicture *pic, ET_Tag_Type tag_type);
 
-Picture *et_picture_load_file_data (GFile *file, GError **error);
-gboolean et_picture_save_file_data (const Picture *pic, GFile *file, GError **error);
+GBytes * et_picture_load_file_data (GFile *file, GError **error);
+gboolean et_picture_save_file_data (const EtPicture *pic, GFile *file, GError **error);
 
 EtPictureType et_picture_type_from_filename (const gchar *filename_utf8);
 
diff --git a/src/playlist_dialog.c b/src/playlist_dialog.c
index 7eb6293..f0c6447 100644
--- a/src/playlist_dialog.c
+++ b/src/playlist_dialog.c
@@ -71,13 +71,10 @@ write_playlist (EtPlaylistDialog *self, GFile *file, GError **error)
     GFile *parent;
     GFileOutputStream *ostream;
     GString *to_write;
-    ET_File *etfile;
     GList *l;
     GList *etfilelist = NULL;
-    gchar *filename;
     gchar *basedir;
     gchar *temp;
-    gint duration;
     EtPlaylistContent playlist_content;
 
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -133,6 +130,8 @@ write_playlist (EtPlaylistDialog *self, GFile *file, GError **error)
 
         for (l = selfilelist; l != NULL; l = g_list_next (l))
         {
+            ET_File *etfile;
+
             etfile = et_application_window_browser_get_et_file_from_path (ET_APPLICATION_WINDOW (MainWindow),
                                                                           l->data);
             etfilelist = g_list_prepend (etfilelist, etfile);
@@ -148,6 +147,10 @@ write_playlist (EtPlaylistDialog *self, GFile *file, GError **error)
 
     for (l = etfilelist; l != NULL; l = g_list_next (l))
     {
+        const ET_File *etfile;
+        const gchar *filename;
+        gint duration;
+
         etfile = (ET_File *)l->data;
         filename = ((File_Name *)etfile->FileNameCur->data)->value;
         duration = ((ET_File_Info *)etfile->ETFileInfo)->duration;
diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index c6fa43b..31c87a4 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -22,13 +22,9 @@
 #include "preferences_dialog.h"
 
 #include <errno.h>
-#include <stdlib.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
-#include <stdio.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
 
 #include "application_window.h"
 #include "setting.h"
@@ -510,15 +506,15 @@ create_preferences_dialog (EtPreferencesDialog *self)
     /* Disc formatting. */
     pad_disc_number = GTK_WIDGET (gtk_builder_get_object (builder,
                                                           "tags_disc_check"));
-    g_settings_bind (MainSettings, "tag-number-padded", pad_disc_number,
+    g_settings_bind (MainSettings, "tag-disc-padded", pad_disc_number,
                      "active", G_SETTINGS_BIND_DEFAULT);
 
     pad_disc_number_spinbutton = GTK_WIDGET (gtk_builder_get_object (builder,
                                                                      "tags_disc_button"));
-    g_settings_bind (MainSettings, "tag-number-length",
+    g_settings_bind (MainSettings, "tag-disc-length",
                      pad_disc_number_spinbutton, "value",
                      G_SETTINGS_BIND_DEFAULT);
-    g_settings_bind (MainSettings, "tag-number-padded",
+    g_settings_bind (MainSettings, "tag-disc-padded",
                      pad_disc_number_spinbutton, "sensitive",
                      G_SETTINGS_BIND_GET);
     g_signal_emit_by_name (G_OBJECT (pad_disc_number), "toggled");
diff --git a/src/scan_dialog.c b/src/scan_dialog.c
index 3eb74d7..0c25813 100644
--- a/src/scan_dialog.c
+++ b/src/scan_dialog.c
@@ -21,11 +21,9 @@
 
 #include "scan_dialog.h"
 
-#include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
 #include <gdk/gdkkeysyms.h>
-#include <config.h>
 #include <glib/gi18n.h>
 
 #include "application_window.h"
@@ -207,8 +205,6 @@ static GList *Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask);
 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 GList *Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask);
 
 static void et_scan_on_response (GtkDialog *dialog, gint response_id,
@@ -220,6 +216,117 @@ static void et_scan_on_response (GtkDialog *dialog, gint response_id,
  *************/
 
 /*
+ * 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;
+    }
+}
+
+static void
+et_scan_dialog_set_file_tag_for_mask_item (File_Tag *file_tag,
+                                           Scan_Mask_Item *item)
+{
+    switch (item->code)
+    {
+        case 't':
+            et_file_tag_set_title (file_tag, item->string);
+            break;
+        case 'a':
+            et_file_tag_set_artist (file_tag, item->string);
+            break;
+        case 'b':
+            et_file_tag_set_album (file_tag, item->string);
+            break;
+        case 'd':
+            et_file_tag_set_disc_number (file_tag, item->string);
+            break;
+        case 'x':
+            et_file_tag_set_disc_total (file_tag, item->string);
+            break;
+        case 'y':
+            et_file_tag_set_year (file_tag, item->string);
+            break;
+        case 'n':
+            et_file_tag_set_track_number (file_tag, item->string);
+            break;
+        case 'l':
+            et_file_tag_set_track_total (file_tag, item->string);
+            break;
+        case 'g':
+            et_file_tag_set_genre (file_tag, item->string);
+            break;
+        case 'c':
+            et_file_tag_set_comment (file_tag, item->string);
+            break;
+        case 'p':
+            et_file_tag_set_composer (file_tag, item->string);
+            break;
+        case 'o':
+            et_file_tag_set_orig_artist (file_tag, item->string);
+            break;
+        case 'r':
+            et_file_tag_set_copyright (file_tag, item->string);
+            break;
+        case 'u':
+            et_file_tag_set_url (file_tag, item->string);
+            break;
+        case 'e':
+            et_file_tag_set_encoded_by (file_tag, item->string);
+            break;
+        case 'z':
+            et_file_tag_set_album_artist (file_tag, item->string);
+            break;
+        case 'i':
+            break;
+        default:
+            Log_Print (LOG_ERROR, "Scanner: Invalid code '%%%c' found!",
+                       item->code);
+            break;;
+    }
+}
+
+/*
  * Uses the filename and path to fill tag information
  * Note: mask and source are read from the right to the left
  */
@@ -229,7 +336,6 @@ Scan_Tag_With_Mask (EtScanDialog *self, ET_File *ETFile)
     EtScanDialogPrivate *priv;
     GList *fill_tag_list = NULL;
     GList *l;
-    gchar **dest = NULL;
     gchar *mask; // The 'mask' in the entry
     gchar *filename_utf8;
     File_Tag *FileTag;
@@ -252,15 +358,10 @@ Scan_Tag_With_Mask (EtScanDialog *self, ET_File *ETFile)
     {
         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 && (g_settings_get_boolean (MainSettings,
-                                             "fill-overwrite-tag-fields")
-            || *dest == NULL || strlen (*dest) == 0))
+        if (g_settings_get_boolean (MainSettings, "fill-overwrite-tag-fields"))
         {
-            ET_Set_Field_File_Tag_Item (dest, mask_item->string);
+            et_scan_dialog_set_file_tag_for_mask_item (FileTag, mask_item);
         }
 
     }
@@ -274,8 +375,7 @@ Scan_Tag_With_Mask (EtScanDialog *self, ET_File *ETFile)
     {
         gchar *default_comment = g_settings_get_string (MainSettings,
                                                         "fill-default-comment");
-        ET_Set_Field_File_Tag_Item ((void *)&FileTag->comment,
-                                    default_comment);
+        et_file_tag_set_comment  (FileTag, default_comment);
         g_free (default_comment);
     }
 
@@ -284,6 +384,7 @@ Scan_Tag_With_Mask (EtScanDialog *self, ET_File *ETFile)
         && (g_settings_get_boolean (MainSettings, "fill-overwrite-tag-fields")
             || FileTag->comment == NULL || strlen (FileTag->comment) == 0))
     {
+        GFile *file;
         GError *error = NULL;
         guint32 crc32_value;
         gchar *buffer;
@@ -293,12 +394,13 @@ Scan_Tag_With_Mask (EtScanDialog *self, ET_File *ETFile)
         switch (ETFileDescription->TagType)
         {
             case ID3_TAG:
-                if (crc32_file_with_ID3_tag (((File_Name *)((GList *)ETFile->FileNameNew)->data)->value,
-                                             &crc32_value, &error))
+                file = g_file_new_for_path (((File_Name *)((GList *)ETFile->FileNameNew)->data)->value);
+
+                if (crc32_file_with_ID3_tag (file, &crc32_value, &error))
                 {
                     buffer = g_strdup_printf ("%.8" G_GUINT32_FORMAT,
                                               crc32_value);
-                    ET_Set_Field_File_Tag_Item((void *)&FileTag->comment,buffer);
+                    et_file_tag_set_comment (FileTag, buffer);
                     g_free(buffer);
                 }
                 else
@@ -308,6 +410,8 @@ Scan_Tag_With_Mask (EtScanDialog *self, ET_File *ETFile)
                                error->message);
                     g_error_free (error);
                 }
+
+                g_object_unref (file);
                 break;
             default:
                 break;
@@ -435,7 +539,7 @@ Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask)
             /*
              * Allocate a new iten for the fill_tag_list
              */
-            mask_item = g_malloc0(sizeof(Scan_Mask_Item));
+            mask_item = g_slice_new0 (Scan_Mask_Item);
 
             // Get the code (used to determine the corresponding target entry)
             mask_item->code = tmp[1];
@@ -656,7 +760,7 @@ Scan_Free_File_Fill_Tag_List (GList *list)
         if (l->data)
         {
             g_free (((Scan_Mask_Item *)l->data)->string);
-            g_free ((Scan_Mask_Item *)l->data);
+            g_slice_free (Scan_Mask_Item, l->data);
         }
     }
 
@@ -803,7 +907,7 @@ et_scan_generate_new_filename_from_mask (const ET_File *ETFile,
         // Mask contains some characters after the code ('%b__')
         if (strlen(tmp)>2)
         {
-            mask_item = g_malloc0(sizeof(File_Mask_Item));
+            mask_item = g_slice_new0 (File_Mask_Item);
             if (counter)
             {
                 if (strchr(tmp+2,G_DIR_SEPARATOR))
@@ -820,7 +924,7 @@ et_scan_generate_new_filename_from_mask (const ET_File *ETFile,
 
         // 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));
+        mask_item = g_slice_new0 (File_Mask_Item);
         if (source && *source && strlen(*source)>0)
         {
             mask_item->type = FIELD;
@@ -865,7 +969,7 @@ et_scan_generate_new_filename_from_mask (const ET_File *ETFile,
     // 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 = g_slice_new0 (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);
@@ -987,7 +1091,7 @@ Scan_Free_File_Rename_List (GList *list)
         if (l->data)
         {
             g_free (((File_Mask_Item *)l->data)->string);
-            g_free ((File_Mask_Item *)l->data);
+            g_slice_free (File_Mask_Item, l->data);
         }
     }
 
@@ -1005,8 +1109,8 @@ Scan_Rename_File_Prefix_Path (EtScanDialog *self)
     gchar *path_tmp;
     const gchar *combo_text = NULL;
     gchar *combo_tmp;
-    ET_File *ETFile = ETCore->ETFileDisplayed;
-    gchar *filename_utf8_cur;
+    const ET_File *ETFile = ETCore->ETFileDisplayed;
+    const gchar *filename_utf8_cur;
     gchar *path_utf8_cur;
 
     if (!ETFile)
@@ -1260,7 +1364,7 @@ Scan_Process_Fields (EtScanDialog *self, ET_File *ETFile)
 
             Scan_Process_Fields_Functions (self, &string);
 
-            ET_Set_Field_File_Tag_Item(&FileTag->title,string);
+            et_file_tag_set_title (FileTag, string);
 
             g_free(string);
         }
@@ -1279,7 +1383,7 @@ Scan_Process_Fields (EtScanDialog *self, ET_File *ETFile)
 
             Scan_Process_Fields_Functions (self, &string);
 
-            ET_Set_Field_File_Tag_Item(&FileTag->artist,string);
+            et_file_tag_set_artist (FileTag, string);
 
             g_free(string);
         }
@@ -1298,7 +1402,7 @@ Scan_Process_Fields (EtScanDialog *self, ET_File *ETFile)
 
             Scan_Process_Fields_Functions (self, &string);
 
-            ET_Set_Field_File_Tag_Item(&FileTag->album_artist,string);
+            et_file_tag_set_album_artist (FileTag, string);
 
             g_free(string);
         }
@@ -1317,7 +1421,7 @@ Scan_Process_Fields (EtScanDialog *self, ET_File *ETFile)
 
             Scan_Process_Fields_Functions (self, &string);
 
-            ET_Set_Field_File_Tag_Item(&FileTag->album,string);
+            et_file_tag_set_album (FileTag, string);
 
             g_free(string);
         }
@@ -1336,7 +1440,7 @@ Scan_Process_Fields (EtScanDialog *self, ET_File *ETFile)
 
             Scan_Process_Fields_Functions (self, &string);
 
-            ET_Set_Field_File_Tag_Item(&FileTag->genre,string);
+            et_file_tag_set_genre (FileTag, string);
 
             g_free(string);
         }
@@ -1355,7 +1459,7 @@ Scan_Process_Fields (EtScanDialog *self, ET_File *ETFile)
 
             Scan_Process_Fields_Functions (self, &string);
 
-            ET_Set_Field_File_Tag_Item(&FileTag->comment,string);
+            et_file_tag_set_comment (FileTag, string);
 
             g_free(string);
         }
@@ -1374,7 +1478,7 @@ Scan_Process_Fields (EtScanDialog *self, ET_File *ETFile)
 
             Scan_Process_Fields_Functions (self, &string);
 
-            ET_Set_Field_File_Tag_Item(&FileTag->composer,string);
+            et_file_tag_set_composer (FileTag, string);
 
             g_free(string);
         }
@@ -1393,7 +1497,7 @@ Scan_Process_Fields (EtScanDialog *self, ET_File *ETFile)
 
             Scan_Process_Fields_Functions (self, &string);
 
-            ET_Set_Field_File_Tag_Item(&FileTag->orig_artist,string);
+            et_file_tag_set_orig_artist (FileTag, string);
 
             g_free(string);
         }
@@ -1412,7 +1516,7 @@ Scan_Process_Fields (EtScanDialog *self, ET_File *ETFile)
 
             Scan_Process_Fields_Functions (self, &string);
 
-            ET_Set_Field_File_Tag_Item(&FileTag->copyright,string);
+            et_file_tag_set_copyright (FileTag, string);
 
             g_free(string);
         }
@@ -1431,7 +1535,7 @@ Scan_Process_Fields (EtScanDialog *self, ET_File *ETFile)
 
             Scan_Process_Fields_Functions (self, &string);
 
-            ET_Set_Field_File_Tag_Item(&FileTag->url,string);
+            et_file_tag_set_url (FileTag, string);
 
             g_free(string);
         }
@@ -1450,7 +1554,7 @@ Scan_Process_Fields (EtScanDialog *self, ET_File *ETFile)
 
             Scan_Process_Fields_Functions (self, &string);
 
-            ET_Set_Field_File_Tag_Item(&FileTag->encoded_by,string);
+            et_file_tag_set_encoded_by (FileTag, string);
 
             g_free(string);
         }
@@ -1466,56 +1570,6 @@ Scan_Process_Fields (EtScanDialog *self, ET_File *ETFile)
 
 }
 
-/*
- * 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 *
  ******************/
diff --git a/src/scan_dialog.h b/src/scan_dialog.h
index 4784ced..4819d86 100644
--- a/src/scan_dialog.h
+++ b/src/scan_dialog.h
@@ -21,12 +21,13 @@
 #ifndef ET_SCAN_DIALOG_H_
 #define ET_SCAN_DIALOG_H_
 
-#include "et_core.h"
-
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
+#include "file.h"
+#include "setting.h"
+
 #define ET_TYPE_SCAN_DIALOG (et_scan_dialog_get_type ())
 #define ET_SCAN_DIALOG(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), ET_TYPE_SCAN_DIALOG, EtScanDialog))
 
diff --git a/src/setting.c b/src/setting.c
index ebf98c7..81943a5 100644
--- a/src/setting.c
+++ b/src/setting.c
@@ -19,14 +19,10 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
-#include <dirent.h>
 #include <sys/types.h>
-#include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <errno.h>
@@ -123,27 +119,34 @@ void Init_Config_Variables (void)
  *
  * Check that the provided @filename exists, and if not, create it.
  */
-static void check_or_create_file (const gchar *filename)
+static void
+check_or_create_file (const gchar *filename)
 {
-    FILE  *file;
-    gchar *file_path = NULL;
+    gchar *file_path;
+    GFile *file;
+    GFileOutputStream *ostream;
+    GError *error = NULL;
 
     g_return_if_fail (filename != NULL);
 
     file_path = g_build_filename (g_get_user_config_dir (), PACKAGE_TARNAME,
                                   filename, NULL);
 
-    if ((file = fopen (file_path, "a+")) != NULL )
+    file = g_file_new_for_path (file_path);
+
+    if (!(ostream = g_file_append_to (file, G_FILE_CREATE_NONE, NULL, &error)))
     {
-        fclose (file);
+        g_debug ("Cannot create or open file ‘%s’: %s", file_path,
+                 error->message);
+        g_error_free (error);
     }
     else
     {
-        Log_Print (LOG_ERROR, _("Cannot create or open file ‘%s’: %s"),
-                   filename, g_strerror (errno));
+        g_object_unref (ostream);
     }
 
     g_free (file_path);
+    g_object_unref (file);
 }
 
 /*
@@ -173,103 +176,158 @@ gboolean Setting_Create_Files (void)
  * Save the contents of a list store to a file
  */
 static void
-Save_List_Store_To_File (const gchar *filename, GtkListStore *liststore, gint colnum)
+Save_List_Store_To_File (const gchar *filename,
+                         GtkListStore *liststore,
+                         gint colnum)
 {
-    gchar *file_path = NULL;
-    FILE *file;
-    gchar *text;
+    gchar *file_path;
+    GFile *file;
+    GFileOutputStream *ostream;
     GtkTreeIter iter;
+    GError *error = NULL;
 
-    if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(liststore), &iter))
+    if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (liststore), &iter)
+        || !Create_Easytag_Directory ())
+    {
         return;
+    }
 
     /* The file to write */
     file_path = g_build_filename (g_get_user_config_dir (), PACKAGE_TARNAME,
                                   filename, NULL);
+    file = g_file_new_for_path (file_path);
+    g_free (file_path);
 
-    if (!Create_Easytag_Directory () || (file = fopen (file_path, "w+")) == NULL)
+    if (!(ostream = g_file_replace (file, NULL, FALSE, G_FILE_CREATE_NONE, NULL,
+                                    &error)))
     {
-        Log_Print (LOG_ERROR, _("Cannot write list to file ‘%s’: %s"),
-                   file_path, g_strerror (errno));
-    }else
+        goto err;
+    }
+    else
     {
+        GString *data;
+        gsize bytes_written;
+
+        data = g_string_new ("");
+
         do
         {
-            GString *data;
+            gchar *text;
 
             gtk_tree_model_get (GTK_TREE_MODEL (liststore), &iter, colnum,
                                 &text, -1);
-            data = g_string_new (text);
+            g_string_append (data, text);
             g_free (text);
             g_string_append_c (data, '\n');
+        } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (liststore), &iter));
 
-            if (*data->str != '\n')
-            {
-                if (fwrite (data->str, data->len, 1, file) != 1)
-                {
-                    Log_Print (LOG_ERROR, _("Error while writing list file ‘%s’"),
-                               file_path);
-                    fclose (file);
-                    g_string_free (data, TRUE);
-                    g_free (file_path);
-                    return;
-                }
-            }
+        if (!g_output_stream_write_all (G_OUTPUT_STREAM (ostream), data->str,
+                                        data->len, &bytes_written, NULL,
+                                        &error))
+        {
             g_string_free (data, TRUE);
-        } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(liststore), &iter));
-        fclose(file);
+            g_object_unref (ostream);
+            goto err;
+        }
+
+        g_string_free (data, TRUE);
+        g_object_unref (ostream);
     }
-    g_free(file_path);
+
+    g_object_unref (file);
+    return;
+
+err:
+    /* FIXME: Format filename encoding for display. */
+    file_path = g_file_get_path (file);
+    Log_Print (LOG_ERROR, _("Cannot write list to file ‘%s’: %s"),
+               file_path, error->message);
+
+    g_error_free (error);
+    g_free (file_path);
+    g_object_unref (file);
+    return;
 }
 
 /*
  * Populate a list store with data from a file passed in as first parameter
  */
 static gboolean
-Populate_List_Store_From_File (const gchar *filename, GtkListStore *liststore, gint text_column)
+Populate_List_Store_From_File (const gchar *filename,
+                               GtkListStore *liststore,
+                               gint text_column)
 {
-
-    gchar *file_path = NULL;
-    FILE *file;
-    gchar buffer[MAX_STRING_LEN];
+    gchar *file_path;
+    GFile *file;
+    GFileInputStream *istream;
     gboolean entries_set = FALSE;
+    GError *error = NULL;
 
     /* The file to write */
     g_return_val_if_fail (filename != NULL, FALSE);
 
     file_path = g_build_filename (g_get_user_config_dir (), PACKAGE_TARNAME,
                                   filename, NULL);
+    file = g_file_new_for_path (file_path);
+    g_free (file_path);
+
+    istream = g_file_read (file, NULL, &error);
 
-    if ((file = fopen (file_path, "r")) == NULL)
+    if (!istream)
     {
-        Log_Print (LOG_ERROR, _("Cannot open file ‘%s’: %s"), file_path,
-                   g_strerror (errno));
-    }else
+        goto err;
+    }
+    else
     {
-        gchar *data = NULL;
+        GDataInputStream *data;
+        gsize bytes_read;
+        gchar *line;
 
-        while(fgets(buffer,sizeof(buffer),file))
+        data = g_data_input_stream_new (G_INPUT_STREAM (istream));
+        /* TODO: Find a safer alternative to _ANY. */
+        g_data_input_stream_set_newline_type (data,
+                                              G_DATA_STREAM_NEWLINE_TYPE_ANY);
+
+        while ((line = g_data_input_stream_read_line (data, &bytes_read, NULL,
+                                                      &error)))
         {
-            if (buffer[strlen(buffer)-1]=='\n')
-                buffer[strlen(buffer)-1]='\0';
+            gchar *utf8_line;
 
-            /*if (g_utf8_validate(buffer, -1, NULL))
-                data = g_strdup(buffer);
-            else
-                data = convert_to_utf8(buffer);*/
-            data = Try_To_Validate_Utf8_String(buffer);
+            utf8_line = Try_To_Validate_Utf8_String (line);
+            g_free (line);
 
-            if (data && g_utf8_strlen(data, -1) > 0)
+            if (utf8_line && g_utf8_strlen (utf8_line, -1) > 0)
             {
                 gtk_list_store_insert_with_values (liststore, NULL, G_MAXINT,
-                                                   text_column, data, -1);
+                                                   text_column, utf8_line, -1);
                 entries_set = TRUE;
             }
-            g_free(data);
+
+            g_free (utf8_line);
+        }
+
+        g_object_unref (data);
+
+        if (error)
+        {
+            g_object_unref (istream);
+            goto err;
         }
-        fclose(file);
     }
-    g_free(file_path);
+
+    g_object_unref (istream);
+    g_object_unref (file);
+
+    return entries_set;
+
+err:
+    file_path = g_file_get_path (file);
+    Log_Print (LOG_ERROR, _("Cannot open file ‘%s’: %s"), file_path,
+               error->message);
+
+    g_free (file_path);
+    g_error_free (error);
+    g_object_unref (file);
     return entries_set;
 }
 
@@ -402,9 +460,8 @@ migrate_config_file_dir (const gchar *old_path, const gchar *new_path)
                                         NULL
     };
 
-    Log_Print (LOG_OK,
-               _("Migrating configuration from directory ‘%s’ to ‘%s’"),
-               old_path, new_path);
+    g_debug ("Migrating configuration from directory ‘%s’ to ‘%s’", old_path,
+             new_path);
 
     for (i = 0; filenames[i]; i++)
     {
@@ -426,9 +483,8 @@ migrate_config_file_dir (const gchar *old_path, const gchar *new_path)
         if (!g_file_move (old_file, new_file, G_FILE_COPY_NONE, NULL, NULL,
                           NULL, NULL))
         {
-            Log_Print (LOG_ERROR,
-                       _("Failed to migrate configuration file ‘%s’"),
-                       filenames[i]);
+            g_debug ("Failed to migrate configuration file ‘%s’",
+                     filenames[i]);
         }
 
         g_free (old_filename);
@@ -464,8 +520,8 @@ Create_Easytag_Directory (void)
 
     if (result == -1)
     {
-        Log_Print (LOG_ERROR, _("Cannot create directory ‘%s’: %s"),
-                  easytag_path, g_strerror (errno));
+        g_debug ("Cannot create directory ‘%s’: %s", easytag_path,
+                 g_strerror (errno));
         g_free (easytag_path);
         return FALSE;
     }
diff --git a/src/status_bar.c b/src/status_bar.c
index 3e7e4d0..a9be060 100644
--- a/src/status_bar.c
+++ b/src/status_bar.c
@@ -19,9 +19,10 @@
 
 #include "config.h"
 
+#include "status_bar.h"
+
 #include <glib/gi18n.h>
 
-#include "status_bar.h"
 #include "charset.h"
 
 /* TODO: Use G_DEFINE_TYPE_WITH_PRIVATE. */
diff --git a/src/tag_area.c b/src/tag_area.c
index 4be465e..d6ea9ef 100644
--- a/src/tag_area.c
+++ b/src/tag_area.c
@@ -20,13 +20,12 @@
 
 #include "tag_area.h"
 
-#include <ctype.h>
 #include <glib/gi18n.h>
 
 #include "application_window.h"
 #include "charset.h"
 #include "easytag.h"
-#include "et_core.h"
+#include "file_list.h"
 #include "genres.h"
 #include "log.h"
 #include "misc.h"
@@ -179,7 +178,7 @@ on_apply_to_selection (GObject *object,
             etfile = (ET_File *)l->data;
             FileTag = ET_File_Tag_Item_New();
             ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->title,string_to_set);
+            et_file_tag_set_title (FileTag, string_to_set);
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
@@ -201,7 +200,7 @@ on_apply_to_selection (GObject *object,
             etfile = (ET_File *)l->data;
             FileTag = ET_File_Tag_Item_New();
             ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->artist,string_to_set);
+            et_file_tag_set_artist (FileTag, string_to_set);
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
@@ -222,7 +221,7 @@ on_apply_to_selection (GObject *object,
             etfile = (ET_File *)l->data;
             FileTag = ET_File_Tag_Item_New();
             ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->album_artist,string_to_set);
+            et_file_tag_set_album_artist (FileTag, string_to_set);
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
@@ -244,7 +243,7 @@ on_apply_to_selection (GObject *object,
             etfile = (ET_File *)l->data;
             FileTag = ET_File_Tag_Item_New();
             ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->album,string_to_set);
+            et_file_tag_set_album (FileTag, string_to_set);
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
@@ -282,8 +281,8 @@ on_apply_to_selection (GObject *object,
             etfile = (ET_File *)l->data;
             FileTag = ET_File_Tag_Item_New();
             ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item (&FileTag->disc_number, string_to_set);
-            ET_Set_Field_File_Tag_Item (&FileTag->disc_total, string_to_set1);
+            et_file_tag_set_disc_number (FileTag, string_to_set);
+            et_file_tag_set_disc_total (FileTag, string_to_set1);
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
 
@@ -314,7 +313,7 @@ on_apply_to_selection (GObject *object,
             etfile = (ET_File *)l->data;
             FileTag = ET_File_Tag_Item_New();
             ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->year,string_to_set);
+            et_file_tag_set_year (FileTag, string_to_set);
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
@@ -342,8 +341,11 @@ on_apply_to_selection (GObject *object,
             // We apply the TrackEntry field to all others files only if it is to delete
             // the field (string=""). Else we don't overwrite the track number
             if (!string_to_set || g_utf8_strlen(string_to_set, -1) == 0)
-                ET_Set_Field_File_Tag_Item(&FileTag->track,string_to_set);
-            ET_Set_Field_File_Tag_Item(&FileTag->track_total,string_to_set1);
+            {
+                et_file_tag_set_track_number (FileTag, string_to_set);
+            }
+
+            et_file_tag_set_track_total (FileTag, string_to_set1);
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
 
@@ -385,7 +387,7 @@ on_apply_to_selection (GObject *object,
         while (etfilelist && etfilelistfull)
         {
             // To get the path of the file
-            File_Name *FileNameCur = (File_Name *)((ET_File *)etfilelistfull->data)->FileNameCur->data;
+            const File_Name *FileNameCur = (File_Name *)((ET_File *)etfilelistfull->data)->FileNameCur->data;
             // The ETFile in the selected file list
             etfile = etfilelist->data;
 
@@ -402,7 +404,7 @@ on_apply_to_selection (GObject *object,
             {
                 FileTag = ET_File_Tag_Item_New();
                 ET_Copy_File_Tag_Item(etfile,FileTag);
-                ET_Set_Field_File_Tag_Item(&FileTag->track,string_to_set);
+                et_file_tag_set_track_number (FileTag, string_to_set);
                 ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
 
                 if (!etfilelist->next) break;
@@ -439,7 +441,7 @@ on_apply_to_selection (GObject *object,
 
             FileTag = ET_File_Tag_Item_New();
             ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->track_total,string_to_set);
+            et_file_tag_set_track_total (FileTag, string_to_set);
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
 
@@ -462,7 +464,7 @@ on_apply_to_selection (GObject *object,
             etfile = (ET_File *)l->data;
             FileTag = ET_File_Tag_Item_New();
             ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->genre,string_to_set);
+            et_file_tag_set_genre (FileTag, string_to_set);
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
@@ -491,7 +493,7 @@ on_apply_to_selection (GObject *object,
             etfile = (ET_File *)l->data;
             FileTag = ET_File_Tag_Item_New();
             ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->comment,string_to_set);
+            et_file_tag_set_comment (FileTag, string_to_set);
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
@@ -512,7 +514,7 @@ on_apply_to_selection (GObject *object,
             etfile = (ET_File *)l->data;
             FileTag = ET_File_Tag_Item_New();
             ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->composer,string_to_set);
+            et_file_tag_set_composer (FileTag, string_to_set);
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
@@ -534,7 +536,7 @@ on_apply_to_selection (GObject *object,
             etfile = (ET_File *)l->data;
             FileTag = ET_File_Tag_Item_New();
             ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->orig_artist,string_to_set);
+            et_file_tag_set_orig_artist (FileTag, string_to_set);
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
@@ -556,7 +558,7 @@ on_apply_to_selection (GObject *object,
             etfile = (ET_File *)l->data;
             FileTag = ET_File_Tag_Item_New();
             ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->copyright,string_to_set);
+            et_file_tag_set_copyright (FileTag, string_to_set);
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
@@ -578,7 +580,7 @@ on_apply_to_selection (GObject *object,
             etfile = (ET_File *)l->data;
             FileTag = ET_File_Tag_Item_New();
             ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->url,string_to_set);
+            et_file_tag_set_url (FileTag, string_to_set);
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
@@ -600,7 +602,7 @@ on_apply_to_selection (GObject *object,
             etfile = (ET_File *)l->data;
             FileTag = ET_File_Tag_Item_New();
             ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Item(&FileTag->encoded_by,string_to_set);
+            et_file_tag_set_encoded_by (FileTag, string_to_set);
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
@@ -615,7 +617,7 @@ on_apply_to_selection (GObject *object,
     }
     else if (object == G_OBJECT (priv->apply_image_toolitem))
     {
-        Picture *res = NULL, *pic, *prev_pic = NULL;
+        EtPicture *res = NULL, *pic, *prev_pic = NULL;
         GtkTreeModel *model;
         GtkTreeIter iter;
 
@@ -624,8 +626,9 @@ on_apply_to_selection (GObject *object,
         {
             do
             {
-                gtk_tree_model_get(model, &iter, PICTURE_COLUMN_DATA, &pic, -1);
-                pic = Picture_Copy_One(pic);
+                gtk_tree_model_get (model, &iter, PICTURE_COLUMN_DATA, &pic,
+                                    -1);
+
                 if (!res)
                     res = pic;
                 else
@@ -639,7 +642,7 @@ on_apply_to_selection (GObject *object,
             etfile = (ET_File *)l->data;
             FileTag = ET_File_Tag_Item_New();
             ET_Copy_File_Tag_Item(etfile,FileTag);
-            ET_Set_Field_File_Tag_Picture((Picture **)&FileTag->picture, res);
+            et_file_tag_set_picture (FileTag, res);
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (res)
@@ -651,7 +654,7 @@ on_apply_to_selection (GObject *object,
             msg = g_strdup (_("Removed images from selected files"));
         }
 
-        Picture_Free (res);
+        et_picture_free (res);
     }
 
     g_list_free(etfilelist);
@@ -1074,7 +1077,7 @@ Insert_Only_Digit (GtkEditable *editable,
     if (length<=0 || !inserted_text)
         return;
 
-    if (!isdigit((guchar)inserted_text[0]) && inserted_text[0] != '-')
+    if (!g_ascii_isdigit (inserted_text[0]) && inserted_text[0] != '-')
     {
         g_signal_stop_emission_by_name(G_OBJECT(editable),"insert_text");
         return;
@@ -1091,7 +1094,7 @@ Insert_Only_Digit (GtkEditable *editable,
     // Check the rest, if any...
     for (i = 1; i < length; i++)
     {
-        if (isdigit((guchar)inserted_text[i]))
+        if (g_ascii_isdigit (inserted_text[i]))
         {
             result[j++] = inserted_text[i];
         }
@@ -1216,29 +1219,15 @@ static void
 PictureEntry_Clear (EtTagArea *self)
 {
     EtTagAreaPrivate *priv;
-    GtkTreeModel *model;
-    GtkTreeIter iter;
-    Picture *pic;
 
     priv = et_tag_area_get_instance_private (self);
 
-    model = GTK_TREE_MODEL (priv->images_model);
-
-    if (gtk_tree_model_get_iter_first (model, &iter))
-    {
-        do
-        {
-            gtk_tree_model_get (model, &iter, PICTURE_COLUMN_DATA, &pic, -1);
-            Picture_Free (pic);
-        } while (gtk_tree_model_iter_next (model, &iter));
-    }
-
     gtk_list_store_clear (priv->images_model);
 }
 
 static void
 PictureEntry_Update (EtTagArea *self,
-                     Picture *pic,
+                     EtPicture *pic,
                      gboolean select_it)
 {
     EtTagAreaPrivate *priv;
@@ -1249,17 +1238,17 @@ PictureEntry_Update (EtTagArea *self,
 
     priv = et_tag_area_get_instance_private (self);
 
-    if (!pic->data)
-    {
-        PictureEntry_Clear (self);
-        return;
-    }
-
     loader = gdk_pixbuf_loader_new ();
 
     if (loader)
     {
-        if (gdk_pixbuf_loader_write(loader, pic->data, pic->size, &error))
+        gconstpointer data;
+        gsize data_size;
+
+        data = g_bytes_get_data (pic->bytes, &data_size);
+
+        /* TODO: Use gdk_pixbuf_loader_write_bytes(). */
+        if (gdk_pixbuf_loader_write (loader, data, data_size, &error))
         {
             GtkTreeSelection *selection;
             GdkPixbuf *pixbuf;
@@ -1304,8 +1293,8 @@ PictureEntry_Update (EtTagArea *self,
                                     GDK_INTERP_BILINEAR);
                 g_object_unref(pixbuf);
 
-                pic_info = Picture_Info (pic,
-                                         ETCore->ETFileDisplayed->ETFileDescription->TagType);
+                pic_info = et_picture_format_info (pic,
+                                                   ETCore->ETFileDisplayed->ETFileDescription->TagType);
                 gtk_list_store_insert_with_values (priv->images_model, &iter1,
                                                    G_MAXINT,
                                                    PICTURE_COLUMN_PIC,
@@ -1313,7 +1302,7 @@ PictureEntry_Update (EtTagArea *self,
                                                    PICTURE_COLUMN_TEXT,
                                                    pic_info,
                                                    PICTURE_COLUMN_DATA,
-                                                   Picture_Copy_One (pic), -1);
+                                                   pic, -1);
                 g_free(pic_info);
 
                 if (select_it)
@@ -1371,7 +1360,7 @@ static void
 load_picture_from_file (GFile *file,
                         EtTagArea *self)
 {
-    Picture *pic;
+    GBytes *bytes;
     const gchar *filename_utf8;
     GFileInfo *info;
     GError *error = NULL;
@@ -1387,9 +1376,9 @@ load_picture_from_file (GFile *file,
     }
 
     filename_utf8 = g_file_info_get_display_name (info);
-    pic = et_picture_load_file_data (file, &error);
+    bytes = et_picture_load_file_data (file, &error);
 
-    if (!pic)
+    if (!bytes)
     {
         GtkWidget *msgdialog;
 
@@ -1418,12 +1407,17 @@ load_picture_from_file (GFile *file,
 
     if (filename_utf8)
     {
+        EtPicture *pic;
+        EtPictureType type;
+        const gchar *description;
+
         // Behaviour following the tag type...
         switch (ETCore->ETFileDisplayed->ETFileDescription->TagType)
         {
             // Only one picture supported for MP4
             case MP4_TAG:
-                pic->type = ET_PICTURE_TYPE_FRONT_COVER;
+                description = "";
+                type = ET_PICTURE_TYPE_FRONT_COVER;
                 break;
 
             // Other tag types
@@ -1433,16 +1427,16 @@ load_picture_from_file (GFile *file,
             case APE_TAG:
             case FLAC_TAG:
             case WAVPACK_TAG:
-                pic->description = g_strdup (filename_utf8);
+                description = filename_utf8;
 
                 if (g_settings_get_boolean (MainSettings,
                                             "tag-image-type-automatic"))
                 {
-                    pic->type = et_picture_type_from_filename (pic->description);
+                    type = et_picture_type_from_filename (description);
                 }
                 else
                 {
-                    pic->type = ET_PICTURE_TYPE_FRONT_COVER;
+                    type = ET_PICTURE_TYPE_FRONT_COVER;
                 }
                 break;
 
@@ -1450,11 +1444,14 @@ load_picture_from_file (GFile *file,
                 g_assert_not_reached ();
         }
 
+        pic = et_picture_new (type, description, 0, 0, bytes);
+
         PictureEntry_Update (self, pic, TRUE);
 
-        Picture_Free (pic);
+        et_picture_free (pic);
     }
 
+    g_bytes_unref (bytes);
     g_object_unref (info);
 }
 
@@ -1535,7 +1532,7 @@ on_picture_add_button_clicked (GObject *object,
     // Starting directory (the same of the current file)
     if (ETCore->ETFileDisplayed)
     {
-        gchar *cur_filename_utf8 = ((File_Name *)((GList *)ETCore->ETFileDisplayed->FileNameCur)->data)->value_utf8;
+        const gchar *cur_filename_utf8 = ((File_Name *)((GList *)ETCore->ETFileDisplayed->FileNameCur)->data)->value_utf8;
         init_dir = g_path_get_dirname(cur_filename_utf8);
         gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(FileSelectionWindow),init_dir);
     }else
@@ -1613,7 +1610,7 @@ on_picture_properties_button_clicked (GObject *object,
     {
         GtkWidget *PictureTypesWindow;
         GtkTreePath *path = l->data;
-        Picture *pic = NULL;
+        EtPicture *pic = NULL;
         GtkTreeSelection *selectiontype;
         gchar *title;
         GtkTreePath *rowPath;
@@ -1777,8 +1774,8 @@ on_picture_properties_button_clicked (GObject *object,
                 pic->description = buffer;
 
                 /* Update value in the PictureEntryView. */
-                pic_info = Picture_Info (pic,
-                                         ETCore->ETFileDisplayed->ETFileDescription->TagType);
+                pic_info = et_picture_format_info (pic,
+                                                   ETCore->ETFileDisplayed->ETFileDescription->TagType);
                 gtk_list_store_set (GTK_LIST_STORE (model), &iter,
                                     PICTURE_COLUMN_TEXT, pic_info, -1);
                 g_free (pic_info);
@@ -1827,7 +1824,7 @@ on_picture_save_button_clicked (GObject *object,
     {
         GtkTreePath *path = l->data;
         GtkTreeIter iter;
-        Picture *pic;
+        EtPicture *pic;
         gchar *title;
         gboolean valid;
         gint response;
@@ -2056,13 +2053,9 @@ on_picture_clear_button_clicked (GObject *object,
     for (l = refs; l != NULL; l = g_list_next (l))
     {
         GtkTreePath *path = gtk_tree_row_reference_get_path (l->data);
-        Picture *pic;
 
         if (gtk_tree_model_get_iter (model, &iter, path))
         {
-            gtk_tree_model_get(model, &iter, PICTURE_COLUMN_DATA, &pic,-1);
-            Picture_Free(pic);
-
             gtk_list_store_remove (priv->images_model, &iter);
         }
 
@@ -2129,6 +2122,10 @@ create_tag_area (EtTagArea *self)
 
     priv = et_tag_area_get_instance_private (self);
 
+    /* Ensure that the boxed type is registered before using it in
+     * GtkBuilder. */
+    et_picture_get_type ();
+
     /* Main Frame */
     builder = gtk_builder_new ();
     gtk_builder_add_from_resource (builder,
@@ -2938,15 +2935,11 @@ et_tag_area_create_file_tag (EtTagArea *self)
 
     /* Picture */
     {
-        Picture *pic, *prev_pic = NULL;
+        EtPicture *pic, *prev_pic = NULL;
         GtkTreeModel *model;
         GtkTreeIter iter;
 
-        if (FileTag->picture)
-        {
-            Picture_Free (FileTag->picture);
-            FileTag->picture = NULL;
-        }
+        et_file_tag_set_picture (FileTag, NULL);
 
         model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->picture_entry_view));
 
@@ -2954,8 +2947,9 @@ et_tag_area_create_file_tag (EtTagArea *self)
         {
             do
             {
-                gtk_tree_model_get (model, &iter, PICTURE_COLUMN_DATA, &pic,-1);
-                pic = Picture_Copy_One (pic);
+                gtk_tree_model_get (model, &iter, PICTURE_COLUMN_DATA, &pic,
+                                    -1);
+
                 if (!FileTag->picture)
                 {
                     FileTag->picture = pic;
@@ -3248,7 +3242,7 @@ et_tag_area_display_et_file (EtTagArea *self,
 
     if (FileTag && FileTag->picture)
     {
-        Picture *pic;
+        EtPicture *pic;
         guint    nbr_pic = 0;
         GtkWidget *page;
         gchar *string;
diff --git a/src/tags/ape_tag.c b/src/tags/ape_tag.c
index d96d647..d808217 100644
--- a/src/tags/ape_tag.c
+++ b/src/tags/ape_tag.c
@@ -18,15 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <errno.h>
-#include <unistd.h>
 
 #include "easytag.h"
 #include "ape_tag.h"
@@ -89,6 +86,14 @@ ape_tag_read_file_tag (GFile *file,
     if (FileTag->artist == NULL)
         FileTag->artist = Try_To_Validate_Utf8_String(string);
 
+    /* Album artist. */
+    string = apefrm_getstr (ape_cnt, APE_TAG_FIELD_ALBUMARTIST);
+
+    if (FileTag->album_artist == NULL)
+    {
+        FileTag->album_artist = Try_To_Validate_Utf8_String (string);
+    }
+
     /*********
      * Album *
      *********/
@@ -252,6 +257,17 @@ ape_tag_write_file_tag (const ET_File *ETFile,
     else
         apefrm_remove(ape_mem,APE_TAG_FIELD_ARTIST);
 
+    /* Album artist. */
+    if (FileTag->album_artist && g_utf8_strlen (FileTag->album_artist, -1) > 0)
+    {
+        apefrm_add (ape_mem, 0, APE_TAG_FIELD_ALBUMARTIST,
+                    FileTag->album_artist);
+    }
+    else
+    {
+        apefrm_remove (ape_mem, APE_TAG_FIELD_ALBUMARTIST);
+    }
+
     /*********
      * Album *
      *********/
diff --git a/src/tags/flac_header.c b/src/tags/flac_header.c
index f796c18..ee60fb7 100644
--- a/src/tags/flac_header.c
+++ b/src/tags/flac_header.c
@@ -21,146 +21,15 @@
 
 #ifdef ENABLE_FLAC
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <FLAC/all.h>
 #include <errno.h>
 
 #include "et_core.h"
 #include "flac_header.h"
+#include "flac_private.h"
 #include "misc.h"
 
-typedef struct
-{
-    GFileInputStream *istream;
-    gboolean eof;
-    GError *error;
-} EtFlacState;
-
-/* FLAC__metadata_read_with_callbacks() IO callbacks. */
-static size_t
-et_flac_read_func (void *ptr,
-                   size_t size,
-                   size_t nmemb,
-                   FLAC__IOHandle handle)
-{
-    EtFlacState *state;
-    gssize bytes_read;
-
-    state = (EtFlacState *)handle;
-    state->eof = FALSE;
-
-    bytes_read = g_input_stream_read (G_INPUT_STREAM (state->istream), ptr,
-                                      size * nmemb, NULL, &state->error);
-
-    if (bytes_read == -1)
-    {
-        errno = EIO;
-        return 0;
-    }
-    else if (bytes_read == 0)
-    {
-        state->eof = TRUE;
-    }
-
-    return bytes_read;
-}
-
-static int
-et_flac_seek_func (FLAC__IOHandle handle,
-                   FLAC__int64 offset,
-                   int whence)
-{
-    EtFlacState *state;
-    GSeekable *seekable;
-    GSeekType seektype;
-
-    state = (EtFlacState *)handle;
-    seekable = G_SEEKABLE (state->istream);
-
-    if (!g_seekable_can_seek (seekable))
-    {
-        errno = EBADF;
-        return -1;
-    }
-    else
-    {
-        switch (whence)
-        {
-            case SEEK_SET:
-                seektype = G_SEEK_SET;
-                break;
-            case SEEK_CUR:
-                seektype = G_SEEK_CUR;
-                break;
-            case SEEK_END:
-                seektype = G_SEEK_END;
-                break;
-            default:
-                errno = EINVAL;
-                return -1;
-        }
-
-        if (!g_seekable_seek (seekable, offset, seektype, NULL, &state->error))
-        {
-            /* TODO: More suitable error. */
-            errno = EINVAL;
-            return -1;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-}
-
-static FLAC__int64
-et_flac_tell_func (FLAC__IOHandle handle)
-{
-    EtFlacState *state;
-    GSeekable *seekable;
-
-    state = (EtFlacState *)handle;
-    seekable = G_SEEKABLE (state->istream);
-
-    if (!g_seekable_can_seek (seekable))
-    {
-        errno = EBADF;
-        return -1;
-    }
-    else
-    {
-        return g_seekable_tell (seekable);
-    }
-}
-
-static int
-et_flac_eof_func (FLAC__IOHandle handle)
-{
-    EtFlacState *state;
-
-    state = (EtFlacState *)handle;
-
-    /* EOF is not directly supported by GFileInputStream. */
-    return state->eof ? 1 : 0;
-}
-
-static int
-et_flac_close_func (FLAC__IOHandle handle)
-{
-    EtFlacState *state;
-
-    state = (EtFlacState *)handle;
-
-    g_clear_object (&state->istream);
-    g_clear_error (&state->error);
-
-    /* Always return success. */
-    return 0;
-}
-
 /* Header info of FLAC file */
-
 gboolean
 et_flac_header_read_file_info (GFile *file,
                                ET_File_Info *ETFileInfo,
@@ -168,11 +37,13 @@ et_flac_header_read_file_info (GFile *file,
 {
     GFileInfo *info;
     FLAC__Metadata_Chain *chain;
-    EtFlacState state;
+    EtFlacReadState state;
     GFileInputStream *istream;
-    FLAC__IOCallbacks callbacks = { et_flac_read_func, NULL, et_flac_seek_func,
-                                    et_flac_tell_func, et_flac_eof_func,
-                                    et_flac_close_func };
+    FLAC__IOCallbacks callbacks = { et_flac_read_func,
+                                    NULL, /* Do not set a write callback. */
+                                    et_flac_seek_func, et_flac_tell_func,
+                                    et_flac_eof_func,
+                                    et_flac_read_close_func };
     FLAC__Metadata_Iterator *iter;
     gsize metadata_len;
 
@@ -200,6 +71,7 @@ et_flac_header_read_file_info (GFile *file,
     state.eof = FALSE;
     state.error = NULL;
     state.istream = istream;
+    state.seekable = G_SEEKABLE (istream);
 
     if (!FLAC__metadata_chain_read_with_callbacks (chain, &state, callbacks))
     {
@@ -211,7 +83,7 @@ et_flac_header_read_file_info (GFile *file,
         /* TODO: Provide a dedicated error enum corresponding to status. */
         g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, "%s",
                      _("Error opening FLAC file"));
-        et_flac_close_func (&state);
+        et_flac_read_close_func (&state);
         return FALSE;
     }
 
@@ -219,7 +91,7 @@ et_flac_header_read_file_info (GFile *file,
 
     if (iter == NULL)
     {
-        et_flac_close_func (&state);
+        et_flac_read_close_func (&state);
         g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, "%s",
                      g_strerror (ENOMEM));
         return FALSE;
@@ -257,7 +129,7 @@ et_flac_header_read_file_info (GFile *file,
 
     FLAC__metadata_iterator_delete (iter);
     FLAC__metadata_chain_delete (chain);
-    et_flac_close_func (&state);
+    et_flac_read_close_func (&state);
     /* End of decoding FLAC file */
 
     info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SIZE,
diff --git a/src/tags/flac_private.c b/src/tags/flac_private.c
new file mode 100644
index 0000000..bdda107
--- /dev/null
+++ b/src/tags/flac_private.c
@@ -0,0 +1,180 @@
+/* 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 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 "flac_private.h"
+
+#include <errno.h>
+#include <unistd.h>
+
+size_t
+et_flac_read_func (void *ptr,
+                   size_t size,
+                   size_t nmemb,
+                   FLAC__IOHandle handle)
+{
+    EtFlacReadState *state;
+    gssize bytes_read;
+
+    state = (EtFlacReadState *)handle;
+
+    state->eof = FALSE;
+
+    bytes_read = g_input_stream_read (G_INPUT_STREAM (state->istream), ptr,
+                                      size * nmemb, NULL, &state->error);
+
+    if (bytes_read == -1)
+    {
+        errno = EIO;
+        return 0;
+    }
+    else if (bytes_read == 0)
+    {
+        state->eof = TRUE;
+    }
+
+    return bytes_read;
+}
+
+size_t
+et_flac_write_func (const void *ptr,
+                    size_t size,
+                    size_t nmemb,
+                    FLAC__IOHandle handle)
+{
+    EtFlacWriteState *state;
+    gsize bytes_written;
+
+    state = (EtFlacWriteState *)handle;
+
+    if (!g_output_stream_write_all (G_OUTPUT_STREAM (state->ostream), ptr,
+                                    size * nmemb, &bytes_written, NULL,
+                                    &state->error))
+    {
+        g_debug ("Only %" G_GSIZE_FORMAT " bytes out of %" G_GSIZE_FORMAT
+                 " bytes of data were written", bytes_written,
+                 size);
+        errno = EIO;
+    }
+
+    return bytes_written;
+}
+
+int
+et_flac_seek_func (FLAC__IOHandle handle,
+                   FLAC__int64 offset,
+                   int whence)
+{
+    GSeekType seektype;
+    EtFlacReadState *state;
+
+    state = (EtFlacReadState *)handle;
+
+    if (!g_seekable_can_seek (state->seekable))
+    {
+        errno = EBADF;
+        return -1;
+    }
+    else
+    {
+        switch (whence)
+        {
+            case SEEK_SET:
+                seektype = G_SEEK_SET;
+                break;
+            case SEEK_CUR:
+                seektype = G_SEEK_CUR;
+                break;
+            case SEEK_END:
+                seektype = G_SEEK_END;
+                break;
+            default:
+                errno = EINVAL;
+                return -1;
+        }
+
+        if (g_seekable_seek (state->seekable, offset, seektype, NULL,
+                             &state->error))
+        {
+            return 0;
+        }
+        else
+        {
+            /* TODO: More suitable error. */
+            errno = EINVAL;
+            return -1;
+        }
+    }
+}
+
+FLAC__int64
+et_flac_tell_func (FLAC__IOHandle handle)
+{
+    EtFlacReadState *state;
+
+    state = (EtFlacReadState *)handle;
+
+    if (!g_seekable_can_seek (state->seekable))
+    {
+        errno = EBADF;
+        return -1;
+    }
+    else
+    {
+        return g_seekable_tell (state->seekable);
+    }
+}
+
+int
+et_flac_eof_func (FLAC__IOHandle handle)
+{
+    EtFlacReadState *state;
+
+    state = (EtFlacReadState *)handle;
+
+    /* EOF is not directly supported by GFileInputStream. */
+    return state->eof ? 1 : 0;
+}
+
+int
+et_flac_read_close_func (FLAC__IOHandle handle)
+{
+    EtFlacReadState *state;
+
+    state = (EtFlacReadState *)handle;
+
+    g_clear_object (&state->istream);
+    g_clear_error (&state->error);
+
+    /* Always return success. */
+    return 0;
+}
+
+int
+et_flac_write_close_func (FLAC__IOHandle handle)
+{
+    EtFlacWriteState *state;
+
+    state = (EtFlacWriteState *)handle;
+
+    g_clear_object (&state->file);
+    g_clear_object (&state->iostream);
+    g_clear_error (&state->error);
+
+    /* Always return success. */
+    return 0;
+}
diff --git a/src/tags/flac_private.h b/src/tags/flac_private.h
new file mode 100644
index 0000000..5c57076
--- /dev/null
+++ b/src/tags/flac_private.h
@@ -0,0 +1,80 @@
+/* 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 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_FLAC_PRIVATE_H_
+#define ET_FLAC_PRIVATE_H_
+
+#include "config.h"
+
+#ifdef ENABLE_FLAC
+
+#include <gio/gio.h>
+#include <FLAC/metadata.h>
+
+G_BEGIN_DECLS
+
+/*
+ * EtFlacReadState:
+ *
+ * Used as a FLAC__IOHandle for FLAC__metadata_chain_read_with_callbacks().
+ */
+typedef struct
+{
+    GFileInputStream *istream;
+    GSeekable *seekable;
+    gboolean eof;
+    GError *error;
+} EtFlacReadState;
+
+/*
+ * EtFlacWriteState:
+ *
+ * Used as a FLAC__IOHandle for FLAC__metadata_chain_write_with_callbacks() and
+ * FLAC__metadata_chain_write_with_callbacks_and_tempfile().
+ */
+typedef struct
+{
+    /* Begin fields copied from EtFlacReadState. */
+    GFileInputStream *istream;
+    GSeekable *seekable;
+    gboolean eof;
+    GError *error;
+    /* End fields copied from EtFlacReadState. */
+    GFile *file;
+    GFileOutputStream *ostream;
+    GFileIOStream *iostream;
+} EtFlacWriteState;
+
+/* Used with both EtFlacReadState and EtFlacWriteState. */
+size_t et_flac_read_func (void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle);
+int et_flac_seek_func (FLAC__IOHandle handle, FLAC__int64 offset, int whence);
+FLAC__int64 et_flac_tell_func (FLAC__IOHandle handle);
+int et_flac_eof_func (FLAC__IOHandle handle);
+
+/* Only to be used with EtFlacReadState. */
+int et_flac_read_close_func (FLAC__IOHandle handle);
+
+/* Only to be used with EtFlacWriteState. */
+size_t et_flac_write_func (const void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle);
+int et_flac_write_close_func (FLAC__IOHandle handle);
+
+G_END_DECLS
+
+#endif /* ENABLE_FLAC */
+
+#endif /* ET_FLAC_PRIVATE_H_ */
diff --git a/src/tags/flac_tag.c b/src/tags/flac_tag.c
index 2109fb0..f4a42f3 100644
--- a/src/tags/flac_tag.c
+++ b/src/tags/flac_tag.c
@@ -22,16 +22,11 @@
 
 #ifdef ENABLE_FLAC
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
-#include <FLAC/metadata.h>
-#include <unistd.h>
 
 #include "easytag.h"
+#include "flac_private.h"
 #include "flac_tag.h"
 #include "vcedit.h"
 #include "et_core.h"
@@ -41,14 +36,8 @@
 #include "picture.h"
 #include "charset.h"
 
-
-/***************
- * Declaration *
- ***************/
-
 #define MULTIFIELD_SEPARATOR " - "
 
-
 /* FLAC uses Ogg Vorbis comments
  * Ogg Vorbis fields names :
  *  - TITLE        : Track name
@@ -76,23 +65,12 @@
  * of any language.
  */
 
-
-
-/**************
- * Prototypes *
- **************/
-
 static gboolean Flac_Write_Delimetered_Tag (FLAC__StreamMetadata *vc_block, const gchar *tag_name, gchar *values);
 static gboolean Flac_Write_Tag (FLAC__StreamMetadata *vc_block, const gchar *tag_name, gchar *value);
 static gboolean Flac_Set_Tag (FLAC__StreamMetadata *vc_block, const gchar *tag_name, gchar *value, gboolean split);
 
-
-/*************
- * Functions *
- *************/
-
 /*
- * Read tag data from a FLAC file using the level 1 flac interface,
+ * Read tag data from a FLAC file using the level 2 flac interface,
  * Note:
  *  - if field is found but contains no info (strlen(str)==0), we don't read it
  */
@@ -101,60 +79,75 @@ flac_tag_read_file_tag (GFile *file,
                         File_Tag *FileTag,
                         GError **error)
 {
-    FLAC__Metadata_SimpleIterator *iter;
-    const gchar *flac_error_msg;
+    FLAC__Metadata_Chain *chain;
+    EtFlacReadState state;
+    FLAC__IOCallbacks callbacks = { et_flac_read_func,
+                                    NULL, /* Do not set a write callback. */
+                                    et_flac_seek_func, et_flac_tell_func,
+                                    et_flac_eof_func,
+                                    et_flac_read_close_func };
+    FLAC__Metadata_Iterator *iter;
+
     gchar *string = NULL;
-    gchar *filename;
-    gchar *filename_utf8;
     guint i;
-    Picture *prev_pic = NULL;
+    EtPicture *prev_pic = NULL;
     //gint j = 1;
 
     g_return_val_if_fail (file != NULL && FileTag != NULL, FALSE);
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-    /* Initialize the iterator for the blocks. */
-    filename = g_file_get_path (file);
-    iter = FLAC__metadata_simple_iterator_new();
+    chain = FLAC__metadata_chain_new ();
 
-    if ( iter == NULL || !FLAC__metadata_simple_iterator_init(iter, filename, true, false) )
+    if (chain == NULL)
     {
-        if ( iter == NULL )
-        {
-            // Error with "FLAC__metadata_simple_iterator_new"
-            flac_error_msg = FLAC__Metadata_SimpleIteratorStatusString[FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR];
-        }else
+        g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, "%s",
+                     g_strerror (ENOMEM));
+        return FALSE;
+    }
+
+    state.error = NULL;
+    state.istream = g_file_read (file, NULL, &state.error);
+    state.seekable = G_SEEKABLE (state.istream);
+
+    if (!FLAC__metadata_chain_read_with_callbacks (chain, &state, callbacks))
+    {
+        FLAC__Metadata_ChainStatus status;
+
+        status = FLAC__metadata_chain_status (chain);
+
+        switch (status)
         {
-            // Error with "FLAC__metadata_simple_iterator_init"
-            FLAC__Metadata_SimpleIteratorStatus status = FLAC__metadata_simple_iterator_status(iter);
-            flac_error_msg = FLAC__Metadata_SimpleIteratorStatusString[status];
-            
-            FLAC__metadata_simple_iterator_delete(iter);
+            /* TODO: Provide a dedicated error enum corresponding to status. */
+            default:
+                g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, "%s",
+                             _("Error opening FLAC file"));
+                et_flac_read_close_func (&state);
+                break;
         }
 
-        g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                     _("Error while opening file: %s"), flac_error_msg);
-        g_free (filename);
         return FALSE;
     }
-    
-    filename_utf8 = filename_to_display (filename);
-    g_free (filename);
 
-    /* libFLAC is able to detect (and skip) ID3v2 tags by itself */
+    iter = FLAC__metadata_iterator_new ();
 
-    while (FLAC__metadata_simple_iterator_next(iter))
+    if (iter == NULL)
     {
-        // Get block data
-        FLAC__StreamMetadata *block = FLAC__metadata_simple_iterator_get_block(iter);
-        //g_print("Read: %d %s -> block type: %d\n",j++,g_path_get_basename(filename),FLAC__metadata_simple_iterator_get_block_type(iter));
-        
-        // Action to do according the type
-        switch ( FLAC__metadata_simple_iterator_get_block_type(iter) )
+        et_flac_read_close_func (&state);
+        g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, "%s",
+                     g_strerror (ENOMEM));
+        return FALSE;
+    }
+
+    FLAC__metadata_iterator_init (iter, chain);
+
+    while (FLAC__metadata_iterator_next (iter))
+    {
+        FLAC__StreamMetadata *block;
+
+        block = FLAC__metadata_iterator_get_block (iter);
+
+        switch (block->type)
         {
-            //
-            // Read the VORBIS_COMMENT block (only one should exist)
-            //
             case FLAC__METADATA_TYPE_VORBIS_COMMENT:
             {
                 FLAC__StreamMetadata_VorbisComment       *vc;
@@ -668,48 +661,41 @@ flac_tag_read_file_tag (GFile *file,
             //
             case FLAC__METADATA_TYPE_PICTURE: 
             {
-                
-                /***********
-                 * Picture *
-                 ***********/
+                /* Picture. */
                 FLAC__StreamMetadata_Picture *p;
-                Picture *pic;
+                GBytes *bytes;
+                EtPicture *pic;
             
-                // Get picture data from block
+                /* Get picture data from block. */
                 p = &block->data.picture;
+
+                bytes = g_bytes_new (p->data, p->data_length);
             
-                pic = Picture_Allocate();
+                pic = et_picture_new (p->type, (const gchar *)p->description,
+                                      0, 0, bytes);
+                g_bytes_unref (bytes);
+
                 if (!prev_pic)
+                {
                     FileTag->picture = pic;
+                }
                 else
+                {
                     prev_pic->next = pic;
-                prev_pic = pic;
-
-                pic->size = p->data_length;
-                pic->data = g_memdup(p->data,pic->size);
-                pic->type = p->type;
-                pic->description = g_strdup((gchar *)p->description);
-                // Not necessary: will be calculated later
-                //pic->height = p->height;
-                //pic->width  = p->width;
-
-                //g_print("Image type : %s\n",FLAC__StreamMetadata_Picture_TypeString[p->type]);
-                //g_print("Mime    type : %s\n",p->mime_type);
+                }
 
+                prev_pic = pic;
                 break;
             }
                 
             default:
                 break;
         }
-        
-        /* Free block data. */
-        FLAC__metadata_object_delete (block);
     }
-    
-    // Free iter
-    FLAC__metadata_simple_iterator_delete(iter);
 
+    FLAC__metadata_iterator_delete (iter);
+    FLAC__metadata_chain_delete (chain);
+    et_flac_read_close_func (&state);
 
 #ifdef ENABLE_MP3
     /* If no FLAC vorbis tag found : we try to get the ID3 tag if it exists
@@ -732,8 +718,9 @@ flac_tag_read_file_tag (GFile *file,
       && FileTag->encoded_by  == NULL
       && FileTag->picture     == NULL)
     {
-        /* Ignore errors. */
-        id3tag_read_file_tag (file, FileTag, NULL);
+        gboolean rc;
+
+        rc = id3tag_read_file_tag (file, FileTag, NULL);
 
         // If an ID3 tag has been found (and no FLAC tag), we mark the file as
         // unsaved to rewrite a flac tag.
@@ -757,10 +744,11 @@ flac_tag_read_file_tag (GFile *file,
         {
             FileTag->saved = FALSE;
         }
+
+        return rc;
     }
 #endif
 
-    g_free(filename_utf8);
     return TRUE;
 }
 
@@ -819,6 +807,13 @@ flac_tag_write_file_tag (const ET_File *ETFile,
                          GError **error)
 {
     const File_Tag *FileTag;
+    GFile *file;
+    GFileIOStream *iostream;
+    EtFlacWriteState state;
+    FLAC__IOCallbacks callbacks = { et_flac_read_func, et_flac_write_func,
+                                    et_flac_seek_func, et_flac_tell_func,
+                                    et_flac_eof_func,
+                                    et_flac_write_close_func };
     const gchar *filename;
     const gchar *filename_utf8;
     const gchar *flac_error_msg;
@@ -836,31 +831,56 @@ flac_tag_write_file_tag (const ET_File *ETFile,
 
     /* libFLAC is able to detect (and skip) ID3v2 tags by itself */
     
-    // Create a new chain instance to get all blocks in one time
-    chain = FLAC__metadata_chain_new();
-    if (chain == NULL || !FLAC__metadata_chain_read(chain,filename))
+    /* Create a new chain instance to get all blocks in one time. */
+    chain = FLAC__metadata_chain_new ();
+
+    if (chain == NULL)
     {
-        if (chain == NULL)
-        {
-            // Error with "FLAC__metadata_chain_new"
-            flac_error_msg = FLAC__Metadata_ChainStatusString[FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR];
-        }else
-        {
-            // Error with "FLAC__metadata_chain_read"
-            FLAC__Metadata_ChainStatus status = FLAC__metadata_chain_status(chain);
-            flac_error_msg = FLAC__Metadata_ChainStatusString[status];
-            
-            FLAC__metadata_chain_delete(chain);
-        }
+        flac_error_msg = FLAC__Metadata_ChainStatusString[FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR];
         
         g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
                      _("Error while opening file ‘%s’ as FLAC: %s"),
                      filename_utf8, flac_error_msg);
         return FALSE;
     }
+
+    file = g_file_new_for_path (filename);
+
+    state.file = file;
+    state.error = NULL;
+    /* TODO: Fallback to an in-memory copy of the file for non-local files,
+     * where creation of the GFileIOStream may fail. */
+    iostream = g_file_open_readwrite (file, NULL, &state.error);
+
+    if (iostream == NULL)
+    {
+        FLAC__metadata_chain_delete (chain);
+        g_propagate_error (error, state.error);
+        g_object_unref (file);
+        return FALSE;
+    }
+
+    state.istream = G_FILE_INPUT_STREAM (g_io_stream_get_input_stream (G_IO_STREAM (iostream)));
+    state.ostream = G_FILE_OUTPUT_STREAM (g_io_stream_get_output_stream (G_IO_STREAM (iostream)));
+    state.seekable = G_SEEKABLE (iostream);
+    state.iostream = iostream;
+
+    if (!FLAC__metadata_chain_read_with_callbacks (chain, &state, callbacks))
+    {
+        const FLAC__Metadata_ChainStatus status = FLAC__metadata_chain_status (chain);
+        flac_error_msg = FLAC__Metadata_ChainStatusString[status];
+        FLAC__metadata_chain_delete (chain);
+
+        g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                     _("Error while opening file ‘%s’ as FLAC: %s"),
+                     filename_utf8, flac_error_msg);
+        et_flac_write_close_func (&state);
+        return FALSE;
+    }
     
-    // Create a new iterator instance for the chain
-    iter = FLAC__metadata_iterator_new();
+    /* Create a new iterator instance for the chain. */
+    iter = FLAC__metadata_iterator_new ();
+
     if (iter == NULL)
     {
         flac_error_msg = FLAC__Metadata_ChainStatusString[FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR];
@@ -868,19 +888,19 @@ flac_tag_write_file_tag (const ET_File *ETFile,
         g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
                      _("Error while opening file ‘%s’ as FLAC: %s"),
                      filename_utf8, flac_error_msg);
+        FLAC__metadata_chain_delete (chain);
+        et_flac_write_close_func (&state);
         return FALSE;
     }
     
-    // Initialize the iterator to point to the first metadata block in the given chain.
-    FLAC__metadata_iterator_init(iter,chain);
+    FLAC__metadata_iterator_init (iter, chain);
     
-    while (FLAC__metadata_iterator_next(iter))
+    while (FLAC__metadata_iterator_next (iter))
     {
-        //g_print("Write: %d %s -> block type: %d\n",j++,g_path_get_basename(filename),FLAC__metadata_iterator_get_block_type(iter));
-        
-        // Action to do according the type
-        switch ( FLAC__metadata_iterator_get_block_type(iter) )
+        switch (FLAC__metadata_iterator_get_block_type (iter))
         {
+            /* TODO: Modify the blocks directly, rather than deleting and
+             * recreating. */
             //
             // Delete the VORBIS_COMMENT block and convert to padding. But before, save the original vendor string.
             //
@@ -911,7 +931,7 @@ flac_tag_write_file_tag (const ET_File *ETFile,
                 FLAC__metadata_iterator_delete_block(iter,true);
                 break;
             }
-            
+
             default:
                 break;
         }
@@ -1049,14 +1069,18 @@ flac_tag_write_file_tag (const ET_File *ETFile,
      * Picture *
      ***********/
     {
-        Picture *pic = FileTag->picture;
+        EtPicture *pic = FileTag->picture;
+
         while (pic)
         {
-            if (pic->data)
+            /* TODO: Can this ever be NULL? */
+            if (pic->bytes)
             {
                 const gchar *violation;
                 FLAC__StreamMetadata *picture_block; // For picture data
                 Picture_Format format;
+                gconstpointer data;
+                gsize data_size;
                 
                 // Allocate block for picture data
                 picture_block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_PICTURE);
@@ -1082,8 +1106,10 @@ flac_tag_write_file_tag (const ET_File *ETFile,
                 picture_block->data.picture.depth  = 0;
 
                 /* Picture data. */
+                data = g_bytes_get_data (pic->bytes, &data_size);
                 FLAC__metadata_object_picture_set_data (picture_block,
-                                                        (FLAC__byte *)pic->data, (FLAC__uint32) pic->size,
+                                                        (FLAC__byte *)data,
+                                                        (FLAC__uint32)data_size,
                                                         TRUE);
                 
                 if (!FLAC__metadata_object_picture_is_legal (picture_block,
@@ -1104,37 +1130,96 @@ flac_tag_write_file_tag (const ET_File *ETFile,
         }
     }
     
-    // Free iter
-    FLAC__metadata_iterator_delete(iter);
-    
+    FLAC__metadata_iterator_delete (iter);
     
     //
     // Prepare for writing tag
     //
     
-    // Move all PADDING blocks to the end on the metadata, and merge them into a single block.
-    FLAC__metadata_chain_sort_padding(chain);
+    FLAC__metadata_chain_sort_padding (chain);
  
     /* Write tag. */
-    if (!FLAC__metadata_chain_write (chain, /*padding*/TRUE,
-                                     g_settings_get_boolean (MainSettings,
-                                                             "file-preserve-modification-time")))
+    if (FLAC__metadata_chain_check_if_tempfile_needed (chain, true))
     {
-        // Error with "FLAC__metadata_chain_write"
-        FLAC__Metadata_ChainStatus status = FLAC__metadata_chain_status(chain);
-        flac_error_msg = FLAC__Metadata_ChainStatusString[status];
+        EtFlacWriteState temp_state;
+        GFile *temp_file;
+        GFileIOStream *temp_iostream;
+        GError *temp_error = NULL;
 
-        FLAC__metadata_chain_delete(chain);
-        
-        g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                     _("Failed to write comments to file ‘%s’: %s"),
-                     filename_utf8, flac_error_msg);
-        return FALSE;
+        temp_file = g_file_new_tmp ("easytag-XXXXXX", &temp_iostream,
+                                    &temp_error);
+
+        if (temp_file == NULL)
+        {
+            FLAC__metadata_chain_delete (chain);
+            g_propagate_error (error, temp_error);
+            et_flac_write_close_func (&state);
+            return FALSE;
+        }
+
+        temp_state.file = temp_file;
+        temp_state.error = NULL;
+        temp_state.istream = G_FILE_INPUT_STREAM (g_io_stream_get_input_stream (G_IO_STREAM (temp_iostream)));
+        temp_state.ostream = G_FILE_OUTPUT_STREAM (g_io_stream_get_output_stream (G_IO_STREAM (temp_iostream)));
+        temp_state.seekable = G_SEEKABLE (temp_iostream);
+        temp_state.iostream = temp_iostream;
+
+        if (!FLAC__metadata_chain_write_with_callbacks_and_tempfile (chain,
+                                                                     true,
+                                                                     &state,
+                                                                     callbacks,
+                                                                     &temp_state,
+                                                                     callbacks))
+        {
+            const FLAC__Metadata_ChainStatus status = FLAC__metadata_chain_status (chain);
+            flac_error_msg = FLAC__Metadata_ChainStatusString[status];
+
+            FLAC__metadata_chain_delete (chain);
+            et_flac_write_close_func (&temp_state);
+            et_flac_write_close_func (&state);
+
+            g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                         _("Failed to write comments to file ‘%s’: %s"),
+                         filename_utf8, flac_error_msg);
+            return FALSE;
+        }
+
+        if (!g_file_move (temp_file, file, G_FILE_COPY_OVERWRITE, NULL, NULL,
+                          NULL, &state.error))
+        {
+            FLAC__metadata_chain_delete (chain);
+            et_flac_write_close_func (&temp_state);
+
+            g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                         _("Failed to write comments to file ‘%s’: %s"),
+                         filename_utf8, state.error->message);
+            et_flac_write_close_func (&state);
+            return FALSE;
+        }
+
+        et_flac_write_close_func (&temp_state);
     }
-    
-    FLAC__metadata_chain_delete(chain);
+    else
+    {
+        if (!FLAC__metadata_chain_write_with_callbacks (chain, true, &state,
+                                                        callbacks))
+        {
+            const FLAC__Metadata_ChainStatus status = FLAC__metadata_chain_status (chain);
+            flac_error_msg = FLAC__Metadata_ChainStatusString[status];
+
+            FLAC__metadata_chain_delete (chain);
+            et_flac_write_close_func (&state);
+
+            g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                         _("Failed to write comments to file ‘%s’: %s"),
+                         filename_utf8, flac_error_msg);
+            return FALSE;
+        }
+    }
+
+    FLAC__metadata_chain_delete (chain);
+    et_flac_write_close_func (&state);
 
-    
 #ifdef ENABLE_MP3
     {
         // Delete the ID3 tags (create a dummy ETFile for the Id3tag_... function)
diff --git a/src/tags/id3_tag.c b/src/tags/id3_tag.c
index a61f938..1489722 100644
--- a/src/tags/id3_tag.c
+++ b/src/tags/id3_tag.c
@@ -19,19 +19,14 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <stdio.h>
-#include <errno.h>
 #include <string.h>
-#include <ctype.h>
-#include <unistd.h>
+#include <errno.h>
 
 #include "id3_tag.h"
 #include "ape_tag.h"
 #include "picture.h"
 #include "easytag.h"
-#include "browser.h"
 #include "genres.h"
 #include "setting.h"
 #include "misc.h"
@@ -101,7 +96,7 @@ et_id3tag_get_tpos_from_file_tag (const File_Tag *FileTag)
 
     while (*p)
     {
-        if (!isdigit (*p))
+        if (!g_ascii_isdigit (*p))
         {
             break;
         }
@@ -117,7 +112,7 @@ et_id3tag_get_tpos_from_file_tag (const File_Tag *FileTag)
 
         while (*p)
         {
-            if (!isdigit (*p))
+            if (!g_ascii_isdigit (*p))
             {
                 break;
             }
@@ -172,7 +167,7 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
     ID3Field *id3_field;
     //gchar *string;
     gchar *string1;
-    Picture *pic;
+    EtPicture *pic;
 
     g_return_val_if_fail (ETFile != NULL && ETFile->FileTag != NULL, FALSE);
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -525,7 +520,13 @@ id3tag_write_file_v23tag (const ET_File *ETFile,
             Id3tag_Set_Field(id3_frame, ID3FN_DESCRIPTION, pic->description);
 
         if ((id3_field = ID3Frame_GetField(id3_frame,ID3FN_DATA)))
-            ID3Field_SetBINARY(id3_field, pic->data, pic->size);
+        {
+            gconstpointer data;
+            gsize data_size;
+
+            data = g_bytes_get_data (pic->bytes, &data_size);
+            ID3Field_SetBINARY (id3_field, data, data_size);
+        }
 
         has_picture = TRUE;
     }
@@ -1005,13 +1006,13 @@ gchar *Id3tag_Get_Field (const ID3Frame *id3_frame, ID3_FieldID id3_fieldid)
         switch ( enc )
         {
             case ID3TE_ISO8859_1:
-                string = g_malloc0(sizeof(char)*ID3V2_MAX_STRING_LEN+1);
+                string = g_malloc0 (ID3V2_MAX_STRING_LEN + 1);
                 num_chars = ID3Field_GetASCII_1(id3_field,string,ID3V2_MAX_STRING_LEN,0);
                 string1 = convert_string(string,"ISO-8859-1","UTF-8",FALSE);
                 break;
 
             case ID3TE_UTF8: // Shouldn't work with id3lib 3.8.3 (supports only ID3v2.3, not ID3v2.4)
-                string = g_malloc0(sizeof(char)*ID3V2_MAX_STRING_LEN+1);
+                string = g_malloc0 (ID3V2_MAX_STRING_LEN+1);
                 num_chars = ID3Field_GetASCII_1(id3_field,string,ID3V2_MAX_STRING_LEN,0);
                 //string1 = convert_string(string,"UTF-8","UTF-8",FALSE); // Nothing to do
                 if (g_utf8_validate(string,-1,NULL))
@@ -1028,7 +1029,7 @@ gchar *Id3tag_Get_Field (const ID3Frame *id3_frame, ID3_FieldID id3_fieldid)
                 break;
 
             default:
-                string = g_malloc0(sizeof(char)*4*ID3V2_MAX_STRING_LEN+1);
+                string = g_malloc0 (4 * ID3V2_MAX_STRING_LEN + 1);
                 num_chars = ID3Field_GetASCII_1(id3_field,string,ID3V2_MAX_STRING_LEN,0);
                 string1 = convert_to_utf8(string);
                 break;
diff --git a/src/tags/id3v24_tag.c b/src/tags/id3v24_tag.c
index c142c4a..1a0679f 100644
--- a/src/tags/id3v24_tag.c
+++ b/src/tags/id3v24_tag.c
@@ -18,18 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <fcntl.h>
-#include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <ctype.h>
 #include <stdlib.h>
-#include <limits.h>
-#include <unistd.h>
 
 #include "id3_tag.h"
 #include "picture.h"
@@ -54,6 +48,7 @@
  ****************/
 #define MULTIFIELD_SEPARATOR " - "
 #define EASYTAG_STRING_ENCODEDBY "Encoded by"
+#define ID3V1_TAG_SIZE 128
 
 enum {
     EASYTAG_ID3_FIELD_LATIN1        = 0x0001,
@@ -103,7 +98,7 @@ id3tag_read_file_tag (GFile *gfile,
     struct id3_frame *frame;
     union id3_field *field;
     gchar *string1, *string2;
-    Picture *prev_pic = NULL;
+    EtPicture *prev_pic = NULL;
     int i, j;
     unsigned tmpupdate, update = 0;
     long tagsize;
@@ -194,7 +189,7 @@ id3tag_read_file_tag (GFile *gfile,
     }
 
     /* Go to the beginning of ID3v1 tag. */
-    if (g_seekable_seek (seekable, -128, G_SEEK_END, NULL, error)
+    if (g_seekable_seek (seekable, -ID3V1_TAG_SIZE, G_SEEK_END, NULL, error)
     && (string1)
         && g_input_stream_read_all (istream, string1, 3, &bytes_read, NULL,
                                     NULL /* Ignore errors. */)
@@ -451,18 +446,12 @@ id3tag_read_file_tag (GFile *gfile,
      ******************/
     for (i = 0; (frame = id3_tag_findframe(tag, "APIC", i)); i++)
     {
-        Picture *pic;
+        GBytes *bytes = NULL;
+        EtPictureType type = ET_PICTURE_TYPE_FRONT_COVER;
+        gchar *description;
+        EtPicture *pic;
 
-        pic = Picture_Allocate();
-        if (!prev_pic)
-            FileTag->picture = pic;
-        else
-            prev_pic->next = pic;
-        prev_pic = pic;
-
-        pic->data = NULL;
-
-        // Picture file data
+        /* Picture file data. */
         for (j = 0; (field = id3_frame_field(frame, j)); j++)
         {
             switch (id3_field_type(field))
@@ -472,23 +461,45 @@ id3tag_read_file_tag (GFile *gfile,
                         id3_length_t size;
                         id3_byte_t const *data;
                         
-                        data = id3_field_getbinarydata(field, &size);
-                        if (pic->data)
-                            g_free(pic->data);
-                        if ( data && (pic->data = g_memdup(data, size)) )
-                            pic->size = size;
+                        data = id3_field_getbinarydata (field, &size);
+
+                        if (data)
+                        {
+                            if (bytes)
+                            {
+                                g_bytes_unref (bytes);
+                            }
+
+                            bytes = g_bytes_new (data, size);
+                        }
                     }
                     break;
                 case ID3_FIELD_TYPE_INT8:
-                    pic->type = id3_field_getint(field);
+                    type = id3_field_getint (field);
                     break;
                 default:
                     break;
             }
         }
 
-        // Picture description
-        update |= libid3tag_Get_Frame_Str(frame, EASYTAG_ID3_FIELD_STRING, &pic->description);
+        /* Picture description. */
+        update |= libid3tag_Get_Frame_Str (frame, EASYTAG_ID3_FIELD_STRING,
+                                           &description);
+
+        pic = et_picture_new (type, description, 0, 0, bytes);
+        g_bytes_unref (bytes);
+        g_free (description);
+
+        if (!prev_pic)
+        {
+            FileTag->picture = pic;
+        }
+        else
+        {
+            prev_pic->next = pic;
+        }
+
+        prev_pic = pic;
     }
 
     /**********************
@@ -913,7 +924,7 @@ id3tag_write_file_v24tag (const ET_File *ETFile,
     struct id3_frame *frame;
     union id3_field  *field;
     gchar            *string1;
-    Picture          *pic;
+    EtPicture          *pic;
     gboolean strip_tags = TRUE;
     guchar genre_value = ID3_INVALID_GENRE;
     gboolean success;
@@ -1042,13 +1053,10 @@ id3tag_write_file_v24tag (const ET_File *ETFile,
     /***************
      * Part of set *
      ***************/
-    if (FileTag->disc_number)
-    {
-        string1 = et_id3tag_get_tpos_from_file_tag (FileTag);
-        etag_set_tags (string1, "TPOS", ID3_FIELD_TYPE_STRINGLIST, NULL, v2tag,
-                       &strip_tags);
-        g_free (string1);
-    }
+    string1 = et_id3tag_get_tpos_from_file_tag (FileTag);
+    etag_set_tags (string1, "TPOS", ID3_FIELD_TYPE_STRINGLIST, NULL, v2tag,
+                   &strip_tags);
+    g_free (string1);
 
     /********
      * Year *
@@ -1161,7 +1169,13 @@ id3tag_write_file_v24tag (const ET_File *ETFile,
                         id3_field_setint(field, pic->type);
                         break;
                     case ID3_FIELD_TYPE_BINARYDATA:
-                        id3_field_setbinarydata(field, pic->data, pic->size);
+                        {
+                            gconstpointer data;
+                            gsize data_size;
+
+                            data = g_bytes_get_data (pic->bytes, &data_size);
+                            id3_field_setbinarydata (field, data, data_size);
+                        }
                         break;
                     default:
                         break;
@@ -1507,29 +1521,36 @@ etag_write_tags (const gchar *filename,
 {
     id3_byte_t *v1buf, *v2buf;
     id3_length_t v1size = 0, v2size = 0;
-    char tmp[ID3_TAG_QUERYSIZE];
-    int fd;
-    int curpos;
+    gchar tmp[ID3_TAG_QUERYSIZE];
+    GFile *file;
+    GFileIOStream *iostream;
+    GSeekable *seekable;
+    GInputStream *istream;
+    GOutputStream *ostream;
     long filev2size;
     gsize ctxsize;
-    char *ctx = NULL;
+    gchar *ctx = NULL;
     gboolean success = TRUE;
-    gssize size_read = 0;
+    gsize bytes_read;
+    gsize bytes_written;
 
     v1buf = v2buf = NULL;
-    if ( !strip_tags )
+
+    if (!strip_tags)
     {
         /* Render v1 tag */
         if (v1tag)
         {
-            v1size = id3_tag_render(v1tag, NULL);
-            if (v1size == 128)
+            v1size = id3_tag_render (v1tag, NULL);
+
+            if (v1size == ID3V1_TAG_SIZE)
             {
-                v1buf = g_try_malloc(v1size);
-                if (id3_tag_render(v1tag, v1buf) != v1size)
+                v1buf = g_malloc (v1size);
+
+                if (id3_tag_render (v1tag, v1buf) != v1size)
                 {
                     /* NOTREACHED */
-                    g_free(v1buf);
+                    g_free (v1buf);
                     v1buf = NULL;
                 }
             }
@@ -1538,14 +1559,16 @@ etag_write_tags (const gchar *filename,
         /* Render v2 tag */
         if (v2tag)
         {
-            v2size = id3_tag_render(v2tag, NULL);
+            v2size = id3_tag_render (v2tag, NULL);
+
             if (v2size > 10)
             {
-                v2buf = g_try_malloc0(v2size);
-                if ((v2size = id3_tag_render(v2tag, v2buf)) == 0)
+                v2buf = g_malloc0 (v2size);
+
+                if ((v2size = id3_tag_render (v2tag, v2buf)) == 0)
                 {
                     /* NOTREACHED */
-                    g_free(v2buf);
+                    g_free (v2buf);
                     v2buf = NULL;
                 }
             }
@@ -1553,184 +1576,239 @@ etag_write_tags (const gchar *filename,
     }
     
     if (v1buf == NULL)
+    {
         v1size = 0;
+    }
     if (v2buf == NULL)
+    {
         v2size = 0;
+    }
 
-    if ((fd = open (filename, O_RDWR)) < 0)
+    file = g_file_new_for_path (filename);
+    iostream = g_file_open_readwrite (file, NULL, error);
+
+    if (!iostream)
     {
-        g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
-                     "%s", g_strerror (errno));
-        g_free (v1buf);
-        g_free (v2buf);
-        return FALSE;
+        goto err;
+    }
+
+    /* Seeking on the IOStream seeks to the same position on both the input and
+     * output streams. */
+    seekable = G_SEEKABLE (iostream);
+
+    if (!g_seekable_can_seek (seekable))
+    {
+        g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_BADF, "%s",
+                     g_strerror (EBADF));
+        goto err;
     }
 
     success = FALSE;
 
-    /* Handle Id3v1 tag */
-    if ((curpos = lseek (fd, -128, SEEK_END)) < 0)
-        goto out;
-    if ((size_read = read (fd, tmp, ID3_TAG_QUERYSIZE)) != ID3_TAG_QUERYSIZE)
+    /* Handle ID3v1 tag */
+    if (!g_seekable_seek (seekable, -ID3V1_TAG_SIZE, G_SEEK_END, NULL, error))
     {
-        goto out;
+        goto err;
     }
 
-    if ( (tmp[0] == 'T')
-    &&   (tmp[1] == 'A')
-    &&   (tmp[2] == 'G')
-       )
+    istream = g_io_stream_get_input_stream (G_IO_STREAM (iostream));
+
+    if (!g_input_stream_read_all (istream, tmp, ID3_TAG_QUERYSIZE, &bytes_read,
+                                  NULL, error))
+    {
+        goto err;
+    }
+
+    /* Seek to the beginning of the ID3v1 tag, if it exists. */
+    if ((tmp[0] == 'T') && (tmp[1] == 'A') && (tmp[2] == 'G'))
     {
-        if ((curpos = lseek(fd, -128, SEEK_END)) < 0)
+        if (!g_seekable_seek (seekable, -ID3V1_TAG_SIZE, G_SEEK_END, NULL,
+                              error))
         {
-            goto out;
+            goto err;
         }
-    }else
+    }
+    else
     {
-        if ((curpos = lseek(fd, 0, SEEK_END)) < 0)
+        if (!g_seekable_seek (seekable, 0, G_SEEK_END, NULL, error))
         {
-            goto out;
+            goto err;
         }
     }
 
-    /* Search id3v2 tags at the end of the file (before any ID3v1 tag) */
+    /* Search ID3v2 tags at the end of the file (before any ID3v1 tag) */
     /* XXX: Unsafe */
-    if ((curpos = lseek (fd, -ID3_TAG_QUERYSIZE, SEEK_CUR)) >= 0)
+    if (g_seekable_seek (seekable, -ID3_TAG_QUERYSIZE, G_SEEK_CUR, NULL,
+                         error))
     {
-        if (read (fd, tmp, ID3_TAG_QUERYSIZE) != ID3_TAG_QUERYSIZE)
-            goto out;
-        filev2size = id3_tag_query((id3_byte_t const *)tmp, ID3_TAG_QUERYSIZE);
-        if ((filev2size > 10) && (curpos = lseek (fd, -filev2size, SEEK_CUR)))
+        if (!g_input_stream_read_all (istream, tmp, ID3_TAG_QUERYSIZE,
+                                      &bytes_read, NULL, error))
         {
-            if ((size_read = read (fd, tmp, ID3_TAG_QUERYSIZE)) != ID3_TAG_QUERYSIZE)
+            goto err;
+        }
+
+        filev2size = id3_tag_query ((id3_byte_t const *)tmp,
+                                    ID3_TAG_QUERYSIZE);
+
+        if (filev2size > 10)
+        {
+            if (!g_seekable_seek (seekable, -filev2size, G_SEEK_CUR, NULL,
+                                  error))
+            {
+                goto err;
+            }
+
+            if (!g_input_stream_read_all (istream, tmp, ID3_TAG_QUERYSIZE,
+                                          &bytes_read, NULL, error))
             {
-                goto out;
+                goto err;
+            }
+
+            if (id3_tag_query ((id3_byte_t const *)tmp, ID3_TAG_QUERYSIZE)
+                != filev2size)
+            {
+                if (!g_seekable_seek (seekable,
+                                      -ID3_TAG_QUERYSIZE - filev2size,
+                                      G_SEEK_CUR, NULL, error))
+                {
+                    goto err;
+                }
             }
-            if (id3_tag_query((id3_byte_t const *)tmp, ID3_TAG_QUERYSIZE) != filev2size)
-                curpos = lseek (fd, -ID3_TAG_QUERYSIZE - filev2size, SEEK_CUR);
             else
-                curpos = lseek (fd, -ID3_TAG_QUERYSIZE, SEEK_CUR);
+            {
+                if (!g_seekable_seek (seekable, -ID3_TAG_QUERYSIZE,
+                                      G_SEEK_CUR, NULL, error))
+                {
+                    goto err;
+                }
+            }
         }
     }
 
+    ostream = g_io_stream_get_output_stream (G_IO_STREAM (iostream));
+
     /* Write id3v1 tag */
     if (v1buf)
     {
-        if (write (fd, v1buf, v1size) != v1size)
-            goto out;
+        if (!g_output_stream_write_all (ostream, v1buf, v1size, &bytes_written,
+                                        NULL, error))
+        {
+            goto err;
+        }
     }
 
     /* Truncate file (strip tags at the end of file) */
-    if ((curpos = lseek (fd, 0, SEEK_CUR)) <= 0)
-        goto out;
-    if (ftruncate (fd, curpos) == -1)
-        goto out;
+    if (!g_seekable_can_truncate (seekable))
+    {
+        g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_BADF, "%s",
+                     g_strerror (EBADF));
+        goto err;
+    }
+
+    if (!g_seekable_truncate (seekable, g_seekable_tell (seekable), NULL,
+                              error))
+    {
+        goto err;
+    }
 
     /* Handle Id3v2 tag */
-    if ((curpos = lseek(fd, 0, SEEK_SET)) < 0)
-        goto out;
+    if (!g_seekable_seek (seekable, 0, G_SEEK_SET, NULL, error))
+    {
+        goto err;
+    }
 
-    if ( (size_read = read(fd, tmp, ID3_TAG_QUERYSIZE)) != ID3_TAG_QUERYSIZE)
+    if (!g_input_stream_read_all (istream, tmp, ID3_TAG_QUERYSIZE, &bytes_read,
+                                  NULL, error))
     {
-        goto out;
+        goto err;
     }
 
-    filev2size = id3_tag_query((id3_byte_t const *)tmp, ID3_TAG_QUERYSIZE);
+    filev2size = id3_tag_query ((id3_byte_t const *)tmp, ID3_TAG_QUERYSIZE);
 
-    // No ID3v2 tag in the file, and no new tag
-    if ( (filev2size == 0)
-    &&   (v2size == 0) )
-        goto out;
+    /* No ID3v2 tag in the file, and no new tag. */
+    if ((filev2size == 0) && (v2size == 0))
+    {
+        /* TODO: Improve error description. */
+        g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_BADF, "%s",
+                     g_strerror (EBADF));
+        goto err;
+    }
 
     if (filev2size == v2size)
     {
-        if ((curpos = lseek(fd, 0, SEEK_SET)) < 0)
-            goto out;
-        if (write(fd, v2buf, v2size) != v2size)
-            goto out;
-    }else
+        if (!g_seekable_seek (seekable, 0, G_SEEK_SET, NULL, error))
+        {
+            goto err;
+        }
+
+        if (!g_output_stream_write_all (ostream, v2buf, v2size, &bytes_written,
+                                        NULL, error))
+        {
+            goto err;
+        }
+    }
+    else
     {
         /* XXX */
-        // Size of audio data (tags at the end were already removed)
-        ctxsize = lseek (fd, 0, SEEK_END) - filev2size;
-
-        if ((ctx = g_try_malloc(ctxsize)) == NULL)
-            goto out;
-        if ((curpos = lseek (fd, filev2size, SEEK_SET)) < 0)
-            goto out;
-        if ((size_read = read (fd, ctx, ctxsize)) != ctxsize)
+        /* Size of audio data (tags at the end were already removed) */
+        if (!g_seekable_seek (seekable, 0, G_SEEK_END, NULL, error))
         {
-            gchar *filename_utf8 = filename_to_display(filename);
-            gchar *basename_utf8 = g_path_get_basename(filename_utf8);
-            gchar *bytes_missing = g_strdup_printf ("%" G_GSIZE_FORMAT,
-                                                    ctxsize - size_read);
-
-            /* Construct the string in this awkward way as xgettext does not
-             * support macros in extracted strings.
-             * https://bugzilla.gnome.org/show_bug.cgi?id=705952
-             */
-            g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
-                         /* 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.
-                          */
-                         ngettext ("Cannot write tag of file ‘%s’ (a byte was missing)",
-                                   "Cannot write tag of file ‘%s’ (%s bytes were missing)",
-                                   ctxsize - size_read),
-                         basename_utf8, bytes_missing);
-            g_free (filename_utf8);
-            g_free (basename_utf8);
-            g_free (bytes_missing);
-            goto out;
+            goto err;
+        }
+
+        ctxsize = g_seekable_tell (seekable) - filev2size;
+
+        ctx = g_malloc (ctxsize);
+
+        if (!g_seekable_seek (seekable, filev2size, G_SEEK_SET, NULL, error))
+        {
+            goto err;
+        }
+
+        if (!g_input_stream_read_all (istream, ctx, ctxsize, &bytes_read, NULL,
+                                      error))
+        {
+            goto err;
         }
         
-        // Return to the beginning of the file
-        if (lseek (fd, 0, SEEK_SET) < 0)
-            goto out;
-            
-        // Write the ID3v2 tag
+        /* Return to the beginning of the file. */
+        if (!g_seekable_seek (seekable, 0, G_SEEK_SET, NULL, error))
+        {
+            goto err;
+        }
+
+        /* Write the ID3v2 tag. */
         if (v2buf)
         {
-            if (write (fd, v2buf, v2size) != v2size)
+            if (!g_output_stream_write_all (ostream, v2buf, v2size,
+                                            &bytes_written, NULL, error))
             {
-                gchar *filename_utf8 = filename_to_display (filename);
-                gchar *basename_utf8 = g_path_get_basename (filename_utf8);
-                g_set_error (error, G_FILE_ERROR,
-                             g_file_error_from_errno (errno),
-                             _("Cannot save tag of file ‘%s’"), basename_utf8);
-                g_free (basename_utf8);
-                goto out;
+                goto err;
             }
         }
-        // Write audio data
-        if (write(fd, ctx, ctxsize) != ctxsize)
+
+        /* Write audio data. */
+        if (!g_output_stream_write_all (ostream, ctx, ctxsize, &bytes_written,
+                                        NULL, error))
         {
-            gchar *filename_utf8 = filename_to_display(filename);
-            gchar *basename_utf8 = g_path_get_basename(filename_utf8);
-            g_set_error (error, G_FILE_ERROR,
-                         g_file_error_from_errno (errno),
-                         _("Size error while saving tag of ‘%s’"),
-                         basename_utf8);
-            g_free (filename_utf8);
-            g_free (basename_utf8);
-            goto out;
+            goto err;
         }
 
-        if ((curpos = lseek (fd, 0, SEEK_CUR)) <= 0)
-            goto out;
-
-        if (ftruncate (fd, curpos) < 0)
-            goto out;
+        if (!g_seekable_truncate (seekable, g_seekable_tell (seekable), NULL,
+                                  error))
+        {
+            goto err;
+        }
     }
 
     success = TRUE;
-out:
-    g_free(ctx);
-    lseek(fd, 0, SEEK_SET);
-    close(fd);
-    g_free(v1buf);
-    g_free(v2buf);
+
+err:
+    g_free (ctx);
+    g_object_unref (file);
+    g_clear_object (&iostream);
+    g_free (v1buf);
+    g_free (v2buf);
     return success;
 }
 
diff --git a/src/tags/libapetag/COPYING.LGPL b/src/tags/libapetag/COPYING.LGPL
deleted file mode 100644
index cc6f365..0000000
--- a/src/tags/libapetag/COPYING.LGPL
+++ /dev/null
@@ -1,510 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-^L
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-^L
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-

-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-^L
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-^L
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-^L
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-^L
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-^L
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-^L
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-  Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/src/tags/libapetag/README.apetag b/src/tags/libapetag/README.apetag
index 9b3d311..f2f2255 100644
--- a/src/tags/libapetag/README.apetag
+++ b/src/tags/libapetag/README.apetag
@@ -9,4 +9,4 @@ All documentation fixes please send too (check all *.h files)
 
 this will be on dual licences GPL/LGPL (propably) 
 
-now is LGPL
+now is GPLv2+
diff --git a/src/tags/libapetag/apetaglib.c b/src/tags/libapetag/apetaglib.c
index 57533d8..aeceef5 100644
--- a/src/tags/libapetag/apetaglib.c
+++ b/src/tags/libapetag/apetaglib.c
@@ -1,23 +1,20 @@
-/********************************************************************
-* 
-* Copyright (c) 2002 Artur Polaczynski (Ar't)  All rights reserved.
-*            <artii at o2.pl>        LGPL-2.1
-*       $ArtId: apetaglib.c,v 1.44 2003/04/16 21:06:27 art Exp $
-********************************************************************/
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation; either version 2.1 
- * of the License, or (at your option) any later version.
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
+ * Copyright (C) 2002 Artur Polaczynski (Ar't) <artii at o2.pl>
+ *
+ * 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 Lesser 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 Lesser 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.
  */
 
 #include <string.h>
diff --git a/src/tags/libapetag/apetaglib.h b/src/tags/libapetag/apetaglib.h
index 41bc007..15ab8f2 100644
--- a/src/tags/libapetag/apetaglib.h
+++ b/src/tags/libapetag/apetaglib.h
@@ -1,26 +1,22 @@
-/********************************************************************
-*    
-* Copyright (c) 2002 Artur Polaczynski (Ar't)  All rights reserved.
-*            <artii at o2.pl>        LGPL-2.1
-*       $ArtId: apetaglib.h,v 1.30 2003/04/16 21:06:27 art Exp $
-********************************************************************/
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation; either version 2.1 
- * of the License, or (at your option) any later version.
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
+ * Copyright (C) 2002 Artur Polaczynski (Ar't) <artii at o2.pl>
  *
- * 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 Lesser General Public License for more details.
+ * 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.
  *
- * You should have received a copy of the GNU Lesser 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
+ * 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 _APETAGLIB_H
 #define _APETAGLIB_H
 
@@ -84,6 +80,7 @@
 #define APE_TAG_FIELD_TITLE             "Title"
 #define APE_TAG_FIELD_SUBTITLE          "Subtitle"
 #define APE_TAG_FIELD_ARTIST            "Artist"
+#define APE_TAG_FIELD_ALBUMARTIST "Album Artist"
 #define APE_TAG_FIELD_ALBUM             "Album"
 #define APE_TAG_FIELD_PART "Part"
 #define APE_TAG_FIELD_DEBUTALBUM        "Debut Album"
diff --git a/src/tags/libapetag/id3v2_read.c b/src/tags/libapetag/id3v2_read.c
index f5e445e..ec1fd0f 100644
--- a/src/tags/libapetag/id3v2_read.c
+++ b/src/tags/libapetag/id3v2_read.c
@@ -1,26 +1,22 @@
-/********************************************************************
-*    
-* Copyright (c) 2002 Artur Polaczynski (Ar't)  All rights reserved.
-*            <artii at o2.pl>        LGPL-2.1
-*       $ArtId: id3v2_read.c,v 1.16 2003/04/13 11:24:10 art Exp $
-********************************************************************/
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation; either version 2.1 
- * of the License, or (at your option) any later version.
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
+ * Copyright (C) 2002 Artur Polaczynski (Ar't) <artii at o2.pl>
+ *
+ * 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 Lesser 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 Lesser 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.
  */
 
-
 #ifdef ID3V2_READ
 
 #include <string.h>
diff --git a/src/tags/libapetag/id3v2_read.h b/src/tags/libapetag/id3v2_read.h
index 0a9918b..f9c4680 100644
--- a/src/tags/libapetag/id3v2_read.h
+++ b/src/tags/libapetag/id3v2_read.h
@@ -1,26 +1,22 @@
-/********************************************************************
-*    
-* Copyright (c) 2002 Artur Polaczynski (Ar't)  All rights reserved.
-*            <artii at o2.pl>        LGPL-2.1
-*       $ArtId: id3v2_read.h,v 1.6 2003/04/04 20:06:40 art Exp $
-********************************************************************/
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation; either version 2.1 
- * of the License, or (at your option) any later version.
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
+ * Copyright (C) 2002 Artur Polaczynski (Ar't) <artii at o2.pl>
  *
- * 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 Lesser General Public License for more details.
+ * 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.
  *
- * You should have received a copy of the GNU Lesser 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
+ * 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 _ID3V2_READ_H
 #define _ID3V2_READ_H
 
diff --git a/src/tags/libapetag/info_mac.c b/src/tags/libapetag/info_mac.c
index fb19f97..2105545 100644
--- a/src/tags/libapetag/info_mac.c
+++ b/src/tags/libapetag/info_mac.c
@@ -1,23 +1,20 @@
-/********************************************************************
-*    
-* Copyright (c) 2002 Artur Polaczynski (Ar't)  All rights reserved.
-*            <artii at o2.pl>        LGPL-2.1
-*       $ArtId: info_mac.c,v 1.15 2003/04/13 11:24:10 art Exp $
-********************************************************************/
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation; either version 2.1 
- * of the License, or (at your option) any later version.
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
+ * Copyright (C) 2002 Artur Polaczynski (Ar't) <artii at o2.pl>
+ *
+ * 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 Lesser 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 Lesser 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.
  */
 
 #include <stdio.h>
diff --git a/src/tags/libapetag/info_mac.h b/src/tags/libapetag/info_mac.h
index 25f841a..f588f97 100644
--- a/src/tags/libapetag/info_mac.h
+++ b/src/tags/libapetag/info_mac.h
@@ -1,26 +1,22 @@
-/********************************************************************
-*    
-* Copyright (c) 2002 Artur Polaczynski (Ar't)  All rights reserved.
-*            <artii at o2.pl>        LGPL-2.1
-*       $ArtId: info_mac.h,v 1.6 2003/04/13 11:24:10 art Exp $
-********************************************************************/
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation; either version 2.1 
- * of the License, or (at your option) any later version.
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
+ * Copyright (C) 2002 Artur Polaczynski (Ar't) <artii at o2.pl>
  *
- * 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 Lesser General Public License for more details.
+ * 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.
  *
- * You should have received a copy of the GNU Lesser 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
+ * 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 INFO_MAC_H
 #define INFO_MAC_H
 
diff --git a/src/tags/libapetag/info_mpc.c b/src/tags/libapetag/info_mpc.c
index 94070fa..712cb16 100644
--- a/src/tags/libapetag/info_mpc.c
+++ b/src/tags/libapetag/info_mpc.c
@@ -1,24 +1,22 @@
-/********************************************************************
-*    
-* Copyright (c) 2002 Artur Polaczynski (Ar't)  All rights reserved.
-*            <artii at o2.pl>        LGPL-2.1
-*       $ArtId: info_mpc.c,v 1.12 2003/04/13 11:24:10 art Exp $
-********************************************************************/
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation; either version 2.1 
- * of the License, or (at your option) any later version.
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
+ * Copyright (C) 2002 Artur Polaczynski (Ar't) <artii at o2.pl>
+ *
+ * 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 Lesser 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 Lesser 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.
  */
+
 /*
     Some portions of code or/and ideas come from 
     winamp plugins, xmms plugins, mppdec decoder
diff --git a/src/tags/libapetag/info_mpc.h b/src/tags/libapetag/info_mpc.h
index 7567d82..d82a9bb 100644
--- a/src/tags/libapetag/info_mpc.h
+++ b/src/tags/libapetag/info_mpc.h
@@ -1,26 +1,22 @@
-/********************************************************************
-*    
-* Copyright (c) 2002 Artur Polaczynski (Ar't)  All rights reserved.
-*            <artii at o2.pl>        LGPL-2.1
-*       $ArtId: info_mpc.h,v 1.8 2003/04/13 11:24:10 art Exp $
-********************************************************************/
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation; either version 2.1 
- * of the License, or (at your option) any later version.
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
+ * Copyright (C) 2002 Artur Polaczynski (Ar't) <artii at o2.pl>
  *
- * 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 Lesser General Public License for more details.
+ * 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.
  *
- * You should have received a copy of the GNU Lesser 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
+ * 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 INFO_MPC_H
 #define INFO_MPC_H
 
diff --git a/src/tags/libapetag/is_tag.c b/src/tags/libapetag/is_tag.c
index 7cef2b1..7ba9bb4 100644
--- a/src/tags/libapetag/is_tag.c
+++ b/src/tags/libapetag/is_tag.c
@@ -1,23 +1,20 @@
-/********************************************************************
-*    
-* Copyright (c) 2002 Artur Polaczynski (Ar't)  All rights reserved.
-*            <artii at o2.pl>        LGPL-2.1
-*       $ArtId: is_tag.c,v 1.10 2003/04/16 21:06:27 art Exp $
-********************************************************************/
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation; either version 2.1 
- * of the License, or (at your option) any later version.
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
+ * Copyright (C) 2002 Artur Polaczynski (Ar't) <artii at o2.pl>
+ *
+ * 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 Lesser 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 Lesser 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.
  */
 
 #include <string.h>
diff --git a/src/tags/libapetag/is_tag.h b/src/tags/libapetag/is_tag.h
index 1eaad3b..fec96c8 100644
--- a/src/tags/libapetag/is_tag.h
+++ b/src/tags/libapetag/is_tag.h
@@ -1,26 +1,22 @@
-/********************************************************************
-*    
-* Copyright (c) 2002 Artur Polaczynski (Ar't)  All rights reserved.
-*            <artii at o2.pl>        LGPL-2.1
-*       $ArtId: is_tag.h,v 1.7 2003/04/13 11:24:10 art Exp $
-********************************************************************/
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation; either version 2.1 
- * of the License, or (at your option) any later version.
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
+ * Copyright (C) 2002 Artur Polaczynski (Ar't) <artii at o2.pl>
  *
- * 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 Lesser General Public License for more details.
+ * 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.
  *
- * You should have received a copy of the GNU Lesser 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
+ * 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 _IS_TAG_H
 #define _IS_TAG_H
 
diff --git a/src/tags/monkeyaudio_header.c b/src/tags/monkeyaudio_header.c
index 2a00820..e7671e1 100644
--- a/src/tags/monkeyaudio_header.c
+++ b/src/tags/monkeyaudio_header.c
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "et_core.h"
diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
index bc2a1b4..32eaf20 100644
--- a/src/tags/mp4_tag.cc
+++ b/src/tags/mp4_tag.cc
@@ -23,7 +23,6 @@
 
 #ifdef ENABLE_MP4
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "mp4_header.h"
@@ -210,15 +209,17 @@ mp4tag_read_file_tag (GFile *file,
         const TagLib::MP4::CoverArtList covers = cover.toCoverArtList ();
         const TagLib::MP4::CoverArt &art = covers.front ();
 
-        FileTag->picture = Picture_Allocate ();
+        /* TODO: Use g_bytes_new_with_free_func()? */
+        GBytes *bytes = g_bytes_new (art.data ().data (), art.data ().size ());
 
-        FileTag->picture->size = art.data ().size ();
-        FileTag->picture->data = (guchar *)g_memdup (art.data ().data (),
-                                                     art.data ().size ());
+        /* MP4 does not support image types, nor descriptions. */
+        FileTag->picture = et_picture_new (ET_PICTURE_TYPE_FRONT_COVER, "", 0,
+                                           0, bytes);
+        g_bytes_unref (bytes);
     }
     else
     {
-        FileTag->picture = NULL;
+        et_file_tag_set_picture (FileTag, NULL);
     }
 
     return TRUE;
@@ -439,6 +440,8 @@ mp4tag_write_file_tag (const ET_File *ETFile,
     {
         Picture_Format pf;
         TagLib::MP4::CoverArt::Format f;
+        gconstpointer data;
+        gsize data_size;
 
         pf = Picture_Format_From_Data (FileTag->picture);
 
@@ -459,8 +462,9 @@ mp4tag_write_file_tag (const ET_File *ETFile,
                 break;
         }
 
-        TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)FileTag->picture->data,
-                                                         FileTag->picture->size));
+        data = g_bytes_get_data (FileTag->picture->bytes, &data_size);
+        TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+                                                         data_size));
 
         extra_items.insert ("covr",
                             TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
diff --git a/src/tags/mpeg_header.c b/src/tags/mpeg_header.c
index 2913b53..159b526 100644
--- a/src/tags/mpeg_header.c
+++ b/src/tags/mpeg_header.c
@@ -21,7 +21,6 @@
 
 #if defined ENABLE_MP3 && defined ENABLE_ID3LIB
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <errno.h>
 
diff --git a/src/tags/musepack_header.c b/src/tags/musepack_header.c
index a696eda..9cf7481 100644
--- a/src/tags/musepack_header.c
+++ b/src/tags/musepack_header.c
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "et_core.h"
diff --git a/src/tags/ogg_header.c b/src/tags/ogg_header.c
index 9cca686..c7190e3 100644
--- a/src/tags/ogg_header.c
+++ b/src/tags/ogg_header.c
@@ -21,7 +21,6 @@
 
 #ifdef ENABLE_OGG
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <errno.h>
 #include <vorbis/codec.h>
@@ -50,7 +49,7 @@ et_ogg_error_quark (void)
 }
 
 /*
- * EtOggState:
+ * EtOggHeaderState:
  * @file: the Ogg file which is currently being parsed
  * @istream: an input stream for the current Ogg file
  * @error: either the most recent error, or %NULL
@@ -63,7 +62,7 @@ typedef struct
     GFile *file;
     GInputStream *istream;
     GError *error;
-} EtOggState;
+} EtOggHeaderState;
 
 /*
  * et_ogg_read_func:
@@ -80,7 +79,7 @@ typedef struct
 static size_t
 et_ogg_read_func (void *ptr, size_t size, size_t nmemb, void *datasource)
 {
-    EtOggState *state = (EtOggState *)datasource;
+    EtOggHeaderState *state = (EtOggHeaderState *)datasource;
     gssize bytes_read;
 
     bytes_read = g_input_stream_read (state->istream, ptr, size * nmemb, NULL,
@@ -111,7 +110,7 @@ et_ogg_read_func (void *ptr, size_t size, size_t nmemb, void *datasource)
 static int
 et_ogg_seek_func (void *datasource, ogg_int64_t offset, int whence)
 {
-    EtOggState *state = (EtOggState *)datasource;
+    EtOggHeaderState *state = (EtOggHeaderState *)datasource;
     GSeekType seektype;
 
     if (!g_seekable_can_seek (G_SEEKABLE (state->istream)))
@@ -161,7 +160,7 @@ et_ogg_seek_func (void *datasource, ogg_int64_t offset, int whence)
 static int
 et_ogg_close_func (void *datasource)
 {
-    EtOggState *state = (EtOggState *)datasource;
+    EtOggHeaderState *state = (EtOggHeaderState *)datasource;
 
     g_clear_object (&state->istream);
     g_clear_error (&state->error);
@@ -180,7 +179,7 @@ et_ogg_close_func (void *datasource)
 static long
 et_ogg_tell_func (void *datasource)
 {
-    EtOggState *state = (EtOggState *)datasource;
+    EtOggHeaderState *state = (EtOggHeaderState *)datasource;
 
     return g_seekable_tell (G_SEEKABLE (state->istream));
 }
@@ -200,7 +199,7 @@ et_ogg_header_read_file_info (GFile *file,
     gint res;
     ov_callbacks callbacks = { et_ogg_read_func, et_ogg_seek_func,
                                et_ogg_close_func, et_ogg_tell_func };
-    EtOggState state;
+    EtOggHeaderState state;
     GFileInfo *info;
 
     g_return_val_if_fail (file != NULL && ETFileInfo != NULL, FALSE);
@@ -305,9 +304,9 @@ et_speex_header_read_file_info (GFile *file,
                                 ET_File_Info *ETFileInfo,
                                 GError **error)
 {
-    vcedit_state *state;
-    SpeexHeader  *si;
-    gchar *encoder_version = NULL;
+    EtOggState *state;
+    const SpeexHeader *si;
+    const gchar *encoder_version = NULL;
     gint channels = 0;
     glong rate = 0;
     glong bitrate = 0;
@@ -341,8 +340,8 @@ et_speex_header_read_file_info (GFile *file,
     ETFileInfo->size = g_file_info_get_size (info);
     g_object_unref (info);
 
-    // Get Speex information
-    if ( (si=state->si) != NULL )
+    /* Get Speex information. */
+    if ((si = vcedit_speex_header (state)) != NULL)
     {
         encoder_version = si->speex_version;
         channels        = si->nb_channels;        // Number of channels in bitstream.
diff --git a/src/tags/ogg_header.h b/src/tags/ogg_header.h
index 533eea7..a0a5698 100644
--- a/src/tags/ogg_header.h
+++ b/src/tags/ogg_header.h
@@ -21,8 +21,7 @@
 #ifndef ET_OGG_HEADER_H_
 #define ET_OGG_HEADER_H_
 
-
-#include <glib.h>
+#include <gio/gio.h>
 #include "et_core.h"
 
 G_BEGIN_DECLS
diff --git a/src/tags/ogg_tag.c b/src/tags/ogg_tag.c
index 29e7fbe..948e30c 100644
--- a/src/tags/ogg_tag.c
+++ b/src/tags/ogg_tag.c
@@ -21,15 +21,10 @@
 
 #ifdef ENABLE_OGG
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <vorbis/codec.h>
-#include <vorbis/vorbisfile.h>
-#include <unistd.h>
 
 #include "easytag.h"
 #include "ogg_tag.h"
@@ -125,13 +120,16 @@ convert_to_byte_array (guint32 n, guchar *array)
  */
 
 static void
-add_to_guchar_str (guchar *ustr, gsize *ustr_len, guchar *str, gsize str_len)
+add_to_guchar_str (guchar *ustr,
+                   gsize *ustr_len,
+                   const guchar *str,
+                   gsize str_len)
 {
     gsize i;
 
     for (i = *ustr_len; i < *ustr_len + str_len; i++)
     {
-        ustr [i] = str [i - *ustr_len];
+        ustr[i] = str[i - *ustr_len];
     }
 
     *ustr_len += str_len;
@@ -174,7 +172,7 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
     gchar *string1 = NULL;
     gchar *string2 = NULL;
     guint field_num, i;
-    Picture *prev_pic = NULL;
+    EtPicture *prev_pic = NULL;
 
     /*********
      * Title *
@@ -483,52 +481,43 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
     field_num = 0;
     while ( (string = vorbis_comment_query(vc,"COVERART",field_num++)) != NULL )
     {
-        Picture *pic;
+        EtPicture *pic;
+        guchar *data;
+        gsize data_size;
+        GBytes *bytes;
+        EtPictureType type;
+        const gchar *description;
             
         /* 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;
-        else
-            prev_pic->next = pic;
-        prev_pic = pic;
-
-        pic->data = NULL;
-        
-        // Decode picture data
-        pic->data = g_base64_decode (string, &pic->size);
+        /* Decode picture data. */
+        data = g_base64_decode (string, &data_size);
+        bytes = g_bytes_new_take (data, data_size);
 
-        if ( (string = vorbis_comment_query(vc,"COVERARTTYPE",field_num-1)) != NULL )
+        if ((string = vorbis_comment_query (vc, "COVERARTTYPE", field_num - 1))
+            != NULL)
         {
-            pic->type = atoi(string);
+            type = atoi (string);
         }
-
-        if ( (string = vorbis_comment_query(vc,"COVERARTDESCRIPTION",field_num-1)) != NULL )
+        else
         {
-            pic->description = g_strdup(string);
+            type = ET_PICTURE_TYPE_FRONT_COVER;
         }
 
-        //if ((string = vorbis_comment_query(vc,"COVERTARTMIME",field_num-1)) != NULL )
-        //{
-        //    pic->description = g_strdup(string);
-        //}
-
-    }
-
-    /* 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;
+        if ((string = vorbis_comment_query (vc, "COVERARTDESCRIPTION",
+                                            field_num - 1)) != NULL)
+        {
+            description = string;
+        }
+        else
+        {
+            description = "";
+        }
 
-        pic = Picture_Allocate();
+        pic = et_picture_new (type, description, 0, 0, bytes);
+        g_bytes_unref (bytes);
 
         if (!prev_pic)
         {
@@ -540,14 +529,29 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
         }
 
         prev_pic = pic;
+    }
 
-        pic->data = NULL;
+    /* METADATA_BLOCK_PICTURE tag used for picture information */
+    field_num = 0;
+    while ((string = vorbis_comment_query (vc, "METADATA_BLOCK_PICTURE",
+                                           field_num++)) != NULL)
+    {
+        EtPicture *pic;
+        gsize bytes_pos, mimelen, desclen;
+        guchar *decoded_ustr;
+        GBytes *bytes;
+        EtPictureType type;
+        gchar *description;
+        GBytes *pic_bytes;
+        gsize decoded_size;
+        gsize data_size;
 
         /* Decode picture data. */
-        decoded_ustr = g_base64_decode (string, &decoded_len);
+        decoded_ustr = g_base64_decode (string, &decoded_size);
+        bytes = g_bytes_new_take (decoded_ustr, decoded_size);
 
         /* Reading picture type. */
-        pic->type = read_guint32_from_byte (decoded_ustr, 0);
+        type = read_guint32_from_byte (decoded_ustr, 0);
         bytes_pos = 4;
 
         /* Reading MIME data. */
@@ -558,29 +562,36 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc,
         desclen = read_guint32_from_byte (decoded_ustr, bytes_pos);
         bytes_pos += 4;
 
-        pic->description = g_malloc (desclen + 1);
+        description = g_strndup ((const gchar *)&decoded_ustr[bytes_pos],
+                                 desclen);
 
-        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);
+        data_size = read_guint32_from_byte (decoded_ustr, bytes_pos);
         bytes_pos += 4;
 
-        /* Reading decoded picture */
-        pic->data = g_malloc (pic->size);
+        /* Read only the image data into a new GBytes. */
+        pic_bytes = g_bytes_new_from_bytes (bytes, bytes_pos, data_size);
+
+        pic = et_picture_new (type, description, 0, 0, pic_bytes);
+
+        g_free (description);
+        g_bytes_unref (pic_bytes);
 
-        for (i = 0; i < pic->size; i++)
+        if (!prev_pic)
         {
-            pic->data [i] = decoded_ustr [i + bytes_pos];
+            FileTag->picture = pic;
+        }
+        else
+        {
+            prev_pic->next = pic;
         }
 
-        g_free (decoded_ustr);
+        prev_pic = pic;
+
+        /* pic->bytes still holds a ref on the decoded data. */
+        g_bytes_unref (bytes);
     }
 
     /***************************
@@ -629,7 +640,7 @@ ogg_tag_read_file_tag (GFile *file,
                        GError **error)
 {
     GFileInputStream *istream;
-    vcedit_state   *state;
+    EtOggState *state;
     gchar *filename;
     gchar *filename_utf8;
 
@@ -790,11 +801,11 @@ ogg_tag_write_file_tag (const ET_File *ETFile,
     const File_Tag *FileTag;
     const gchar *filename;
     GFile           *file;
-    vcedit_state   *state;
+    EtOggState *state;
     vorbis_comment *vc;
     gchar          *string;
     GList *l;
-    Picture        *pic;
+    EtPicture *pic;
 
     g_return_val_if_fail (ETFile != NULL && ETFile->FileTag != NULL, FALSE);
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -905,139 +916,142 @@ ogg_tag_write_file_tag (const ET_File *ETFile,
      **************/
     et_ogg_set_tag (vc, "ENCODED-BY=", FileTag->encoded_by, FALSE);
     
-    
     /***********
      * Picture *
      ***********/
     for (pic = FileTag->picture; pic != NULL; pic = pic->next)
     {
-        if (pic->data)
+        const gchar *mime;
+        guchar array[4];
+        guchar *ustring = NULL;
+        gsize ustring_len = 0;
+        gchar *base64_string;
+        gsize desclen;
+        gconstpointer data;
+        gsize data_size;
+        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)
         {
-            const gchar *mime;
-            guchar array[4];
-            guchar *ustring = NULL;
-            gsize ustring_len = 0;
-            gchar *base64_string;
-            gsize desclen;
-            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)
-            {
-                GdkPixbufLoader *loader;
-                GError *error = NULL;
+            GdkPixbufLoader *loader;
+            gconstpointer data;
+            gsize data_size;
+            GError *error = NULL;
 
-                loader = gdk_pixbuf_loader_new ();
+            loader = gdk_pixbuf_loader_new ();
 
-                if (!gdk_pixbuf_loader_write (loader, pic->data, pic->size,
-                                              &error))
+            data = g_bytes_get_data (pic->bytes, &data_size);
+
+            /* TODO: Use gdk_pixbuf_loader_write_bytes() */
+            if (!gdk_pixbuf_loader_write (loader, data, data_size, &error))
+            {
+                g_debug ("Error parsing image data: %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))
                 {
-                    g_debug ("Error parsing image data: %s", error->message);
+                    g_debug ("Error parsing image data: %s",
+                             error->message);
                     g_error_free (error);
                     g_object_unref (loader);
                     continue;
                 }
-                else
+
+                pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+
+                if (!pixbuf)
                 {
-                    GdkPixbuf *pixbuf;
-                    gchar *buffer;
-                    gsize buffer_size;
-
-                    if (!gdk_pixbuf_loader_close (loader, &error))
-                    {
-                        g_debug ("Error parsing image data: %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);
+                    continue;
+                }
 
-                    /* 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_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_free (pic->data);
-                    pic->data = (guchar *)buffer;
-                    pic->size = buffer_size;
+                g_object_unref (pixbuf);
 
-                    /* Set the picture format to reflect the new data. */
-                    format = Picture_Format_From_Data (pic);
-                }
+                g_bytes_unref (pic->bytes);
+                pic->bytes = g_bytes_new_take (buffer, buffer_size);
+
+                /* Set the picture format to reflect the new data. */
+                format = Picture_Format_From_Data (pic);
             }
+        }
 
-            mime = Picture_Mime_Type_String (format);
+        mime = Picture_Mime_Type_String (format);
 
-            /* Calculating full length of byte string and allocating. */
-            desclen = pic->description ? strlen (pic->description) : 0;
-            ustring = g_malloc (4 * 8 + strlen (mime) + desclen + pic->size);
+        data = g_bytes_get_data (pic->bytes, &data_size);
 
-            /* Adding picture type. */
-            convert_to_byte_array (pic->type, array);
-            add_to_guchar_str (ustring, &ustring_len, array, 4);
+        /* Calculating full length of byte string and allocating. */
+        desclen = pic->description ? strlen (pic->description) : 0;
+        ustring = g_malloc (4 * 8 + strlen (mime) + desclen + data_size);
 
-            /* 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 type. */
+        convert_to_byte_array (pic->type, array);
+        add_to_guchar_str (ustring, &ustring_len, array, 4);
 
-            /* Adding picture description. */
-            convert_to_byte_array (desclen, array);
-            add_to_guchar_str (ustring, &ustring_len, array, 4);
-            add_to_guchar_str (ustring, &ustring_len,
-                               (guchar *)pic->description,
-                               desclen);
+        /* 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 width, height, color depth, indexed colors. */
-            convert_to_byte_array (pic->width, array);
-            add_to_guchar_str (ustring, &ustring_len, array, 4);
+        /* Adding picture description. */
+        convert_to_byte_array (desclen, array);
+        add_to_guchar_str (ustring, &ustring_len, array, 4);
+        add_to_guchar_str (ustring, &ustring_len,
+                           (guchar *)pic->description,
+                           desclen);
 
-            convert_to_byte_array (pic->height, array);
-            add_to_guchar_str (ustring, &ustring_len, array, 4);
+        /* 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 (0, 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);
 
-            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);
+        convert_to_byte_array (0, array);
+        add_to_guchar_str (ustring, &ustring_len, array, 4);
 
-            add_to_guchar_str (ustring, &ustring_len, pic->data, pic->size);
+        /* Adding picture data and its size. */
+        convert_to_byte_array (data_size, array);
+        add_to_guchar_str (ustring, &ustring_len, array, 4);
 
-            base64_string = g_base64_encode (ustring, ustring_len);
-            string = g_strconcat ("METADATA_BLOCK_PICTURE=", base64_string,
-                                  NULL);
-            vorbis_comment_add (vc, string);
+        add_to_guchar_str (ustring, &ustring_len, data, data_size);
 
-            g_free (base64_string);
-            g_free (ustring);
-            g_free (string);
-        }
+        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);
     }
 
     /**************************
@@ -1064,6 +1078,8 @@ ogg_tag_write_file_tag (const ET_File *ETFile,
         vcedit_clear (state);
     }
 
+    g_object_unref (file);
+
     g_assert (error == NULL || *error == NULL);
     return TRUE;
 }
diff --git a/src/tags/opus_header.c b/src/tags/opus_header.c
index 9eaa8aa..e4a95c0 100644
--- a/src/tags/opus_header.c
+++ b/src/tags/opus_header.c
@@ -20,9 +20,7 @@
 
 #ifdef ENABLE_OPUS
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <errno.h>
 
 #include "easytag.h"
 #include "opus_header.h"
diff --git a/src/tags/opus_tag.c b/src/tags/opus_tag.c
index 9cedd2c..1e104e8 100644
--- a/src/tags/opus_tag.c
+++ b/src/tags/opus_tag.c
@@ -22,11 +22,6 @@
 
 #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>
 
diff --git a/src/tags/vcedit.c b/src/tags/vcedit.c
index ccda76a..07d8859 100644
--- a/src/tags/vcedit.c
+++ b/src/tags/vcedit.c
@@ -1,12 +1,20 @@
-/* This program is licensed under the GNU Library General Public License, version 2,
- * a copy of which is included with this program (LICENCE.LGPL).
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
+ * Copyright (C) 2000-2001 Michael Smith <msmith at xiph.org>
  *
- * (c) 2000-2001 Michael Smith <msmith at xiph.org>
+ * 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.
  *
- * Comment editing backend, suitable for use by nice frontend interfaces.
- *
- * last modified: $Id: vcedit.c,v 1.23 2003/09/03 07:58:05 calc Exp $
+ * 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_OGG. */
@@ -14,7 +22,6 @@
 #ifdef ENABLE_OGG
 #include <gio/gio.h>
 #include <glib/gi18n.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ogg/ogg.h>
@@ -25,51 +32,97 @@
 
 #define CHUNKSIZE 4096
 
-vcedit_state *vcedit_new_state(void)
+struct _EtOggState
+{
+    /*< private >*/
+    GFileInputStream *in;
+#ifdef ENABLE_SPEEX
+    SpeexHeader *si;
+#endif
+#ifdef ENABLE_OPUS
+    OpusHead *oi;
+#endif
+    vorbis_info *vi;
+    ogg_stream_state *os;
+    ogg_sync_state *oy;
+    vorbis_comment *vc;
+    EtOggKind oggtype;
+    glong serial;
+    guchar *mainbuf;
+    guchar *bookbuf;
+    gchar *vendor;
+    gint mainlen;
+    gint booklen;
+    gint prevW;
+    gint extrapage;
+    gint eosin;
+};
+
+EtOggState *
+vcedit_new_state (void)
 {
-    vcedit_state *state = malloc(sizeof(vcedit_state));
-    memset(state, 0, sizeof(vcedit_state));
-    state->oggtype = VCEDIT_IS_UNKNOWN;
+    EtOggState *state = g_slice_new0 (EtOggState);
+    state->oggtype = ET_OGG_KIND_UNKNOWN;
 
     return state;
 }
 
-vorbis_comment *vcedit_comments(vcedit_state *state)
+vorbis_comment *
+vcedit_comments (EtOggState *state)
 {
     return state->vc;
 }
 
-static void vcedit_clear_internals(vcedit_state *state)
+#ifdef ENABLE_SPEEX
+const SpeexHeader *
+vcedit_speex_header (EtOggState *state)
 {
-    if(state->vc)
+    return state->si;
+}
+#endif /* ENABLE_SPEEX */
+
+static void
+vcedit_clear_internals (EtOggState *state)
+{
+    if (state->vc)
+    {
+        vorbis_comment_clear (state->vc);
+        g_slice_free (vorbis_comment, state->vc);
+    }
+
+    if (state->os)
     {
-        vorbis_comment_clear(state->vc);
-        free(state->vc);
+        ogg_stream_clear (state->os);
+        g_slice_free (ogg_stream_state, state->os);
     }
-    if(state->os)
+
+    if (state->oy)
     {
-        ogg_stream_clear(state->os);
-        free(state->os);
+        ogg_sync_clear (state->oy);
+        g_slice_free (ogg_sync_state, state->oy);
     }
-    if(state->oy)
+
+    g_free (state->vendor);
+    g_free (state->mainbuf);
+    g_free (state->bookbuf);
+
+    if (state->vi)
     {
-        ogg_sync_clear(state->oy);
-        free(state->oy);
+        vorbis_info_clear (state->vi);
+        g_slice_free (vorbis_info, state->vi);
     }
-    if(state->vendor)
-        free(state->vendor);
-    if(state->mainbuf)
-        free(state->mainbuf);
-    if(state->bookbuf)
-        free(state->bookbuf);
-    if(state->vi) {
-        vorbis_info_clear(state->vi);
-        free(state->vi);
+
+#ifdef ENABLE_SPEEX
+    if (state->si)
+    {
+        speex_header_free (state->si);
     }
+#endif
+
 #ifdef ENABLE_OPUS
     if (state->oi)
     {
-        g_free (state->oi);
+        g_slice_free (OpusHead, state->oi);
     }
 #endif /* ENABLE_OPUS */
 
@@ -78,90 +131,107 @@ static void vcedit_clear_internals(vcedit_state *state)
         g_object_unref (state->in);
     }
 
-    memset(state, 0, sizeof(*state));
+    memset (state, 0, sizeof (*state));
 }
 
-void vcedit_clear(vcedit_state *state)
+void
+vcedit_clear (EtOggState *state)
 {
-    if(state)
+    if (state)
     {
-        vcedit_clear_internals(state);
-        free(state);
+        vcedit_clear_internals (state);
+        g_slice_free (EtOggState, state);
     }
 }
 
 /* Next two functions pulled straight from libvorbis, apart from one change
  * - we don't want to overwrite the vendor string.
  */
-static void _v_writestring(oggpack_buffer *o, const char *s, int len)
+static void
+_v_writestring (oggpack_buffer *o,
+                const char *s,
+                int len)
 {
-    while(len--)
+    while (len--)
     {
-        oggpack_write(o,*s++,8);
+        oggpack_write (o, *s++, 8);
     }
 }
 
-static int _commentheader_out(vcedit_state *state, ogg_packet *op)
+static int
+_commentheader_out (EtOggState *state,
+                    ogg_packet *op)
 {
     vorbis_comment *vc = state->vc;
-    char           *vendor = state->vendor;
+    const gchar *vendor = state->vendor;
     oggpack_buffer opb;
 
-    oggpack_writeinit(&opb);
+    oggpack_writeinit (&opb);
 
-    if (state->oggtype == VCEDIT_IS_OGGVORBIS)
+    if (state->oggtype == ET_OGG_KIND_VORBIS)
     {
         /* preamble */
-        oggpack_write(&opb,0x03,8);
-        _v_writestring(&opb,"vorbis", 6);
+        oggpack_write (&opb, 0x03, 8);
+        _v_writestring (&opb, "vorbis", 6);
     }
 #ifdef ENABLE_OPUS
-    else if (state->oggtype == VCEDIT_IS_OPUS)
+    else if (state->oggtype == ET_OGG_KIND_OPUS)
     {
         _v_writestring (&opb, "OpusTags", 8);
     }
 #endif
 
     /* vendor */
-    oggpack_write(&opb,strlen(vendor),32);
-    _v_writestring(&opb,vendor, strlen(vendor));
+    oggpack_write (&opb, strlen (vendor), 32);
+    _v_writestring (&opb,vendor, strlen (vendor));
 
     /* comments */
-    oggpack_write(&opb,vc->comments,32);
-    if(vc->comments){
+    oggpack_write (&opb, vc->comments, 32);
+
+    if (vc->comments)
+    {
         int i;
-        for(i=0;i<vc->comments;i++){
-            if(vc->user_comments[i]){
-                oggpack_write(&opb,vc->comment_lengths[i],32);
-                _v_writestring(&opb,vc->user_comments[i],
-                               vc->comment_lengths[i]);
-            }else{
-                oggpack_write(&opb,0,32);
+
+        for (i=0; i < vc->comments; i++)
+        {
+            if (vc->user_comments[i])
+            {
+                oggpack_write (&opb, vc->comment_lengths[i], 32);
+                _v_writestring (&opb, vc->user_comments[i],
+                                vc->comment_lengths[i]);
+            }
+            else
+            {
+                oggpack_write (&opb, 0, 32);
             }
         }
     }
-    oggpack_write(&opb,1,1);
 
-    op->packet = _ogg_malloc(oggpack_bytes(&opb));
-    memcpy(op->packet, opb.buffer, oggpack_bytes(&opb));
+    oggpack_write (&opb, 1, 1);
+
+    op->packet = _ogg_malloc (oggpack_bytes (&opb));
+    memcpy (op->packet, opb.buffer, oggpack_bytes (&opb));
+
+    op->bytes = oggpack_bytes (&opb);
+    op->b_o_s = 0;
+    op->e_o_s = 0;
+    op->granulepos = 0;
 
-    op->bytes=oggpack_bytes(&opb);
-    op->b_o_s=0;
-    op->e_o_s=0;
-    op->granulepos=0;
-    if (state->oggtype == VCEDIT_IS_OGGVORBIS)
+    if (state->oggtype == ET_OGG_KIND_VORBIS)
     {
         op->packetno = 1;
     }
 
-    oggpack_writeclear(&opb);
+    oggpack_writeclear (&opb);
     return 0;
 }
 
-static int _blocksize(vcedit_state *s, ogg_packet *p)
+static int
+_blocksize (EtOggState *s,
+            ogg_packet *p)
 {
-    int this = vorbis_packet_blocksize(s->vi, p);
-    int ret = (this + s->prevW)/4;
+    int this = vorbis_packet_blocksize (s->vi, p);
+    int ret = (this + s->prevW) / 4;
 
     if(!s->prevW)
     {
@@ -174,7 +244,9 @@ static int _blocksize(vcedit_state *s, ogg_packet *p)
 }
 
 static gboolean
-_fetch_next_packet (vcedit_state *s, ogg_packet *p, ogg_page *page,
+_fetch_next_packet (EtOggState *s,
+                    ogg_packet *p,
+                    ogg_page *page,
                     GError **error)
 {
     int result;
@@ -183,25 +255,29 @@ _fetch_next_packet (vcedit_state *s, ogg_packet *p, ogg_page *page,
 
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-    result = ogg_stream_packetout(s->os, p);
+    result = ogg_stream_packetout (s->os, p);
 
-    if(result > 0)
+    if (result > 0)
+    {
         return TRUE;
+    }
     else
     {
-        if(s->eosin)
+        if (s->eosin)
         {
             g_set_error (error, ET_OGG_ERROR, ET_OGG_ERROR_EOS,
                          "Page reached end of logical bitstream");
             g_assert (error == NULL || *error != NULL);
             return FALSE;
         }
-        while(ogg_sync_pageout(s->oy, page) <= 0)
+
+        while (ogg_sync_pageout (s->oy, page) <= 0)
         {
-            buffer = ogg_sync_buffer(s->oy, CHUNKSIZE);
+            buffer = ogg_sync_buffer (s->oy, CHUNKSIZE);
             bytes = g_input_stream_read (G_INPUT_STREAM (s->in), buffer,
                                          CHUNKSIZE, NULL, error);
-            ogg_sync_wrote(s->oy, bytes);
+            ogg_sync_wrote (s->oy, bytes);
+
             if(bytes == 0)
             {
                 g_set_error (error, ET_OGG_ERROR, ET_OGG_ERROR_EOF,
@@ -215,9 +291,12 @@ _fetch_next_packet (vcedit_state *s, ogg_packet *p, ogg_page *page,
                 return FALSE;
             }
         }
-        if(ogg_page_eos(page))
+
+        if (ogg_page_eos (page))
+        {
             s->eosin = 1;
-        else if(ogg_page_serialno(page) != s->serial)
+        }
+        else if (ogg_page_serialno (page) != s->serial)
         {
             g_set_error (error, ET_OGG_ERROR, ET_OGG_ERROR_SN,
                          "Page serial number and state serial number doesn't match");
@@ -226,49 +305,73 @@ _fetch_next_packet (vcedit_state *s, ogg_packet *p, ogg_page *page,
             g_assert (error == NULL || *error != NULL);
             return FALSE;
         }
+
         g_assert (error == NULL || *error == NULL);
-        ogg_stream_pagein(s->os, page);
-        return _fetch_next_packet(s, p, page, error);
+        ogg_stream_pagein (s->os, page);
+        return _fetch_next_packet (s, p, page, error);
     }
 }
 
 /*
  * Next functions pulled straight from libvorbis,
  */
-static void _v_readstring(oggpack_buffer *o,char *buf,int bytes){
-  while(bytes--){
-    *buf++=oggpack_read(o,8);
-  }
+static void
+_v_readstring (oggpack_buffer *o,
+               char *buf,
+               int bytes)
+{
+    while (bytes--)
+    {
+        *buf++ = oggpack_read (o, 8);
+    }
 }
 
 /*
  * Next functions pulled straight from libvorbis, apart from one change
  * - disabled the EOP check
  */
-static int _speex_unpack_comment(vorbis_comment *vc,oggpack_buffer *opb)
+static int
+_speex_unpack_comment (vorbis_comment *vc,
+                       oggpack_buffer *opb)
 {
     int i;
-    int vendorlen=oggpack_read(opb,32);
-    if (vendorlen<0) 
+    int vendorlen = oggpack_read (opb, 32);
+
+    if (vendorlen < 0) 
+    {
         goto err_out;
+    }
+
+    vc->vendor = _ogg_calloc (vendorlen + 1, 1);
+    _v_readstring (opb, vc->vendor, vendorlen);
 
-    vc->vendor=_ogg_calloc(vendorlen+1,1);
-    _v_readstring(opb,vc->vendor,vendorlen);
+    vc->comments = oggpack_read (opb, 32);
 
-    vc->comments=oggpack_read(opb,32);
-    if (vc->comments<0)
+    if (vc->comments < 0)
+    {
         goto err_out;
-    vc->user_comments=_ogg_calloc(vc->comments+1,sizeof(*vc->user_comments));
-    vc->comment_lengths=_ogg_calloc(vc->comments+1, sizeof(*vc->comment_lengths));
-    for (i=0;i<vc->comments;i++){
-        int len=oggpack_read(opb,32);
-        if (len<0)
+    }
+
+    vc->user_comments = _ogg_calloc (vc->comments + 1,
+                                     sizeof (*vc->user_comments));
+    vc->comment_lengths = _ogg_calloc (vc->comments + 1,
+                                       sizeof (*vc->comment_lengths));
+
+    for (i = 0; i < vc->comments; i++)
+    {
+        int len = oggpack_read (opb, 32);
+
+        if (len < 0)
+        {
             goto err_out;
-        vc->comment_lengths[i]=len;
-        vc->user_comments[i]=_ogg_calloc(len+1,1);
-        _v_readstring(opb,vc->user_comments[i],len);
+        }
+
+        vc->comment_lengths[i] = len;
+        vc->user_comments[i] = _ogg_calloc (len + 1, 1);
+        _v_readstring (opb, vc->user_comments[i], len);
     }
-    //if(oggpack_read(opb,1)!=1)goto err_out; /* EOP check */
+
+    /*if(oggpack_read(opb,1)!=1)goto err_out; EOP check */ 
     return(0);
 
 err_out:
@@ -277,7 +380,9 @@ err_out:
 }
 
 gboolean
-vcedit_open(vcedit_state *state, GFile *file, GError **error)
+vcedit_open (EtOggState *state,
+             GFile *file,
+             GError **error)
 {
     char *buffer;
     gssize bytes;
@@ -295,7 +400,6 @@ vcedit_open(vcedit_state *state, GFile *file, GError **error)
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
     istream = g_file_read (file, NULL, error);
-    state->in = istream;
 
     if (!istream)
     {
@@ -303,12 +407,13 @@ vcedit_open(vcedit_state *state, GFile *file, GError **error)
         return FALSE;
     }
 
-    state->oy = malloc(sizeof(ogg_sync_state));
-    ogg_sync_init(state->oy);
+    state->in = istream;
+    state->oy = g_slice_new (ogg_sync_state);
+    ogg_sync_init (state->oy);
 
     while(1)
     {
-        buffer = ogg_sync_buffer(state->oy, CHUNKSIZE);
+        buffer = ogg_sync_buffer (state->oy, CHUNKSIZE);
         bytes = g_input_stream_read (G_INPUT_STREAM (state->in), buffer,
                                      CHUNKSIZE, NULL, error);
         if (bytes == -1)
@@ -328,110 +433,129 @@ vcedit_open(vcedit_state *state, GFile *file, GError **error)
                              "Input truncated or empty");
             else
                 g_set_error (error, ET_OGG_ERROR, ET_OGG_ERROR_NOTOGG,
-                             "Input is not an OGG bitstream");
+                             "Input is not an Ogg bitstream");
             goto err;
         }
     }
 
     state->serial = ogg_page_serialno(&og);
 
-    state->os = malloc(sizeof(ogg_stream_state));
-    ogg_stream_init(state->os, state->serial);
+    state->os = g_slice_new (ogg_stream_state);
+    ogg_stream_init (state->os, state->serial);
 
-    state->vi = malloc(sizeof(vorbis_info));
-    vorbis_info_init(state->vi);
+    state->vi = g_slice_new (vorbis_info);
+    vorbis_info_init (state->vi);
 
-    state->vc = malloc(sizeof(vorbis_comment));
-    vorbis_comment_init(state->vc);
+    state->vc = g_slice_new (vorbis_comment);
+    vorbis_comment_init (state->vc);
 
-    if(ogg_stream_pagein(state->os, &og) < 0)
+    if (ogg_stream_pagein (state->os, &og) < 0)
     {
         g_set_error (error, ET_OGG_ERROR, ET_OGG_ERROR_PAGE,
-                     "Error reading first page of OGG bitstream");
+                     "Error reading first page of Ogg bitstream");
         goto err;
     }
 
-    if(ogg_stream_packetout(state->os, &header_main) != 1)
+    if (ogg_stream_packetout (state->os, &header_main) != 1)
     {
         g_set_error (error, ET_OGG_ERROR, ET_OGG_ERROR_HEADER,
                      "Error reading initial header packet");
         goto err;
     }
 
-    // We save the main header first, (it seems speex_packet_to_header munge's it??)
+    /* Save the main header first, it seems speex_packet_to_header() munges
+     * it. */
     state->mainlen = header_main.bytes;
-    state->mainbuf = malloc(state->mainlen);
-    memcpy(state->mainbuf, header_main.packet, header_main.bytes);
+    state->mainbuf = g_memdup (header_main.packet, header_main.bytes);
 
-    state->oggtype = VCEDIT_IS_UNKNOWN;
-    if(vorbis_synthesis_headerin(state->vi, state->vc, &header_main) == 0)
+    state->oggtype = ET_OGG_KIND_UNKNOWN;
+
+    if(vorbis_synthesis_headerin (state->vi, state->vc, &header_main) == 0)
     {
-        state->oggtype = VCEDIT_IS_OGGVORBIS;
+        state->oggtype = ET_OGG_KIND_VORBIS;
     }
     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;
+        /* Done after "Ogg test" to avoid to display an error message in
+         * function speex_packet_to_header() when the file is not Speex. */
+        if((state->si = speex_packet_to_header ((char*)(&header_main)->packet,
+                                                (&header_main)->bytes)))
+        {
+            state->oggtype = ET_OGG_KIND_SPEEX;
+        }
 #endif
+
 #ifdef ENABLE_OPUS
-        if (state->oggtype == VCEDIT_IS_UNKNOWN)
+        if (state->oggtype == ET_OGG_KIND_UNKNOWN)
         {
-            state->oi = g_malloc (sizeof (OpusHead));
+            state->oi = g_slice_new (OpusHead);
 
             if (opus_head_parse (state->oi,
                                  (unsigned char*)(&header_main)->packet,
                                  (&header_main)->bytes) == 0)
             {
-                state->oggtype = VCEDIT_IS_OPUS;
+                state->oggtype = ET_OGG_KIND_OPUS;
             }
         }
 #endif
     }
 
-    if (state->oggtype == VCEDIT_IS_UNKNOWN)
+    if (state->oggtype == ET_OGG_KIND_UNKNOWN)
     {
         g_set_error (error, ET_OGG_ERROR, ET_OGG_ERROR_INVALID,
-                     "OGG bitstream contains neither Speex nor Vorbis data");
+                     "Ogg bitstream contains unknown data");
         goto err;
     }
 
     switch (state->oggtype)
     {
-        case VCEDIT_IS_OGGVORBIS:
+        case ET_OGG_KIND_VORBIS:
             header = &header_comments;
             headerpackets = 3;
             break;
 #ifdef ENABLE_SPEEX
-        case VCEDIT_IS_SPEEX:
+        case ET_OGG_KIND_SPEEX:
             header = &header_comments;
             headerpackets = 2 + state->si->extra_headers;
             break;
 #endif
 #ifdef ENABLE_OPUS
-        case VCEDIT_IS_OPUS:
+        case ET_OGG_KIND_OPUS:
             header = &header_comments;
             headerpackets = 2;
 #endif
+            break;
+        default:
+            g_assert_not_reached ();
+            break;
     }
+
     i = 1;
-    while(i<headerpackets)
+
+    while (i < headerpackets)
     {
-        while(i<headerpackets)
+        while (i < headerpackets)
         {
-            int result = ogg_sync_pageout(state->oy, &og);
-            if(result == 0) break; /* Too little data so far */
-            else if(result == 1)
+            int result = ogg_sync_pageout (state->oy, &og);
+
+            if (result == 0)
+            {
+                break; /* Too little data so far */
+            }
+            else if (result == 1)
             {
-                ogg_stream_pagein(state->os, &og);
-                while(i< headerpackets)
+                ogg_stream_pagein (state->os, &og);
+
+                while (i < headerpackets)
                 {
                     result = ogg_stream_packetout(state->os, header);
-                    if(result == 0) break;
-                    if(result == -1)
+                    if (result == 0)
+                    {
+                        break;
+                    }
+
+                    if (result == -1)
                     {
                         g_set_error (error, ET_OGG_ERROR, ET_OGG_ERROR_CORRUPT,
                                      "Corrupt secondary header");
@@ -439,26 +563,26 @@ vcedit_open(vcedit_state *state, GFile *file, GError **error)
                     }
                     switch (state->oggtype)
                     {
-                        case VCEDIT_IS_OGGVORBIS:
-                            vorbis_synthesis_headerin(state->vi, state->vc, header);
+                        case ET_OGG_KIND_VORBIS:
+                            vorbis_synthesis_headerin (state->vi, state->vc,
+                                                       header);
                             switch (i) 
                             {
-                                // 0 packet was the vorbis header
+                                /* 0 packet was the Vorbis header. */
                                 case 1:
                                     header = &header_codebooks;
                                     break;
                                 case 2:
                                     state->booklen = header->bytes;
-                                    state->bookbuf = malloc(state->booklen);
-                                    memcpy(state->bookbuf, header->packet, 
-                                           header->bytes);
+                                    state->bookbuf = g_memdup (header->packet,
+                                                               header->bytes);
                                     break;
                             }
                             break;
-                        case VCEDIT_IS_SPEEX:
+                        case ET_OGG_KIND_SPEEX:
                             switch (i) 
                             {
-                                // 0 packet was the speex header
+                                /* 0 packet was the Speex header. */
                                 case 1:
                                     oggpack_readinit(&opb,header->packet,header->bytes);
                                     _speex_unpack_comment(state->vc,&opb);
@@ -471,7 +595,7 @@ vcedit_open(vcedit_state *state, GFile *file, GError **error)
                             }
                             break;
 #ifdef ENABLE_OPUS
-                        case VCEDIT_IS_OPUS:
+                        case ET_OGG_KIND_OPUS:
                             switch (opus_tags_parse ((OpusTags *)state->vc,
                                                      header->packet,
                                                      header->bytes))
@@ -498,32 +622,36 @@ vcedit_open(vcedit_state *state, GFile *file, GError **error)
                                     break;
                             }
 #endif
+                        default:
+                            g_assert_not_reached ();
+                            break;
                     }
+
                     i++;
                 }
             }
         }
 
-        buffer = ogg_sync_buffer(state->oy, CHUNKSIZE);
+        buffer = ogg_sync_buffer (state->oy, CHUNKSIZE);
         bytes = g_input_stream_read (G_INPUT_STREAM (state->in), buffer,
                                      CHUNKSIZE, NULL, error);
+
         if (bytes == -1)
         {
             goto err;
         }
 
-        if(bytes == 0 && i < 2)
+        if (bytes == 0 && i < 2)
         {
             g_set_error (error, ET_OGG_ERROR, ET_OGG_ERROR_VORBIS,
                          "EOF before end of Vorbis headers");
             goto err;
         }
-        ogg_sync_wrote(state->oy, bytes);
+        ogg_sync_wrote (state->oy, bytes);
     }
 
     /* Copy the vendor tag */
-    state->vendor = malloc(strlen(state->vc->vendor) +1);
-    strcpy(state->vendor, state->vc->vendor);
+    state->vendor = g_strdup (state->vc->vendor);
 
     /* Headers are done! */
     g_assert (error == NULL || *error == NULL);
@@ -532,12 +660,14 @@ vcedit_open(vcedit_state *state, GFile *file, GError **error)
 
 err:
     g_assert (error == NULL || *error != NULL);
-    vcedit_clear_internals(state);
+    vcedit_clear_internals (state);
     return FALSE;
 }
 
 gboolean
-vcedit_write(vcedit_state *state, GFile *file, GError **error)
+vcedit_write (EtOggState *state,
+              GFile *file,
+              GError **error)
 {
     ogg_stream_state streamout;
     ogg_packet header_main;
@@ -550,7 +680,7 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
     int result;
     char *buffer;
     int bytes;
-    int needflush=0, needout=0;
+    int needflush = 0, needout = 0;
     GOutputStream *ostream;
     gchar *buf;
     gsize size;
@@ -587,17 +717,19 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
     header_codebooks.e_o_s = 0;
     header_codebooks.granulepos = 0;
 
-    ogg_stream_init(&streamout, state->serial);
+    ogg_stream_init (&streamout, state->serial);
 
-    _commentheader_out(state, &header_comments);
+    _commentheader_out (state, &header_comments);
 
-    ogg_stream_packetin(&streamout, &header_main);
-    ogg_stream_packetin(&streamout, &header_comments);
+    ogg_stream_packetin (&streamout, &header_main);
+    ogg_stream_packetin (&streamout, &header_comments);
 
-    if (state->oggtype == VCEDIT_IS_OGGVORBIS)
-        ogg_stream_packetin(&streamout, &header_codebooks);
+    if (state->oggtype == ET_OGG_KIND_VORBIS)
+    {
+        ogg_stream_packetin (&streamout, &header_codebooks);
+    }
 
-    while((result = ogg_stream_flush(&streamout, &ogout)))
+    while ((result = ogg_stream_flush (&streamout, &ogout)))
     {
         gsize bytes_written;
 
@@ -623,7 +755,7 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
 
     while (_fetch_next_packet (state, &op, &ogin, error))
     {
-        if(needflush)
+        if (needflush)
         {
             if (ogg_stream_flush (&streamout, &ogout))
             {
@@ -650,9 +782,9 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
                 }
             }
         }
-        else if(needout)
+        else if (needout)
         {
-            if(ogg_stream_pageout(&streamout, &ogout))
+            if(ogg_stream_pageout (&streamout, &ogout))
             {
                 gsize bytes_written;
 
@@ -680,12 +812,12 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
             }
         }
 
-        needflush=needout=0;
+        needflush = needout = 0;
 
-        if (state->oggtype == VCEDIT_IS_OGGVORBIS ||
-            state->oggtype == VCEDIT_IS_OPUS)
+        if (state->oggtype == ET_OGG_KIND_VORBIS ||
+            state->oggtype == ET_OGG_KIND_OPUS)
         {
-            if (state->oggtype == VCEDIT_IS_OGGVORBIS)
+            if (state->oggtype == ET_OGG_KIND_VORBIS)
             {
                 int size;
                 size = _blocksize(state, &op);
@@ -701,30 +833,30 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
             if(op.granulepos == -1)
             {
                 op.granulepos = granpos;
-                ogg_stream_packetin(&streamout, &op);
+                ogg_stream_packetin (&streamout, &op);
             }
             else /* granulepos is set, validly. Use it, and force a flush to 
                 account for shortened blocks (vcut) when appropriate */ 
             {
-                if(granpos > op.granulepos)
+                if (granpos > op.granulepos)
                 {
                     granpos = op.granulepos;
-                    ogg_stream_packetin(&streamout, &op);
-                    needflush=1;
+                    ogg_stream_packetin (&streamout, &op);
+                    needflush = 1;
                 }
                 else 
                 {
-                    ogg_stream_packetin(&streamout, &op);
-                    needout=1;
+                    ogg_stream_packetin (&streamout, &op);
+                    needout = 1;
                 }
             }
         }
         /* Don't know about granulepos for speex, will just assume the original 
            was appropriate. Not sure about the flushing?? */
-        else if (state->oggtype == VCEDIT_IS_SPEEX)
+        else if (state->oggtype == ET_OGG_KIND_SPEEX)
         {
-            ogg_stream_packetin(&streamout, &op);
-            needout=1;
+            ogg_stream_packetin (&streamout, &op);
+            needout = 1;
         }
     }
 
@@ -744,7 +876,8 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
     }
 
     streamout.e_o_s = 1;
-    while(ogg_stream_flush(&streamout, &ogout))
+
+    while (ogg_stream_flush (&streamout, &ogout))
     {
         gsize bytes_written;
 
@@ -792,16 +925,21 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
         }
     }
 
-    state->eosin=0; /* clear it, because not all paths to here do */
-    while(!state->eosin) /* We reached eos, not eof */
+    state->eosin = 0; /* clear it, because not all paths to here do */
+
+    while (!state->eosin) /* We reached eos, not eof */
     {
         /* We copy the rest of the stream (other logical streams)
          * through, a page at a time. */
         while(1)
         {
-            result = ogg_sync_pageout(state->oy, &ogout);
-            if(result==0)
+            result = ogg_sync_pageout (state->oy, &ogout);
+
+            if (result == 0)
+            {
                 break;
+            }
+
             if (result < 0)
             {
                 g_debug ("%s", "Corrupt or missing data, continuing");
@@ -829,7 +967,8 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
                 }
             }
         }
-        buffer = ogg_sync_buffer(state->oy, CHUNKSIZE);
+
+        buffer = ogg_sync_buffer (state->oy, CHUNKSIZE);
 
         bytes = g_input_stream_read (G_INPUT_STREAM (state->in), buffer,
                                      CHUNKSIZE, NULL, error);
@@ -840,8 +979,9 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
             goto cleanup;
         }
 
-        ogg_sync_wrote(state->oy, bytes);
-        if(bytes == 0)
+        ogg_sync_wrote (state->oy, bytes);
+
+        if (bytes == 0)
         {
             state->eosin = 1;
             break;
@@ -850,11 +990,11 @@ vcedit_write(vcedit_state *state, GFile *file, GError **error)
 
 
 cleanup:
-    ogg_stream_clear(&streamout);
-    ogg_packet_clear(&header_comments);
+    ogg_stream_clear (&streamout);
+    ogg_packet_clear (&header_comments);
 
-    free(state->mainbuf);
-    free(state->bookbuf);
+    g_free (state->mainbuf);
+    g_free (state->bookbuf);
     state->mainbuf = state->bookbuf = NULL;
 
     if (!state->eosin)
diff --git a/src/tags/vcedit.h b/src/tags/vcedit.h
index ba1f716..9e097eb 100644
--- a/src/tags/vcedit.h
+++ b/src/tags/vcedit.h
@@ -1,23 +1,33 @@
-/* This program is licensed under the GNU Library General Public License, version 2,
- * a copy of which is included with this program (with filename LICENSE.LGPL).
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
+ * Copyright (C) 2000-2001 Michael Smith <msmith at xiph.org>
  *
- * (c) 2000-2001 Michael Smith <msmith at xiph.org>
+ * 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.
  *
- * VCEdit header.
+ * 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.
  *
- * last modified: $ID:$
+ * 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 __VCEDIT_H
-#define __VCEDIT_H
+#ifndef ET_VCEDIT_H_
+#define ET_VCEDIT_H_
 
 #include "config.h"
 
 #ifdef ENABLE_OGG
 
+#include <gio/gio.h>
+
 G_BEGIN_DECLS
 
-#include <stdio.h>
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
 
@@ -31,44 +41,27 @@ G_BEGIN_DECLS
 #include <speex/speex_header.h>
 #endif
 
-#define VCEDIT_IS_UNKNOWN   0
-#define VCEDIT_IS_SPEEX     1
-#define VCEDIT_IS_OGGVORBIS 2
-#define VCEDIT_IS_OPUS      3
+typedef enum
+{
+    ET_OGG_KIND_VORBIS,
+    ET_OGG_KIND_SPEEX,
+    ET_OGG_KIND_OPUS,
+    ET_OGG_KIND_UNKNOWN
+} EtOggKind;
 
-typedef struct {
-    ogg_sync_state      *oy;
-    ogg_stream_state    *os;
+typedef struct _EtOggState EtOggState;
 
-    int                 oggtype; // Stream is Vorbis or Speex?
-    vorbis_comment      *vc;
-    vorbis_info         *vi;
+EtOggState *vcedit_new_state (void);
+void vcedit_clear (EtOggState *state);
+vorbis_comment * vcedit_comments (EtOggState *state);
 #ifdef ENABLE_SPEEX
-    SpeexHeader         *si;
-#endif
-#ifdef ENABLE_OPUS
-    OpusHead            *oi;
-#endif
-    GFileInputStream    *in;
-    long        serial;
-    unsigned char   *mainbuf;
-    unsigned char   *bookbuf;
-    int     mainlen;
-    int     booklen;
-    char   *vendor;
-    int prevW;
-    int extrapage;
-    int eosin;
-} vcedit_state;
-
-extern vcedit_state    *vcedit_new_state(void);
-extern void             vcedit_clear(vcedit_state *state);
-extern vorbis_comment  *vcedit_comments(vcedit_state *state);
-extern int              vcedit_open(vcedit_state *state, GFile *in, GError **error);
-extern int              vcedit_write(vcedit_state *state, GFile *file, GError **error);
+const SpeexHeader * vcedit_speex_header (EtOggState *state);
+#endif /* ENABLE_SPEEX */
+int vcedit_open (EtOggState *state, GFile *in, GError **error);
+int vcedit_write (EtOggState *state, GFile *file, GError **error);
 
 G_END_DECLS
 
 #endif /* ENABLE_OGG */
 
-#endif /* __VCEDIT_H */
+#endif /* ET_VCEDIT_H_ */
diff --git a/src/tags/wavpack_header.c b/src/tags/wavpack_header.c
index e90102a..801b40e 100644
--- a/src/tags/wavpack_header.c
+++ b/src/tags/wavpack_header.c
@@ -21,7 +21,6 @@
 
 #ifdef ENABLE_WAVPACK
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <wavpack/wavpack.h>
 
@@ -29,6 +28,7 @@
 #include "et_core.h"
 #include "misc.h"
 #include "wavpack_header.h"
+#include "wavpack_private.h"
 
 
 gboolean
@@ -36,21 +36,44 @@ et_wavpack_header_read_file_info (GFile *file,
                                   ET_File_Info *ETFileInfo,
                                   GError **error)
 {
-    gchar *filename;
+    WavpackStreamReader reader = { wavpack_read_bytes, wavpack_get_pos,
+                                   wavpack_set_pos_abs, wavpack_set_pos_rel,
+                                   wavpack_push_back_byte, wavpack_get_length,
+                                   wavpack_can_seek, NULL /* No writing. */ };
+    EtWavpackState state;
     WavpackContext *wpc;
     gchar message[80];
 
     g_return_val_if_fail (file != NULL && ETFileInfo != NULL, FALSE);
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-    /* TODO: Use WavpackOpenFileInputEx() instead. */
-    filename = g_file_get_path (file);
-    wpc = WavpackOpenFileInput (filename, message, 0, 0);
-    g_free (filename);
+    state.error = NULL;
+    state.istream = g_file_read (file, NULL, &state.error);
+
+    if (!state.istream)
+    {
+        g_propagate_error (error, state.error);
+        return FALSE;
+    }
+
+    state.seekable = G_SEEKABLE (state.istream);
+
+    /* NULL for the WavPack correction file. */
+    wpc = WavpackOpenFileInputEx (&reader, &state, NULL, message, 0, 0);
 
     if (wpc == NULL)
     {
-        g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, "%s", message);
+        if (state.error)
+        {
+            g_propagate_error (error, state.error);
+        }
+        else
+        {
+            g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, "%s",
+                         message);
+        }
+
+        g_object_unref (state.istream);
         return FALSE;
     }
 
@@ -59,14 +82,46 @@ et_wavpack_header_read_file_info (GFile *file,
     ETFileInfo->bitrate     = WavpackGetAverageBitrate(wpc, 0)/1000;
     ETFileInfo->samplerate  = WavpackGetSampleRate(wpc);
     ETFileInfo->mode        = WavpackGetNumChannels(wpc);
+    ETFileInfo->layer = WavpackGetChannelMask (wpc);
     ETFileInfo->size        = WavpackGetFileSize(wpc);
     ETFileInfo->duration    = WavpackGetNumSamples(wpc)/ETFileInfo->samplerate;
 
     WavpackCloseFile(wpc);
 
+    g_object_unref (state.istream);
+
     return TRUE;
 }
 
+/*
+ * et_wavpack_channel_mask_to_string:
+ * @channels: total number of channels
+ * @mask: Microsoft channel mask
+ *
+ * Formats a number of channels and a channel mask into a string, suitable for
+ * display to the user.
+ *
+ * Returns: the formatted channel information
+ */
+static gchar *
+et_wavpack_channel_mask_to_string (gint channels,
+                                   gint mask)
+{
+    gboolean lfe;
+
+    /* Low frequency effects channel is bit 3. */
+    lfe = mask & (1 << 3);
+
+    if (lfe)
+    {
+        return g_strdup_printf ("%d.1", channels - 1);
+    }
+    else
+    {
+        return g_strdup_printf ("%d", channels);
+    }
+}
+
 EtFileHeaderFields *
 et_wavpack_header_display_file_info_to_ui (const ET_File *ETFile)
 {
@@ -94,8 +149,8 @@ et_wavpack_header_display_file_info_to_ui (const ET_File *ETFile)
 
     /* Mode */
     fields->mode_label = _("Channels:");
-    fields->mode = g_strdup_printf ("%d", info->mode);
-    g_free (fields->mode);
+    fields->mode = et_wavpack_channel_mask_to_string (info->mode,
+                                                      info->layer);
 
     /* Size */
     size = g_format_size (info->size);
diff --git a/src/tags/wavpack_private.c b/src/tags/wavpack_private.c
new file mode 100644
index 0000000..2346c7f
--- /dev/null
+++ b/src/tags/wavpack_private.c
@@ -0,0 +1,182 @@
+/* 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 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 "wavpack_private.h"
+
+/* For EOF. */
+#include <stdio.h>
+
+int32_t
+wavpack_read_bytes (void *id,
+                    void *data,
+                    int32_t bcount)
+{
+    EtWavpackState *state;
+    gssize bytes_written;
+
+    state = (EtWavpackState *)id;
+
+    bytes_written = g_input_stream_read (G_INPUT_STREAM (state->istream), data,
+                                         bcount, NULL, &state->error);
+
+    if (bytes_written == -1)
+    {
+        return 0;
+    }
+
+    return bytes_written;
+}
+
+uint32_t
+wavpack_get_pos (void *id)
+{
+    EtWavpackState *state;
+
+    state = (EtWavpackState *)id;
+
+    return g_seekable_tell (state->seekable);
+}
+
+int
+wavpack_set_pos_abs (void *id,
+                     uint32_t pos)
+{
+    EtWavpackState *state;
+
+    state = (EtWavpackState *)id;
+
+    if (!g_seekable_seek (state->seekable, pos, G_SEEK_SET, NULL,
+                          &state->error))
+    {
+        return -1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+int
+wavpack_set_pos_rel (void *id,
+                     int32_t delta,
+                     int mode)
+{
+    EtWavpackState *state;
+    GSeekType seek_type;
+
+    state = (EtWavpackState *)id;
+
+    switch (mode)
+    {
+        case SEEK_SET:
+            seek_type = G_SEEK_SET;
+            break;
+        case SEEK_CUR:
+            seek_type = G_SEEK_CUR;
+            break;
+        case SEEK_END:
+            seek_type = G_SEEK_END;
+            break;
+        default:
+            g_assert_not_reached ();
+            break;
+    }
+
+    if (!g_seekable_seek (state->seekable, delta, seek_type, NULL,
+                          &state->error))
+    {
+        return -1;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+int
+wavpack_push_back_byte (void *id,
+                        int c)
+{
+    EtWavpackState *state;
+
+    state = (EtWavpackState *)id;
+
+    if (!g_seekable_seek (state->seekable, -1, G_SEEK_CUR, NULL,
+                          &state->error))
+    {
+        return EOF;
+    }
+
+    /* TODO: Check if c is present in the input stream. */
+    return c;
+}
+
+uint32_t
+wavpack_get_length (void *id)
+{
+    EtWavpackState *state;
+    GFileInfo *info;
+    goffset size;
+
+    state = (EtWavpackState *)id;
+
+    info = g_file_input_stream_query_info (state->istream,
+                                           G_FILE_ATTRIBUTE_STANDARD_SIZE,
+                                           NULL, &state->error);
+
+    if (!info)
+    {
+        return 0;
+    }
+
+    size = g_file_info_get_size (info);
+    g_object_unref (info);
+
+    return size;
+}
+
+int
+wavpack_can_seek (void *id)
+{
+    EtWavpackState *state;
+
+    state = (EtWavpackState *)id;
+
+    return g_seekable_can_seek (state->seekable);
+}
+
+int32_t
+wavpack_write_bytes (void *id,
+                     void *data,
+                     int32_t bcount)
+{
+    EtWavpackWriteState *state;
+    gssize bytes_written;
+
+    state = (EtWavpackWriteState *)id;
+
+    bytes_written = g_output_stream_write (G_OUTPUT_STREAM (state->ostream),
+                                           data, bcount, NULL, &state->error);
+
+    if (bytes_written == -1)
+    {
+        return 0;
+    }
+
+    return bytes_written;
+}
diff --git a/src/tags/wavpack_private.h b/src/tags/wavpack_private.h
new file mode 100644
index 0000000..57654e4
--- /dev/null
+++ b/src/tags/wavpack_private.h
@@ -0,0 +1,64 @@
+/* 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 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_WAVPACK_PRIVATE_H_
+#define ET_WAVPACK_PRIVATE_H_
+
+#include "config.h"
+
+#ifdef ENABLE_WAVPACK
+
+#include <gio/gio.h>
+#include <wavpack/wavpack.h>
+
+G_BEGIN_DECLS
+
+typedef struct
+{
+    GFileInputStream *istream;
+    GSeekable *seekable;
+    GError *error;
+} EtWavpackState;
+
+typedef struct
+{
+    /* Start fields copied from EtWavpackState. */
+    GFileInputStream *istream;
+    GSeekable *seekable;
+    GError *error;
+    /* End fields copied from EtWavpackState. */
+    GFileIOStream *iostream;
+    GFileOutputStream *ostream;
+} EtWavpackWriteState;
+
+int32_t wavpack_read_bytes (void *id, void *data, int32_t bcount);
+uint32_t wavpack_get_pos (void *id);
+int wavpack_set_pos_abs (void *id, uint32_t pos);
+int wavpack_set_pos_rel (void *id, int32_t delta, int mode);
+int wavpack_push_back_byte (void *id, int c);
+uint32_t wavpack_get_length (void *id);
+int wavpack_can_seek (void *id);
+
+/* Only use this with EtWavpackWriteState. */
+int32_t wavpack_write_bytes (void *id, void *data, int32_t bcount);
+
+G_END_DECLS
+
+#endif /* ENABLE_WAVPACK */
+
+#endif /* ET_WAVPACK_PRIVATE_H_ */
diff --git a/src/tags/wavpack_tag.c b/src/tags/wavpack_tag.c
index f9a81aa..b804348 100644
--- a/src/tags/wavpack_tag.c
+++ b/src/tags/wavpack_tag.c
@@ -1,34 +1,29 @@
-/* wavpack_tag.c - 2007/02/15 */
-/*
- *  EasyTAG - Tag editor for many file types
- *  Copyright (C) 2007 Maarten Maathuis (madman2003 at gmail.com)
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave at amigadave.com>
+ * Copyright (C) 2007 Maarten Maathuis (madman2003 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 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.
  */
 
 #include "config.h"
 
 #ifdef ENABLE_WAVPACK
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <unistd.h>
 #include <wavpack/wavpack.h>
 
 #include "easytag.h"
@@ -36,6 +31,7 @@
 #include "picture.h"
 #include "charset.h"
 #include "misc.h"
+#include "wavpack_private.h"
 #include "wavpack_tag.h"
 
 #define MAXLEN 1024
@@ -69,68 +65,98 @@ wavpack_tag_read_file_tag (GFile *file,
                            File_Tag *FileTag,
                            GError **error)
 {
-    gchar *filename;
+    WavpackStreamReader reader = { wavpack_read_bytes, wavpack_get_pos,
+                                   wavpack_set_pos_abs, wavpack_set_pos_rel,
+                                   wavpack_push_back_byte, wavpack_get_length,
+                                   wavpack_can_seek, NULL /* No writing. */ };
+    EtWavpackState state;
     WavpackContext *wpc;
     gchar message[80];
-    gchar *field, *field2;
+    gchar field[MAXLEN] = { 0, };
+    gchar *field2;
     guint length;
-
-    int open_flags = OPEN_TAGS;
+    const int open_flags = OPEN_TAGS;
 
     g_return_val_if_fail (file != NULL && FileTag != NULL, FALSE);
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-    /* TODO: Use WavpackOpenFileInputEx() instead. */
-    filename = g_file_get_path (file);
-    wpc = WavpackOpenFileInput (filename, message, open_flags, 0);
-    g_free (filename);
+    state.error = NULL;
+    state.istream = g_file_read (file, NULL, &state.error);
+
+    if (!state.istream)
+    {
+        g_propagate_error (error, state.error);
+        return FALSE;
+    }
+
+    state.seekable = G_SEEKABLE (state.istream);
+
+    /* NULL for the WavPack correction file. */
+    wpc = WavpackOpenFileInputEx (&reader, &state, NULL, message, open_flags,
+                                  0);
 
     if (wpc == NULL)
     {
-        g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, "%s", message);
+        if (state.error)
+        {
+            g_propagate_error (error, state.error);
+        }
+        else
+        {
+            g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, "%s",
+                         message);
+        }
+
+        g_object_unref (state.istream);
         return FALSE;
     }
 
     /*
      * Title
      */
-    field = g_malloc0(sizeof(char) * MAXLEN);
     length = WavpackGetTagItem(wpc, "title", field, MAXLEN);
 
     if ( length > 0 && FileTag->title == NULL ) {
         FileTag->title = Try_To_Validate_Utf8_String(field);
     }
 
-    g_free (field);
+    memset (field, '\0', MAXLEN);
 
     /*
      * Artist
      */
-    field = g_malloc0(sizeof(char) * MAXLEN);
     length = WavpackGetTagItem(wpc, "artist", field, MAXLEN);
 
     if ( length > 0 && FileTag->artist == NULL) {
         FileTag->artist = Try_To_Validate_Utf8_String(field);
     }
 
-    g_free (field);
+    memset (field, '\0', MAXLEN);
+
+    /* Album artist. */
+    length = WavpackGetTagItem (wpc, "album artist", field, MAXLEN);
+
+    if (length > 0 && FileTag->album_artist == NULL)
+    {
+        FileTag->album_artist = Try_To_Validate_Utf8_String (field);
+    }
+
+    memset (field, '\0', MAXLEN);
 
     /*
      * Album
      */
-    field = g_malloc0(sizeof(char) * MAXLEN);
     length = WavpackGetTagItem(wpc, "album", field, MAXLEN);
 
     if ( length > 0 && FileTag->album == NULL ) {
         FileTag->album = Try_To_Validate_Utf8_String(field);
     }
 
-    g_free (field);
+    memset (field, '\0', MAXLEN);
 
     /*
      * Discnumber + Disctotal.
      */
-    field = g_malloc0 (sizeof (char) * MAXLEN);
     length = WavpackGetTagItem (wpc, "part", field, MAXLEN);
     field2 = g_utf8_strchr (field, -1, '/');
 
@@ -143,31 +169,38 @@ wavpack_tag_read_file_tag (GFile *file,
 
     if (field2 && FileTag->disc_total == NULL)
     {
-        FileTag->disc_total = et_disc_number_to_string (atoi (Try_To_Validate_Utf8_String (field2)));
+        gchar *tmp;
+
+        tmp = Try_To_Validate_Utf8_String (field2);
+        FileTag->disc_total = et_disc_number_to_string (atoi (tmp));
+        g_free (tmp);
     }
+
     if (length > 0 && FileTag->disc_number == NULL)
     {
-        FileTag->disc_number = et_disc_number_to_string (atoi (Try_To_Validate_Utf8_String (field)));
+        gchar *tmp;
+
+        tmp = Try_To_Validate_Utf8_String (field);
+        FileTag->disc_number = et_disc_number_to_string (atoi (tmp));
+        g_free (tmp);
     }
 
-    g_free (field);
+    memset (field, '\0', MAXLEN);
 
     /*
      * Year
      */
-    field = g_malloc0(sizeof(char) * MAXLEN);
     length = WavpackGetTagItem(wpc, "year", field, MAXLEN);
 
     if ( length > 0 && FileTag->year == NULL ) {
         FileTag->year = Try_To_Validate_Utf8_String(field);
     }
 
-    g_free (field);
+    memset (field, '\0', MAXLEN);
 
     /*
      * Tracknumber + tracktotal
      */
-    field = g_malloc0(sizeof(char) * MAXLEN);
     length = WavpackGetTagItem(wpc, "track", field, MAXLEN);
     field2 = g_utf8_strchr(field, -1, '/');
 
@@ -179,108 +212,145 @@ wavpack_tag_read_file_tag (GFile *file,
 
     if (field2 && FileTag->track_total == NULL)
     {
-        FileTag->track_total = et_track_number_to_string (atoi (Try_To_Validate_Utf8_String (field2)));
+        gchar *tmp;
+
+        tmp = Try_To_Validate_Utf8_String (field2);
+        FileTag->track_total = et_track_number_to_string (atoi (tmp));
+        g_free (tmp);
     }
+
     if (length > 0 && FileTag->track == NULL)
     {
-        FileTag->track = et_track_number_to_string (atoi (Try_To_Validate_Utf8_String (field)));
+        gchar *tmp;
+
+        tmp = Try_To_Validate_Utf8_String (field);
+        FileTag->track = et_track_number_to_string (atoi (tmp));
+        g_free (tmp);
     }
 
-    g_free (field);
+    memset (field, '\0', MAXLEN);
 
     /*
      * Genre
      */
-    field = g_malloc0(sizeof(char) * MAXLEN);
     length = WavpackGetTagItem(wpc, "genre", field, MAXLEN);
 
     if ( length > 0 && FileTag->genre == NULL ) {
         FileTag->genre = Try_To_Validate_Utf8_String(field);
     }
 
-    g_free (field);
+    memset (field, '\0', MAXLEN);
 
     /*
      * Comment
      */
-    field = g_malloc0(sizeof(char) * MAXLEN);
     length = WavpackGetTagItem(wpc, "comment", field, MAXLEN);
 
     if ( length > 0 && FileTag->comment == NULL ) {
         FileTag->comment = Try_To_Validate_Utf8_String(field);
     }
 
-    g_free (field);
+    memset (field, '\0', MAXLEN);
 
     /*
      * Composer
      */
-    field = g_malloc0(sizeof(char) * MAXLEN);
     length = WavpackGetTagItem(wpc, "composer", field, MAXLEN);
 
     if ( length > 0 && FileTag->composer == NULL ) {
         FileTag->composer = Try_To_Validate_Utf8_String(field);
     }
 
-    g_free (field);
+    memset (field, '\0', MAXLEN);
 
     /*
      * Original artist
      */
-    field = g_malloc0(sizeof(char) * MAXLEN);
     length = WavpackGetTagItem(wpc, "original artist", field, MAXLEN);
 
     if ( length > 0 && FileTag->orig_artist == NULL ) {
         FileTag->orig_artist  = Try_To_Validate_Utf8_String(field);
     }
 
-    g_free (field);
+    memset (field, '\0', MAXLEN);
 
     /*
      * Copyright
      */
-    field = g_malloc0(sizeof(char) * MAXLEN);
     length = WavpackGetTagItem(wpc, "copyright", field, MAXLEN);
 
     if ( length > 0 && FileTag->copyright == NULL ) {
         FileTag->copyright = Try_To_Validate_Utf8_String(field);
     }
 
-    g_free (field);
+    memset (field, '\0', MAXLEN);
 
     /*
      * URL
      */
-    field = g_malloc0(sizeof(char) * MAXLEN);
     length = WavpackGetTagItem(wpc, "copyright url", field, MAXLEN);
 
     if ( length > 0 && FileTag->url == NULL ) {
         FileTag->url = Try_To_Validate_Utf8_String(field);
     }
 
-    g_free (field);
+    memset (field, '\0', MAXLEN);
 
     /*
      * Encoded by
      */
-    field = g_malloc0(sizeof(char) * MAXLEN);
     length = WavpackGetTagItem(wpc, "encoded by", field, MAXLEN);
 
     if ( length > 0 && FileTag->encoded_by == NULL ) {
         FileTag->encoded_by = Try_To_Validate_Utf8_String(field);
     }
 
-    g_free (field);
-
     WavpackCloseFile(wpc);
 
+    g_object_unref (state.istream);
+
     return TRUE;
 }
 
+/*
+ * et_wavpack_append_or_delete_tag_item:
+ * @wpc: the #WavpackContext of which to modify tags
+ * @tag: the tag item name
+ * @value: the tag value to write, or %NULL to delete
+ *
+ * Appends @value to the @tag item of @wpc, or removes the tag item if @value
+ * is %NULL.
+ *
+ * Returns: %TRUE on success, %FALSE otherwise
+ */
+static gboolean
+et_wavpack_append_or_delete_tag_item (WavpackContext *wpc,
+                                      const gchar *tag,
+                                      const gchar *value)
+{
+    if (value)
+    {
+        return WavpackAppendTagItem (wpc, tag, value, strlen (value));
+    }
+    else
+    {
+        WavpackDeleteTagItem (wpc, tag);
+
+        /* It is not an error if there was no tag item to delete. */
+        return TRUE;
+    }
+}
+
 gboolean
 wavpack_tag_write_file_tag (const ET_File *ETFile,
                             GError **error)
 {
+    WavpackStreamReader writer = { wavpack_read_bytes, wavpack_get_pos,
+                                   wavpack_set_pos_abs, wavpack_set_pos_rel,
+                                   wavpack_push_back_byte, wavpack_get_length,
+                                   wavpack_can_seek, wavpack_write_bytes };
+    GFile *file;
+    EtWavpackWriteState state;
     const gchar *filename;
     const File_Tag *FileTag;
     WavpackContext *wpc;
@@ -293,45 +363,73 @@ wavpack_tag_write_file_tag (const ET_File *ETFile,
     filename = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value;
     FileTag = (File_Tag *)ETFile->FileTag->data;
 
-    /* TODO: Use WavpackOpenFileInputEx() instead. */
-    wpc = WavpackOpenFileInput (filename, message, OPEN_EDIT_TAGS, 0);
+    file = g_file_new_for_path (filename);
+    state.error = NULL;
+    state.iostream = g_file_open_readwrite (file, NULL, &state.error);
+    g_object_unref (file);
+
+    if (!state.iostream)
+    {
+        g_propagate_error (error, state.error);
+        return FALSE;
+    }
+
+    state.istream = G_FILE_INPUT_STREAM (g_io_stream_get_input_stream (G_IO_STREAM (state.iostream)));
+    state.ostream = G_FILE_OUTPUT_STREAM (g_io_stream_get_output_stream (G_IO_STREAM (state.iostream)));
+    state.seekable = G_SEEKABLE (state.iostream);
+
+    /* NULL for the WavPack correction file. */
+    wpc = WavpackOpenFileInputEx (&writer, &state, NULL, message,
+                                  OPEN_EDIT_TAGS, 0);
 
     if (wpc == NULL)
     {
-        g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, "%s", message);
+        if (state.error)
+        {
+            g_propagate_error (error, state.error);
+        }
+        else
+        {
+            g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, "%s",
+                         message);
+        }
+
+        g_object_unref (state.iostream);
         return FALSE;
     }
 
-    /*
-     * Title
-     */
-    if (FileTag->title && WavpackAppendTagItem(wpc, "title", FileTag->title, strlen(FileTag->title)) == 0) {
+    /* Title. */
+    if (!et_wavpack_append_or_delete_tag_item (wpc, "title", FileTag->title))
+    {
         goto err;
     }
 
-    /*
-     * Artist
-     */
-    if (FileTag->artist && WavpackAppendTagItem(wpc, "artist", FileTag->artist, strlen(FileTag->artist)) == 0) {
+    /* Artist. */
+    if (!et_wavpack_append_or_delete_tag_item (wpc, "artist", FileTag->artist))
+    {
         goto err;
     }
 
-    /*
-     * Album
-     */
-    if (FileTag->album && WavpackAppendTagItem(wpc, "album", FileTag->album, strlen(FileTag->album)) == 0) {
+    /* Album artist. */
+    if (!et_wavpack_append_or_delete_tag_item (wpc, "album artist",
+                                               FileTag->album_artist))
+    {
         goto err;
     }
 
-    /*
-     * Discnumber
-    */
+    /* Album. */
+    if (!et_wavpack_append_or_delete_tag_item (wpc, "album", FileTag->album))
+    {
+        goto err;
+    }
+
+    /* Discnumber. */
     if (FileTag->disc_number && FileTag->disc_total)
     {
         buffer = g_strdup_printf ("%s/%s", FileTag->disc_number,
                                   FileTag->disc_total);
 
-        if (WavpackAppendTagItem (wpc, "part", buffer, strlen (buffer)) == 0)
+        if (!et_wavpack_append_or_delete_tag_item (wpc, "part", buffer))
         {
             g_free (buffer);
             goto err;
@@ -343,94 +441,100 @@ wavpack_tag_write_file_tag (const ET_File *ETFile,
     }
     else
     {
-        if (FileTag->disc_number && WavpackAppendTagItem (wpc, "part",
-                                                          FileTag->disc_number,
-                                                          strlen (FileTag->disc_number)) == 0)
+        if (!et_wavpack_append_or_delete_tag_item (wpc, "part",
+                                                   FileTag->disc_number))
         {
             goto err;
         }
     }
 
-    /*
-     * Year
-     */
-    if (FileTag->year && WavpackAppendTagItem(wpc, "year", FileTag->year, strlen(FileTag->year)) == 0) {
+    /* Year. */
+    if (!et_wavpack_append_or_delete_tag_item (wpc, "year", FileTag->year))
+    {
         goto err;
     }
 
-    /*
-     * Tracknumber + tracktotal
-     */
-    if (FileTag->track_total) {
-        buffer = g_strdup_printf("%s/%s", FileTag->track, FileTag->track_total);
-        if (FileTag->track && WavpackAppendTagItem(wpc, "track", buffer, strlen(buffer)) == 0) {
-            g_free(buffer);
+    /* Tracknumber + tracktotal. */
+    if (FileTag->track_total)
+    {
+        buffer = g_strdup_printf ("%s/%s", FileTag->track,
+                                  FileTag->track_total);
+
+        if (!et_wavpack_append_or_delete_tag_item (wpc, "track", buffer))
+        {
+            g_free (buffer);
             goto err;
-        } else {
-            g_free(buffer);
         }
-    } else {
-        if (FileTag->track && WavpackAppendTagItem(wpc, "track", FileTag->track, strlen(FileTag->track)) == 0) {
+        else
+        {
+            g_free (buffer);
+        }
+    }
+    else
+    {
+        if (!et_wavpack_append_or_delete_tag_item (wpc, "track",
+                                                   FileTag->track))
+        {
             goto err;
         }
     }
 
-    /*
-     * Genre
-     */
-    if (FileTag->genre && WavpackAppendTagItem(wpc, "genre", FileTag->genre, strlen(FileTag->genre)) == 0) {
+    /* Genre. */
+    if (!et_wavpack_append_or_delete_tag_item (wpc, "genre", FileTag->genre))
+    {
         goto err;
     }
 
-    /*
-     * Comment
-     */
-    if (FileTag->comment && WavpackAppendTagItem(wpc, "comment", FileTag->comment, strlen(FileTag->comment)) == 0) {
+    /* Comment. */
+    if (!et_wavpack_append_or_delete_tag_item (wpc, "comment", FileTag->comment))
+    {
         goto err;
     }
 
-    /*
-     * Composer
-     */
-    if (FileTag->composer && WavpackAppendTagItem(wpc, "composer", FileTag->composer, strlen(FileTag->composer)) == 0) {
+    /* Composer. */
+    if (!et_wavpack_append_or_delete_tag_item (wpc, "composer",
+                                               FileTag->composer))
+    {
         goto err;
     }
 
-    /*
-     * Original artist
-     */
-    if (FileTag->orig_artist && WavpackAppendTagItem(wpc, "original artist", FileTag->orig_artist, strlen(FileTag->orig_artist)) == 0) {
+    /* Original artist. */
+    if (!et_wavpack_append_or_delete_tag_item (wpc, "original artist",
+                                               FileTag->orig_artist))
+    {
         goto err;
     }
 
-    /*
-     * Copyright
-     */
-    if (FileTag->copyright && WavpackAppendTagItem(wpc, "copyright", FileTag->copyright, strlen(FileTag->copyright)) == 0) {
+    /* Copyright. */
+    if (!et_wavpack_append_or_delete_tag_item (wpc, "copyright",
+                                               FileTag->copyright))
+    {
         goto err;
     }
 
-    /*
-     * URL
-     */
-    if (FileTag->url && WavpackAppendTagItem(wpc, "copyright url", FileTag->url, strlen(FileTag->url)) == 0) {
+    /* URL. */
+    if (!et_wavpack_append_or_delete_tag_item (wpc, "copyright url",
+                                               FileTag->url))
+    {
         goto err;
     }
 
-    /*
-     * Encoded by
-     */
-    if (FileTag->encoded_by && WavpackAppendTagItem(wpc, "encoded by", FileTag->encoded_by, strlen(FileTag->encoded_by)) == 0) {
+    /* Encoded by. */
+    if (!et_wavpack_append_or_delete_tag_item (wpc, "encoded by",
+                                               FileTag->encoded_by))
+    {
         goto err;
     }
 
-    if (WavpackWriteTag (wpc) != 0)
+    if (WavpackWriteTag (wpc) == 0)
     {
         goto err;
     }
 
     WavpackCloseFile (wpc);
 
+    g_object_unref (state.iostream);
+
     return TRUE;
 
 err:
diff --git a/src/win32/easytag.manifest b/src/win32/easytag.manifest
new file mode 100644
index 0000000..1480796
--- /dev/null
+++ b/src/win32/easytag.manifest
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git a/src/win32/win32dep.c b/src/win32/win32dep.c
index d8d05d1..09b2176 100644
--- a/src/win32/win32dep.c
+++ b/src/win32/win32dep.c
@@ -209,16 +209,4 @@ et_w32_truncate (const gchar *path, off_t length)
     return ret;
 }
 
-gint
-et_w32_ftruncate (gint fd, off_t length)
-{
-    HANDLE h;
-
-    h = (HANDLE)_get_osfhandle (fd);
-
-    if (h == (HANDLE) - 1) return -1;
-
-    return chsize ((gint)h, length);
-}
-
 #endif /* G_OS_WIN32 */
diff --git a/src/win32/win32dep.h b/src/win32/win32dep.h
index 59cf681..eeac9a3 100644
--- a/src/win32/win32dep.h
+++ b/src/win32/win32dep.h
@@ -66,11 +66,6 @@ extern void  ET_Win32_Path_Replace_Slashes           (gchar *path);
 extern gint et_w32_mkstemp (char *template);
 #endif /* HAVE_MKSTEMP */
 
-#ifndef HAVE_FTRUNCATE
-#define et_w32_ftruncate ftruncate
-extern gint et_w32_ftruncate (gint fd, off_t length);
-#endif /* !HAVE_FTRUNCATE */
-
 #ifndef HAVE_TRUNCATE
 #define et_w32_truncate truncate
 extern gint et_w32_truncate (const gchar *path, off_t length);
diff --git a/tests/test-file_description.c b/tests/test-file_description.c
new file mode 100644
index 0000000..7f7cb78
--- /dev/null
+++ b/tests/test-file_description.c
@@ -0,0 +1,156 @@
+/* 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 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 "file_description.h"
+
+static void
+file_description_get_extension (void)
+{
+    gsize i;
+    static const struct
+    {
+        const gchar *filename;
+        const gchar *extension;
+    } filenames[] =
+    {
+        { "test.mp3", ".mp3" },
+        { "test.mp4.mp3", ".mp3" },
+        { "test.mp4mp3", ".mp4mp3" },
+        { "test.", "." },
+        { "test", NULL },
+        { "test.Mp4", ".Mp4" }
+    };
+
+    for (i = 0; i < G_N_ELEMENTS (filenames); i++)
+    {
+        const gchar *extension;
+        extension = ET_Get_File_Extension (filenames[i].filename);
+        g_assert_cmpstr (extension, ==, filenames[i].extension);
+    }
+}
+
+static void
+file_description_get_file_description (void)
+{
+    gsize i;
+    static const struct
+    {
+        const gchar *filename;
+        ET_File_Type file_type;
+        ET_Tag_Type tag_type;
+    } filenames[] =
+    {
+        { "test.mp3", MP3_FILE, ID3_TAG },
+        { "test.mp4.mp3", MP3_FILE, ID3_TAG },
+        { "test.mp4mp3", UNKNOWN_FILE, UNKNOWN_TAG },
+        { "test.", UNKNOWN_FILE, UNKNOWN_TAG },
+        { "test", UNKNOWN_FILE, UNKNOWN_TAG },
+        { "test.Mp4", MP4_FILE, MP4_TAG },
+        { "test.mpeg", UNKNOWN_FILE, UNKNOWN_TAG },
+        { "test.mp2", MP2_FILE, ID3_TAG },
+        { "test.opus", OPUS_FILE, OPUS_TAG },
+        { "test.ogg", OGG_FILE, OGG_TAG },
+        { "test.oga", OGG_FILE, OGG_TAG },
+        { "test.spx", SPEEX_FILE, OGG_TAG },
+        { "test.dsf", UNKNOWN_FILE, UNKNOWN_TAG },
+        { "test.flac", FLAC_FILE, FLAC_TAG },
+        { "test.fla", FLAC_FILE, FLAC_TAG },
+        { "test.mpc", MPC_FILE, APE_TAG },
+        { "test.mp+", MPC_FILE, APE_TAG },
+        { "test.mpp", MPC_FILE, APE_TAG },
+        { "test.ape", MAC_FILE, APE_TAG },
+        { "test.mac", MAC_FILE, APE_TAG },
+        { "test.ofr", OFR_FILE, APE_TAG },
+        { "test.ofs", OFR_FILE, APE_TAG },
+        { "test.mp4", MP4_FILE, MP4_TAG },
+        { "test.m4a", MP4_FILE, MP4_TAG },
+        { "test.m4p", MP4_FILE, MP4_TAG },
+        { "test.m4v", MP4_FILE, MP4_TAG },
+        { "test.wv", WAVPACK_FILE, WAVPACK_TAG },
+        { "test.wvc", UNKNOWN_FILE, UNKNOWN_TAG }
+    };
+
+    for (i = 0; i < G_N_ELEMENTS (filenames); i++)
+    {
+        const ET_File_Description *description;
+        description = ET_Get_File_Description (filenames[i].filename);
+        g_assert_cmpint (description->FileType, ==, filenames[i].file_type);
+        g_assert_cmpint (description->TagType, ==, filenames[i].tag_type);
+    }
+}
+
+static void
+file_description_is_supported (void)
+{
+    gsize i;
+    static const struct
+    {
+        const gchar *filename;
+        gboolean supported;
+    } filenames[] =
+    {
+        { "test.mp3", TRUE },
+        { "test.mp4.mp3", TRUE },
+        { "test.mp4mp3", FALSE },
+        { "test.", FALSE },
+        { "test", FALSE },
+        { "test.mpeg", FALSE },
+        { "test.mp2", TRUE },
+        { "test.opus", TRUE },
+        { "test.ogg", TRUE },
+        { "test.oga", TRUE },
+        { "test.spx", TRUE },
+        { "test.flac", TRUE },
+        { "test.fla", TRUE },
+        { "test.mpc", TRUE },
+        { "test.mp+", TRUE },
+        { "test.mpp", TRUE },
+        { "test.ape", TRUE },
+        { "test.mac", TRUE },
+        { "test.ofr", TRUE },
+        { "test.ofs", TRUE },
+        { "test.mp4", TRUE },
+        { "test.m4a", TRUE },
+        { "test.m4p", TRUE },
+        { "test.m4v", TRUE },
+        { "test.wv", TRUE },
+        { "test.wvc", FALSE }
+    };
+
+    for (i = 0; i < G_N_ELEMENTS (filenames); i++)
+    {
+        gboolean supported;
+        supported = et_file_is_supported (filenames[i].filename);
+        g_assert (supported == filenames[i].supported);
+    }
+}
+
+int
+main (int argc, char** argv)
+{
+    g_test_init (&argc, &argv, NULL);
+
+    g_test_add_func ("/file_description/get_extension",
+                     file_description_get_extension);
+    g_test_add_func ("/file_description/get_file_description",
+                     file_description_get_file_description);
+    g_test_add_func ("/file_description/is_supported",
+                     file_description_is_supported);
+
+    return g_test_run ();
+}
diff --git a/tests/test-picture.c b/tests/test-picture.c
index a1970d1..8948a97 100644
--- a/tests/test-picture.c
+++ b/tests/test-picture.c
@@ -18,56 +18,55 @@
 
 #include "picture.h"
 
+#include <string.h>
+
 static void
 picture_copy (void)
 {
-    Picture *pic1;
-    Picture *pic2;
-    Picture *pic3;
-    Picture *pic1_copy;
-    Picture *pic2_copy;
-    const Picture *pic3_copy;
-
-    pic1 = Picture_Allocate ();
-
-    pic1->type = ET_PICTURE_TYPE_LEAFLET_PAGE;
-    pic1->width = 640;
-    pic1->height = 480;
-    pic1->description = g_strdup ("foobar.png");
-    pic1->size = 10;
-    pic1->data = g_malloc0 (pic1->size);
-
-    pic2 = Picture_Copy (pic1);
+    GBytes *bytes;
+    EtPicture *pic1;
+    EtPicture *pic2;
+    EtPicture *pic3;
+    EtPicture *pic4;
+    EtPicture *pic1_copy;
+    EtPicture *pic2_copy;
+    const EtPicture *pic3_copy;
+    EtPicture *pic4_copy;
+
+    bytes = g_bytes_new_static ("foobar", 6);
+    pic1 = et_picture_new (ET_PICTURE_TYPE_LEAFLET_PAGE, "foobar.png", 640,
+                           480, bytes);
+    g_bytes_unref (bytes);
+
+    pic2 = et_picture_copy_all (pic1);
 
     g_assert_cmpint (pic2->type, ==, ET_PICTURE_TYPE_LEAFLET_PAGE);
     g_assert_cmpint (pic2->width, ==, 640);
     g_assert_cmpint (pic2->height, ==, 480);
     g_assert_cmpstr (pic2->description, ==, "foobar.png");
-    g_assert_cmpint (pic2->size, ==, 10);
+    g_assert_cmpint (g_bytes_hash (pic2->bytes), ==,
+                     g_bytes_hash (pic1->bytes));
+    g_assert (pic2->bytes == pic1->bytes);
     g_assert (pic2->next == NULL);
 
-    pic3 = Picture_Allocate ();
-
-    pic3->type = ET_PICTURE_TYPE_ILLUSTRATION;
-    pic3->width = 320;
-    pic3->height = 240;
-    pic3->description = g_strdup ("bash.jpg");
-    pic3->size = 20;
-    pic3->data = g_malloc0 (pic3->size);
+    bytes = g_bytes_new_static ("foo", 3);
+    pic3 = et_picture_new (ET_PICTURE_TYPE_ILLUSTRATION, "bash.jpg", 320, 240,
+                           bytes);
+    g_bytes_unref (bytes);
 
     pic1->next = pic2;
     pic2->next = pic3;
 
-    pic2_copy = Picture_Copy_One (pic2);
+    pic2_copy = et_picture_copy_single (pic2);
 
     g_assert_cmpint (pic2_copy->type, ==, ET_PICTURE_TYPE_LEAFLET_PAGE);
     g_assert_cmpint (pic2_copy->width, ==, 640);
     g_assert_cmpint (pic2_copy->height, ==, 480);
     g_assert_cmpstr (pic2_copy->description, ==, "foobar.png");
-    g_assert_cmpint (pic2_copy->size, ==, 10);
+    g_assert_cmpint (g_bytes_get_size (pic2_copy->bytes), ==, 6);
     g_assert (pic2_copy->next == NULL);
 
-    pic1_copy = Picture_Copy (pic1);
+    pic1_copy = et_picture_copy_all (pic1);
 
     g_assert (pic1_copy->next != NULL);
     g_assert (pic1_copy->next->next != NULL);
@@ -79,11 +78,25 @@ picture_copy (void)
     g_assert_cmpint (pic3_copy->width, ==, 320);
     g_assert_cmpint (pic3_copy->height, ==, 240);
     g_assert_cmpstr (pic3_copy->description, ==, "bash.jpg");
-    g_assert_cmpint (pic3_copy->size, ==, 20);
+    g_assert_cmpint (g_bytes_get_size (pic3_copy->bytes), ==, 3);
+
+    bytes = g_bytes_new_static ("foobarbaz", 9);
+    pic4 = et_picture_new (ET_PICTURE_TYPE_MEDIA, "baz.gif", 800, 600, bytes);
+    g_bytes_unref (bytes);
+
+    pic4_copy = g_boxed_copy (ET_TYPE_PICTURE, pic4);
 
-    Picture_Free (pic1_copy);
-    Picture_Free (pic2_copy);
-    Picture_Free (pic1);
+    g_assert_cmpint (pic4_copy->type, ==, ET_PICTURE_TYPE_MEDIA);
+    g_assert_cmpint (pic4_copy->width, ==, 800);
+    g_assert_cmpint (pic4_copy->height, ==, 600);
+    g_assert_cmpstr (pic4_copy->description, ==, "baz.gif");
+    g_assert_cmpint (g_bytes_get_size (pic4_copy->bytes), ==, 9);
+
+    et_picture_free (pic1_copy);
+    et_picture_free (pic2_copy);
+    g_boxed_free (ET_TYPE_PICTURE, pic4_copy);
+    et_picture_free (pic1);
+    et_picture_free (pic4);
 }
 
 static void
@@ -131,12 +144,49 @@ picture_type_from_filename (void)
     }
 }
 
+static void
+picture_format_from_data (void)
+{
+    gsize i;
+
+    static const struct
+    {
+        const gchar *data;
+        Picture_Format format;
+    } pictures[] =
+    {
+        { "\xff\xd8", PICTURE_FORMAT_UNKNOWN },
+        { "\xff\xd8\xff", PICTURE_FORMAT_JPEG },
+        { "\x89PNG\x0d\x0a\x1a\x0a", PICTURE_FORMAT_PNG },
+        { "GIF87a", PICTURE_FORMAT_GIF },
+        { "GIF89a", PICTURE_FORMAT_GIF },
+        { "GIF900", PICTURE_FORMAT_UNKNOWN }
+    };
+
+    for (i = 0; i < G_N_ELEMENTS (pictures); i++)
+    {
+        GBytes *bytes;
+        EtPicture *pic;
+
+        bytes = g_bytes_new_static (pictures[i].data,
+                                    strlen (pictures[i].data) + 1);
+        pic = et_picture_new (ET_PICTURE_TYPE_FRONT_COVER, "", 0, 0, bytes);
+        g_bytes_unref (bytes);
+
+        g_assert_cmpint (pictures[i].format, ==,
+                         Picture_Format_From_Data (pic));
+
+        et_picture_free (pic);
+    }
+}
+
 int
 main (int argc, char** argv)
 {
     g_test_init (&argc, &argv, NULL);
 
     g_test_add_func ("/picture/copy", picture_copy);
+    g_test_add_func ("/picture/format-from-data", picture_format_from_data);
     g_test_add_func ("/picture/type-from-filename",
                      picture_type_from_filename);
 

-- 
easytag packaging



More information about the pkg-multimedia-commits mailing list